summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect/ChangeLog5
-rw-r--r--app-admin/eselect/eselect-1.2.9.ebuild27
2 files changed, 10 insertions, 22 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index e635100baeea..58c033accba9 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -1,6 +1,9 @@
# 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.149 2009/12/31 14:15:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.150 2009/12/31 16:41:07 ulm Exp $
+
+ 31 Dec 2009; Ulrich Mueller <ulm@gentoo.org> eselect-1.2.9.ebuild:
+ Inherit bash-completion.eclass, bug 299051.
31 Dec 2009; Brent Baude <ranger@gentoo.org> eselect-1.2.8.ebuild:
Marking eselect-1.2.8 ppc64 for bug 297496
diff --git a/app-admin/eselect/eselect-1.2.9.ebuild b/app-admin/eselect/eselect-1.2.9.ebuild
index ba22d19a78c1..70d334269def 100644
--- a/app-admin/eselect/eselect-1.2.9.ebuild
+++ b/app-admin/eselect/eselect-1.2.9.ebuild
@@ -1,6 +1,8 @@
# 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.9.ebuild,v 1.1 2009/12/31 01:46:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.9.ebuild,v 1.2 2009/12/31 16:41:07 ulm Exp $
+
+inherit bash-completion
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -9,7 +11,7 @@ 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"
+IUSE="doc"
RDEPEND="sys-apps/sed
|| (
@@ -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
}