Fix building with gcc4.7 wrt #414133 by David Kredba <nheghathivhistha@gmail.com>

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 51 insertions, 19 deletions

diff --git a/dev-libs/zthread/ChangeLog b/dev-libs/zthread/ChangeLog
index 6c3506b8d980..f6a49626c1e5 100644
--- a/dev-libs/zthread/ChangeLog
+++ b/dev-libs/zthread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/zthread
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.31 2012/01/13 03:23:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.32 2012/06/23 11:48:56 xarthisius Exp $
+
+  23 Jun 2012; Kacper Kowalik <xarthisius.kk@gmail.com>
+  +files/zthread-2.3.2-gcc47.patch, zthread-2.3.2-r2.ebuild:
+  Fix building with gcc4.7 wrt #414133 by David Kredba
+  <nheghathivhistha@gmail.com>
 
 *zthread-2.3.2-r2 (13 Jan 2012)
 
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index 29362c8a2a34..7fc4fe319b71 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX zthread-2.3.2-automake.patch 1287 RMD160 be59e22327c783766327eab32146b6f2c92f3e9a SHA1 7e0c0200772b1a2d552684314dbfa3efa288a171 SHA256 9df40b2532e2cb3e59ef884ac20b63d5de43b141fd12263db3cda138ff92d470
+AUX zthread-2.3.2-gcc47.patch 704 RMD160 16a736b531fd4e2f6c0e284b99d1ce5ab5ac9c2d SHA1 c3c9fa702cd810aa94413742de1cd4a53d279bd2 SHA256 9a9d5f64545ce9b74d8577e06da60c72563c593b98748063c07c312183f6c0fa
 AUX zthread-2.3.2-m4-quote.patch 554 RMD160 7b619cb2c00ceb210194ec68c9e9099663df6b9b SHA1 b86b597b22ff628c34236a0cec36e713a125429b SHA256 6ef0a0732917e46102b02ac7bbcfa69eed7eba340816d2526ba21de023c730ce
 AUX zthread-2.3.2-no-fpermissive.diff 2010 RMD160 0a40511669b688f34f18423e2529e00a1022ee36 SHA1 82a67e151c8a41c178392c2560a1abc485aee58b SHA256 f1f37cffbff4c3dd825ff482b80686672902b817529519851f1b554d50ce29d3
 DIST ZThread-2.3.2.tar.gz 412527 RMD160 8419afad91ea8db1fff7ce3bf7784329839dd2e8 SHA1 574902824cbb1830d70e049a1cd7b684a6919815 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854
 EBUILD zthread-2.3.2-r1.ebuild 1365 RMD160 6c91b0ef6ff59a78ec1946a108047c5211dc861a SHA1 48869ed06b76c3d540b2e25f35a61cbf4e22782b SHA256 9698029a1c82895ffaa8f30a2df4822b14870c17908f85a80c9b3dd8cafd3cd8
-EBUILD zthread-2.3.2-r2.ebuild 1533 RMD160 d7f2f2727ef90af7cd84e46e318ac2c8e40e9a91 SHA1 850a082077d8b27f35a5f4f2d080928f8494920b SHA256 7c9b2ca2272b930cdb62d2ae5e12dab3e964c7db774a5c53987223a4ae7f78be
-MISC ChangeLog 4637 RMD160 4d7e1a7dfee4b29c8885f13bcc9637eae1f6fec1 SHA1 078be11e59228d71c92834e67dff778d51a8e314 SHA256 26d8436ddd1c8d15aa87ff8603d114c930bf3a335461811184f83197bfbbf4a9
+EBUILD zthread-2.3.2-r2.ebuild 1576 RMD160 9254c3b23e0f74c2fa998b3c59fd07ba807100dc SHA1 061ec6b391267359d95e3d4595b12c73203330b6 SHA256 49804b4f76f723355c3160249bcbb9e7137d86d528407c0049832aa8ee489fb0
+MISC ChangeLog 4845 RMD160 13051b1977669397b763a4a64719b82a5a1f3b01 SHA1 6c59ba517dd5e48fdd8548df945cb8cb8df0e85e SHA256 cd598d054cbbfef2fba985afe13a52d91f68e4946fc3246e1cae5f66d2414644
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPD6OnAAoJELEHsLL7fEFWjPAP/jWvAVJhCLQwKCfTHq2SZicN
-Ee78RB4KJt9fbSAxP2CBGMWqz7vVQhkPsXxdxLhuu+M0KJNUwvKfJRujMKCXYNEk
-+cIYUY2/DOvRNjSXDH/hZ6QwEQIigUuX9Oehrx1eLOKU6xuhdE5y11M/UZJVupY+
-7f7Gb+6iMjqGqtintidPkSNtn9xybYsStrqsrzxsfQPy6FkJ+u1Q5sEXVEMarzOf
-sELxRO3jjcsEVKpd6tHw7Rf71GaLJ9xGc2CmGsI2JJwooiI2pJ53/8CDHe8Q6Sx5
-IVPO+CQnths7cu82NYR2jW0xf1OL7pa9U1lEhoCUFWicvdQQZofTnGJDKrBL+F79
-wNLYW5UttIhihn37JTVwc/vNpEWyQa7K3/pEIDXLCtpCK0l1vZuiJTxCRfTbsYpT
-+3X46SVzy7Z8uu2P2OJc9w7SkIO8EEl482CvwIasVRIKlskoG/MU10LJAzByM7vB
-IIVp+8KfK8Cwm4LqKjWLVKaAZKiMBUpJoHYiIXf1yoJ00jPbqk3clg8wHLGliyxO
-Zgk/owSl18Cm7C/bADm22Cbjx0MWBjlBW5z/iTPZCWktniZE9erDqpTApwk6tYvk
-8BvXvNzRVcrh80rIrbTVOdVTbMlQWSmWugdUMnhTZVyAibu/Dj88znPjDbBrxFPl
-3vHryGJ2DQIZIKqb8TSQ
-=3Tfq
+iQIcBAEBCAAGBQJP5a0xAAoJEF0huFKJUZL5ZWwP/3Y5LrWBRyU+1nkXipzFi7cC
+NuCXJpzD5HsnW8aAeMcg39zye4/Tq9tSIVCOZHzu22B2Sr7lNYvPQVwdXCr2Rm82
+Z4tER8ojnHWxRf1ZjB1deiRloCUnzVzNAs4NHkK4opZIGjlIfoUPyw1tbdSb9iPx
+2NWYLSCJKkml2rwvpgZTTfb/mW4BYyjVWnqQ9qLzUWMqQedHOdYNypObZZKKEpTO
+srz4BrqtUmm8DkmwOWNNWBZ5VKDLRCvgbk0sXY/HYRhjomSXdY9U8aoOLuygNUP4
+xhUgBaReYykVIu+Kz2LDcMAn6Fikq6t/ueWMoB2dRtPqh25UWcdOAPKO9LSR3f2Z
+5taKmYdog4rJ1OjCM0HsRh3vvFB3g26oyKnyndbGgqAnxUkOjvdS/wnoKiE/2qF+
+1WeqV+Hr+7S34uGllqlQb2OidOpb7WqDpupScoe45nQzPCGXyhC8XZXD6O0cg+wn
+ZfpHQbI8WUISii/jDF3ifHwZX/+ltDlajlofvaSV9yksirDdV+a1LZ+tQQpPdOV8
+klVW9T/yyfcfU72IlmZiysWS83ByXYFp7kYV4WQWnJcX4l6NagmchSZDYVwmn9m1
+bgHMlPzn/qmBK25FCRkCmBXah2zyNXfD1TR4gnalM80BG/rQYmWVHud/ZWPJrHAF
+gH32BnIckFzpBniRJRhA
+=df93
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch b/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch
new file mode 100644
index 000000000000..57b122d22c5f
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.2-gcc47.patch
@@ -0,0 +1,25 @@
+Description: Make sure to use qualified lookups.
+http://bugs.debian.org/667430
+https://bugs.gentoo.org/show_bug.cgi?id=414133
+
+Author: Cyril Brulebois <kibi@debian.org>
+--- a/include/zthread/Guard.h
++++ b/include/zthread/Guard.h
+@@ -428,7 +428,7 @@
+   template <class U, class V>
+   Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+ 
+-    LockingPolicy::shareScope(*this, extract(g));
++    LockingPolicy::shareScope(*this, this->extract(g));
+     
+   }
+ 
+@@ -458,7 +458,7 @@
+   template <class U, class V>
+   Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+ 
+-    LockingPolicy::transferScope(*this, extract(g));
++    LockingPolicy::transferScope(*this, this->extract(g));
+ 
+   }
+ 
diff --git a/dev-libs/zthread/zthread-2.3.2-r2.ebuild b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
index b531b620503f..143eff7ddcf4 100644
--- a/dev-libs/zthread/zthread-2.3.2-r2.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r2.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/dev-libs/zthread/zthread-2.3.2-r2.ebuild,v 1.1 2012/01/13 03:23:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.2-r2.ebuild,v 1.2 2012/06/23 11:48:56 xarthisius Exp $
 
 EAPI="4"
 
@@ -26,6 +26,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-fpermissive.diff
 	epatch "${FILESDIR}"/${P}-m4-quote.patch
 	epatch "${FILESDIR}"/${P}-automake.patch
+	epatch "${FILESDIR}"/${P}-gcc47.patch
 
 	AT_M4DIR="share" eautoreconf
 }