commit: 7cf325caa96119f512d967deca99492f63f05f41 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 27 01:42:34 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 27 01:42:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf325ca
sys-devel/reflex: drop 20221012, 20230206, 20230521 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/reflex/Manifest | 6 --- .../files/reflex-20230206-parallel-build.patch | 54 ---------------------- sys-devel/reflex/reflex-20221012.ebuild | 27 ----------- sys-devel/reflex/reflex-20230206.ebuild | 31 ------------- sys-devel/reflex/reflex-20230521.ebuild | 22 --------- 5 files changed, 140 deletions(-) diff --git a/sys-devel/reflex/Manifest b/sys-devel/reflex/Manifest index ef14edd3e006..62eca417a802 100644 --- a/sys-devel/reflex/Manifest +++ b/sys-devel/reflex/Manifest @@ -1,8 +1,2 @@ -DIST reflex-20221012.tgz 476024 BLAKE2B 63d9c0ea10d3d86651c88da4f901928d2f112d64b7e3462a6c2b4d6580a138372f2980e18d0b813579a9700084f05d77dfe2547171efa0992c24629ad31ff66e SHA512 9fcf3cd49f598af5ef0e561845c1e8b2fd50e811f5449279692820748b91e9a6a3922d3fe4224820f2c10a2f3aee3049c4f584ace4a058820db21539aa89accc -DIST reflex-20221012.tgz.asc 729 BLAKE2B 1f35909edb7e9c8a2f7fe30f430c23580a6f192cad8efa65d2b7a282aa107523b90f300908b43f4beb623041988c164da1ff04642a09558c8c24bb77fc777919 SHA512 d98d2dc2b3163784a55f197b0b00157c1906dcbdf3fbc39022d867d786c47f32e5d858eafa3cb83e068454e7198ebdae6283b49b22c6b0ae5ee38ba2ea977a7b -DIST reflex-20230206.tgz 476372 BLAKE2B d1619518546d8dbb4865f818b538624b8b88947e2f870b6fe7c26c05cc9b9d63e374bfea11c291a6d8284fcf681489345533c1480106690126b3187b2e252187 SHA512 dbbe6150145162de6cf1ec4dadcf156ba320819fc0d034a2e38443fbe2834cf342fcb47f2dbe4578f2825ba7aefe87bf7c9b6667f1733a7003b4c7fe139e8ccb -DIST reflex-20230206.tgz.asc 729 BLAKE2B 5d2e1a7baa6fc0c8c7da32884e14c6a8b647d29d830be72b381fe2e0134eeb829f78500af2be71ed81f86b9bad9a26ddcd98b233b23810eddad7d035e04363d5 SHA512 8cefa7a27e676c56de8b898a2383b6ce591ff7e704cbbd6cb7a598696a5d0d67e2b89af4a9fdcf138d728a831a80a2fb67cc7c82d21f0b9e470027e28d41ff72 -DIST reflex-20230521.tgz 480866 BLAKE2B a6f5562de3dd10343e8f11bf286256cbbd8f4f0c6d5801ba55321ad0e2599b6a591aa2436f3fcd0251426f57a2da05cf357d55e14b68fc6c75cf44d99ec41b74 SHA512 789dfa4a2f412cbfed34435a14abf70d972487f226b1df82047f1269c173edb3881bc06ac92ffa2551e34a568553832c26e2a85cb70ea718f573ae1e631b1da3 -DIST reflex-20230521.tgz.asc 729 BLAKE2B 4ae6532ffd70b46d34948eb134f5780da913e86ba86bb515da0c31ac25278ce64cdd5e66b50009854d032761264996b0085952c3b238f9fd82c613dea295dd9a SHA512 ea479a810a418c192d52b5d7180212e06b4426048525f2a845b17afd0ab9918b5e2779e545d2857f9abf89f3d56ee37fbed6330fefe4f2b81eb9ec11e0cea364 DIST reflex-20230523.tgz 480999 BLAKE2B a7306367bdf5bfb542a44f29c382a5d889a176059d95539916ab3132de06401edfd0c6a476ec66f433d56398039524d79c6879e1f24b4e813ebbba98ea434ed3 SHA512 9704b6dc3327bc017175bef21f34f53ff6614a76692deacb4af99c29bd4330e5fb7f71af6497d233acceab148bc8a7911d41d3ca224110812e5883c90cc801f2 DIST reflex-20230523.tgz.asc 729 BLAKE2B 0249d1bc4f6d6395be0f51f90e1f9834bc63cd7e4b5565e71ff0502746f45ea04b611c8db70d62513dfe95d492512cf1935f4e70d582c960f38d11e06853f54f SHA512 48e2f84c8932a038366159ea6a26eac73510bb69b6bc3c5027195682ade4ef3a33ade082b41e4d08af0c23c6692abc8ee46b261796d72709aa9568070c16c20b diff --git a/sys-devel/reflex/files/reflex-20230206-parallel-build.patch b/sys-devel/reflex/files/reflex-20230206-parallel-build.patch deleted file mode 100644 index ecfadc14639f..000000000000 --- a/sys-devel/reflex/files/reflex-20230206-parallel-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 16cc516dfbb6dac01fcd0bfcb717a681b132c0b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <[email protected]> -Date: Thu, 9 Feb 2023 20:34:48 +0100 -Subject: [PATCH] Remove .bootstrap and scan.c target race - -If the parallelism of a make invocation is great enough to generate both -.bootstrap and scan.c simultaneously, there's a great chance that the -rule in .bootstrap will be overruled by the (possibly failing) -redirection in the scan.c, resulting in an empty scan.c and a failing -build. Instead, we can use an empty scan.c as an (inaccurate) proxy for -the boostrap. - -Bug: https://bugs.gentoo.org/883611 ---- a/Makefile.in -+++ b/Makefile.in -@@ -126,14 +126,9 @@ PERF_REPORT = -p - - all: $(FLEX) - --$(FLEX): .bootstrap $(OBJECTS) $(FLEXLIB) -+$(FLEX): $(OBJECTS) $(FLEXLIB) - @ECHO_LD@$(CC) $(CFLAGS) -o $(FLEX) $(LDFLAGS) $(OBJECTS) $(FLEXLIB) $(LIBS) - --.bootstrap: initscan.c -- @rm -f scan.c -- cp $(srcdir)/initscan.c scan.c -- touch .bootstrap -- - parse.c: parse.y - $(YACC) -d $(srcdir)/parse.y - @sed '/extern char.*malloc/d' <y.tab.c >parse.tmp -@@ -145,6 +140,7 @@ parse.h: parse.c - - scan.c: scan.l - $(SHELL) $(srcdir)/mkscan.sh $(FLEX_EXEC) $(FLEX_FLAGS) $(COMPRESSION) $(srcdir)/scan.l >scan.c -+ grep . $@ || cp initscan.c scan.c - - scan$o: scan.c parse.h flexdef.h config.h - yylex$o: yylex.c parse.h flexdef.h config.h -@@ -259,8 +255,8 @@ clean :: mostlyclean - $(FLEXLIB) config.log config.cache - - distclean :: clean -- rm -f .bootstrap $(FLEX) scan.c tags TAGS Makefile man2html.tmp \ -- config.status config.h stamp-h config.log config.cache -+ rm -f $(FLEX) scan.c tags TAGS Makefile man2html.tmp config.status \ -+ config.h stamp-h config.log config.cache - - maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" --- -2.39.1 - - diff --git a/sys-devel/reflex/reflex-20221012.ebuild b/sys-devel/reflex/reflex-20221012.ebuild deleted file mode 100644 index d845c63d9f4c..000000000000 --- a/sys-devel/reflex/reflex-20221012.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc -inherit verify-sig - -DESCRIPTION="This is a variant of the flex fast lexical scanner" -HOMEPAGE="https://invisible-island.net/reflex/"; -SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"; -SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )" - -LICENSE="FLEX" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )" - -src_install() { - default - - # Workaround assumption of gzip compressed manpage - # Reported upstream via email - rm "${ED}"/usr/share/man/man1/reflex++.1.gz || die - dosym reflex.1 /usr/share/man/man1/reflex++.1 || die -} diff --git a/sys-devel/reflex/reflex-20230206.ebuild b/sys-devel/reflex/reflex-20230206.ebuild deleted file mode 100644 index 90e5689c06c3..000000000000 --- a/sys-devel/reflex/reflex-20230206.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc -inherit verify-sig - -DESCRIPTION="This is a variant of the flex fast lexical scanner" -HOMEPAGE="https://invisible-island.net/reflex/"; -SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"; -SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )" - -LICENSE="FLEX" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )" - -PATCHES=( - "${FILESDIR}"/reflex-20230206-parallel-build.patch -) - -src_install() { - default - - # Workaround assumption of gzip compressed manpage - # Reported upstream via email - rm "${ED}"/usr/share/man/man1/reflex++.1.gz || die - dosym reflex.1 /usr/share/man/man1/reflex++.1 || die -} diff --git a/sys-devel/reflex/reflex-20230521.ebuild b/sys-devel/reflex/reflex-20230521.ebuild deleted file mode 100644 index cf39cf9119e6..000000000000 --- a/sys-devel/reflex/reflex-20230521.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc -inherit verify-sig - -DESCRIPTION="This is a variant of the flex fast lexical scanner" -HOMEPAGE="https://invisible-island.net/reflex/"; -SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"; -SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )" - -LICENSE="FLEX" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )" - -src_configure() { - econf --with-manpage-format=formatted -}
