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>
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

3 files changed, 51 insertions, 47 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/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
+}