add upstream patch to support building against latest boost (bug #422769)

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

4 files changed, 64 insertions, 5 deletions

diff --git a/games-engines/scummvm-tools/ChangeLog b/games-engines/scummvm-tools/ChangeLog
index 45964ace7a50..cb3d627cc287 100644
--- a/games-engines/scummvm-tools/ChangeLog
+++ b/games-engines/scummvm-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/scummvm-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/ChangeLog,v 1.56 2012/11/01 14:53:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/ChangeLog,v 1.57 2012/11/04 04:31:47 mr_bones_ Exp $
+
+  04 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scummvm-tools-1.4.0-boost.patch, scummvm-tools-1.4.0.ebuild:
+  add upstream patch to support building against latest boost (bug #422769)
 
   01 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
   -scummvm-tools-1.3.0.ebuild:
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 89d43b0e6ea0..e3b9a3829c5f 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1,4 +1,5 @@
+AUX scummvm-tools-1.4.0-boost.patch 1631 SHA256 b5758a60d0ff6c79767ae8b560cb60acf61a15ce443efb47fc50744d50760558 SHA512 d35aee983e6896dc322e044fd0fa2cbc3ae36e90bf3d70a8220262e8b232a7d2b99ed8b5516e456bbb3883b865281ddd3d41bc0334c3a5dd4d63fb9e7d2bbb54 WHIRLPOOL 77bdb14167a34ca0c24df133fdbbe03fc38d871e2b0d5e8778b2e20f9edf79ca3d5010b1c9a0db5beedc71974597f48668594d68d99dc92874e2245d5cfbee65
 DIST scummvm-tools-1.4.0.tar.bz2 943697 SHA256 d19abf4424691ba20321369d6d91f20ace80c2166e7f11fd5f62e1eb7416d30c SHA512 0997bf4f7cea27af6fd8821303fc08029cb6c57d4291eede9b7e2bcddff3512c101f886b1b776217b231efd12a6828593a592915690ea724f33348345bdff0a4 WHIRLPOOL 22f2f99a2b9ad27eb6bd2438c763f2cfd23252a9cc3be7fd975a970dbf370e8ff348c2d7360b42e1bc0f03adb270bdc8d283106c1545c283b56f20882bf37295
-EBUILD scummvm-tools-1.4.0.ebuild 2037 SHA256 dbae002e8b6650207ec33bc47d4dfa2ed99fb8f6e29762e15dcea9a6019c4f72 SHA512 987e83db09d9c9c27f12d53c3b96fe1afc3143a5cd933eab6d10a29506719ee3bd0569d9f375e8fd181f9a22a556180979554233b48aa27005739c2f6fdc635f WHIRLPOOL e7d46e52aa1d4d37cb10659557e741914b7ef55a796f0810a329e66b6b3730af2c6615fcf90df4a01c9516a52cbbb17940b5389151bdc3f1a4dd9c7ae92a02f2
-MISC ChangeLog 7438 SHA256 1aee5096e217fd43b0828bbed32d0a5fb52764d771bec1d533865d11ecde2737 SHA512 7f4260892455b4ea7b37af6e25c51a8b1ee5f16fb569df6ed5d969179078540f74d52ee98ce196a21ac4f1529df1a33f0e9a36c61308d3af8014a7b3f834ba30 WHIRLPOOL 2710780937f4d5f67ed9c0da2dbe94e90117df674e570555bd5c0e97bdfb7260287f9f61c4634546a1100566c4573f30002ee26ff319a1f012a8edddcebe5500
+EBUILD scummvm-tools-1.4.0.ebuild 2083 SHA256 7df66ce8763f48ea7f81a7d607c6d49dcd70b2b131c8abf37ff43c5e0a3db3c9 SHA512 b731955bee2194a4624f3153f6e65b153bd001915c0e455c25b788795c82e6e3e8fe4a723d82f348b8cc23b49c06a8d72ac8fb720e1f189c0d7623a9c82e7733 WHIRLPOOL 8e7e49a5cb4e02477f1bd3399964c65ffe35cb61bf5b71bf4f497bc307d05f43b2133bd0a02838106c0c80809cd54cb72f3a5522044d17de5f7b6e7749d59634
+MISC ChangeLog 7640 SHA256 e7a19f16dc42e8ca655cc0d631631c09a051e9a731155a97091fb1a49b224b7a SHA512 781c2e38c5048cc6a706387bcfaae3547ffa4c49b765b06c06807427c710fb098869e47ea00cd49a430044c8c7e69bd81c3d18c549b0cf23b7374c0fd1d17f4c WHIRLPOOL a8f9d16145c945ef331da1ba6411ea15b77445c68c66e6692d3109990d5caf14e79bb30178c43c9ecd0d6e061e17a009f9cab27cc8ada14e8919c25b40aecd7d
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch b/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch
new file mode 100644
index 000000000000..d492e194d3c5
--- /dev/null
+++ b/games-engines/scummvm-tools/files/scummvm-tools-1.4.0-boost.patch
@@ -0,0 +1,53 @@
+From 36cb68919303bc2b874a5faa879e269a35874eff Mon Sep 17 00:00:00 2001
+From: Johannes Schickel <lordhoto@scummvm.org>
+Date: Sat, 3 Nov 2012 21:57:08 +0100
+Subject: [PATCH] TOOLS: Fix decompiler compilation with gcc 4.7.
+
+---
+ decompiler/refcounted.h |   10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/decompiler/refcounted.h b/decompiler/refcounted.h
+index a496ff7..f4d9020 100644
+--- a/decompiler/refcounted.h
++++ b/decompiler/refcounted.h
+@@ -25,10 +25,8 @@
+ 
+ class RefCounted;
+ 
+-namespace boost {
+ inline void intrusive_ptr_add_ref(RefCounted *p);
+ inline void intrusive_ptr_release(RefCounted *p);
+-} // End of namespace boost
+ 
+ /**
+  * Provides a base implementation of reference counting for use with boost::intrusive_ptr.
+@@ -36,16 +34,14 @@
+ class RefCounted {
+ private:
+ 	long _refCount; ///< Reference count used for boost::intrusive_ptr.
+-	friend void ::boost::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
+-	friend void ::boost::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
++	friend void ::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods.
++	friend void ::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods.
+ 
+ protected:
+ 	RefCounted() : _refCount(0) { }
+ 	virtual ~RefCounted() { }
+ };
+ 
+-namespace boost {
+-
+ /**
+  * Add a reference to a pointer.
+  */
+@@ -61,6 +57,4 @@ inline void intrusive_ptr_release(RefCounted *p) {
+ 		delete p;
+ }
+ 
+-} // End of namespace boost
+-
+ #endif
+-- 
+1.7.10
+
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild
index f0176ecdebd3..b179124f7761 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.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/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild,v 1.7 2012/11/01 14:58:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm-tools/scummvm-tools-1.4.0.ebuild,v 1.8 2012/11/04 04:31:47 mr_bones_ Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
-inherit wxwidgets flag-o-matic games
+inherit wxwidgets eutils flag-o-matic games
 
 DESCRIPTION="utilities for the SCUMM game engine"
 HOMEPAGE="http://scummvm.sourceforge.net/"
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/_/}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-boost.patch
 	rm -rf *.bat dists/win32
 	# use $T instead of /tmp - bug #402459
 	sed -i \