use bash-completion-r1

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

12 files changed, 67 insertions, 19 deletions

diff --git a/app-paludis/plop/Manifest b/app-paludis/plop/Manifest
index 8fd782de..ef01a8fc 100644
--- a/app-paludis/plop/Manifest
+++ b/app-paludis/plop/Manifest
@@ -1,4 +1,4 @@
 AUX plop-0.2.3_0.30.8.patch 14202 RMD160 5b45265a49a9dfea6c316de38182a1cc660385b9 SHA1 15d40a3533eeb451f05551b20e4b454ca7df3f3b SHA256 9238e3f2a3508705df8a1689418eabfe5fd99eff4276947c6f6da957ef7dffab
 AUX plop.bash-completion 2255 RMD160 deb6e27bfb99fbca3cde5bd30b6d44567ac69a77 SHA1 fb7b9cddbe5b0358ed6cd4d9e5b0c269c1ed848a SHA256 08c96f4c2bc90bc40af08634d98fd5535986f5e935f90af9c252156906fcaeaf
-EBUILD plop-0.2.3.ebuild 1391 RMD160 b7265490516315ffc7a71fbe55ce69f469c2b77e SHA1 bd8db8d3b5214eacfaac1dc9bd0073d0d42af162 SHA256 b8ecb964f2e4cad721b49e3872d8daa4463926933811e6d98a626d666e4daae0
+EBUILD plop-0.2.3.ebuild 1389 RMD160 7e93851112eb7dc237c6380b4baf1b08c2784d91 SHA1 7415b1c30518c4fcf85be1249e2194adfdea9d9e SHA256 6a8d6e51e03066327846d358022b742817bac07cec4d025d1cfcef1affd56131
 DIST plop-0.2.3.tar.gz 21315 RMD160 11a1590f91e49d985a5109fe8ca3421855cd4c9e SHA1 dafd5ec96c4ddd6d189feb104c9cb7811d143728 SHA256 944cdfcb9d633dacc4a196039d509e6dc9a22e4ec1715255733a75ca6a36a9e4
diff --git a/app-paludis/plop/plop-0.2.3.ebuild b/app-paludis/plop/plop-0.2.3.ebuild
index c43760f8..fac760e8 100644
--- a/app-paludis/plop/plop-0.2.3.ebuild
+++ b/app-paludis/plop/plop-0.2.3.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="4"
-inherit eutils bash-completion
+inherit eutils bash-completion-r1
 
 DESCRIPTION="A nice paludis.log parser (patched genlop)"
 HOMEPAGE="http://www.genoetigt.de/site/projects/plop"
@@ -35,7 +35,7 @@ src_install() {
 	dobin plop || die "failed to install plop (via dobin)"
 	dodoc README Changelog
 	doman plop.1
-	dobashcompletion ${FILESDIR}/plop.bash-completion plop
+	newbashcomp ${FILESDIR}/plop.bash-completion plop
 }
 
 pkg_postinst() {
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4e6c8240..6827137d 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,5 +2,5 @@ AUX external-gdbus-codegen.patch 3170 RMD160 15dad383d18636d4e8c4777153ea0f2b84d
 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
 AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
 AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af
-EBUILD glib-9999-r1.ebuild 6385 RMD160 0aecad91bc41246f44afc5d33f03380a9f715c2d SHA1 944c375c83a2fa63feb8605659991b1d9c8fc210 SHA256 2226f8c7a38921fec876ae4077f2775549f32361c272a115c625594dafa3e533
+EBUILD glib-9999-r1.ebuild 6373 RMD160 47b68635242124c1f38ed2e0b9479496682e4144 SHA1 bb81209be70dc589dc8d5af7196a25a7aebb81df SHA256 b333a47f7733da4f04b76d2f9821e0337631ff33554e6749aeefb9a875446f33
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
diff --git a/dev-libs/glib/glib-9999-r1.ebuild b/dev-libs/glib/glib-9999-r1.ebuild
index a3eabd3b..95e72565 100644
--- a/dev-libs/glib/glib-9999-r1.ebuild
+++ b/dev-libs/glib/glib-9999-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit autotools gnome2-live libtool eutils flag-o-matic multilib pax-utils virtualx
+inherit autotools bash-completion-r1 gnome2-live libtool eutils flag-o-matic multilib pax-utils virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -128,9 +128,8 @@ src_install() {
 	emake README || die "emake README failed"
 	dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
 
-	insinto /usr/share/bash-completion
 	for f in gdbus gsettings; do
-		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
+		newbashcomp "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
 	done
 	rm -rf "${ED}/etc"
 
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
new file mode 100644
index 00000000..c97305e2
--- /dev/null
+++ b/eclass/bash-completion-r1.eclass
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: bash-completion-r1.eclass
+# @MAINTAINER:
+# mgorny@gentoo.org
+# @BLURB: A few quick functions to install bash-completion files
+# @EXAMPLE:
+#
+# @CODE
+# EAPI=4
+#
+# src_install() {
+# 	default
+#
+# 	newbashcomp contrib/${PN}.bash-completion ${PN}
+# }
+# @CODE
+
+# @FUNCTION: dobashcomp
+# @USAGE: file [...]
+# @DESCRIPTION:
+# Install bash-completion files passed as args. Has EAPI-dependant failure
+# behavior (like doins).
+dobashcomp() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	(
+		insinto /usr/share/bash-completion
+		doins "${@}"
+	)
+}
+
+# @FUNCTION: newbashcomp
+# @USAGE: file newname
+# @DESCRIPTION:
+# Install bash-completion file under a new name. Has EAPI-dependant failure
+# behavior (like newins).
+newbashcomp() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	(
+		insinto /usr/share/bash-completion
+		newins "${@}"
+	)
+}
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 223e89ad..88e1ef20 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,3 +1,3 @@
 AUX 0001-paludis-sort-world.patch 6309 RMD160 aed7ebcd6584cb48c9078b7b0f25686c8bd7c16a SHA1 ca105295391c8869f4f1a38b7689d08efdcc6a0a SHA256 b1f40b94776ea05d109d6b8c6ae3abf31cb362f5241beac8c3e30adb605f7650
 AUX 0002-cave-resolve-ask.patch 8368 RMD160 5fc2de9fa90551a255fcebd8926e5bd121781c1f SHA1 7a5df81d45d20f9867bbf5344fc1504d72fb23f0 SHA256 fb5d1519f60f354401a3b3450ad5284f28c42a7aaa032d6f8c5647447c42d708
-EBUILD paludis-9999.ebuild 3845 RMD160 aa37a71f5c978f522a87e78768dd92931a380202 SHA1 02a9eacea1081a1b7f761e5de7f26d6c6715cf5a SHA256 6f02d2575684fa5e1f5ab16bda6f58a92ed5db94e94c5ac469bf61648c03dd06
+EBUILD paludis-9999.ebuild 3815 RMD160 f1820054d707ee96cfe6496263d8d1c2b2291328 SHA1 4bfcf93ca8f2b956a2949b5a2e9b7ed077f9a30e SHA256 3c1ed96dceec35c906222f6d14dcf003ee38a620e1704ff5b7782676d2f36323
diff --git a/sys-apps/paludis/paludis-9999.ebuild b/sys-apps/paludis/paludis-9999.ebuild
index 113fb775..a017c089 100644
--- a/sys-apps/paludis/paludis-9999.ebuild
+++ b/sys-apps/paludis/paludis-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="paludis-1"
-inherit bash-completion eutils git-2
+inherit bash-completion-r1 eutils git-2
 
 DESCRIPTION="paludis, the other package mangler"
 HOMEPAGE="http://paludis.pioto.org/"
@@ -108,7 +108,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS README NEWS
 
-	BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
+	dobashcomp bash-completion/cave
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		doins zsh-completion/_cave
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 93ca6546..40444fed 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1 +1 @@
-EBUILD systemd-9999.ebuild 4358 RMD160 6f671fade2fda8cc87e03c377d864e25d8569833 SHA1 ecfe61084593076b3df2b8c36894f6d4b37290da SHA256 759672fa65c181777d01d976b0fb6823106e826759505cadb2f172e4c1902d5e
+EBUILD systemd-9999.ebuild 4366 RMD160 3a5c21703e17211f9f65ea15f436b8f8104cbe4e SHA1 236dfb0bb15b70e1e1ca8fd36077cc698d3d850f SHA256 a9a81ec024a3b65668cb85c07d15bc698df3adc09385b331f77f9bae38aba9fe
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3bfb8065..7d7d2395 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 WANT_AUTOMAKE=1.11
 
-inherit autotools bash-completion git-2 linux-info pam systemd
+inherit autotools bash-completion-r1 git-2 linux-info pam systemd
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
@@ -112,7 +112,7 @@ do_symlinks() {
 src_install() {
 	emake DESTDIR="${ED}" install
 	# move files as necessary
-	dobashcompletion "${S}"/src/systemctl-bash-completion.sh
+	newbashcomp "${S}"/src/systemctl-bash-completion.sh systemctl
 	dodoc "${ED}"/usr/share/doc/systemd/*
 	rm -rf "${ED}"/usr/share/doc/systemd
 
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 64997c74..6845c69e 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,3 +1,3 @@
-EBUILD gpaste-1.5.ebuild 1143 RMD160 769c9a2ff0ed56a34616a04105b4886cf09164fe SHA1 d1d9fd6e043db84534f7bcbd973ff0d5600a9090 SHA256 624367d547ba1089e1a5c6568c3e648f6e860216d060e9b2c041245bc0682ec1
-EBUILD gpaste-9999.ebuild 1204 RMD160 f66b81a9fafc7ffa13c42d3856e0001e4b4983d5 SHA1 51af22dad75f110bcd5b2a08bf232b638709bbe2 SHA256 1ef91dc490fbad55fce953f02a4b0ee843b88b05f45bd97fd94e86e7d00c2147
+EBUILD gpaste-1.5.ebuild 1111 RMD160 79704165e32166a6495a42fbe75f2995bc8c43f5 SHA1 50563142606ccccd053087e16ec24ab4e5124807 SHA256 ca8784a3b37ef403b0efee165fd0620eb5946f62703cc7d751afc2d80ce7bf1d
+EBUILD gpaste-9999.ebuild 1209 RMD160 16501494aaef1fbb795f54abaf5fb3a4c9433092 SHA1 64b15ae1ebe46f2ca69093a1ac5454523f6c41d6 SHA256 a78089fd404ac2c4435dd2f27803ca61ea2a1a8c24d0d0f68ff5c0afda7c5de7
 DIST gpaste-1.5.tar.xz 146188 RMD160 a535ba8694df4419c7b3df1d6eb84be886c1e338 SHA1 c5b4137279c5b655327f65b943175ae62cdec160 SHA256 75ba1e4f61cb63aabaf512f1180f62c4a91890b0327b98cd0572dae8f5444f35
diff --git a/x11-misc/gpaste/gpaste-1.5.ebuild b/x11-misc/gpaste/gpaste-1.5.ebuild
index c1397a53..34e90735 100644
--- a/x11-misc/gpaste/gpaste-1.5.ebuild
+++ b/x11-misc/gpaste/gpaste-1.5.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="4"
-inherit bash-completion gnome2
+inherit bash-completion-r1 gnome2
 
 DESCRIPTION="Clipboard management system"
 HOMEPAGE="http://github.com/Keruspe/GPaste"
@@ -34,7 +34,7 @@ DOCS="AUTHORS NEWS ChangeLog TODO README"
 REQUIRED_USE="|| ( gnome-shell applet )"
 
 src_install() {
-	use bash-completion && BASHCOMPLETION_NAME="gpaste" dobashcompletion completions/gpaste
+	use bash-completion && dobashcomp completions/gpaste
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		doins completions/_gpaste
diff --git a/x11-misc/gpaste/gpaste-9999.ebuild b/x11-misc/gpaste/gpaste-9999.ebuild
index c5b9c837..c1fd7e3a 100644
--- a/x11-misc/gpaste/gpaste-9999.ebuild
+++ b/x11-misc/gpaste/gpaste-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="4"
-inherit autotools bash-completion gnome2-live
+inherit autotools bash-completion-r1 gnome2-live
 
 DESCRIPTION="Clipboard management system"
 HOMEPAGE="http://github.com/Keruspe/GPaste"
@@ -18,9 +18,11 @@ DEPEND="dev-libs/glib:2
 	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.40
 	>=x11-libs/gtk+-3.0.0:3
+	x11-base/xorg-server
 	>=dev-lang/vala-0.13.4:0.14"
 RDEPEND="${DEPEND}
 	bash-completion? ( app-shells/bash )
+	sys-apps/dbus
 	gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
 	zsh-completion? ( app-shells/zsh app-shells/zsh-completion )"
 
@@ -37,7 +39,7 @@ DOCS="AUTHORS NEWS ChangeLog TODO FIXME README"
 REQUIRED_USE="|| ( gnome-shell applet )"
 
 src_install() {
-	use bash-completion && BASHCOMPLETION_NAME="gpaste" dobashcompletion data/completions/gpaste
+	use bash-completion && dobashcomp data/completions/gpaste
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		doins data/completions/_gpaste