Pull in a proper version of gentoo-bashcomp as extension of the bundled default completion set.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 117 insertions, 16 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index cc767391d34a..0e52aebc35bb 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.276 2014/11/10 17:59:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.277 2014/11/20 11:48:41 mgorny Exp $
+
+*bash-completion-2.1-r93 (20 Nov 2014)
+
+  20 Nov 2014; Michał Górny <mgorny@gentoo.org> +bash-completion-2.1-r93.ebuild:
+  Pull in a proper version of gentoo-bashcomp as extension of the bundled
+  default completion set.
 
   10 Nov 2014; Michał Górny <mgorny@gentoo.org> bash-completion-2.1-r92.ebuild:
   Remove the bash blocker, and just depend on bash. There is no point having ||
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 157aff63f172..c125c5662c61 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -10,25 +10,26 @@ EBUILD bash-completion-1.3-r2.ebuild 3218 SHA256 65d588e08f44a8a654d88254fd13597
 EBUILD bash-completion-2.1-r2.ebuild 4090 SHA256 34b75f419f50a4f9354775d573b60cae86e3d096904f7eae6faf355a33c64889 SHA512 f0236136e18d38d6a5fb99592c21975b7e2b5058ab9eb883e1be31acf3494f32cbc2dba7ebf424f4fd373a20ccab9dae511111dccd267bef262c850b79f5c13f WHIRLPOOL 3aca5eb741c1f6e0aa0036bada05d5ac7d4cfb0c81c7cb5ae730f99a4e3d905cad86274262d1450d2de5cca703261b265cb0c08d37aa86064d7a86efa60da6ca
 EBUILD bash-completion-2.1-r91.ebuild 3167 SHA256 5c063f0d34645e9b996f28abfbf9dca83c797d03aef112dacc93cce2df8663d3 SHA512 7c47ef36cee93ef33b06182d4e426cfe6b202ff195248120353b4f55689fcfc81f85868946751cf0856b666abef2a7a70922d96ed2450a15c5c91a9e87ab2eae WHIRLPOOL f70dc9429e24368f59e548cef0c006436bbfd8e2f5f3f53a374c24fbfa61db471950e430faf8a346810f68154f82ca2790ab361c7c68002d4588be56b536aea8
 EBUILD bash-completion-2.1-r92.ebuild 3203 SHA256 e0f40223cf5217929f80c13c7f385b144f1fd281169e70cd1bcf55a80a70877b SHA512 bcbb5fc1d51c2849699caaa63748404304e1d9e3ea357ae7bbb1fab5268acba3e73a28af56a76b80bb5c73de629089aa21fb7ca8de850186978136162fe672f9 WHIRLPOOL cfd5554ad8d4b4b0e3a84971a9e95afdaaff6f67b2b64749aad0a4db64565a5c26559fe49bb5268d00b7896f02e287c3f64b825f2405873aa55afc9d2a92aa82
+EBUILD bash-completion-2.1-r93.ebuild 3251 SHA256 8ff8cc2fa36d46d6b5c342442a03c9cb14669a14e853cd68f917b3e36a306847 SHA512 f153a23506d88288f4c0ddadf33e0af0b744d7d129230109735329711404c304f4493caf8fff3d2e07ab1a4148df8414c851e849c2c1dea4e2db3098ce463be6 WHIRLPOOL e9ed0f17c6547caf0477c6b90f79915c24b42cd3f28e982ffe75725c6c11feffd277c88e3860001ebe666923af6b16b4804bd6c62b9e278c57aebac79dc2236a
 EBUILD bash-completion-2.1.ebuild 3430 SHA256 f32bfb8898fd5591e95037095b4d646526448b2ae9d1c0b8045aafeba8f3f21f SHA512 f6b62b85d51b8c327933c58805e1c46cfb4c2fa82f009bab9b91f5e5af790f1f771f08eab8a3a6c2a03c9c9ed1932e4a5641f9afd1ba6cf937fbe6849bda8c9e WHIRLPOOL ad3948f6d1e05002e4d3c2dd3c84007e14fd47461f5973387d2a2d0e221eb1a06aaaaefd13dab69c071039a989d50a3b888d3a615e52a64088113e5afe12401b
-MISC ChangeLog 46844 SHA256 7f9ad7219f471f1665bd3942f59c04a3982f28994dcf9d61ae7e4e7ff5a3b00b SHA512 dd01b41e17f6debd9f44a6ad2512c481fdc90a86c8455d80cc469f13fc3726caac764d7963c86b8cde03a1f44d5023550c4697456674b053c5fa986eda0c5a70 WHIRLPOOL 00033b1c1e58e631e4e22e6114fe1b0636e1f922fdf5fb1bb91a1f77fe9ea99f94926d43771e154f0f48a677141f77f5490670ccff20f29fad8c7612fdd9769f
+MISC ChangeLog 47068 SHA256 56160e45ea72cbc1d00b27df6356b19053790a06b104ab8aea84caea0f07e97f SHA512 a87edf0ba496826305a532bc743fc1cd64a200c8a4706e60a77ade9b2d687ebfdea4cc2a24dd373c79dc94a00b596e1fd01de4208d508d936f838d733983ccc2 WHIRLPOOL 7b4614f2128c6bb00a02f8268491057781445f68e727efe3f439b669eff8457069259c6883f4c177225cfdb8cd40fd8713fe7083cc3be9f3c92aada8452bb201
 MISC metadata.xml 1020 SHA256 785eaa20ef6e8c3d46916e22ecbf772ddc9ac12243d2f50ffd149b5f0e5c51c2 SHA512 305eddc1c77d281e6c64417c9d1c2373d20b6a88ae1f27764488814343eb7d5409705e645b31fb978774352c76cf4a14d0d51949a2f2945a8e8e168dd6d59528 WHIRLPOOL 52db2505ddd82f53c74675babc2ea35d3551091254f13638390662cb151bd65f87d36b26245ae90605cb6c9b8ba74cb25ce27158ce2016e8e2192ee47ea6f979
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUYP0MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUbdUbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBCwQAJmXAMbxl5EHfN8tB0xvRXuP
-1Oza+e1Vzy07Snv+iADa8/AoIgQ6H0fNJo5Td6CcY8RCX2YNjTYyKK07+drvQ0GZ
-tLT+N4tq6TETdueuT6YHUqR9C6HhEZbtEKxxASwh8/i9XRGolt8XMVWrle0thAOj
-wV3NhXZGVPVu2pBJnSaFTxexwwETH203PyOGWWkHwnotlLY/6bcAZQrhV201lCbN
-t1XQrNB7Sumb8nyfT2E9/5Z6w8FudvsxXf5qWCOeyerqk8HztfHMU7ryeA0M+qal
-mWjRoPMnpSKMHgRXUs2nKlfpdzpGhv6c/qG8GXPoXaYQkNBAXYTWWQFcHCIDAtuN
-1NT9aDFPtOMntX9dxwES1sWXw/CKwcpljDplJQThcxrsY3zr7GISTM/eEEyZh7B/
-MJz3f4AKpzTQq4jfMLJ3nQSeBb0Tc8MUYkKFm4oveK60PD4rtA4eOI0gB3C81W3D
-0Cx+ZW4jirY06TgBmb2L6QngZe3QovNOHo2GqN82kQkC393QVsX8dK+BeoLJl2fq
-UZX88biJjexG2obn9O+DmMGd1UIHiz48t3aRgAccn3MonBHQa07VDL3B65Ezf/oG
-8a41jrBh0JMwT+zwI2HYjJDGgM/Pqb6AP9We+GJCeEqAdHLn9GiPGrDNIJ/qVO0d
-FYrflt59GbHOMQjmqR51
-=6a44
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjEcP/0MMq/Q4tq4j0pPjSpDoGM/U
+vP1eZB/Yp9lrzluKZpCjCrG2QRBYvyvygpl1Marx5Ob52a8U8FsqdlL4JmhyMpzz
+6nqNRJXjNfbTDFv5mtGXnyvGQBwrLmL9rxMCks15wU6F7UJJoxvXtXh/kRUgR9Zy
+O7E7O4McNJljFnmvDgArq+sRII1sCVv+naUQSKKM/nrMv1FtlWBdGNFLoeEFacon
+J19niIhYWbWGP22Gvry5fydbcpDBzKGVxNQNOCC1IWlL2SYWzR58u+LFgrkBGTpZ
+2tJ7TsDF7B61uXXwXN3/DOm6UBBHonHEhGdcm8tDUPxPxs2sUhIaGIeyXMXDqwq+
+yxrMv2hbNWwD68e5Pdv1bqTx4VlZcPi1h6mqRJtV+NpH46kr5EpF5B61narACxdd
+eN/8fCmIZvAKZboj60mKGXtcc26WR1NQb4jH2tQ2Tsh8HzCQ0sSnX6hvIuHIgs8R
+QpRNAOFirqBFiRPqmpkTUtDofDiJ+mg0nkvjjC6LhyaJUEEgXsTPvhdkjH751N+/
+SzB5GlF3jx0EJ0IJ3oP5toq2XAzuVY0jTTAvIuWlZQYfq+GcTmFERqJ94Ticv5f7
+NkQe4qMlERuie35fPGTulsjiie5f/GXwPPMOe50VwDG2EgsYq2M00ELu5ITKW5v3
+aTVvp3t2r0+07HHBO2Dx
+=qEuH
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-2.1-r93.ebuild b/app-shells/bash-completion/bash-completion-2.1-r93.ebuild
new file mode 100644
index 000000000000..c9fa1f6dad1e
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.1-r93.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r93.ebuild,v 1.1 2014/11/20 11:48:41 mgorny Exp $
+
+EAPI=5
+
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="http://bash-completion.alioth.debian.org/"
+SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2
+	http://dev.gentoo.org/~mgorny/dist/bashcomp2-pre1.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 ~x86-interix ~amd64-linux ~ia64-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-admin/eselect-bashcomp"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Included in util-linux, bug #468544
+	cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake
+
+	# 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
+)
+
+src_prepare() {
+	epatch "${WORKDIR}"/bashcomp2-pre1/*.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=/etc/bash/bashrc.d install
+
+	# use the copies from >=sys-apps/util-linux-2.23 wrt #468544 -> hd and ncal
+	# becomes dead symlinks as a result
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+
+	# use the copy from app-editors/vim-core:
+	rm "${ED}"/usr/share/bash-completion/completions/xxd || die
+
+	# use the copy from net-misc/networkmanager:
+	rm "${ED}"/usr/share/bash-completion/completions/nmcli || die
+
+	dodoc AUTHORS CHANGES README
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}"/bashcomp2-pre1/bashcomp.eselect
+	doman "${WORKDIR}"/bashcomp2-pre1/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
+}