Fix via ChromiumOS from upstream for building with gcc-4.7.

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

4 files changed, 217 insertions, 12 deletions

diff --git a/dev-cpp/gmock/ChangeLog b/dev-cpp/gmock/ChangeLog
index 0dd52833ea55..39e19d458586 100644
--- a/dev-cpp/gmock/ChangeLog
+++ b/dev-cpp/gmock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gmock
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.6 2012/03/30 15:52:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.7 2012/05/30 20:03:47 vapier Exp $
+
+  30 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/gmock-1.4.0-gcc-4.7.patch, gmock-1.4.0.ebuild:
+  Fix via ChromiumOS from upstream for building with gcc-4.7.
 
 *gmock-1.6.0 (30 Mar 2012)
 
diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
index 52c32db308a6..78e8dd571c9d 100644
--- a/dev-cpp/gmock/Manifest
+++ b/dev-cpp/gmock/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX gmock-1.4.0-gcc-4.7.patch 6982 RMD160 4aefc5c2cf15a805e79fcc3504132fb9e47b265d SHA1 b73c66396f6a1a1de2d74a4c642cc9cc811be812 SHA256 851343d6d805abd5c03c91c9a6dd0dbcb7db99a60d8a87100025cd167fb5f01c
 DIST gmock-1.4.0.tar.bz2 946373 RMD160 9d43853f4abc650b8d8fe9984a6b4baddeea08ce SHA1 ecc8beec7004f36d8d4c0af5237381db4d640126 SHA256 21d37c154a7b8d7a8562b9dde82db7db0a6c188b985c4a18ff3413daae8caa8c
 DIST gmock-1.5.0.tar.bz2 1283432 RMD160 5b07d083aefa7b77614d2766570d3442f367c5dc SHA1 76d8f5a221c93105304d71e33391dc70af573d6a SHA256 d8689a51fbc13f55509f5842fe7d514839d9fd6092743d145304bc2824fc9197
 DIST gmock-1.6.0.zip 2053682 RMD160 e08ea01a82e119591eef9bab69629d0af247784f SHA1 4702e98af194d320a915f1e6d2532a32b280819e SHA256 341ad07c31c619ba32c88c2265bc23693da1df062f47f146a7ed340f646d82b7
-EBUILD gmock-1.4.0.ebuild 801 RMD160 83e3b21bd240de15228331999320938442113360 SHA1 61da8014410b453d77f8dca388854458f3121850 SHA256 fc75e0bebe17bd5d6eda163ed16e7e6453ce911b17e1d67dd3f11d351236b9bd
+EBUILD gmock-1.4.0.ebuild 854 RMD160 27786c9b57f4cf38e1cc83bf38dbd7ecaff249f6 SHA1 13c4f349210e06f83b7fa41a35bbe368303bc780 SHA256 9529b60c3171320b74b69b13e4ade114a132229e0ac361cc23ab87b4128356ab
 EBUILD gmock-1.5.0.ebuild 801 RMD160 7037fa0f619c7adae9765805830ff407e34b7185 SHA1 26ce30a7c8b583545835b9b41c9fe2bc2710e391 SHA256 c5358a643bd4ce9344b470b08f5691761c94bbffd31c3b78723345658b117b2f
 EBUILD gmock-1.6.0.ebuild 924 RMD160 c5c6b96ad6f5253eadf6e99ed984ba4e7fa63c00 SHA1 8bb2a20b7b1d72b9740b95c8d308682e22d0cb2a SHA256 c78fa7644033bab9ca5e873934280c77a38b7128c299dea806f6685aa05b7545
-MISC ChangeLog 995 RMD160 2e8b1bb5e180db16fa95090a9cc6fd4bbd9510ba SHA1 cd100921894634e0587984ebc759130fc35f6c60 SHA256 bc91fefb46e6e522d2ed1c227fcfca4d08af42730d17228e152b65d33636c3e5
+MISC ChangeLog 1164 RMD160 f349d78403904b9b75e7d0ae4d0d138d9f029e9d SHA1 8ac138adb06cfb9e7339a56982b5d3dab41c908a SHA256 7fa27b0857706790bb8eed7854f79848a3cbdc44ac6ed3eba95dc5b3bd6a35b4
 MISC metadata.xml 283 RMD160 a4a5852497f8c312964c9209d90ff96a36c1fd1a SHA1 9533752ec96e296d493d3761d19d020afd6c5bdb SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk93Q3QACgkQuUQtlDBCeQKJ1ACeLeJ4F5vSKBnsz4R16F9Fq3NH
-uMMAn2a4vM+Ii/4SpQ/FZgv68tpstENc
-=7+p3
+iQIcBAEBAgAGBQJPxn0qAAoJELEHsLL7fEFWftYQAMS6AH8qiLjm8u8+8eceQJgx
+81GWWTxSmlHYoafpP0AYYvyIemhjZg05TAyoASY/+gO2ZCqqDpuh8Jgz/fpxGQ+i
+8IGMKiQYAVZ7P3+73XATR73YPG+/hhrgBQRkVrpp5kxAcbOxMG9qu/oQJ/bcSEUj
+J/Hn00IG+qOp3zIcozCYMUt93FSiU3c2ohFcOVH3LpSpxaSjiI0E2B+Qgl6HQyR4
+uNOtjUWigWYGzHehTF1SEPDTc2ytgecnPC4XYhVe/KNlD0acMu0taSoq1X2+2lRm
+DMCvuvhJLgD118VdkX+aeQc3PlcrWaN344TSwZ6in/+TaV0P8fyihQCaJMMG2Ry1
+eFBw74VEugH3pTivE4QcARfy1BtQBv6UUDFFg/xBZ2qCshcpf2ixw8uBppzxBBcP
+Ptbs45/tsny+y3i6cCb53Av9R5WnBx6heQa1tVKZcLIRiSgvjeDcl0iFXObPS9Jo
+Fsw4aPQ9yUEbRSdziVphWYFToZ2adROKushBf5L6YCv3jZs1TkR8h4OSZW80Uru+
+LjxL1Z2mSWhDly55gP6k7Q8TxxDErn2wW8XWXuMKwm1XEEL33LarSWm9HR1TrQTU
+MrP0PIu491gTDEoT4yYK5yzKPqwTJ/bP/z4eXKGWm2Wmt0HU/CFD8xOsCXsyWBHy
+Znb/OKGFLlo7KTpRUiIg
+=Vf45
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gmock/files/gmock-1.4.0-gcc-4.7.patch b/dev-cpp/gmock/files/gmock-1.4.0-gcc-4.7.patch
new file mode 100644
index 000000000000..fa678220f2a1
--- /dev/null
+++ b/dev-cpp/gmock/files/gmock-1.4.0-gcc-4.7.patch
@@ -0,0 +1,189 @@
+taken from upstream repo
+
+Index: include/gmock/gmock-generated-function-mockers.h.pump
+===================================================================
+--- include/gmock/gmock-generated-function-mockers.h.pump	(revision 227)
++++ include/gmock/gmock-generated-function-mockers.h.pump	(revision 228)
+@@ -45,10 +45,6 @@ $var n = 10  $$ The maximum arity we sup
+ #include <gmock/internal/gmock-internal-utils.h>
+ 
+ namespace testing {
+-
+-template <typename F>
+-class MockSpec;
+-
+ namespace internal {
+ 
+ template <typename F>
+@@ -89,7 +85,11 @@ $if i >= 1 [[
+   }
+ 
+   R Invoke($Aas) {
+-    return InvokeWith(ArgumentTuple($as));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple($as));
+   }
+ };
+ 
+Index: include/gmock/gmock-generated-function-mockers.h
+===================================================================
+--- include/gmock/gmock-generated-function-mockers.h	(revision 227)
++++ include/gmock/gmock-generated-function-mockers.h	(revision 228)
+@@ -42,10 +42,6 @@
+ #include <gmock/internal/gmock-internal-utils.h>
+ 
+ namespace testing {
+-
+-template <typename F>
+-class MockSpec;
+-
+ namespace internal {
+ 
+ template <typename F>
+@@ -71,7 +67,11 @@ class FunctionMocker<R()> : public
+   }
+ 
+   R Invoke() {
+-    return InvokeWith(ArgumentTuple());
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple());
+   }
+ };
+ 
+@@ -88,7 +88,11 @@ class FunctionMocker<R(A1)> : public
+   }
+ 
+   R Invoke(A1 a1) {
+-    return InvokeWith(ArgumentTuple(a1));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1));
+   }
+ };
+ 
+@@ -105,7 +109,11 @@ class FunctionMocker<R(A1, A2)> : public
+   }
+ 
+   R Invoke(A1 a1, A2 a2) {
+-    return InvokeWith(ArgumentTuple(a1, a2));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2));
+   }
+ };
+ 
+@@ -123,7 +131,11 @@ class FunctionMocker<R(A1, A2, A3)> : pu
+   }
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3));
+   }
+ };
+ 
+@@ -141,7 +153,11 @@ class FunctionMocker<R(A1, A2, A3, A4)>
+   }
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3, A4 a4) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3, a4));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4));
+   }
+ };
+ 
+@@ -161,7 +177,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
+   }
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5));
+   }
+ };
+ 
+@@ -182,7 +202,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
+   }
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6));
+   }
+ };
+ 
+@@ -203,7 +227,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
+   }
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7));
+   }
+ };
+ 
+@@ -224,7 +252,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
+   }
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8));
+   }
+ };
+ 
+@@ -246,7 +278,11 @@ class FunctionMocker<R(A1, A2, A3, A4, A
+   }
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9));
+   }
+ };
+ 
+@@ -270,7 +306,12 @@ class FunctionMocker<R(A1, A2, A3, A4, A
+ 
+   R Invoke(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
+       A10 a10) {
+-    return InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10));
++    // Even though gcc and MSVC don't enforce it, 'this->' is required
++    // by the C++ standard [14.6.4] here, as the base class type is
++    // dependent on the template argument (and thus shouldn't be
++    // looked into when resolving InvokeWith).
++    return this->InvokeWith(ArgumentTuple(a1, a2, a3, a4, a5, a6, a7, a8, a9,
++        a10));
+   }
+ };
+ 
diff --git a/dev-cpp/gmock/gmock-1.4.0.ebuild b/dev-cpp/gmock/gmock-1.4.0.ebuild
index 3fe4fa8d3801..1777a2ee36b4 100644
--- a/dev-cpp/gmock/gmock-1.4.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.2 2011/11/11 20:35:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.3 2012/05/30 20:03:47 vapier Exp $
 
 EAPI="4"
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="Google's C++ mocking framework"
 HOMEPAGE="http://code.google.com/p/googlemock/"
@@ -25,6 +25,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
 	elibtoolize
 }
 
@@ -34,5 +35,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || find "${D}" -name '*.la' -delete
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
 }