Fix build with gmp-5.1 (bug 451442). Thanks to Diego and the tinderbox.

Package-Manager: portage-2.1.11.41/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC

4 files changed, 81 insertions, 6 deletions

diff --git a/sci-mathematics/frobby/ChangeLog b/sci-mathematics/frobby/ChangeLog
index c66bec44b632..69775830d04b 100644
--- a/sci-mathematics/frobby/ChangeLog
+++ b/sci-mathematics/frobby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/frobby
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/ChangeLog,v 1.13 2012/07/30 12:28:16 tomka Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/ChangeLog,v 1.14 2013/01/15 21:45:12 tomka Exp $
+
+*frobby-0.9.0-r1 (15 Jan 2013)
+
+  15 Jan 2013; Thomas Kahle <tomka@gentoo.org> +files/frobby-gmp-5.1.patch,
+  +frobby-0.9.0-r1.ebuild:
+  Fix build with gmp-5.1 (bug 451442). Thanks to Diego and the tinderbox.
 
   30 Jul 2012; Thomas Kahle <tomka@gentoo.org>
   +files/frobby-cflags-no-strip-soname.patch,
diff --git a/sci-mathematics/frobby/Manifest b/sci-mathematics/frobby/Manifest
index fd0746dfa3cd..2b9a45c21cad 100644
--- a/sci-mathematics/frobby/Manifest
+++ b/sci-mathematics/frobby/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 AUX frobby-cflags-no-strip-soname.patch 814 SHA256 d5c732b08d3ad4135644b7cf53b42ec9387d6b537e1175acc703798c982c9ada SHA512 2e6de0d19d09ed658ad4396512dddcf24875c7a54b52906043ba7f2600adb4dcdd300b978910620dac992893500fc4f0268eecea65d5083f6d92c84540d5ac77 WHIRLPOOL bfbaed85da81041b4a8fe66a73a0a6d09c27768443b9fbf07a1b6067e94e80216bbb911a04661c01086fa9e0102885449d1f865f85fa31286182355de41a8bdd
 AUX frobby-gcc-4.7.patch 974 SHA256 a1d1092135ee699e2f7b84d45c5130fb8bc4ca996ad92747b9a21d06b35e5f3c SHA512 2e1895b16064cd7121145202f865b0b9ca1cdb3e5088d82f9f80c8a2fdc8ef4a76f734e326d8685465b06218eea1a502d48ee0e6dd51fe92965bc3f8830fc13f WHIRLPOOL 36b02e227f23613a61b3338c9ab9b705a13a45977226cc67725708ae907a552f54907173d537ba029fc0fe49f8021ca4af0b88da902b1cee9f84723bbc468ac9
+AUX frobby-gmp-5.1.patch 482 SHA256 d3d95c47a46c5ac82f5a12e55cc568fa5a2a946cfabd31376ac3a001f3911695 SHA512 a0e113c8a7c25c442a13425baf3fd3259ef48dfa67db25dcc1c87c9a2b1d2453d7daf9778a7c46ce9298db4f59177b63b7811eb4085f206c5a73e538488d174b WHIRLPOOL 5c2b39823ca4a5860c3b126a69137522ee6a38fada93232b74f1789846913bdefdd5101da8b2d9c19393e677e51473bbadce80561f939cd8d19fb125dbb8d4cb
 DIST frobby_v0.9.0.tar.gz 852524 SHA256 af092383e6dc849c86f4e79747ae0e5cd309a690747230e10aa38d60640062df SHA512 b1f64d7a8630ba7f5464e36f66a06a7a7909bc42f2e52898b2967b8ad6288da8ce11a5d79ebfbbfe2f3933930ad26444173f721465ae9a42b6dcf3eef7ecc59e WHIRLPOOL f02c6c794c214c047ae6e1d764b0a29a87be1c080e8ac7489aedb1394a90169f8dc5bb6447c961760a35ba2af90c34ed9bb8e282590d0d05abe791aff7473025
+EBUILD frobby-0.9.0-r1.ebuild 1407 SHA256 59e2de7c40b2778c5882cde370647389cb5c42b973b711aa7cadb783cd97245f SHA512 d94c674c769cff8d51f5f5f7de49c9a3c40069035d76c946a800cbe5f40d8fd0e82a659c5d9e4814fb57f14e8792ca3f4040c8119d2d150998acbfbecd6c1581 WHIRLPOOL 458ca50fbd3a85498866792707c74638cb3d67efbf50fd525dea06b22e2f4226ed4a11c41a799e13c4178087cd185ea95cb9a7f1727c40c3b7a350b60df8e6ad
 EBUILD frobby-0.9.0.ebuild 1364 SHA256 a80d0b7eb1fc5886c4baabf140a40b9b9300262a91e2da89a26ff65c1e5086be SHA512 00dd1be5ef5dd3f95110e8adeed3e4fdc5a8bec1fdf068d67c00980525779d08f847f0a8c43ec65d001049122936b37cccd5fa67af7cbceea55e13702e280161 WHIRLPOOL c183dfb9ba37a544b23d19d8cfdcdc38fe2fb85bed4fb066f7d8d49914c4db78eeae42eabe2728065a71d969e32cf2044e4acc56b0362905f8de05089ba736c8
-MISC ChangeLog 1979 SHA256 c261ca76d865a8b7aaa82795ddcb39dec42190d093aee9c5290d0a4e07e432bb SHA512 900ecea9159083636731a708c9110abb10496db288e6564676b3c26f90814db1d52c508c6e5fc6a40857a735a2ae278784ece90cbf7939acf369e26ba5aa3dd5 WHIRLPOOL 26bb5ad2112fd0606a644c4d2c72f6401f0671898f71fed7db2ac1feb170de09943cf2cfc97b52401612f30e97e0118fab94eb06a11c5873e8f60d11c93125aa
+MISC ChangeLog 2189 SHA256 f95e13bbf27e4019ff81a4ea4e0a3339d493b22ee7e82f4d2606b9372a1980d8 SHA512 d6ed24b78ecd62d2b76e00671c43ec931818b7e790955376ed184be7d15316a14d6fe4b994fb4d1bc96cc3d8b554fb9d461e40b7eb371d583a729097b2664599 WHIRLPOOL a2b5e12dec749c97d9858b0b8106da96ab16ae4b649f4c545592970f029cf877b2e97e986950c59b05f0ef075dd94f4fa5408f6e21e2f9374eb4783e4054a80d
 MISC metadata.xml 376 SHA256 249ebafb8418fd86ca73f59e39bbf60d393b7f0fa3e9f918871e18dddc9ca339 SHA512 180e27f7e92b29029218ca223f6d00ede0aa3300bee10ada745b3fb261fc8ee78df61b126280d7af9643380b1ec110a43b9f189b6263a3a053ea8746e9cdf6ea WHIRLPOOL 9be1fdb91d9985d1de3578ad080fc25ccf096314a1c384ddc542d56073cbf7bbeda020e3261e58e3a5a8b60b28042af11acae841df1758213336f8dbe9093305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAWfeUACgkQid6yGVZcMrzF9AD9Gl45JeanAYSyZkJ9AM2v+WiC
-Btax+bp9msIb9aAekBMBAKt+9k21fmOOd0FsxFz9RflVhvtNPVmT6uzWDv7SoBAM
-=kucS
+iF4EAREIAAYFAlD1zekACgkQid6yGVZcMryqQgEAsPDFJl9gAUQAn474UxLaXtdh
+3yWzOr9BD0bhdCvYaVcBAK41ywtnXkGPZoxbIspfU5uEdePMHglHnO++DSQGrkd/
+=ZRrT
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/frobby/files/frobby-gmp-5.1.patch b/sci-mathematics/frobby/files/frobby-gmp-5.1.patch
new file mode 100644
index 000000000000..23cf295b8965
--- /dev/null
+++ b/sci-mathematics/frobby/files/frobby-gmp-5.1.patch
@@ -0,0 +1,12 @@
+diff -U 3 -dHrN frobby_v0.9.0.orig/src/StatisticsStrategy.cpp frobby_v0.9.0/src/StatisticsStrategy.cpp
+--- frobby_v0.9.0.orig/src/StatisticsStrategy.cpp	2013-01-15 22:40:13.186967442 +0100
++++ frobby_v0.9.0/src/StatisticsStrategy.cpp	2013-01-15 22:40:33.267100780 +0100
+@@ -140,7 +140,7 @@
+   if (_nodeCount == 0)
+     return 0.0;
+   else {
+-    mpz_class q = mpq_class(_subGenSum) / _nodeCount;
++    mpq_class q = mpq_class(_subGenSum) / _nodeCount;
+     return q.get_d();
+   }
+ }
diff --git a/sci-mathematics/frobby/frobby-0.9.0-r1.ebuild b/sci-mathematics/frobby/frobby-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..72bb6e191845
--- /dev/null
+++ b/sci-mathematics/frobby/frobby-0.9.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/frobby-0.9.0-r1.ebuild,v 1.1 2013/01/15 21:45:12 tomka Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Software system and project for computations with monomial ideals"
+HOMEPAGE="http://www.broune.com/frobby/"
+SRC_URI="http://www.broune.com/frobby/frobby_v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="dev-libs/gmp[cxx]"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/frobby_v${PV}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-cflags-no-strip-soname.patch" \
+		"${FILESDIR}/${PN}-gcc-4.7.patch" \
+		"${FILESDIR}/${PN}-gmp-5.1.patch"
+	# CXXFLAGS are called CPPFLAGS
+	sed "s/CPPFLAGS/CXXFLAGS/" -i Makefile || die
+}
+
+src_compile() {
+	# Makefile uses the value of CXX which may be defined in /etc/env,
+	# breaking cross-compile.
+	CXX=$(tc-getCXX) emake
+	MODE=shared CXX=$(tc-getCXX) emake library
+	use static-libs && CXX=$(tc-getCXX) emake library
+	use doc && emake docPdf
+}
+
+src_install() {
+	dobin bin/frobby
+	dolib.so bin/libfrobby.so
+	dosym libfrobby.so "${EPREFIX}/usr/$(get_libdir)/libfrobby.so.0"
+	use static-libs && dolib.a bin/libfrobby.a
+
+	insinto /usr/include
+	doins src/frobby.h
+
+	insinto /usr/include/"${PN}"
+	doins src/stdinc.h
+
+	use doc && dodoc bin/manual.pdf
+}