Fix bugs in files/bash-completion.sh, in particular default was renamed to

base during development but forgot to change it here
(Portage version: 2.1.2_pre3-r1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 114 deletions

diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index b917aa56af13..069a8bb45418 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -65,10 +65,10 @@ AUX bash-completion 724 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 SHA1 d71
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 files/bash-completion 724
 SHA256 6898275f2b0ab67af4b35c8a239d04a233e0c252acb5ed76692fd65881d3be0e files/bash-completion 724
-AUX bash-completion.sh 1473 RMD160 ab07700e6b7c8937c1efa972c33e40213ba8350b SHA1 41c7dc5a9c38d4d4e7af95b654511a7eb6a38388 SHA256 c1985b7deeb24db7899bde9ab01fcd04f7866c14d815061b49669ac14d38dbd7
-MD5 ddb01a4025fdec3cc66a746a44beaf14 files/bash-completion.sh 1473
-RMD160 ab07700e6b7c8937c1efa972c33e40213ba8350b files/bash-completion.sh 1473
-SHA256 c1985b7deeb24db7899bde9ab01fcd04f7866c14d815061b49669ac14d38dbd7 files/bash-completion.sh 1473
+AUX bash-completion.sh 1626 RMD160 d0e80247e11af5ca7935d0f18f007c15e26aab33 SHA1 165d8f446912c95e605c1d24d737cba233bf2f79 SHA256 503f4a721433d58bcf2cd7a3fc7e3fc3eb40d383e58462904cdbab84389a1141
+MD5 ad94b9e47e9cc3b73c6b05b94ac1beb4 files/bash-completion.sh 1626
+RMD160 d0e80247e11af5ca7935d0f18f007c15e26aab33 files/bash-completion.sh 1626
+SHA256 503f4a721433d58bcf2cd7a3fc7e3fc3eb40d383e58462904cdbab84389a1141 files/bash-completion.sh 1626
 DIST bash-completion-20050121.tar.bz2 90140 RMD160 3804cb7b0824d69a45113caf83c3996266e60915 SHA1 395f67db99dd3588484a66b3681300d3f1d5de0e SHA256 cef765204a7b507a38179156e2e6f0ca3a05797821b645fc58e33c5082587531
 DIST bash-completion-20050721.tar.bz2 92923 RMD160 6e1c25572d68a832bca4974ca02fcce456ea0aca SHA1 bd77fd6c2d7bd5a7af308023c93d8ac1b5358578 SHA256 fdb632afeacfe07f5f67bfbfbbdc229a88abe9d4fe09305a46c549d76a3d855e
 DIST bash-completion-20060301.tar.bz2 102357 RMD160 eaa9112289607bae51868f047a9673ee6f3e6a0c SHA1 19521f0fde4d9d06401ccd26ed4ec33d7d3aa23d SHA256 16727406bd3fbb6a23da375d4f3ca7c5d518afeb7dfb82c061a452eb7a93ceca
@@ -80,18 +80,18 @@ EBUILD bash-completion-20050721.ebuild 2009 RMD160 bf8c44338677996c7c8d8c29663df
 MD5 66eb82e5a9df017daec7510a9a188f47 bash-completion-20050721.ebuild 2009
 RMD160 bf8c44338677996c7c8d8c29663dfa57d57c59ab bash-completion-20050721.ebuild 2009
 SHA256 7e26826d461ff73a183cbe5f9174901ae9f305b27c0993b8a1d2d4141f47f531 bash-completion-20050721.ebuild 2009
-EBUILD bash-completion-20060301-r1.ebuild 3088 RMD160 79aa6d419cfc754791a094f5ab8c9780f87dcdb0 SHA1 52a334e849cf6214e20f0bc1b775e7300ca44622 SHA256 6e4a9a5af8861748c42427fa73c1707e4f80c51a58b610b4f748c2dd9fc502f2
-MD5 99db7ff16bb5b2f458265dee439fc45c bash-completion-20060301-r1.ebuild 3088
-RMD160 79aa6d419cfc754791a094f5ab8c9780f87dcdb0 bash-completion-20060301-r1.ebuild 3088
-SHA256 6e4a9a5af8861748c42427fa73c1707e4f80c51a58b610b4f748c2dd9fc502f2 bash-completion-20060301-r1.ebuild 3088
+EBUILD bash-completion-20060301-r2.ebuild 3088 RMD160 83dcfdff33994ddbcc9cbe43b56a82197e178cbb SHA1 9d36d11010750cc0b0812f2412eba321de87a8e0 SHA256 e2fa75479629de03dc5adc972dfefc98cfa0df8853d093cac2b8fd4396ba43a9
+MD5 2b2850fe1c320247c44bbb78c19b0e12 bash-completion-20060301-r2.ebuild 3088
+RMD160 83dcfdff33994ddbcc9cbe43b56a82197e178cbb bash-completion-20060301-r2.ebuild 3088
+SHA256 e2fa75479629de03dc5adc972dfefc98cfa0df8853d093cac2b8fd4396ba43a9 bash-completion-20060301-r2.ebuild 3088
 EBUILD bash-completion-20060301.ebuild 2059 RMD160 613c723739df569c0acaeb468b73d1d9b7b96f57 SHA1 575af43ee05a50a3e5fc21695c2ee96e71428ec1 SHA256 97ad74c9a03ee26a05fc8028df990f1518b8711993f00f5224d15a79b5f8883b
 MD5 72c6afed9ca9eaa1294b83fd960a378d bash-completion-20060301.ebuild 2059
 RMD160 613c723739df569c0acaeb468b73d1d9b7b96f57 bash-completion-20060301.ebuild 2059
 SHA256 97ad74c9a03ee26a05fc8028df990f1518b8711993f00f5224d15a79b5f8883b bash-completion-20060301.ebuild 2059
-MISC ChangeLog 24113 RMD160 3ef532f7acef507dd41b20c5880e032c4bf7bec2 SHA1 42866e4119f6d01bd338be4320d3f0e8adfb4d3b SHA256 7813dab6b9cbc4e0728eb53ec76ec98afcad1bccfeed5147479af568b664ec76
-MD5 0b7a46ff20c6f432782bbab09c0fc202 ChangeLog 24113
-RMD160 3ef532f7acef507dd41b20c5880e032c4bf7bec2 ChangeLog 24113
-SHA256 7813dab6b9cbc4e0728eb53ec76ec98afcad1bccfeed5147479af568b664ec76 ChangeLog 24113
+MISC ChangeLog 24442 RMD160 2f2ec8f89ebeab5f5e0196efe2edd97d32f4607d SHA1 b1b6c5d173eae0b1fa72d9a2b15193dcb71decf2 SHA256 4041fe532f9703094664b9843a3b0eb5baae860bc823ce8340601eeab407c8cb
+MD5 ba98b289ad98cc3d6c82d4aac16b1f46 ChangeLog 24442
+RMD160 2f2ec8f89ebeab5f5e0196efe2edd97d32f4607d ChangeLog 24442
+SHA256 4041fe532f9703094664b9843a3b0eb5baae860bc823ce8340601eeab407c8cb ChangeLog 24442
 MISC metadata.xml 1019 RMD160 cdc1aaaf47ada6e5e6651c8da3894482291553ad SHA1 c5f65d079f4f5642e5ecbea5914cb1620214af79 SHA256 8befa6a5366b7142e59ccfc58745cd874b8a47fe7aef571d90a31d78057223a5
 MD5 08ab540760a142dbc2af127d5f71be07 metadata.xml 1019
 RMD160 cdc1aaaf47ada6e5e6651c8da3894482291553ad metadata.xml 1019
@@ -105,13 +105,13 @@ SHA256 39ad32a3a50342a8b49e6ae05768a4cc6d105049f0267967a77651ce81308364 files/di
 MD5 c2f575e2eb05dcb99e4715921cf0ee65 files/digest-bash-completion-20060301 277
 RMD160 25c058254d036eb2d95cbd1394a48e2e30b16c73 files/digest-bash-completion-20060301 277
 SHA256 6db83773985ad0568d96f86d5b972bd85777b3feb321961823cff1aaba5edb5b files/digest-bash-completion-20060301 277
-MD5 c2f575e2eb05dcb99e4715921cf0ee65 files/digest-bash-completion-20060301-r1 277
-RMD160 25c058254d036eb2d95cbd1394a48e2e30b16c73 files/digest-bash-completion-20060301-r1 277
-SHA256 6db83773985ad0568d96f86d5b972bd85777b3feb321961823cff1aaba5edb5b files/digest-bash-completion-20060301-r1 277
+MD5 c2f575e2eb05dcb99e4715921cf0ee65 files/digest-bash-completion-20060301-r2 277
+RMD160 25c058254d036eb2d95cbd1394a48e2e30b16c73 files/digest-bash-completion-20060301-r2 277
+SHA256 6db83773985ad0568d96f86d5b972bd85777b3feb321961823cff1aaba5edb5b files/digest-bash-completion-20060301-r2 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYjT5JrHF4yAQTrARAhsZAJoDCeQhCVQ62jxq0sD2xBNsmSgK0QCfVAja
-vV+yEvaLYRQZy+vELdtqPl4=
-=hW3J
+iD8DBQFFZGSoJrHF4yAQTrARAjKKAJ4mPy3KRYb0806MggcofrEey4obdwCfZSVH
+cgmLDQz2RT/iz7TJMbPM7PE=
+=RCu/
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20060301-r1.ebuild b/app-shells/bash-completion/bash-completion-20060301-r1.ebuild
deleted file mode 100644
index 50b1c70816e2..000000000000
--- a/app-shells/bash-completion/bash-completion-20060301-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20060301-r1.ebuild,v 1.1 2006/11/20 23:06:15 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="http://www.caliban.org/bash/index.shtml#completion"
-SRC_URI="http://www.caliban.org/files/bash/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-admin/eselect
-	|| (
-		>=app-shells/bash-2.05a
-		app-shells/zsh
-	)"
-PDEPEND="app-shells/gentoo-bashcomp"
-
-S="${WORKDIR}/${PN/-/_}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/20050721
-	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
-}
-
-src_install() {
-	# split /etc/bash_completion into three parts:
-	# 1. /usr/share/bash-completion/.pre    -- hidden from eselect
-	# 2. /usr/share/bash-completion/default -- eselectable
-	# 3. /usr/share/bash-completion/.post   -- hidden from eselect
-	dodir /usr/share/bash-completion
-	awk -v D="$D" '
-		BEGIN { out=".pre" }
-		/^# A lot of the following one-liners/ { 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"
-
-	exeinto /etc/profile.d
-	doexe ${FILESDIR}/bash-completion.sh || die "failed to install profile.d"
-
-	# dev-util/subversion provides an extremely superior completion
-	rm contrib/subversion
-	insinto /usr/share/bash-completion
-	doins contrib/* || die "failed to install contrib completions"
-
-	dodoc Changelog README
-}
-
-pkg_preinst() {
-	# This file is now being installed as bash-completion.sh, so rename it
-	# first.  That allows CONFIG_PROTECT to kick in properly
-	if [[ -f ${ROOT}/etc/profile.d/bash-completion && \
-		! -f ${ROOT}/etc/profile.d/bash-completion.sh ]]
-	then
-		mv ${ROOT}/etc/profile.d/bash-completion{,.sh}
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Versions of bash-completion prior to 20060301-r1 required each user to"
-	einfo "explicitly source /etc/profile.d/bash-completion in ~/.bashrc.  This"
-	einfo "was kludgy and inconsistent with the completion modules which are"
-	einfo "enabled with eselect bashcomp.  Now any user can enable the base"
-	einfo "completions without editing their .bashrc by running"
-	einfo
-	einfo "    eselect bashcomp enable base"
-	einfo
-	einfo "The system administrator can also be enable this globally with"
-	einfo
-	einfo "    eselect bashcomp enable --global base"
-	einfo
-	einfo "Additional completion functions can also be enabled or"
-	einfo "disabled using eselect's bashcomp module."
-	einfo
-
-	if has_version 'app-shells/zsh' ; then
-		einfo "If you are interested in using the provided bash completion functions with"
-		einfo "zsh, valuable tips on the effective use of bashcompinit are available:"
-		einfo "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		einfo "  http://zshwiki.org/ZshSwitchingTo"
-		einfo
-	fi
-}
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20060301-r1 b/app-shells/bash-completion/files/digest-bash-completion-20060301-r1
deleted file mode 100644
index 845b62873eb5..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20060301-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2 102357
-RMD160 eaa9112289607bae51868f047a9673ee6f3e6a0c bash-completion-20060301.tar.bz2 102357
-SHA256 16727406bd3fbb6a23da375d4f3ca7c5d518afeb7dfb82c061a452eb7a93ceca bash-completion-20060301.tar.bz2 102357