diff options
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/Manifest.gz | bin | 10641 -> 10639 bytes | |||
-rw-r--r-- | app-shells/bash-completion/Manifest | 6 | ||||
-rw-r--r-- | app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild | 176 | ||||
-rw-r--r-- | app-shells/bash-completion/bash-completion-9999.ebuild | 28 | ||||
-rw-r--r-- | app-shells/bash-completion/metadata.xml | 4 |
5 files changed, 209 insertions, 5 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz Binary files differindex cabcec53c906..3ccd4c390a3d 100644 --- a/app-shells/Manifest.gz +++ b/app-shells/Manifest.gz diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index 68745fde8826..62409847afb2 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -1,5 +1,7 @@ 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 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-9999.ebuild 3979 BLAKE2B b37b8af1bb45b4a3b0095eefaaf64570b4ee57d335099110733d0b8ecba00ee75e81c86255118d6c021a1c3181af967c9abbeb53b367dc28e741842acc452d7b SHA512 114907ded2229849f913a54592f9a9d77cff6ff15a6afcebe1e05a97c2feda33914eec430485cc13f8cd19499f29f90be07e46e25e80041945f46a30748bc173 -MISC metadata.xml 1325 BLAKE2B 9a17274f25645bf251ae66c3ddce5d140dff6d6722efce13786d2cafb9c380b20fd5450da22821ee277bccec523c602d64769c0f29cb465835d6dc1ec7dd5bf4 SHA512 cf16bfdd62d42f70ff480ab2c5e0831d5b7e0d987e131b5d04475448b7614b95e8d88c24f4f7a81d2c63e02ade16be57469cc02cc14a3b009620434b9cf4f61b +EBUILD bash-completion-2.13.0-r1.ebuild 4882 BLAKE2B d6ab14e7f431b971d3220a2ff3c1152983df424d0c5a5468f803030b3af2d012dc711c98c863b5c6e58e04a464fbb91fa612890b848b35f8fc6ef5105c1e2cec SHA512 dd62efb394f9958d660a3f8277806c204cab3e762640318128798521a2341735f3dd84942452ed2f561541c5730a80a57464c1d3724da5f34472cfaec1b6f2ea +EBUILD bash-completion-9999.ebuild 4844 BLAKE2B e5b211118d21a8d706f89ae7ab7f7cfba09978abf17acec6e6f4335f45f6784a9c951ee1506094a70db0f472bfc3190360d5557afbc763d8739fa15a048ef7ef SHA512 5ca599b903108fe07d62f8691501c0ba5fc6b2d38b3e1367e73e95d23c8908a15a37c498d74621ded9a50eccf58f05a2dac8b51b468eeb59d5e78dcf850e58fb +MISC metadata.xml 1436 BLAKE2B a01cee2abf1c4bc38ed6fe464f3daf43f8cf441a2a70f74b20bad79e37183a311326a863680d6939f18f8adebb9976861de897df272ab3cc7448cafbcb87f4b3 SHA512 f1b1af3f696ed159b8e1f728b51d651ac66ff849ee3bb37d949bc09e3be47698ea052ed48826edf4341d87835b3b54482153ca4fa3c299a5602eaec5f0cd780b diff --git a/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild new file mode 100644 index 000000000000..c3b7f3ec814f --- /dev/null +++ b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild @@ -0,0 +1,176 @@ +# 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 + !<app-text/tree-2.1.1-r1 + !!net-fs/mc +" +BDEPEND=" + test? ( + ${RDEPEND} + $(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}] + ') + ) +" +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}]" && + python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pytest-xdist[${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_vi.py::TestVi::test_2 + test/t/test_xmlwf.py::TestXmlwf::test_2 #bug 886159 + test/t/test_xrandr.py::TestXrandr::test_output_filter + ) + local EPYTEST_IGNORE=( + # stupid test that async tests work + test/fixtures/pytest/test_async.py + ) + local EPYTEST_XDIST=1 + + # 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 + local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked + 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 CHANGELOG.md CONTRIBUTING.md README.md + + # install the python completions for all targets, bug #622892 + local TARGET + for TARGET in "${PYTHON_COMPAT[@]}"; do + if [[ ! -e "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} ]]; then + dosym python "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} + fi + done + + # 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-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild index d9a8954d6f32..322f3a72d214 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-9999.ebuild @@ -13,7 +13,6 @@ EGIT_REPO_URI="https://github.com/scop/bash-completion" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="" IUSE="+eselect test" RESTRICT="!test? ( test )" @@ -21,6 +20,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles + !<app-text/tree-2.1.1-r1 !!net-fs/mc " BDEPEND=" @@ -29,6 +29,8 @@ 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}] ') ) " @@ -69,7 +71,9 @@ 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[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pytest-forked[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" } pkg_setup() { @@ -102,7 +106,16 @@ src_test() { test/t/test_if{down,up}.py # not available for icedtea test/t/test_javaws.py + # TODO + 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 ) + local EPYTEST_IGNORE=( + # stupid test that async tests work + test/fixtures/pytest/test_async.py + ) + local EPYTEST_XDIST=1 # portage's HOME override breaks tests local -x HOME=$(unset HOME; echo ~) @@ -110,6 +123,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 emake -C completions check epytest } @@ -122,7 +136,15 @@ src_install() { strip_completions - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md + dodoc AUTHORS CHANGELOG.md CONTRIBUTING.md README.md + + # install the python completions for all targets, bug #622892 + local TARGET + for TARGET in "${PYTHON_COMPAT[@]}"; do + if [[ ! -e "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} ]]; then + dosym python "${ED}"/usr/share/bash-completion/completions/${TARGET/_/.} + fi + done # install the eselect module if use eselect; then diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml index 8b2bdc7b1a53..2336cf2dc57e 100644 --- a/app-shells/bash-completion/metadata.xml +++ b/app-shells/bash-completion/metadata.xml @@ -5,6 +5,10 @@ <email>shell-tools@gentoo.org</email> <name>Gentoo Shell Tools Project</name> </maintainer> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> <use> <flag name="eselect"> Support blacklisting of completions via 'eselect bashcomp'. |