[app-admin/eselect] Version bump

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

3 files changed, 36 insertions, 27 deletions

diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index 5c16c2f03..2b3430acd 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/Manifest b/app-admin/eselect/Manifest
index cb8dad5e9..d02d26c5c 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 AUX eselect-alternatives.patch 22660 RMD160 cc3089cf935ed08030f3a256f471ceaef4521e5f SHA1 c7d812be41c72a745fa2a45c5a3bd68102ac7915 SHA256 bd464d40ec449adbb5118a4a4276e5ee15d6675346da75109bae79d7ed971a91
-DIST eselect-1.2.17.tar.bz2 169990 RMD160 c97c8a147f3d737de12c4aa4993a17734464d85d SHA1 fd5721e49eb4705b66bda387eb70fe45ca3b72ba SHA256 37724f875bb13b8998f699bf56a59c55a0d9987943216ab784926a550aa8d138
-EBUILD eselect-1.2.17-r1.ebuild 1791 RMD160 565bfa7529d77f06738a2db79bb5072ed5e01293 SHA1 4aa4163b9ef8c0df29d012454956b2ca842dcff0 SHA256 b4e9e6938a6620f87689c2ae0a432ee110955ce8cecfcd1a5cd2a28ecdc39971
-MISC ChangeLog 25988 RMD160 0570a7c80ef0bc101cee29aad51dfd7e2a001254 SHA1 6ce52ce322b41e343997daeac6b220d9e4a9978e SHA256 fc4ef22c0e12ed30378e0baa48950de154321fe18b1290c2c96aedc4552e2a3a
+DIST eselect-1.2.18.tar.bz2 170120 RMD160 0a2dc01f0c50c03f81b6079b91190859d820ff61 SHA1 5ac5a5049e99d09063da9d99096a146cb22953cd SHA256 68581af8f7ca427dbd726b766071c833918fb5ae25ad03224def7e1599297b3c
+EBUILD eselect-1.2.18-r1.ebuild 1852 RMD160 fbec57c147e968d81e96235863199bc181e87f3a SHA1 aae4cf3237cccdcf2f3782d2cd12f30aacf109e7 SHA256 87fd9b9b3ce13e63befa4c7abd0d4a93d190607f3306cad681f593b9cdcf262f
+MISC ChangeLog 26145 RMD160 f187ef3bfbbd426e5bae81cfa751058a289d46b6 SHA1 4f4d3dbd46c982c364227ecb550dc839939f2a37 SHA256 82f00ce10ebe497ed6a11cbea760524ec811de344a287e678e3fe36b1db89ed0
 MISC metadata.xml 223 RMD160 ad3a63ca53ae3d53a6be0caea0f00d5339415496 SHA1 c5430898aa8d251b7469d16f66dbd02018581bb9 SHA256 9bfa4e7551e380482c16cb288fa4f711543e15f6c00aabd2bb38fdbcbbc6dd26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOZpSoAAoJEOf+E+/4L5LmJ5kP/jJlmrjBwwU6vS6ncKdK+AlD
-rSdO+tZjkZHEyEH8S7D5moVjMXl+/4m0wg3DamWQSul3kFw8hiAklHXCawDtxp/g
-X/SnAd3wPiK0avz63BaZIUFab1HT+hkIatoxJ1NDaqiewKb/XIDeyzpmtPfVxLQ9
-dfloNUjVSZYuMBYKPpLf9JsYZRL2FLj/zDdXAYSbVo6FyQgvMl4S1PTcaq0+m7sa
-TuVA8fLMnsDtd8bxcC8rzZCVZbh4FGCQ/v4CP1mpgwKGPeZVDYQxWh7T6iMycdua
-l+U9vlQ9HutK+vHd+/9aKqwg59/iiz/rInFq0fk8D5EJGAY+TR4jSyrDgmcyt5ji
-SSLNXsvxhqSOnqA3/wCSV9oCM2W0mdw9kBBhYrYwTXHLFvAYtyFy9srH6fLK46+X
-zmHYkKeTtFBUzy2w/H7WASIOexx4rP5e60BGalGO8rfoWvilgcZsc2FpVIcco3VT
-0Bz40Y80+KB/LYQAis7e0Yrzdy8NeOLHK8SoXJxQ/RFHYWigAMgLVqaqj4400bzS
-t8fMEuxY3kWc49vWm4GI1j8nx68urvLk1N+eREO02kam2xbYhlpmavOCUatHhk0G
-IHP+PR7cdS35550W3VWf6pxT5n/pxHjjxJPeWl/aVFTq/SZOS4cL9QGeiI/uPg6d
-Mwme4O0tcTjTFKRZ51yt
-=M48X
+iQIcBAEBCAAGBQJOgfVMAAoJEOf+E+/4L5LmIHoP/2n67/X1EqA6w3wyKzPO7zZZ
+Vl+j11kUEpSvQzmIKCRokXwBCJAX+DMl2eD2NhiRjyq4bJmBAP0EvBJHpd+bRc+y
+r4tBTJagqgldG2K0hzESnAWsy1HDhmFkFDWyzhfkxQDOQ/5PpxcdmVdLQCQor07+
+VTf5TBEGnRADpPvp4yPINRye7iEKr7X1HgFgveWo5vlXSLiC3sMe/MpsbIbxBR92
+G9kpHcOP9WA9caxBog7urZaqguJDCd9Nj+mQYXmN2qHR0UugPrt/E5C0llOAAEb0
+GHjg2zhTvsKOer99rD2Z+8vNwrKvy1frVpPTrTjDCrSKCStx0pvVVTvtB06p8bzd
+EU0/9Rq2kH9x2dTJAPzTOxA95UXiTr4wX7mSzGMgBIseqaUTUZLkD5JE7flB07yd
+FXZBc14DsUBatAH7D9CGjgzJHFZ8jx2qPEFXLUZqqc5ZqbRtxDR58Vgp3UD0c3x5
+n9FZ9GOHx3cJCGVkunM5eGn4O2Vabr4rBwFy6dUzIubQUlnSOGnnQ0Vteydvc2OA
+aPKCJa2WBwzuz3P2HyyRxyShcrREIMRXeOX8y/NN0sXdHu/B5Of3yRa/brXFlry8
+ErEZjZh0jS+243bQuCPxENwtSZhZHyDEEffCMr5YfQEmP5sgMom3fWORBuWCk41c
+kL81awEluSZ7JKFIuixx
+=C1NC
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect/eselect-1.2.17-r1.ebuild b/app-admin/eselect/eselect-1.2.18-r1.ebuild
index 2e303fa12..483018a53 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
 }