Version bump (bug #395091).

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 107 insertions, 16 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 551b973793f6..ee5bf45182af 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.247 2013/06/02 08:43:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.248 2013/06/03 22:26:45 jer Exp $
+
+*bash-completion-2.1 (03 Jun 2013)
+
+  03 Jun 2013; Jeroen Roovers <jer@gentoo.org> +bash-completion-2.1.ebuild:
+  Version bump (bug #395091).
 
   02 Jun 2013; Agostino Sarubbo <ago@gentoo.org> bash-completion-1.3-r2.ebuild:
   Stable for sh, wrt bug #468554
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index abcb08161f71..537615506fb9 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,31 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX bash-completion.pc 282 SHA256 9167632403986bae490182d4177e2e49e4b442b3f6dca14e4358db97890ab677 SHA512 ed413f7bb5decc8b0336d1d383dfd8c9b9d5b709369adec1c5c1b62cf5c602fe8d1281d35d7cc2879e016acda83402a56be9538b708e3c251331e22f8fbdc8c8 WHIRLPOOL df61bc53db7f7a0b37783acee93ff9fa7ca1d6a88fd5f944e9ad87067af10cff12b18c4af60888fd96e48236eca271540e3de3028607c4e5f95c52ae9d48f801
 AUX bash-completion.sh 2109 SHA256 98022951b80b4af62cb254b5b738592835785784b5ddad4b8f71187f15f03b80 SHA512 b8c817ee3bcafcac0546f3de1a1c8e8e9ae0a7456255a9d591fb9831f78719f6aa6a6141d00447d7e069b5daff78dded22fa647997b4d51c58c0ccedc17824a1 WHIRLPOOL a2b39c9dad7a23b1561325dd4fb3685b0d73aac59037011675a6681d1228d8f2c51242b1d97c431b050b4989113075b1d18368cfed67be2512340f7fa494ac00
 AUX bash-completion.sh-gentoo-1.2 2118 SHA256 219c4618936960a2b97c0a237c36961835ae21d819e29239a5d4466b75695ebb SHA512 c73f91b05d87b646a9a10ed29f7003fca27dc65dd1a0435f65d9bac34f8b9968c31475962b773d0d8a22705beddace552d03c84bd0ca1f1ca858c0aabe17e9f5 WHIRLPOOL 5dea0101b053137da4d6de3907f77fed1bf7868741dd8da5e7fccb834b06f5f0432c0da29e223b2e2e601489a8f9e2354e3e1d37e74e589011e16dfb3e4370ce
 DIST bash-completion-1.2.tar.bz2 197574 SHA256 dd09a86134204e4c6b860bfbd5ee8ac46c6b32a54478b967dcf81e8a7839d354 SHA512 7e4e051dcdffdb3722c3e9def8186a3686da4f0b67302c0354900b60224e06e06a30238e496e5a27e4a893acfe896d5e0f8d1b71ff56cc540b969a40e25d54c7 WHIRLPOOL a9650e2e52e03cdebf4318b3baafb322ef3802aced7acb7f26915bcc8ad12d08e6770bac12cca50f9452072001b67f0476e669084ebfed11c9882296d0f3ea21
 DIST bash-completion-1.3.tar.bz2 211899 SHA256 8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec SHA512 f0c6eb3edce982d1306fdb7ba2cb598c08cff4bde8496fca369b3c4d2d3af0ef48dd494ab96258cc90f30b875a56759aad13a6b1bfb4928bfba4634cce6bf8be WHIRLPOOL 9ea16b019eadcdcf60046b58d2c0f3ab68c189f461842d3d9f585ff25d8ba1bd48bf847868c2cc7e5475320d9c7aeaf21ce74818345c7fe648500549d51f29f8
+DIST bash-completion-2.1.tar.bz2 265329 SHA256 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f SHA512 0bc71039ef136b1ccb72527eb40f2ed4068a58dc31b1ac1ee52a40e7c950ea4cfbb4f1bee2f0da6774e56062578fa3653096e6d306eea7f028dd55ff737e92fe WHIRLPOOL 0275d8ac99a0ac5b12637bf2b13561d656b239ba7c166071cb283a481df2fdd904ad1c18608ea35b9af4f0f4db3b034f833f0fd586a0096626d1b268bcd8fc00
 EBUILD bash-completion-1.2.ebuild 2815 SHA256 d65c732ae621225f0b3e528005e0a4fb31c2d1de2fe8a2e6ed0be699dc6145a9 SHA512 455f8288f863d01b4f3cad126c6d42e13d1807814861e0220f06fc7e3fdb353ff92400ab82eab438366d6d4440a1f90175d62f8ca635dddb02a3af328a0ceaae WHIRLPOOL 1ca6e12af23b1e2bae709ddfcbfbe535d9431a558744ad8b05490f66a7f46d2e8f2d73dbe7e73f2649ae79064db8b1fc1a215dbbb45155daf7a1264ea41056df
 EBUILD bash-completion-1.3-r1.ebuild 3104 SHA256 fde0cc88a372247e55767b71b1136a1696e25246dfc269e56910c58560434e4d SHA512 e26c81b08e1a787d0d19b4b1749128ded0d5609801beaaa78fc79d4b1485a3fc7bdbc57f08ab41f009ce6ba5e2b35267d320b81cd301038efc17d95a05a4c418 WHIRLPOOL d4c215db3850c8d3f7c17278a7353537ffe56cd8bfc8131113a4b8a7bda65fb02f8dd492141728a736daf15627eadc341a02ef616addbdff650a67f3536a6ef4
 EBUILD bash-completion-1.3-r2.ebuild 3168 SHA256 3a4a8da97edefef9122ac0ded7d14735d5c93df8a71fe79472ed200e33cb8473 SHA512 9502a5f5735da5a19b13a9262758f17e6aba4852d218cb06453bb8d6ae704e8afbd6cf04e10118940c3c34c683c5703488e0a97f7d85fa932f606cdededbcb3c WHIRLPOOL 7fcbb4bf61158f7524974c8867f880bcfe98ba90b3e16ecd8162d29a798fac119e86e77f8a4147dbd2002dd8c810f926ea2e47e1dab810376dba1507db437a92
 EBUILD bash-completion-1.3.ebuild 2765 SHA256 861a98ec3f944fa89c464172acbd7c8a6bbf8ccafb15bdefbb24774c8158561a SHA512 da3438c89b1e119bbc3f356257e287b6570e3693045ac2909436625a6fd099c2ff5959704bbce848e1ea519cca1fb04a2f5a4385fedc190da90d70414aa40d0f WHIRLPOOL d1e4682a06c18415e2d1640432e93408d9e1ee35dd97901c3046b52540d8e0995d3fbba46fd430b45bdc51a9a25ecec3c237a24af4ca5dc231ad61151e87f292
-MISC ChangeLog 41918 SHA256 cda79d75751cc485160d9b25cef57d3a57293084a0a99e934b1a98777055b93c SHA512 899ccb1f148feb1fbff1599baa6b05e3dd7e436bb8cc201f2e8cae80c4c48046b374d8f69cd9834cefb371f82cb94f35efe7eccbea44722b2c7de16779279d10 WHIRLPOOL 14b7df1d79dd33bdce646f7eabe7a9764254e6d7d25bdcc8c03abad062c4b40b0b11fba5e16531a2c057bd8f2152c5f8c341d0d77a4009a39d813b0e512c962a
+EBUILD bash-completion-2.1.ebuild 3229 SHA256 d2c85a1e0e3fc9bff2ef6a6aed6c9ff9e04fcc00d10805a7903f24f3b7e79f9b SHA512 31703429868fd6c4827dfca4c06f5c15116db8a39774780aa5d69a57ff1ba48c3c9b70678707c0acc5d46ee7b01aad7a024f0e2e487f60b73df341247aaa96a7 WHIRLPOOL 8f53e362b065997c796a61b3884eb95595c18d8d6656df067b8da89a09ebf3110a75a08ebdfd1a75239c691cbbabfd3c38a43fc763f27cd2ad44262e2c609720
+MISC ChangeLog 42061 SHA256 1af5f22915d749622007a3ea53a1e15a425b71069bba023f65bc01581e440ae1 SHA512 f3c7292cf8a1c79c3014684267155bb22fe89eed26c34813e9d9652ed887e7a7687e55beff981124f770dd3059494a56c442fb8d0dd49bc4b308f62e13f3520c WHIRLPOOL ef568c2c465e5b8c0d050fc4be09c14678f4cebf407a91ab407bb80ff87c7371b0f9252724a35b988ce066316df2b471159c0f8e74861ad1aad505a036a1007a
 MISC metadata.xml 930 SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9 SHA512 3410bd40fd29b9a140e1508c0fea5aed6ad95c8c05b6ab5bca83dfd1a82ed617fe086b45677d971a21cb62c6e7e3f9ade43793b4b1eba978ae6ab0e6a88c3ce7 WHIRLPOOL 8d49a80655a987ea098a7185664f37549a99a54e1da4082ec614ae7b4a4361c3368ca47c857a92e6b5a8c21ecf9a650a9dab6f99bcbcfd22aa0c448f2240b790
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRqwT4AAoJELp701BxlEWfPMgP/0BYSUJRWtHQP6A2q61VfMo5
-2aZu1mRPg6Nutx/UDowbVZ3bR4s6L5gUF2yFxBo0xlt4trfSgasDZAH6mAmny8AY
-pU/U2PUoQNkmLAKmYGtXvnG1m584RHNOnRT0u/PWMmEaPncinp7rwkOoETmCj7Jq
-6xYsE5XkSshw8IJ9EgheFPbprnoPb3ecptMDGPwUx9AY8g9AhTJsvFi+75TCF1jz
-CPx0aTAH+G8gBZKPFI60AKFiUr7ZiGwRS5vVwFST8cYBneDv2BH/M+c0942BVVnO
-3Cb0oYAJvuXNiCk1IU/PX0dg48iwvmwI6ezigJ2HbeDrpxct5tfhbKn58RdNFl9q
-1at6SHRj0SEje9Qzqzxh56uF0gBCvalTTwfj/Z0RON0wUoKACpAs41hdXaeoHQiA
-kVKCVeYwgpkvWz0S6KgmOaR/3OyW7+Zjo/K7iazYvW23UIES3CdV7OReatJ/Cf22
-PNN6QprcJ0J4THbBz7ujbopk5WDcISBLOowC5+kJgXjQ/tH/LVqIdxK81lO4e4k4
-DaOAA0YdPhELW8TeMruvq9itfYsbxbmxjbe4UZ+lWyzzbaBtMim4F92KkL1yYQgD
-U6Jo6YSxCSN7+vMqi89VjBw4ds9hpUIyLPupCh8AZcjY711AVOfTog7yfDTEmHOI
-+Y72zAip6a1wQPFncXC2
-=hqJ7
+iEYEAREIAAYFAlGtGCcACgkQVWmRsqeSphN4KACZAVY6bIzI8PalCsRdTDymNz/z
+zBoAnRrfPZS3WqstCWIRQ0XAjHB7L9fK
+=0vIW
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-2.1.ebuild b/app-shells/bash-completion/bash-completion-2.1.ebuild
new file mode 100644
index 000000000000..13cfe47fd3b6
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/06/03 22:26:45 jer Exp $
+
+EAPI=5
+inherit prefix
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="http://bash-completion.alioth.debian.org/"
+SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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-admin/eselect
+	|| ( >=app-shells/bash-3.2 app-shells/zsh )
+	sys-apps/miscfiles"
+PDEPEND="app-shells/gentoo-bashcomp"
+
+src_prepare() {
+	cp "${FILESDIR}"/bash-completion.sh-gentoo-1.2 "${T}"/bash-completion.sh || die
+	eprefixify "${T}"/bash-completion.sh
+
+	find completions -name 'Makefile*' -exec rm -f {} +
+
+	# Part of >=sys-apps/util-linux-2.23 wrt #468544
+	rm -f completions/rtcwake
+
+	# app-editors/vim-core:
+	rm -f completions/xxd
+}
+
+src_configure() { :; } # no-op
+src_compile() { :; } # no-op
+
+src_install() {
+	# Gentoo specific bash-completion.sh file.
+	insinto /etc/profile.d
+	doins "${T}"/bash-completion.sh
+
+	# All files from contrib/ in source package get installed
+	insinto /usr/share/bash-completion
+	doins -r "${S}"/completions/*
+
+	awk -v D="$ED" '
+	BEGIN { out=".pre" }
+	/^# A lot of the following one-liners/ { out="base" }
+	/^# start of section containing completion functions called by other functions/ { out=".pre" }
+	/^# start of section containing completion functions for external programs/ { out="base" }
+	/^# source completion directory/ { out="" }
+	/^unset -f have/ { out=".post" }
+	out != "" { print > D"/usr/share/bash-completion/"out }' \
+	bash_completion || die "failed to split bash_completion"
+
+	dodoc AUTHORS CHANGES README
+
+	# This is backported from upstream 2.0 release. You can stop installing
+	# this file after 2.0 is in Portage and use the one from the tarball
+	# instead.
+	# Installed to datadir instead of libdir because bash-completion(s)
+	# are not ELF files.
+	insinto /usr/share/pkgconfig
+	doins "${FILESDIR}"/bash-completion.pc
+}
+
+pkg_postinst() {
+	if ! has_version "${CATEGORY}/${PN}"; then
+		elog "Any user can enable the module completions without editing their"
+		elog ".bashrc by running:"
+		elog
+		elog "    eselect bashcomp enable <module>"
+		elog
+		elog "The system administrator can also be enable this globally with"
+		elog
+		elog "    eselect bashcomp enable --global <module>"
+		elog
+		elog "Make sure you at least enable the base module! Additional completion"
+		elog "modules can be found by running"
+		elog
+		elog "    eselect bashcomp list"
+		elog
+		elog "If you use non-login shells you still need to source"
+		elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc."
+	fi
+
+	if has_version 'app-shells/zsh' ; then
+		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
+}