Version bump. Fixes bug #477024 (fixes for bash-completion-2.1, patches by

Alexander Tsoy) and bug #478444 (add repos.conf support).

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 61 insertions, 56 deletions

diff --git a/app-shells/gentoo-bashcomp/ChangeLog b/app-shells/gentoo-bashcomp/ChangeLog
index 92e11b7aeee0..98d584769403 100644
--- a/app-shells/gentoo-bashcomp/ChangeLog
+++ b/app-shells/gentoo-bashcomp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/gentoo-bashcomp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/ChangeLog,v 1.55 2013/06/17 04:57:54 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/ChangeLog,v 1.56 2013/08/04 19:38:18 dirtyepic Exp $
+
+*gentoo-bashcomp-20130804 (04 Aug 2013)
+
+  04 Aug 2013; Ryan Hill <dirtyepic@gentoo.org>
+  -gentoo-bashcomp-20101217.ebuild, +gentoo-bashcomp-20130804.ebuild:
+  Version bump. Fixes bug #477024 (fixes for bash-completion-2.1, patches by
+  Alexander Tsoy) and bug #478444 (add repos.conf support).
 
   17 Jun 2013; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index bd8b3549d005..63388af70cb0 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -4,19 +4,20 @@ Hash: SHA256
 AUX gentoo-bashcomp-20101217-make_globals.patch 312 SHA256 d535e8f15f996639de5c18990bc22a6dde1e3f46ca20211282dd9163f7d182f6 SHA512 52c57defde061ab2c28521a601e840cc6e00f4be3ea438edee7089a9ca98e6c540148c5da51744fd6108742b3d219997c93810bfc6f42ade29629ccb90b09af6 WHIRLPOOL 9d2b784cbb755c672f87cb9e4f0be147c68f933735f7ff77854100e778ec25c070869ff0ce0278eaad45aee059fc89f484fa1f9cf93a9e456a5260fb9cc0de5a
 DIST gentoo-bashcomp-20101217.tar.bz2 23095 SHA256 834e62a9189294f30771fce3fcdeca5fae6fd706c7fd35047f246fb2c0e8cd5a SHA512 29c4802b8f71585b7146e454f44700954de8655aa46dda7046338ed46e1e9835f4ea4141cfd5a813a5f75b6586b030e0e0cbde4c8030ec303f98110fa7a5e316 WHIRLPOOL 1d2c0ea0cd9a4888cc86b05bc9f9c9e9810a7af3c601c000cfc03d1f648cf958308d0d0c09615aec9b1d5b1f550398fca08b6a5b60cbc86d189650d13d2d0987
 DIST gentoo-bashcomp-20121024.tar.bz2 28025 SHA256 e7c23a671fa5fee6647729bfb0f93984fda3a33256cf5a29af6f525f2068c42a SHA512 ca755de801b8ecba6267395930024cbd6eb7f3f78c08de5caff6621bcf99554b68f8d3bb93f517f6a7fe27b08c42c8896910b0b93f8917db6e0172bfd614bacd WHIRLPOOL f4a08409874d9481618392810aa942c489337075d01050da24ee88b0dd41e303fc0b44a7f919034d1ddf543cc2a06c3d1cb46430e356a7f6f910a9874d0144bf
+DIST gentoo-bashcomp-20130804.tar.bz2 28978 SHA256 c29048b0713b9fc6537b6e6dc38198358df30a1ad2c05a0e9df8641496f74480 SHA512 1989db65b9e9f696564406981ff012e7f4ea4e6b83c7b3a4c55da177708fc4b1c18a548c4bc39f1b9990be78f915c42fe49d8a557d105a15012709bf8dba008e WHIRLPOOL 5913f506d15fb61c9966660f4ecf0ff5abc22ae0bf173b34571a3d60f9332d34eb9409914f207c8d84213c6cb7b4b1f7baf50e3d1e3add3138b67de611b431b3
 EBUILD gentoo-bashcomp-20101217-r1.ebuild 1572 SHA256 7b364f61d5dac7e3a1849f8fc86973e5ea3822fac5ac14bac98e615d0f0f61a1 SHA512 d64ae78dafe0d7dc2d84f1e7ca018b0e389390c27345d069014758a4ce799fcbc972775b1ac3b6b7b9dcd28eafd1b5ade968884d2886e60194a599a3c5ea2555 WHIRLPOOL 386bb9edc376122949097cbc04343f7e9c12b41416e03ac212a8afb5451eebb5dee0d5f6d65685669e6c25e664d8ef33362a3c041378a111e8ed55755940184a
-EBUILD gentoo-bashcomp-20101217.ebuild 1513 SHA256 44de618d36cc937866fbba67ad58b8c61422de79d1c12d3079fb00f8d75ac724 SHA512 2d0cf78c02a458c5a2b68e953fbfc9547ead7c51a2970710ea9f00bd3d6b49b3e7a1a5992c28975dbca5162c8009c42de98217eda6293ddd6dec1348abaf0046 WHIRLPOOL d1e29ea454cb6c4903332e22e3f832bde53f00f8ea7da4e6dc3c78cfb4cff46f7522bc1ea3df9cb7cc977eb9330c3ab972f6e00c230b9de19f8566f6ada7c966
 EBUILD gentoo-bashcomp-20121024.ebuild 1482 SHA256 a2f75fc8776de834f897d1e34b65570ec454054318572b9725093d84d188b19b SHA512 a6b526b537ba7e0fd8d836a51d0da37a3ea48fd7c494edb2cc0df2cc8fc6e3ec8970fb1f0833a937450674b88d569830a939064298e721a6ac502eff1de073a1 WHIRLPOOL add2471004eb5baac7ac2c14ef7d88c5e2af92c321f4e01e2d1f5031699c3b2f189d0c39990f8459e4f46be21270587ce7a4104e67c953de82bb18c63e2dedf8
-MISC ChangeLog 8557 SHA256 83dd3e0fc5aa8bd3bc26370cab934252426e6f59518970910879c726bd7c7fd5 SHA512 b69c0ea82a56c5ed088a6e111404efe4cff5297a6fabd44fc0cfddfcd284df770618bf00bda1cc2a78100128f5866443b20b86c86e1bcdb37bd60350f5d2bd53 WHIRLPOOL db2d50a30a82ea97d9b4fcbf76bb5a5b987a1674d0b3aa62e2dea4d97bf25aea91f89861487ebdca424f306a2db21b99c4a20754a34f5516f6a5ec1387dfcd77
+EBUILD gentoo-bashcomp-20130804.ebuild 1404 SHA256 f5f00e4dff8e85fddee13c5658a08a7617fb60f5702178467ae6f804fc992881 SHA512 302b19eb90da041bbdcb85d2fe7182e0d50e165fcbb1831fad2e2b53e0cbe0b84ed0908a33dde6a8d081e1b03b7f6db69e8d7c9072078f325c3d28f0f39f8e8f WHIRLPOOL d0068ea5f48d8018fdd13a68d7ca9a756dd4332236328d8bd8a5bd827af4410e85e21385251c25aa24f9069dd2f1001fa59ef48c6a22cb3440339f922f2330cd
+MISC ChangeLog 8854 SHA256 4ec8fec2c7030aa4d7b59f2fb9b314f2aa38d8ffd5ba2120dcc1ee1a5b19888e SHA512 d34788202d04d4edc4409cd238299a3b1cb1812fc851d2c049498fab3d980df52652ef3d0a5b797154f19938311981f274132e2b47de3eb2f7af3f93ca12fe44 WHIRLPOOL 67a7ae188c2697ddeddafd6f6dfca4b63a9c6f2c662ba6b3926ae62f5574c5bdb7479d8385c346c8c106ac03ad472e75ab6ad14d965539bd71616e86cd95dbe1
 MISC metadata.xml 257 SHA256 c94277aece7101d04be693c01261d9d4cbfb2a0a640d3a6c5f3095e50a0d11bf SHA512 e2dc5eb797aef2de01ebdc3eec2b737509fe2e6059c9e7e4ea9008d573cf420225944fd267dd90aee9035265d6600b44ca49f7254b87ed155a73ad16d7bc5847 WHIRLPOOL 00360008c62cef9e36f82118284e85cf21732c0e5ef7a1c92ed03af1d617d7566ee267d33379206bb1797f889c686948470ff493fa068206b2f256ff26b33867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvpnOAAoJEO04vUmVeoRjzqsIAKqHe166oWlvNqAhz3WO+Mbk
-yTHl4gmR7KNMhv0KZe2bn9hs6H0oBuSmZd9zJAgkJqE8ZHFdUEd9wM55uqE9eeUI
-mIaQSmmzQro+jk15rS8f9dbuDhhbAtmjxsWb7g91m+dEnIV6s6azLZrZbrXi+dsV
-09nG8oayuH5Uw3NXccr04WSeciP1lJ0vTegXOsd3Auj7VIBaN5zZ8xzGk9JOgV7w
-ZSp6lb3XkV/s9U5qudSHuFSFB5vAaTlpjBinzlAFB13z2FsM75NF+CimDEdlrj8E
-TZ99YDisxh1WCF46f5YJ+qA/czNchGAypsMJp5TEzrDS16VZe0ki5wFszxG7em8=
-=6vHn
+iQEcBAEBCAAGBQJR/rAvAAoJEO04vUmVeoRjb7gIAKd7vGvnOQOZT/H8+TnDiTJ6
+UQNxclgrufysFA3pZix83K8BVZZckGRQXpBKZTzliWrAJSyqcBOdKkRzmsvE+jX3
+4+tM3uzP9X96Oz5pPD/3vMVdxpegUZGbZuELUbhiiiSkUmAHUwZKApw/qgtDFDQB
+rcJVB2om/chZkucFDbDhI4Ou1XohfFgHFSs9+eFB4g42njolTRYtM9Z0jCq2V+oA
+Kh/zftG6BTL4/YLhjD0oWutzeVYfXNvC+nJf6cdmGrjTdtBsg/ouq8C/h/IFMnQx
+JcYfpjz6pdW0DgqPJLA2fCX2zAakGOGyp+dQYTrI+BpFkUAKy6o6EC2QVLMAJSQ=
+=/xqI
 -----END PGP SIGNATURE-----
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild
deleted file mode 100644
index 898dd9c21b8a..000000000000
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild,v 1.3 2012/05/04 11:07:52 aballier Exp $
-
-EAPI=3
-inherit prefix
-
-DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, repoman, layman, etc)"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~darkside/tmp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
-IUSE=""
-
-RDEPEND="app-shells/bash-completion"
-
-src_prepare() {
-	eprefixify gentoo
-}
-
-src_compile() {	:; } # There is a useless Makefile in the distfile
-
-src_install() {
-	insinto /usr/share/bash-completion
-	doins gentoo 	|| die "failed to install gentoo module"
-	doins repoman 	|| die "failed to install repoman module"
-	doins layman 	|| die "failed to install layman module"
-	dodoc AUTHORS ChangeLog TODO
-}
-
-pkg_postinst() {
-	# can't use bash-completion.eclass.
-	elog "To enable command-line completion for ${PN}, run:"
-	elog
-	elog "  eselect bashcomp enable gentoo"
-	elog
-	elog "to install locally, or"
-	elog
-	elog "  eselect bashcomp enable --global gentoo"
-	elog
-	elog "to install system-wide. (and/or repoman instead of gentoo if you use"
-	elog "repoman frequently)"
-}
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild
new file mode 100644
index 000000000000..cdc2ab9c1d4a
--- /dev/null
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild,v 1.1 2013/08/04 19:38:18 dirtyepic Exp $
+
+EAPI="5"
+inherit bash-completion-r1 eutils prefix
+
+DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, repoman, layman, etc)"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-completion-2.1-r1"
+
+src_prepare() {
+	eprefixify gentoo gentoo-style-init
+	epatch_user
+}
+
+src_compile() {	:; } # There is a useless Makefile in the distfile
+
+src_install() {
+	local sym bashcompdir
+
+	bashcompdir="$(get_bashcompdir)"
+	insinto "${bashcompdir}"
+	doins gentoo repoman layman
+	for sym in emerge ebuild rc rc-status rc-update gcc-config \
+		distcc-config java-config browser-config equery ekeyword portageq \
+		webapp-config revdep-rebuild splat euse glsa-check epm metagen \
+		rc-service; do
+		dosym gentoo "${bashcompdir}"/${sym}
+	done
+
+	insinto /etc/bash_completion.d
+	doins gentoo-style-init
+
+	dodoc AUTHORS ChangeLog TODO
+}