Fix my previous screwup. The base module exists again and hopefully works, bug 289240

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 31 insertions, 15 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 1188bcb3654d..62c4466ed822 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.193 2009/10/15 13:52:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.194 2009/10/16 01:43:14 darkside Exp $
+
+*bash-completion-1.1-r1 (16 Oct 2009)
+
+  16 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
+  -bash-completion-1.1.ebuild, +bash-completion-1.1-r1.ebuild,
+  files/bash-completion.sh:
+  Fix my previous screwup. The base module exists again and hopefully works,
+  bug 289240
 
 *bash-completion-1.1 (15 Oct 2009)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 242e4fdd7080..1540364fc6e2 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -2,10 +2,10 @@ AUX bash-completion 724 RMD160 dc15f6b02f08a2fa656fa2d0c9ed15d20a7b9dc8 SHA1 d71
 AUX bash-completion-1.0-bash4.patch 861 RMD160 865e8f745b8cc53125db6903b1954523f99a277e SHA1 503b825408f4a366d1d4795e3ae4f6e51cf500d5 SHA256 e0ecf183746f6b8075ecc7891e265a10b4a3593f6690f66c320fc18b023ac1ca
 AUX bash-completion-1.0-gentoo.patch 2125 RMD160 33682926cca6bcccc971a8c3dde91180cdf858e1 SHA1 e9a5da746221148dcd7661a6a996a9c4ba7ef149 SHA256 8a7bcd782b8980c8f370ca022872b7f894596f8289dbbd800327659b95a9a85a
 AUX bash-completion-1.0-shadow-compat.patch 879 RMD160 77921832e335109df5aa48475eefe6819a6bc108 SHA1 3139a6431bc9506cc4c4f2b80b516c0d365832f9 SHA256 5e877f2ad0c33c3e1bc7766d5389e18515518ac9ff6ffff4855bf7de59cf9297
-AUX bash-completion.sh 1942 RMD160 d9565f9e7c3c03fe24d2c8a990c9beff0118a8d6 SHA1 667a73b88db5b4862c81b2a4599a9c94fb313d24 SHA256 907ab0302cec5b6034194205637a62be9447c88c35039330fc842a97d4482eee
+AUX bash-completion.sh 1888 RMD160 020882a80ac7c75b99b545535efb957dba7360f4 SHA1 54178af9b9140fb9d342765d5a070b8b9a01eec8 SHA256 51556eab62b7977e7f6ddb9c79cc1b20f8f8037de282f8d00d67925a12db3677
 DIST bash-completion-1.0.tar.gz 143578 RMD160 b590c2633c5c10c3e98b14a74f4e96c910b6177d SHA1 61040795731f5ff509c46e818a1edf0a7a93e11d SHA256 bd96e7d2858f02783046908a984993736f1189d07d82e9ce4b465068dd7187ef
 DIST bash-completion-1.1.tar.bz2 135741 RMD160 e5e3c250d1b791007e916f0ce06511501675ba85 SHA1 dde4ca656c72adb8326a21f1774dd906f8aaef09 SHA256 7cd415c948e44e143c2f76b6ac6f52e1e44a2762db9201cd2892fe81df807ca4
 EBUILD bash-completion-1.0-r5.ebuild 3288 RMD160 78030933452fdf4c5c2f9f26f506c857f67cc1a6 SHA1 1c7db015c3b1244461408cf6495417e671ec48c3 SHA256 4964393657764362283caa4c0f67c423998dca97831fff4e634174ba4938cf86
-EBUILD bash-completion-1.1.ebuild 2214 RMD160 db7da0706afc0eeafad95681fa2d70d3deb7c580 SHA1 16635127edc43ed5bba574e1eb96a77b0d662398 SHA256 94d98ee31903b22e6b8de5bb37ad048adf8753eb892c0869429840848ebf09d5
-MISC ChangeLog 34105 RMD160 05775442fa9a2ffb2f3d4f4a95e120b2a993a8d7 SHA1 d08e24500764f114b435acaee6f0e38d70e1e44b SHA256 44c04f551af9afb5a5f30cdc0fc5929faeb056db47508708a42162903dcb6ff1
+EBUILD bash-completion-1.1-r1.ebuild 2593 RMD160 597e5de0392da7d4983fd19e64e7c882e9e4a9b5 SHA1 14a87b88bd5b127dfff9608a3a72f4b7aad576f8 SHA256 24c167e78b97cbc5b0fc4cc3f90aa51534c70b26cba018d2aefed49a121e5558
+MISC ChangeLog 34376 RMD160 cf4f9fb0aa0e606078c988c21e6d0c3ce23926fd SHA1 5e06d773c5e7eaeb7eb8de4a21ae19e38ac1e1f3 SHA256 ebe4cb24a16a166b804bfaac9c9f9d3b6ef363c04db9a4eb9934983e5d033b27
 MISC metadata.xml 930 RMD160 e6718602012b2cfcb5be5bfc962889bf88f4dc73 SHA1 a585c9cfc0bdb59ee4c7ff1e786bc53d28d36aac SHA256 281bfd91145b2ae2a5c2774802dee741bbe625777b1c4e3eaefdca406e534ba9
diff --git a/app-shells/bash-completion/bash-completion-1.1.ebuild b/app-shells/bash-completion/bash-completion-1.1-r1.ebuild
index cbf24f91d387..ba7664e4f42d 100644
--- a/app-shells/bash-completion/bash-completion-1.1.ebuild
+++ b/app-shells/bash-completion/bash-completion-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.1.ebuild,v 1.1 2009/10/15 13:52:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.1-r1.ebuild,v 1.1 2009/10/16 01:43:14 darkside Exp $
 
 EAPI="2"
 
@@ -30,8 +30,16 @@ src_install() {
 	mv "${D}"/etc/bash_completion.d/* "${D}/usr/share/bash-completion/" \
 		|| die "installation failed to move files"
 	rm -r "${D}"/etc/bash_completion.d || die "rm failed"
-	mv "${D}"/etc/bash_completion \
-		"${D}/usr/share/bash-completion/.bash-completion" || die "mv failed"
+	awk -v D="$D" '
+	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"
+
 	dodoc AUTHORS README TODO || die "dodocs failes"
 }
 
diff --git a/app-shells/bash-completion/files/bash-completion.sh b/app-shells/bash-completion/files/bash-completion.sh
index aa84784ff74a..2ef091fc9cb3 100644
--- a/app-shells/bash-completion/files/bash-completion.sh
+++ b/app-shells/bash-completion/files/bash-completion.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh,v 1.4 2009/10/15 13:52:36 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh,v 1.5 2009/10/16 01:43:15 darkside Exp $
 
 # Check for interactive bash and that we haven't already been sourced.
 [ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return
@@ -9,22 +9,22 @@
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
 if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
     _load_completions() {
-    declare f x loaded_base=false
+    declare f x loaded_pre=false
     for f; do
         if [[ -f $f ]]; then
         # Prevent loading base twice, initially and via glob
-        if $loaded_base && [[ $f == */.bash-completion ]]; then
+        if $loaded_pre && [[ $f == */base ]]; then
             continue
         fi
 
         # Some modules, including base, depend on the definitions
         # in .pre.  See the ebuild for how this is created.
-        if ! $loaded_base; then
+        if ! $loaded_pre; then
             if [[ ${BASH_COMPLETION-unset} == unset ]]; then
-            BASH_COMPLETION=/usr/share/bash-completion/.bash-completion
+            BASH_COMPLETION=/usr/share/bash-completion/base
             fi
-            source /usr/share/bash-completion/.bash-completion
-            loaded_base=true
+            source /usr/share/bash-completion/.pre
+            loaded_pre=true
         fi
 
         source "$f"
@@ -42,7 +42,7 @@ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
     # 4. Load user completion file last, overrides modules at user discretion
 	# This order is subject to change once upstream decides on something.
     _load_completions \
-    /usr/share/bash-completion/.bash-completion
+    /etc/bash_completion.d/base \
     /etc/bash_completion.d/* \
     ~/.bash_completion.d/* \
     ~/.bash_completion