| 1 |
commit: 0ae0c92d4b93d66262b56b6f2c58150bcf80369e |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Tue Mar 30 09:23:57 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 30 09:23:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae0c92d |
| 7 |
|
| 8 |
sci-mathematics/ggnfs: Remove last-rited pkg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/454074 |
| 11 |
Closes: https://bugs.gentoo.org/542280 |
| 12 |
Closes: https://bugs.gentoo.org/708508 |
| 13 |
Closes: https://bugs.gentoo.org/728026 |
| 14 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 15 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 16 |
|
| 17 |
profiles/package.mask | 6 - |
| 18 |
sci-mathematics/ggnfs/Manifest | 4 - |
| 19 |
.../ggnfs/files/ggnfs-0.77.1-gentoo.patch | 158 --------------------- |
| 20 |
sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild | 66 --------- |
| 21 |
sci-mathematics/ggnfs/metadata.xml | 11 -- |
| 22 |
5 files changed, 245 deletions(-) |
| 23 |
|
| 24 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 25 |
index 29fb85c5fa0..8d8b27c3192 100644 |
| 26 |
--- a/profiles/package.mask |
| 27 |
+++ b/profiles/package.mask |
| 28 |
@@ -382,12 +382,6 @@ dev-ml/core_extended |
| 29 |
# Masked for removal in 30 days. |
| 30 |
media-gfx/openexr_viewers |
| 31 |
|
| 32 |
-# Sam James <sam@g.o> (2021-02-27) |
| 33 |
-# Fails to build with GCC 10 (or otherwise!) |
| 34 |
-# bug #708508, bug #728026, bug #542280 |
| 35 |
-# Removal in 30 days |
| 36 |
-sci-mathematics/ggnfs |
| 37 |
- |
| 38 |
# Sam James <sam@g.o> (2021-02-27) |
| 39 |
# Broken with newer(?) dev-scheme/guile, dead upstream |
| 40 |
# bug #642736, bug #773196 |
| 41 |
|
| 42 |
diff --git a/sci-mathematics/ggnfs/Manifest b/sci-mathematics/ggnfs/Manifest |
| 43 |
deleted file mode 100644 |
| 44 |
index 819bd3405b9..00000000000 |
| 45 |
--- a/sci-mathematics/ggnfs/Manifest |
| 46 |
+++ /dev/null |
| 47 |
@@ -1,4 +0,0 @@ |
| 48 |
-DIST def-nm-params.txt 3495 BLAKE2B b3128f209a7849ab377b7faad65e7ee8b70c316e72530ad27d4bbdef447104d8af2249ebf7bb5d0036e41c61b61e309ca862c3c9f3d67285eba85fe8ce69e69b SHA512 b924292bc5354f87a3f88f2c35b767b9183704ced61c0e709cdd0974a2e1f34a4c170c6d12524b10162f63306f74001ad30e82ac7997d98db823006086772460 |
| 49 |
-DIST def-par.txt 4957 BLAKE2B 5e59798d257e96b3908163877b46919ca9e48cb72e678c3794b4e20425863c35cce57c8dadca99a670d46ed341b9d1a229b1277b60e5055646df267823bbd873 SHA512 fc0851513b1170e0a43e7458e24da4274146272018b7fefbe35280005ebeba20458756c4d4715b2a98780354dd1c5bcf31d98dd1388f1d352fb718062141c434 |
| 50 |
-DIST ggnfs-0.77.1.zip 2279013 BLAKE2B 25b825e0fa200ba64f450ccb6cda0fb6633e215210cf3dda6a3f8d8cf53601f4631f5deb81047347a927b9c9b7ef2bbf4de4e370d7c5d9a911cfcc11a75762ff SHA512 77f5050d1310df5de45e80a25c8421cc9240ce11776fc4af596ce19d8b064b926dcc7e6dd7b2ef12d86056f7af0b67db2f746fc261cba24bbcf1efef06287513 |
| 51 |
-DIST ggnfs-doc.pdf 252344 BLAKE2B 11851d276db415e07457106538833b9ff0d579f9a0312098067a297924114e2700bb8fa6ba5f86d6f64818fdf7a4608bc49dd4ce730abc2c99a1e9f195242fe4 SHA512 60f4153dbd31d7484b37a4f805eb71c9a785af884f228039136cd92e64ef145593dc0fde9e6f1c58a11d2d5124760d08d66566134f764e65f7dce86a36a11f01 |
| 52 |
|
| 53 |
diff --git a/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch b/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch |
| 54 |
deleted file mode 100644 |
| 55 |
index ac751603414..00000000000 |
| 56 |
--- a/sci-mathematics/ggnfs/files/ggnfs-0.77.1-gentoo.patch |
| 57 |
+++ /dev/null |
| 58 |
@@ -1,158 +0,0 @@ |
| 59 |
- src/Makefile | 34 +++++++++++++++++----------------- |
| 60 |
- src/lasieve4/Makefile | 6 +++--- |
| 61 |
- src/pol5/Makefile | 8 ++++---- |
| 62 |
- 3 files changed, 24 insertions(+), 24 deletions(-) |
| 63 |
- |
| 64 |
-diff --git a/src/Makefile b/src/Makefile |
| 65 |
-index 01f66be..59b433f 100644 |
| 66 |
---- a/src/Makefile |
| 67 |
-+++ b/src/Makefile |
| 68 |
-@@ -1,15 +1,15 @@ |
| 69 |
- # Workaround for PPC |
| 70 |
- # Due to unknown reason -march isn't supported there |
| 71 |
- ifeq ($(ARCH),970) |
| 72 |
-- ALLOPT=-mcpu=$(ARCH) -m64 -pipe |
| 73 |
-+ ALLOPT= |
| 74 |
- else |
| 75 |
-- ALLOPT=-march=$(ARCH) -pipe |
| 76 |
-+ ALLOPT= |
| 77 |
- endif |
| 78 |
- |
| 79 |
- INC=-I. -I.. -I../include $(LOCALINC) |
| 80 |
- LIBS=-lgmp -lm |
| 81 |
- BINDIR=../bin |
| 82 |
--LIBFLAGS=$(LOCALLIB) |
| 83 |
-+LDFLAGS+=$(LOCALLIB) |
| 84 |
- |
| 85 |
- MATBUILD_TPIE=0 |
| 86 |
- TPIE_DIR=../../tpie |
| 87 |
-@@ -17,7 +17,7 @@ TPIE_DIR=../../tpie |
| 88 |
- # Turn on\off workaround for GMP 4.2 bug |
| 89 |
- # Consult http://swox.com/list-archives/gmp-bugs/2006-May/000475.html |
| 90 |
- # for more info |
| 91 |
--GMP_BUG=1 |
| 92 |
-+GMP_BUG=0 |
| 93 |
- |
| 94 |
- ifeq ($(HOST),generic) |
| 95 |
- ALLOPT+= -DGGNFS_HOST_GENERIC |
| 96 |
-@@ -32,10 +32,10 @@ ifeq ($(ARCH),prescott) |
| 97 |
- ALLOPT+= -DL2_CACHE_SIZE=1024 |
| 98 |
- endif |
| 99 |
- |
| 100 |
--DEBUGOPT=-W -Wall -g -pg |
| 101 |
-+DEBUGOPT=-W -Wall |
| 102 |
- |
| 103 |
--CFLAGS=-DNDEBUG -O3 -funroll-loops -finline-functions \ |
| 104 |
-- -ftracer -fomit-frame-pointer -W -Wall $(ALLOPT) |
| 105 |
-+CFLAGS+=-DNDEBUG \ |
| 106 |
-+ -W -Wall $(ALLOPT) |
| 107 |
- # CFLAGS=$(DEBUGOPT) $(ALLOPT) |
| 108 |
- # -ffast-math removed since -funsafe-math-optimizations seems to cause occasional problems, especially in sqrt |
| 109 |
- |
| 110 |
-@@ -71,7 +71,7 @@ endif |
| 111 |
- ifeq ($(MATBUILD_TPIE),1) |
| 112 |
- BINS+= $(BINDIR)/matbuild-tpie |
| 113 |
- INC+= -I$(TPIE_DIR)/include |
| 114 |
-- LIBFLAGS+= -L$(TPIE_DIR)/lib |
| 115 |
-+ LDFLAGS+= -L$(TPIE_DIR)/lib |
| 116 |
- LIBS+=-ltpie |
| 117 |
- endif |
| 118 |
- |
| 119 |
-@@ -97,35 +97,35 @@ bins : $(BINS) |
| 120 |
- $(CC) $(CFLAGS) -o $@ -c $*.S |
| 121 |
- |
| 122 |
- $(BINDIR)/sieve : sieve.c clsieve.c $(OBJS) makefb.o |
| 123 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ $^ $(LIBS) |
| 124 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 125 |
- |
| 126 |
- $(BINDIR)/makefb : makefb.c $(OBJS) |
| 127 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -D_MAKEFB_STANDALONE -o $@ \ |
| 128 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -D_MAKEFB_STANDALONE -o $@ \ |
| 129 |
- makefb.c $(OBJS) $(LIBS) |
| 130 |
- |
| 131 |
- $(BINDIR)/procrels : procrels.c $(OBJS) |
| 132 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ procrels.c $(OBJS) $(LIBS) |
| 133 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ procrels.c $(OBJS) $(LIBS) |
| 134 |
- |
| 135 |
- $(BINDIR)/matbuild : matbuild.c $(OBJS) |
| 136 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matbuild.c combparts.c \ |
| 137 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matbuild.c combparts.c \ |
| 138 |
- $(OBJS) $(LIBS) |
| 139 |
- |
| 140 |
- $(BINDIR)/matbuild-tpie : matbuild.c $(OBJS) |
| 141 |
-- $(CPP) $(INC) $(CFLAGS) $(LIBFLAGS) -DGGNFS_TPIE -o $@ matbuild.c \ |
| 142 |
-+ $(CPP) $(INC) $(CFLAGS) $(LDFLAGS) -DGGNFS_TPIE -o $@ matbuild.c \ |
| 143 |
- experimental/combparts_tpie.cpp experimental/llist_tpie.cpp \ |
| 144 |
- $(OBJS) $(LIBS) |
| 145 |
- |
| 146 |
- $(BINDIR)/matprune : matprune.c $(OBJS) |
| 147 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matprune.c $(OBJS) $(LIBS) |
| 148 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matprune.c $(OBJS) $(LIBS) |
| 149 |
- |
| 150 |
- $(BINDIR)/matsolve : matsolve.c $(OBJS) |
| 151 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ matsolve.c $(OBJS) $(LIBS) |
| 152 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ matsolve.c $(OBJS) $(LIBS) |
| 153 |
- |
| 154 |
- $(BINDIR)/sqrt : sqrt.c $(OBJS) |
| 155 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ sqrt.c $(OBJS) $(LIBS) |
| 156 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ sqrt.c $(OBJS) $(LIBS) |
| 157 |
- |
| 158 |
- $(BINDIR)/polyselect : polyselect.c $(OBJS) |
| 159 |
-- $(CC) $(INC) $(CFLAGS) $(LIBFLAGS) -o $@ polyselect.c $(OBJS) $(LIBS) |
| 160 |
-+ $(CC) $(INC) $(CFLAGS) $(LDFLAGS) -o $@ polyselect.c $(OBJS) $(LIBS) |
| 161 |
- |
| 162 |
- latsiever : |
| 163 |
- $(MAKE) -C lasieve4 |
| 164 |
-diff --git a/src/lasieve4/Makefile b/src/lasieve4/Makefile |
| 165 |
-index 31e05a9..6886b16 100644 |
| 166 |
---- a/src/lasieve4/Makefile |
| 167 |
-+++ b/src/lasieve4/Makefile |
| 168 |
-@@ -10,8 +10,8 @@ |
| 169 |
- # 6/13/04: Hacked up for use in GGNFS by Chris Monico. |
| 170 |
- |
| 171 |
- INC=-I.. -I../../include $(LOCALINC) |
| 172 |
--LIBFLAGS=-L. $(LOCALLIB) |
| 173 |
--CFLAGS+=-Os |
| 174 |
-+LDFLAGS+=-L. $(LOCALLIB) |
| 175 |
-+CFLAGS+= |
| 176 |
- |
| 177 |
- BINDIR=../../bin |
| 178 |
- FACT=prho.o |
| 179 |
-@@ -58,7 +58,7 @@ gnfs-lasieve4eI%.o: gnfs-lasieve4e.c lasieve.h asm/siever-config.h |
| 180 |
- |
| 181 |
- $(BINDIR)/gnfs-lasieve4I%e: gnfs-lasieve4eI%.o $(OBJS) libgmp-aux.a \ |
| 182 |
- asm/liblasieve.a asm/liblasieveI%.a $(FACT) |
| 183 |
-- $(CC) $(CFLAGS) $(INC) $(LIBFLAGS) -o $@ $^ $(LIBS) |
| 184 |
-+ $(CC) $(CFLAGS) $(INC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 185 |
- |
| 186 |
- asm/lib%.a: |
| 187 |
- $(MAKE) -C asm |
| 188 |
-diff --git a/src/pol5/Makefile b/src/pol5/Makefile |
| 189 |
-index 44b08be..e474ffb 100644 |
| 190 |
---- a/src/pol5/Makefile |
| 191 |
-+++ b/src/pol5/Makefile |
| 192 |
-@@ -1,6 +1,6 @@ |
| 193 |
- BINDIR=../../bin |
| 194 |
- INC=-I.. -I../../include $(LOCALINC) |
| 195 |
--LIBFLAGS=$(LOCALLIB) |
| 196 |
-+LDFLAGS+=$(LOCALLIB) |
| 197 |
- LIBS=-lm -lgmp |
| 198 |
- CFLAGS2= |
| 199 |
- |
| 200 |
-@@ -46,13 +46,13 @@ all: $(BINS) |
| 201 |
- $(CC) $(INC) -c $(CFLAGS) $(CFLAGS2) $^ |
| 202 |
- |
| 203 |
- $(BINDIR)/pol51m0b: pol51m0b.o $(OBJS) $(OBJS2) |
| 204 |
-- $(CC) $(INC) -o $@ $(CFLAGS) $(CFLAGS2) $^ $(LIBFLAGS) $(LIBS) |
| 205 |
-+ $(CC) $(INC) $(LDFLAGS) -o $@ $(CFLAGS) $(CFLAGS2) $^ $(LIBS) |
| 206 |
- |
| 207 |
- $(BINDIR)/pol51m0n: pol51m0n.o $(OBJS) $(OBJS3) |
| 208 |
-- $(CC) $(INC) $(CFLAGS) $(CFLAGS2) -o $@ $^ $(LIBFLAGS) $(LIBS) |
| 209 |
-+ $(CC) $(INC) $(CFLAGS) $(CFLAGS2) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 210 |
- |
| 211 |
- $(BINDIR)/pol51opt: pol51opt.o $(OBJS) $(OBJS4) |
| 212 |
-- $(CC) $(INC) $(CFLAGS) $(CFLAGS2) -o $@ $^ $(LIBFLAGS) $(LIBS) |
| 213 |
-+ $(CC) $(INC) $(CFLAGS) $(CFLAGS2) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 214 |
- |
| 215 |
- clean : ; |
| 216 |
- rm -f $(BINS) *.o core |
| 217 |
|
| 218 |
diff --git a/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild b/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild |
| 219 |
deleted file mode 100644 |
| 220 |
index c110cabe74c..00000000000 |
| 221 |
--- a/sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild |
| 222 |
+++ /dev/null |
| 223 |
@@ -1,66 +0,0 @@ |
| 224 |
-# Copyright 1999-2020 Gentoo Authors |
| 225 |
-# Distributed under the terms of the GNU General Public License v2 |
| 226 |
- |
| 227 |
-EAPI=5 |
| 228 |
- |
| 229 |
-inherit eutils toolchain-funcs |
| 230 |
- |
| 231 |
-DESCRIPTION="A suite of algorithms to help factoring large integers" |
| 232 |
-# inactive old homepage exists, this is a fork |
| 233 |
-HOMEPAGE="https://github.com/radii/ggnfs" |
| 234 |
-# snapshot because github makes people stupid |
| 235 |
-SRC_URI=" |
| 236 |
- http://dev.gentooexperimental.org/~dreeevil/${P}.zip |
| 237 |
- http://stuff.mit.edu/afs/sipb/project/pari-gp/ggnfs/Linux/src/def-par.txt |
| 238 |
- http://stuff.mit.edu/afs/sipb/project/pari-gp/ggnfs/Linux/src/def-nm-params.txt |
| 239 |
- http://gentooexperimental.org/~patrick/ggnfs-doc.pdf" |
| 240 |
- |
| 241 |
-SLOT="0" |
| 242 |
-LICENSE="GPL-2" |
| 243 |
-KEYWORDS="~amd64 ~x86" |
| 244 |
-IUSE="" |
| 245 |
- |
| 246 |
-DEPEND=">=dev-libs/gmp-4.3:0 |
| 247 |
- app-arch/unzip" |
| 248 |
-RDEPEND="${DEPEND} |
| 249 |
- !sci-mathematics/cado-nfs" # file collisions, fixable |
| 250 |
- |
| 251 |
-S=${WORKDIR}/${PN}-master |
| 252 |
- |
| 253 |
-src_prepare() { |
| 254 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
| 255 |
- echo "#define GGNFS_VERSION \"0.77.1-$ARCH\"" > include/version.h || die |
| 256 |
- # fix directory symlink, add missing targets, rewrite variable used by portage internally |
| 257 |
- cd src/lasieve4 && rm -f -r asm && ln -s ppc32 asm || die |
| 258 |
- sed -i -e 's/all: liblasieve.a/all: liblasieve.a liblasieveI11.a liblasieveI15.a liblasieveI16.a/' asm/Makefile || die |
| 259 |
- cd "${S}" |
| 260 |
- sed -i -e 's/ARCH/MARCH/g' Makefile src/Makefile || die |
| 261 |
- sed -i -e 's/$(LSBINS) strip/$(LSBINS)/' src/Makefile || die #No stripping! |
| 262 |
- sed -i -e 's/SVN \$Revision\$/0.77.1 snapshot/' src/experimental/lasieve4_64/gnfs-lasieve4e.c src/lasieve4/gnfs-lasieve4e.c || die |
| 263 |
- tc-export CC |
| 264 |
-} |
| 265 |
- |
| 266 |
-src_configure() { :; } |
| 267 |
- |
| 268 |
-src_compile() { |
| 269 |
- # setting MARCH like this is fugly, but it uses -march=$ARCH - better fix welcome |
| 270 |
- # it also assumes a recent-ish compiler |
| 271 |
- cd src |
| 272 |
- HOST="generic" MARCH="${ARCH}" emake -j1 |
| 273 |
-} |
| 274 |
- |
| 275 |
-src_install() { |
| 276 |
- mkdir -p "${D}/usr/bin/" |
| 277 |
- for i in gnfs-lasieve4I11e gnfs-lasieve4I12e gnfs-lasieve4I13e gnfs-lasieve4I14e \ |
| 278 |
- gnfs-lasieve4I15e gnfs-lasieve4I16e makefb matbuild matprune matsolve pol51m0b pol51m0n \ |
| 279 |
- pol51opt polyselect procrels sieve sqrt; do |
| 280 |
- cp "${S}/bin/${i}" "${D}/usr/bin/" || die |
| 281 |
- done |
| 282 |
- mkdir -p "${D}/usr/share/doc/${PN}" |
| 283 |
- cp "${DISTDIR}/def-par.txt" "${D}/usr/share/doc/${PN}" || die |
| 284 |
- cp "${DISTDIR}/def-nm-params.txt" "${D}/usr/share/doc/${PN}" || die |
| 285 |
- docompress -x "/usr/share/doc/${PN}/def-par.txt" |
| 286 |
- docompress -x "/usr/share/doc/${PN}/def-nm-params.txt" |
| 287 |
- # TODO: docs? File collisions? |
| 288 |
- cp ${DISTDIR}/ggnfs-doc.pdf "${D}/usr/share/doc/${PN}" || die |
| 289 |
-} |
| 290 |
|
| 291 |
diff --git a/sci-mathematics/ggnfs/metadata.xml b/sci-mathematics/ggnfs/metadata.xml |
| 292 |
deleted file mode 100644 |
| 293 |
index b75f4bc2a9e..00000000000 |
| 294 |
--- a/sci-mathematics/ggnfs/metadata.xml |
| 295 |
+++ /dev/null |
| 296 |
@@ -1,11 +0,0 @@ |
| 297 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 298 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 299 |
-<pkgmetadata> |
| 300 |
- <maintainer type="person"> |
| 301 |
- <email>patrick@g.o</email> |
| 302 |
- <name>Patrick Lauer</name> |
| 303 |
- </maintainer> |
| 304 |
- <upstream> |
| 305 |
- <remote-id type="github">radii/ggnfs</remote-id> |
| 306 |
- </upstream> |
| 307 |
-</pkgmetadata> |
Archives