Fix boost-1.48 compilation issue (bug 407433, c bou)

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 55 insertions, 9 deletions

diff --git a/dev-games/simgear/ChangeLog b/dev-games/simgear/ChangeLog
index b7c823c7db66..5fe5a29199b9 100644
--- a/dev-games/simgear/ChangeLog
+++ b/dev-games/simgear/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/simgear
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.49 2012/04/06 10:48:32 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/ChangeLog,v 1.50 2012/07/09 15:08:17 xmw Exp $
+
+  09 Jul 2012; Michael Weber <xmw@gentoo.org>
+  +files/simgear-2.4.0-boost148.patch, simgear-2.4.0.ebuild:
+  Fix boost-1.48 compilation issue (bug 407433, c bou)
 
   06 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> simgear-2.4.0.ebuild:
   x86 stable, see bug 405665
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index f7e3ea94ed76..bb8f0810646e 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX simgear-1.9.1-gcc44.patch 270 SHA256 6ff75cc54cc6f86d9e9653ce5954265046969b434aa499a78036c750ba305d8f SHA512 4b01fdf06b0bb38405a448da57b1b4c52804f54254b51e74ad530ed5b120be6ada475762009dc8d08a8eee7a350ece404014241cabbc728ffbd0e3cc653c18d8 WHIRLPOOL 8f1255b2dd01a06479ad0864898be23a3f424cac20b0294f3c107618a9feaa36b6bc9a8dbab39acb063ab43dd6b9d2ca29da4388bbc4d0b4707ac42933762cf8
+AUX simgear-2.4.0-boost148.patch 899 SHA256 9db85232807d0746d781579441d8cdcaa07c00dbf738f784261fdcccc1b950d6 SHA512 b46e0f3b27cd2e3eefc00d52a5f71f0fa02e37b5a424d5a270fac19bd8fa11fc5a49ea9c649343c386368195dbb83d59db3668212ce61f0352e7ddf274c23a9a WHIRLPOOL 9a09764f66e8ca9a7154b16633fbdd18de3cbf77d7bacd836a68b8f4dbc30ef7b9ef073d7c1980df399643aa765efa226b1d6872c46bc27ccf01f255e12eb838
 DIST SimGear-1.9.1.tar.gz 851327 SHA256 ba9014ad08594730db388cfe9ba9f59c82cd81b4e8bc91e2c254f5b47afcfa6a SHA512 c22a1b6d39d619fa573c924b688eff859b6aeff682d0b0d912d052c98cabc78cd780fd57107f91b2f6a2ff9d934c6de6c02bc4f39f6af018c74c19bd5e1c30dc WHIRLPOOL 2b75739eba85c5d517d04da0036c13f954a02134f163237b40a01f212946efe4156247cac8d6352f3ad2efd163023024cdce67932502c92855cdabb9b7fb9bb9
 DIST SimGear-2.0.0.tar.gz 1058343 SHA256 a55847b8aefdeabb511b761a2a39290b36b841b22e813d62217cd32c7351d121 SHA512 71c2ec01ab72c663bcffd273250c87d3bbe73cd8197c1483beb209b885960d6020e478c2a059b97710b732bd3506fe9c4b749d09d87378ddff13e29ec25beaca WHIRLPOOL 6ee9f1972a4d444ba63aeaf6ffb087590bf5331b323b8122ba7c418c6c4557b61ced01bcb1f68cbcafd47ce6d2254286fc89e7dd253be301cc74a72605b7351d
 DIST simgear-2.4.0.tar.bz2 834501 SHA256 e26007ed015e75a61e140e3ab6a446d8163ea3cfd2baeaa763355db0be4dddf6 SHA512 edd764d7304a595361db1bdfd68e7e3314f8e9d7198f71792ca7976d953d13123d5e92dec8b3295134bf56b01cfb198b1f867a6f93cb56b947db72597e841414 WHIRLPOOL b0c65c2e1412b7182f9fe33cf3bcfb58e93524efa80064792ae302df9a95412b1b6aa0a4c19db72e98dc431307954a1168ed865d44adbcc44db324788892df94
 EBUILD simgear-1.9.1.ebuild 814 SHA256 3af18ab7782abaf4ce641818d00c453ce7c45b0c15509a904f590fc65625eb4f SHA512 f4b1a25098ebd8422ee5c587109853d8857cd35e63dbc8524cff47acff6f7e2cdc3c4c85f18c4aff9e824c3498675f1589af2269dafe0e859f605f6fb0991787 WHIRLPOOL 749023544b095a4756a119e6f30a0f2c57f652c346961b66c31fde641507a7f94fa7e31c9b01dab4e7fdb00e464e0bbcc081eb88b7f636c82015b32b9c964149
 EBUILD simgear-2.0.0.ebuild 807 SHA256 623fcf7daf0b5bc2103e343a9951ec6fb42963ccbdc4d859396a1c4dd67dc897 SHA512 ebc309b0e53a3263d2c99e29592b242b1faaa9f6b3ba03160e937b3edc97d05d4e860c5c149b1f6c4da49447aa16782294570dea49437484747e77d711a0d22c WHIRLPOOL 8f4ff8209fc5873761c477369680c6249f01d04767e58e89f4657cd61b16151c64876e30789303306c2d830c078b53ccd060ffa27fe1e97fa752c3ad3bcd40b2
-EBUILD simgear-2.4.0.ebuild 833 SHA256 ddf3c2683e3dc0968b7e5096706278df8872c9aae34235c6fc03851bf149c6db SHA512 a20c22d0e28a0c3caba69d5f05cf0493e37e731ea37f4f94ab35497153e6c6e93a067b7d208fb6d7d772d31c4b994da9925c20cdd0c4dc6cf49e68c0d335a4b8 WHIRLPOOL 7217958dabf63b432640b2d4a04106e665e4cd19b70f0cc2f883e467bfd068eab728dce5847fa0df7359f05167f22d05adabd7a6ed018e9cc13ad0cbc705c7f2
-MISC ChangeLog 7974 SHA256 a6a616f4afdfca9cea9d0b5b6688122e72dab5ca1f9236e412319a03853fcf9e SHA512 078f1e769cc6b5955d2fa33850daace341a15a3fb24efca1f97dea086c0311e9542e259edd7c213eb7e952e8104134f5824ab9c6e0eba6422929f442294b2029 WHIRLPOOL a42b1edd12f2251677e3b6190ee4fadaeb2c4eb0b4d3e0f5e056aaba9b9b7ced3c87afddddb9216da11f105cccec523d130908b2062f518a7719294a1248c8d0
+EBUILD simgear-2.4.0.ebuild 892 SHA256 38528bff4fc29dc8ffd863dd92edc2a4cd360f4cefd90065b052708910cdb799 SHA512 514bf6a068582b54684bf109b0e4de6ed1e739019ab6755f15f80fed54515ee1ddfe343b9f2933e31b8b533de37b5450deedf8f482d896ea837e24c3e3711219 WHIRLPOOL 1d36636c2b8666e893f8d0af9a4efe69d4db42599092d4b2e0bd5f29ba63296cd94707c4eecf2c2d036a59ca3b574d5d7582e788e59d79f8427930d487816d6a
+MISC ChangeLog 8131 SHA256 94163f148bbed43a27e8447f49736721fbfd386f1ac4a57e8bceff4d3ee865b0 SHA512 2393a46d641f55f28f9493e745310666cfce153b9fc8a4165d2520764e5d06a617ba048459579627c3ae7484149c83688c5bf60acb893836ed91523b08aada1f WHIRLPOOL 8041811cd724d2df77a7fb9e711223c4ffa4fdc9dc304c0be339c04ea60e7ba7d92fa911cb2b8fb28ecd5fad6e5c4374271c568fb3a19bab0b2033b7120c035c
 MISC metadata.xml 632 SHA256 adc03add5cc88a06d5e31503860b2c12a4ca7269465252a78ef1372880dbcc9d SHA512 1ae66b7599b69c0c2ad9eebc2bbb7edb41ca319c8bc2d45043fda7ab59f001143446195fe6120e25e6be5cf6f904dc21aeaeec78085b0e266845e2caaaeec4bb WHIRLPOOL ea3346ea9945c101878de067f2a9545b5241100006fdcdcb3617db995e744e65b98fab59f0538ccb6f7185517e0db4c56c49d536a5e23ec36a151df78acc1e75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAk/6860ACgkQknrdDGLu8JCruwD5ASafwWeQBFWkVFbQdQ0wuYou
+yoDIV70aRsnPUByMk8wA/jPPC/OKfTTNgTjYat6pKNb59qmFyOlcwnFPnjUNCF4y
+=pvKY
+-----END PGP SIGNATURE-----
diff --git a/dev-games/simgear/files/simgear-2.4.0-boost148.patch b/dev-games/simgear/files/simgear-2.4.0-boost148.patch
new file mode 100644
index 000000000000..a8b1aacc9cc3
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2.4.0-boost148.patch
@@ -0,0 +1,29 @@
+--- simgear-2.4.0/simgear/structure/Singleton.hxx
++++ simgear-2.4.0/simgear/structure/Singleton.hxx
+@@ -1,7 +1,7 @@
+ #ifndef SIMGEAR_SINGLETON_HXX
+ #define SIMGEAR_SINGLETON_HXX 1
+ 
+-#include <boost/pool/detail/singleton.hpp>
++#include "boost/thread/detail/singleton.hpp"
+ 
+ #include <osg/Referenced>
+ #include <osg/ref_ptr>
+@@ -22,7 +22,7 @@
+     static Class* instance()
+     {
+         Class& singleton
+-            = boost::details::pool::singleton_default<Class>::instance();
++            = boost::detail::thread::singleton<Class>::instance();
+         return &singleton;
+     }
+ };
+@@ -38,7 +38,7 @@
+     static RefClass* instance()
+     {
+         SingletonRefPtr& singleton
+-            = boost::details::pool::singleton_default<SingletonRefPtr>::instance();
++            = boost::detail::thread::singleton<SingletonRefPtr>::instance();
+         return singleton.ptr.get();
+     }
+ private:
diff --git a/dev-games/simgear/simgear-2.4.0.ebuild b/dev-games/simgear/simgear-2.4.0.ebuild
index 486d01c63f8f..c109d9afeed0 100644
--- a/dev-games/simgear/simgear-2.4.0.ebuild
+++ b/dev-games/simgear/simgear-2.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.4.0.ebuild,v 1.3 2012/04/06 10:48:32 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/simgear/simgear-2.4.0.ebuild,v 1.4 2012/07/09 15:08:17 xmw Exp $
 
 EAPI=4
 
-inherit autotools-utils
+inherit autotools-utils eutils
 
 DESCRIPTION="Development library for simulation games"
 HOMEPAGE="http://www.simgear.org/"
@@ -17,18 +17,20 @@ IUSE="debug"
 
 RESTRICT="test"
 
-RDEPEND="
-	>=dev-games/openscenegraph-3.0.1
+RDEPEND=">=dev-games/openscenegraph-3.0.1
 	>=dev-libs/boost-1.37
 	dev-vcs/subversion
 	media-libs/freealut
 	media-libs/openal
-	>=media-libs/plib-1.8.5
-"
+	>=media-libs/plib-1.8.5"
 DEPEND="${RDEPEND}"
 
 DOCS=(AUTHORS NEWS TODO)
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-boost148.patch
+}
+
 src_configure() {
 	myeconfargs=(
 		--with-jpeg-factory