Version bump. Remove old.

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

3 files changed, 22 insertions, 31 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 3b9e1ebe8d5a..a2445c49e022 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.165 2010/05/23 21:01:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.166 2010/07/27 22:43:13 ulm Exp $
+
+*eselect-1.2.11 (27 Jul 2010)
+
+  27 Jul 2010; Ulrich Mueller <ulm@gentoo.org> -eselect-1.2.8.ebuild,
+  +eselect-1.2.11.ebuild:
+  Version bump. Remove old.
 
   23 May 2010; Pacho Ramos <pacho@gentoo.org> eselect-1.2.10.ebuild:
   stable amd64, bug 313829
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 335e4daa71f2..f83f948dc93f 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST eselect-1.2.10.tar.bz2 155667 RMD160 384064d264d6ea1bbab56cc6e2a575cc44eb4aa6 SHA1 54a2b6f40453b342333f37a4f97ba5099fd039d0 SHA256 fd9ae0b1bfd35da014c1ea52df0d5434505250e3e99858907d3b17c81e131ed1
-DIST eselect-1.2.8.tar.bz2 154370 RMD160 c5c904e526561bd631eca75c19308d05c38138ff SHA1 542c10d364454a3988a107ea82b24ee4c697c19d SHA256 71db5898c3e3b1dc710ba56b55afbfff04879f7cd179439e0b9be0b7d3206160
+DIST eselect-1.2.11.tar.bz2 158910 RMD160 13e755327d85985659fa840e698ca99d49e09cc9 SHA1 293ea681f349c4b36a1d3fd3c431113124ebdbb7 SHA256 5619d53e01d159498a1c660c3eb609ee2e498bb25e2d540c7017af610729e07f
 DIST eselect-1.2.9.tar.bz2 155420 RMD160 b265f0cd147e0587d2da1c1dfb49292aee090f38 SHA1 a45b9384302f8e99e6d9b810307a318f86f66677 SHA256 20df3315f9283398bd0ea5b245832dd840c179d141432c68be95bf9d30b29e6b
 EBUILD eselect-1.2.10.ebuild 1785 RMD160 b9984e438b2c0f94dbb2f62192046d3a4d374c33 SHA1 74bf77640e9c48f66fc0642353afc7580765bf75 SHA256 f267dd31b586f9a56eb53ee694855d4753696e5c38dd9427a0377f55ef3f1189
-EBUILD eselect-1.2.8.ebuild 2226 RMD160 a21be294576f31156fabb6661ddf461f835b56b0 SHA1 2e6e87a5bbc63687d743bd4a582fb8c692159b7c SHA256 fcc4821082fe9932020c11ec9c2f13c4ba4851555e34483f4b34daa1aed235c3
+EBUILD eselect-1.2.11.ebuild 1794 RMD160 d001b9f4962c8b6b2507cd600260fc691e04dedc SHA1 7838f6f6f3cff55f96afc5af6b711e592ffd8818 SHA256 db89d9cbacff87f59400667ea9538ad882f1bf796e90a3b6b44ddb9ada087069
 EBUILD eselect-1.2.9.ebuild 1785 RMD160 084890f05666c8b048b172473421406598d37a17 SHA1 a4cb8a1239961f356acbb5e6971794e35088c204 SHA256 1aaf0589b91e4d05095463f55e96603d5d26c741de00a6018a4ae0a76755b801
-MISC ChangeLog 23905 RMD160 1635482397f1f666b2a076bb0fc0c1529079f974 SHA1 dc1efed80e987827eb07d16d23dc924d51e70447 SHA256 af6496b0b76d1cdf51039edd9a30e32a5163df77f35dff003ed15570c1e0c724
+MISC ChangeLog 24059 RMD160 20ede7fceb82558ddda0f04559a7e38712d16b35 SHA1 23b5be0910155dbc3ba2fc04817b98cbad5d2962 SHA256 ad2fb440c5282ea3687cc059f91b027c91c80f52515f75180d66bfe00186e90d
 MISC metadata.xml 223 RMD160 ad3a63ca53ae3d53a6be0caea0f00d5339415496 SHA1 c5430898aa8d251b7469d16f66dbd02018581bb9 SHA256 9bfa4e7551e380482c16cb288fa4f711543e15f6c00aabd2bb38fdbcbbc6dd26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkv5l6AACgkQCaWpQKGI+9TYbQCdG0ietHrZnE1ltCIfgnGqV69i
-kAgAnRt94OHLZize+YWJ3TdJa+q6IDxj
-=1Cfm
+iEYEARECAAYFAkxPYZ8ACgkQOeoy/oIi7uwnoACeJ0tzdO1DKJq9p8gd13LZVo+f
+0NUAniiiFy4dyhpfy/nN8cg5gRpAXqlu
+=LpWJ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect/eselect-1.2.8.ebuild b/app-admin/eselect/eselect-1.2.11.ebuild
index 90aa32e24908..368054017385 100644
--- a/app-admin/eselect/eselect-1.2.8.ebuild
+++ b/app-admin/eselect/eselect-1.2.11.ebuild
@@ -1,6 +1,8 @@
 # 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.8.ebuild,v 1.8 2010/01/11 17:31:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.11.ebuild,v 1.1 2010/07/27 22:43:13 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 ~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 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,16 +43,10 @@ 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() {
@@ -60,16 +56,5 @@ pkg_postinst() {
 	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
 }