sci-mathematics/gmp-ecm: Fix download location; bump to EAPI=5 and clean some die

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

6 files changed, 60 insertions, 47 deletions

diff --git a/sci-mathematics/gmp-ecm/ChangeLog b/sci-mathematics/gmp-ecm/ChangeLog
index ae9fe441d542..3da8477991ca 100644
--- a/sci-mathematics/gmp-ecm/ChangeLog
+++ b/sci-mathematics/gmp-ecm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/gmp-ecm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/ChangeLog,v 1.8 2013/03/07 07:51:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/ChangeLog,v 1.9 2013/03/07 08:05:21 jlec Exp $
+
+  07 Mar 2013; Justin Lecher <jlec@gentoo.org> gmp-ecm-6.4.3-r5.ebuild,
+  gmp-ecm-6.4.4.ebuild, gmp-ecm-9999.ebuild, metadata.xml:
+  Fix download location; bump to EAPI=5 and clean some die
 
 *gmp-ecm-6.4.4 (07 Mar 2013)
 
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 1deb61b9bb33..bf7cc219341f 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gmp-ecm-6.4.3.tar.gz 944719 SHA256 946c9870c0b76ada2f6342515386828800c096fe32ff347c82374d5a4ec73685 SHA512 71ccdf3b48e96b0acad45302c87a7b17a20ad289efde212a34fb11491531b96848f1824606fdab7604874ca7d8165baba4bbfbc8424e27e8844444ad0d4f56a6 WHIRLPOOL b177904307fefbffc0c8aec2d20eb6de8475428f84f4e263b032fd47b671dba44211a2fcb80cacead76545429a7df5cd444137853145ee4ced62cb8356753579
-DIST gmp-ecm-6.4.4.tar.gz 944719 SHA256 946c9870c0b76ada2f6342515386828800c096fe32ff347c82374d5a4ec73685 SHA512 71ccdf3b48e96b0acad45302c87a7b17a20ad289efde212a34fb11491531b96848f1824606fdab7604874ca7d8165baba4bbfbc8424e27e8844444ad0d4f56a6 WHIRLPOOL b177904307fefbffc0c8aec2d20eb6de8475428f84f4e263b032fd47b671dba44211a2fcb80cacead76545429a7df5cd444137853145ee4ced62cb8356753579
-EBUILD gmp-ecm-6.4.3-r5.ebuild 1657 SHA256 8906df01347767891aa7cfb916656839bc0da6cb5ce2794f0ffa00b66bbe87a8 SHA512 c67d903361b74f3a3af3a834d682e5e18f16246aded5ad7066b784a9a804a963b227e3973b636cc4fc65fc45ed2a0d4094f7b7ccaab8292c0d458e111fd7e83b WHIRLPOOL 834d337288650b6897df4122c9ba67f37876177cd9761a9a9d67fc63588717a049ec987494191c19ec06b7317268665ad0f9188d0139fca36be0f46ac25025d1
-EBUILD gmp-ecm-6.4.4.ebuild 1713 SHA256 89324d3f0e58df6fc6af37fd7db3adbc1b740b317de633eadebf137068b1ea9d SHA512 ea972e0691193f508d5499c385882930a7623955a408aa84627da85cc24c9129dcb3f57ce1f7b4e92b1e2b5a39405005b40390ed3cf6454ac86912dc2a9e5733 WHIRLPOOL 75e86d20619dc6cba44a5031a6248636cbfe6449a0d5695e25c0681ce5f5d5d0ef0648ec7d785706495d4fc17406da1a4822fad05a19bb41e8d88c8d86d5583f
-EBUILD gmp-ecm-9999.ebuild 1667 SHA256 9c52c313c156f1573c22fabf754a67337d90d3431ed186b8bc7c660b20ea63ea SHA512 ec38cd3585f4164ae28b04c5f9b6003e6dba4bfe2cf9f6d09f971cebb35ae7009c0c942cc35f3a0fee86e1676fb70c5e43aa29e349799c85f96b6a6e12bcbebd WHIRLPOOL 4ef4171cc9d3b4ab62ec9d418edd718f530b86e6468b139416726fe5147e664289d99d53735a71cf19a2f72a777adb118cb76df27dda72109ea3d21a7553f9b4
-MISC ChangeLog 1542 SHA256 f4ec07c3937633741968e832f1cc7ef46ee53dca1163becd7ed98a1f14700d3d SHA512 0d99de18e81f2a84b6c1f42b6d101396cc4903e3acb751e9d0340466cf80ff0b371d83fa73da14c159246b2a6beca9edbac63c94c69f9e3efcce8a41acf7d1a3 WHIRLPOOL 4a10c221f648d442fc90ea2cc78a09c86981f8a154c99a4a8ba21eecdb357051c3541bc06944a90a6fda791e7a92581297757c8302d52e18b3dc1b6518b4942e
-MISC metadata.xml 417 SHA256 1e7f554d5355a3d44dc5330b0d619ddf4d86b6d23483321f0e40f9a8dc2903fe SHA512 198b02f666fa79c2393aa75a53dd66e7b98adf058219df8ceb02cbeb6a954c5203f8a9874fac476286a3e32ea028d3be203707d1c2ad70858ae0f6be4389c8bc WHIRLPOOL 2ba8c72645243bcd0c616ecbef88ab2e276042d195e30fa7985083db5bdb1e011ac7dfb17383cb845a99d423823e422e181da88137530e4c7696e3139f83eef0
+DIST gmp-ecm-6.4.4.tar.gz 941058 SHA256 c813a814592d8092745012debdba25388211e1a2579c26183adda7cfa215b06c SHA512 039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097 WHIRLPOOL 47cb942a4e3fd3d8a978df031dbcb19ea200e43eb9cd6ac2a9b551b7d7a8caed6f2e6ec8d7f7ec84584035b24ed2b49839582f758d245df8e297038d82be2cf8
+EBUILD gmp-ecm-6.4.3-r5.ebuild 1647 SHA256 c223231dd709d6f60cc24cef6e20c6cd8e309feb323ca9aaf45ef135460426ed SHA512 ca0776f9a53672b61cdf89e4afa5ebaa99b81383a3962443b469a9ba173e7edd43f013a3680aa83133a0c46c71c052aa2ed7883c4da9c88c5a51661a4fa5307d WHIRLPOOL 937591cb5d9e647b6d37f5fc1fcde6cb243a998569ee74b1b57e3c39eda789f95ccaed53949a962b5f37e8002af0e1408eeb023086105e08dfaa9c8db3b5f733
+EBUILD gmp-ecm-6.4.4.ebuild 1548 SHA256 3ff6acd01b94b552d6bc8998fbf5bdd1d6b63a3045c29920e9b0fd028673759b SHA512 b6b30fc18e8d330853dc60d3f46adf8b25279f0a8dd5d254c7b10cb4833bcc65181c316bd9ed8b25f6d2c2b662e7b35406af1f19ff3f0bbeb91b1df1cdc9257c WHIRLPOOL 1b63938cd205b59710d816c3ede813fb23a45bb0c0dc448d4f05354b616d8a6a1d0a491bfd89d5ea5c4521f8a4ed4cf3c03e2024626f18fc1cd9b2806de3fd6d
+EBUILD gmp-ecm-9999.ebuild 1649 SHA256 535db9f7d060cf0cdbb63c01b1833429fc1d2e696873cc9e0469e32fdd29abc9 SHA512 e9b2d7a0457c96bdd28ed1c77cd199889cc3b040125b0544a3c69019dd8cf3026b6312e649b74daeff9f7e1ee7fa2e12b29474376a086cc5ea12eb484b71bfd1 WHIRLPOOL 9e369840695e2f2dae481f7816d9444a075f366eb79515236a48c41af4a2597cae25d2cf5dece82cb3e2da3abd9f2b80b76677957cab747bdbf58e67307043e0
+MISC ChangeLog 1730 SHA256 e08910e3bb9995ec20b37d1aa4330d867e3ebb2f6a2d2c8e9ca13412081d704f SHA512 213617f658cefc50e85b31f1a8e13315680e1f4b781f9d6adc8df5a79af346f3b68ad8b90ee4be5c4b701eae89df5e097ae73f7338f4202ca9e919925ced85e2 WHIRLPOOL ff984772d0fdae9ef43b31e8276d58ec258dbd3898dd05661ec4e481734df76caf1667183d31610f1c74f2e7b90bd6ca53c7af4f55ec0998ab15d7b6fe569318
+MISC metadata.xml 429 SHA256 9053054992196fcfa31080b0db94db93659737b13a980a65764a4aa96a592ae8 SHA512 d8659eeecbb721ae385baa1267a810e4e33ae75e1cf6ae11d77edbdac1f3c102851ecc94dd9a098c47183a75e151b477023d32c2cc78dcd76f62d9424802d98a WHIRLPOOL dfa460da1d05a49b887959d2e36a077a03d9ad6ebd46a403cd0c3aca538ef4163478b0cab8cab6987628bb996b9bfffda719014669adfa53e7074c73694efbb0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlE4SkIACgkQgAnW8HDreRYK6ACeIav8x7m+h6iZ/4hTKuxrBI/r
+/BQAoKWF9trRtm5+P4gPoL1oy/SNmgmP
+=IgjT
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
index 95baa1ab69cb..b241fe52ed65 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild,v 1.1 2013/01/01 17:08:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild,v 1.2 2013/03/07 08:05:21 jlec Exp $
 
 EAPI=4
 DESCRIPTION="Elliptic Curve Method for Integer Factorization"
@@ -29,7 +29,7 @@ S=${WORKDIR}/ecm-${PV}
 src_configure() {
 	if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
 	# --enable-shellcmd is broken
-	econf $(use_enable openmp) $myconf || die
+	econf $(use_enable openmp) $myconf
 }
 
 src_compile() {
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4.ebuild
index 75c70616162d..45aee228deb7 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4.ebuild,v 1.1 2013/03/07 07:51:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4.ebuild,v 1.2 2013/03/07 08:05:21 jlec Exp $
+
+EAPI=5
 
-EAPI=4
 DESCRIPTION="Elliptic Curve Method for Integer Factorization"
 HOMEPAGE="http://ecm.gforge.inria.fr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/30965/${P}.tar.gz"
+SRC_URI="https://gforge.inria.fr/frs/download.php/32159/${P}.tar.gz"
 
 inherit eutils flag-o-matic
 
@@ -14,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+blas +custom-tune gwnum -openmp test"
 
-# gmp 5.1 breaks a few things with this version
-DEPEND="dev-libs/gmp
+DEPEND="
+	dev-libs/gmp
 	blas? ( sci-libs/gsl )
 	gwnum? ( sci-mathematics/gwnum )
 	openmp? ( sys-devel/gcc[openmp] )"
@@ -24,13 +25,14 @@ RDEPEND="${DEPEND}"
 # can't be both enabled
 REQUIRED_USE="gwnum? ( !openmp )"
 
-# little oopsie
-S=${WORKDIR}/ecm-6.4.3
+S=${WORKDIR}/ecm-${PV}
+
+MAKEOPTS+=" -j1"
 
 src_configure() {
 	if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
 	# --enable-shellcmd is broken
-	econf $(use_enable openmp) $myconf || die
+	econf $(use_enable openmp) $myconf
 }
 
 src_compile() {
@@ -38,21 +40,17 @@ src_compile() {
 	if use custom-tune; then
 		use amd64 && cd x86_64
 		use x86 && cd pentium4
-		emake -j1 || die # build libecm/libmulredc.la
+		emake
 		cd .. && make bench_mulredc || die
 		sed -i -e 's:#define TUNE_MULREDC_TABLE://#define TUNE_MULREDC_TABLE:g' `readlink ecm-params.h` || die
 		sed -i -e 's:#define TUNE_SQRREDC_TABLE://#define TUNE_SQRREDC_TABLE:g' `readlink ecm-params.h` || die
 		./bench_mulredc | tail -n 4 >> `readlink ecm-params.h` || die
 	fi
-	emake -j1 || die
+	default
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	mkdir -p "${D}/usr/include/${PN}/"
 	cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
 }
-
-src_test() {
-	make check || die
-}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
index a1d21588fcce..aae03654a492 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild,v 1.2 2013/01/01 17:08:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild,v 1.3 2013/03/07 08:05:21 jlec Exp $
+
+EAPI=5
 
-EAPI=4
 DESCRIPTION="Elliptic Curve Method for Integer Factorization"
 HOMEPAGE="http://ecm.gforge.inria.fr/"
 #SRC_URI="https://gforge.inria.fr/frs/download.php/30965/${P}.tar.gz"
 ESVN_REPO_URI="svn://scm.gforge.inria.fr/svnroot/ecm/trunk"
 
-inherit eutils subversion autotools
+inherit autotools eutils flag-o-matic subversion
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="blas +custom-tune gwnum -openmp test"
 
-DEPEND="dev-libs/gmp
+DEPEND="
+	dev-libs/gmp
 	blas? ( sci-libs/gsl )
 	gwnum? ( sci-mathematics/gwnum )
 	openmp? ( sys-devel/gcc[openmp] )"
@@ -26,6 +28,8 @@ REQUIRED_USE="gwnum? ( !openmp )"
 
 S=${WORKDIR}/ecm-${PV}
 
+MAKEOPTS+=" -j1"
+
 src_prepare() {
 	eautoreconf
 }
@@ -33,28 +37,25 @@ src_prepare() {
 src_configure() {
 	if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
 	# --enable-shellcmd is broken
-	econf $(use_enable openmp) $myconf || die
+	econf $(use_enable openmp) $myconf
 }
 
 src_compile() {
+	append-ldflags "-Wl,-z,noexecstack"
 	if use custom-tune; then
 		use amd64 && cd x86_64
 		use x86 && cd pentium4
-		emake -j1 || die # build libecm/libmulredc.la
+		emake
 		cd .. && make bench_mulredc || die
-		sed -i -e 's:#define TUNE_MULREDC_TABLE://#define TUNE_MULREDC_TABLE:g' ecm-params.h || die
-		sed -i -e 's:#define TUNE_SQRREDC_TABLE://#define TUNE_SQRREDC_TABLE:g' ecm-params.h || die
-		./bench_mulredc | tail -n 4 >> ecm-params.h || die
+		sed -i -e 's:#define TUNE_MULREDC_TABLE://#define TUNE_MULREDC_TABLE:g' `readlink ecm-params.h` || die
+		sed -i -e 's:#define TUNE_SQRREDC_TABLE://#define TUNE_SQRREDC_TABLE:g' `readlink ecm-params.h` || die
+		./bench_mulredc | tail -n 4 >> `readlink ecm-params.h` || die
 	fi
-	emake -j1 || die
+	default
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	mkdir -p "${D}/usr/include/${PN}/"
 	cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
 }
-
-src_test() {
-	make check || die
-}
diff --git a/sci-mathematics/gmp-ecm/metadata.xml b/sci-mathematics/gmp-ecm/metadata.xml
index 33cbddc879e8..1723f3d6a58c 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/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>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<use>
-		<flag name='custom-tune'>Improve performance of some operations by selecting machine-specific defaults</flag>
-		<flag name='gwnum'>Use GWNum lib where possible</flag>
-	</use>
+  <maintainer>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <use>
+    <flag name="custom-tune">Improve performance of some operations by selecting machine-specific defaults</flag>
+    <flag name="gwnum">Use GWNum lib where possible</flag>
+  </use>
 </pkgmetadata>