gentoo resync : 05.03.2021

4 files changed, 41 insertions, 37 deletions

diff --git a/sci-mathematics/yafu/Manifest b/sci-mathematics/yafu/Manifest
index 6b6d542bf879..afa1d42ce235 100644
--- a/sci-mathematics/yafu/Manifest
+++ b/sci-mathematics/yafu/Manifest
@@ -1,5 +1,5 @@
-AUX fix-Makefile.patch 284 BLAKE2B 6ddf0a69891479ac0036f813b0ddf61fba08c7dee28d4e07c0de4bc52156f5d6addeb1aed0d72693b18e0042c15cc54a5cd2452ba0598fd4904a784156f87bb4 SHA512 40e17093675e767cae4f757e85c671b85cd83b57c71c4bf0721a26745dcd5a9a17a8160e0c4caf168f8878461597b6efa30a2f1cec83ba64319acb2787e4609a
+AUX yafu-1.34.3-Makefile.patch 211 BLAKE2B 787be431c83a03f4db65c4117f6b75b8f510dee9fcf93b8bcf20a7dcdf4393068da16720914e9dba6a098df7698a5101567b01b7f2addc1d3032ac9204a718d0 SHA512 ee88e14d5d7bc61f1666712ca96800f9f2715e3634e69edb4e8d4aceb4cc364f72fdffa7117970204574100cf3481f458dea2b5effa6b025cd26fb5c77a45d42
 DIST yafu-1.34-src.zip 686655 BLAKE2B 6c5ccb587aeacf4c72c7969d409846ad768f2f7ec1c7c100372617ce75c00a6d61a0a00691f6ebce4de1250e00cb4abe4abeee5278d2aab19d0d8861c8bd1916 SHA512 f8afba77e0286c579b4152517ba3a0b6b85d43606e4fafc653dc06b7f7c2aba0f8f3c65b38f3496657495bff476dd4cc8e06daaad8a7a78a36fc6e1c0cf046a4
-EBUILD yafu-1.34.3.ebuild 1783 BLAKE2B f282f795aee7ad51444453ae9af713d578befcbdde866497e85eacbc8a058917f8f3003a3f8f35397e6e5e74a19cf31b682eb98b0deecc49c043102e8d2c3944 SHA512 f2b86bf2c8b31f67581930fd729eaee3c27d8dd89b570b7f02e58ae4b58833abd309d3d9c1cdce0893ed149a96c25f53e52432102bdc0d063f9e21536056094c
+EBUILD yafu-1.34.3.ebuild 1351 BLAKE2B 418e096f5aa6902002b8c19c0fd0b6f8cb99311f31166c5fce27ca0fb649e1a3bda1a39fec8ccdf40917b67728db9df36b8b28c94f5c093309c737064eabf17a SHA512 0add41a99b3997be09f466d9d72ebb8580f03e320d850cbc802c26f4d08b312b81103304c284b46d7e6c9bd7d761a863c48f9edbfd7d0f42cf64131483e13f31
 EBUILD yafu-9999.ebuild 1759 BLAKE2B a37f1b0865e27fb72e2770637d9a971edfb1033bfa6db2cf7dacea96509a586975d7168f27f5d290d17a84cbf61e90cfbb421e27ef1afc2a5bf4e484ecd9a279 SHA512 024bb3283f5f22328580d3d83360e8bdf783bea00e53a83459b1dcef2a9142c86a9a2d21e061fe68817e2548735931568ec0fb73ccba3a197cd3933bb6d55c55
-MISC metadata.xml 418 BLAKE2B 23e7fc4a87c2e8ec76814728afee8c3a0e499172359958ba9c92bd7ef4c44de46b6a01cc85c1f6a8fb365708ebdb4e0af2ef2ff197e48302f1b8807367869dc1 SHA512 36f48590e2713be40668446867f7e5937dd1be766566e2c90330bd467c8797f3169c71d785d3c9a2b3d839a411332f90c4770e27875da99e9e760d60c6b79a6d
+MISC metadata.xml 404 BLAKE2B a4bacb954724b1e7513cde006d06180f16ca94c64d7fbb33fc837d4be3b468e183f0952ad50b84d04630ce319d82f35f23c7e313b5f76b790527a24477ae58cb SHA512 56722324cd3a892578f194fc2a4dc0e59e0cdd4ee516ff6aaeebd87450942163224e00b594ec034ae1d399a642510ed8d5281ccef42665c8ac95880bd78419aa
diff --git a/sci-mathematics/yafu/files/fix-Makefile.patch b/sci-mathematics/yafu/files/yafu-1.34.3-Makefile.patch
index 82b8e0d7d2ff..bee579150c9d 100644
--- a/sci-mathematics/yafu/files/fix-Makefile.patch
+++ b/sci-mathematics/yafu/files/yafu-1.34.3-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-03-17 11:20:40.248683894 +0400
-+++ Makefile	2013-03-17 11:20:47.352683657 +0400
+--- a/Makefile
++++ b/Makefile
 @@ -87,7 +87,7 @@ ifeq ($(CC),icc)
  	CFLAGS += -mtune=core2 -march=core2
  endif
diff --git a/sci-mathematics/yafu/metadata.xml b/sci-mathematics/yafu/metadata.xml
index 651621cc9277..f07f2757aeb5 100644
--- a/sci-mathematics/yafu/metadata.xml
+++ b/sci-mathematics/yafu/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <use>
-    <flag name="sieve">Use msieve for the sieving steps of NFS</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">yafu</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<use>
+		<flag name="sieve">Use msieve for the sieving steps of NFS</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">yafu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/yafu/yafu-1.34.3.ebuild b/sci-mathematics/yafu/yafu-1.34.3.ebuild
index cf1be408e987..e48b2e4b2059 100644
--- a/sci-mathematics/yafu/yafu-1.34.3.ebuild
+++ b/sci-mathematics/yafu/yafu-1.34.3.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-2)"
+inherit flag-o-matic
 
+MY_PV="$(ver_cut 1-2)"
 DESCRIPTION="Yet another factoring utility"
 HOMEPAGE="https://sourceforge.net/projects/yafu/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PV}/${PN}-${MY_PV}-src.zip"
@@ -14,42 +13,47 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}/${PN}-${MY_PV}-src.zip"
 SLOT="0"
 LICENSE="public-domain"
 KEYWORDS="~amd64 ~x86"
-# nfs is overloaded, so using less confusing sieve here
 IUSE="+sieve"
 
 DEPEND="
 	dev-libs/gmp:0=
 	sci-mathematics/gmp-ecm
 	sieve? (
+		sci-mathematics/ggnfs
 		sci-mathematics/msieve
-		sci-mathematics/ggnfs )"
+	)"
 RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}/fix-Makefile.patch"
-	# This is not nice. But then the Makefile is quite special :)
-	sed -i -e 's:../gmp/include:gmp:' Makefile 		|| die "Failed to rectify things"
-	sed -i -e 's:../gmp-ecm/include:gmp-ecm:' Makefile 	|| die "Failed to rectify things"
-	sed -i -e 's:LIBS += -L../:# LIBS += -L../:g' Makefile	|| die "Failed to rectify things"
-	sed -i -e 's:\"config.h\":<gmp-ecm/config.h>:g' top/driver.c	|| die "Failed to rectify things"
-	sed -i -e 's:# LIBS += -L../msieve/lib/linux/x86_64:LIBS += -lmsieve -lz -ldl:' Makefile	|| die "Failed to rectify things"
-	sed -i -e 's:CFLAGS = -g:#CFLAGS = -g:' Makefile	|| die "Failed to rectify things"
-	sed -i -e '/$(LIBS)$/s:$(CC):$(CC) $(LDFLAGS):g' Makefile || die
+	default
+	sed -i \
+		-e 's:../gmp/include:gmp:' \
+		-e 's:../gmp-ecm/include:gmp-ecm:' \
+		-e 's:# LIBS += -L../msieve/lib/linux/x86_64:LIBS += -lmsieve -lz -ldl:' \
+		-e 's:CFLAGS = -g:#CFLAGS = -g:' \
+		-e '/$(LIBS)$/s:$(CC):$(CC) $(LDFLAGS):g' Makefile || die
+	sed -i -e 's:\"config.h\":<gmp-ecm/config.h>:g' top/driver.c || die
 
 	# proper ggnfs default path
-	sed -i -e 's~strcpy(fobj->nfs_obj.ggnfs_dir,"./");~strcpy(fobj->nfs_obj.ggnfs_dir,"/usr/bin/");~' factor/factor_common.c || die "Failed to rectify things"
+	sed -i -e 's~strcpy(fobj->nfs_obj.ggnfs_dir,"./");~strcpy(fobj->nfs_obj.ggnfs_dir,"/usr/bin/");~' factor/factor_common.c || die
+}
+
+src_configure() {
+	append-cflags -fcommon
+	default
 }
 
 src_compile() {
-	local VAR=""
-	# hmm, not that useful:
-	#VAR="TIMING=1 "
-	use sieve && VAR+="NFS=1"
+	local VAR
+	use sieve && VAR="NFS=1"
 	use amd64 && emake $VAR x86_64
 	use x86 && emake $VAR x86
 }
 
 src_install() {
-	dobin "${S}/yafu"
+	dobin "${S}"/yafu
 	dodoc docfile.txt README yafu.ini
 }