gentoo resync : 28.04.2021

5 files changed, 25 insertions, 153 deletions

diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index d7c503e626f7..1faa570433d1 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,8 +1,5 @@
-AUX fix-version.patch 499 BLAKE2B e4522d29cb5eed0eaad14ba37d9575268721457d607a7e10be571c56fcb016ec58c303df5b0b5f3430acee986d381241c39a8b1bde4eb136867552620b21d0ea SHA512 9ea8b52377cf11e6dc34860d3231dee364a8018d860a25ca25901fc00e948adb11ba767106df67e5769e6328fcb703638a14178666f53f9518c0e07b15d36767
 AUX msieve-1.51-reduce-printf.patch 1598 BLAKE2B 3cce6aab49b9c66fb4f0feede9a56a70ad62f63fdaad76116948133dd1a915d17c0b6887adc936692de1a91e917954a0478ea30d5db0449e3ad43b5d35835da8 SHA512 abd539239b1c289265b523f748dc0838df89d532a21c27040b6bbd0a8c7ef10641fc24a06378d48c45fe2d0156f09de06d10412d1d0ec71583c02123fa6158c6
 AUX msieve-1.53-fix-version.patch 1138 BLAKE2B 110bdba41cc622eb6edbebef641df4f5cbd9c184e87c8ee2824c7a29aa10f4615c98d4e1ef754fea960756d6afc1bf58e66c9f9d561fa3c699b462b216a9aabe SHA512 3133cd9d424328802060578fef60b7e0657b044927ac6a4e677c356f79224ec3d066764ab3ce6a06e5fc203bd8a000cbde47705277dcb6cc5f6a9004200d299d
-AUX reduce-printf.patch 2105 BLAKE2B 3ba089546e8a67100c9ab6849854c91c78a9e74b1385ab89a4c83586a4b774f9bd65f1fa007df32b5c57c80af6c58425742f8611c80746a361fe6d6ec5eb8aeb SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
-EBUILD msieve-1.53-r1.ebuild 1457 BLAKE2B f8536704a0fcce0cdc2fc8e66f663cbf981b346ba2b4b91a1ac2e7462fe32eb35f2ba30a1391fd2e3e02124a9a95dbf1dcd0825770d5cf4fcf45ae06c3e37666 SHA512 88fb3b5fbc5357746bc37f4f5bd85d164fa6b54b7aa6b609868492d2c4c8acf8ca4d1befd5cae4460d97b404c0d685bc71b1c1c3594c868233f5edf77356c7ef
-EBUILD msieve-9999.ebuild 1317 BLAKE2B 8cd2cc6925fcecc20e3e78bffbfe2e331c53dcd32e7432be57188f5de1ab081152fc944e5ebd56e1248f9e0dfd0e421e726cf24081c61176556e9ca19bb0f8e8 SHA512 9b7cc2ea8f065e47fcda5b83f043262b59cc6705adf14187d81bd8ec6c05f3d80c08011c7613ab0b040328ba8c5a2f3b6d651916d487fed9c6195f15f8428507
+EBUILD msieve-1.53-r1.ebuild 1232 BLAKE2B 2552549e4c0ced96b57a7643f4febcbb109a40885521d23408e48d265084345e2063b2bf9acea6007f254d287bf3b49be8b5e3b4fb3ab3d5c3cae7480952e120 SHA512 cdbca923a6d310ebade396846afd725a00b837fce68a422fc706d43a30135c581ee83db290b57571dcea60f3bad0add79bcc4e691f5bef46741b9e0f388d8b91
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/files/fix-version.patch b/sci-mathematics/msieve/files/fix-version.patch
deleted file mode 100644
index 748a7ae8c68c..000000000000
--- a/sci-mathematics/msieve/files/fix-version.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- common/driver.c	2011-05-02 09:10:50.000000000 +0800
-+++ common/driver.c.new	2012-11-30 16:43:59.067925006 +0800
-@@ -191,10 +191,9 @@
- 
- 	logprintf(obj, "\n");
- 	logprintf(obj, "\n");
--	logprintf(obj, "Msieve v. %d.%02d (SVN %s)\n", 
-+	logprintf(obj, "Msieve v. %d.%02d\n", 
- 				MSIEVE_MAJOR_VERSION, 
--				MSIEVE_MINOR_VERSION,
--				MSIEVE_SVN_VERSION);
-+				MSIEVE_MINOR_VERSION);
- 	start_time = time(NULL);
- 	if (obj->flags & MSIEVE_FLAG_LOG_TO_STDOUT) {
- 		printf("%s", ctime(&start_time));
diff --git a/sci-mathematics/msieve/files/reduce-printf.patch b/sci-mathematics/msieve/files/reduce-printf.patch
deleted file mode 100644
index dad1dc7db8f3..000000000000
--- a/sci-mathematics/msieve/files/reduce-printf.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c
---- msieve-1.50/common/minimize.c	2011-07-04 23:32:33.000000000 +0800
-+++ msieve-copy/common/minimize.c	2012-11-26 23:09:22.889240528 +0800
-@@ -210,7 +210,7 @@
- 		}
- 	}
- 
--	printf("too many line iterations\n");
-+	//printf("too many line iterations\n");
- 	*min_out = x;
- 	*status = 1;
- 	return fx;
-diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/optimize.c
---- msieve-1.50/gnfs/poly/stage2/optimize.c	2011-10-15 23:03:39.000000000 +0800
-+++ msieve-copy/gnfs/poly/stage2/optimize.c	2012-11-26 23:14:36.243232414 +0800
-@@ -390,7 +390,7 @@
- 			score = minimize(best, num_vars, tol, 40, 
- 					objective, &opt_data);
- 
--			printf("i %u score %le\n", i, score);
-+			//printf("i %u score %le\n", i, score);
- 			for (j = 0; j <= rotate_dim; j++) {
- 				double cj = floor(best[ROTATE0 + j] + 0.5);
- 				mpz_set_d(c->gmp_help1, cj);
-@@ -422,7 +422,7 @@
- 			tol = 1e-5;
- 			score = ifs_rectangular(apoly.coeff, apoly.degree,
- 						best[SKEWNESS]);
--			printf("transition score %le\n", score);
-+			//printf("transition score %le\n", score);
- 		}
- 	}
- 
-@@ -430,9 +430,9 @@
- #if 0
- 	printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]);
- 	for (i = 0; i < 2; i++)
--		gmp_printf("%+Zd\n", c->gmp_lina[i]);
-+		//gmp_printf("%+Zd\n", c->gmp_lina[i]);
- 	for (i = 0; i <= deg; i++)
--		gmp_printf("%+Zd\n", c->gmp_a[i]);
-+		//gmp_printf("%+Zd\n", c->gmp_a[i]);
- #endif
- }
- 
-diff -Naur msieve-1.50/gnfs/poly/stage2/stage2.c msieve-copy/gnfs/poly/stage2/stage2.c
---- msieve-1.50/gnfs/poly/stage2/stage2.c	2011-10-09 09:32:49.000000000 +0800
-+++ msieve-copy/gnfs/poly/stage2/stage2.c	2012-11-26 23:14:30.894232552 +0800
-@@ -122,10 +122,10 @@
- 	}
- 
- #if 0
--	gmp_printf("%+Zd\n", c->gmp_lina[0]);
--	gmp_printf("%+Zd\n", c->gmp_lina[1]);
-+	//gmp_printf("%+Zd\n", c->gmp_lina[0]);
-+	//gmp_printf("%+Zd\n", c->gmp_lina[1]);
- 	for (i = 0; i <= degree; i++)
--		gmp_printf("%+Zd\n", c->gmp_a[i]);
-+		//gmp_printf("%+Zd\n", c->gmp_a[i]);
- 
- 	printf("coeff ratio = %.5lf\n",
- 		fabs(mpz_get_d(c->gmp_a[degree-2])) / coeff_bound);
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index 5df9a95f4e7e..4cf9b2d6dce3 100644
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,30 +14,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zlib +ecm mpi"
 
-DEPEND="
+RDEPEND="
 	ecm? ( sci-mathematics/gmp-ecm )
 	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}"
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# TODO: Integrate ggnfs properly
+	"${FILESDIR}"/${PN}-1.51-reduce-printf.patch
+	"${FILESDIR}"/${PN}-1.53-fix-version.patch
+)
 
 src_prepare() {
 	default
 
-	# TODO: Integrate ggnfs properly
-	eapply \
-		"${FILESDIR}"/${PN}-1.51-reduce-printf.patch \
-		"${FILESDIR}"/${PN}-1.53-fix-version.patch
-
-	sed -i -e 's/-march=k8//' Makefile 		|| die
-	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
+	sed -i -e 's/-march=k8//' Makefile || die
+	sed -i -e 's/CC =/#CC =/' Makefile || die
+	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile || die
 	sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die
 }
 
 src_compile() {
-	use ecm && export "ECM=1"
-	use mpi && export "MPI=1"
-	use zlib && export "ZLIB=1"
+	use ecm && export ECM=1
+	use mpi && export MPI=1
+	use zlib && export ZLIB=1
 	emake \
 		CC=$(tc-getCC) \
 		AR=$(tc-getAR) \
@@ -46,11 +47,12 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED}/usr/include/msieve"
-	mkdir -p "${ED}/usr/lib/"
-	mkdir -p "${ED}/usr/share/doc/${P}/"
-	cp include/* "${ED}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${ED}/usr/lib/" || die "Failed to install"
 	dobin msieve
-	cp Readme* "${ED}/usr/share/doc/${P}/" || die "Failed to install"
+
+	insinto /usr/include/msieve
+	doins -r include/.
+
+	dolib.a libmsieve.a
+
+	dodoc Readme*
 }
diff --git a/sci-mathematics/msieve/msieve-9999.ebuild b/sci-mathematics/msieve/msieve-9999.ebuild
deleted file mode 100644
index 72fa0aaf997f..000000000000
--- a/sci-mathematics/msieve/msieve-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils subversion toolchain-funcs
-
-DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
-HOMEPAGE="https://sourceforge.net/projects/msieve/"
-#SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}src.tar.gz"
-ESVN_REPO_URI="https://svn.code.sf.net/p/msieve/code/trunk"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS=""
-IUSE="zlib +ecm mpi"
-
-DEPEND="
-	ecm? ( sci-mathematics/gmp-ecm )
-	mpi? ( virtual/mpi )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# TODO: Integrate ggnfs properly
-	sed -i -e 's/-march=k8//' Makefile 		|| die
-	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
-	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
-}
-
-src_compile() {
-	use ecm && export "ECM=1"
-	use mpi && export "MPI=1"
-	use zlib && export "ZLIB=1"
-	emake \
-		CC=$(tc-getCC) \
-		AR=$(tc-getAR) \
-		OPT_FLAGS="${CFLAGS}" \
-		all
-}
-
-src_install() {
-	mkdir -p "${D}/usr/include/msieve"
-	mkdir -p "${D}/usr/lib/"
-	mkdir -p "${D}/usr/share/doc/${P}/"
-	cp include/* "${D}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${D}/usr/lib/" || die "Failed to install"
-	dobin msieve
-	cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install"
-}