Add another fix from upstream for building with gcc-4.7.

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

4 files changed, 167 insertions, 7 deletions

diff --git a/dev-cpp/gmock/ChangeLog b/dev-cpp/gmock/ChangeLog
index 7d8dd591caf1..7bfad2e4cb09 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.13 2012/08/24 09:23:27 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.14 2012/08/28 21:52:08 vapier Exp $
+
+  28 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/gmock-1.4.0-more-gcc-4.7.patch, gmock-1.4.0.ebuild:
+  Add another fix from upstream for building with gcc-4.7.
 
   24 Aug 2012; Michael Weber <xmw@gentoo.org> gmock-1.6.0.ebuild:
   ppc stable (bug 420853).
diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
index f4d59ec88391..4967f1683224 100644
--- a/dev-cpp/gmock/Manifest
+++ b/dev-cpp/gmock/Manifest
@@ -2,18 +2,29 @@
 Hash: SHA256
 
 AUX gmock-1.4.0-gcc-4.7.patch 6982 SHA256 851343d6d805abd5c03c91c9a6dd0dbcb7db99a60d8a87100025cd167fb5f01c SHA512 fca0b60fe1715613ca7ef6dfd2f1c65c0cbf97a39a4bb86a1396c3acf4a6d5d4a53876187a4888e268abbfe0e7098b6e6d8258563d41c09d1f7709f4034b7936 WHIRLPOOL b76ebbf677d96b6b3c9788c912ee28b8a58ba3cd3f01b6c122d92428288f4de89ec0f5edcc5ebd2c19ae6e7f9c4a577ea6a76cc90dea2b53e3ab8aea0254a25e
+AUX gmock-1.4.0-more-gcc-4.7.patch 5156 SHA256 be933382c5baf74eb3304c619c6f004635b5d92f36562bdf3af61b4b2f8e9600 SHA512 a09bb34261f9af7ec107e026b125d1351dca3d125ad212b382edffe6aae38fc6b9551484169eee58aa8becd8d594fdf36524b1a1bd65bf9911a4a27e946fa6e8 WHIRLPOOL 11000f315bde9f24e1f3b5fdf8faf2f9d42632cac0259dd6d022802c5b7adec8d73b8c8a4a86aa497499745629226626b31709ca85dff0222e22da2b06426fd1
 DIST gmock-1.4.0.tar.bz2 946373 SHA256 21d37c154a7b8d7a8562b9dde82db7db0a6c188b985c4a18ff3413daae8caa8c SHA512 df99aae44d23f4b0b4ce9ac24fde9e72508c9a915323dd07fb475c708953b79310c164141d085a04a9203b6abd759336d55a94979495f429c92f11bc4d1b038c WHIRLPOOL 7a4525a589770cd5de21c0b82a7b9a7219b3fcdef605e0b455dfff50bc87ff1432b3989cc7e0c08c42c68083e2618841a77d8afcf4ed51b3f55f09a5a64c4fb2
 DIST gmock-1.5.0.tar.bz2 1283432 SHA256 d8689a51fbc13f55509f5842fe7d514839d9fd6092743d145304bc2824fc9197 SHA512 b0a3897c801d14a9f59a07911fa77ae15ddae9bef6e2d818583ff0b5085d35507259c195b43a6fe25af70b4d2eee3796889ffcda91d16ce6e6e5b4e462196aa2 WHIRLPOOL f00854ebdece304006907ea2e3906fbe58578a7a3684d93eb8e9f2c26bd100f751878109d5fd13a31cf58463d759fc09c1b07c035107c127c19f572ff264fd76
 DIST gmock-1.6.0.zip 2053682 SHA256 341ad07c31c619ba32c88c2265bc23693da1df062f47f146a7ed340f646d82b7 SHA512 7adff00bb6ff81a6ffb704be71d0747636d69e24b4a8b709e1fb8c177a9a47f6dea8d14fde73034ebfb1529c291c7212a944ad92a34f88abdfe23c2d0b11b6f7 WHIRLPOOL 1a03ff8f2d96287f5deb24f970688f20f3480e77a4a71089ef1399a87f28f616bf0feaedc217e7ac1ca8ca1246e53f5d882f350704be111ae547961949939530
-EBUILD gmock-1.4.0.ebuild 854 SHA256 d6c194b5c85ae4c01e7b1dff097e115d451a1eccb2becb21854cc1a714d47b8a SHA512 4b0f19e1c680e7471da99832ad688385e516f30b544d8bdd721fcd24f31be6f06bd000b71eed1f1083215861e74eafa92d5c6fac2682e33910f4ea0a913df874 WHIRLPOOL 362a988a86f46554b97100074761ac3774fd0e8330252adf319886af9b5d4e2237d5b6adeeeec8588a0addecb2a2475c36d57443ad9f0484a375dfdcfcc97b3c
+EBUILD gmock-1.4.0.ebuild 900 SHA256 ac6459b47610fabc4a1976a27b813a5d60bc2ed94b053e0f0f95eaa9317f2919 SHA512 dc4bd30c218906d7a43798dc4393d6b9201328185d6dc5e5fa591ec44419b71814d759e9061b2b7125d1efb41e670e9680c6ccd50be1835e7ae496020a5b6d33 WHIRLPOOL ebec651a934b28ecc628f6abfb3ebea8442b2eb572b5cd4cfafd86f1286454afff51de5260f0d5afe75253a52788b08253af08d7274283df52a7e9bef0b0b89c
 EBUILD gmock-1.5.0.ebuild 801 SHA256 da8e3eb98f7fc07b8909373b612700c8a861c5c92bb48ee27c5addf787848657 SHA512 d1813c15ecc635418c859f69ba49c4ff401daf56bef042d9d8e8abc1f072421af04579f0aea4e4ad6c650b60aaa2f1ccea65bd295a298f0cce5c3cfd5f9ddd52 WHIRLPOOL 47ed5fafcb25a3414bb06c8eb27688c571b42e7b52f84089414e82ac8944b736a66698023b9dd81d3201316af07fe5056c6741e925f185c85efaaa0bccf4dcaf
 EBUILD gmock-1.6.0.ebuild 952 SHA256 1b99c8807a5d5c5b38729537979939171d24a64adfa08c146b3065759d7047ae SHA512 c8724c4c71173c54a48af457a76f3176fdb207d2122d05d3fb64a1a3a1211224e8687e28a9f17b16e3c89faf77dbf655c4f4408034e3d08d11d906671722e755 WHIRLPOOL df440ef467c415e8875e1cb760edba9c239738897b0b583aa13cef8fde94489b9e9c2ea75e386c88d0bf6ec8a0953a7331125e3eaae705bd77b5b794af82fda7
-MISC ChangeLog 1891 SHA256 ff7477731ea082bbb339a731cbab5780e7e6620673037e6d92fac65c01360566 SHA512 6b99da3fc61ad68d7657b27b42a050beeb3d2ef4787eee22bbe35e550c9778ac431bdbb5dcd71e1f23bf89ece72714826c731c298c09abccc901b2885a550e11 WHIRLPOOL a7c8c0974d0233586f80ddeee8272075d85c6d7d3cbe3544fe5b113858147915e421be5d067e604af1eda7944d661e2ad02b0b179fbcb3bf45047eaac4a423e9
+MISC ChangeLog 2065 SHA256 e0d96b7d602c1f0d2b17247dbef486cba23265ec1f6243ab430396b633ce4367 SHA512 8fe61ffb39484909d3d85a6c2d3db12b919091be84d5542c5845f7e36dad0e2a0787171fd3c15c044452f1d1e96aa7b0e3fd1425c3c078dbb9bd1d9b51beba9f WHIRLPOOL 55e9e1b40dd198cd828bd3f19abdb6a62d6e977c6106a6c1af1752189f79769e6caf9d65ebb2570ff67e410f5317e2955668b75042e389775bf1d00b1abacc5f
 MISC metadata.xml 283 SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2 SHA512 e85ed05e67750a75476066754448e724ab3e65c91af152befff80c7f66423254311243fa213ba282bcc6456499964d4c969103cad829d8386ab3ef50138b5b81 WHIRLPOOL 3c504418a30332c69ad4282d204ff0ffeef35bc0aff4071d0c7f51704e7a1e091ce7e72826de354f8d1ded20920d61fa60bee4fafd3db8bd43acb9cdce9717bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF0EAREIAAYFAlA3SBMACgkQknrdDGLu8JCFtgD47ukX0lc+jGUiGE5RK4eibvfx
-+VDv83ANvUrO75V1mgD5AScUcncLZ4Q2aW5SUfDAo7kldJVfnTNjKzO2FyRpdL0=
-=zKXr
+iQIcBAEBCAAGBQJQPT22AAoJELEHsLL7fEFWNVQP/2FAoEQ7kH6GmIs3gU2hn799
+jey2RtJzPpktsgfsZOx0hadUCCpu2zRO/TQwS2Nq4HgXOa2SE4CBWvdND3VcapHW
+RaxvrVsQa5EvhLL2974ObBDu3Fh8ma1od2dFkAhylWhuC3O/MUfd4uWtAFZWqlWo
+Yb2eLJlNZQVdWfpZzZVCmNytwv0ypWlLPUXdP4cOej5/ay4FB8lqTJ4p3Prhy79x
+oUwzu+HlkJeAzBcL37rNSf1IpxoeSNpU2i8Yf5ji/A5B6QDII6qqQrBI26B6zzHR
+lznNREJdrUlCQIn3e7KUqaip9fGIBNQ5QT4G16dQlUtSbzmf2sFIJc8p7baKVU+O
++iKj4+bwfce0J5H/H6Zicw5/9ChTgIEV7xj2vaW3hZuvDg4Lks/IsQDwyE7W9V8I
+tTswsK0Q3Tyd9WO1AitWhSSvhoqHvyTo4c/Zi7ULI768mrnCNOpBtzpMLJ5Jw1Hg
+p904W+OThDkbjRLacI+6kiXaJu9vgbMnHeo5a82YeTpy+zSyQQUz5Rcgg/pEusn4
+CFGHrJCXHbVVVaAF9ubRbhVIZ+sFTerHvAjavhduorzJyZQOCDsppCLheVqhnsm7
+El0arTU68RCjnQNZnJ7/3CqSkp0kBSzvlzN512d3lCNDYX4umJXyqqaCSioNe34b
+3HDWCUhAX4PTeo6aEaJz
+=Wkgz
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch b/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch
new file mode 100644
index 000000000000..d28a121a474d
--- /dev/null
+++ b/dev-cpp/gmock/files/gmock-1.4.0-more-gcc-4.7.patch
@@ -0,0 +1,144 @@
+taken from upstream repo
+
+------------------------------------------------------------------------
+r245 | zhanyong.wan | 2009-12-02 03:36:42 -0500 (Wed, 02 Dec 2009) | 2 lines
+
+Fixes a C++-standard-compliance bug in gmock-printers.h.
+
+
+Index: include/gmock/gmock-printers.h
+===================================================================
+--- include/gmock/gmock-printers.h	(revision 244)
++++ include/gmock/gmock-printers.h	(revision 245)
+@@ -434,63 +434,10 @@ inline void PrintTo(const ::std::wstring
+ // Overload for ::std::tr1::tuple.  Needed for printing function
+ // arguments, which are packed as tuples.
+ 
+-typedef ::std::vector<string> Strings;
+-
+-// This helper template allows PrintTo() for tuples and
+-// UniversalTersePrintTupleFieldsToStrings() to be defined by
+-// induction on the number of tuple fields.  The idea is that
+-// TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
+-// fields in tuple t, and can be defined in terms of
+-// TuplePrefixPrinter<N - 1>.
+-
+-// The inductive case.
+-template <size_t N>
+-struct TuplePrefixPrinter {
+-  // Prints the first N fields of a tuple.
+-  template <typename Tuple>
+-  static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
+-    TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
+-    *os << ", ";
+-    UniversalPrinter<typename ::std::tr1::tuple_element<N - 1, Tuple>::type>
+-        ::Print(::std::tr1::get<N - 1>(t), os);
+-  }
+-
+-  // Tersely prints the first N fields of a tuple to a string vector,
+-  // one element for each field.
+-  template <typename Tuple>
+-  static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
+-    TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
+-    ::std::stringstream ss;
+-    UniversalTersePrint(::std::tr1::get<N - 1>(t), &ss);
+-    strings->push_back(ss.str());
+-  }
+-};
+-
+-// Base cases.
+-template <>
+-struct TuplePrefixPrinter<0> {
+-  template <typename Tuple>
+-  static void PrintPrefixTo(const Tuple&, ::std::ostream*) {}
+-
+-  template <typename Tuple>
+-  static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
+-};
+-template <>
+-template <typename Tuple>
+-void TuplePrefixPrinter<1>::PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
+-  UniversalPrinter<typename ::std::tr1::tuple_element<0, Tuple>::type>::
+-      Print(::std::tr1::get<0>(t), os);
+-}
+-
+ // Helper function for printing a tuple.  T must be instantiated with
+ // a tuple type.
+ template <typename T>
+-void PrintTupleTo(const T& t, ::std::ostream* os) {
+-  *os << "(";
+-  TuplePrefixPrinter< ::std::tr1::tuple_size<T>::value>::
+-      PrintPrefixTo(t, os);
+-  *os << ")";
+-}
++void PrintTupleTo(const T& t, ::std::ostream* os);
+ 
+ // Overloaded PrintTo() for tuples of various arities.  We support
+ // tuples of up-to 10 fields.  The following implementation works
+@@ -725,6 +672,64 @@ void UniversalPrint(const T& value, ::st
+   UniversalPrinter<T>::Print(value, os);
+ }
+ 
++typedef ::std::vector<string> Strings;
++
++// This helper template allows PrintTo() for tuples and
++// UniversalTersePrintTupleFieldsToStrings() to be defined by
++// induction on the number of tuple fields.  The idea is that
++// TuplePrefixPrinter<N>::PrintPrefixTo(t, os) prints the first N
++// fields in tuple t, and can be defined in terms of
++// TuplePrefixPrinter<N - 1>.
++
++// The inductive case.
++template <size_t N>
++struct TuplePrefixPrinter {
++  // Prints the first N fields of a tuple.
++  template <typename Tuple>
++  static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
++    TuplePrefixPrinter<N - 1>::PrintPrefixTo(t, os);
++    *os << ", ";
++    UniversalPrinter<typename ::std::tr1::tuple_element<N - 1, Tuple>::type>
++        ::Print(::std::tr1::get<N - 1>(t), os);
++  }
++
++  // Tersely prints the first N fields of a tuple to a string vector,
++  // one element for each field.
++  template <typename Tuple>
++  static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) {
++    TuplePrefixPrinter<N - 1>::TersePrintPrefixToStrings(t, strings);
++    ::std::stringstream ss;
++    UniversalTersePrint(::std::tr1::get<N - 1>(t), &ss);
++    strings->push_back(ss.str());
++  }
++};
++
++// Base cases.
++template <>
++struct TuplePrefixPrinter<0> {
++  template <typename Tuple>
++  static void PrintPrefixTo(const Tuple&, ::std::ostream*) {}
++
++  template <typename Tuple>
++  static void TersePrintPrefixToStrings(const Tuple&, Strings*) {}
++};
++template <>
++template <typename Tuple>
++void TuplePrefixPrinter<1>::PrintPrefixTo(const Tuple& t, ::std::ostream* os) {
++  UniversalPrinter<typename ::std::tr1::tuple_element<0, Tuple>::type>::
++      Print(::std::tr1::get<0>(t), os);
++}
++
++// Helper function for printing a tuple.  T must be instantiated with
++// a tuple type.
++template <typename T>
++void PrintTupleTo(const T& t, ::std::ostream* os) {
++  *os << "(";
++  TuplePrefixPrinter< ::std::tr1::tuple_size<T>::value>::
++      PrintPrefixTo(t, os);
++  *os << ")";
++}
++
+ // Prints the fields of a tuple tersely to a string vector, one
+ // element for each field.  See the comment before
+ // UniversalTersePrint() for how we define "tersely".
+
+------------------------------------------------------------------------
diff --git a/dev-cpp/gmock/gmock-1.4.0.ebuild b/dev-cpp/gmock/gmock-1.4.0.ebuild
index 744d1c074f86..998501011f5a 100644
--- a/dev-cpp/gmock/gmock-1.4.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.4.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/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.5 2012/06/12 18:58:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.4.0.ebuild,v 1.6 2012/08/28 21:52:08 vapier Exp $
 
 EAPI="4"
 
@@ -26,6 +26,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+	epatch "${FILESDIR}"/${P}-more-gcc-4.7.patch
 	elibtoolize
 }