gentoo resync : 12.01.2019

3 files changed, 93 insertions, 0 deletions

diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 04b3e07b3b7e..cd650b49a799 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,8 +1,11 @@
 AUX fix-version.patch 499 BLAKE2B e4522d29cb5eed0eaad14ba37d9575268721457d607a7e10be571c56fcb016ec58c303df5b0b5f3430acee986d381241c39a8b1bde4eb136867552620b21d0ea SHA512 9ea8b52377cf11e6dc34860d3231dee364a8018d860a25ca25901fc00e948adb11ba767106df67e5769e6328fcb703638a14178666f53f9518c0e07b15d36767
 AUX fix-version2.patch 560 BLAKE2B 1a922dbb933781cceaf89898f8cac7e36caafb5217cf0b0f9c2dbae56d0bdc2ff66df21133a21e09f2c56b78cccda7679aa94c2d33c83623ed0c027accf5bf7f SHA512 c745b63461a76a20d32c3d022c120ed1ee201a05ed372f01381d71f4cc9601d92089acfc07bfe6930180740c4f4711b88b129d126065558d2cf6d7dd81bf78d8
 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
 DIST msieve151.tar.gz 623885 BLAKE2B a222f49fb1c6a411e1e46a7ed153e1ba24bbb604b70034c2c0632f69096e6a08a6783b25a44ffcd2d6b6962a8713455c893eb9514fb54a13f28a5b6a9aea3867 SHA512 79c03b5d669de7f05e27fc59fa999f416f513e41cba822376b862c31439fc66cf8749034c1f8f967f745955a5271a484b23e950ffede23d3fa2737ae26dbb0d4
 EBUILD msieve-1.51.ebuild 1517 BLAKE2B 3fdc54265bb1046de71e125c9548d20450cc8f63dc3e376537b33135b3a471c1b47fadd0a1709a7ab65f82eeb7e36fb140599a71583722c28c7a8876d772306b SHA512 a24368225d685a913b0231d4ca8342a3a4e551c7ee37f16fbe21ce2b957ed4fde235df48244f0723d7d37b5b4fab204b27174666dafcd595baf759c70c33d56f
+EBUILD msieve-1.53.ebuild 1539 BLAKE2B f4cb1472f9c0cab4d2d3c61b6faebefa4da58c1b2ce3e641d818d716a468b1e237943c7d8dee52d864e60b345c8633a263a798fa1dec3a90e348523a71fc66cd SHA512 02d02e2b91d52ca74129f33b4c9eec4310d79d1822473400b8bd6a0f7d6ae706bc79be207a0891285942f2899be010a0605780b4607caca6d9adb533c4c957b0
 EBUILD msieve-9999.ebuild 1390 BLAKE2B ff2d1e3a22f2e1b44c8f5c0c5644ba87d7f013a679a64c3ee720147465082473f74d3174c072c45d9686c15eba1928e17c916ae94900616b011faaec875937c7 SHA512 07c5ef126bd37d859d2ed826ff87ce3c7b82bb02f11a23165fddcea791e025ed671231e919b13b8a137ec0fac06270105927c30698c2ef6d56f0666dfe2a386d
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
new file mode 100644
index 000000000000..eb9a8d7ac2d0
--- /dev/null
+++ b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
@@ -0,0 +1,33 @@
+diff --git a/common/driver.c b/common/driver.c
+index ffecfa9..3e1da78 100644
+--- a/common/driver.c
++++ b/common/driver.c
+@@ -189,10 +189,9 @@ void msieve_run(msieve_obj *obj) {
+ 
+ 	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/demo.c b/demo.c
+index a882732..ec3e869 100644
+--- a/demo.c
++++ b/demo.c
+@@ -81,9 +81,8 @@ void get_random_seeds(uint32 *seed1, uint32 *seed2) {
+ /*--------------------------------------------------------------------*/
+ void print_usage(char *progname) {
+ 
+-	printf("\nMsieve v. %d.%02d (SVN %s)\n", MSIEVE_MAJOR_VERSION, 
+-					MSIEVE_MINOR_VERSION,
+-					MSIEVE_SVN_VERSION);
++	printf("\nMsieve v. %d.%02d\n", MSIEVE_MAJOR_VERSION,
++					MSIEVE_MINOR_VERSION);
+ 
+ 	printf("\nusage: %s [options] [one_number]\n", progname);
+ 	printf("\nnumbers starting with '0' are treated as octal,\n"
diff --git a/sci-mathematics/msieve/msieve-1.53.ebuild b/sci-mathematics/msieve/msieve-1.53.ebuild
new file mode 100644
index 000000000000..534207e16fb4
--- /dev/null
+++ b/sci-mathematics/msieve/msieve-1.53.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit 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 -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zlib +ecm mpi"
+
+# some linking troubles with gwnum
+DEPEND="
+	ecm? ( sci-mathematics/gmp-ecm[-gwnum] )
+	mpi? ( virtual/mpi )
+	zlib? ( sys-libs/zlib:= )"
+RDEPEND="${DEPEND}"
+
+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/LIBS += -lecm/LIBS += -lecm -lgomp/' 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 "${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 || die "Failed to install"
+	cp Readme* "${ED%/}/usr/share/doc/${P}/" || die "Failed to install"
+}