--- bash-completion-2.1.ebuild	2013-06-04 04:54:26.000000000 +0300
+++ /tmp/bash-completion-2.1-r1.ebuild	2013-06-13 01:07:13.950969218 +0300
@@ -3,7 +3,6 @@
 # $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1.ebuild,v 1.2 2013/06/04 01:54:26 jer Exp $
 
 EAPI=5
-inherit prefix
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="http://bash-completion.alioth.debian.org/"
@@ -14,81 +13,28 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
-RDEPEND="app-admin/eselect
-	|| ( >=app-shells/bash-3.2 app-shells/zsh )
-	sys-apps/miscfiles"
-PDEPEND="app-shells/gentoo-bashcomp"
-
-src_prepare() {
-	cp "${FILESDIR}"/bash-completion.sh-gentoo-1.2 "${T}"/bash-completion.sh || die
-	eprefixify "${T}"/bash-completion.sh
+RDEPEND="|| ( >=app-shells/bash-3.2 app-shells/zsh )
+	sys-apps/miscfiles
+	!app-shells/gentoo-bashcomp" #472938#c1
 
-	find completions -name 'Makefile*' -exec rm -f {} +
+src_install() {
+	default
 
-	# Part of >=sys-apps/util-linux-2.23 wrt #468544
+	# use the copies from >=sys-apps/util-linux-2.23 wrt #468544 -> hd and ncal
+	# becomes dead symlinks as a result
 	local file
-	for file in cal dmesg eject hexdump hwclock ionice look renice rtcwake; do
-		rm -f completions/${file}
+	for file in cal dmesg eject hd hexdump hwclock ionice look ncal renice rtcwake xxd; do
+		rm -f "${ED}"/usr/share/bash-completion/completions/${file}
 	done
 
-	# app-editors/vim-core:
-	rm -f completions/xxd
-}
-
-src_configure() { :; } # no-op
-src_compile() { :; } # no-op
-
-src_install() {
-	# Gentoo specific bash-completion.sh file.
-	insinto /etc/profile.d
-	doins "${T}"/bash-completion.sh
-
-	# All files from contrib/ in source package get installed
-	insinto /usr/share/bash-completion
-	doins -r "${S}"/completions/*
-
-	awk -v D="$ED" '
-	BEGIN { out=".pre" }
-	/^# A lot of the following one-liners/ { out="base" }
-	/^# start of section containing completion functions called by other functions/ { out=".pre" }
-	/^# start of section containing completion functions for external programs/ { out="base" }
-	/^# source completion directory/ { out="" }
-	/^unset -f have/ { out=".post" }
-	out != "" { print > D"/usr/share/bash-completion/"out }' \
-	bash_completion || die "failed to split bash_completion"
+	# use the copy from app-editors/vim-core:
+	rm -f "${ED}"/usr/share/bash-completion/completions/xxd
 
 	dodoc AUTHORS CHANGES README
-
-	# This is backported from upstream 2.0 release. You can stop installing
-	# this file after 2.0 is in Portage and use the one from the tarball
-	# instead.
-	# Installed to datadir instead of libdir because bash-completion(s)
-	# are not ELF files.
-	insinto /usr/share/pkgconfig
-	doins "${FILESDIR}"/bash-completion.pc
 }
 
 pkg_postinst() {
-	if ! has_version "${CATEGORY}/${PN}"; then
-		elog "Any user can enable the module completions without editing their"
-		elog ".bashrc by running:"
-		elog
-		elog "    eselect bashcomp enable <module>"
-		elog
-		elog "The system administrator can also be enable this globally with"
-		elog
-		elog "    eselect bashcomp enable --global <module>"
-		elog
-		elog "Make sure you at least enable the base module! Additional completion"
-		elog "modules can be found by running"
-		elog
-		elog "    eselect bashcomp list"
-		elog
-		elog "If you use non-login shells you still need to source"
-		elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc."
-	fi
-
-	if has_version 'app-shells/zsh' ; then
+	if has_version 'app-shells/zsh'; then
 		elog "If you are interested in using the provided bash completion functions with"
 		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
 		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"