commit: ad087c9b5ff2d481a5e27d9bac677a0b96d01d45 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Apr 17 01:42:44 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Apr 17 01:42:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad087c9b
dev-util/gperf: drop 3.2, 3.2-r1 3.2.1 is the same as the patches in 3.2-r1. Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/gperf/Manifest | 2 -- dev-util/gperf/files/gperf-3.2-tests.patch | 46 ------------------------------ dev-util/gperf/gperf-3.2-r1.ebuild | 30 ------------------- dev-util/gperf/gperf-3.2.ebuild | 24 ---------------- 4 files changed, 102 deletions(-) diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest index 2349ea678119..14b59ee42ccc 100644 --- a/dev-util/gperf/Manifest +++ b/dev-util/gperf/Manifest @@ -1,4 +1,2 @@ DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4 -DIST gperf-3.2-c++.patch.xz 2096 BLAKE2B acaf0d685434afe6eb5dc2cabc507b2ebff182af65d7297a4526af547280ab49ea030edca79500414420d590e4ba1493ad061a9018a48421243276228636164b SHA512 dd405440790fd30f4cf36f1be735900fc7b6850e5477f74482d24bd7c1ce9dbe3f795158c44901cff407e51bcba669be3798efa853ca182b796be5ff77db34d4 DIST gperf-3.2.1.tar.gz 1269006 BLAKE2B a718a83c1f813c4bd09284420dd5bd760a651685a83a00899c5a24ffc93ed5e0ecbf9850059730899a86551e5234783cc3b0ccdd14e2a36c4f8f91bfea485a36 SHA512 1718fb26c176ff331be5fe3082256a36d6fc3c090993319511e363400723742e8daf4b318deafbfb57954bd41f5306443fe80b62e2aeabdb7c59335737c16226 -DIST gperf-3.2.tar.gz 1268603 BLAKE2B 6c90d665ff6b7f07862668b250ce06c5df386e6c746398ecb7d40912ed1ca820455addb9ecd17650925b6ef7cd2ff00b8ed9174e55da16a410f84d87b244e8f8 SHA512 97addf85e5b6f801f0f7084ec065d0d4a24a07f3fb6e60e2bc57b0f8813bd5db1bb4bed4f51fb96d0a8b278ffde1dfd0e42302cae911a619b95cc3cc46254fb3 diff --git a/dev-util/gperf/files/gperf-3.2-tests.patch b/dev-util/gperf/files/gperf-3.2-tests.patch deleted file mode 100644 index 191b8216f66c..000000000000 --- a/dev-util/gperf/files/gperf-3.2-tests.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://git.savannah.gnu.org/gitweb/?p=gperf.git;a=commit;h=1a8e476f99335ad5a553f24f1956a084fc6adc10 - -From 1a8e476f99335ad5a553f24f1956a084fc6adc10 Mon Sep 17 00:00:00 2001 -From: Bruno Haible <[email protected]> -Date: Wed, 9 Apr 2025 13:10:17 +0200 -Subject: [PATCH] Fix "make check" failure with an ISO C 23 conforming C - compiler. - -Prompted by -<https://lists.gnu.org/archive/html/bug-gperf/2025-04/msg00002.html>. - -* tests/smtp.gperf (my_case_strcmp, main): Convert from K&R C syntax -to ISO C 90 syntax. ---- - ChangeLog | 8 ++++++++ - tests/smtp.gperf | 8 ++------ - 2 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/tests/smtp.gperf b/tests/smtp.gperf -index da6ec7d..a5c448d 100644 ---- a/tests/smtp.gperf -+++ b/tests/smtp.gperf -@@ -124,9 +124,7 @@ Xref - #include <ctype.h> - - static int --my_case_strcmp (s1, s2) -- register const char *s1; -- register const char *s2; -+my_case_strcmp (const char *s1, const char *s2) - { - for (;;) - { -@@ -143,9 +141,7 @@ my_case_strcmp (s1, s2) - } - - int --main (argc, argv) -- int argc; -- char *argv[]; -+main (int argc, char *argv[]) - { - int i, j, k, n, exitcode; - size_t len; --- -2.17.1 diff --git a/dev-util/gperf/gperf-3.2-r1.ebuild b/dev-util/gperf/gperf-3.2-r1.ebuild deleted file mode 100644 index c1857b2012db..000000000000 --- a/dev-util/gperf/gperf-3.2-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A perfect hash function generator" -HOMEPAGE="https://www.gnu.org/software/gperf/"; -SRC_URI="mirror://gnu/gperf/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-c++.patch.xz"; - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -PATCHES=( - "${WORKDIR}"/${P}-c++.patch - "${FILESDIR}"/${P}-tests.patch -) - -src_prepare() { - default - - sed -i \ - -e "/^CPPFLAGS /s:=:+=:" \ - */Makefile.in || die #444078 -} - -src_configure() { - econf --cache-file="${S}"/config.cache -} diff --git a/dev-util/gperf/gperf-3.2.ebuild b/dev-util/gperf/gperf-3.2.ebuild deleted file mode 100644 index 0eb955fb06e1..000000000000 --- a/dev-util/gperf/gperf-3.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A perfect hash function generator" -HOMEPAGE="https://www.gnu.org/software/gperf/"; -SRC_URI="mirror://gnu/gperf/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -src_prepare() { - default - - sed -i \ - -e "/^CPPFLAGS /s:=:+=:" \ - */Makefile.in || die #444078 -} - -src_configure() { - econf --cache-file="${S}"/config.cache -}
