summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-01 12:24:25 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-01 12:24:25 +0000
commit7f1a4c9bc7097be3baf0b4920e6ad8bdebc7060c (patch)
tree78f431c0e114d1ed29fd9f40a56b601fd491444a /dev-games
parentStable on amd64 wrt bug #326269 (diff)
downloadhistorical-7f1a4c9bc7097be3baf0b4920e6ad8bdebc7060c.tar.gz
historical-7f1a4c9bc7097be3baf0b4920e6ad8bdebc7060c.tar.bz2
historical-7f1a4c9bc7097be3baf0b4920e6ad8bdebc7060c.zip
Apply ogre-1.4.9-as-needed.patch also to 1.6.5 wrt #308387 by Mik B. Shvets.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/ogre/ChangeLog6
-rw-r--r--dev-games/ogre/Manifest4
-rw-r--r--dev-games/ogre/ogre-1.6.5.ebuild5
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 9cc9539f0fca..a308a595d324 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/ogre
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.64 2010/03/26 02:06:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.65 2010/07/01 12:24:25 ssuominen Exp $
+
+ 01 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> ogre-1.6.5.ebuild:
+ Apply ogre-1.4.9-as-needed.patch also to 1.6.5 wrt #308387 by Mik B.
+ Shvets.
26 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.5.ebuild,
+files/ogre-1.6.5-cegui.patch:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 60e98678dc7d..0008998a9139 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -6,6 +6,6 @@ AUX ogre-1.6.5-cegui.patch 885 RMD160 0b2252ced3f1f7d3e1f3d429ff75a494d59f1793 S
DIST ogre-v1-4-9.tar.bz2 29555312 RMD160 c95536520d222b410e30f7bbee15c55360ee9c8d SHA1 3b8fb296a16cac77cdba6370bd9c752bfcccf18a SHA256 38b17826b6b34e70bf1bab17d4791ab1d485409c938cf71e1e5f866f3391c35b
DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
EBUILD ogre-1.4.9.ebuild 2471 RMD160 e4d5799c3181b5e018cf388e6f61af6ed105400d SHA1 cf23cea542cbf09cea5a5863a7e8e058f3122b16 SHA256 4a5e333060987d058edc37fd4af50a40fd8681ebb79c222900a4767a968b04c6
-EBUILD ogre-1.6.5.ebuild 2431 RMD160 bda184710d50c2ad328d1f2cca1e91f7ce07a86b SHA1 9d0967b1f2130dca35e8c3fdd2addacd927cd684 SHA256 bacf1c14e6215d247ad1545ab857b023a843da652d830066d4ca7523c7efe43e
-MISC ChangeLog 9330 RMD160 e8f8479669fba9c960dfcfddfc0685738e5baffc SHA1 31ee1d4588122173c86b55ff514b23b9445115fc SHA256 354e6388f9f42f90eef22f10228bd0ed2117af9e6e9a5e2ce35a6da859d455f0
+EBUILD ogre-1.6.5.ebuild 2477 RMD160 e37119458339982568882ff15ef674f6e92832b2 SHA1 f2ddc0379ea26ea3e47e4a2c1a7fb57cd692e03e SHA256 0125657e8c81bdad1b2a46f9fc2d31d45acea18c38b269b5c7dd5831e6076486
+MISC ChangeLog 9485 RMD160 fa624dfd5ba06320576d9086e752956316669f6c SHA1 d6ee0bb6e3fd24d596a26e8a9fb60ef62988ddae SHA256 9e8d42124ee62add917d6978e680d4585b0c2dbb8b141dd3d67bbefd96ebb7ac
MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
diff --git a/dev-games/ogre/ogre-1.6.5.ebuild b/dev-games/ogre/ogre-1.6.5.ebuild
index a5ec1f8d3784..db531d9a3289 100644
--- a/dev-games/ogre/ogre-1.6.5.ebuild
+++ b/dev-games/ogre/ogre-1.6.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.2 2010/03/26 02:06:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.3 2010/07/01 12:24:25 ssuominen Exp $
EAPI=2
inherit multilib eutils autotools flag-o-matic
@@ -50,7 +50,8 @@ src_prepare() {
sed -i -e '/CPPUNIT/d' configure.in || die "sed failed"
epatch "${FILESDIR}"/${P}-boost.patch \
"${FILESDIR}"/${P}-automake.patch \
- "${FILESDIR}"/${P}-cegui.patch
+ "${FILESDIR}"/${P}-cegui.patch \
+ "${FILESDIR}"/${PN}-1.4.9-as-needed.patch
eautoreconf
}