From 0b5a793dab90853dce0fb1d202f157c6ed415f18 Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Sun, 15 Sep 2019 10:41:52 +0000
Subject: sci-mathematics/gmp-ecm: Fix custom-tune useflag

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Patrick Lauer <patrick@gentoo.org>
---
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild | 54 ++++++++++++++++++++++++
 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild    | 55 -------------------------
 2 files changed, 54 insertions(+), 55 deletions(-)
 create mode 100644 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
 delete mode 100644 sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild

(limited to 'sci-mathematics/gmp-ecm')

diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
new file mode 100644
index 000000000000..67ee92316610
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="http://ecm.gforge.inria.fr/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/36224/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+blas +custom-tune -openmp static-libs test"
+
+DEPEND="
+	dev-libs/gmp:0=
+	blas? ( sci-libs/gsl )
+	openmp? ( sys-devel/gcc:*[openmp] )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/ecm-${PV}
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-shellcmd is broken
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable openmp) \
+		${myconf}
+}
+
+src_compile() {
+	append-ldflags "-Wl,-z,noexecstack"
+	if use custom-tune; then
+		emake && emake ecm-params # need to build all to get benchmark bits, then run benchmark
+		emake
+	fi
+	default
+}
+
+src_install() {
+	default
+	mkdir -p "${ED}/usr/include/${PN}/"
+	cp "${S}"/*.h "${ED}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
+}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
deleted file mode 100644
index 54f7a1bbd2df..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/36224/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune -openmp static-libs test"
-
-DEPEND="
-	dev-libs/gmp:0=
-	blas? ( sci-libs/gsl )
-	openmp? ( sys-devel/gcc:*[openmp] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/ecm-${PV}
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	# --enable-shellcmd is broken
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(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
-	fi
-	default
-}
-
-src_install() {
-	default
-	mkdir -p "${ED}/usr/include/${PN}/"
-	cp "${S}"/*.h "${ED}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
-}
-- 
cgit v1.2.3