Version bump. Remove old.

(Portage version: 2.2_rc62/cvs/Linux i686)

2 files changed, 19 insertions, 27 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 5c9618f86e08..ad756075604d 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.156 2010/02/04 21:50:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.157 2010/02/05 22:31:08 ulm Exp $
+
+*eselect-1.2.10 (05 Feb 2010)
+
+  05 Feb 2010; Ulrich Mueller <ulm@gentoo.org> -eselect-1.2.3.ebuild,
+  +eselect-1.2.10.ebuild:
+  Version bump. Remove old.
 
   04 Feb 2010; Markus Meier <maekke@gentoo.org> eselect-1.2.9.ebuild:
   amd64/arm stable, bug #302878
diff --git a/app-admin/eselect/eselect-1.2.3.ebuild b/app-admin/eselect/eselect-1.2.10.ebuild
index ea8b91c749e4..27d10c95d23b 100644
--- a/app-admin/eselect/eselect-1.2.3.ebuild
+++ b/app-admin/eselect/eselect-1.2.10.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.3.ebuild,v 1.9 2009/10/13 17:00:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.10.ebuild,v 1.1 2010/02/05 22:31:08 ulm Exp $
+
+inherit bash-completion
 
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -8,8 +10,8 @@ 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 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc bash-completion"
+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
 	|| (
@@ -32,7 +34,7 @@ src_compile() {
 	econf
 	emake || die "emake failed"
 
-	if use doc ; then
+	if use doc; then
 		make html || die "failed to build html"
 	fi
 }
@@ -41,34 +43,18 @@ 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
-
-	# we don't use bash-completion.eclass since eselect
-	# is listed in RDEPEND.
-	if use bash-completion ; then
-		insinto /usr/share/bash-completion
-		newins misc/${PN}.bashcomp ${PN} || die
-	fi
 }
 
 pkg_postinst() {
 	# fowners in src_install doesn't work for the portage group:
 	# merging changes the group back to root
-	chgrp portage "${ROOT}/var/lib/gentoo/news" \
-		&& chmod g+w "${ROOT}/var/lib/gentoo/news"
+	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
+	chgrp portage "${EROOT}/var/lib/gentoo/news" \
+		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
 
-	if use bash-completion ; then
-		elog "In case you have not yet enabled command-line completion"
-		elog "for eselect, you can run:"
-		elog
-		elog "  eselect bashcomp enable eselect"
-		elog
-		elog "to install locally, or"
-		elog
-		elog "  eselect bashcomp enable --global eselect"
-		elog
-		elog "to install system-wide."
-	fi
+	bash-completion_pkg_postinst
 }