[gentoo-commits] proj/sci:master commit in: app-admin/eselect/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     2f7b7b72216b8f3eb16368f5c9112ee4cd85243a
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 16:09:48 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 16:09:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2f7b7b72

[app-admin/eselect] Version bump

(Portage version: 2.2.0_alpha59/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 app-admin/eselect/ChangeLog                        |    6 ++++
 ...t-1.2.17-r1.ebuild => eselect-1.2.18-r1.ebuild} |   25 +++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 5c16c2f..2b3430a 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.179 2011/01/22 21:38:52 ulm Exp $
 
+*eselect-1.2.18-r1 (27 Sep 2011)
+
+  27 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> -eselect-1.2.17-r1.ebuild,
+  +eselect-1.2.18-r1.ebuild:
+  Version bump
+
   06 Sep 2011; Sébastien Fabbro <bicatali@gentoo.org>
   files/eselect-alternatives.patch:
   Updated to newer eclectic alternatives. Fixed a prefix thanks Francois Bissey

diff --git a/app-admin/eselect/eselect-1.2.17-r1.ebuild b/app-admin/eselect/eselect-1.2.18-r1.ebuild
similarity index 65%
rename from app-admin/eselect/eselect-1.2.17-r1.ebuild
rename to app-admin/eselect/eselect-1.2.18-r1.ebuild
index 2e303fa..483018a 100644
--- a/app-admin/eselect/eselect-1.2.17-r1.ebuild
+++ b/app-admin/eselect/eselect-1.2.18-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.2.18.ebuild,v 1.1 2011/09/25 16:24:18 ulm Exp $
 
 EAPI=3
-inherit eutils bash-completion autotools
+
+inherit autotools bash-completion-r1 eutils
 
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -11,7 +12,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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~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
@@ -30,24 +31,28 @@ RDEPEND="!app-admin/eselect-news
 # Commented out: only few users of eselect will edit its source
 #PDEPEND="emacs? ( app-emacs/gentoo-syntax )
 #	vim-syntax? ( app-vim/eselect-syntax )"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-alternatives.patch
 	eautoreconf
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake || die
 
 	if use doc; then
-		make html || die "failed to build html"
+		emake html || die
 	fi
 }
 
 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
+	emake DESTDIR="${D}" install || die
+	newbashcomp misc/${PN}.bashcomp ${PN} || die
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt || die
+
+	if use doc; then
+		dohtml *.html doc/* || die
+	fi
 
 	# needed by news module
 	keepdir /var/lib/gentoo/news
@@ -59,6 +64,4 @@ pkg_postinst() {
 	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	chgrp portage "${EROOT}/var/lib/gentoo/news" \
 		&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-
-	bash-completion_pkg_postinst
 }