summaryrefslogtreecommitdiff
path: root/app-shells/bash-completion
diff options
context:
space:
mode:
Diffstat (limited to 'app-shells/bash-completion')
-rw-r--r--app-shells/bash-completion/Manifest9
-rw-r--r--app-shells/bash-completion/bash-completion-2.11.ebuild155
-rw-r--r--app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild (renamed from app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild)22
-rw-r--r--app-shells/bash-completion/bash-completion-2.14.0.ebuild2
-rw-r--r--app-shells/bash-completion/bash-completion-9999.ebuild22
5 files changed, 29 insertions, 181 deletions
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 61de271d0b8b..59b3e8cb485f 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,10 +1,7 @@
AUX bash-completion-2.14.0-optimize-kernel-modules.patch 493 BLAKE2B cdc4ddab98922d1282380953ee5fb3b8d81415cd6e799e28f24d3298e86ebc3958a4afebf3ae4c603547bb1b0f06baa8d51ecd64dbbcf5f909630ff94b4c50c5 SHA512 a8a95045b1046538f242515d50c5c625b809b69da6e8e600a33e671408f452b42d69d64e7831c29a2f743c88826f51c29054ba9712b7b13cdeb18c960fa0c397
-DIST bash-completion-2.11.tar.xz 311004 BLAKE2B 98e3ab6669bd70b49b238a597f1bc1309dc7ddd51c5b17c5e054f9161115d75d26e85d547471bc087e070d10554448b790a6dfb557abc413b70079ecc94acce3 SHA512 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06
-DIST bash-completion-2.13.0.tar.xz 424956 BLAKE2B 5055118378f99ea679cc9e6e2c12a2c82b3428bae3f87b2b73df448ce31c68567fc18423332fccd6f3c0c7ceb3ae8d0f0a84eec7ddbd8c2b7868061a03c4a8a5 SHA512 7c65fea599a25c2c9d6ef300a9cc2d5fbabd0bcc9e09fe32bb706d3398936f40501171f03280f042465bc0d9aca4b1b53c2c13a99bbdfb6fe916767a267158af
DIST bash-completion-2.14.0.tar.xz 428980 BLAKE2B c28ec0cd348a3954461f7a865823a358e47c4b479c7812baa6d54aef856c958510967806550e62784955f9daf233a0b01edade19884e534df857472a3196e63e SHA512 2e12d2e57c932b931a6cfe59234f9d33d715538d6ea4eb72ed4ed3d8d2cf2cedaf08fcb6abaf3117e06115d892283e38a07b3abe5c91c026d2c06a0f64e347bd
DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.11.ebuild 4048 BLAKE2B 177e6746e781a1743b28d4d523c934d6779c2dfab654d2d2ee280bd446004df315a775e8685f17c9db701f97619e4ba789cf2c84c245a05996d7decc90142d4c SHA512 f1a58ee868d4b44a29924650dcaeca20aebd05afce9f80da79bc562770b37a67f3d58c8f6d4488ba37c40e48f127173d7b194f39d33bdf40105f7040297679a8
-EBUILD bash-completion-2.13.0-r1.ebuild 4882 BLAKE2B d6ab14e7f431b971d3220a2ff3c1152983df424d0c5a5468f803030b3af2d012dc711c98c863b5c6e58e04a464fbb91fa612890b848b35f8fc6ef5105c1e2cec SHA512 dd62efb394f9958d660a3f8277806c204cab3e762640318128798521a2341735f3dd84942452ed2f561541c5730a80a57464c1d3724da5f34472cfaec1b6f2ea
-EBUILD bash-completion-2.14.0.ebuild 4821 BLAKE2B d85ce6d4a1dbf44d8f1b468f7f27047693cb2b2b5a9d8c49e6a8e607606568e44d7daf5c09e58aaf33f24760fd3fcc69809e9bf1b03a04a42cdc02909690b4f4 SHA512 87d1e24e86770570c7e6beecefa996f99848c92cb33bdfaa463714e447f8cacc68d1a3c4f2bf4772f9df9e8d0ebca63046658ea6de28e59fb1a07115bf24f39c
-EBUILD bash-completion-9999.ebuild 4844 BLAKE2B e5b211118d21a8d706f89ae7ab7f7cfba09978abf17acec6e6f4335f45f6784a9c951ee1506094a70db0f472bfc3190360d5557afbc763d8739fa15a048ef7ef SHA512 5ca599b903108fe07d62f8691501c0ba5fc6b2d38b3e1367e73e95d23c8908a15a37c498d74621ded9a50eccf58f05a2dac8b51b468eeb59d5e78dcf850e58fb
+EBUILD bash-completion-2.14.0-r1.ebuild 5103 BLAKE2B e0bceea2ff6cdf72f3549974aab60aab736cf433de74650f330a30ee5a5647e8b856b6b05582baa61c82d8fbe27c0963caa6756a230f6977ad70d2ef1dcca9b4 SHA512 89ca2f0c2903dbf16640af394fb17faeef33e2f07a3c4af412a7e5ccdf26e2826e3dabe683b26e32673312c7773df1bff2f98f59ec36593f80fc674c09a6143f
+EBUILD bash-completion-2.14.0.ebuild 4807 BLAKE2B e1594f534ff65922f13ad3a95c1476fc54ab96cde7f2550c3d2136cc3694591e54d6b57c493c531ecf2a0f83efcbb29698c758f7ff44039f0bfb95244b1cab9e SHA512 a3d0201c0b48f92b500f9ef4b6b1ddf8f8d4212c668bf3a08039ff64a9f9bb0e39467f61cdb79e6268271e6b8ea19565483ed0e745fc55cc6fa0c3682753a465
+EBUILD bash-completion-9999.ebuild 4608 BLAKE2B fe5c0aeff60122ab244b90c6528ac64953f53549377c4d92b1dd54e46ddb9850bde316621d2c39aa471946272741aecf99a2fb17e7886833f419d659027b6a88 SHA512 1fa98733a40adc30569f32dfd7ac90de1b4836967f378b4c4b8a1e24365e7d114367ed79a7e409868da1f4760ec12fc1fa75f2544bddd117eec9fd233f73d072
MISC metadata.xml 1436 BLAKE2B a01cee2abf1c4bc38ed6fe464f3daf43f8cf441a2a70f74b20bad79e37183a311326a863680d6939f18f8adebb9976861de897df272ab3cc7448cafbcb87f4b3 SHA512 f1b1af3f696ed159b8e1f728b51d651ac66ff849ee3bb37d949bc09e3be47698ea052ed48826edf4341d87835b3b54482153ca4fa3c299a5602eaec5f0cd780b
diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
deleted file mode 100644
index 60411504c5c1..000000000000
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-BASHCOMP_P=bashcomp-2.0.3
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit python-any-r1
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+eselect test"
-RESTRICT="!test? ( test )"
-
-# completion collision with net-fs/mc
-RDEPEND="
- >=app-shells/bash-4.3_p30-r1:0
- sys-apps/miscfiles
- !!net-fs/mc
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- $(python_gen_any_dep '
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- ')
- )
-"
-PDEPEND="
- >=app-shells/gentoo-bashcomp-20140911
-"
-
-strip_completions() {
- # Remove unwanted completions.
- local strip_completions=(
- # Slackware package stuff, quite generic names cause collisions
- # (e.g. with sys-apps/pacman)
- explodepkg installpkg makepkg pkgtool removepkg upgradepkg
-
- # Debian/Red Hat network stuff
- ifdown ifup ifquery ifstatus
-
- # Installed in app-editors/vim-core
- xxd
-
- # Now-dead symlinks to deprecated completions
- hd ncal
-
- # FreeBSD
- freebsd-update kldload kldunload portinstall portsnap
- pkg_deinstall pkg_delete pkg_info
- )
-
- 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
-}
-
-python_check_deps() {
- python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if use eselect; then
- eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
- fi
-
- eapply_user
-}
-
-src_test() {
- local EPYTEST_DESELECT=(
- # redhat-specific, we strip these completions
- test/t/test_if{down,up}.py
- # not available for icedtea
- test/t/test_javaws.py
- # TODO
- test/t/test_xmlwf.py::TestXmlwf::test_2
- )
-
- # portage's HOME override breaks tests
- local -x HOME=$(unset HOME; echo ~)
- addpredict "${HOME}"
- # used in pytest tests
- local -x NETWORK=none
- local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- emake -C completions check
- epytest
-}
-
-src_install() {
- # work-around race conditions, bug #526996
- mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
-
- emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
-
- strip_completions
-
- dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
-
- # install the eselect module
- if use eselect; then
- insinto /usr/share/eselect/modules
- doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
- doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
- fi
-}
-
-pkg_postinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -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
- done
-
- if has_version 'app-shells/zsh'; then
- elog
- elog "If you are interested in using the provided bash completion functions with"
- elog "zsh, valuable tips on the effective use of bashcompinit are available:"
- elog " http://www.zsh.org/mla/workers/2003/msg00046.html"
- elog
- fi
-}
diff --git a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild b/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild
index c3b7f3ec814f..c34ed3ffdb52 100644
--- a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.14.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 )"
@@ -36,7 +36,6 @@ BDEPEND="
$(python_gen_any_dep '
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
)
@@ -45,6 +44,10 @@ PDEPEND="
>=app-shells/gentoo-bashcomp-20140911
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch
+)
+
strip_completions() {
# Remove unwanted completions.
local strip_completions=(
@@ -64,8 +67,18 @@ strip_completions() {
# FreeBSD
freebsd-update kldload kldunload portinstall portsnap
pkg_deinstall pkg_delete pkg_info
+
+ # For GNU mailman, which isn't packaged. If mailman isn't installed,
+ # it triggers a QA warning.
+ arch
)
+ if [[ ${CHOST} != *solaris* ]]; then
+ # Triggers QA warning since it only defines a completion on Solaris,
+ # to avoid defining a bad one on macOS.
+ strip_completions+=(pkgutil)
+ fi
+
local file
for file in "${strip_completions[@]}"; do
rm "${ED}"/usr/share/bash-completion/completions/${file} ||
@@ -79,7 +92,6 @@ strip_completions() {
python_check_deps() {
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
}
@@ -92,7 +104,7 @@ src_prepare() {
eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
fi
- eapply_user
+ default
}
src_test() {
@@ -118,7 +130,7 @@ src_test() {
# used in pytest tests
local -x NETWORK=none
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked
+ local -x PYTEST_PLUGINS=xdist.plugin
emake -C completions check
epytest
}
diff --git a/app-shells/bash-completion/bash-completion-2.14.0.ebuild b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
index a66af6d25158..8bf37e86e52d 100644
--- a/app-shells/bash-completion/bash-completion-2.14.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.14.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 )"
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 322f3a72d214..ab48b5fd6c59 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit autotools git-r3 python-any-r1
@@ -29,7 +29,6 @@ BDEPEND="
$(python_gen_any_dep '
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
')
)
@@ -38,6 +37,10 @@ PDEPEND="
>=app-shells/gentoo-bashcomp-20140911
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch
+)
+
strip_completions() {
# Remove unwanted completions.
local strip_completions=(
@@ -53,17 +56,9 @@ strip_completions() {
# Now-dead symlinks to deprecated completions
hd ncal
-
- # FreeBSD
- freebsd-update kldload kldunload portinstall portsnap
- pkg_deinstall pkg_delete pkg_info
)
- local file
- for file in "${strip_completions[@]}"; do
- rm "${ED}"/usr/share/bash-completion/completions/${file} ||
- die "stripping ${file} failed"
- done
+ rm -v "${strip_completions[@]/#/${ED}/usr/share/bash-completion/completions/}" || die
# remove deprecated completions (moved to other packages)
rm "${ED}"/usr/share/bash-completion/completions/_* || die
@@ -72,7 +67,6 @@ strip_completions() {
python_check_deps() {
python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" &&
- python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
}
@@ -96,7 +90,7 @@ src_prepare() {
eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
fi
- eapply_user
+ default
eautoreconf
}
@@ -123,7 +117,7 @@ src_test() {
# used in pytest tests
local -x NETWORK=none
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
- local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked
+ local -x PYTEST_PLUGINS=xdist.plugin
emake -C completions check
epytest
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 07:56:54 +0000