--- gentoo-bashcomp-20121024.ebuild	2012-10-24 08:34:01.000000000 +0400
+++ gentoo-bashcomp-20130717.ebuild	2013-07-17 21:18:16.566649129 +0400
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild,v 1.1 2012/10/24 04:34:01 dirtyepic Exp $
 
-EAPI=4
-inherit eutils prefix
+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/"
@@ -14,19 +14,30 @@
 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"
+RDEPEND=">=app-shells/bash-completion-2.1-r1"
 
 src_prepare() {
-	eprefixify gentoo
+	eprefixify gentoo gentoo-style-init
 }
 
 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"
+	local bashcompdir="$(get_bashcompdir)" sym
+	local compatdir="$(_bash-completion-r1_get_bashdir compatdir /etc/bash_completion.d)"
+
+	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 "${compatdir}"
+	doins gentoo-style-init
+
 	dodoc AUTHORS ChangeLog TODO
 }