Version bump; fixes bugs 280191 and 288527.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

3 files changed, 87 insertions, 5 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index f44ed4a3454a..40ab05fdc479 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.138 2009/10/13 17:00:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.139 2009/11/04 13:52:05 ulm Exp $
+
+*eselect-1.2.5 (04 Nov 2009)
+
+  04 Nov 2009; Ulrich Mueller <ulm@gentoo.org> +eselect-1.2.5.ebuild:
+  Version bump; fixes bugs 280191 and 288527.
 
   13 Oct 2009; Ulrich Mueller <ulm@gentoo.org> eselect-1.1.3.ebuild,
   eselect-1.2.3.ebuild, eselect-1.2.4.ebuild:
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 7a93e41f5601..0b028372e39b 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 DIST eselect-1.1.3.tar.bz2 154862 RMD160 60b00e3a7959288da4bc1c2482ba7a2e8a9ec5db SHA1 f643b4c4bfdcf58ffd9399e6b7690f8394711bc7 SHA256 7810445c4967879d9c6d9ff98840e6e635d40b7169c16e3251fcaba6d5279767
 DIST eselect-1.2.3.tar.bz2 153606 RMD160 21beb87317663b02e817e0fcb041bfd7e43845b0 SHA1 af742bb898482aa816803e9536ac886e305c6bd6 SHA256 5a7ca211eb70cbb4e6028369db252150ffba1ced0f637d5b488f40d89925e772
 DIST eselect-1.2.4.tar.bz2 153952 RMD160 13bae86f0267f647c01265ae69a716185e592e67 SHA1 e0e3973f67aaf308ed8fd4be2df470bb09de3bb0 SHA256 ff7ac7771c2e35a19fd8efad2c7dd27b7c780db93e314af6cd81937b3a07bbcc
+DIST eselect-1.2.5.tar.bz2 154143 RMD160 1788ade1f4443cff3e943fb4344d048111974877 SHA1 7a9fedc4d717678674443936deca2917283a39f4 SHA256 93a9d9dbf9b55d55da6298623922a43112043bd820dbd430dcae91146d3bca36
 EBUILD eselect-1.1.3.ebuild 1962 RMD160 76bc602593bc25bb6526d4864ac618ee68a780e7 SHA1 47c41d1cb18cf77a7ac9386cd53affd278841c41 SHA256 592b4562f2b6db50bf519b2673823abc8ed56ed4906c89411d7d8c4995d3c310
 EBUILD eselect-1.2.3.ebuild 1983 RMD160 07643e78d0ff1767682555b3107e0c0af8fca466 SHA1 32965213d7a37eed2c8a512843457f2fe923534e SHA256 5c92e44220f09f74732d887358ed390951bfcc84cd6881f4f90695a25c9d09c4
 EBUILD eselect-1.2.4.ebuild 2234 RMD160 ada0ef11a5d065271eb435a263180aa64767c943 SHA1 f4d25ea4d14a5834c8c59f899574320b986827b6 SHA256 6d3d751f19dc501dded34637c6001c177cda35afc61a65419ddd0083a7c1a1fa
-MISC ChangeLog 20707 RMD160 8f2828bea9f6e5e3266ab93b0e062b95fbf5d47f SHA1 1ae576cd951f1b5af520e632c671255dd4390049 SHA256 d615b0cb02d7a46de783ca62d3ae9cc75829d86d3c49d7199f080039d3391c53
+EBUILD eselect-1.2.5.ebuild 2234 RMD160 0e9ee4d8e8651ada7ea02c6fb992a1207ae2e837 SHA1 37251158c5c861185b31cb6568a5025858f9e2b2 SHA256 3f8dc58e62b3ced1a03ce166487b07c4d7c02375b74058a24310d0c93be0f046
+MISC ChangeLog 20854 RMD160 8b9d92f6478c9487dd08d5db80dfea7305a7d30e SHA1 378903a6315ec924dff24ccf547e6c9b61a331e0 SHA256 5e1eefba42a025d49d43031964d82372ba2d3767bf8cbcf5fc529e459dd956cb
 MISC metadata.xml 223 RMD160 ad3a63ca53ae3d53a6be0caea0f00d5339415496 SHA1 c5430898aa8d251b7469d16f66dbd02018581bb9 SHA256 9bfa4e7551e380482c16cb288fa4f711543e15f6c00aabd2bb38fdbcbbc6dd26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkrUshcACgkQOeoy/oIi7uwUCgCgvucoaMDx25NyCDzm4ZlAlk4V
-hhAAn2bNaXvO7cxlZLxlh2L5c42rtkOb
-=/gPt
+iEYEARECAAYFAkrxh5oACgkQOeoy/oIi7uzRtQCgq7hULmMalVT+PsQghFKxIFK7
+/a4AoNuNw/EKxZtrncqYfRNPW6+2yof7
+=ne40
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect/eselect-1.2.5.ebuild b/app-admin/eselect/eselect-1.2.5.ebuild
new file mode 100644
index 000000000000..c15de3ddb4c4
--- /dev/null
+++ b/app-admin/eselect/eselect-1.2.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.5.ebuild,v 1.1 2009/11/04 13:52:05 ulm Exp $
+
+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 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~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"
+
+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/*
+
+	# 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
+	[[ -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
+}