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.

(Portage version: 2.2.11_p165/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 127 insertions, 1 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/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