From 02ee99b588ea9b98e10f9a3b0c4a43572acf5f40 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 1 Jan 2018 22:57:32 +0100 Subject: app-shells/bash-completion: Clean old up --- app-shells/bash-completion/Manifest | 1 - .../bash-completion/bash-completion-2.5.ebuild | 98 ----------------- .../bash-completion/bash-completion-2.7.ebuild | 122 --------------------- 3 files changed, 221 deletions(-) delete mode 100644 app-shells/bash-completion/bash-completion-2.5.ebuild delete mode 100644 app-shells/bash-completion/bash-completion-2.7.ebuild (limited to 'app-shells') diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index abcdc1b873f6..47fa68714477 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -1,4 +1,3 @@ DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82a6a575b05118099b609da12bf2e369637be907cba1d46e1e33fface482ebd7c63d70d56c948e45ef71725780ffb2171 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627 -DIST bash-completion-2.5.tar.xz 276732 BLAKE2B bf1d51ee2ede39d5ff0a2ebcb3b4d763f36ecf8f8ce6923e9b907922ef685569c9cd65713775cdd56bee4584e87f958f3160efc0b53c9460de065de9e92efbdb SHA512 44ca2cbf38190c2bfa1e98021c1de36dbef0e55f9fe7840e83bd7f91b4c9afc92afa9bb03d53dbc6d9f9b468ac63ff1021a60e456fc239010010d75687eff3da DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce diff --git a/app-shells/bash-completion/bash-completion-2.5.ebuild b/app-shells/bash-completion/bash-completion-2.5.ebuild deleted file mode 100644 index 0585f5e0e970..000000000000 --- a/app-shells/bash-completion/bash-completion-2.5.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BASHCOMP_P=bashcomp-2.0.2 -inherit versionator - -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 - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -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 ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal - - # Installed by sys-apps/util-linux-2.28 - mount umount mount.linux umount.linux -) - -src_prepare() { - eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch - # Bug 543100, update bug 601194 - eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" - eapply_user -} - -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 - -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 - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; 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.7.ebuild b/app-shells/bash-completion/bash-completion-2.7.ebuild deleted file mode 100644 index 99d53dd87c6a..000000000000 --- a/app-shells/bash-completion/bash-completion-2.7.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BASHCOMP_P=bashcomp-2.0.2 -inherit versionator - -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 - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="test" -# Multiple test failures, need to investigate the exact problem -RESTRICT="test" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils - test? ( - ${RDEPEND} - app-misc/dtach - dev-util/dejagnu - dev-tcltk/tcllib - )" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -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 ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal - - # Installed by sys-apps/util-linux-2.28 - mount umount mount.linux umount.linux -) - -src_prepare() { - eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.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=${!} - - nonfatal dtach -N "${T}/dtach.sock" \ - bash -c 'emake check &> "${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 - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; 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 -} -- cgit v1.2.3-65-gdbad