commit: f20d28d20b796f2f0ea59f5b2b640b564ae554de Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 06:35:06 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Thu Nov 24 06:36:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20d28d2
dev-util/sgb: treeclean Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-util/sgb/Manifest | 2 - dev-util/sgb/files/sgb-20030623-destdir.patch | 76 ---------------------- .../sgb/files/sgb-20030623-parallel-make-fix.patch | 47 ------------- .../sgb-20090810-Fix-build-with-Clang-16.patch | 46 ------------- dev-util/sgb/metadata.xml | 7 -- dev-util/sgb/sgb-20030623-r1.ebuild | 59 ----------------- dev-util/sgb/sgb-20090810-r1.ebuild | 60 ----------------- profiles/package.mask | 5 -- 8 files changed, 302 deletions(-) diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest deleted file mode 100644 index 6a5b32d30610..000000000000 --- a/dev-util/sgb/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874 -DIST sgb-2009-08-10.tar.gz 496678 BLAKE2B 48c780259fee240e9739166a52972c4f3a37dc44d98a503b1df63aecec553a05888e11a01b8cf40c8a853f7416ce3118109aa6ce5db15fbfed1abbee552735ce SHA512 39afaaaeda9b1e2b0ecd56d8d0fee59754ee9340c497c9bd28aa19f039be605aef6c492969082c230840ca1619de3cb81ba3a38d4d7b6fdac6f19b658d4c01e2 diff --git a/dev-util/sgb/files/sgb-20030623-destdir.patch b/dev-util/sgb/files/sgb-20030623-destdir.patch deleted file mode 100644 index 0517d0ce46a3..000000000000 --- a/dev-util/sgb/files/sgb-20030623-destdir.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Nuar -Nuar work.orig/Makefile work/Makefile ---- work.orig/Makefile 2009-09-22 01:59:32.521217030 +0000 -+++ work/Makefile 2009-09-22 01:58:42.494972535 +0000 -@@ -93,50 +93,48 @@ - $(CC) $(CFLAGS) -DDATA_DIRECTORY=\"$(DATADIR)/\" -c gb_io.c - - test_io: gb_io.o -- $(CC) $(CFLAGS) test_io.c gb_io.o -o test_io -+ $(CC) $(CFLAGS) $(LDFLAGS) test_io.c gb_io.o -o test_io - - test_graph: gb_graph.o -- $(CC) $(CFLAGS) test_graph.c gb_graph.o -o test_graph -+ $(CC) $(CFLAGS) $(LDFLAGS) test_graph.c gb_graph.o -o test_graph - - test_flip: gb_flip.o -- $(CC) $(CFLAGS) test_flip.c gb_flip.o -o test_flip -+ $(CC) $(CFLAGS) $(LDFLAGS) test_flip.c gb_flip.o -o test_flip - --tests: test_io test_graph test_flip -+tests: certified -+ -+tests_phase1: test_io test_graph test_flip - ./test_io - ./test_graph - ./test_flip -- make gb_sort.o -- make lib -- make test_sample -+ -+certified tests_phase2: tests_phase1 gb_sort.o lib test_sample - - ./test_sample > sample.out - diff test.gb test.correct - diff sample.out sample.correct -- rm test.gb sample.out test_io test_graph test_flip test_sample -+ echo rm test.gb sample.out test_io test_graph test_flip test_sample - echo "Congratulations --- the tests have all been passed." - touch certified - --install: lib -- if test ! -r certified; then echo "Please run 'make tests' first!"; fi -- test -r certified -- make installdata -- - mkdir $(LIBDIR) -- - cp libgb.a $(LIBDIR) -- - mkdir $(CWEBINPUTS) -- - cp -p boilerplate.w gb_types.w $(CWEBINPUTS) -- - mkdir $(INCLUDEDIR) -- - cp -p $(HEADERS) Makefile $(INCLUDEDIR) -+install: lib certified installdata -+ - mkdir -p $(DESTDIR)$(LIBDIR) -+ - cp libgb.a $(DESTDIR)$(LIBDIR) -+ - mkdir -p $(DESTDIR)$(CWEBINPUTS) -+ - cp -p boilerplate.w gb_types.w $(DESTDIR)$(CWEBINPUTS) -+ - mkdir -p $(DESTDIR)$(INCLUDEDIR) -+ - cp -p $(HEADERS) Makefile $(DESTDIR)$(INCLUDEDIR) - - installdata: $(DATAFILES) -- - mkdir $(SGBDIR) -- - mkdir $(DATADIR) -- - cp -p $(DATAFILES) $(DATADIR) -+ - mkdir -p $(DESTDIR)$(SGBDIR) -+ - mkdir -p $(DESTDIR)$(DATADIR) -+ - cp -p $(DATAFILES) $(DESTDIR)$(DATADIR) - - installdemos: lib $(DEMOS) -- - mkdir $(BINDIR) -- - mv $(DEMOS) $(BINDIR) -+ - mkdir -p $(DESTDIR)$(BINDIR) -+ - mv $(DEMOS) $(DESTDIR)$(BINDIR) - - uninstalldemos: -- - cd $(BINDIR); rm -f $(DEMOS) -+ - cd $(DESTDIR)$(BINDIR); rm -f $(DEMOS) - - doc: - tex abstract.plaintex diff --git a/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch b/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch deleted file mode 100644 index 4a96742f24eb..000000000000 --- a/dev-util/sgb/files/sgb-20030623-parallel-make-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Nuar b/Makefile a/Makefile ---- b/Makefile 1999-12-27 22:27:24.000000000 +0000 -+++ a/Makefile 2009-09-21 11:49:40.000000000 +0000 -@@ -46,26 +46,14 @@ - - .SUFFIXES: .dvi .tex .w - --.tex.dvi: -- tex $*.tex -+all: libgb.a test_io test_graph test_flip demos - --.w.c: -- if test -r $*.ch; then ctangle $*.w $*.ch; else ctangle $*.w; fi -- --.w.tex: -- if test -r $*.ch; then cweave $*.w $*.ch; else cweave $*.w; fi -- --.w.o: -- make $*.c -- make $*.o -- --.w: -- make $*.c -- make $* -- --.w.dvi: -- make $*.tex -- make $*.dvi -+%.dvi: %.tex -+ tex $^ -+%.c: %.w -+ ctangle $^ -+%.tex: %.w -+ cweave $^ - - DATAFILES = anna.dat david.dat econ.dat games.dat homer.dat huck.dat \ - jean.dat lisa.dat miles.dat roget.dat words.dat -@@ -175,3 +163,9 @@ - - fulltar: $(ALL) ERRATA ANSI AMIGA PROTOTYPES MSVC - tar cvf sgb.tar $(ALL) ERRATA ANSI AMIGA PROTOTYPES MSVC -+ -+$(DEMOS) lib tests test_io test_graph test_flip: libgb.a -+ -+demos: $(DEMOS) -+ -+.PRECIOUS: .o .c .tex diff --git a/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch b/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch deleted file mode 100644 index d26e26a42e1e..000000000000 --- a/dev-util/sgb/files/sgb-20090810-Fix-build-with-Clang-16.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5d0845e935d9b8d4174b9d98dbc123ec5d5a3460 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Mon, 24 Oct 2022 19:54:02 +0100 -Subject: [PATCH] Fix build with Clang 16 - -Bug: https://bugs.gentoo.org/832835 ---- a/gb_graph.w -+++ b/gb_graph.w -@@ -40,11 +40,8 @@ programs at a higher level via the system loading routine. Here is - the general outline of \.{gb\_graph.c}: - - @p --#ifdef SYSV - #include <string.h> --#else - #include <strings.h> --#endif - #include <stdio.h> - #include <stdlib.h> - @h@# -@@ -63,11 +60,8 @@ interfere with GraphBase use of a useful identifier. We scotch that. - @(gb_graph.h@>= - #include <stdio.h> - #include <stdlib.h> --#ifdef SYSV - #include <string.h> --#else - #include <strings.h> --#endif - #undef min - @<Type declarations@>@; - ---- a/gb_io.w -+++ b/gb_io.w -@@ -92,11 +92,8 @@ occasion to use some of the standard string operations. - - @<Header...@>= - #include <stdio.h> --#ifdef SYSV - #include <string.h> --#else - #include <strings.h> --#endif - - @* Inputting a line. The {\sc GB\_\,IO} routines get their input from - an array called |buffer|. This array is internal to {\sc diff --git a/dev-util/sgb/metadata.xml b/dev-util/sgb/metadata.xml deleted file mode 100644 index aaab041e8885..000000000000 --- a/dev-util/sgb/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>[email protected]</email> -</maintainer> -</pkgmetadata> diff --git a/dev-util/sgb/sgb-20030623-r1.ebuild b/dev-util/sgb/sgb-20030623-r1.ebuild deleted file mode 100644 index 26b28efed229..000000000000 --- a/dev-util/sgb/sgb-20030623-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Stanford GraphBase" -HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"; -SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"; - -LICENSE="mmix" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="" - -DEPEND="virtual/tex-base" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/sgb-20030623-parallel-make-fix.patch - "${FILESDIR}"/sgb-20030623-destdir.patch -) - -src_compile() { - local vars=( - CFLAGS="${CFLAGS}" - SGBDIR=/usr/share/${PN} - INCLUDEDIR=/usr/include/sgb - LIBDIR=/usr/$(get_libdir) - BINDIR=/usr/bin - #CWEBINPUTS=/usr/share/${PN}/cweb - #LDFLAGS="${LDFLAGS}" - ) - # bug #299028 - emake -j1 "${vars[@]}" lib demos tests -} - -src_test() { - emake tests -} - -src_install() { - local vars=( - SGBDIR=/usr/share/${PN} - INCLUDEDIR=/usr/include/sgb - LIBDIR=/usr/$(get_libdir) - BINDIR=/usr/bin - CFLAGS="${CFLAGS}" - # TODO: why are they commented out above? - LDFLAGS="${LDFLAGS}" - CWEBINPUTS=/usr/share/${PN}/cweb - ) - emake DESTDIR="${D}" "${vars[@]}" install - - # we don't need no makefile - rm "${D}"/usr/include/sgb/Makefile || die - - dodoc ERRATA README -} diff --git a/dev-util/sgb/sgb-20090810-r1.ebuild b/dev-util/sgb/sgb-20090810-r1.ebuild deleted file mode 100644 index 411bb22b4b39..000000000000 --- a/dev-util/sgb/sgb-20090810-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Stanford GraphBase" -HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"; -SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"; - -LICENSE="mmix" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="virtual/tex-base" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/sgb-20030623-parallel-make-fix.patch - "${FILESDIR}"/sgb-20030623-destdir.patch - "${FILESDIR}"/sgb-20090810-Fix-build-with-Clang-16.patch -) - -src_compile() { - local vars=( - CFLAGS="${CFLAGS}" - SGBDIR=/usr/share/${PN} - INCLUDEDIR=/usr/include/sgb - LIBDIR=/usr/$(get_libdir) - BINDIR=/usr/bin - #CWEBINPUTS=/usr/share/${PN}/cweb - #LDFLAGS="${LDFLAGS}" - ) - # bug #299028 - emake -j1 "${vars[@]}" lib demos tests -} - -src_test() { - emake tests -} - -src_install() { - local vars=( - SGBDIR=/usr/share/${PN} - INCLUDEDIR=/usr/include/sgb - LIBDIR=/usr/$(get_libdir) - BINDIR=/usr/bin - CFLAGS="${CFLAGS}" - # TODO: why are they commented out above? - LDFLAGS="${LDFLAGS}" - CWEBINPUTS=/usr/share/${PN}/cweb - ) - emake DESTDIR="${D}" "${vars[@]}" install - - # we don't need no makefile - rm "${D}"/usr/include/sgb/Makefile || die - - dodoc ERRATA README -} diff --git a/profiles/package.mask b/profiles/package.mask index c87795eed151..77eb11360f65 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -417,11 +417,6 @@ dev-python/pweave # Removal after 2022-12-24. Bug #878337. app-misc/tpconfig -# Sam James <[email protected]> (2022-10-24) -# Non-free licence which prohibits any patching. Fails to build with Clang 16. -# Removal on 2022-10-24. -dev-util/sgb - # John Helmert III <[email protected]> (2022-10-16) # <OpenSSL-1.1.1 are EOL and contain known vulnerabilities. Users should # migrate to a newer branch.
