summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2021-03-30 11:23:57 +0200
committerDavid Seifert <soap@gentoo.org>2021-03-30 11:23:57 +0200
commit0ae0c92d4b93d66262b56b6f2c58150bcf80369e (patch)
treec3be53cc33142d67635b8ea8483c40c5b58417bc
parentdev-lang/ats: Remove last-rited pkg (diff)
downloadgentoo-0ae0c92d4b93d66262b56b6f2c58150bcf80369e.tar.gz
gentoo-0ae0c92d4b93d66262b56b6f2c58150bcf80369e.tar.bz2
gentoo-0ae0c92d4b93d66262b56b6f2c58150bcf80369e.zip
sci-mathematics/ggnfs: Remove last-rited pkg
Closes: https://bugs.gentoo.org/454074 Closes: https://bugs.gentoo.org/542280 Closes: https://bugs.gentoo.org/708508 Closes: https://bugs.gentoo.org/728026 Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--profiles/package.mask6
-rw-r--r--sci-mathematics/ggnfs/Manifest4
-rw-r--r--sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch158
-rw-r--r--sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild66
-rw-r--r--sci-mathematics/ggnfs/metadata.xml11
5 files changed, 0 insertions, 245 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 29fb85c5fa04..8d8b27c3192e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -383,12 +383,6 @@ dev-ml/core_extended
media-gfx/openexr_viewers
# Sam James <sam@gentoo.org> (2021-02-27)
-# Fails to build with GCC 10 (or otherwise!)
-# bug #708508, bug #728026, bug #542280
-# Removal in 30 days
-sci-mathematics/ggnfs
-
-# Sam James <sam@gentoo.org> (2021-02-27)
# Broken with newer(?) dev-scheme/guile, dead upstream
# bug #642736, bug #773196
# Removal in 30 days
diff --git a/sci-mathematics/ggnfs/Manifest b/sci-mathematics/ggnfs/Manifest
deleted file mode 100644
index 819bd3405b9a..000000000000
--- a/sci-mathematics/ggnfs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST def-nm-params.txt 3495 BLAKE2B b3128f209a7849ab377b7faad65e7ee8b70c316e72530ad27d4bbdef447104d8af2249ebf7bb5d0036e41c61b61e309ca862c3c9f3d67285eba85fe8ce69e69b SHA512 b924292bc5354f87a3f88f2c35b767b9183704ced61c0e709cdd0974a2e1f34a4c170c6d12524b10162f63306f74001ad30e82ac7997d98db823006086772460
-DIST def-par.txt 4957 BLAKE2B 5e59798d257e96b3908163877b46919ca9e48cb72e678c3794b4e20425863c35cce57c8dadca99a670d46ed341b9d1a229b1277b60e5055646df267823bbd873 SHA512 fc0851513b1170e0a43e7458e24da4274146272018b7fefbe35280005ebeba20458756c4d4715b2a98780354dd1c5bcf31d98dd1388f1d352fb718062141c434
-DIST ggnfs-0.77.1.zip 2279013 BLAKE2B 25b825e0fa200ba64f450ccb6cda0fb6633e215210cf3dda6a3f8d8cf53601f4631f5deb81047347a927b9c9b7ef2bbf4de4e370d7c5d9a911cfcc11a75762ff SHA512 77f5050d1310df5de45e80a25c8421cc9240ce11776fc4af596ce19d8b064b926dcc7e6dd7b2ef12d86056f7af0b67db2f746fc261cba24bbcf1efef06287513
-DIST ggnfs-doc.pdf 252344 BLAKE2B 11851d276db415e07457106538833b9ff0d579f9a0312098067a297924114e2700bb8fa6ba5f86d6f64818fdf7a4608bc49dd4ce730abc2c99a1e9f195242fe4 SHA512 60f4153dbd31d7484b37a4f805eb71c9a785af884f228039136cd92e64ef145593dc0fde9e6f1c58a11d2d5124760d08d66566134f764e65f7dce86a36a11f01
diff --git a/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch b/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch
deleted file mode 100644
index ac7516034147..000000000000
--- a/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch
+++ /dev/null
@@ -1,158 +0,0 @@
- src/Makefile | 34 +++++++++++++++++-----------------
- src/lasieve4/Makefile | 6 +++---
- src/pol5/Makefile | 8 ++++----
- 3 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 01f66be..59b433f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,15 +1,15 @@
- # Workaround for PPC
- # Due to unknown reason -march isn't supported there
- ifeq ($(ARCH),970)
-- ALLOPT=-mcpu=$(ARCH) -m64 -pipe
-+ ALLOPT=
- else
-- ALLOPT=-march=$(ARCH) -pipe
-+ ALLOPT=
- endif
-
- INC=-I. -I.. -I../include $(LOCALINC)
- LIBS=-lgmp -lm
- BINDIR=../bin
--LIBFLAGS=$(LOCALLIB)
-+LDFLAGS+=$(LOCALLIB)
-
- MATBUILD_TPIE=0
- TPIE_DIR=../../tpie
-@@ -17,7 +17,7 @@ TPIE_DIR=../../tpie
- # Turn on\off workaround for GMP 4.2 bug
- # Consult http://swox.com/list-archives/gmp-bugs/2006-May/000475.html
- # for more info
--GMP_BUG=1
-+GMP_BUG=0
-
- ifeq ($(HOST),generic)
- ALLOPT+= -DGGNFS_HOST_GENERIC
-@@ -32,10 +32,10 @@ ifeq ($(ARCH),prescott)
- ALLOPT+= -DL2_CACHE_SIZE=1024
- endif
-
--DEBUGOPT=-W -Wall -g -pg
-+DEBUGOPT=-W -Wall
-
--CFLAGS=-DNDEBUG -O3 -funroll-loops -finline-functions \
-- -ftracer -fomit-frame-pointer -W -Wall $(ALLOPT)
-+CFLAGS+=-DNDEBUG \
-+ -W -Wall $(ALLOPT)
- # CFLAGS=$(DEBUGOPT) $(ALLOPT)
- # -ffast-math removed since -funsafe-math-optimizations seems to cause occasional problems, especially in sqrt
-
-@@ -71,7 +71,7 @@ endif
- ifeq ($(MATBUILD_TPIE),1)
- BINS+= $(BINDIR)/matbuild-tpie
- INC+= -I$(TPIE_DIR)/include
-- LIBFLAGS+= -L$(TPIE_DIR)/lib
-+ LDFLAGS+= -L$(TPIE_DIR)/lib
- LIBS+=-ltpie
- endif
-
-@@ -97,35 +97,35 @@ bins : $(BINS)
- $(CC) $(CFLAGS) -o $@ -c $*.S
-
- $(BINDIR)/sieve : sieve.c clsieve.c $(OBJS) makefb.o
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- $(BINDIR)/makefb : makefb.c $(OBJS)
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -D_MAKEFB_STANDALONE -o $@ \
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -D_MAKEFB_STANDALONE -o $@ \
- makefb.c $(OBJS) $(LIBS)
-
- $(BINDIR)/procrels : procrels.c $(OBJS)
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ procrels.c $(OBJS) $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ procrels.c $(OBJS) $(LIBS)
-
- $(BINDIR)/matbuild : matbuild.c $(OBJS)
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matbuild.c combparts.c \
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matbuild.c combparts.c \
- $(OBJS) $(LIBS)
-
- $(BINDIR)/matbuild-tpie : matbuild.c $(OBJS)
-- $(CPP) $(INC) $(CFLAGS) $(LIBFLAGS) -DGGNFS_TPIE -o $@ matbuild.c \
-+ $(CPP) $(INC) $(CFLAGS) $(LDFLAGS) -DGGNFS_TPIE -o $@ matbuild.c \
- experimental/combparts_tpie.cpp experimental/llist_tpie.cpp \
- $(OBJS) $(LIBS)
-
- $(BINDIR)/matprune : matprune.c $(OBJS)
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matprune.c $(OBJS) $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matprune.c $(OBJS) $(LIBS)
-
- $(BINDIR)/matsolve : matsolve.c $(OBJS)
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matsolve.c $(OBJS) $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matsolve.c $(OBJS) $(LIBS)
-
- $(BINDIR)/sqrt : sqrt.c $(OBJS)
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ sqrt.c $(OBJS) $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ sqrt.c $(OBJS) $(LIBS)
-
- $(BINDIR)/polyselect : polyselect.c $(OBJS)
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ polyselect.c $(OBJS) $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ polyselect.c $(OBJS) $(LIBS)
-
- latsiever :
- $(MAKE) -C lasieve4
-diff --git a/src/lasieve4/Makefile b/src/lasieve4/Makefile
-index 31e05a9..6886b16 100644
---- a/src/lasieve4/Makefile
-+++ b/src/lasieve4/Makefile
-@@ -10,8 +10,8 @@
- # 6/13/04: Hacked up for use in GGNFS by Chris Monico.
-
- INC=-I.. -I../../include $(LOCALINC)
--LIBFLAGS=-L. $(LOCALLIB)
--CFLAGS+=-Os
-+LDFLAGS+=-L. $(LOCALLIB)
-+CFLAGS+=
-
- BINDIR=../../bin
- FACT=prho.o
-@@ -58,7 +58,7 @@ gnfs-lasieve4eI%.o: gnfs-lasieve4e.c lasieve.h asm/siever-config.h
-
- $(BINDIR)/gnfs-lasieve4I%e: gnfs-lasieve4eI%.o $(OBJS) libgmp-aux.a \
- asm/liblasieve.a asm/liblasieveI%.a $(FACT)
-- $(CC) $(CFLAGS) $(INC) $(LIBFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(CFLAGS) $(INC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- asm/lib%.a:
- $(MAKE) -C asm
-diff --git a/src/pol5/Makefile b/src/pol5/Makefile
-index 44b08be..e474ffb 100644
---- a/src/pol5/Makefile
-+++ b/src/pol5/Makefile
-@@ -1,6 +1,6 @@
- BINDIR=../../bin
- INC=-I.. -I../../include $(LOCALINC)
--LIBFLAGS=$(LOCALLIB)
-+LDFLAGS+=$(LOCALLIB)
- LIBS=-lm -lgmp
- CFLAGS2=
-
-@@ -46,13 +46,13 @@ all: $(BINS)
- $(CC) $(INC) -c $(CFLAGS) $(CFLAGS2) $^
-
- $(BINDIR)/pol51m0b: pol51m0b.o $(OBJS) $(OBJS2)
-- $(CC) $(INC) -o $@ $(CFLAGS) $(CFLAGS2) $^ $(LIBFLAGS) $(LIBS)
-+ $(CC) $(INC) $(LDFLAGS) -o $@ $(CFLAGS) $(CFLAGS2) $^ $(LIBS)
-
- $(BINDIR)/pol51m0n: pol51m0n.o $(OBJS) $(OBJS3)
-- $(CC) $(INC) $(CFLAGS) $(CFLAGS2) -o $@ $^ $(LIBFLAGS) $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(CFLAGS2) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- $(BINDIR)/pol51opt: pol51opt.o $(OBJS) $(OBJS4)
-- $(CC) $(INC) $(CFLAGS) $(CFLAGS2) -o $@ $^ $(LIBFLAGS) $(LIBS)
-+ $(CC) $(INC) $(CFLAGS) $(CFLAGS2) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- clean : ;
- rm -f $(BINS) *.o core
diff --git a/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild b/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild
deleted file mode 100644
index c110cabe74c1..000000000000
--- a/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A suite of algorithms to help factoring large integers"
-# inactive old homepage exists, this is a fork
-HOMEPAGE="https://github.com/radii/ggnfs"
-# snapshot because github makes people stupid
-SRC_URI="
- http://dev.gentooexperimental.org/~dreeevil/${P}.zip
- http://stuff.mit.edu/afs/sipb/project/pari-gp/ggnfs/Linux/src/def-par.txt
- http://stuff.mit.edu/afs/sipb/project/pari-gp/ggnfs/Linux/src/def-nm-params.txt
- http://gentooexperimental.org/~patrick/ggnfs-doc.pdf"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/gmp-4.3:0
- app-arch/unzip"
-RDEPEND="${DEPEND}
- !sci-mathematics/cado-nfs" # file collisions, fixable
-
-S=${WORKDIR}/${PN}-master
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- echo "#define GGNFS_VERSION \"0.77.1-$ARCH\"" > include/version.h || die
- # fix directory symlink, add missing targets, rewrite variable used by portage internally
- cd src/lasieve4 && rm -f -r asm && ln -s ppc32 asm || die
- sed -i -e 's/all: liblasieve.a/all: liblasieve.a liblasieveI11.a liblasieveI15.a liblasieveI16.a/' asm/Makefile || die
- cd "${S}"
- sed -i -e 's/ARCH/MARCH/g' Makefile src/Makefile || die
- sed -i -e 's/$(LSBINS) strip/$(LSBINS)/' src/Makefile || die #No stripping!
- sed -i -e 's/SVN \$Revision\$/0.77.1 snapshot/' src/experimental/lasieve4_64/gnfs-lasieve4e.c src/lasieve4/gnfs-lasieve4e.c || die
- tc-export CC
-}
-
-src_configure() { :; }
-
-src_compile() {
- # setting MARCH like this is fugly, but it uses -march=$ARCH - better fix welcome
- # it also assumes a recent-ish compiler
- cd src
- HOST="generic" MARCH="${ARCH}" emake -j1
-}
-
-src_install() {
- mkdir -p "${D}/usr/bin/"
- for i in gnfs-lasieve4I11e gnfs-lasieve4I12e gnfs-lasieve4I13e gnfs-lasieve4I14e \
- gnfs-lasieve4I15e gnfs-lasieve4I16e makefb matbuild matprune matsolve pol51m0b pol51m0n \
- pol51opt polyselect procrels sieve sqrt; do
- cp "${S}/bin/${i}" "${D}/usr/bin/" || die
- done
- mkdir -p "${D}/usr/share/doc/${PN}"
- cp "${DISTDIR}/def-par.txt" "${D}/usr/share/doc/${PN}" || die
- cp "${DISTDIR}/def-nm-params.txt" "${D}/usr/share/doc/${PN}" || die
- docompress -x "/usr/share/doc/${PN}/def-par.txt"
- docompress -x "/usr/share/doc/${PN}/def-nm-params.txt"
- # TODO: docs? File collisions?
- cp ${DISTDIR}/ggnfs-doc.pdf "${D}/usr/share/doc/${PN}" || die
-}
diff --git a/sci-mathematics/ggnfs/metadata.xml b/sci-mathematics/ggnfs/metadata.xml
deleted file mode 100644
index b75f4bc2a9eb..000000000000
--- a/sci-mathematics/ggnfs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
- <upstream>
- <remote-id type="github">radii/ggnfs</remote-id>
- </upstream>
-</pkgmetadata>