diff options
Diffstat (limited to 'app-shells/bash-completion')
4 files changed, 163 insertions, 4 deletions
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index 362251d84231..59910b6f295c 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -1,6 +1,8 @@ AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162db2f8e35fb20d3a24f9e4c067e5297816d91a85ffcdd3ff43695f3c361959cba59b887afd0d12e75fa317899054d3a615ee3da615a4409ec SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab +DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008 -EBUILD bash-completion-2.9-r1.ebuild 4806 BLAKE2B 5d9ec27d3629f36165beb180d9d9e548c547b560e227b65b112b6cb4ff34d55f31a5d01193ed559f7c0d5beb3b95baebf37c6b9263a442865d8c2cb32f9b1da9 SHA512 150ae169e8997a01c403407b177d2ec7f34d5a6c7f422355af97e6f4a717d12fdf24431990455075b1c0d208ae344e6013e67daa1734abdb6e283cf4b3e44406 -EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0 +EBUILD bash-completion-2.10.ebuild 4708 BLAKE2B 4cbe7c7e24f1b2871a0bab43122011f4235e5d7d24837a8d22a564c59c3b76c5025466cf42b08786a509bfd9c88420ce47fa1253eb2244d009fd092013b05d75 SHA512 d7b8a08f7e4d9ddcac4429cbed68f52da1d9b7c25cba59db0a417216f4e8593eeef4634185b6628fd31ae349c8d5dd92407b43b5d2b453f381a2cdade5c38d90 +EBUILD bash-completion-2.9-r1.ebuild 4775 BLAKE2B eaf986b764094f36f1e436382d54f2064f5bf53cb0b3c05c75f1f5afc1f31237892737d8555136d1e8f05a964e527badba47f148c9db150dd2b509bde4ffb96f SHA512 c0cf334103c8ce059e94a0dcdb3b55ed4c5e4a33facdb7df515081ea366446249c0725ad21d810bf13ee9516d2c020e202e303a8709c5d5526e36ed9b684321d +EBUILD bash-completion-9999.ebuild 4704 BLAKE2B f8386bb63850b650e953561d60c95e82e083e9bcdd14e43fc852c49b3754d13b3a44d31d78215e3bed1c30e79eca3a87be5b023fcdf1312e974bc5c8c65ab317 SHA512 1e4d789d376a85c98867f0696df3b897582cc5978641bc72abb44d2cff6e46522b501392102ced475d6f769c54ca1b491a688f746c9d04b80b6adfd02bd75fdd MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d diff --git a/app-shells/bash-completion/bash-completion-2.10.ebuild b/app-shells/bash-completion/bash-completion-2.10.ebuild new file mode 100644 index 000000000000..0c09bd75cb84 --- /dev/null +++ b/app-shells/bash-completion/bash-completion-2.10.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +BASHCOMP_P=bashcomp-2.0.3 +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit bash-completion-r1 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/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" +IUSE="+eselect test" +RESTRICT="test" + +# completion collision with net-fs/mc +RDEPEND=">=app-shells/bash-4.3_p30-r1:0 + sys-apps/miscfiles + !!net-fs/mc" +DEPEND=" + test? ( + ${RDEPEND} + app-misc/dtach + dev-util/dejagnu + dev-tcltk/tcllib + $(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 + ) + if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then + strip_completions+=( + freebsd-update kldload kldunload portinstall portsnap + pkg_deinstall pkg_delete pkg_info + ) + fi + + 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() { + has_version "dev-python/pexpect[${PYTHON_USEDEP}]" && + has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + use eselect && + eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch" + # Bug 543100, update bug 601194 + eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" + eapply_user +} + +src_test() { + # Tests need an interactive shell, #477066 + # idea stolen from: + # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec + + # real-time output of the log ;-) + touch "${T}/dtach-test.log" || die + tail -f "${T}/dtach-test.log" & + local tail_pid=${!} + + # override the default expect timeout and buffer size to avoid tests + # failing randomly due to cold cache, busy system or just more output + # than upstream anticipated (they run tests on pristine docker + # installs of binary distros) + nonfatal dtach -N "${T}/dtach.sock" \ + bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \ + &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' + + kill "${tail_pid}" + [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests" + [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed" +} + +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.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild index 220069bc3750..a49edc05f8d6 100644 --- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild +++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild @@ -22,7 +22,6 @@ RESTRICT="test" # completion collision with net-fs/mc RDEPEND=">=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles - !app-eselect/eselect-bashcomp !!net-fs/mc" DEPEND="app-arch/xz-utils test? ( diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild index ee27e7fcf8fe..4fdb9c19f7fd 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-9999.ebuild @@ -19,7 +19,6 @@ RESTRICT="!test? ( test )" # completion collision with net-fs/mc RDEPEND=">=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles - !app-eselect/eselect-bashcomp !!net-fs/mc" DEPEND=" test? ( @@ -93,6 +92,11 @@ src_prepare() { eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch fi + # our setup is close enough to container to cause the same tests + # to fail + sed -i -e '/def in_container/a \ + return True' test/t/conftest.py || die + eautoreconf } |