fix build with gcc 4.7, bug #425274

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 62 insertions, 11 deletions

diff --git a/media-libs/raul/ChangeLog b/media-libs/raul/ChangeLog
index 09b1def7e68e..a4d43d46b2f4 100644
--- a/media-libs/raul/ChangeLog
+++ b/media-libs/raul/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/raul
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/ChangeLog,v 1.16 2012/06/01 20:54:57 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/ChangeLog,v 1.17 2012/11/24 14:36:49 aballier Exp $
+
+  24 Nov 2012; Alexis Ballier <aballier@gentoo.org> raul-0.8.0.ebuild,
+  +files/raul-0.8.0-gcc47.patch:
+  fix build with gcc 4.7, bug #425274
 
   01 Jun 2012; Ian Stakenvicius <axs@gentoo.org> -raul-0.5.1.ebuild,
   -files/raul-0.5.1-gcc44.patch, -raul-0.6.0.ebuild, -raul-0.7.0.ebuild,
diff --git a/media-libs/raul/Manifest b/media-libs/raul/Manifest
index 9ca6d4fa67dd..a1cb1badb4e5 100644
--- a/media-libs/raul/Manifest
+++ b/media-libs/raul/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ldconfig2.patch 366 RMD160 429931a83b8bb3149e042dfdabb44c31bbcac3d4 SHA1 4b826b09df5373aaa5ce1be0991328291864dd69 SHA256 fe47d16cec0c9bee90a2b9d125305753567e290de22ccaa36f1259618a70bcd2
-DIST raul-0.8.0.tar.bz2 155450 RMD160 a80d50057596a0abc38ef72a95b3895dec72aa6e SHA1 8c93557447967b7fea934003613a8c54ee503870 SHA256 0b35cd7bb6fb0b1ca0340be07678a2561888572c96cf4e4da4d8f4c03a20ba26
-EBUILD raul-0.8.0.ebuild 1259 RMD160 eeeb30b06d338ac475dc5dd86c8a35a6a727ae10 SHA1 3cecd5c112b2c4cbc1e45cb3078f8274b0561222 SHA256 325a63c2acee41b15927b32a05882056d099ff0e6344afa4d6c6419f22509c86
-MISC ChangeLog 2433 RMD160 a1fda94041113608ce84d75b248aded6b77b63b9 SHA1 3c390942c3f3bdfc9967604a08003dae008c1f6e SHA256 2c31ba6d034462456eb6b76183414d1d6d5a7cf7c67f6786c687b2f0fde9081f
-MISC metadata.xml 321 RMD160 0fc4ae9547124ca7a8b3b162810c37af89202efe SHA1 ee9300170040dcd38a4d6d5da83e35872af1085b SHA256 4a9071c58dff9396449851c754d7da9efe85be74b0f86d05af15e36a06489130
+AUX ldconfig2.patch 366 SHA256 fe47d16cec0c9bee90a2b9d125305753567e290de22ccaa36f1259618a70bcd2 SHA512 008c6699afadc123139e66736588f83612a9d301870726178782a58807951f2231891e4968ce83d6eb72f38388e2e8df78deec25a352d754a801b63b2541775e WHIRLPOOL 61445a8a421dedf1d1d5550883644eb916d65a19a315f8fbce74bd61616e6ea7e6ea96395a6ae3685871f8c78668cda414f1463e92ad31a5151cd4cc65db30f7
+AUX raul-0.8.0-gcc47.patch 1466 SHA256 c095cf92edf24848eace08bc7bb9d02f82baeef1c5334d276d4e69ab878d2e5a SHA512 6056c680136bade273cf5b061591556b6f1e6d0045b6afc6b3f950e9a37def4a22356d45dccea52a29bd6b9c455744ac60ba51cccabb5965fdc31c67452344b7 WHIRLPOOL db2e33d4856c3a303ed2a233d5448c2544aa8b53d3fc0f122699fa224c97b618e91435d76a69bd628faeb4bbd6efb64dca4781856a4035a6f8dc6e77f64e8a6d
+DIST raul-0.8.0.tar.bz2 155450 SHA256 0b35cd7bb6fb0b1ca0340be07678a2561888572c96cf4e4da4d8f4c03a20ba26 SHA512 7ad48c551945aad104309448bcdb86a4a2ca07c44af53b37492e7cddce6a093529f1e1e75c4b27cb8e292ec46424969cdea270883d44b2f1badc48df8943a0a1 WHIRLPOOL b63cf7eef4de032ef26f2f2bef46543cd2d3b691e8bbdc4dd105feaae02c589525382b9155f4e9faa1c10ae7ae89baf0fe3878c57a1a10b969740804b67cef4a
+EBUILD raul-0.8.0.ebuild 1303 SHA256 7141a69b27c21076dae979d9cc8ddd3193106d0890d5745e90c136574b0632b7 SHA512 935ff8bfcde65f57e725158b33449b1deb851129ae1f15ec86bcfd493a0ff1ba0d4b09fd561f2c93547b8f710fea84da998d1b5173b9f9c26750593695ed21e4 WHIRLPOOL 52b88826d32e18403e1d25b2f3bd9be712d6d06d69a69b2feafc3e355fbac3978c4bb3830bf22583f982a3cea045fbf84e29caba486d51e16ed88b611bc32bff
+MISC ChangeLog 2581 SHA256 3a0769ce92261d60b4fa0a32940d85a6480ee77fc26e1098f773b30345890352 SHA512 b270918f2e94c59c5d1aaff6299d9fbd5b15a8a50eee02b13b20e6139c040f5c4d8dac67f78ecb0023328d45b073e226a436b0114f90aefa529a59881ec05f65 WHIRLPOOL 46cd788a13cfc644f0d132abc4f7a6f52b7b6a67dc3301651da2af6486f3d49737b4504ab03bb0339ef41325ab19aa8f09270e1b0a795c555a8d5c447162be0e
+MISC metadata.xml 321 SHA256 4a9071c58dff9396449851c754d7da9efe85be74b0f86d05af15e36a06489130 SHA512 893f7d8c73acd55ab9930c9b9020495cca7ba9cf5b93558b1df1d75cd99a774d677d2808943bbddf07462daa182548dfe4fb53018c670dc806dba70b66f2f080 WHIRLPOOL 11ff6f7d34afa30a77ffd8df477d5b99583c9aab3129daec966a8425ff6fcdcb173fa624ce0676dfe567d16e9129fdf44dfb678fc92cbb700551034aed78be74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/JLE4ACgkQ2ugaI38ACPA0mwD9GAkoYHuB9LZvTpj33prv7W7b
-LbxChGORxApzB0lLO+oBAJrBE2rffMayRFNcPZuCgKTFVC326eYpSC3eUcGduKN/
-=JJ5c
+iEYEAREIAAYFAlCw24IACgkQvFcC4BYPU0q1vwCeKni+y+u8BXLapSLK5PATXWBV
+zGQAoJ24hxVtGYzxNRi+lpceMneK/GzN
+=Tjvd
 -----END PGP SIGNATURE-----
diff --git a/media-libs/raul/files/raul-0.8.0-gcc47.patch b/media-libs/raul/files/raul-0.8.0-gcc47.patch
new file mode 100644
index 000000000000..c9cb2d080931
--- /dev/null
+++ b/media-libs/raul/files/raul-0.8.0-gcc47.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/show_bug.cgi?id=425274
+Build with gcc 4.7
+
+Index: raul-0.8.0/raul/PathTable.hpp
+===================================================================
+--- raul-0.8.0.orig/raul/PathTable.hpp
++++ raul-0.8.0/raul/PathTable.hpp
+@@ -37,13 +37,13 @@ public:
+ 	typename Table<Path, T>::iterator find_descendants_end(
+ 			typename Table<Path, T>::iterator parent)
+ 	{
+-		return find_range_end(parent, &Path::descendant_comparator);
++		return this->find_range_end(parent, &Path::descendant_comparator);
+ 	}
+ 
+ 	typename Table<Path, T>::const_iterator find_descendants_end(
+ 			typename Table<Path, T>::const_iterator parent) const
+ 	{
+-		return find_range_end(parent, &Path::descendant_comparator);
++		return this->find_range_end(parent, &Path::descendant_comparator);
+ 	}
+ };
+ 
+Index: raul-0.8.0/raul/TableImpl.hpp
+===================================================================
+--- raul-0.8.0.orig/raul/TableImpl.hpp
++++ raul-0.8.0/raul/TableImpl.hpp
+@@ -249,7 +249,7 @@ Table<K, T>::cram(const Table<K,T>& rang
+ 	assert(is_sorted());
+ #endif
+ 
+-	return make_pair(iterator(*this, insert_index), true);
++	return std::make_pair(iterator(*this, insert_index), true);
+ }
+ 
+ 
+@@ -339,7 +339,7 @@ Table<K, T>::operator[](const K& key)
+ 	if (i != end()) {
+ 		return i->second;
+ 	} else {
+-		std::pair<iterator,bool> ret = insert(make_pair(key, T()));
++		std::pair<iterator,bool> ret = insert(std::make_pair(key, T()));
+ 		return ret.first->second;
+ 	}
+ }
diff --git a/media-libs/raul/raul-0.8.0.ebuild b/media-libs/raul/raul-0.8.0.ebuild
index bd3c9ad91adf..6cb738e58b8b 100644
--- a/media-libs/raul/raul-0.8.0.ebuild
+++ b/media-libs/raul/raul-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/raul-0.8.0.ebuild,v 1.5 2012/06/01 20:25:07 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/raul-0.8.0.ebuild,v 1.6 2012/11/24 14:36:49 aballier Exp $
 
 EAPI=4
 
@@ -31,6 +31,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/ldconfig2.patch"
+	epatch "${FILESDIR}/${P}-gcc47.patch"
 }
 
 src_configure() {