Use bash-completion-r1 to reuse the current installation paths or respect the eclass defaults on new installs. Provide forward compatibility with new completionsdir location for eselect-bashcomp. Add myself as co-maintainer to help with the possible issues.

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

4 files changed, 146 insertions, 11 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 98fa3ea7c91e..374ea95e8d58 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,15 @@
 # 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.261 2014/01/22 19:27:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.262 2014/08/27 08:13:54 mgorny Exp $
+
+*bash-completion-2.1-r1 (27 Aug 2014)
+
+  27 Aug 2014; Michał Górny <mgorny@gentoo.org> +bash-completion-2.1-r1.ebuild,
+  metadata.xml:
+  Use bash-completion-r1 to reuse the current installation paths or respect the
+  eclass defaults on new installs. Provide forward compatibility with new
+  completionsdir location for eselect-bashcomp. Add myself as co-maintainer to
+  help with the possible issues.
 
   22 Jan 2014; Samuli Suominen <ssuominen@gentoo.org>
   -bash-completion-2.1-r1.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index adab3381b607..abe79ea998cc 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -6,17 +6,26 @@ AUX bash-completion.sh-gentoo-1.2 2118 SHA256 219c4618936960a2b97c0a237c36961835
 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.3-r2.ebuild 3218 SHA256 65d588e08f44a8a654d88254fd135976a760c4e5574573cd27b6af65a2e7e8f4 SHA512 ffb70519062e81803c287444355e7b5c51ae70cca366b472aef221d4285535d4ce092bdbeed1359a7b9d5903f3f2bfd5d93734753724a283c861d91d8b2f1a63 WHIRLPOOL eeac8f6835e34e1e7d6dcdee6d6b3289097b2c6c619f024eb624248c2a1a454a1b18abec9df59a0b95107acf9808368cda9ec6ade626aeba2a5542731ee84493
+EBUILD bash-completion-2.1-r1.ebuild 3937 SHA256 5e1c162b109cdf6f414c657c81a2f540b349a093b13a15ac6d01c27f3f1c440d SHA512 87d13fd65a6f006fd150e72e0fc0e6dd4f1267c4d034667205505abaf9a4194063331f19da072985cb85da1ebaa521123ee958f305df3ca429db09712eec3bb2 WHIRLPOOL ca3bf2b784a7cdbda936f7493f4fc02a87381f71e4764a61b3af3de1ef40b6944309e1e4ac951c9487b4eceb39a4db721ccc48d1591d9eb1871f78479df96096
 EBUILD bash-completion-2.1.ebuild 3429 SHA256 9c43b41f5c3a36a526eae5e32f0c3c3073250764efed494679d5d62981193234 SHA512 56ca3f400b3948f403658df8b5f95dce49827056335edf07a10ba375de9eb23aab450645549a536e9ed50ce3e5e4279746e745437751c956ab71522018bd7917 WHIRLPOOL 0820e25cb25eefb17b163bc03a0d12c81bebad7b5bb1010f37d379bde71af9e8438e4d406d80a54dac0fd59a4b31f937b6d72d6bad50bfb607ba46de64d5ed59
-MISC ChangeLog 44158 SHA256 d5008b3fd84d49f5430d09800b578990b5dfd0862163ec90134b98174695327b SHA512 110a0061b172ef2e3a570b0dd442975e6c941398d063d2d65774931fd10f055333ecef590092ca02b9c8d5db9014c3be06eaf5a9d8b5a75c67ad02386cc08d84 WHIRLPOOL 6c9ba605db708ce1f9651c247e36e5970a7bfcbf46481ed1b32d71a10613307f49d06b567080f194b28eb7bb6497c66c00efca7353fbfbbd129a3eb0a326d47a
-MISC metadata.xml 930 SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9 SHA512 3410bd40fd29b9a140e1508c0fea5aed6ad95c8c05b6ab5bca83dfd1a82ed617fe086b45677d971a21cb62c6e7e3f9ade43793b4b1eba978ae6ab0e6a88c3ce7 WHIRLPOOL 8d49a80655a987ea098a7185664f37549a99a54e1da4082ec614ae7b4a4361c3368ca47c857a92e6b5a8c21ecf9a650a9dab6f99bcbcfd22aa0c448f2240b790
+MISC ChangeLog 44559 SHA256 ed66e55263a4be8377a900d9f461dcb607df134cec45c1a4dc5cf673708be8d7 SHA512 4d73090569a5b54b45a81dd027ff43e75e6089b3bf086072e414b26e63afbe27486d7ad7c46095e456c31a5caa048641215f5cab8ded2aa7904a4e6b81dbf151 WHIRLPOOL b49706e18dd00dcfdbc39d8b352350d60295cfa4330add187b279f4dbdd6838f9f9d3750306f9e491c74c395e8821ac14e755d1d7904b5a2a5ebabb964545216
+MISC metadata.xml 1020 SHA256 785eaa20ef6e8c3d46916e22ecbf772ddc9ac12243d2f50ffd149b5f0e5c51c2 SHA512 305eddc1c77d281e6c64417c9d1c2373d20b6a88ae1f27764488814343eb7d5409705e645b31fb978774352c76cf4a14d0d51949a2f2945a8e8e168dd6d59528 WHIRLPOOL 52db2505ddd82f53c74675babc2ea35d3551091254f13638390662cb151bd65f87d36b26245ae90605cb6c9b8ba74cb25ce27158ce2016e8e2192ee47ea6f979
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJS4BrNAAoJEEdUh39IaPFN35YH/22jzbehf8tDkZkwm6a9WuZ9
-eaHg+RY6w/bwo5SF/7MR6wEHct+eCErKM01COOnKN1wkpriyh9rRMTqwvCLYCWxO
-spJuH69Qr1+19+Ot503s6WUxbIPAkg2fJ1cnCdD3ERxinQJTPWja7b/3ajCQlk1r
-f27ufOEU48xjEFlR912oyfPCAHwpi8gT+FNZPGPBueHsfX9cFThSbQT6zhPVm2f2
-uGx9lQWSN5kDzKwq3Dd4vi9BWFF4sl5VzBEfofQBvZcN5SyrwcyYUliyrQpY1IH+
-axvLnVmRo2ysrmUHHSfwxxi+oIDHeu2V0FzH9pHVERPZ04jtm4k6eWbeWfojUsM=
-=WxJo
+iQJ8BAEBCABmBQJT/ZNHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJMAQAKiIxDZ+VVxdL0KlDVjcReG+
+5NBTbSk4PQpb5Y0L36KwnEW6yQGEm5VbhF6GPIkkG9uZXrSFurQAG22JupmXtbgZ
+Y1OKVTXaRndtXbBwOPiq71Ypj0nv5L6iq4WGsoJP2yb0DClk2QiCdMv82cgjMO80
+HmtPJN4FvrFMvOrg5Nbd5A97m71yo45WpvKSL2KXyC6xk4a75nBKSx9RuBny6wrq
+0znSHl6LNJorvdaiaCpUeQPgjQeEGOZ96MRo+UDRsmxa8YQDaeE8GIY2BSHJk0Qd
+FlXKZZPXmz/lMqT4j/RSFvyp4G3YZHV9iRIvNtPudsSqKG71ynUEvvP0L3H5ZDRA
+mkM+x2sjWl314OekA0rgwLMjdeV2vpdrTeIDUj5ANpC/hUiRjJePvu7Z2GNmOzhg
+O7jLkyyW8QpyKLdxA+tLwxxCCDUjnsWgt+OpYxRfb/CvaHuPYX3fLZbjOcMXdgVg
+wg2zMcnxP+eRzZ/ZbK5/5ZmSHy5zjG4whq7vl/3pvaLQ+CbMAjHVZiRfDvcwyJ3T
+9TbM77WvZsvAHDPVkSe3XclS5KOaeZAwYgsV06gXkgGxxLu+/BMT3SZpj3zL1Zkn
+bz99eoRqGAnk6FNMxgBnFkg/e19Oc3KcIhLG89VmIysqUx4sfKe0F91oLgkg0sv2
+tO/46rlC/knjIUVu7kix
+=8y+p
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-2.1-r1.ebuild b/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
new file mode 100644
index 000000000000..0f4830c12e03
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.1-r1.ebuild
@@ -0,0 +1,113 @@
+# 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-r1.ebuild,v 1.9 2014/08/27 08:13:54 mgorny Exp $
+
+EAPI=5
+inherit bash-completion-r1 prefix toolchain-funcs
+
+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 ~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-admin/eselect-bashcomp <app-admin/eselect-1.3.7 )
+	|| ( >=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
+
+	cp "${FILESDIR}"/bash-completion.pc "${T}"/ || die
+	# reuse paths from the eclass -- those can come from pkg-config
+	# or defaults.
+	sed -i \
+		-e "/completionsdir/s@=.*\$@=$(get_bashcompdir)@" \
+		-e "/helpersdir/s@=.*\$@=$(get_bashhelpersdir)@" \
+		"${T}"/bash-completion.pc || die
+
+	find completions -name 'Makefile*' -exec rm -f {} +
+
+	# Part of >=sys-apps/util-linux-2.23 wrt #468544
+	local file
+	for file in cal dmesg eject hexdump hwclock ionice look renice rtcwake; do
+		rm -f completions/${file}
+	done
+
+	# app-editors/vim-core:
+	rm -f completions/xxd
+
+	# net-misc/networkmanager:
+	rm -f completions/nmcli
+
+	# Forward-compatibility with new install location, for eselect-bashcomp.
+	echo "ES_BASHCOMP_DIRS=\"${EPREFIX}/usr/share/bash-completion/completions\"" \
+		> "${T}"/50bash_completion || die
+}
+
+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
+	dobashcomp "${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 "${T}"/bash-completion.pc
+
+	doenvd "${T}"/50bash_completion
+}
+
+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
+}
diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 4bcc7abbe629..3b6711241595 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>shell-tools</herd>
+<maintainer>
+	<email>mgorny@gentoo.org</email>
+	<name>Michał Górny</name>
+</maintainer>
 <longdescription>
   Since v2.04, bash has allowed you to intelligently program and extend its
   standard completion behavior to achieve complex command lines with just a