Fix gmp dep, add test phase, add live ebuild

(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 78 insertions, 47 deletions

diff --git a/sci-mathematics/gmp-ecm/ChangeLog b/sci-mathematics/gmp-ecm/ChangeLog
index ea7253a42697..07a963b0a3ed 100644
--- a/sci-mathematics/gmp-ecm/ChangeLog
+++ b/sci-mathematics/gmp-ecm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/gmp-ecm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/ChangeLog,v 1.5 2012/11/28 09:47:26 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/ChangeLog,v 1.6 2013/01/01 14:28:37 patrick Exp $
+
+*gmp-ecm-6.4.3-r4 (01 Jan 2013)
+*gmp-ecm-9999 (01 Jan 2013)
+
+  01 Jan 2013; Patrick Lauer <patrick@gentoo.org> +gmp-ecm-6.4.3-r4.ebuild,
+  +gmp-ecm-9999.ebuild, -gmp-ecm-6.4.3-r2.ebuild, -gmp-ecm-6.4.3-r3.ebuild:
+  Fix gmp dep, add test phase, add live ebuild
 
   28 Nov 2012; Patrick Lauer <patrick@gentoo.org> gmp-ecm-6.4.3-r3.ebuild:
   Avoid parallel make failure
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild
deleted file mode 100644
index 9b0b3bddd00c..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.2 2012/11/28 08:11:17 patrick Exp $
-
-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"
-
-inherit eutils
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+custom-tune openmp"
-
-DEPEND="dev-libs/gmp
-	openmp? ( sys-devel/gcc[openmp] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/ecm-${PV}
-
-src_configure() {
-	# --enable-shellcmd is broken
-	econf $(use_enable openmp) || die
-}
-
-src_compile() {
-	emake || die
-	if use custom-tune; then
-		./bench_mulredc | tail -n 4 >> `readlink ecm-params.h` || die
-		make clean; emake || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	mkdir -p "${D}/usr/include/${PN}/"
-	cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
-}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r3.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r4.ebuild
index d14072908a72..e07dc6090307 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r3.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-r3.ebuild,v 1.2 2012/11/28 09:47:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r4.ebuild,v 1.1 2013/01/01 14:28:37 patrick Exp $
 
 EAPI=4
 DESCRIPTION="Elliptic Curve Method for Integer Factorization"
@@ -9,12 +9,13 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/30965/${P}.tar.gz"
 
 inherit eutils
 
-LICENSE="GPL-2"
+LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+custom-tune +gwnum -openmp"
+IUSE="+custom-tune gwnum -openmp test"
 
-DEPEND="dev-libs/gmp
+# gmp 5.1 breaks a few things with this version
+DEPEND="<dev-libs/gmp-5.1.0
 	gwnum? ( sci-mathematics/gwnum )
 	openmp? ( sys-devel/gcc[openmp] )"
 RDEPEND="${DEPEND}"
@@ -48,3 +49,7 @@ src_install() {
 	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
new file mode 100644
index 000000000000..325a921b5df4
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
@@ -0,0 +1,59 @@
+# 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.1 2013/01/01 14:28:37 patrick Exp $
+
+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
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="+custom-tune gwnum -openmp test"
+
+DEPEND="dev-libs/gmp
+	gwnum? ( sci-mathematics/gwnum )
+	openmp? ( sys-devel/gcc[openmp] )"
+RDEPEND="${DEPEND}"
+
+# can't be both enabled
+REQUIRED_USE="gwnum? ( !openmp )"
+
+S=${WORKDIR}/ecm-${PV}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
+	# --enable-shellcmd is broken
+	econf $(use_enable openmp) $myconf || die
+}
+
+src_compile() {
+	if use custom-tune; then
+		use amd64 && cd x86_64
+		use x86 && cd pentium4
+		emake -j1 || die # build libecm/libmulredc.la
+		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
+	fi
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	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
+}