From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sci-mathematics/yafu/Manifest | 5 +-- 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 | 55 ---------------------------- 5 files changed, 55 insertions(+), 120 deletions(-) create mode 100644 sci-mathematics/yafu/yafu-1.34.3-r1.ebuild delete mode 100644 sci-mathematics/yafu/yafu-1.34.3.ebuild delete mode 100644 sci-mathematics/yafu/yafu-9999.ebuild (limited to 'sci-mathematics/yafu') diff --git a/sci-mathematics/yafu/Manifest b/sci-mathematics/yafu/Manifest index afa1d42ce235..b8a3b6a1349e 100644 --- a/sci-mathematics/yafu/Manifest +++ b/sci-mathematics/yafu/Manifest @@ -1,5 +1,4 @@ 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 1351 BLAKE2B 418e096f5aa6902002b8c19c0fd0b6f8cb99311f31166c5fce27ca0fb649e1a3bda1a39fec8ccdf40917b67728db9df36b8b28c94f5c093309c737064eabf17a SHA512 0add41a99b3997be09f466d9d72ebb8580f03e320d850cbc802c26f4d08b312b81103304c284b46d7e6c9bd7d761a863c48f9edbfd7d0f42cf64131483e13f31 -EBUILD yafu-9999.ebuild 1759 BLAKE2B a37f1b0865e27fb72e2770637d9a971edfb1033bfa6db2cf7dacea96509a586975d7168f27f5d290d17a84cbf61e90cfbb421e27ef1afc2a5bf4e484ecd9a279 SHA512 024bb3283f5f22328580d3d83360e8bdf783bea00e53a83459b1dcef2a9142c86a9a2d21e061fe68817e2548735931568ec0fb73ccba3a197cd3933bb6d55c55 -MISC metadata.xml 404 BLAKE2B a4bacb954724b1e7513cde006d06180f16ca94c64d7fbb33fc837d4be3b468e183f0952ad50b84d04630ce319d82f35f23c7e313b5f76b790527a24477ae58cb SHA512 56722324cd3a892578f194fc2a4dc0e59e0cdd4ee516ff6aaeebd87450942163224e00b594ec034ae1d399a642510ed8d5281ccef42665c8ac95880bd78419aa +EBUILD yafu-1.34.3-r1.ebuild 1249 BLAKE2B 67b4b85adcf4f7209f55e90e054bf019b8268280598f7a1434f1bc44ebe70cb776f870e510e7c875d52b3b41de3bd252b6975535a91f956919f67014d6c52ad8 SHA512 acadd85a8e5c255aab171043c4fc5072dfae1d836d28b7e1f2d4ddb5fc2cc1963b4c3ff912e90dbef228859efd85dc8b88bdfe38600fc2b9fd54af97e73bad11 +MISC metadata.xml 321 BLAKE2B a198ce4210cbb59177aeef1e04575105f7117d292fb84fbc8ed0749043b9ce7cf429a02de9af2283b4689fca16337c88966d3ad52b8cd7fcf3b2c8ca82872652 SHA512 d59beca59e217b2192b449adb9be13f2bf301526ddc16abbdd08b248abb03f085aca725e21465f4e1aec65cce0f6cbea53ecafedfb5f87d66c8f9f74cf590e9e 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 @@ patrick@gentoo.org Patrick Lauer - - Use msieve for the sieving steps of NFS - yafu 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\"::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\"::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 deleted file mode 100644 index 3f727cf66ae4..000000000000 --- a/sci-mathematics/yafu/yafu-9999.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils subversion versionator - -DESCRIPTION="Yet another factoring utility" -HOMEPAGE="https://sourceforge.net/projects/yafu/" -#SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip" -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 )" -RDEPEND="${DEPEND}" - -src_prepare() { - cd trunk - # 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\"::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 - - # 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" -} - -src_compile() { - local VAR="" - 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 -} - -src_install() { - dobin "${S}/yafu" - dodoc docfile.txt README yafu.ini -} -- cgit v1.2.3