Revision bump for bug 78922; fixes a few equery completion bugs.

(Portage version: 2.0.51-r15)

5 files changed, 133 insertions, 15 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index b7fd321434cb..b36bb049ad69 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,13 @@
 # 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.103 2005/01/22 00:56:38 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.104 2005/02/04 12:51:46 ka0ttic Exp $
+
+*bash-completion-20050121-r1 (04 Feb 2005)
+
+  04 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/gentoo-bashcomp-20050117-equery.diff,
+  +bash-completion-20050121-r1.ebuild, -bash-completion-20050121.ebuild:
+  Revision bump for bug 78922; fixes a few equery completion bugs.
 
 *bash-completion-20050121 (21 Jan 2005)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index d3f1fadede45..5a590e73a220 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 966a1b97060ac3708d22d088e3cf49d6 bash-completion-20041017-r3.ebuild 2621
-MD5 d15e96907acc7c2554b88a3566d0f6bd bash-completion-20050121.ebuild 2638
-MD5 d1d0d6030fcaebe074c6b45f36da14a6 ChangeLog 16613
+MD5 8493faf31d3d1720a5eac938cf53c103 bash-completion-20050121-r1.ebuild 2702
+MD5 01e77c9bf635c9e2d01c181c11109312 ChangeLog 16894
 MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
+MD5 4406981db9a6c4f413d3f9f4b14eae91 files/gentoo-bashcomp-20050117-equery.diff 3329
 MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152
 MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
+MD5 35fc8232b26ca995623692bea7df2e5d files/digest-bash-completion-20050121-r1 152
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
-MD5 35fc8232b26ca995623692bea7df2e5d files/digest-bash-completion-20050121 152
 MD5 64ca0b5063d0874c6104a4b174cb0d40 files/20050121-gentoo.diff 1894
 MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB8aTQEZCkKN40op4RAu5VAKDDmrFr058qTygWyX0l/SlZ71utEQCdEA4C
-ggV1x3qqFjoNrAOOj4WTDH8=
-=j81N
------END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20050121.ebuild b/app-shells/bash-completion/bash-completion-20050121-r1.ebuild
index 6ed00901d93a..edf0b1dad3a2 100644
--- a/app-shells/bash-completion/bash-completion-20050121.ebuild
+++ b/app-shells/bash-completion/bash-completion-20050121-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-20050121.ebuild,v 1.1 2005/01/22 00:56:38 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r1.ebuild,v 1.1 2005/02/04 12:51:46 ka0ttic Exp $
 
 inherit eutils
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo.diff
 	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
+	epatch ${FILESDIR}/gentoo-bashcomp-${GENCOMP_VERS}-equery.diff
 }
 
 src_install() {
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r1
index 9db0f10e078e..9db0f10e078e 100644
--- a/app-shells/bash-completion/files/digest-bash-completion-20050121
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050121-r1
diff --git a/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff b/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff
new file mode 100644
index 000000000000..8dc5cc1bc04b
--- /dev/null
+++ b/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff
@@ -0,0 +1,119 @@
+diff -urN gentoo-bashcomp-20050117.orig/gentoo gentoo-bashcomp-20050117/gentoo
+--- gentoo-bashcomp-20050117.orig/gentoo	2005-01-31 03:41:52.876228512 -0500
++++ gentoo-bashcomp-20050117/gentoo	2005-01-31 04:07:55.467678504 -0500
+@@ -750,7 +750,8 @@
+ 	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|hasuse))
++			case $i in
++                            @(belongs|ch@(anges|eck)|dep@(ends|graph)|files|glsa|list|s@(ize|tats)|uses|which|hasuse|b|c|k|d|g|f|a|h|l|s|t|u|w))
+ 				mode=$i
+ 				;;
+ 			esac
+@@ -769,11 +770,11 @@
+ 					;;
+ 			esac
+ 			;;
+-		changes|glsa|stats)
++		c?(hanges)|a|glsa|t|stats)
+ 			# These commands have not been implemented in 'equery' yet ...
+ 			echo -n "# Not implemented! "
+ 			;;
+-		files)
++		f?(iles))
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -788,7 +789,7 @@
+ 				esac
+ 			fi
+ 			;;
+-		list)
++		l?(ist))
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -803,7 +804,7 @@
+ 				esac
+ 			fi
+ 			;;
+-		belongs)
++		b?(elongs))
+ 			# Only complete if the previous entry on the command line is not
+ 			# a file name.
+ 			if \
+@@ -823,8 +824,8 @@
+ 						COMPREPLY=($(compgen -W "-c --category -e --earlyout" -- $cur))
+ 						;;
+ 					*)
+-						# Complete filenames. Function defined in /etc/bash_completion.
+-						_filedir
++                                                COMPREPLY=($(compgen -f -- $cur) \
++                                                    $(compgen -d -S '/' -- $cur))
+ 						;;
+ 				esac
+ 			# Are we completing a category?
+@@ -832,7 +833,7 @@
+ 				COMPREPLY=($(cd ${portdir}/metadata/cache; compgen -W "$(compgen -G '*')" -- $cur))
+ 			fi
+ 			;;
+-		uses|which)
++		@(u?(ses)|w?(hich)))
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} ]]; then
+@@ -840,7 +841,7 @@
+ 				_pkgname -A $cur
+ 			fi
+ 			;;
+-		depgraph)
++		g|depgraph)
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -855,7 +856,7 @@
+ 				esac
+ 			fi
+ 			;;
+-		depends)
++		d?(epends))
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -878,7 +879,7 @@
+ 				esac
+ 			fi
+ 			;;
+-		check)
++		k|check)
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} ]]; then
+@@ -886,7 +887,7 @@
+ 				_pkgname -I $cur
+ 			fi
+ 			;;
+-		size)
++		s?(ize))
+ 			# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -901,7 +902,7 @@
+ 				esac
+ 			fi
+ 			;;
+-		hasuse)
++		h?(asuse))
+ 		   	# Only complete if the previous entry on the command line is not
+ 			# a package name.
+ 			if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+@@ -921,7 +922,7 @@
+ 	esac
+ 	return 0
+ }
+-complete -F _equery -o filenames equery
++complete -F _equery equery
+ }
+ 
+ #