From 96a339dda415fc229484841a898b0b4054f1152d Mon Sep 17 00:00:00 2001
From: Jakov Smolic <jakov.smolic@sartura.hr>
Date: Tue, 30 Mar 2021 11:24:03 +0200
Subject: sci-mathematics/yafu: Remove sieve USE flag

Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
---
 sci-mathematics/yafu/metadata.xml          |  3 --
 sci-mathematics/yafu/yafu-1.34.3-r1.ebuild | 53 +++++++++++++++++++++++++++
 sci-mathematics/yafu/yafu-1.34.3.ebuild    | 59 ------------------------------
 sci-mathematics/yafu/yafu-9999.ebuild      |  9 +----
 4 files changed, 54 insertions(+), 70 deletions(-)
 create mode 100644 sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
 delete mode 100644 sci-mathematics/yafu/yafu-1.34.3.ebuild

(limited to 'sci-mathematics')

diff --git a/sci-mathematics/yafu/metadata.xml b/sci-mathematics/yafu/metadata.xml
index f07f2757aeb5..056ae1719a6e 100644
--- a/sci-mathematics/yafu/metadata.xml
+++ b/sci-mathematics/yafu/metadata.xml
@@ -5,9 +5,6 @@
 		<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>
diff --git a/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild b/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
new file mode 100644
index 000000000000..24b5c5e29c94
--- /dev/null
+++ b/sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/gmp:0=
+	sci-mathematics/gmp-ecm"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_prepare() {
+	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
+}
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
+
+src_compile() {
+	local VAR
+	use amd64 && emake $VAR x86_64
+	use x86 && emake $VAR x86
+}
+
+src_install() {
+	dobin "${S}"/yafu
+	dodoc docfile.txt README yafu.ini
+}
diff --git a/sci-mathematics/yafu/yafu-1.34.3.ebuild b/sci-mathematics/yafu/yafu-1.34.3.ebuild
deleted file mode 100644
index e48b2e4b2059..000000000000
--- a/sci-mathematics/yafu/yafu-1.34.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sieve"
-
-DEPEND="
-	dev-libs/gmp:0=
-	sci-mathematics/gmp-ecm
-	sieve? (
-		sci-mathematics/ggnfs
-		sci-mathematics/msieve
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="app-arch/unzip"
-
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
-src_prepare() {
-	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
-}
-
-src_configure() {
-	append-cflags -fcommon
-	default
-}
-
-src_compile() {
-	local VAR
-	use sieve && VAR="NFS=1"
-	use amd64 && emake $VAR x86_64
-	use x86 && emake $VAR x86
-}
-
-src_install() {
-	dobin "${S}"/yafu
-	dodoc docfile.txt README yafu.ini
-}
diff --git a/sci-mathematics/yafu/yafu-9999.ebuild b/sci-mathematics/yafu/yafu-9999.ebuild
index 3f727cf66ae4..baa6c351b546 100644
--- a/sci-mathematics/yafu/yafu-9999.ebuild
+++ b/sci-mathematics/yafu/yafu-9999.ebuild
@@ -12,16 +12,10 @@ ESVN_REPO_URI="https://svn.code.sf.net/p/yafu/code/"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS=""
-# nfs is overloaded, so using less confusing sieve here
-IUSE="+sieve"
 
 DEPEND="
 	dev-libs/gmp:0=
-	sci-mathematics/gmp-ecm
-	sieve? (
-		sci-mathematics/msieve
-		sci-mathematics/ggnfs )"
+	sci-mathematics/gmp-ecm"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -44,7 +38,6 @@ src_compile() {
 	cd trunk
 	# hmm, not that useful:
 	#VAR="TIMING=1 "
-	use sieve && VAR+="NFS=1"
 	use amd64 && emake $VAR x86_64
 	use x86 && emake $VAR x86
 }
-- 
cgit v1.2.3-65-gdbad