gentoo Easter resync : 12.04.2020

4 files changed, 13 insertions, 120 deletions

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 74716a31145f..2d82297ca4f0 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,7 +1,4 @@
-DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B e83f02592a8bb86285f258fefc3e302cc5168888109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0 SHA512 039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
 DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-EBUILD gmp-ecm-6.4.4-r1.ebuild 1501 BLAKE2B 48aa2b0e116f151507bfebc43ca33b413c29d5eb89364e608556b611302094dc8c0db497350c8001f4164822b89fedc1aa571dd3332c5182dc600f6cc2af5566 SHA512 131cef9c49bfdea884516a56b0b1ddf42602886555554c4eab112f17417f2b9838a3fc70ba7171f9eb9c882971bbc73bda1619b8f2a31986a08d2380c8abe4a3
-EBUILD gmp-ecm-7.0.4-r1.ebuild 1230 BLAKE2B 43eafb8be5dce1211467d2cb40ae5f0aa68306876a891a3160903eb71f1922c38091320d5f9f9bb66b8ac444eb48d9121b8743d13ee31b0ffb5825598e862f4f SHA512 3eb32837e3b7311fc9dda8592c9934da55191ee5b294de9d2d0540f20f6665f64234995f7e243ae4b39d63baba5787d5ca9724b51ea6e840090ca0b239ed50d5
-EBUILD gmp-ecm-7.0.4-r2.ebuild 854 BLAKE2B a87be49f51af233f60c6e0e3e8c90b95d90c1bbca35308c57e7f0c472d6c15eb5e4d4e41d2157e546373bf3ef73feab57dc431b5c7ccdcdd09b666cc603556e2 SHA512 b4af870ddacc1cc748c32459af13fdf373a794df59ab23c05cc7d01973dc5cc750fa169ce5765bf246019da13b01e7cc211ad0c704693ed83ef6e92180e06284
+EBUILD gmp-ecm-7.0.4-r2.ebuild 1283 BLAKE2B da1c9b2c779874c6ab1dc6fd2138b85c49f70ca1467d2ba021a50ab2b5bc70a64487a82e5986f0ca9ac86f4fb1d0916e55986be644ffefde5ed8aea9c23af313 SHA512 34e79c04c4454ec04ac07df58d11d9facedeb5f7a80c5553b1298f03401eb2bb33449134b0def1dba77e5b0cdbaf7ad87c3694f9f0310b6688c28f4a7d2a18dd
 EBUILD gmp-ecm-9999.ebuild 1053 BLAKE2B eab97fcb27a1ac30898000ea06ba6d8e5279e979b2b85141ce86494fabf3fb6066c8449292620816ee17822b12564c248705bbbe6ecb4f64a622d8c84b25c4a5 SHA512 2d5f6ebbb57d8cf98e479021d9b345ca00d41dbffef357d0ddfdc40ef6c9f4bf159527ad0b1a37e18deb33051796408456f72ebb2b0bc3c47651a6a374f4ebe4
 MISC metadata.xml 384 BLAKE2B 168807abd87bddc88522015f01126d5ec0bde8716aa38b6e619054d39e9bb12a6ffdaa3082328ecb56c0398b498c964c8e28c818d3887919fbe3065a28673f2a SHA512 a8a7aa64869c88ac293347281a80158cbd3cc84fc9f5ca56531d3d53b33601f9baa5c4f66c93508d6763dc54779a563faa09c4a473c670a9b217610efecca25c
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
deleted file mode 100644
index 463c145bb3c8..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
+++ /dev/null
@@ -1,60 +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/32159/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune -openmp static-libs test"
-RESTRICT="!test? ( 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
-		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
-	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-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.ebuild
deleted file mode 100644
index e650e69207f7..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r1.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"
-RESTRICT="!test? ( 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-r2.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
index 62d2aabe95ee..7ed81f19115a 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="
@@ -26,6 +26,17 @@ pkg_pretend() {
 	use openmp && tc-check-openmp
 }
 
+src_compile() {
+	default
+	if use custom-tune; then
+		# One "emake" was needed to build the library. Now we can find
+		# the best set of parameters, and then run "emake" one more time
+		# to rebuild the library with the custom parameters. See the
+		# project's README or INSTALL-ecm. The build targets don't depend
+		# on ecm-params.h, so we need to "make clean" to force a rebuild.
+		emake ecm-params && emake clean && emake
+	fi
+}
 src_configure() {
 	econf \
 		--enable-shared \