Add patch from Debian to fix build with GCC 4.7, wrt bug #422895.

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

4 files changed, 105 insertions, 11 deletions

diff --git a/sci-mathematics/gmm/ChangeLog b/sci-mathematics/gmm/ChangeLog
index a54a3130a43d..cbca94571045 100644
--- a/sci-mathematics/gmm/ChangeLog
+++ b/sci-mathematics/gmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/gmm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmm/ChangeLog,v 1.23 2012/03/03 13:39:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmm/ChangeLog,v 1.24 2012/06/22 10:03:08 kensington Exp $
+
+*gmm-4.1-r1 (22 Jun 2012)
+
+  22 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/gmm-4.1-gcc-4.7.patch, +gmm-4.1-r1.ebuild:
+  Add patch from Debian to fix build with GCC 4.7, wrt bug #422895.
 
   03 Mar 2012; Johannes Huber <johu@gentoo.org> -gmm-3.1.ebuild:
   Remove old.
diff --git a/sci-mathematics/gmm/Manifest b/sci-mathematics/gmm/Manifest
index 48c5fb5dd868..0436e63d28fc 100644
--- a/sci-mathematics/gmm/Manifest
+++ b/sci-mathematics/gmm/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX gmm-4.1-gcc-4.7.patch 2654 RMD160 ad39828ae682f38d87a36e9505349afcb04aaf3b SHA1 bbdd4f7b187fa24529551b4b44e01131138ff7df SHA256 dd1e1385835b452328a113701c300505945273f405119e05f4f8b01070bbcce4
 DIST gmm-4.1.tar.gz 475697 RMD160 7e54e65d3467bdb204ab26e1b11fb3ba858d9bea SHA1 eea7f8e77f7e468cf93d044a992fcad3ce3f180f SHA256 e202845ba712519dc9fe780af2d8cb40d4515faa099d6b6f4dcd4c7bd25b0569
+EBUILD gmm-4.1-r1.ebuild 614 RMD160 0bcf14cbd4a66e0f90e3a9802d1e7258a38a26d1 SHA1 a85a4691e99a62864c04819a14abde1d74f4f093 SHA256 32dc9d0fc048ee8158fb5eb14f0c533248551f34c8496d3dbff2afbc84e6dcf7
 EBUILD gmm-4.1.ebuild 543 RMD160 f9db5f264da6a0630c742f8068b99341b4222da8 SHA1 b9e8169be28d2bdc9318e866cb20561741e269e9 SHA256 4be6a42fefcff7afbae7ff7f58a168ec7fa41b92a99f268fb2c7a9c3f42790ac
-MISC ChangeLog 3001 RMD160 1aba2870d5f49764e917c17de3e4a85062210df4 SHA1 6186102a864f676def63b2c54638915c260e8502 SHA256 d2e0ca1a9a34bde39ede01e9081cc13c31cb16d07ad1d11c74e2710c4f748eaa
+MISC ChangeLog 3211 RMD160 ab699caf33f6717d85163e17a2f26cfe9aa2a197 SHA1 ce4c2610964773e57f412bdab2c1eb383ee83667 SHA256 8d70acb774e83004bf9c0a744408081b8d2062fcbc5e9dccc62568ddf6c46078
 MISC metadata.xml 688 RMD160 31436e5c0471da80a0d5918af4d809d8a5b9b56d SHA1 5d368ec620d0f9336eca95e29e81cc41eced30b9 SHA256 eaac29751164b14ec12f7ebec55675972ae281a2dce3b2224659f60a1f0a1beb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPUiBgAAoJEO+t9ga+3I3awpMH/jz55JI+s9QquASfHOjzJcEp
-kMDdT+xy3Iy8bip8+tJ+ZA8OR0ctneFjPiQRumsx6r0mLhW0apyBKI4Dn6RPVFSp
-L4MoXXNJyLpheepgQv6ICnD8hEtmpcbOazcZ0E4rtiXHCitpmdwhZKijiLyMq0LE
-jdSZ+KbGwWRTuPbeWBSSc7+bc+8k2oF2mJytUyjqKokSA77aIm5E7mHEQMhtgKcu
-CwNgryfu6srgGjDmv7nP/6QzcDG8p5nsYY1beNrwwQexGhNy5cvHnTIv+BhBV//Q
-D0ZIJsggSZpA++E0XVTfwUMbEMOlBDN5UkMwwrdJHz9NM7M1eMzrBLt3e2vvGIE=
-=ySbq
+iQEcBAEBAgAGBQJP5ELnAAoJEMbwO6tnXQ0s154IAMpcLZGhlV3PqvG5KaHiXrhq
+g88rUoONaC7alTbhoZqoA6EkMHOwbpRiSH6A/t9+1RA0dZBXeypzTNQlPAywLwRo
+EasTOCB8MKuMuAuhbeiMZPbsSbFd0z4J2YnEacwLrXxFpO9n1e8EF1i4zoOXKYrH
+47vkW/jYbOat+v+/Kq4QO4tUbv1NnemuaDbuwq6NupneQwJefTfxgKajhfG+mUUa
+YZbdvjX3mgj00/evrXqO51t9b0pUl87eupIt8RxHy6OtqU0IxfPImNyV0mNyMdwl
+hSs2HCOLxaF6LZ6/iOZl8KieCDgatbzuarHbeJ2osxrP4+eU96BQVFCbXlLkV8w=
+=wlSd
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gmm/files/gmm-4.1-gcc-4.7.patch b/sci-mathematics/gmm/files/gmm-4.1-gcc-4.7.patch
new file mode 100644
index 000000000000..285fbc717dea
--- /dev/null
+++ b/sci-mathematics/gmm/files/gmm-4.1-gcc-4.7.patch
@@ -0,0 +1,67 @@
+Description: fix FTBFS with gcc-4.7
+Author: Philipp Büttgenbach <Philipp.Buettgenbach@gmx.de>
+Reviewed-by: Anton Gladky <gladky.anton@gmail.com>
+Last-Update: 2012-04-20
+
+--- a/include/gmm/gmm_except.h
++++ b/include/gmm/gmm_except.h
+@@ -76,7 +76,7 @@
+   }
+ # define GMM_THROW_(type, errormsg) {					\
+     std::stringstream msg;						\
+-    msg << "Error in "__FILE__ << ", line "				\
++    msg << "Error in " << __FILE__ << ", line "				\
+ 	<< __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n"		\
+ 	<< errormsg << ends;						\
+     throw (type)(msg.str());						\
+@@ -91,7 +91,7 @@
+   }
+ # define GMM_THROW_(type, errormsg) {					\
+     std::stringstream msg;						\
+-    msg << "Error in "__FILE__ << ", line "				\
++    msg << "Error in " << __FILE__ << ", line "				\
+ 	<< __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n"		\
+ 	<< errormsg   << ends;						\
+     ::abort();								\
+@@ -148,7 +148,7 @@
+ 
+ #define GMM_WARNING_MSG(level_, thestr)  {			       \
+       std::stringstream msg;                                           \
+-      msg << "Level " << level_ << " Warning in "__FILE__ << ", line " \
++      msg << "Level " << level_ << " Warning in " << __FILE__ << ", line " \
+           << __LINE__ << ": " << thestr << ends;		       \
+        std::cerr << msg.str() << std::endl;                            \
+     }
+@@ -210,7 +210,7 @@
+ #define GMM_TRACE_MSG(level_, thestr)  {			       \
+     GMM_TRACE_MSG_MPI {						       \
+       std::stringstream msg;                                           \
+-      msg << "Trace " << level_ << " in "__FILE__ << ", line "         \
++      msg << "Trace " << level_ << " in " << __FILE__ << ", line "         \
+           << __LINE__ << ": " << thestr				       \
+           << ends;						       \
+       std::cout << msg.str() << std::endl;			       \
+
+Description: fix FTBFS with gcc-4.7
+Author: Anton Gladky <gladky.anton@gmail.com>
+Last-Update: 2012-05-25
+
+--- a/include/gmm/gmm_vector.h
++++ b/include/gmm/gmm_vector.h
+@@ -235,14 +235,14 @@
+   template<typename T>  void wsvector<T>::clean(double eps) {
+     iterator it = this->begin(), itf = it, ite = this->end();
+     while (it != ite) {
+-      ++itf; if (gmm::abs(it->second) <= eps) erase(it); it = itf;
++      ++itf; if (gmm::abs(it->second) <= eps) base_type::erase(it); it = itf;
+     }
+   }
+ 
+   template<typename T>  void wsvector<T>::resize(size_type n) {
+     if (n < nbl) {
+       iterator it = this->begin(), itf = it, ite = this->end();
+-      while (it != ite) { ++itf; if (it->first >= n) erase(it); it = itf; }
++      while (it != ite) { ++itf; if (it->first >= n) base_type::erase(it); it = itf; }
+     }
+     nbl = n;
+   }
diff --git a/sci-mathematics/gmm/gmm-4.1-r1.ebuild b/sci-mathematics/gmm/gmm-4.1-r1.ebuild
new file mode 100644
index 000000000000..561cc55643b2
--- /dev/null
+++ b/sci-mathematics/gmm/gmm-4.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmm/gmm-4.1-r1.ebuild,v 1.1 2012/06/22 10:03:08 kensington Exp $
+
+EAPI=4
+
+inherit base
+
+DESCRIPTION="Generic C++ template library for sparse, dense and skyline matrices"
+SRC_URI="http://download.gna.org/getfem/stable/${P}.tar.gz"
+HOMEPAGE="http://www-gmm.insa-toulouse.fr/getfem/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+DOCS=( AUTHORS )
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )