sci-mathematics/frobby: Fix for build with gcc-4.7, #424663; handle static-libs

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

5 files changed, 66 insertions, 28 deletions

diff --git a/sci-mathematics/frobby/ChangeLog b/sci-mathematics/frobby/ChangeLog
index 900c103a2e72..f217191fc871 100644
--- a/sci-mathematics/frobby/ChangeLog
+++ b/sci-mathematics/frobby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2012/05/18 16:32:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/ChangeLog,v 1.12 2012/07/04 06:27:07 jlec Exp $
+
+  04 Jul 2012; Justin Lecher <jlec@gentoo.org> frobby-0.9.0.ebuild,
+  +files/frobby-gcc-4.7.patch, metadata.xml:
+  Fix for build with gcc-4.7, #424663; handle static-libs
 
   18 May 2012; Thomas Kahle <tomka@gentoo.org> -files/frobby-latex.patch,
   -files/frobby-useless-checks.patch, -frobby-0.8.2-r1.ebuild,
diff --git a/sci-mathematics/frobby/Manifest b/sci-mathematics/frobby/Manifest
index cbb002d7e7bc..85a41dc36500 100644
--- a/sci-mathematics/frobby/Manifest
+++ b/sci-mathematics/frobby/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX frobby-cflags-no-strip.patch 407 RMD160 cf450868e1ff6b6eb939d21ae073b101977ec977 SHA1 a965f57fb4c871d5715207593f2bd8759698c362 SHA256 1bf3b101656f6711badca5c47bf9281e99457791a4e86a0bcd38af69bb7de25d
+AUX frobby-gcc-4.7.patch 974 RMD160 87a047a60c56664feb306cf561abaa22987bb600 SHA1 6f9f6abdb3615ac9c9792ba6aaabec857b715c2c SHA256 a1d1092135ee699e2f7b84d45c5130fb8bc4ca996ad92747b9a21d06b35e5f3c
 DIST frobby_v0.9.0.tar.gz 852524 RMD160 5d99489f8943c93d15acb9ca7d8ece955a2d4ba2 SHA1 513b6e2ef8e8670c0518d168c2e554df1f8d79b4 SHA256 af092383e6dc849c86f4e79747ae0e5cd309a690747230e10aa38d60640062df
-EBUILD frobby-0.9.0.ebuild 1182 RMD160 9a1d52f121b58be07daf85f6da6131d6a5b0cb25 SHA1 2cb462bc93342cc6c0b6a796fbfcca01f34c2a01 SHA256 43d24f21cdb0ca39f14876e4bc1e5fcb00eb4376ab268412e15d10f9fcf3b59f
-MISC ChangeLog 1634 RMD160 4674bc9dfd77bb76cf6df5e07d7c1cfe6ca83ce5 SHA1 ea11505a6f77ddf54dff54e6cb9f2855d40ac1d2 SHA256 6805fb969d97e2b4f9dd5855ab041b31f3325a3aa7ad0566b0a70ac8f8eae577
-MISC metadata.xml 372 RMD160 51eb09d1be778712b8c8a2d1f2b8736ca67d4246 SHA1 d4229222fa452fa7c4fe20c33c61be8b74f20594 SHA256 f9dd1b0ddf6735e8274e29f73b4df57fe3b7180a338f3f13022fa9512c52e987
+EBUILD frobby-0.9.0.ebuild 1200 RMD160 6205be16b924b7e804de8cde32cdf8f129a51acc SHA1 717f20b0658ec70b219c2f15f8fc0df8a67e9a41 SHA256 cc74e334f77ddf4a79e6845e4cc8a1c91678ee25434b8b1913bb52bf93ecfaa3
+MISC ChangeLog 1805 RMD160 8f28e5b9df107115cf588a8ba100e625c9d7851c SHA1 f161674fd9789bec517f53a26f3114b18340c1ba SHA256 b15b3b588c2889499380f2956f0b302ba2cfaaa4eba7775f2abe75776699e8d2
+MISC metadata.xml 376 RMD160 4c4bbf9ecdc8709f9180ffc279f71f7b2c152464 SHA1 8340e18e81e8a79b79244bfcdf11c115a4049a23 SHA256 249ebafb8418fd86ca73f59e39bbf60d393b7f0fa3e9f918871e18dddc9ca339
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iF4EAREIAAYFAk+2eZQACgkQid6yGVZcMrxQbwD+NM9owz6MnRG3SrMLWq1+AgfG
-rkHdswopjSOEXeYJUx0BAJFq5afbNJDU6bqjlkvpqYnyzks+M9D3J5oPhkmD0zED
-=k5Dy
+iEYEAREKAAYFAk/z4kAACgkQgAnW8HDreRaRWQCfcyiVB934c5+dqTj6nd7a8pfl
+cwIAn18Emm4fSammwriHUdObDlTJkXn8
+=uPVL
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/frobby/files/frobby-gcc-4.7.patch b/sci-mathematics/frobby/files/frobby-gcc-4.7.patch
new file mode 100644
index 000000000000..4a73161166d9
--- /dev/null
+++ b/sci-mathematics/frobby/files/frobby-gcc-4.7.patch
@@ -0,0 +1,32 @@
+ src/main.cpp                 |    3 +++
+ src/randomDataGenerators.cpp |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index a16754e..315ea53 100755
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -25,6 +25,9 @@
+ #include <ctime>
+ #include <cstdlib>
+ 
++#include <sys/types.h>
++#include <unistd.h>
++
+ /** This function runs the Frobby console interface. the ::main
+     function calls this function after having set up DEBUG-specific
+     things, catching exceptions, setting the random seed and so on.
+diff --git a/src/randomDataGenerators.cpp b/src/randomDataGenerators.cpp
+index 432a90a..1de3559 100755
+--- a/src/randomDataGenerators.cpp
++++ b/src/randomDataGenerators.cpp
+@@ -26,6 +26,9 @@
+ #include <limits>
+ #include <ctime>
+ 
++#include <sys/types.h>
++#include <unistd.h>
++
+ void generateLinkedListIdeal(BigIdeal& ideal, size_t variableCount) {
+   VarNames names(variableCount);
+   ideal.clearAndSetNames(variableCount);
diff --git a/sci-mathematics/frobby/frobby-0.9.0.ebuild b/sci-mathematics/frobby/frobby-0.9.0.ebuild
index dffd4e08483f..6b5a3de9e43e 100644
--- a/sci-mathematics/frobby/frobby-0.9.0.ebuild
+++ b/sci-mathematics/frobby/frobby-0.9.0.ebuild
@@ -1,19 +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/frobby/frobby-0.9.0.ebuild,v 1.4 2012/05/18 16:32:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/frobby-0.9.0.ebuild,v 1.5 2012/07/04 06:27:07 jlec Exp $
 
 EAPI=4
 
 inherit eutils
 
-DESCRIPTION="Frobby is a software system and project for computations with monomial ideals"
+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"
+IUSE="doc static-libs"
 
 RDEPEND="dev-libs/gmp[cxx]"
 DEPEND="${RDEPEND}
@@ -22,9 +22,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/frobby_v${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-cflags-no-strip.patch"
+	epatch \
+		"${FILESDIR}/${PN}-cflags-no-strip.patch" \
+		"${FILESDIR}/${PN}-gcc-4.7.patch"
 	# CXXFLAGS are called CPPFLAGS
-	sed "s/CPPFLAGS/CXXFLAGS/" -i Makefile
+	sed "s/CPPFLAGS/CXXFLAGS/" -i Makefile || die
 }
 
 src_compile() {
@@ -32,20 +34,18 @@ src_compile() {
 	# breaking cross-compile.
 	CXX=$(tc-getCXX) emake
 	CXX=$(tc-getCXX) emake library
-	if use doc; then
-		emake docPdf
-	fi
+	use doc && emake docPdf
 }
 
 src_install() {
 	dobin bin/frobby
-	dolib.a bin/libfrobby.a
+	use static-libs && dolib.a bin/libfrobby.a
+
 	insinto /usr/include
 	doins src/frobby.h
-	dodir /usr/include/"${PN}"
+
 	insinto /usr/include/"${PN}"
 	doins src/stdinc.h
-	if use doc; then
-		dodoc bin/manual.pdf
-	fi
+
+	use doc && dodoc bin/manual.pdf
 }
diff --git a/sci-mathematics/frobby/metadata.xml b/sci-mathematics/frobby/metadata.xml
index 06fa79d6bbc5..4e93bbb7622c 100644
--- a/sci-mathematics/frobby/metadata.xml
+++ b/sci-mathematics/frobby/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>tomka@gentoo.org</email>
-  <name>Thomas Kahle</name>
-</maintainer>
-<herd>sci</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
+	</maintainer>
+	<herd>sci</herd>
+	<longdescription lang="en">
 Frobby is a software system and library for computations with monomial ideals. 
 </longdescription>
 </pkgmetadata>