gentoo resync : 20.10.2021

3 files changed, 2 insertions, 48 deletions

diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 979234487232..8946c63a44fc 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,7 +1,5 @@
 AUX gmp-ecm-7.0.4-execstack.patch 1568 BLAKE2B ccf8b74074bf357e74bc6126c505ebc77c389c851ee0ec35743c99270b6f36fa92d26c9df4b1f1a20e125a3b6dbd53522fa441d91fc4f8427d3b6d6ab50be07a SHA512 874924dd2f81c2e85dd4cdb0d8a14d1e22a9aca0c3883a9e16f1888f61b5af9b26a8c80469b65566a4becefce6a1d37ecdbba029648b4d62dc320f9e5a776453
 AUX gmp-ecm-7.0.4-openmp.patch 795 BLAKE2B 2a857cba5e0bc4e7dfe710c250bcb721dd2fd5e0c9c049987f8505d2efc758ff026b313bc92a2b18472bbebc320c8d1187c8506eaea6d2f1f6d51da284bca3ae SHA512 063d20e5a4cf088aaed31eb79c6b253ef4747d3d449c70936b4079c519480767f4f19dc259894422dc6d5783c9c360fc2c3a9fda4bb9b2a124a0e7bd90c08554
 DIST ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
-EBUILD gmp-ecm-7.0.4-r2.ebuild 1215 BLAKE2B c018b48131e2baeb0f373993b32c2a1e05b9669932ac54ece52ba30b8e0b63a6e59ff4506cbcd85bcb1d7e3ace665d993d4bae830ecb9f2909530fc41d3a78db SHA512 912183343a5a87f9fb27934de2e729a4eef66dec2a72ef6afbdb59eff91da2e2222647976b4304d186c40ef65a79a3536103527fbf0d9346419a46ddc3e5b476
-EBUILD gmp-ecm-7.0.4-r4.ebuild 2006 BLAKE2B 103f94466d63669a880d9b883799e2fbefb4f3d887eef3711569bf6e55aca319599c91b2b1b1979f922d9633e9491df3276037ff7f7100e85ed091001dc54b3b SHA512 c66648073d3097233010fccbcf55c16437910833cf521d8aad0cd22f272a0b65ea008809750abfecb1fe96d88828041382b3541a1740e6e35757593dd8003c40
+EBUILD gmp-ecm-7.0.4-r4.ebuild 2004 BLAKE2B 60f412108fdab2ca5ba1d06218e29311fad9899d5ad12cb7e50c39b4194dafc70b9c6e73d68b07cf2dc1f938744b37320e91d2d025b60d868397c26407dacc27 SHA512 b23a5852c8f28b9b8c857572ea6e864b8ae3fd91b07748636a3e575a6eb274f80051daaae981c1159829dcc5fd21874b9c4087f686f88d4ccaaddb9ca13768dd
 MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8
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
deleted file mode 100644
index ee5812002ccf..000000000000
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Elliptic Curve Method for Integer Factorization"
-HOMEPAGE="http://ecm.gforge.inria.fr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/36224/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
-IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
-
-DEPEND="dev-libs/gmp:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/ecm-${PV}"
-
-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 \
-		$(use_enable static-libs static) \
-		$(use_enable openmp) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable custom-tune asm-redc)
-}
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
index 800fcf6b3584..d090e6592b6d 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/9cd422ec80268f8a885e499e17
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp static-libs cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="