gentoo resync : 02.02.2022

5 files changed, 132 insertions, 32 deletions

diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 041cee2b990d..fd0b6f6d6a60 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,5 +1,6 @@
-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 msieve-1.51-reduce-printf.patch 1073 BLAKE2B a977fb38ccfe9170bee1af8bdeed846ae5b2766f5b6c5334788748efc9c0a20e212a09df472452dbe1638d2a3fe5807d5f6fb38a934b38ccb9e8731dd0f57c21 SHA512 f675bbbe6070d3908fcfaff5ae4394b48b66e002c7b721e823aae83c9810a77272f7d148eb63b7bf1d2e2a473bf3aee26cc7a5f75d3e7d4b0b93771dd76f0325
+AUX msieve-1.53-fix-version.patch 1002 BLAKE2B 76f4e62f9e7714d75d0015ef6204b4a6b38663a49c9f941f961ad604fcc221909ca1ef5758d1a7389bff23bed4b1744e6db558963ac2a441dc49fa0d45a8e1ab SHA512 5069306c34a0fbd5ac9004495b1055f6e1d5f2fda57bfdb781609db0506f2a34625bc8fc1d4d00d1acfc9d893ed2c718ebcdc33b43ab576d601f06c7572729ce
+AUX msieve-1.53-makefile.patch 2983 BLAKE2B f6f6c3ddc7447d5e2e258c8d4689693f7545596b988a0de7d71be7b2b51684f939a1032e8a828141b422a1d09a7268193160c9b791a20075b0c78bfc71bb3126 SHA512 71e171edb313f78b9fcd7528d21c26b8e2a87b2bf262421699715281b4d642844e203aea8d6c5eecd4ea3bef1ea9c8d7e304b1aec5e6bb52052a1f0201886a2c
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
-EBUILD msieve-1.53-r1.ebuild 1232 BLAKE2B 2552549e4c0ced96b57a7643f4febcbb109a40885521d23408e48d265084345e2063b2bf9acea6007f254d287bf3b49be8b5e3b4fb3ab3d5c3cae7480952e120 SHA512 cdbca923a6d310ebade396846afd725a00b837fce68a422fc706d43a30135c581ee83db290b57571dcea60f3bad0add79bcc4e691f5bef46741b9e0f388d8b91
+EBUILD msieve-1.53-r1.ebuild 1050 BLAKE2B 24d80301ad0e2dcdec4aaaa45e9f540d2227238b297592c829c7e8d2fd7b128bbf1dae256a7a4cfcc35db74316c5170647d2f2f132d93ffe934f64d2de25ab4a SHA512 97ec470ce451f50860621e675a3382e24e2676b976a1f467264f890a99944addc2328dfe11361b734bbd6463966e058f6e6c700f98105f8a287925edf8abca91
 MISC metadata.xml 333 BLAKE2B d39c13d7d0b53f9e6bcd216bdd7e517152c3c74c8ef1b22e18dcc3a390ab7124cd2d9b6cfc81d5c9f58669572eed3045033b5154136dacc1729c9d50ddf28200 SHA512 692294346a4a20ac8daffe6d52026ae20200a673f88d2753780e676fa82f2bfef44c9081350ba724985af1030aaf41197c9dc6966b6c72fa7b973c81aee1e630
diff --git a/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch b/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
index 39892716716a..e3483b8d15bb 100644
--- a/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
+++ b/sci-mathematics/msieve/files/msieve-1.51-reduce-printf.patch
@@ -1,6 +1,5 @@
-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
+--- a/common/minimize.c
++++ b/common/minimize.c
 @@ -210,7 +210,7 @@
  		}
  	}
@@ -10,9 +9,8 @@ diff -Naur msieve-1.50/common/minimize.c msieve-copy/common/minimize.c
  	*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
+--- a/gnfs/poly/stage2/optimize.c
++++ b/gnfs/poly/stage2/optimize.c
 @@ -430,9 +430,9 @@
  #if 0
  	printf("norm %.7e skew %lf\n", *pol_norm, best[SKEWNESS]);
@@ -25,9 +23,8 @@ diff -Naur msieve-1.50/gnfs/poly/stage2/optimize.c msieve-copy/gnfs/poly/stage2/
  #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
+--- a/gnfs/poly/stage2/stage2.c
++++ b/gnfs/poly/stage2/stage2.c
 @@ -122,10 +122,10 @@
  	}
  
diff --git a/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
index eb9a8d7ac2d0..c3ec73ac5987 100644
--- a/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
+++ b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
@@ -1,5 +1,3 @@
-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) {
@@ -15,8 +13,6 @@ index ffecfa9..3e1da78 100644
  	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) {
diff --git a/sci-mathematics/msieve/files/msieve-1.53-makefile.patch b/sci-mathematics/msieve/files/msieve-1.53-makefile.patch
new file mode 100644
index 000000000000..2676cefff18b
--- /dev/null
+++ b/sci-mathematics/msieve/files/msieve-1.53-makefile.patch
@@ -0,0 +1,108 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,10 +18,8 @@
+ 
+ # gcc with basic optimization (-march flag could
+ # get overridden by architecture-specific builds)
+-CC = gcc
+-WARN_FLAGS = -Wall -W
+-OPT_FLAGS = -O3 -fomit-frame-pointer -march=native \
+-	    -D_FILE_OFFSET_BITS=64 -DNDEBUG -D_LARGEFILE64_SOURCE
++CFLAGS += -Wall -W
++CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ 
+ # use := instead of = so we only run the following once
+ SVN_VERSION := $(shell svnversion .)
+@@ -29,15 +27,14 @@
+ 	SVN_VERSION := unknown
+ endif
+ 
+-CFLAGS = $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) \
+-	 	-DMSIEVE_SVN_VERSION="\"$(SVN_VERSION)\"" \
+-		-I. -Iaprcl -Iinclude -Ignfs -Ignfs/poly -Ignfs/poly/stage1
++CPPFLAGS += -DMSIEVE_SVN_VERSION="\"$(SVN_VERSION)\"" \
++	-I. -Iaprcl -Iinclude -Ignfs -Ignfs/poly -Ignfs/poly/stage1
+ 
+ # tweak the compile flags
+ 
+ ifeq ($(ECM),1)
+-	CFLAGS += -DHAVE_GMP_ECM
+-	LIBS += -lecm
++	CPPFLAGS += -DHAVE_GMP_ECM
++	LIBS += -lecm -lgomp
+ endif
+ ifeq ($(WIN),1)
+ 
+@@ -61,22 +58,21 @@
+ 	CUDA_ROOT = $(shell dirname $(NVCC))/../
+ 	CUDA_LIBS = -lcuda
+ endif
+-	CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
++	CPPFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
+ 	LIBS += $(CUDA_LIBS)
+ endif
+ ifeq ($(MPI),1)
+-	CC = mpicc
+-	CFLAGS += -DHAVE_MPI
++	CPPFLAGS += -DHAVE_MPI
+ endif
+ ifeq ($(BOINC),1)
+ 	# fill in as appropriate
+ 	BOINC_INC_DIR = .
+ 	BOINC_LIB_DIR = .
+-	CFLAGS += -I$(BOINC_INC_DIR) -DHAVE_BOINC
++	CPPFLAGS += -I$(BOINC_INC_DIR) -DHAVE_BOINC
+ 	LIBS += -L$(BOINC_LIB_DIR) -lboinc_api -lboinc
+ endif
+ ifeq ($(NO_ZLIB),1)
+-	CFLAGS += -DNO_ZLIB
++	CPPFLAGS += -DNO_ZLIB
+ else
+ 	LIBS += -lz
+ endif
+@@ -272,9 +268,9 @@
+ 
+ all: $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) $(GPU_OBJS)
+ 	rm -f libmsieve.a
+-	ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS)
+-	ranlib libmsieve.a
+-	$(CC) $(CFLAGS) demo.c -o msieve $(LDFLAGS) \
++	$(AR) r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS)
++	$(RANLIB) libmsieve.a
++	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) demo.c -o msieve \
+ 			libmsieve.a $(LIBS)
+ 
+ clean:
+@@ -287,27 +283,27 @@
+ # common file build rules
+ 
+ %.o: %.c $(COMMON_HDR)
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ # QS build rules
+ 
+ mpqs/sieve_core_generic_32k.qo: mpqs/sieve_core.c $(COMMON_HDR) $(QS_HDR)
+-	$(CC) $(CFLAGS) -DBLOCK_KB=32 -DHAS_SSE2 \
++	$(CC) $(CFLAGS) $(CPPFLAGS) -DBLOCK_KB=32 -DHAS_SSE2 \
+ 		-DROUTINE_NAME=qs_core_sieve_generic_32k \
+ 		-c -o $@ mpqs/sieve_core.c
+ 
+ mpqs/sieve_core_generic_64k.qo: mpqs/sieve_core.c $(COMMON_HDR) $(QS_HDR)
+-	$(CC) $(CFLAGS) -DBLOCK_KB=64 -DHAS_SSE2 \
++	$(CC) $(CFLAGS) $(CPPFLAGS) -DBLOCK_KB=64 -DHAS_SSE2 \
+ 		-DROUTINE_NAME=qs_core_sieve_generic_64k \
+ 		-c -o $@ mpqs/sieve_core.c
+ 
+ %.qo: %.c $(COMMON_HDR) $(QS_HDR)
+-	$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ # NFS build rules
+ 
+ %.no: %.c $(COMMON_HDR) $(NFS_HDR)
+-	$(CC) $(CFLAGS) -Ignfs -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -Ignfs -c -o $@ $<
+ 
+ # GPU build rules
+ 
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index 4cf9b2d6dce3..1f8a4593e738 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -24,26 +24,24 @@ PATCHES=(
 	# TODO: Integrate ggnfs properly
 	"${FILESDIR}"/${PN}-1.51-reduce-printf.patch
 	"${FILESDIR}"/${PN}-1.53-fix-version.patch
+	"${FILESDIR}"/${PN}-1.53-makefile.patch
 )
 
-src_prepare() {
-	default
+src_configure() {
+	tc-export AR CC RANLIB
 
-	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
+	use ecm && export ECM=1
+
+	if use mpi; then
+		export MPI=1
+		export CC=mpicc
+	fi
+
+	use zlib && export ZLIB=1
 }
 
 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
+	emake all
 }
 
 src_install() {