Revision bump; added diff against gentoo-bashcomp cvs HEAD that closes bugs 74733, 75332, and 76416.

5 files changed, 209 insertions, 17 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 9de478c60018..9c2b70afc566 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.92 2005/01/04 17:41:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.93 2005/01/09 01:50:14 ka0ttic Exp $
+
+*bash-completion-20050103-r1 (08 Jan 2005)
+
+  08 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/gentoo-bashcomp-20040108.diff, +bash-completion-20050103-r1.ebuild,
+  -bash-completion-20050103.ebuild:
+  Revision bump; added diff against gentoo-bashcomp cvs HEAD that closes bugs
+  74733, 75332, and 76416.
 
   04 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   bash-completion-20041017-r3.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 882e7cef3c5b..f8f7e71366ac 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 996c137519fdde99cc4d06114009072e ChangeLog 14008
-MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
-MD5 2c7adfe2e73433c49c7d276d7da5b523 bash-completion-20050103.ebuild 2645
-MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091
-MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093
 MD5 5c025c16b6b1214ae6b54beb797a0af1 bash-completion-20041017-r1.ebuild 2265
 MD5 cb7dd2c202fcf41ce6b6f26737254847 bash-completion-20041017-r3.ebuild 2682
-MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
+MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093
+MD5 eb7785c47de55c8e55af6cbc89f3bd25 bash-completion-20050103-r1.ebuild 2746
+MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091
+MD5 aff8e75a028c5940642e7d539c360c71 ChangeLog 14319
+MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
 MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017-r1 152
-MD5 6bfeb038d793aa50d7496c6d08913183 files/digest-bash-completion-20050103 152
-MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
-MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151
-MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
-MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
 MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152
+MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
+MD5 6bfeb038d793aa50d7496c6d08913183 files/digest-bash-completion-20050103-r1 152
+MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
+MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151
 MD5 62c632c282cbbd0b28ba064ec57e2111 files/20050103-gentoo.diff 2060
+MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
+MD5 c44e709c618225287ce479dbd07abd87 files/gentoo-bashcomp-20040108.diff 6578
+MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB23rDroRuSHgZdywRAvqVAJ9KPaVLNsenFoed2cV2jskB2S6uvACfRoAh
-bAkTqGPtaMB4dF3tb9ig2ww=
-=09eE
+iD8DBQFB4I3fEZCkKN40op4RAtGQAJ9imtnoi9SMO/6V13Vi2H8ZrEdmCgCgnV4N
+Cvt3Ep9WlwgQGZiprUaj4Ug=
+=5kot
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20050103.ebuild b/app-shells/bash-completion/bash-completion-20050103-r1.ebuild
index ba11b5242ee2..7692d4992938 100644
--- a/app-shells/bash-completion/bash-completion-20050103.ebuild
+++ b/app-shells/bash-completion/bash-completion-20050103-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050103.ebuild,v 1.2 2005/01/05 05:27:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050103-r1.ebuild,v 1.1 2005/01/09 01:50:14 ka0ttic Exp $
 
 inherit eutils
 
@@ -29,6 +29,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo.diff
+	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
+	epatch ${FILESDIR}/gentoo-bashcomp-20040108.diff
 }
 
 src_install() {
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050103 b/app-shells/bash-completion/files/digest-bash-completion-20050103-r1
index 771839999aae..771839999aae 100644
--- a/app-shells/bash-completion/files/digest-bash-completion-20050103
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050103-r1
diff --git a/app-shells/bash-completion/files/gentoo-bashcomp-20040108.diff b/app-shells/bash-completion/files/gentoo-bashcomp-20040108.diff
new file mode 100644
index 000000000000..b13b79db01c6
--- /dev/null
+++ b/app-shells/bash-completion/files/gentoo-bashcomp-20040108.diff
@@ -0,0 +1,181 @@
+diff -urN gentoo-bashcomp-1.0_beta4/CVS/Entries gentoo-bashcomp/CVS/Entries
+--- gentoo-bashcomp-1.0_beta4/CVS/Entries	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/CVS/Entries	2005-01-08 19:21:27.000000000 -0500
+@@ -0,0 +1,6 @@
++/COPYING/1.2/Thu Jun  3 01:04:41 2004//
++/NEWS/1.3/Thu Jun  3 01:04:40 2004//
++/README/1.2/Thu Jun  3 01:04:41 2004//
++/TODO/1.3/Thu Jun  3 01:04:41 2004//
++D/src////
++/AUTHORS/1.7/Sun Dec  5 05:12:08 2004//
+diff -urN gentoo-bashcomp-1.0_beta4/CVS/Entries.Log gentoo-bashcomp/CVS/Entries.Log
+--- gentoo-bashcomp-1.0_beta4/CVS/Entries.Log	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/CVS/Entries.Log	2005-01-08 19:21:28.000000000 -0500
+@@ -0,0 +1,2 @@
++A D/CVSROOT////
++R D/CVSROOT////
+diff -urN gentoo-bashcomp-1.0_beta4/CVS/Repository gentoo-bashcomp/CVS/Repository
+--- gentoo-bashcomp-1.0_beta4/CVS/Repository	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/CVS/Repository	2004-11-27 13:29:12.000000000 -0500
+@@ -0,0 +1 @@
++gentoo-bashcomp
+diff -urN gentoo-bashcomp-1.0_beta4/CVS/Root gentoo-bashcomp/CVS/Root
+--- gentoo-bashcomp-1.0_beta4/CVS/Root	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/CVS/Root	2004-11-27 13:29:12.000000000 -0500
+@@ -0,0 +1 @@
++:ext:ka0ttic@cvs.sourceforge.net:/cvsroot/gentoo-bashcomp
+diff -urN gentoo-bashcomp-1.0_beta4/NEWS gentoo-bashcomp/NEWS
+--- gentoo-bashcomp-1.0_beta4/NEWS	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/NEWS	2004-06-02 21:04:40.000000000 -0400
+@@ -0,0 +1 @@
++First release on SourceForge.
+\ No newline at end of file
+diff -urN gentoo-bashcomp-1.0_beta4/src/CVS/Entries gentoo-bashcomp/src/CVS/Entries
+--- gentoo-bashcomp-1.0_beta4/src/CVS/Entries	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/src/CVS/Entries	2005-01-08 20:39:25.967753832 -0500
+@@ -0,0 +1,2 @@
++/gentoo/1.19/Sun Jan  9 01:39:25 2005//
++D
+diff -urN gentoo-bashcomp-1.0_beta4/src/CVS/Repository gentoo-bashcomp/src/CVS/Repository
+--- gentoo-bashcomp-1.0_beta4/src/CVS/Repository	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/src/CVS/Repository	2004-11-27 13:29:13.000000000 -0500
+@@ -0,0 +1 @@
++gentoo-bashcomp/src
+diff -urN gentoo-bashcomp-1.0_beta4/src/CVS/Root gentoo-bashcomp/src/CVS/Root
+--- gentoo-bashcomp-1.0_beta4/src/CVS/Root	1969-12-31 19:00:00.000000000 -0500
++++ gentoo-bashcomp/src/CVS/Root	2004-11-27 13:29:13.000000000 -0500
+@@ -0,0 +1 @@
++:ext:ka0ttic@cvs.sourceforge.net:/cvsroot/gentoo-bashcomp
+diff -urN gentoo-bashcomp-1.0_beta4/src/gentoo gentoo-bashcomp/src/gentoo
+--- gentoo-bashcomp-1.0_beta4/src/gentoo	2004-12-05 23:56:32.000000000 -0500
++++ gentoo-bashcomp/src/gentoo	2005-01-08 20:39:25.000000000 -0500
+@@ -2,7 +2,7 @@
+ #
+ # Gentoo Linux Bash Shell Command Completion
+ #
+-# $Id: gentoo-bashcomp-20040108.diff,v 1.1 2005/01/09 01:50:14 ka0ttic Exp $
++# $Id: gentoo-bashcomp-20040108.diff,v 1.1 2005/01/09 01:50:14 ka0ttic Exp $
+ #
+ # Copyright 1999-2004 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License, v2 or later
+@@ -13,7 +13,7 @@
+ #
+ _portdir()
+ {
+-	sed -n -e '/^PORTDIR=/ { s/^[^=]\+=\("[^"]\+\|\S\+\).*/\1/p ; q }' \
++	sed -n -e '/^PORTDIR=/ { s/^[^=]\+="\?\([^"]\+\|\S\+\).*/\1/p ; q }' \
+ 		/etc/make.conf /etc/make.globals
+ }
+ 
+@@ -273,7 +273,7 @@
+ 	cur=${COMP_WORDS[COMP_CWORD]}
+ 	if [ $COMP_CWORD -eq 1 ]; then
+ 		#COMPREPLY=($(compgen -o filenames -X "!*.ebuild" $cur))
+-		COMPREPLY=($(compgen -o filenames))
++		COMPREPLY=($(compgen -o filenames -A file -W "--debug" -- ${cur}))
+ 	elif [ $COMP_CWORD -eq 2 ]; then
+ 		COMPREPLY=($(compgen -W 'clean compile config \
+ 			depend digest \
+@@ -295,7 +295,7 @@
+ #
+ # simple completion for Gentoo style init
+ #
+-complete -W "start stop restart pause zap ineed needsme iuse usesme broken" \
++complete -W "start stop restart pause zap status ineed needsme iuse usesme broken" \
+ 	$(for i in /etc/init.d/*; do echo ${i##*/}; done)
+ 
+ #
+@@ -731,7 +731,7 @@
+ 	for i in "${COMP_WORDS[@]}"; do
+ 		if [ $j -lt $COMP_CWORD ]; then
+ 			j=$((j + 1))
+-			case $i in @(belongs|ch@(anges|eck)|dep@(ends|graph)|files|glsa|list|s@(ize|tats)|uses|which))
++			case $i in @(belongs|ch@(anges|eck)|dep@(ends|graph)|files|glsa|list|s@(ize|tats)|uses|which|hasuse))
+ 				mode=$i
+ 				;;
+ 			esac
+@@ -746,11 +746,11 @@
+ 					COMPREPLY=($(compgen -W "-q --quiet -C --nocolor -h --help -V --version" -- $cur))
+ 					;;
+ 				*)
+-					COMPREPLY=($(compgen -W "belongs changes check depends depgraph files glsa list size stats uses which" -- $cur))
++					COMPREPLY=($(compgen -W "belongs changes check depends depgraph files glsa hasuse list size stats uses which" -- $cur))
+ 					;;
+ 			esac
+ 			;;
+-		changes|depends|glsa|stats)
++		changes|glsa|stats)
+ 			# These commands have not been implemented in 'equery' yet ...
+ 			echo -n "# Not implemented! "
+ 			;;
+@@ -830,12 +830,35 @@
+ 						COMPREPLY=($(compgen -W "-U --no-useflags -l --linear" -- $cur))
+ 						;;
+ 					*)
+-						# Complete on all package names.
+-						_pkgname -A $cur
++						# Complete on installed package names.
++						_pkgname -I $cur
+ 						;;
+ 				esac
+ 			fi
+ 			;;
++		depends)
++			# Only complete if the previous entry on the command line is not
++			# a package name.
++			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
++				case $cur in
++					-*)
++						COMPREPLY=($(compgen -W "-a --all-packages -d --direct -D --indirect" -- $cur))
++						;;
++					*)
++						case $prev in
++						    -a|--all-packages)
++							    # Complete on all package names.							
++							    _pkgname -A $cur
++							    ;;
++						    *)
++							    # Complete on installed package names.
++							    _pkgname -I $cur
++							    ;;
++
++						esac
++				esac
++			fi
++			;;
+ 		check)
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+@@ -859,12 +882,32 @@
+ 				esac
+ 			fi
+ 			;;
++		hasuse)
++		   	# Only complete if the previous entry on the command line is not
++			# a package name.
++			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
++				case $cur in
++					-*)
++						COMPREPLY=($(compgen -W "-i --installed -I --exclude-installed -p --portage-tree -o --overlay" -- $cur))
++						;;
++					*)
++						local glob loc
++						glob=$(sed -n -e 's/^\([^ ]\+\) - .*$/\1/p' ${portdir}/profiles/use.desc)
++						loc=$(sed -n -e 's/^[^ ]\+:\([^ ]*\) - .*$/\1/p' ${portdir}/profiles/use.local.desc)
++						COMPREPLY=($(compgen -W "$glob $loc" -- $cur))
++						;;
++				esac
++			fi
++			;;
+ 	esac
+ 	return 0
+ }
+ complete -F _equery -o filenames equery
+ }
+ 
++# ekeyword completion
++# contributed by Ciaran McCreesh <ciaranm@gentoo.org>
++
+ have ekeyword && {
+ _ekeyword()
+ {