Migrate to bash-completion-r1.eclass. Remove old.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

7 files changed, 34 insertions, 160 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 287c0b302961..f86a6a2590b8 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.188 2011/09/04 10:08:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.189 2011/09/09 10:43:05 ulm Exp $
+
+  09 Sep 2011; Ulrich Mueller <ulm@gentoo.org> -eselect-1.2.11.ebuild,
+  eselect-1.2.15.ebuild, -eselect-1.2.16.ebuild, eselect-1.2.17.ebuild,
+  eselect-9999.ebuild:
+  Migrate to bash-completion-r1.eclass. Remove old.
 
 *eselect-1.2.17 (04 Sep 2011)
 
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 14f8171e1d9a..35c4e1d324d0 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST eselect-1.2.11.tar.bz2 158910 RMD160 13e755327d85985659fa840e698ca99d49e09cc9 SHA1 293ea681f349c4b36a1d3fd3c431113124ebdbb7 SHA256 5619d53e01d159498a1c660c3eb609ee2e498bb25e2d540c7017af610729e07f
 DIST eselect-1.2.15.tar.bz2 169358 RMD160 9b5c2174786466f6a32e8b823eb4140e2581f945 SHA1 4875545e001904ab6f9a5a8c96150739ee1cff29 SHA256 fa8e3b2af2bc4a951ddb6067ba1e786a04681555ab7e83d50d4eb85047f2e7d7
-DIST eselect-1.2.16.tar.bz2 169671 RMD160 50d1171fcba4d5d708e7b9a1c756ed6e4bbdb2b3 SHA1 51e90eeb08b5e2357009c9d157aad70b636ebfdd SHA256 184d33c4f1ea030698614ee7bc2ba1398c91a03b9f4d31505af036f9b641b403
 DIST eselect-1.2.17.tar.bz2 169990 RMD160 c97c8a147f3d737de12c4aa4993a17734464d85d SHA1 fd5721e49eb4705b66bda387eb70fe45ca3b72ba SHA256 37724f875bb13b8998f699bf56a59c55a0d9987943216ab784926a550aa8d138
-EBUILD eselect-1.2.11.ebuild 1789 RMD160 bb62d41fbccc3efc253aa3ca9fb63ca452571d08 SHA1 81a85d38073bad2ed140fb8cdd8a12ba9b4bdc61 SHA256 8772cf8ed2314c5ab4bc6dca5fde2b26711def1d5a764d84e4d9de01f0794026
-EBUILD eselect-1.2.15.ebuild 1798 RMD160 721820dfe880bd8b2e1cfe46844d61b2def0a148 SHA1 b01a5b1fd890ccc3e8dd25e5c11982bc29c188ab SHA256 22cbe4f67e4b6def431cf8fdb776e065d8dbb5fa546836b3de6530151fa5b06e
-EBUILD eselect-1.2.16.ebuild 1807 RMD160 3f6c4fc1f3dd5e43f779ea08f5e4b787f4ef5bd3 SHA1 b4217781374498d549b19a6119c846869ef44d90 SHA256 7b3a290845f3e4655e74f7866aad4e40d3911fd510779e85d9db07c92fccfffc
-EBUILD eselect-1.2.17.ebuild 1808 RMD160 f77552266632b4bc2027fe6fc8bd8b9184ed21f5 SHA1 959aee755a5a7ace863de88cba29306e64746f6f SHA256 8b493dcc22094247ebd749d4e2ea657e71a67fce82a6628f9424defa8cac87d1
-EBUILD eselect-9999.ebuild 1568 RMD160 8632ecfee005e5cadfa74275903f7bf8db4ca359 SHA1 7c48073f87f81095aaaac1d8288a77aa2ed46d3f SHA256 edc633d281444a7d8e14e4e5882355737253207777ed9ac7c713c10e71a63913
-MISC ChangeLog 26649 RMD160 4c073da67adf8bb451634c7109d588b5a7ee333f SHA1 12628fe5ca84c07a0d75b0f6d85ab86d59c04be8 SHA256 f786db881a92b32788717d802a9970b265b6b141c722e3fb2cd762534d8d4233
+EBUILD eselect-1.2.15.ebuild 1775 RMD160 c9aa0162eb54475d0b5669bb3b043bc0fc621b14 SHA1 c274584c50f80f4b4753c3cdf755e05cfb537fce SHA256 50952b211d338b44a98b02485080ef4ebc7a9ea0c3d00bb60b0a08447e356d43
+EBUILD eselect-1.2.17.ebuild 1756 RMD160 6f2d4e571c0fcbd940ecbb02fb2366db08a274b1 SHA1 0fcd52255d89ad2ec155d4e8b6513d454a132ec7 SHA256 cfc6105b27b6e4b45ff63fc9ea26efeead23a43da9fa9b8c988221ade281ea86
+EBUILD eselect-9999.ebuild 1406 RMD160 8220a8d5b7060474fc71ce387af8764587bfeddd SHA1 ecca222bf3304b1d6c425c2e4910c6311e0543ad SHA256 6f474264c738072486e2e2cda4c11b22d85c9c1a65dea7700499232d4057582d
+MISC ChangeLog 26868 RMD160 c6e544e656f952b6b48caf42e10213aca339d915 SHA1 999751366a69953fd49251752fc2336ff0cdc659 SHA256 69c4857ab4bcdfd8ebd47bf3671312bfa773059e6c493bf05ff8f91327cd92e4
 MISC metadata.xml 223 RMD160 ad3a63ca53ae3d53a6be0caea0f00d5339415496 SHA1 c5430898aa8d251b7469d16f66dbd02018581bb9 SHA256 9bfa4e7551e380482c16cb288fa4f711543e15f6c00aabd2bb38fdbcbbc6dd26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5jT30ACgkQOeoy/oIi7uxU9gCfTNmMyys4dv/iY7mx4zT8Qroy
-i8QAoL4JfOBEul1Q8CJVCXQHlROx10U4
-=BVxm
+iEYEARECAAYFAk5p70EACgkQOeoy/oIi7uwkhwCgj2nK7AiML24y6yMQPw5glRZs
+0t8AoOUho8EUoub+qwi/AYN/S65iK7Wr
+=ACpt
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect/eselect-1.2.11.ebuild b/app-admin/eselect/eselect-1.2.11.ebuild
deleted file mode 100644
index 6b432b423377..000000000000
--- a/app-admin/eselect/eselect-1.2.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.11.ebuild,v 1.8 2011/01/22 21:34:51 xarthisius Exp $
-
-inherit bash-completion
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="!app-admin/eselect-news
-	${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses"
-
-# Commented out: only few users of eselect will edit its source
-#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
-#	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	econf
-	emake || die "emake failed"
-
-	if use doc; then
-		make html || die "failed to build html"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-	dobashcompletion misc/${PN}.bashcomp
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
-	chgrp portage "${EROOT}/var/lib/gentoo/news" \
-		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-
-	bash-completion_pkg_postinst
-}
diff --git a/app-admin/eselect/eselect-1.2.15.ebuild b/app-admin/eselect/eselect-1.2.15.ebuild
index d8a90a8b4539..900b93a81e01 100644
--- a/app-admin/eselect/eselect-1.2.15.ebuild
+++ b/app-admin/eselect/eselect-1.2.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.15.ebuild,v 1.6 2011/05/23 00:04:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.15.ebuild,v 1.7 2011/09/09 10:43:05 ulm Exp $
 
-inherit bash-completion
+inherit bash-completion-r1
 
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -41,9 +41,9 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
+	newbashcomp misc/${PN}.bashcomp ${PN} || die
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
 	use doc && dohtml *.html doc/*
-	dobashcompletion misc/${PN}.bashcomp
 
 	# needed by news module
 	keepdir /var/lib/gentoo/news
@@ -55,6 +55,4 @@ pkg_postinst() {
 	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	chgrp portage "${EROOT}/var/lib/gentoo/news" \
 		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-
-	bash-completion_pkg_postinst
 }
diff --git a/app-admin/eselect/eselect-1.2.16.ebuild b/app-admin/eselect/eselect-1.2.16.ebuild
deleted file mode 100644
index 88b5f3a4225d..000000000000
--- a/app-admin/eselect/eselect-1.2.16.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.16.ebuild,v 1.1 2011/07/08 06:03:43 ulm Exp $
-
-inherit bash-completion
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="!app-admin/eselect-news
-	${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses"
-
-# Commented out: only few users of eselect will edit its source
-#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
-#	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	econf
-	emake || die "emake failed"
-
-	if use doc; then
-		make html || die "failed to build html"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-	dobashcompletion misc/${PN}.bashcomp
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
-	chgrp portage "${EROOT}/var/lib/gentoo/news" \
-		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-
-	bash-completion_pkg_postinst
-}
diff --git a/app-admin/eselect/eselect-1.2.17.ebuild b/app-admin/eselect/eselect-1.2.17.ebuild
index f21f29864904..230b574f0655 100644
--- a/app-admin/eselect/eselect-1.2.17.ebuild
+++ b/app-admin/eselect/eselect-1.2.17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.17.ebuild,v 1.1 2011/09/04 10:08:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.17.ebuild,v 1.2 2011/09/09 10:43:05 ulm Exp $
 
 EAPI=2
 
-inherit bash-completion
+inherit bash-completion-r1
 
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -33,18 +33,21 @@ RDEPEND="!app-admin/eselect-news
 #	vim-syntax? ( app-vim/eselect-syntax )"
 
 src_compile() {
-	emake || die "emake failed"
+	emake || die
 
 	if use doc; then
-		make html || die "failed to build html"
+		emake html || die
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-	dobashcompletion misc/${PN}.bashcomp
+	emake DESTDIR="${D}" install || die
+	newbashcomp misc/${PN}.bashcomp ${PN} || die
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
+
+	if use doc; then
+		dohtml *.html doc/* || die
+	fi
 
 	# needed by news module
 	keepdir /var/lib/gentoo/news
@@ -56,6 +59,4 @@ pkg_postinst() {
 	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	chgrp portage "${EROOT}/var/lib/gentoo/news" \
 		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-
-	bash-completion_pkg_postinst
 }
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
index cadb8e22feab..920017fa452e 100644
--- a/app-admin/eselect/eselect-9999.ebuild
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-9999.ebuild,v 1.8 2011/09/03 12:56:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-9999.ebuild,v 1.9 2011/09/09 10:43:05 ulm Exp $
 
-EAPI=2
+EAPI=4
 ESVN_REPO_URI="svn://anonsvn.gentoo.org/eselect/trunk"
 ESVN_BOOTSTRAP="autogen.bash"
 
-inherit subversion bash-completion
+inherit subversion bash-completion-r1
 
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -35,18 +35,15 @@ RDEPEND="!app-admin/eselect-news
 #	vim-syntax? ( app-vim/eselect-syntax )"
 
 src_compile() {
-	emake || die "emake failed"
-
-	if use doc; then
-		make html || die "failed to build html"
-	fi
+	emake
+	use doc && emake html
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
 	use doc && dohtml *.html doc/*
-	dobashcompletion misc/${PN}.bashcomp
 
 	# needed by news module
 	keepdir /var/lib/gentoo/news
@@ -55,9 +52,6 @@ src_install() {
 pkg_postinst() {
 	# fowners in src_install doesn't work for the portage group:
 	# merging changes the group back to root
-	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	chgrp portage "${EROOT}/var/lib/gentoo/news" \
 		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-
-	bash-completion_pkg_postinst
 }