diff options
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/Manifest.gz | bin | 51524 -> 51512 bytes | |||
-rw-r--r-- | sys-apps/gawk/Manifest | 7 | ||||
-rw-r--r-- | sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch | 193 | ||||
-rw-r--r-- | sys-apps/gawk/gawk-5.2.2.ebuild | 139 | ||||
-rw-r--r-- | sys-apps/gawk/gawk-5.3.0-r1.ebuild | 140 | ||||
-rw-r--r-- | sys-apps/pandora_box/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/pandora_box/pandora_box-0.12.0-r1.ebuild (renamed from sys-apps/pandora_box/pandora_box-0.12.0.ebuild) | 9 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/portage/portage-3.0.67.ebuild | 231 | ||||
-rw-r--r-- | sys-apps/the_silver_searcher/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-lfs-fixup-config.patch | 157 | ||||
-rw-r--r-- | sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch | 1 | ||||
-rw-r--r-- | sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild | 67 |
13 files changed, 471 insertions, 481 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 01d92aa14307..a81d20582676 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest index 2710a53ab2fc..63712086f7ce 100644 --- a/sys-apps/gawk/Manifest +++ b/sys-apps/gawk/Manifest @@ -1,11 +1,4 @@ -AUX gawk-5.3.0-str2wstr.patch 6052 BLAKE2B 6173dad2b2c246aa355d77cc2411fe272ade5a6ae13bf2abd7e275af83d5c63d6eeed68e6d789b8cec49c4db1bb336eed1373009f74c5819fd454e49dc9d2d90 SHA512 5038182b65d4ae3224a96371e5aec5fa73dc863508c5ad7e2c569cea5b87a30ce401925845276d5ee827d4dda98732b7ce075e3cf900df6e91de3b995da87970 -DIST gawk-5.2.2.tar.xz 3402872 BLAKE2B 49dd69d3e2414867d60fe42b74b39bc6858114aeeb9305ade7bfd64f1933b3c93d59d127362b614cb4b73e29279ed3b4ea9fa0da94fce98ca9925980d17b5d0c SHA512 90611e4daba7226d5ce8230843bf479dc71c0101740c005d851ef7c5b935b6cd4c42089b858abc1619adc05ed25fc7234f993690a76d2ea0b8e61bcbb7dc5a58 -DIST gawk-5.2.2.tar.xz.sig 488 BLAKE2B ad737580d7eeb556187a3eeb269decb484398ca91b0fbf08da7f78bba92328ca2fb566b00f8e880fb7c5f0f956e49f8ab9fddc73209902c420666d5413e8a467 SHA512 563911c3771feddf64810ef2480705fd470c90380c0e258940cedeef3f15d594ef657ddab267a6d958321333d466b77c9b83be2392549c959245324950fb32ed -DIST gawk-5.3.0.tar.xz 3436180 BLAKE2B 1bab754626a51679e4d6fe4552bc965f402a51d176eab30686bf19c74085fd15507b51514c3c46d38f68d3e98da4326c138411abe12e4d8793cec617b2533f3c SHA512 c274a62c7420e7b7769b8ed94db40024bd5917ff49bd50a77ad6df1f16ecf116968aaf85da94015479466bf5570b370b6fdd197f95212ae0c3509dfcb7d9e35a -DIST gawk-5.3.0.tar.xz.sig 488 BLAKE2B 9d35eca94424cc39bb52b0b790e0db0b9ee51099c40da0a8be7bc60450d227735ba51dcfc10a08f6765d2037054cb9324f0fba100ea2ad08cf56dac1e2c11ac0 SHA512 b0fd75375bee6ca113bb99b07a868729bb90a50d06bc4ff124603594cd9ba564433f69a26e8d01c30f4e4fbfb70ecad2ffa14ed93142b9a1aab2e38ae71b7903 DIST gawk-5.3.1.tar.xz 3510032 BLAKE2B be9132324344c0b052e954e004a942ff7c6b14b86b73cda491d7a33485f60341be4d8da1a06d1d7a27445b9b39a528bcce3eee9c2a3f8756de21bdc57a33f54d SHA512 c6b4c50ce565e6355ca162955072471e37541c51855c0011e834243a7390db8811344b0c974335844770e408e1f63d72d0d81459a081c392e0245c726019eaff DIST gawk-5.3.1.tar.xz.sig 488 BLAKE2B 2abafbb965912a194d047bed3ac1ef33a2b44dce0bc4b1a83a6ca3e2ecf676da0ad8333bb3817f0f32c7d67ab8662dc6086c9e1d6f2185a93d786390197fc643 SHA512 3e13b1bd598b7d4c715c802dcc9db298aeab12721620692f9dd76d3941fdfd87381f660c93be5cc04b6cd7378a6464b9033c93419dfcb514dcc33da8d0d9f502 -EBUILD gawk-5.2.2.ebuild 3492 BLAKE2B 9cbd082647f2d13f93aaa14cd25a6aeea52ab58c41cfb89a3c2f8be432df79116d042b061b25859f6c3a7598cce036cfe04a62654b023f6404c61de2bfd1d5ca SHA512 c53fa9696a835f61d3b9fd36d0dc183ab3b1e1bd78ae8ed81c89ff339930bb1a8dc7013f96a2b7a527f4ec782834a6648f943d536cad79f10992f3f3bf41a7e2 -EBUILD gawk-5.3.0-r1.ebuild 3467 BLAKE2B 2ee1c6cae8a7857182aac8e046e285e9cac56dcccb404bf20dfd59940dba077e072dcb30a3943707ad6867e7688e9e170a72f3513a23c0bd358da295232f29bb SHA512 291fa2c2896afc58beb34dba838f9113ad16842f57e23bf4187bcfd7385a8d5783ebe5d05db35d46a144079c4ccf1db66811f68f9c0e8eb15b7c724c0ad8a931 EBUILD gawk-5.3.1.ebuild 3419 BLAKE2B ae8bc034718cee2990c065cd926b88fe7e758d17089ef989e9cf6c0907f625bbaa96d4440dcfc1b0f2d2f8e3af39996a2d359b7eb19040656366c589aa67097c SHA512 3e55a703da6edd0b977b5e69c9da04788bc549ae64ccb0ced91896d3558dd8fffc136858e643053c18b6d634cdd9976a045caf3299cd2ba61017f2954f09d03f MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2 diff --git a/sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch b/sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch deleted file mode 100644 index 078ba8b1c746..000000000000 --- a/sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch +++ /dev/null @@ -1,193 +0,0 @@ -https://bugs.gentoo.org/921503 -https://lists.gnu.org/archive/html/bug-gawk/2024-01/msg00013.html -https://git.savannah.gnu.org/cgit/gawk.git/commit/?h=gawk-5.3-stable&id=e05040b5d81b5a0e809fc56df2a7c3d654c77e1d - -From e05040b5d81b5a0e809fc56df2a7c3d654c77e1d Mon Sep 17 00:00:00 2001 -From: "Arnold D. Robbins" <arnold@skeeve.com> -Date: Sun, 28 Jan 2024 20:24:09 +0200 -Subject: Bug fix in str2wstr. - ---- - node.c | 26 ++++++++++++++------------ - pc/Makefile.tst | 6 ++++++ - test/Makefile.am | 5 ++++- - test/Makefile.in | 10 +++++++++- - test/Maketests | 5 +++++ - test/match4.awk | 1 + - test/match4.ok | 1 + - 10 files changed, 56 insertions(+), 14 deletions(-) - create mode 100644 test/match4.awk - create mode 100644 test/match4.ok - -diff --git a/node.c b/node.c -index de12f05..5aac5e8 100644 ---- a/node.c -+++ b/node.c -@@ -816,6 +816,20 @@ str2wstr(NODE *n, size_t **ptr) - assert((n->flags & (STRING|STRCUR)) != 0); - - /* -+ * For use by do_match, create and fill in an array. -+ * For each byte `i' in n->stptr (the original string), -+ * a[i] is equal to `j', where `j' is the corresponding wchar_t -+ * in the converted wide string. -+ * -+ * This is needed even for Nnull_string or Null_field. -+ * -+ * Create the array. -+ */ -+ if (ptr != NULL) { -+ ezalloc(*ptr, size_t *, sizeof(size_t) * (n->stlen + 1), "str2wstr"); -+ } -+ -+ /* - * Don't convert global null string or global null field - * variables to a wide string. They are both zero-length anyway. - * This also avoids future double-free errors while releasing -@@ -848,18 +862,6 @@ str2wstr(NODE *n, size_t **ptr) - emalloc(n->wstptr, wchar_t *, sizeof(wchar_t) * (n->stlen + 1), "str2wstr"); - wsp = n->wstptr; - -- /* -- * For use by do_match, create and fill in an array. -- * For each byte `i' in n->stptr (the original string), -- * a[i] is equal to `j', where `j' is the corresponding wchar_t -- * in the converted wide string. -- * -- * Create the array. -- */ -- if (ptr != NULL) { -- ezalloc(*ptr, size_t *, sizeof(size_t) * (n->stlen + 1), "str2wstr"); -- } -- - sp = n->stptr; - src_count = n->stlen; - memset(& mbs, 0, sizeof(mbs)); -diff --git a/pc/Makefile.tst b/pc/Makefile.tst -index daf3c56..9ab61c7 100644 ---- a/pc/Makefile.tst -+++ b/pc/Makefile.tst -@@ -180,6 +180,7 @@ BASIC_TESTS = \ - substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \ - trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \ - unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \ -+ match4 \ - widesub4 wjposer1 zero2 zeroe0 zeroflag - - UNIX_TESTS = \ -@@ -2602,6 +2603,11 @@ widesub3: - AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - -+match4: -+ @echo $@ -+ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ -+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -+ - widesub4: - @echo $@ $(ZOS_FAIL) - @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \ -diff --git a/test/Makefile.am b/test/Makefile.am -index a876b3a..e1e1f3f 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -1,7 +1,7 @@ - # - # test/Makefile.am --- automake input file for gawk - # --# Copyright (C) 1988-2023 the Free Software Foundation, Inc. -+# Copyright (C) 1988-2024 the Free Software Foundation, Inc. - # - # This file is part of GAWK, the GNU implementation of the - # AWK Programming Language. -@@ -763,6 +763,8 @@ EXTRA_DIST = \ - match3.awk \ - match3.in \ - match3.ok \ -+ match4.awk \ -+ match4.ok \ - math.awk \ - math.ok \ - mbfw1.awk \ -@@ -1544,6 +1546,7 @@ BASIC_TESTS = \ - substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \ - trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \ - unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \ -+ match4 \ - widesub4 wjposer1 zero2 zeroe0 zeroflag - - UNIX_TESTS = \ -diff --git a/test/Makefile.in b/test/Makefile.in -index 1ef143f..681a85b 100644 ---- a/test/Makefile.in -+++ b/test/Makefile.in -@@ -17,7 +17,7 @@ - # - # test/Makefile.am --- automake input file for gawk - # --# Copyright (C) 1988-2023 the Free Software Foundation, Inc. -+# Copyright (C) 1988-2024 the Free Software Foundation, Inc. - # - # This file is part of GAWK, the GNU implementation of the - # AWK Programming Language. -@@ -1027,6 +1027,8 @@ EXTRA_DIST = \ - match3.awk \ - match3.in \ - match3.ok \ -+ match4.awk \ -+ match4.ok \ - math.awk \ - math.ok \ - mbfw1.awk \ -@@ -1808,6 +1810,7 @@ BASIC_TESTS = \ - substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \ - trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \ - unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \ -+ match4 \ - widesub4 wjposer1 zero2 zeroe0 zeroflag - - UNIX_TESTS = \ -@@ -4414,6 +4417,11 @@ widesub3: - AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - -+match4: -+ @echo $@ -+ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ -+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -+ - widesub4: - @echo $@ $(ZOS_FAIL) - @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \ -diff --git a/test/Maketests b/test/Maketests -index bac220f..9a00140 100644 ---- a/test/Maketests -+++ b/test/Maketests -@@ -1288,6 +1288,11 @@ widesub3: - AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - -+match4: -+ @echo $@ -+ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ -+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -+ - widesub4: - @echo $@ $(ZOS_FAIL) - @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \ -diff --git a/test/match4.awk b/test/match4.awk -new file mode 100644 -index 0000000..e50150a ---- /dev/null -+++ b/test/match4.awk -@@ -0,0 +1 @@ -+BEGIN { print match (m, /a?/) } -diff --git a/test/match4.ok b/test/match4.ok -new file mode 100644 -index 0000000..d00491f ---- /dev/null -+++ b/test/match4.ok -@@ -0,0 +1 @@ -+1 --- -cgit v1.1 diff --git a/sys-apps/gawk/gawk-5.2.2.ebuild b/sys-apps/gawk/gawk-5.2.2.ebuild deleted file mode 100644 index a3fff916f028..000000000000 --- a/sys-apps/gawk/gawk-5.2.2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -#GAWK_IS_BETA=yes - -DESCRIPTION="GNU awk pattern-matching language" -HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" - -if [[ ${GAWK_IS_BETA} == yes || ${PV} == *_beta* ]] ; then - if [[ ${PV} == *_beta* ]] ; then - # Beta versioning is sometimes for the release prior, e.g. - # 5.2.1_beta is labelled upstream as 5.2.0b. - MY_PV=${PV/_beta/b} - MY_PV=$(ver_cut 1-2 ${MY_PV}).$(($(ver_cut 3 ${MY_PV}) - 1))$(ver_cut 4- ${MY_PV}) - MY_P=${PN}-${MY_PV} - - S="${WORKDIR}"/${MY_P} - else - MY_P=${P} - fi - - SRC_URI="https://www.skeeve.com/gawk/${MY_P}.tar.gz" -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gawk.asc - inherit verify-sig - - SRC_URI="mirror://gnu/gawk/${P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" - - 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" -fi - -LICENSE="GPL-3+" -SLOT="0" -# While tempting to enable mpfr by default as e.g. Fedora do, as of 5.2.x, -# MPFR support is "on parole" and may be removed: -# https://www.gnu.org/software/gawk/manual/html_node/MPFR-On-Parole.html. -IUSE="mpfr pma nls readline" - -RDEPEND=" - mpfr? ( - dev-libs/gmp:= - dev-libs/mpfr:= - ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-apps/texinfo-6.7 - >=sys-devel/bison-3.5.4 - nls? ( sys-devel/gettext ) -" - -if [[ ${GAWK_IS_BETA} != yes ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-gawk )" -fi - -src_prepare() { - default - - # Use symlinks rather than hardlinks, and disable version links - sed -i \ - -e '/^LN =/s:=.*:= $(LN_S):' \ - -e '/install-exec-hook:/s|$|\nfoo:|' \ - Makefile.in doc/Makefile.in || die - - # bug #413327 - sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die - - # Fix standards conflict on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i \ - -e '/\<_XOPEN_SOURCE\>/s/1$/600/' \ - -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \ - extension/inplace.c || die - fi -} - -src_configure() { - # Avoid automagic dependency on libsigsegv - export ac_cv_libsigsegv=no - - # README says gawk may not work properly if built with non-Bison. - # We already BDEPEND on Bison, so just unset YACC rather than - # guessing if we need to do yacc.bison or bison -y. - unset YACC - - local myeconfargs=( - --cache-file="${S}"/config.cache - --libexec='$(libdir)/misc' - $(use_with mpfr) - $(use_enable nls) - $(use_enable pma) - $(use_with readline) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # Automatic dodocs barfs - rm -rf README_d || die - - default - - # Install headers - insinto /usr/include/awk - doins *.h - rm "${ED}"/usr/include/awk/config.h || die -} - -pkg_postinst() { - # Symlink creation here as the links do not belong to gawk, but to any awk - if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then - eselect awk update ifunset - else - local l - for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do - if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then - ln -s "${l##*/}" "${l/gawk/awk}" || die - fi - done - - if ! [[ -e ${EROOT}/bin/awk ]] ; then - # /bin might not exist yet (stage1) - [[ -d "${EROOT}/bin" ]] || mkdir "${EROOT}/bin" || die - - ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die - fi - fi -} - -pkg_postrm() { - if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then - eselect awk update ifunset - fi -} diff --git a/sys-apps/gawk/gawk-5.3.0-r1.ebuild b/sys-apps/gawk/gawk-5.3.0-r1.ebuild deleted file mode 100644 index f877fcf70804..000000000000 --- a/sys-apps/gawk/gawk-5.3.0-r1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -#GAWK_IS_BETA=yes - -DESCRIPTION="GNU awk pattern-matching language" -HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" - -if [[ ${GAWK_IS_BETA} == yes || ${PV} == *_beta* ]] ; then - if [[ ${PV} == *_beta* ]] ; then - # Beta versioning is sometimes for the release prior, e.g. - # 5.2.1_beta is labelled upstream as 5.2.0b. - MY_PV=${PV/_beta/b} - MY_PV=$(ver_cut 1-2 ${MY_PV}).$(($(ver_cut 3 ${MY_PV}) - 1))$(ver_cut 4- ${MY_PV}) - MY_P=${PN}-${MY_PV} - - S="${WORKDIR}"/${MY_P} - else - MY_P=${P} - fi - - SRC_URI="https://www.skeeve.com/gawk/${MY_P}.tar.gz" -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gawk.asc - inherit verify-sig - - SRC_URI="mirror://gnu/gawk/${P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" - - 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" -fi - -LICENSE="GPL-3+" -SLOT="0" -# While tempting to enable mpfr by default as e.g. Fedora do, as of 5.2.x, -# MPFR support is "on parole" and may be removed: -# https://www.gnu.org/software/gawk/manual/html_node/MPFR-On-Parole.html. -IUSE="mpfr pma nls readline" - -RDEPEND=" - mpfr? ( - dev-libs/gmp:= - dev-libs/mpfr:= - ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-apps/texinfo-7.1 - >=sys-devel/bison-3.5.4 - nls? ( sys-devel/gettext ) -" - -if [[ ${GAWK_IS_BETA} != yes ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-gawk )" -fi - -PATCHES=( - "${FILESDIR}"/${P}-str2wstr.patch -) - -src_prepare() { - default - - # Use symlinks rather than hardlinks, and disable version links - sed -i \ - -e '/^LN =/s:=.*:= $(LN_S):' \ - -e '/install-exec-hook:/s|$|\nfoo:|' \ - Makefile.in doc/Makefile.in || die - - # bug #413327 - sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die - - # Fix standards conflict on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i \ - -e '/\<_XOPEN_SOURCE\>/s/1$/600/' \ - -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \ - extension/inplace.c || die - fi -} - -src_configure() { - # README says gawk may not work properly if built with non-Bison. - # We already BDEPEND on Bison, so just unset YACC rather than - # guessing if we need to do yacc.bison or bison -y. - unset YACC - - local myeconfargs=( - --cache-file="${S}"/config.cache - --libexec='$(libdir)/misc' - $(use_with mpfr) - $(use_enable nls) - $(use_enable pma) - $(use_with readline) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # Automatic dodocs barfs - rm -rf README_d || die - - default - - # Install headers - insinto /usr/include/awk - doins *.h - rm "${ED}"/usr/include/awk/config.h || die -} - -pkg_postinst() { - # Symlink creation here as the links do not belong to gawk, but to any awk - if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then - eselect awk update ifunset - else - local l - for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do - if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then - ln -s "${l##*/}" "${l/gawk/awk}" || die - fi - done - - if ! [[ -e ${EROOT}/bin/awk ]] ; then - # /bin might not exist yet (stage1) - [[ -d "${EROOT}/bin" ]] || mkdir "${EROOT}/bin" || die - - ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die - fi - fi -} - -pkg_postrm() { - if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then - eselect awk update ifunset - fi -} diff --git a/sys-apps/pandora_box/Manifest b/sys-apps/pandora_box/Manifest index ebb4e7017b88..794ddd09dd4f 100644 --- a/sys-apps/pandora_box/Manifest +++ b/sys-apps/pandora_box/Manifest @@ -468,5 +468,5 @@ DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa6586 DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe EBUILD pandora_box-0.11.0.ebuild 8598 BLAKE2B 4e8444b6f21cecafa065a3b857cb9f5e4e706a11f8c3186e14249495bde3e94d8c427e0c608ef6f6a39c3262590c267011309ae8a0708901451b296948a74260 SHA512 9e9c357134dddecf7fbc77a3cc2c57842a7eab2e429ff1f846ba6e574148c4667931cbb93e19322ada7d2ba417551685cf280cb5859fc13e9f92d3dd255956c5 -EBUILD pandora_box-0.12.0.ebuild 2497 BLAKE2B 3c25e371326647c75ea7b28f257aafc42dcaeb924ab46e2043f50f318c8678daabfddcd6a4389ce5719b595547bd249d6d2d688d530ccc0eac55d66e5d7542e9 SHA512 35b8dfeac58acc1360de1f58eb12e685c805f316037123be521f378bf711056fc4891e1d0994a3640e9758f69bc88e1053e7592d6b917e605949146680e6aa0d +EBUILD pandora_box-0.12.0-r1.ebuild 2630 BLAKE2B 175db660dbefe62f62c00d0a5d979e74ce1e7ad5b4ca6e528791988932ee1bdc5b4763b890ef0d4258f0002d5c54d3c0c939dff5c5569bdfd25e84bee2a9edb9 SHA512 647bba3e4b7cccfa1322632c3105bc17b005bc3cbc91a75d5cec727d5bdd750a6bf0846b110c78b11501f888a9084c69392878b406b8c5cc77885afcf9d69d2e MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b diff --git a/sys-apps/pandora_box/pandora_box-0.12.0.ebuild b/sys-apps/pandora_box/pandora_box-0.12.0-r1.ebuild index ad0137ee8c7a..75c2362b73f3 100644 --- a/sys-apps/pandora_box/pandora_box-0.12.0.ebuild +++ b/sys-apps/pandora_box/pandora_box-0.12.0-r1.ebuild @@ -7,6 +7,8 @@ EAPI=8 SYDVER=3.30.0 +IUSE="static" + CRATES=" ahash@0.8.11 argv@0.1.11 @@ -123,3 +125,10 @@ SLOT="0" KEYWORDS="~amd64" S=${WORKDIR}/syd-v${SYDVER}/pandora + +src_configure() { + if use static; then + export RUSTFLAGS+="-Ctarget-feature=+crt-static" + fi + cargo_src_configure +} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 0e0f758166e4..1187bdd83bc7 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -4,7 +4,9 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906 AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd DIST portage-3.0.65.tar.bz2 1193321 BLAKE2B 4734b0a2b17cf0cdbd0bedac9efa6cecb5799460e1faa8b8ab137fa017e17d47d6d5da6382e75322f21d4be77a31acffbacd753c70b43b011613cc5a6332bc96 SHA512 c864bcb3bef11916128852a5f50b161d82529d7316ec970703a9ec948c46a51148419ef1dfde2906f72347dd41d0eebd49f5a1769a228d97145f5517c34dbff8 DIST portage-3.0.66.1.tar.bz2 1198196 BLAKE2B 8dbd1bc17c1a9a3530425efa31a27efba39e1ef5f5457b4084875c64f7128453139aea447c25a642c124438e88ef484a43b1838cbd8c03748017571dd18f9921 SHA512 fcd3d4d3dcfdb67cbcdb0f4854860f073b4a9d41dadc97a3e6f890e3c75091aceec5622e97495741622b5c390309f05dec35b9e951d7ee7a78e28a9b3ed2939d +DIST portage-3.0.67.tar.bz2 1196776 BLAKE2B 4a9056d388b012a0fa343d6fc50c9c3b455cb3a4d356210accf86c4ff4434a2d8cb4d23c3f58f3e23ab8bb4a4e9ee244bd1ec1203d5f72fa6f0e0a2caa92e757 SHA512 e725a471dcadaac771aa7f910524232e237efbb944d3e175825ad659b5190d631a91d4c188089c278a79b4709d4a8d6a6e53c55524c4b1c8d1c43580506e0d1c EBUILD portage-3.0.65-r1.ebuild 6776 BLAKE2B 06f1d5e62b178276acf0a4c908697fe337f004fcd8bc8b0855f604ceacd60d37331024115a99dc6b1711c2a67d91f94d29f7a5e278519d8be0fc8a3a93c38367 SHA512 c55d309d9bf3706d3e272f3634dc6c33222074d8dc2f289109631b4f6db24df62fbb355a70c8bdf74f3d76c0a799b262726c92efaea9e7e52fa49e4b175abb20 EBUILD portage-3.0.66.1-r1.ebuild 6401 BLAKE2B 91539d4020cb0b91ed61c1c0f0fa15935cdca80a9326765ab0bb28e4d79edc35e3cac07728979178bc7112010318ae9bafebbc008b94958a9ef5f3243e18bcdb SHA512 8e77a4da3d898f820d8afc9a028a2b3cfebb41e77d2fdae0131f8087ad0794cb2ede27b2bad7a37d4a9d36595d2523e6ec67f70ee96bc6169fada6aff5448c41 +EBUILD portage-3.0.67.ebuild 6425 BLAKE2B a2c05cc7cc63f6664aafff5f8b22a97774c304d4bcebcd902dcd4683f8032922ea5cbdf0b69fa42277074cfdd4952f9b3418f790fbe49d356f032fc41bf87ad0 SHA512 eb99d6b97a9955572e35cea9048e33fe01eb12bcf50cd0f121a379d30127219ba442c2c0a455f33090370840e5530b3aea08c7b58b0ca00ae8974636e65c9fea EBUILD portage-9999.ebuild 6425 BLAKE2B a2c05cc7cc63f6664aafff5f8b22a97774c304d4bcebcd902dcd4683f8032922ea5cbdf0b69fa42277074cfdd4952f9b3418f790fbe49d356f032fc41bf87ad0 SHA512 eb99d6b97a9955572e35cea9048e33fe01eb12bcf50cd0f121a379d30127219ba442c2c0a455f33090370840e5530b3aea08c7b58b0ca00ae8974636e65c9fea MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d diff --git a/sys-apps/portage/portage-3.0.67.ebuild b/sys-apps/portage/portage-3.0.67.ebuild new file mode 100644 index 000000000000..e1afb04b085f --- /dev/null +++ b/sys-apps/portage/portage-3.0.67.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{10..13} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit meson linux-info python-r1 tmpfiles + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/portage.git + https://github.com/gentoo/portage.git + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + >=app-arch/tar-1.27 + >=dev-build/meson-1.3.0-r1 + >=sys-apps/sed-4.0.5 + sys-devel/patch + !build? ( $(python_gen_impl_dep 'ssl(+)') ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + ) + doc? ( + ~app-text/docbook-xml-dtd-4.4 + app-text/xmlto + ) + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-vcs/git + ) +" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +RDEPEND=" + ${PYTHON_DEPS} + acct-user/portage + >=app-arch/tar-1.27 + app-arch/zstd + >=app-misc/pax-utils-0.1.17 + dev-lang/python-exec:2 + >=sys-apps/baselayout-2.9 + >=sys-apps/findutils-4.9 + !build? ( + >=app-admin/eselect-1.2 + app-portage/getuto + >=app-shells/bash-5.0:0 + >=sec-keys/openpgp-keys-gentoo-release-20240703 + >=sys-apps/sed-4.0.5 + rsync-verify? ( + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) +" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + >=sys-apps/coreutils-6.4 + >=sys-apps/file-5.44-r3 + ) +" + +pkg_pretend() { + local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + + check_extra_config +} + +src_prepare() { + default + + if use prefix-guest; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi +} + +src_configure() { + local code_only=false + python_foreach_impl my_src_configure +} + +my_src_configure() { + local emesonargs=( + -Dcode-only=${code_only} + -Deprefix="${EPREFIX}" + -Dportage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + $(meson_use doc) + $(meson_use apidoc) + $(meson_use gentoo-dev) + $(meson_use ipc) + $(meson_use xattr) + ) + + if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then + emesonargs+=( -Dnative-extensions=true ) + else + emesonargs+=( -Dnative-extensions=false ) + fi + + if use build; then + emesonargs+=( -Drsync-verify=false ) + else + emesonargs+=( $(meson_use rsync-verify) ) + fi + + meson_src_configure + code_only=true +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + local EPYTEST_XDIST=1 + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + python_foreach_impl epytest +} + +src_install() { + python_foreach_impl my_src_install + dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/{bin,sbin}/* || die) + python_replicate_script "${scripts[@]}" +} + +my_src_install() { + local pydirs=( + "${D}$(python_get_sitedir)" + "${ED}/usr/lib/portage/${EPYTHON}" + ) + + meson_src_install + python_fix_shebang "${pydirs[@]}" + python_optimize "${pydirs[@]}" +} + +pkg_preinst() { + if ! use build && [[ -z ${ROOT} ]]; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + + env -u BINPKG_FORMAT \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + ED="${ED}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_format || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} + +pkg_postinst() { + # Warn about obsolete "enotice" script, bug #867010 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then + eerror "Obsolete 'enotice' script detected!" + eerror "Please remove this from ${bashrc} to avoid problems." + eerror "See bug 867010 for more details." + fi +} diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest index 0664e0c03733..139a4e80a862 100644 --- a/sys-apps/the_silver_searcher/Manifest +++ b/sys-apps/the_silver_searcher/Manifest @@ -1,7 +1,9 @@ AUX 0001-bash-completion-port-to-v2-API.patch 1299 BLAKE2B 75881c7a6092cfa26ae188a7773a8d2745336c0859f762abb799a3ab3efed1ef67591bc5c560d7dd3040f7a51bd272675ce48251f4191969874e9921e196940b SHA512 452cf11f32e28e2851bc3d2c8a72ff42f6df17f03c9da1692d83cfceeea7e1e29c1443483fb0daac90ae620959b380d4421185c7d97347513569f678bd164d0c AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052 -AUX the_silver_searcher-2.2.0-no_lfs64.patch 1319 BLAKE2B dbddd84fe6a2c0a29b3d585cc93892806808b0c3684213f43c0b32646a450bf40c56e1eaa2a0c40a651f1a82c2b773184792b558eeefed728d379fba711e1483 SHA512 0a2417467c221192f27e0ecd34dbc3d7ebe0f2e95613e978ee5c2fa49c85a2ebaf19e2bc0adcaaa0e1add415ed65156e6de437152c3d31cbb377e316f0b44639 +AUX the_silver_searcher-2.2.0-lfs-fixup-config.patch 3087 BLAKE2B 89e71136161f60f2e792e0165bd1b5f2d73c98f7a49816ba73dfad3898a2763cb60704d2b2b64147837402468e7bf307c4dfe96ca7dfc27cd1afb3b2b2db8bab SHA512 1f720486b9f959439d226f8b8922ee5634a07ffa55af70522a3d07927a887dd963f6d08e0c0cb212f7f1382e95c1169ef4f44d5912e720e5f7e269bc843bfc56 +AUX the_silver_searcher-2.2.0-no_lfs64.patch 1375 BLAKE2B 008c2f6b647dcf97452c0fce2610219c8a762e3e5e3c825c8032104e6766364ff47ea8094413c60a3fc88cc4f03519e98d63aff71f62a73131544bf348b705af SHA512 6f951fcb635285c182f89d932933f92375637891d83f669ee5c3f4c62269d310be51761e3db5dbef3bcdc385f5744c4c35b8746a956f31ee5e9d12eea40b4905 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126 EBUILD the_silver_searcher-2.2.0_p20201217-r2.ebuild 1248 BLAKE2B 9478a97970b5fc43ef375e2ff6d31221d9cd88e01c68cd658d4d5bf933cc93489f87508b018573ebeaf49971fc8cf96fad2d1ff23926982bf56e98ab546b484f SHA512 33110751afa88d6ffa5005dac1c74d0149f589ccd9be55e91978a9e770c40aea964e095b1ddc82c6c148d4b85ff89b93f27c5ef13096dd060e393d9deaebaa17 EBUILD the_silver_searcher-2.2.0_p20201217-r3.ebuild 1417 BLAKE2B ebcff15b708f6a4f132e80e34f4244fb17a1e0376531f265a3b80dd71a132a558b2f333052f9b74446fa0a24e335a0bbf866aa9d46ec4c9e7b12111dc9876eb9 SHA512 ebf346101bfe02b65cd144bd17223531edfb8e57a22e1f8386732b64b9b2ad18d60ec424bd9be88c489096c58c2766e01064de3b423b776003437a396f87a303 +EBUILD the_silver_searcher-2.2.0_p20201217-r4.ebuild 1465 BLAKE2B 72ae91ef1e394b02ead633a01ee7f87e9b7fc19582ab7622f8ff1a3c4bd45b0431b63da760814b7cbc6250228720abe3626b96568b72e6030ffc75d728d0cdf1 SHA512 80f4f3bca1b6eb45564f4e7c2a060b5c382bb1124182570e0cdb8da25a9a4bd28e2f10e2ff0f6398902ce54c3cf999e601859c4e1ef0f7b56667e260569e95e6 MISC metadata.xml 259 BLAKE2B 703872b1e3d4395fbd05daec4fe759e9dee9578a64b1c252889402a61b4eb8a9549b0a9a238dd4a8eaf6af63a1e43b9b70aeb5641c1b9fa84c1a7ddfe0a22ef9 SHA512 9fb79b710b6e2ecde94d3c128b82fef372c64c87071aff04fc854a2734472c2a2587f2af37305a56dd950adcb2b94d4da1ac07ececf9a0db6e77000b5c12a1d3 diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-lfs-fixup-config.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-lfs-fixup-config.patch new file mode 100644 index 000000000000..cdbe82b88802 --- /dev/null +++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-lfs-fixup-config.patch @@ -0,0 +1,157 @@ +https://bugs.gentoo.org/928924 + +Fixup on top of https://github.com/ggreer/the_silver_searcher/pull/1525 +diff --git a/src/decompress.c b/src/decompress.c +index f0bbb33..1680cd5 100644 +--- a/src/decompress.c ++++ b/src/decompress.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <string.h> + #include <unistd.h> + +diff --git a/src/ignore.c b/src/ignore.c +index 88036ef..02b06f4 100644 +--- a/src/ignore.c ++++ b/src/ignore.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <ctype.h> + #include <dirent.h> + #include <limits.h> +diff --git a/src/lang.c b/src/lang.c +index 6d62f72..1f2c020 100644 +--- a/src/lang.c ++++ b/src/lang.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <stdlib.h> + #include <string.h> + +diff --git a/src/log.c b/src/log.c +index f6f4e9a..e6c56ea 100644 +--- a/src/log.c ++++ b/src/log.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <stdarg.h> + #include <stdio.h> + +diff --git a/src/main.c b/src/main.c +index e116f70..3d3b565 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <ctype.h> + #include <pcre.h> + #include <stdarg.h> +@@ -9,8 +11,6 @@ + #include <windows.h> + #endif + +-#include "config.h" +- + #ifdef HAVE_SYS_CPUSET_H + #include <sys/cpuset.h> + #endif +diff --git a/src/options.c b/src/options.c +index 2145b33..2bfac85 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <errno.h> + #include <limits.h> + #include <stdarg.h> +@@ -8,7 +10,6 @@ + #include <sys/stat.h> + #include <unistd.h> + +-#include "config.h" + #include "ignore.h" + #include "lang.h" + #include "log.h" +diff --git a/src/print.c b/src/print.c +index 34dbeff..5d825dd 100644 +--- a/src/print.c ++++ b/src/print.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <limits.h> + #include <stdarg.h> + #include <stdio.h> +diff --git a/src/print_w32.c b/src/print_w32.c +index a1fd387..ca15da4 100644 +--- a/src/print_w32.c ++++ b/src/print_w32.c +@@ -1,5 +1,6 @@ + #ifdef _WIN32 + ++#include "config.h" + #include "print.h" + #include <io.h> + #include <stdarg.h> +diff --git a/src/scandir.c b/src/scandir.c +index 50cb595..425855a 100644 +--- a/src/scandir.c ++++ b/src/scandir.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <dirent.h> + #include <stdlib.h> + +diff --git a/src/search.c b/src/search.c +index 40b5662..dc81b4c 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -1,3 +1,4 @@ ++#include "config.h" + #include "search.h" + #include "print.h" + #include "scandir.h" +diff --git a/src/util.c b/src/util.c +index 90ffb6f..32e91f2 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include <ctype.h> + #include <stdarg.h> + #include <stdio.h> +@@ -5,7 +7,6 @@ + #include <string.h> + #include <sys/stat.h> + +-#include "config.h" + #include "util.h" + + #ifdef _WIN32 +diff --git a/src/zfile.c b/src/zfile.c +index 299a519..a8c1c73 100644 +--- a/src/zfile.c ++++ b/src/zfile.c +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #ifdef __FreeBSD__ + #include <sys/endian.h> + #endif +@@ -17,8 +19,6 @@ typedef _off64_t off_t; + #include <stdlib.h> + #include <string.h> + +-#include "config.h" +- + #ifdef HAVE_ERR_H + #include <err.h> + #endif diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch index 7468a47a0568..2bf7174015a0 100644 --- a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch +++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch @@ -1,6 +1,7 @@ LFS64 interfaces are now generally considered deprecated, and are no longer available in MUSL since version 1.2.4. +https://github.com/ggreer/the_silver_searcher/pull/1525 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild new file mode 100644 index 000000000000..8a13a97175ba --- /dev/null +++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r4.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 flag-o-matic vcs-snapshot + +COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f" +DESCRIPTION="A code-searching tool similar to ack, but faster" +HOMEPAGE="https://github.com/ggreer/the_silver_searcher" +SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" +IUSE="lzma test zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libpcre + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + dev-util/cram + dev-vcs/git + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-lzma.patch + "${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch + "${FILESDIR}"/${PN}-2.2.0-lfs-fixup-config.patch + # https://github.com/ggreer/the_silver_searcher/issues/1537 + # broken with >=app-shells/bash-completion-2.12 + "${FILESDIR}"/0001-bash-completion-port-to-v2-API.patch +) + +src_prepare() { + default + + sed '/^dist_bashcomp/d' -i Makefile.am || die + + eautoreconf +} + +src_configure() { + # false positive TEXTRELs on riscv + # https://bugs.gentoo.org/797355 + append-flags -fPIC + + econf \ + $(use_enable lzma) \ + $(use_enable zlib) +} + +src_test() { + cram -v tests/*.t || die "tests failed" +} + +src_install() { + default + newbashcomp ag.bashcomp.sh ag +} |