Version bump; removed old ebuild/patches.

(Portage version: 2.0.51.22-r1)

12 files changed, 157 insertions, 265 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index b2ad0f06c7b6..31ce6df2925f 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,16 @@
 # 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.126 2005/06/28 05:30:06 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.127 2005/07/13 13:17:58 ka0ttic Exp $
+
+*bash-completion-20050712 (13 Jul 2005)
+
+  13 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/20050121-gentoo.diff, +files/20050712/01_all_gkrellm.diff,
+  -files/gentoo-bashcomp-20050117-equery.diff,
+  +files/20050712/02_all_cvs.diff, +files/20050712/03_all_find.diff,
+  +files/20050712/04_all_command.diff, -bash-completion-20050121-r1.ebuild,
+  +bash-completion-20050712.ebuild:
+  Version bump; removed old ebuild/patches.
 
   28 Jun 2005; Joshua Kinard <kumba@gentoo.org>
   bash-completion-20050121-r9.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index a89251a37cc4..4012a0c0821f 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,28 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 08ab540760a142dbc2af127d5f71be07 metadata.xml 1019
+MD5 eff92f985f19940a359a47e56bbb6c49 bash-completion-20050712.ebuild 1905
 MD5 ebcfc3ffedea1fed2a323797c62bb5f5 bash-completion-20050121-r9.ebuild 1868
-MD5 9f92410c661b9bc6f8da754914c6c64d ChangeLog 21362
-MD5 6eeb1d7aba8dbb67d3909a7f2f35da08 bash-completion-20050121-r1.ebuild 2695
-MD5 4406981db9a6c4f413d3f9f4b14eae91 files/gentoo-bashcomp-20050117-equery.diff 3329
+MD5 10f950471a9a539bf8bfbb58436b03be ChangeLog 21793
+MD5 08ab540760a142dbc2af127d5f71be07 metadata.xml 1019
 MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r9 76
-MD5 35fc8232b26ca995623692bea7df2e5d files/digest-bash-completion-20050121-r1 152
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
-MD5 64ca0b5063d0874c6104a4b174cb0d40 files/20050121-gentoo.diff 1894
-MD5 a5a7bf3f82466146a212f2e54a5bb1d9 files/20050121/02_all_cvs.diff 772
-MD5 ffcc2a25851c78eed228d5bf9a34a471 files/20050121/03_all_timidity.diff 844
-MD5 61f83b8578faa6f1d522ce1a9411e0cd files/20050121/05_all_muttng.diff 2293
-MD5 49c5f3ad15cbf56b194b4fa56bbe8342 files/20050121/06_all_tar.diff 347
+MD5 62b71378eedd5eb85a0a62c8e9e09ca4 files/digest-bash-completion-20050712 76
 MD5 d53ba451ff7064515327649c28ec37fb files/20050121/08_all_lvm.diff 868
 MD5 bc7bb8b50049a7c6d412b60b273b55d4 files/20050121/01_all_gkrellm.diff 246
+MD5 61f83b8578faa6f1d522ce1a9411e0cd files/20050121/05_all_muttng.diff 2293
+MD5 a5a7bf3f82466146a212f2e54a5bb1d9 files/20050121/02_all_cvs.diff 772
 MD5 5a5965b5055a1d6ee5d7ae884bc0cc18 files/20050121/07_all_find.diff 947
-MD5 bb517a3e3dea3755291f4629330481f2 files/20050121/09_all_command.diff 492
+MD5 ffcc2a25851c78eed228d5bf9a34a471 files/20050121/03_all_timidity.diff 844
+MD5 49c5f3ad15cbf56b194b4fa56bbe8342 files/20050121/06_all_tar.diff 347
 MD5 a68ebcc5af6af06535fcc9895b6066b3 files/20050121/04_all_mplayer.diff 974
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzHXbgIKl8Uu19MoRAucpAJ96TSieXLyKrEjvgXTR+Aw3qHRsTACcCjVd
-RQXtKYvIRiMKXReT72HfU4g=
-=Ar+z
------END PGP SIGNATURE-----
+MD5 bb517a3e3dea3755291f4629330481f2 files/20050121/09_all_command.diff 492
+MD5 bc7bb8b50049a7c6d412b60b273b55d4 files/20050712/01_all_gkrellm.diff 246
+MD5 a5a7bf3f82466146a212f2e54a5bb1d9 files/20050712/02_all_cvs.diff 772
+MD5 5a5965b5055a1d6ee5d7ae884bc0cc18 files/20050712/03_all_find.diff 947
+MD5 bb517a3e3dea3755291f4629330481f2 files/20050712/04_all_command.diff 492
diff --git a/app-shells/bash-completion/bash-completion-20050121-r1.ebuild b/app-shells/bash-completion/bash-completion-20050121-r1.ebuild
deleted file mode 100644
index 08ac24d3932e..000000000000
--- a/app-shells/bash-completion/bash-completion-20050121-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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-r1.ebuild,v 1.8 2005/04/06 11:46:23 ciaranm Exp $
-
-inherit eutils
-
-GENCOMP_VERS="20050117"
-
-DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)"
-HOMEPAGE="http://www.caliban.org/bash/index.shtml#completion"
-SRC_URI="http://www.caliban.org/files/bash/${P}.tar.bz2
-	http://download.berlios.de/gentoo-bashcomp/gentoo-bashcomp-${GENCOMP_VERS}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 ~ppc-macos s390 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/tar
-	app-arch/bzip2"
-RDEPEND="|| (
-				>=app-shells/bash-2.05a
-				app-shells/zsh
-			)"
-
-S="${WORKDIR}/${PN/-/_}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo.diff
-	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-	epatch ${FILESDIR}/gentoo-bashcomp-${GENCOMP_VERS}-equery.diff
-}
-
-src_install() {
-	insinto /etc
-	doins bash_completion || die "failed to install bash_completion"
-	exeinto /etc/profile.d
-	doexe ${FILESDIR}/bash-completion || 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
-
-	# gentoo-bashcomp
-	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-	doins gentoo || die "failed to install gentoo completions"
-	dodir /etc/bash_completion.d
-	dosym ../../usr/share/bash-completion/gentoo /etc/bash_completion.d/gentoo \
-		|| die "dosym gentoo-bashcomp failed"
-	docinto gentoo
-	dodoc AUTHORS TODO
-}
-
-pkg_postinst() {
-	echo
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "activate completion support in your bash:"
-	einfo "[ -f /etc/profile.d/bash-completion ] && . /etc/profile.d/bash-completion"
-	einfo
-	einfo "Additional complete functions can be enabled by symlinking them from"
-	einfo "/usr/share/bash-completion to /etc/bash_completion.d"
-
-	local g="${ROOT}/etc/bash_completion.d/gentoo"
-	if [[ -e "${g}" && ! -L "${g}" ]] ; then
-		echo
-		ewarn "The gentoo completion functions have moved to /usr/share/bash-completion."
-		ewarn "Please run etc-update to replace /etc/bash_completion.d/gentoo with a symlink."
-	fi
-	echo
-
-	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"
-		echo
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-20050712.ebuild b/app-shells/bash-completion/bash-completion-20050712.ebuild
new file mode 100644
index 000000000000..6ba334c050fc
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-20050712.ebuild
@@ -0,0 +1,64 @@
+# 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-20050712.ebuild,v 1.1 2005/07/13 13:17:58 ka0ttic 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-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}/${PV}
+}
+
+src_install() {
+	insinto /etc
+	doins bash_completion || die "failed to install bash_completion"
+	exeinto /etc/profile.d
+	doexe ${FILESDIR}/bash-completion || 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_postinst() {
+	echo
+	einfo "Add the following to the beginning of your ~/.bashrc"
+	einfo "to activate completion support:"
+	einfo
+	einfo "[[ -f /etc/profile.d/bash-completion ]] && \\ "
+	einfo "    source /etc/profile.d/bash-completion"
+	einfo
+	einfo "Additional completion functions can be enabled by installing"
+	einfo "app-admin/eselect and using the included bashcomp module."
+	echo
+
+	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"
+		echo
+	fi
+}
diff --git a/app-shells/bash-completion/files/20050121-gentoo.diff b/app-shells/bash-completion/files/20050121-gentoo.diff
deleted file mode 100644
index 4669dcce62c2..000000000000
--- a/app-shells/bash-completion/files/20050121-gentoo.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- bash_completion.orig	2005-01-20 06:29:03.982356288 -0500
-+++ bash_completion	2005-01-20 06:44:08.957779112 -0500
-@@ -105,7 +105,8 @@
- complete -f -X '!*.@(ogg|OGG|m3u|flac|spx)' ogg123
- complete -f -X '!*.@(mp3|MP3|ogg|OGG|pls|m3u)' gqmpeg freeamp
- complete -f -X '!*.fig' xfig
--complete -f -X '!*.@(mid?(i))' timidity playmidi
-+complete -f -X '!*.@(mid?(i))' playmidi
-+complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity
- complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview
- complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs
- complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine
-@@ -1582,7 +1583,7 @@
- 				COMPREPLY=( $( compgen -W '${changed[@]:-} \
- 						   ${newremoved[@]:-}' -- $cur ) )
- 			else
--				_filedir
-+				COMPREPLY=($(compgen $default -- "$cur"))
- 			fi
- 		else
- 			COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- \
-@@ -5318,7 +5319,7 @@
- 			return 0
- 			;;
- 		-audiofile)
--			_filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV)'
-+			_filedir '@(mp3|MP3|mpg|MPG|ogg|OGG|wav|WAV|mid|MID)'
- 			return 0
- 			;;
- 		-font)
-@@ -5610,7 +5611,7 @@
- 					-xvidencopts -of --verbose' -- $cur) )
- 			;;
- 		*)
--			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV)'
-+			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|mid|MID|ts|TS)'
- 			;;
- 	esac
- 
diff --git a/app-shells/bash-completion/files/20050712/01_all_gkrellm.diff b/app-shells/bash-completion/files/20050712/01_all_gkrellm.diff
new file mode 100644
index 000000000000..d8e92af45d26
--- /dev/null
+++ b/app-shells/bash-completion/files/20050712/01_all_gkrellm.diff
@@ -0,0 +1,8 @@
+--- bash_completion.orig/contrib/gkrellm	2005-04-20 02:19:05.000000000 -0400
++++ bash_completion/contrib/gkrellm	2005-04-20 02:19:21.000000000 -0400
+@@ -33,4 +33,4 @@
+ 	fi
+ 
+ }
+-complete -F _gkrellm gkrellm
++complete -F _gkrellm gkrellm gkrellm2
diff --git a/app-shells/bash-completion/files/20050712/02_all_cvs.diff b/app-shells/bash-completion/files/20050712/02_all_cvs.diff
new file mode 100644
index 000000000000..4273e5272389
--- /dev/null
+++ b/app-shells/bash-completion/files/20050712/02_all_cvs.diff
@@ -0,0 +1,21 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN bash_completion.orig/bash_completion bash_completion/bash_completion
+--- bash_completion.orig/bash_completion	2005-05-18 23:59:24.000000000 -0400
++++ bash_completion/bash_completion	2005-05-19 00:00:21.000000000 -0400
+@@ -1531,7 +1531,7 @@
+ 				for i in ${entries[@]:-}; do
+ 					files=( ${files[@]/#$i//} )
+ 				done
+-				COMPREPLY=( $( compgen -W '${files[@]}' -- \
++				COMPREPLY=( $( compgen -X '*~' -W '${files[@]}' -- \
+ 					       $cur ) )
+ 			fi
+ 		else
+@@ -1584,7 +1584,7 @@
+ 				COMPREPLY=( $( compgen -W '${changed[@]:-} \
+ 						   ${newremoved[@]:-}' -- $cur ) )
+ 			else
+-				_filedir
++				COMPREPLY=( $(compgen $default -- "$cur") )
+ 			fi
+ 		else
+ 			COMPREPLY=( $( compgen -W '-n -R -l -f -F -m -r' -- \
diff --git a/app-shells/bash-completion/files/20050712/03_all_find.diff b/app-shells/bash-completion/files/20050712/03_all_find.diff
new file mode 100644
index 000000000000..84ce8d3fb86b
--- /dev/null
+++ b/app-shells/bash-completion/files/20050712/03_all_find.diff
@@ -0,0 +1,23 @@
+--- bash_completion.orig/bash_completion	2005-04-06 12:19:18.102705608 +0100
++++ bash_completion/bash_completion	2005-04-06 12:23:24.310276368 +0100
+@@ -925,8 +925,8 @@
+ 		_command
+ 		return 0
+ 		;;
+-	-[acm]min|-[acm]time|-?(i)?(l)name|-inum|-?(i)path|-?(i)regex| \
+-	-links|-perm|-size|-used|-printf)
++	-[acm]min|-[acm]time|-?(i)?(l)?(whole)name|-inum|-?(i)path| \
++	-?(i)regex|-links|-perm|-size|-used|-printf)
+ 		# do nothing, just wait for a parameter to be given
+ 		return 0
+ 		;;
+@@ -953,7 +953,8 @@
+ 			-links -lname -mmin -mtime -name -newer -nouser \
+ 			-nogroup -perm -regex -size -true -type -uid -used \
+ 			-user -xtype -exec -fls -fprint -fprint0 -fprintf -ok \
+-			-print -print0 -printf -prune -ls' -- $cur ) )
++			-print -print0 -printf -prune -ls -wholename \
++			-iwholename' -- $cur ) )
+ 
+ 	# this removes any options from the list of completions that have
+ 	# already been specified somewhere on the command line, as long as
diff --git a/app-shells/bash-completion/files/20050712/04_all_command.diff b/app-shells/bash-completion/files/20050712/04_all_command.diff
new file mode 100644
index 000000000000..1a723b55e566
--- /dev/null
+++ b/app-shells/bash-completion/files/20050712/04_all_command.diff
@@ -0,0 +1,16 @@
+--- bash_completion.orig/bash_completion	2005-05-04 01:01:21.000000000 -0400
++++ bash_completion/bash_completion	2005-05-04 01:15:55.000000000 -0400
+@@ -3024,7 +3024,12 @@
+ 	cmd=${COMP_WORDS[1]}
+ 	    if [[ "$cmd" == -* ]] ; then
+ 		for (( i=1 ; i<=COMP_CWORD ; i++)) ; do
+-		    COMP_WORDS[i]=${COMP_WORDS[i+1]}
++		    if [[ ${i} -lt ${COMP_CWORD} ]] ; then
++			COMP_WORDS[i]=${COMP_WORDS[i+1]}
++		    else
++			done=1
++			break
++		    fi
+ 		done
+ 		COMP_CWORD=$(($COMP_CWORD-1))
+ 	    else 
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050121-r1 b/app-shells/bash-completion/files/digest-bash-completion-20050121-r1
deleted file mode 100644
index 9db0f10e078e..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20050121-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 90140
-MD5 63dfa5f5a71bf494f44b9a6b89771dba gentoo-bashcomp-20050117.tar.bz2 15180
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050712 b/app-shells/bash-completion/files/digest-bash-completion-20050712
new file mode 100644
index 000000000000..f60e47e182bc
--- /dev/null
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050712
@@ -0,0 +1 @@
+MD5 4f38a59eabf97a6dd7db0f10c0ee5063 bash-completion-20050712.tar.bz2 92282
diff --git a/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff b/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff
deleted file mode 100644
index 8dc5cc1bc04b..000000000000
--- a/app-shells/bash-completion/files/gentoo-bashcomp-20050117-equery.diff
+++ /dev/null
@@ -1,119 +0,0 @@
-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
- }
- 
- #