3 files changed, 8 insertions, 77 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 14f985675d62..e9b0b341e0d7 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,12 @@
 # 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.141 2009/11/14 20:31:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.142 2009/11/20 20:42:41 ulm Exp $
+
+*eselect-1.2.8 (20 Nov 2009)
+
+  20 Nov 2009; Ulrich Mueller <ulm@gentoo.org> -eselect-1.2.5.ebuild,
+  -eselect-1.2.6.ebuild, +eselect-1.2.8.ebuild:
+  Version bump, fixes bug 293317. Remove old.
 
 *eselect-1.2.7 (14 Nov 2009)
 
diff --git a/app-admin/eselect/eselect-1.2.6.ebuild b/app-admin/eselect/eselect-1.2.6.ebuild
deleted file mode 100644
index 963428f8b73d..000000000000
--- a/app-admin/eselect/eselect-1.2.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.6.ebuild,v 1.1 2009/11/07 11:47:06 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
-}
diff --git a/app-admin/eselect/eselect-1.2.5.ebuild b/app-admin/eselect/eselect-1.2.8.ebuild
index c15de3ddb4c4..7fe279462818 100644
--- a/app-admin/eselect/eselect-1.2.5.ebuild
+++ b/app-admin/eselect/eselect-1.2.8.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.8.ebuild,v 1.1 2009/11/20 20:42:41 ulm Exp $
 
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"