6 files changed, 27 insertions, 149 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/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
 }