Revision bump; new gentoo-bashcomp release. Also, added gentoo patch for extra filetypes support for .ts (bug 67201) and others. Fixed gkrellm completion to complete for gkrellm2 as well. Marked 20041017-r1 stable on x86.

3 files changed, 40 insertions, 3 deletions

diff --git a/app-shells/bash-completion/files/20041017-gentoo.diff b/app-shells/bash-completion/files/20041017-gentoo.diff
new file mode 100644
index 000000000000..f1c5eb855e00
--- /dev/null
+++ b/app-shells/bash-completion/files/20041017-gentoo.diff
@@ -0,0 +1,39 @@
+diff -urN bash_completion.orig/bash_completion bash_completion/bash_completion
+--- bash_completion.orig/bash_completion	2004-11-27 04:26:41.356337311 -0500
++++ bash_completion/bash_completion	2004-11-27 04:27:07.461009682 -0500
+@@ -104,7 +104,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
+@@ -4693,7 +4694,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)
+@@ -4985,7 +4986,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|RM|ram|RAM|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|RM|ram|RAM|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	2004-11-27 04:26:41.354337642 -0500
++++ bash_completion/contrib/gkrellm	2004-11-27 04:33:27.155938637 -0500
+@@ -34,3 +34,4 @@
+ 
+ }
+ complete -F _gkrellm gkrellm
++complete -F _gkrellm gkrellm2
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20040704 b/app-shells/bash-completion/files/digest-bash-completion-20040704
deleted file mode 100644
index 71d744fd8807..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20040704
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1a0991f4ff892ed6fed1c6cf39ee7022 bash-completion-20040704.tar.bz2 82544
-MD5 8776015ce9bbf116e34a149ef0846c85 gentoo-bashcomp-1.0_beta.tar.gz 13346
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20041017 b/app-shells/bash-completion/files/digest-bash-completion-20041017-r2
index 192b9cf05a2b..7e8362f97797 100644
--- a/app-shells/bash-completion/files/digest-bash-completion-20041017
+++ b/app-shells/bash-completion/files/digest-bash-completion-20041017-r2
@@ -1,2 +1,2 @@
 MD5 3fd0836127d01606a9dc4262f3e2e1fb bash-completion-20041017.tar.bz2 86227
-MD5 1d4fb21337ed341334188fed97fa0745 gentoo-bashcomp-1.0_beta2.tar.gz 15025
+MD5 5ea2243f1e08c50d7ee1d0388afd0f47 gentoo-bashcomp-1.0_beta3.tar.gz 15059