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

(Portage version: 2.1.11.41/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)

3 files changed, 75 insertions, 2 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/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
+}