diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-12-01 17:22:21 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-12-01 17:22:21 +0000 |
| commit | 2d7ca836c17b93f087b260f8ef244c0f4c11d04e (patch) | |
| tree | 24c6e080477f913e52cecc0a9da2cd09814fa9bd /dev-games | |
| parent | Adjust Asterisk dependency in preparation for 1.4 ebuilds. (diff) | |
| download | historical-2d7ca836c17b93f087b260f8ef244c0f4c11d04e.tar.gz historical-2d7ca836c17b93f087b260f8ef244c0f4c11d04e.tar.bz2 historical-2d7ca836c17b93f087b260f8ef244c0f4c11d04e.zip | |
fix patching for as-needed to fit the naming convention (bug #347377)
Package-Manager: portage-2.1.9.24/cvs/Linux i686
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/ogre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/ogre/Manifest | 5 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.6.5-as-needed.patch | 11 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.6.5.ebuild | 4 |
4 files changed, 21 insertions, 5 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog index 968f03d39c83..e94ae20ae164 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.69 2010/10/15 17:44:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.70 2010/12/01 17:22:21 mr_bones_ Exp $ + + 01 Dec 2010; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.5.ebuild, + +files/ogre-1.6.5-as-needed.patch: + fix patching for as-needed to fit the naming convention (bug #347377) 15 Oct 2010; Christian Faulhammer <fauli@gentoo.org> ogre-1.6.5.ebuild: stable x86, bug 340925 diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 0970aec8c6e7..5db9243330a8 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,7 +1,8 @@ +AUX ogre-1.6.5-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a AUX ogre-1.6.5-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f AUX ogre-1.6.5-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc AUX ogre-1.6.5-cegui.patch 885 RMD160 0b2252ced3f1f7d3e1f3d429ff75a494d59f1793 SHA1 f94eaf64966efad0592cbb6aa90c1700deadbfc7 SHA256 364739dbc04d99eb4a1fd1faad37079dd9acc60b8181f96a399861d700940d6b DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5 -EBUILD ogre-1.6.5.ebuild 2475 RMD160 1d07d2d295a3ddc1e7d6d4b8611cf0425470a6dc SHA1 3ead6d937fdff70d6fb8ce1f130ba944b4a6a584 SHA256 6a7c55bdf8553dd6cf344f93425e115e389cf274a812209b57be6f7f675fb268 -MISC ChangeLog 10023 RMD160 bb4e515c5741b8fb80233ea1800d8a72b55b2ba2 SHA1 cc5d36883e87953f3050a4a1a6a20548b3b0b9f0 SHA256 d29e8ebc23262df726e2573bde0c7480d5adae21925bf3b6eacd9e4554a80e53 +EBUILD ogre-1.6.5.ebuild 2472 RMD160 ab5d9969e9205d6d165ea2371428969eff805d51 SHA1 459e45631c073f2dec1d001f2d6db51fb7db346c SHA256 a290315e9e1a5fd08f7d6ddc2005968458eacad38b5ca7577a365c3d4a148e19 +MISC ChangeLog 10211 RMD160 714f2f5d88119ee445be9223487ff6a592756a67 SHA1 43379eb7b075618dc2a4b5da9efb5f151c4693ac SHA256 3cd55e58d9869e48b419a0b8d27f50be50c020a4157f34d87db45a5605a84bfc MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304 diff --git a/dev-games/ogre/files/ogre-1.6.5-as-needed.patch b/dev-games/ogre/files/ogre-1.6.5-as-needed.patch new file mode 100644 index 000000000000..11ccb571776a --- /dev/null +++ b/dev-games/ogre/files/ogre-1.6.5-as-needed.patch @@ -0,0 +1,11 @@ +--- acinclude.m4.orig 2008-04-09 17:49:30.848987000 +0100 ++++ acinclude.m4 2008-04-09 17:53:25.652068359 +0100 +@@ -340,7 +340,7 @@ + * --disable-cg to this configure script but this is highly * + * discouraged as this breaks many of the examples. * + ****************************************************************]) +- ) ++ ,-Xlinker --no-as-needed -lstdc++) + fi + + AM_CONDITIONAL(BUILD_CGPLUGIN, test x$build_cg = xyes) diff --git a/dev-games/ogre/ogre-1.6.5.ebuild b/dev-games/ogre/ogre-1.6.5.ebuild index 147093964a5f..a51260d7ecbf 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.7 2010/10/15 17:44:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.8 2010/12/01 17:22:21 mr_bones_ Exp $ EAPI=2 inherit multilib eutils autotools flag-o-matic @@ -51,7 +51,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-boost.patch \ "${FILESDIR}"/${P}-automake.patch \ "${FILESDIR}"/${P}-cegui.patch \ - "${FILESDIR}"/${PN}-1.4.9-as-needed.patch + "${FILESDIR}"/${P}-as-needed.patch eautoreconf } |