commit: aa5426a4b593ae6228fa1a98b03ec78553f1c51f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jun 14 07:20:51 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jun 14 07:21:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5426a4
www-misc/htdig: treeclean Closes: https://bugs.gentoo.org/314835 (pkgremoved) Closes: https://bugs.gentoo.org/632432 (pkgremoved) Closes: https://bugs.gentoo.org/827131 (pkgremoved) Closes: https://bugs.gentoo.org/874429 (pkgremoved) Closes: https://bugs.gentoo.org/908830 (pkgremoved) Closes: https://bugs.gentoo.org/925513 (pkgremoved) Closes: https://bugs.gentoo.org/934808 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 6 -- www-misc/htdig/Manifest | 1 - .../htdig/files/htdig-3.2.0_beta6-as-needed.patch | 61 ------------------ .../htdig-3.2.0_beta6-drop-bogus-assignment.patch | 16 ----- www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch | 15 ----- www-misc/htdig/files/htdig-3.2.0_beta6-gcc6.patch | 65 ------------------- www-misc/htdig/files/htdig-3.2.0_beta6-musl.patch | 33 ---------- .../htdig/files/htdig-3.2.0_beta6-quoting.patch | 26 -------- www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild | 75 ---------------------- www-misc/htdig/metadata.xml | 8 --- 10 files changed, 306 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index de3119a7324e..d1c1e4e04e63 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -266,12 +266,6 @@ dev-libs/icu-le-hb # Masked for testing dev-db/mysql:8.4 -# Andreas Sturmlechner <[email protected]> (2025-05-15) -# Very dead upstream, very many open bugs for years without anyone fixing. -# Bugs #314835, #632432, #827131, #874429, #908830, #925513, #934808. -# Removal on 2025-06-14. -www-misc/htdig - # Matt Turner <[email protected]> (2025-05-13) # Package is replaced by dev-util/mesa_clc. # Removal on 2025-06-12. Bug #955925. diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest deleted file mode 100644 index 916be7d46acd..000000000000 --- a/www-misc/htdig/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST htdig-3.2.0b6.tar.gz 3104936 BLAKE2B aa70026ce6fb10910c42b4091900980c78f81fc9d07b1dec4071811aee21c6d6a67a7fbb2ca59b785c457b13b508773f8ca8f96042f23def82b071fc40b00870 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064 diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch deleted file mode 100644 index 6cc9efc121d6..000000000000 --- a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/Makefile.config 2006-11-19 08:49:57.000000000 -0800 -+++ b/Makefile.config 2006-11-19 08:51:19.000000000 -0800 -@@ -22,10 +22,7 @@ - $(LOCAL_DEFINES) $(PROFILING) - - HTLIBS= $(top_builddir)/htnet/libhtnet.la \ -- $(top_builddir)/htcommon/libcommon.la \ -- $(top_builddir)/htword/libhtword.la \ - $(top_builddir)/htlib/libht.la \ - $(top_builddir)/htcommon/libcommon.la \ - $(top_builddir)/htword/libhtword.la \ -- $(top_builddir)/db/libhtdb.la \ -- $(top_builddir)/htlib/libht.la -+ $(top_builddir)/db/libhtdb.la ---- htdig-3.2.0b6/htlib/Makefile.am.orig 2006-11-19 09:13:47.000000000 -0800 -+++ htdig-3.2.0b6/htlib/Makefile.am 2006-11-19 09:17:50.000000000 -0800 -@@ -1,7 +1,8 @@ - include $(top_srcdir)/Makefile.config - - pkglib_LTLIBRARIES = libht.la -- -+libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la -+libht_la_LIBADD= $(top_builddir)/db/libhtdb.la - libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \ - DB2_db.cc IntObject.cc List.cc Object.cc \ - ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \ -@@ -17,9 +18,6 @@ - myqsort.c \ - md5.cc mhash_md5.c - --libht_la_LIBADD=@LTLIBOBJS@ --# this includes regex.c -- - libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags} - - pkginclude_HEADERS = \ ---- htdig-3.2.0b6/htword/Makefile.am.orig 2006-11-19 08:55:08.000000000 -0800 -+++ htdig-3.2.0b6/htword/Makefile.am 2006-11-19 08:56:51.000000000 -0800 -@@ -10,7 +10,8 @@ - LOCAL_DEFINES = - - pkglib_LTLIBRARIES = libhtword.la -- -+libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la -+libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la - libhtword_la_SOURCES = \ - WordBitCompress.cc \ - WordContext.cc \ - ---- htdig-3.2.0b6/htcommon/Makefile.am.orig 2006-11-19 09:32:39.000000000 -0800 -+++ htdig-3.2.0b6/htcommon/Makefile.am 2006-11-19 09:33:42.000000000 -0800 -@@ -12,7 +12,8 @@ - EXTRA_DIST=conf_lexer.cxx conf_parser.cxx - - pkglib_LTLIBRARIES = libcommon.la -- -+libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la -+libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la - libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \ - HtWordReference.cc HtWordList.cc defaults.cc \ - HtURLCodec.cc URL.cc URLTrans.cc \ diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch deleted file mode 100644 index 2328280e3174..000000000000 --- a/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- htdig-3.2.0b6.orig/htdig/Parsable.cc -+++ htdig-3.2.0b6/htdig/Parsable.cc -@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever - retriever.got_word(w, wordindex++, slot); // slot for img_alt - w = HtWordToken(0); - } -- w = '\0'; - } - - //***************************************************************************** -@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re - retriever.got_word(w, wordindex++, 9); - w = HtWordToken(0); - } -- w = '\0'; - } diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch deleted file mode 100644 index 6054df50d54f..000000000000 --- a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h ---- a/htsearch/Collection.h 2004-05-28 06:15:24.000000000 -0700 -+++ b/htsearch/Collection.h 2006-03-22 11:35:40.000000000 -0800 -@@ -36,9 +36,9 @@ public: - const char *docExcerpt); - ~Collection(); - -- void Collection::Open(); -+ void Open(); - -- void Collection::Close(); -+ void Close(); - - char *getWordFile() { return wordFile.get(); } - DocumentRef *getDocumentRef(int id); diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc6.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc6.patch deleted file mode 100644 index 095ec92f2e3e..000000000000 --- a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc6.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/htfuzzy/Accents.cc -+++ b/htfuzzy/Accents.cc -@@ -44,38 +44,38 @@ - `--------------------------------------------------*/ - - static char MinusculeISOLAT1[256] = { -- 0, 1, 2, 3, 4, 5, 6, 7, -- 8, 9, 10, 11, 12, 13, 14, 15, -- 16, 17, 18, 19, 20, 21, 22, 23, -- 24, 25, 26, 27, 28, 29, 30, 31, -- 32, 33, 34, 35, 36, 37, 38, 39, -- 40, 41, 42, 43, 44, 45, 46, 47, -- 48, 49, 50, 51, 52, 53, 54, 55, -- 56, 57, 58, 59, 60, 61, 62, 63, -- 64, 'a', 'b', 'c', 'd', 'e', 'f', 'g', -+ (char) 0, (char) 1, (char) 2, (char) 3, (char) 4, (char) 5, (char) 6, (char) 7, -+ (char) 8, (char) 9, (char) 10, (char) 11, (char) 12, (char) 13, (char) 14, (char) 15, -+ (char) 16, (char) 17, (char) 18, (char) 19, (char) 20, (char) 21, (char) 22, (char) 23, -+ (char) 24, (char) 25, (char) 26, (char) 27, (char) 28, (char) 29, (char) 30, (char) 31, -+ (char) 32, (char) 33, (char) 34, (char) 35, (char) 36, (char) 37, (char) 38, (char) 39, -+ (char) 40, (char) 41, (char) 42, (char) 43, (char) 44, (char) 45, (char) 46, (char) 47, -+ (char) 48, (char) 49, (char) 50, (char) 51, (char) 52, (char) 53, (char) 54, (char) 55, -+ (char) 56, (char) 57, (char) 58, (char) 59, (char) 60, (char) 61, (char) 62, (char) 63, -+ (char) 64, 'a', 'b', 'c', 'd', 'e', 'f', 'g', - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', -- 'x', 'y', 'z', 91, 92, 93, 94, 95, -- 96, 'a', 'b', 'c', 'd', 'e', 'f', 'g', -+ 'x', 'y', 'z', (char) 91, (char) 92, (char) 93, (char) 94, (char) 95, -+ (char) 96, 'a', 'b', 'c', 'd', 'e', 'f', 'g', - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', -- 'x', 'y', 'z', 123, 124, 125, 126, 127, -- 128, 129, 130, 131, 132, 133, 134, 135, -- 136, 137, 138, 139, 140, 141, 142, 143, -- 144, 145, 146, 147, 148, 149, 150, 151, -- 152, 153, 154, 155, 156, 157, 158, 159, -- 160, 161, 162, 163, 164, 165, 166, 167, -- 168, 168, 170, 171, 172, 173, 174, 175, -- 176, 177, 178, 179, 180, 181, 182, 183, -- 184, 185, 186, 187, 188, 189, 190, 191, -+ 'x', 'y', 'z', (char) 123, (char) 124, (char) 125, (char) 126, (char) 127, -+ (char) 128, (char) 129, (char) 130, (char) 131, (char) 132, (char) 133, (char) 134, (char) 135, -+ (char) 136, (char) 137, (char) 138, (char) 139, (char) 140, (char) 141, (char) 142, (char) 143, -+ (char) 144, (char) 145, (char) 146, (char) 147, (char) 148, (char) 149, (char) 150, (char) 151, -+ (char) 152, (char) 153, (char) 154, (char) 155, (char) 156, (char) 157, (char) 158, (char) 159, -+ (char) 160, (char) 161, (char) 162, (char) 163, (char) 164, (char) 165, (char) 166, (char) 167, -+ (char) 168, (char) 168, (char) 170, (char) 171, (char) 172, (char) 173, (char) 174, (char) 175, -+ (char) 176, (char) 177, (char) 178, (char) 179, (char) 180, (char) 181, (char) 182, (char) 183, -+ (char) 184, (char) 185, (char) 186, (char) 187, (char) 188, (char) 189, (char) 190, (char) 191, - 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'c', - 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', -- 208, 'n', 'o', 'o', 'o', 'o', 'o', 'o', -- 'o', 'u', 'u', 'u', 'u', 'y', 222, 223, -+ (char) 208, 'n', 'o', 'o', 'o', 'o', 'o', 'o', -+ 'o', 'u', 'u', 'u', 'u', 'y', (char) 222, (char) 223, - 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'c', - 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', -- 240, 'n', 'o', 'o', 'o', 'o', 'o', 'o', -- 'o', 'u', 'u', 'u', 'u', 'y', 254, 255}; -+ (char) 240, 'n', 'o', 'o', 'o', 'o', 'o', 'o', -+ 'o', 'u', 'u', 'u', 'u', 'y', (char) 254, (char) 255}; - - - //***************************************************************************** diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-musl.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-musl.patch deleted file mode 100644 index 5b405993a792..000000000000 --- a/www-misc/htdig/files/htdig-3.2.0_beta6-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -176,7 +176,7 @@ - AC_FUNC_STRFTIME - AC_FUNC_STRPTIME - AC_FUNC_VPRINTF --AC_CHECK_FUNCS([alarm btowc bzero ftime getcwd gettimeofday localtime_r memcmp memcpy memmove memset mkstemp munmap pstat_getdynamic raise re_comp regcomp select setlocale strchr strcspn strdup strerror strrchr strstr strtol strtoul timegm]) -+AC_CHECK_FUNCS([alarm btowc bzero ftime getcwd gettimeofday localtime_r memcmp memcpy memmove memset mkstemp munmap pstat_getdynamic raise re_comp regcomp rresvport select setlocale strchr strcspn strdup strerror strrchr strstr strtol strtoul timegm]) - AC_REPLACE_FUNCS(snprintf vsnprintf) - - # More header checks--here use C++ -diff -ur a/htdig-3.2.0b6/htnet/Connection.cc b/htdig-3.2.0b6/htnet/Connection.cc ---- a/htnet/Connection.cc -+++ b/htnet/Connection.cc -@@ -64,7 +64,7 @@ - - typedef void (*SIGNAL_HANDLER) (...); - --#ifndef _MSC_VER /* _WIN32 */ -+#ifdef HAVE_RRESVPORT - extern "C" { - int rresvport(int *); - } -@@ -161,8 +161,7 @@ - { - int aport = IPPORT_RESERVED - 1; - --// Native Windows (MSVC) has no rresvport --#ifndef _MSC_VER /* _WIN32 */ -+#ifdef HAVE_RRESVPORT - sock = rresvport(&aport); - #else - return NOTOK; diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch deleted file mode 100644 index 57b0e3b78731..000000000000 --- a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: htdig-3.2.0b6/htsearch/Display.cc -=================================================================== ---- htdig-3.2.0b6.orig/htsearch/Display.cc -+++ htdig-3.2.0b6/htsearch/Display.cc -@@ -137,7 +137,7 @@ Display::display(int pageNumber) - // Must temporarily stash the message in a String, since - // displaySyntaxError will overwrite the static temp used in form. - -- String s(form("No such sort method: `%s'", (const char*)config->Find("sort"))); -+ String s("invalid sort method"); - - displaySyntaxError(s); - return; -Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc -=================================================================== ---- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc -+++ htdig-3.2.0b6/libhtdig/ResultFetch.cc -@@ -142,7 +142,7 @@ ResultFetch::fetch() - // Must temporarily stash the message in a String, since - // displaySyntaxError will overwrite the static temp used in form. - -- String s(form("No such sort method: `%s'", (const char *) config->Find("sort"))); -+ String s("invalid sort method"); - - displaySyntaxError(s); - //return; diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild deleted file mode 100644 index 6b051b3c0857..000000000000 --- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -MY_PV="${PV/_beta/b}" - -DESCRIPTION="HTTP/HTML indexing and searching system" -HOMEPAGE="https://htdig.sourceforge.net/"; -SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="ssl" - -DEPEND=" - sys-libs/zlib - app-arch/unzip - ssl? ( - dev-libs/openssl:0= - )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${P}-gcc4.patch - "${FILESDIR}"/${P}-as-needed.patch - "${FILESDIR}"/${P}-quoting.patch - "${FILESDIR}"/${P}-gcc6.patch - "${FILESDIR}"/${P}-musl.patch - "${FILESDIR}"/${P}-drop-bogus-assignment.patch #638720 -) -HTML_DOCS=( htdoc/. ) - -src_prepare() { - default - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die - eautoreconf -} - -src_configure() { - # "WordDBPage.h:309:76: error: reference to 'byte' is ambiguous" - # bug #787716 - append-cxxflags -std=c++14 - - local myeconfargs=( - --disable-static - --with-config-dir="${EPREFIX}"/etc/${PN} - --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf - --with-database-dir="${EPREFIX}"/var/lib/${PN}/db - --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin - --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} - --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} - $(use_with ssl) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - sed -i "s:${D}::g" \ - "${ED}"/etc/${PN}/${PN}.conf \ - "${ED}"/usr/bin/rundig \ - || die "sed failed (removing \${D} from installed files)" - - # symlink htsearch so it can be easily found. see bug #62087 - dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/www-misc/htdig/metadata.xml b/www-misc/htdig/metadata.xml deleted file mode 100644 index 78e603166211..000000000000 --- a/www-misc/htdig/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Webapps</name> -</maintainer> -</pkgmetadata>
