Migrate to bash-completion-r1

(Portage version: 2.1.10.20/cvs/Linux x86_64)

3 files changed, 11 insertions, 13 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index b39ef0b94462..df4140c0ca1a 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.149 2011/10/08 17:40:29 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.150 2011/10/08 18:02:51 nixphoeni Exp $
+
+  08 Oct 2011; Joe Sapp <nixphoeni@gentoo.org> gdesklets-core-0.36.2-r3.ebuild,
+  gdesklets-core-0.36.3-r3.ebuild:
+  Migrate to bash-completion-r1
 
   08 Oct 2011; Joe Sapp <nixphoeni@gentoo.org> gdesklets-core-0.36.2-r3.ebuild,
   gdesklets-core-0.36.3-r3.ebuild:
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
index fe1b5c68ab9e..18ed5d868bfa 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild,v 1.10 2011/10/08 17:40:29 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.2-r3.ebuild,v 1.11 2011/10/08 18:02:51 nixphoeni Exp $
 
 EAPI=3
 # desklets don't run with USE=debug
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 PYTHON_USE_WITH="xml"
 PYTHON_DEPEND="2:2.4"
 
-inherit gnome2 python eutils autotools multilib bash-completion
+inherit gnome2 python eutils autotools multilib bash-completion-r1
 
 MY_PN="gDesklets"
 MY_P="${MY_PN}-${PV}"
@@ -74,8 +74,7 @@ src_install() {
 	gnome2_src_install
 
 	# Install bash completion script
-	BASHCOMPLETION_NAME="gDesklets" \
-		dobashcompletion "contrib/bash/gdesklets"
+	dobashcomp "contrib/bash/gdesklets"
 
 	# Install autostart script
 	insinto "/etc/xdg/autostart"
@@ -121,8 +120,6 @@ pkg_postinst() {
 	elog "after the first time you run gDesklets"
 	elog
 
-	BASHCOMPLETION_NAME="gDesklets" bash-completion_pkg_postinst
-
 }
 
 pkg_postrm() {
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
index 205e6fb2f0e0..2088371982ec 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.8 2011/10/08 17:40:29 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r3.ebuild,v 1.9 2011/10/08 18:02:51 nixphoeni Exp $
 
 EAPI=3
 # desklets don't run with USE=debug
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 PYTHON_USE_WITH="xml"
 PYTHON_DEPEND="2:2.4"
 
-inherit gnome2 python eutils autotools multilib bash-completion
+inherit gnome2 python eutils autotools multilib bash-completion-r1
 
 MY_PN="${PN/-core}"
 MY_P="${MY_PN}-${PV}"
@@ -74,8 +74,7 @@ src_install() {
 	gnome2_src_install
 
 	# Install bash completion script
-	BASHCOMPLETION_NAME="gDesklets" \
-		dobashcompletion "contrib/bash/gdesklets"
+	dobashcompletion "contrib/bash/gdesklets"
 
 	# Install the gdesklets-control-getid script
 	insinto "/usr/$(get_libdir)/gdesklets"
@@ -113,8 +112,6 @@ pkg_postinst() {
 	elog "after the first time you run gDesklets"
 	elog
 
-	BASHCOMPLETION_NAME="gDesklets" bash-completion_pkg_postinst
-
 }
 
 pkg_postrm() {