commit: efd5f3c2c377f2915299200498fe427dc7ceda64 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Fri Sep 26 14:01:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 30 23:02:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd5f3c2
app-shells/bash-completion: interdiff is now provided by patchutils Bug: https://bugs.gentoo.org/944114 Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Part-of: https://github.com/gentoo/gentoo/pull/43941 Signed-off-by: Sam James <sam <AT> gentoo.org> ...999.ebuild => bash-completion-2.16.0-r3.ebuild} | 65 +++++++++++----------- .../bash-completion/bash-completion-9999.ebuild | 3 + 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-2.16.0-r3.ebuild similarity index 69% copy from app-shells/bash-completion/bash-completion-9999.ebuild copy to app-shells/bash-completion/bash-completion-2.16.0-r3.ebuild index 3489ced000b6..360b8dc67892 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-2.16.0-r3.ebuild @@ -3,16 +3,23 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +BASHCOMP_P=bashcomp-2.0.3 +PYTHON_COMPAT=( python3_{11..13} ) -inherit autotools eapi9-ver git-r3 python-any-r1 +inherit autotools python-any-r1 DESCRIPTION="Programmable Completion for bash" HOMEPAGE="https://github.com/scop/bash-completion"; -EGIT_REPO_URI="https://github.com/scop/bash-completion"; +SRC_URI=" + https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz + eselect? ( + https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz + ) +" LICENSE="GPL-2+" SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="+eselect test" RESTRICT="!test? ( test )" @@ -20,6 +27,7 @@ RDEPEND=" >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !<app-text/tree-2.1.1-r1 + !!<=net-fs/mc-2025.04.16.18.13.26 " BDEPEND=" test? ( @@ -37,6 +45,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch + "${FILESDIR}"/${PN}-2.16.0-libsecret-completion.patch ) strip_completions() { @@ -54,9 +63,20 @@ strip_completions() { # Now-dead symlinks to deprecated completions hd ncal + + # For GNU mailman, which isn't packaged. If mailman isn't installed, + # it triggers a QA warning. + arch + + # Now installed by patchutils + interdiff ) - rm -v "${strip_completions[@]/#/${ED}/usr/share/bash-completion/completions/}" || die + local file + for file in "${strip_completions[@]}"; do + rm "${ED}"/usr/share/bash-completion/completions/${file} || + die "stripping ${file} failed" + done # remove deprecated completions (moved to other packages) rm "${ED}"/usr/share/bash-completion/completions/_* || die @@ -72,23 +92,13 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - use eselect && git-r3_fetch https://github.com/projg2/bashcomp2 - git-r3_fetch - - use eselect && git-r3_checkout https://github.com/projg2/bashcomp2 \ - "${WORKDIR}"/bashcomp2 - git-r3_checkout -} - src_prepare() { if use eselect; then - # generate and apply patch - emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch - eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch + eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch" fi default + # Only needed for ${PN}-2.16.0-libsecret-completion.patch eautoreconf } @@ -102,6 +112,11 @@ src_test() { test/t/test_vi.py::TestVi::test_2 test/t/test_xmlwf.py::TestXmlwf::test_2 #bug 886159 test/t/test_xrandr.py::TestXrandr::test_output_filter + test/t/unit/test_unit_dequote.py + test/t/test_sudo.py::TestSudo::test_1 #bug 935400 + test/t/test_xfreerdp.py::TestXfreerdp::test_6 #bug 935400 + test/t/unit/test_unit_command_offset.py::TestUnitCommandOffset::test_cmd_quoted #bug 931744 + test/t/test_make.py::TestMake::test_6 #bug 931744 ) local EPYTEST_IGNORE=( # stupid test that async tests work @@ -140,25 +155,13 @@ src_install() { # install the eselect module if use eselect; then - emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" install + insinto /usr/share/eselect/modules + doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" + doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" fi } pkg_postinst() { - if ver_replacing -lt 2.1-r90; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - if has_version 'app-shells/zsh'; then elog elog "If you are interested in using the provided bash completion functions with" diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild index 3489ced000b6..19212971d561 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-9999.ebuild @@ -54,6 +54,9 @@ strip_completions() { # Now-dead symlinks to deprecated completions hd ncal + + # Now installed by patchutils + interdiff ) rm -v "${strip_completions[@]/#/${ED}/usr/share/bash-completion/completions/}" || die
