sci-mathematics/msieve: Version Bump; fixing several QA issues; drop old fixes #443662

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

6 files changed, 94 insertions, 55 deletions

diff --git a/sci-mathematics/msieve/ChangeLog b/sci-mathematics/msieve/ChangeLog
index c8d01faf424e..72abafeedbb1 100644
--- a/sci-mathematics/msieve/ChangeLog
+++ b/sci-mathematics/msieve/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/msieve
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/ChangeLog,v 1.11 2013/01/06 14:20:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/ChangeLog,v 1.12 2013/03/07 09:52:28 jlec Exp $
+
+*msieve-1.51 (07 Mar 2013)
+
+  07 Mar 2013; Justin Lecher <jlec@gentoo.org> +msieve-1.51.ebuild,
+  msieve-9999.ebuild, files/reduce-printf2.patch, -msieve-1.50-r4.ebuild,
+  +files/msieve-1.51-reduce-printf.patch, metadata.xml:
+  Version Bump; fixing several QA issues; drop old fixes #443662
 
 *msieve-9999 (06 Jan 2013)
 
diff --git a/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch b/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
new file mode 100644
index 000000000000..39892716716a
--- /dev/null
+++ b/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
@@ -0,0 +1,44 @@
+diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c
+--- msieve-1.50/common/minimize.c	2011-07-04 23:32:33.000000000 +0800
++++ msieve-copy/common/minimize.c	2012-11-26 23:09:22.889240528 +0800
+@@ -210,7 +210,7 @@
+ 		}
+ 	}
+ 
+-	printf(":"); // "too many line iterations\n");
++	//printf(":"); // "too many line iterations\n");
+ 	*min_out = x;
+ 	*status = 1;
+ 	return fx;
+diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/optimize.c
+--- msieve-1.50/gnfs/poly/stage2/optimize.c	2011-10-15 23:03:39.000000000 +0800
++++ msieve-copy/gnfs/poly/stage2/optimize.c	2012-11-26 23:14:36.243232414 +0800
+@@ -430,9 +430,9 @@
+ #if 0
+ 	printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]);
+ 	for (i = 0; i < 2; i++)
+-		gmp_printf("%+Zd\n", c->gmp_lina[i]);
++		//gmp_printf("%+Zd\n", c->gmp_lina[i]);
+ 	for (i = 0; i <= deg; i++)
+-		gmp_printf("%+Zd\n", c->gmp_a[i]);
++		//gmp_printf("%+Zd\n", c->gmp_a[i]);
+ #endif
+ }
+ 
+diff -Naur msieve-1.50/gnfs/poly/stage2/stage2.c msieve-copy/gnfs/poly/stage2/stage2.c
+--- msieve-1.50/gnfs/poly/stage2/stage2.c	2011-10-09 09:32:49.000000000 +0800
++++ msieve-copy/gnfs/poly/stage2/stage2.c	2012-11-26 23:14:30.894232552 +0800
+@@ -122,10 +122,10 @@
+ 	}
+ 
+ #if 0
+-	gmp_printf("%+Zd\n", c->gmp_lina[0]);
+-	gmp_printf("%+Zd\n", c->gmp_lina[1]);
++	//gmp_printf("%+Zd\n", c->gmp_lina[0]);
++	//gmp_printf("%+Zd\n", c->gmp_lina[1]);
+ 	for (i = 0; i <= degree; i++)
+-		gmp_printf("%+Zd\n", c->gmp_a[i]);
++		//gmp_printf("%+Zd\n", c->gmp_a[i]);
+ 
+ 	printf("coeff ratio = %.5lf\n",
+ 		fabs(mpz_get_d(c->gmp_a[degree-2])) / coeff_bound);
diff --git a/sci-mathematics/msieve/files/reduce-printf2.patch b/sci-mathematics/msieve/files/reduce-printf2.patch
index a59e1722758a..fdaa344a3a07 100644
--- a/sci-mathematics/msieve/files/reduce-printf2.patch
+++ b/sci-mathematics/msieve/files/reduce-printf2.patch
@@ -1,11 +1,5 @@
 --- gnfs/poly/stage2/root_sieve_deg45_x.c	2011-08-23 20:59:59.000000000 +0800
 +++ gnfs/poly/stage2/root_sieve_deg45_x.c.new	2012-11-30 17:09:22.553116526 +0800
-@@ -515,7 +515,7 @@
- 			if (obj->flags & MSIEVE_FLAG_STOP_SIEVING)
- 				break;
- 		}
--		printf("\n");
-+		printf(".");
  		return;
  	}
  
diff --git a/sci-mathematics/msieve/metadata.xml b/sci-mathematics/msieve/metadata.xml
index 93efb4dd7d7b..d77356350e30 100644
--- a/sci-mathematics/msieve/metadata.xml
+++ b/sci-mathematics/msieve/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<use>
-		<flag name='ecm'>Enable support for the GMP-ECM library</flag>
-	</use>
+  <maintainer>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <use>
+    <flag name="ecm">Enable support for the GMP-ECM library</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-mathematics/msieve/msieve-1.50-r4.ebuild b/sci-mathematics/msieve/msieve-1.51.ebuild
index f1c5e1025709..128287932d23 100644
--- a/sci-mathematics/msieve/msieve-1.50-r4.ebuild
+++ b/sci-mathematics/msieve/msieve-1.51.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r4.ebuild,v 1.3 2013/01/06 13:35:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.51.ebuild,v 1.1 2013/03/07 09:52:28 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
 
-EAPI=4
 DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
 HOMEPAGE="http://sourceforge.net/projects/msieve/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
-
-inherit eutils
+SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -15,39 +16,32 @@ KEYWORDS="~amd64 ~x86"
 IUSE="zlib +ecm mpi"
 
 # some linking troubles with gwnum
-DEPEND="ecm? ( sci-mathematics/gmp-ecm[-gwnum] )
+DEPEND="
+	ecm? ( sci-mathematics/gmp-ecm[-gwnum] )
 	mpi? ( virtual/mpi )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	# TODO: Integrate ggnfs properly
-	epatch "${FILESDIR}/reduce-printf.patch" 	|| die
-	epatch "${FILESDIR}/reduce-printf2.patch"	|| die
-	epatch "${FILESDIR}/reduce-printf3.patch"	|| die
-	epatch "${FILESDIR}/fix-version.patch"		|| die
-	epatch "${FILESDIR}/fix-version2.patch"		|| die
+	epatch \
+		"${FILESDIR}"/${P}-reduce-printf.patch \
+		"${FILESDIR}"/fix-version.patch \
+		"${FILESDIR}"/fix-version2.patch
 	sed -i -e 's/-march=k8//' Makefile 		|| die
 	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
 	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
 }
 
 src_compile() {
-	if use ecm; then
-		export "ECM=1"
-	fi
-	if use mpi; then
-		export "MPI=1"
-	fi
-	if use zlib; then
-		export "ZLIB=1"
-	fi
-	if use amd64; then
-		emake x86_64 || die "Failed to build"
-	fi
-	if use x86; then
-		emake x86 || die "Failed to build"
-	fi
+	use ecm && export "ECM=1"
+	use mpi && export "MPI=1"
+	use zlib && export "ZLIB=1"
+	emake \
+		CC=$(tc-getCC) \
+		AR=$(tc-getAR) \
+		OPT_FLAGS="${CFLAGS}" \
+		all
 }
 
 src_install() {
diff --git a/sci-mathematics/msieve/msieve-9999.ebuild b/sci-mathematics/msieve/msieve-9999.ebuild
index 6e46621f34e5..9f83a342ddbb 100644
--- a/sci-mathematics/msieve/msieve-9999.ebuild
+++ b/sci-mathematics/msieve/msieve-9999.ebuild
@@ -1,22 +1,24 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-9999.ebuild,v 1.1 2013/01/06 14:20:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-9999.ebuild,v 1.2 2013/03/07 09:52:28 jlec Exp $
+
+EAPI=5
+
+inherit eutils subversion toolchain-funcs
 
-EAPI=4
 DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
 HOMEPAGE="http://sourceforge.net/projects/msieve/"
 #SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
 ESVN_REPO_URI="https://msieve.svn.sourceforge.net/svnroot/msieve"
 
-inherit eutils subversion
-
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS=""
 IUSE="zlib +ecm mpi"
 
 # some linking troubles with gwnum
-DEPEND="ecm? ( sci-mathematics/gmp-ecm[-gwnum] )
+DEPEND="
+	ecm? ( sci-mathematics/gmp-ecm[-gwnum] )
 	mpi? ( virtual/mpi )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
@@ -31,16 +33,14 @@ src_prepare() {
 
 src_compile() {
 	cd trunk
-	if use ecm; then
-		export "ECM=1"
-	fi
-	if use mpi; then
-		export "MPI=1"
-	fi
-	if use zlib; then
-		export "ZLIB=1"
-	fi
-	emake all || die "Failed to build"
+	use ecm && export "ECM=1"
+	use mpi && export "MPI=1"
+	use zlib && export "ZLIB=1"
+	emake \
+		CC=$(tc-getCC) \
+		AR=$(tc-getAR) \
+		OPT_FLAGS="${CFLAGS}" \
+		all
 }
 
 src_install() {