Revision bump; new gentoo-bashcomp release.

Package-Manager: portage-2.0.51-r13

4 files changed, 1 insertions, 185 deletions

diff --git a/app-shells/bash-completion/files/20050103-gentoo.diff b/app-shells/bash-completion/files/20050103-gentoo.diff
deleted file mode 100644
index 0e2f0a239a86..000000000000
--- a/app-shells/bash-completion/files/20050103-gentoo.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN bash_completion.orig/bash_completion bash_completion/bash_completion
---- bash_completion.orig/bash_completion	2005-01-04 06:37:22.323617704 -0500
-+++ bash_completion/bash_completion	2005-01-04 06:44:00.703054824 -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
-@@ -5260,7 +5261,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)
-@@ -5552,7 +5553,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 -urN bash_completion.orig/contrib/gkrellm bash_completion/contrib/gkrellm
---- bash_completion.orig/contrib/gkrellm	2005-01-04 06:37:22.306620288 -0500
-+++ bash_completion/contrib/gkrellm	2005-01-04 06:38:09.936379464 -0500
-@@ -34,3 +34,4 @@
- 
- }
- complete -F _gkrellm gkrellm
-+complete -F _gkrellm gkrellm2
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050103-r2 b/app-shells/bash-completion/files/digest-bash-completion-20050103-r2
deleted file mode 100644
index 771839999aae..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20050103-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0ee7009b18ff862f8a63c2395e5fd100 bash-completion-20050103.tar.bz2 89246
-MD5 d6d22c935ff339c2ebcc0757f5d306d0 gentoo-bashcomp-1.0_beta4.tar.gz 15477
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050112 b/app-shells/bash-completion/files/digest-bash-completion-20050112-r1
index 2fd04a51946b..4a4fe73cb711 100644
--- a/app-shells/bash-completion/files/digest-bash-completion-20050112
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050112-r1
@@ -1,2 +1,2 @@
 MD5 82fbd64d75fb9942519763c7188407e7 bash-completion-20050112.tar.bz2 89401
-MD5 d6d22c935ff339c2ebcc0757f5d306d0 gentoo-bashcomp-1.0_beta4.tar.gz 15477
+MD5 63dfa5f5a71bf494f44b9a6b89771dba gentoo-bashcomp-20050117.tar.bz2 15180
diff --git a/app-shells/bash-completion/files/gentoo-bashcomp-20050112.diff b/app-shells/bash-completion/files/gentoo-bashcomp-20050112.diff
deleted file mode 100644
index 627c0c52a215..000000000000
--- a/app-shells/bash-completion/files/gentoo-bashcomp-20050112.diff
+++ /dev/null
@@ -1,143 +0,0 @@
---- gentoo-bashcomp-1.0_beta4/src/gentoo	2005-01-12 06:26:08.380227552 -0500
-+++ gentoo-bashcomp/src/gentoo	2005-01-12 06:25:05.153839424 -0500
-@@ -12,7 +12,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
- }
- 
-@@ -272,7 +272,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 \
-@@ -292,10 +292,27 @@
- }
- 
- #
--# simple completion for Gentoo style init
-+# Gentoo init.d completion
- #
--complete -W "start stop restart pause zap ineed needsme iuse usesme broken" \
--	$(for i in /etc/init.d/*; do echo ${i##*/}; done)
-+
-+_gentoo_style_init()
-+{
-+	local script="${COMP_WORDS[0]}"
-+	local cur="${COMP_WORDS[$COMP_CWORD]}"
-+
-+	if [[ ( -f "${script}" || -h "${script}" ) && -r "${script}" ]] \
-+	&& [[ "${script}" != *.sh ]] \
-+	&& [[ "$(head -n 1 "${script}")" = "#!/sbin/runscript" ]]; then
-+		[[ $COMP_CWORD -gt 1 ]] && return 1
-+		COMPREPLY=($(opts="start stop status restart pause zap ineed needsme iuse usesme broken"; eval "$(grep '^opts=' "${script}")"; echo "${opts}"))
-+		[[ "$COMPREPLY" ]] || COMPREPLY=(start stop restart zap)
-+		COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "${cur}"))
-+	else
-+		COMPREPLY=($(compgen -o default -- "${cur}"))
-+	fi
-+	return 0
-+}
-+complete -F _gentoo_style_init /etc/init.d/*
- 
- #
- # rc completion command
-@@ -730,7 +747,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
-@@ -745,11 +762,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! "
- 			;;
-@@ -829,9 +846,32 @@
- 						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
- 			;;
-@@ -858,12 +898,33 @@
- 				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
-+#
-+
- have ekeyword && {
- _ekeyword()
- {