bump(app-shells/bash-completion): sync with upstream

This commit is contained in:
David Michael 2018-05-14 15:04:55 -04:00
parent 9c3b03faf4
commit 5aaa269672
14 changed files with 131 additions and 316 deletions

View File

@ -1,16 +1,3 @@
AUX bash-completion-2.1-escape-characters-r1.patch 1084 SHA256 b8e96b91f7d03e6e6de7e105dd8100206058b2ad44f09055521b4fab9befb245 SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab WHIRLPOOL c2697d7a54614692e8b40c3ca55554a25ccf34e5914a362ce9a256d783be3f4d398dd1d948b8b81130ed8662045177a824fdd5b8c7f0166872c33d4274eb4a9d DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82a6a575b05118099b609da12bf2e369637be907cba1d46e1e33fface482ebd7c63d70d56c948e45ef71725780ffb2171 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627
AUX bash-completion-2.1-escape-characters.patch 1082 SHA256 cfa2ffac3da8dc110967464a6af0f029992192b8eff345756f8a0a11a871eb29 SHA512 1352c100ae7cb9d3683a33c8f3fe333a81d897faf16e6a76559c973f90f12d6e53a2998935d755b5518e1ed4912d079ed0bada3d4e97bb97d294ab2f8d58feae WHIRLPOOL 5f729a02426a080c171fa8e72993673e889ecb878db56b7d9fb0fbd2674ec815a2b2793ebc2e8bd3291a7fd458e2225fe9a135a210666e249cadea463aea272d DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
DIST bash-completion-2.3.tar.xz 272252 SHA256 b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9 SHA512 396c060fa39aa05866d26b573d6b9eebdb96e41a17ef723e95f8b01bbda32b0b83bf9e4d978a4f0a1c0590787ae797bb3b6417b95b877f8447037cb873ccf38a WHIRLPOOL fe5ebae1c77dfba504e8f79b130ba0bc80d882a045b980a23f4642e77dfb7bb79b529c1573b13fc0986f486c41696bb94fadef677e0cabfdffe7aeea6e8ff5c0
DIST bash-completion-2.4.tar.xz 276148 SHA256 c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627 WHIRLPOOL f38f148dcbca1ee47ec6fa33637ea0673c03816b607bd638605832fb76ec7fb5f24cba35cb559e8a5b06636b1ec0f225e420615b6721074fc405cb79b505b07b
DIST bash-completion-2.5.tar.xz 276732 SHA256 b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf SHA512 44ca2cbf38190c2bfa1e98021c1de36dbef0e55f9fe7840e83bd7f91b4c9afc92afa9bb03d53dbc6d9f9b468ac63ff1021a60e456fc239010010d75687eff3da WHIRLPOOL b488571aca9d8b027214c2964ec789ef616659a098a2bd65a921075d94a8014b51a802040535e44c7831b159a5094b6879935f726ee97409b575c36cd01dbc13
DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250
DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585
EBUILD bash-completion-2.1_p20141224-r1.ebuild 2995 SHA256 d1c30de8d90fcd960a2a2919b30888c9c277138688371824e8585ffbb7cc7f5a SHA512 2fc900e06669e301612c7488d982396a843955c74911f400a4d47da5df2a53a464e8751ee18b9b5caf6d3ae5555191ca22681b1dbfede621b323a5f8ec01b869 WHIRLPOOL 02c6679fb1237372b7d039b41eea9de29c5eb28d74c4d88935c9d974b0d72b7b1749a6caa04db68e5903f6cbf2efa64b86b58c24be412e40bce9a6335504bf63
EBUILD bash-completion-2.3-r2.ebuild 3219 SHA256 802e5ebc7fc23a6efcbf75b89f274dab2c0b31ea0cc4492d82bda5befdabb715 SHA512 0bf3de6b02f03162e1a575368da1b2b0c3a0dc0c60330907d79e86911b2099c714766630ab63e9746c5399020997a5b53ff0794ca6631c3a5a35764e251c59b2 WHIRLPOOL 76ac7dd678df77aac01c4e1733873351bf09a0ca4758c9330df21de0801e51c89ddd7ff66d17186c235b01a1e019e8964148aad842262d8c2cfa29a33e4208f4
EBUILD bash-completion-2.4-r1.ebuild 3173 SHA256 09d54454ec4c629c21747d071a2c31e432289c207d96b3eebc8cc651ec2fef2a SHA512 5421a782dff1e908fdaafa97b58bcacdaa250ce6d0a701765506bd3384a5f32983bc86e4733336913462102c842b8168fb9e30450180820ce0c6239582467cce WHIRLPOOL b2d3d4d43181c63fa2c49358c6a5d47f310fd6cf578167180aa43eb49784bfa8f0852954460118a34001f00f585459ce975003fb8612931c2b312ab37f038d75
EBUILD bash-completion-2.4.ebuild 3161 SHA256 6ce31c89554f2f58393d10ceb9210ba5ee9fd90bee28509b79a541964f9b70d2 SHA512 f10698650577d080d5af602a87f9b9e3c8204d602a188f439faf99bb782da4b798edfcdabd8c16fe032fd09d18503932b14f3baabb565a0781f86f209b7dde25 WHIRLPOOL 72e6e7b0c24aa70a70706351045a7fa98024ebe3190e713aca42f20ee47016057847333bea45990bdd3a71f96f6c42b04c2d74fa17aac5de308cc4f8f33e05ad
EBUILD bash-completion-2.5.ebuild 3183 SHA256 2d5e15afb28616799eb7b6129f1c112009155685b7c15fe0dc8214820ae21ae0 SHA512 a3a790e199dfba8150c2f5abdc120e5c3b8b41814f996c034e432b4633b211f79eaf056a3622823b36ea0a259cb9ee3ce09210e3e631250fdd6cc315a2642e0a WHIRLPOOL 35e91efe36b01564a3e913980c5990ee5cd1dcf0f0826d360adc42dc3b3cd07ad011e348c6d3f380a450e351b006dbd847ee7b79469312502bdb4a10e5fce34e
MISC ChangeLog 6192 SHA256 7aa78e4d3347e97e9a2676ad90b03dcfbf6bb185ce6f53050786420a7e58b42d SHA512 d689eca6fe0572923dbc618aa95d7a4b43a92654d6485ca14ae974581c3728dfeac45f139788b22b56d17ae86e063316e474f8ce10a7092e43abaad840579c2c WHIRLPOOL de6bc49d153a04b105d21a4de5def31dc028638190a4b51d66d241abaea7206d5704ddba15bef9a5f74acbce2a0b134d9bb38deacac896e9ab4efd16ccc22ddc
MISC ChangeLog-2015 49155 SHA256 df2d7ecd84a601d6a713409dd0ea3f8c2dacadf9b2f637769c6e8787d66cee1d SHA512 31fec84312c20ff1612f57f1bac506937c128b13005246ba36eaa449c1aff7712cc3645952fb9eebf3a24483590010fb5a954d43f238f47cd759911830fe5205 WHIRLPOOL 1463d6fa3480fd139341ade021e1e70884dd72e5f22aa16cb74eb11c8c4b606014b0b4f6369db06fcc9c76e354016d196a2b206fb0681c5b71237aa37991c914
MISC metadata.xml 1285 SHA256 efb4f76c8b2dfe1e809c94fd10aac8b3a4e3ada43ceb33f95193ba246a482529 SHA512 e935bab45ac355ca0a05df6f6f9aaf8e20ef73fa3ce4f2bde83b331cccaa7ae7756a6a62a075b148194b556da8f41f4cf2aa72f271958333d026913ddbfcc133 WHIRLPOOL 6e76587fa0d9e19603fb1bd27100c076ed00840f994bd2b73b9208f438503874dcdc02be6a9c986666cf6d00fb9068d6a6f6dbd1de7662e282be11652412ac83

View File

@ -1,94 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
BASHCOMP_P=bashcomp-2.0.1
inherit versionator
DESCRIPTION="Programmable Completion for bash"
HOMEPAGE="http://bash-completion.alioth.debian.org/"
SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz
https://dev.gentoo.org/~mgorny/dist/${BASHCOMP_P}.tar.bz2"
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
)
src_prepare() {
epatch "${WORKDIR}/${BASHCOMP_P}/${P}"-*.patch
# Bug 543100
epatch "${FILESDIR}/${PN}-2.1-escape-characters.patch"
}
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 README
# 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
}

View File

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=6
@ -13,7 +13,7 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" 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" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE="" IUSE=""
RDEPEND=">=app-shells/bash-4.3_p30-r1 RDEPEND=">=app-shells/bash-4.3_p30-r1

View File

@ -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
eapply "${FILESDIR}/${PN}-2.1-escape-characters.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
}

View File

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=6
@ -13,13 +13,23 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" 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" KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE="" IUSE="test"
# Multiple test failures, need to investigate the exact problem
RESTRICT="test"
# completion collision with net-fs/mc
RDEPEND=">=app-shells/bash-4.3_p30-r1 RDEPEND=">=app-shells/bash-4.3_p30-r1
sys-apps/miscfiles sys-apps/miscfiles
!app-eselect/eselect-bashcomp" !app-eselect/eselect-bashcomp
DEPEND="app-arch/xz-utils" !!net-fs/mc"
DEPEND="app-arch/xz-utils
test? (
${RDEPEND}
app-misc/dtach
dev-util/dejagnu
dev-tcltk/tcllib
)"
PDEPEND=">=app-shells/gentoo-bashcomp-20140911" PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
# Remove unwanted completions. # Remove unwanted completions.
@ -39,6 +49,9 @@ STRIP_COMPLETIONS=(
# Installed by sys-apps/util-linux-2.28 # Installed by sys-apps/util-linux-2.28
mount umount mount.linux umount.linux mount umount mount.linux umount.linux
# Installed by sys-apps/util-linux-2.31
rfkill
) )
src_prepare() { src_prepare() {
@ -46,9 +59,31 @@ src_prepare() {
# Bug 543100, update bug 601194 # Bug 543100, update bug 601194
eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
eapply_user eapply_user
# Remove implicit completions for vim.
# https://bugs.gentoo.org/649986
sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \
bash_completion || die
rm test/completion/vi.exp || die
} }
src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 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() { src_install() {
# work-around race conditions, bug #526996 # work-around race conditions, bug #526996

View File

@ -1,25 +1,33 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=6
BASHCOMP_P=bashcomp-2.0.2 BASHCOMP_P=bashcomp-2.0.2
inherit versionator EGIT_REPO_URI="https://github.com/scop/bash-completion"
inherit autotools git-r3 versionator
DESCRIPTION="Programmable Completion for bash" DESCRIPTION="Programmable Completion for bash"
HOMEPAGE="https://github.com/scop/bash-completion" HOMEPAGE="https://github.com/scop/bash-completion"
SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz SRC_URI="https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" 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" KEYWORDS=""
IUSE="" IUSE="test"
# completion collision with net-fs/mc
RDEPEND=">=app-shells/bash-4.3_p30-r1 RDEPEND=">=app-shells/bash-4.3_p30-r1
sys-apps/miscfiles sys-apps/miscfiles
!app-eselect/eselect-bashcomp" !app-eselect/eselect-bashcomp
DEPEND="app-arch/xz-utils" !!net-fs/mc"
DEPEND="app-arch/xz-utils
test? (
${RDEPEND}
app-misc/dtach
dev-util/dejagnu
dev-tcltk/tcllib
)"
PDEPEND=">=app-shells/gentoo-bashcomp-20140911" PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
# Remove unwanted completions. # Remove unwanted completions.
@ -37,21 +45,47 @@ STRIP_COMPLETIONS=(
# Now-dead symlinks to deprecated completions # Now-dead symlinks to deprecated completions
hd ncal hd ncal
# Installed by sys-apps/util-linux-2.28 # Installed by sys-apps/util-linux-2.28 (and now deprecated)
mount umount mount.linux umount.linux _mount _umount _mount.linux _umount.linux
# Dumb symlink to mplayer, removed upstream in git # Deprecated in favor of sys-apps/util-linux-2.31
mpv _rfkill
) )
src_unpack() {
git-r3_src_unpack
default
}
src_prepare() { src_prepare() {
eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
# Bug 543100
eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch"
eapply_user eapply_user
eautoreconf
} }
src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 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" \
&> "${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() { src_install() {
# work-around race conditions, bug #526996 # work-around race conditions, bug #526996
@ -61,7 +95,8 @@ src_install() {
local file local file
for file in "${STRIP_COMPLETIONS[@]}"; do for file in "${STRIP_COMPLETIONS[@]}"; do
rm "${ED}"/usr/share/bash-completion/completions/${file} || die rm "${ED}"/usr/share/bash-completion/completions/${file} ||
die "stripping ${file} failed"
done done
# remove deprecated completions (moved to other packages) # remove deprecated completions (moved to other packages)
rm "${ED}"/usr/share/bash-completion/completions/_* || die rm "${ED}"/usr/share/bash-completion/completions/_* || die

View File

@ -1,27 +0,0 @@
--- bash-completion-2.1/bash_completion.orig 2014-03-09 17:38:14 +0000
+++ bash-completion-2.1/bash_completion 2014-03-13 23:26:44 +0000
@@ -536,13 +536,23 @@
# @param $2 Name of variable to return result to
_quote_readline_by_ref()
{
- if [[ $1 == \'* ]]; then
+ if [ -z "$1" ]; then
+ # avoid quoting if empty
+ printf -v $2 %s "$1"
+ elif [[ $1 == \'* ]]; then
# Leave out first character
printf -v $2 %s "${1:1}"
+ elif [[ $1 == ~* ]]; then
+ # avoid escaping first ~
+ printf -v $2 ~%q "${1:1}"
else
printf -v $2 %q "$1"
fi
+ # Replace double escaping ( \\ ) by single ( \ )
+ # This happens always when argument is already escaped at cmdline,
+ # and passed to this function as e.g.: file\ with\ spaces
+ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
# If result becomes quoted like this: $'string', re-evaluate in order to
# drop the additional quoting. See also: http://www.mail-archive.com/
# bash-completion-devel@lists.alioth.debian.org/msg01942.html

View File

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata> <pkgmetadata>
<maintainer type="person"> <maintainer type="person">
@ -10,17 +10,18 @@
<name>Gentoo Shell Tools Project</name> <name>Gentoo Shell Tools Project</name>
</maintainer> </maintainer>
<longdescription> <longdescription>
Since v2.04, bash has allowed you to intelligently program and extend its Since v2.04, bash has allowed you to intelligently program and extend its
standard completion behavior to achieve complex command lines with just a standard completion behavior to achieve complex command lines with just a
few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts
from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a
list of all string handling functions in the UNIX manual. mount system: list of all string handling functions in the UNIX manual. mount system:
[Tab] would complete on all exported file-systems from the host called [Tab] would complete on all exported file-systems from the host called
system, while make [Tab] would complete on all targets in Makefile. This system, while make [Tab] would complete on all targets in Makefile. This
project was conceived to produce programmable completion routines for the project was conceived to produce programmable completion routines for the
most common Linux/UNIX commands, reducing the amount of typing sysadmins and most common Linux/UNIX commands, reducing the amount of typing sysadmins and
programmers need to do on a daily basis. programmers need to do on a daily basis.
</longdescription> </longdescription>
<stabilize-allarches/>
<upstream> <upstream>
<remote-id type="bitbucket">mgorny/bashcomp2</remote-id> <remote-id type="bitbucket">mgorny/bashcomp2</remote-id>
<remote-id type="github">scop/bash-completion</remote-id> <remote-id type="github">scop/bash-completion</remote-id>

View File

@ -1,13 +0,0 @@
DEFINED_PHASES=install postinst prepare test
DEPEND=app-arch/xz-utils
DESCRIPTION=Programmable Completion for bash
EAPI=5
HOMEPAGE=http://bash-completion.alioth.debian.org/
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
LICENSE=GPL-2
PDEPEND=>=app-shells/gentoo-bashcomp-20140911
RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
SLOT=0
SRC_URI=https://dev.gentoo.org/~mgorny/dist/bash-completion-2.1_p20141224.tar.xz https://dev.gentoo.org/~mgorny/dist/bashcomp-2.0.1.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=bfd1a35b2dba033efbfb7f1b3f9a9355

View File

@ -1,13 +0,0 @@
DEFINED_PHASES=install postinst prepare test
DEPEND=app-arch/xz-utils
DESCRIPTION=Programmable Completion for bash
EAPI=6
HOMEPAGE=https://github.com/scop/bash-completion
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
LICENSE=GPL-2
PDEPEND=>=app-shells/gentoo-bashcomp-20140911
RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
SLOT=0
SRC_URI=https://github.com/scop/bash-completion/releases/download/2.4/bash-completion-2.4.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=7d781c34d30aa6136bea6ca25da107f4

View File

@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Programmable Completion for bash DESCRIPTION=Programmable Completion for bash
EAPI=6 EAPI=6
HOMEPAGE=https://github.com/scop/bash-completion HOMEPAGE=https://github.com/scop/bash-completion
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 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
LICENSE=GPL-2 LICENSE=GPL-2
PDEPEND=>=app-shells/gentoo-bashcomp-20140911 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
SLOT=0 SLOT=0
SRC_URI=https://github.com/scop/bash-completion/releases/download/2.4/bash-completion-2.4.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz SRC_URI=https://github.com/scop/bash-completion/releases/download/2.4/bash-completion-2.4.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=e21494b4c669c55bbef0e5ee5e9d8645 _md5_=157578ac0d328d1a0b4b30e5d2c28de0

View File

@ -1,13 +0,0 @@
DEFINED_PHASES=install postinst prepare test
DEPEND=app-arch/xz-utils
DESCRIPTION=Programmable Completion for bash
EAPI=6
HOMEPAGE=https://github.com/scop/bash-completion
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
LICENSE=GPL-2
PDEPEND=>=app-shells/gentoo-bashcomp-20140911
RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
SLOT=0
SRC_URI=https://github.com/scop/bash-completion/releases/download/2.5/bash-completion-2.5.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=50687892d595a8439d50c50e7998f402

View File

@ -1,13 +1,15 @@
DEFINED_PHASES=install postinst prepare test DEFINED_PHASES=install postinst prepare test
DEPEND=app-arch/xz-utils DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib )
DESCRIPTION=Programmable Completion for bash DESCRIPTION=Programmable Completion for bash
EAPI=6 EAPI=6
HOMEPAGE=https://github.com/scop/bash-completion HOMEPAGE=https://github.com/scop/bash-completion
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
KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
LICENSE=GPL-2 LICENSE=GPL-2
PDEPEND=>=app-shells/gentoo-bashcomp-20140911 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
RESTRICT=test
SLOT=0 SLOT=0
SRC_URI=https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=8a7263236d226baf4c3cabaf4c0ba7c8 _md5_=d88b101a900f6d3e2af1457d396f68fd

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=install postinst prepare test unpack
DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
DESCRIPTION=Programmable Completion for bash
EAPI=6
HOMEPAGE=https://github.com/scop/bash-completion
IUSE=test
LICENSE=GPL-2
PDEPEND=>=app-shells/gentoo-bashcomp-20140911
RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
SLOT=0
SRC_URI=https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 git-r3 52a888802d25387c2c74cb845d1219bc libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=77df6238b974a1ba068f88b51d37efb8