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.

8 files changed, 73 insertions, 99 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 848cfe79a638..c05b12e99c56 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.81 2004/11/15 15:34:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.82 2004/11/27 09:42:59 ka0ttic Exp $
+
+*bash-completion-20041017-r2 (27 Nov 2004)
+
+  27 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/20041017-gentoo.diff, -bash-completion-20040704.ebuild,
+  bash-completion-20041017-r1.ebuild, +bash-completion-20041017-r2.ebuild,
+  -bash-completion-20041017.ebuild:
+  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.
 
   15 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
   bash-completion-20041017-r1.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index bba0f94c287c..b738be76c09e 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,23 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8fec3a89ed490aa10f450d0ef0f846f0 bash-completion-20041017-r1.ebuild 2267
+MD5 f27d094579249172566197402963bfa0 bash-completion-20041017-r1.ebuild 2266
 MD5 50f43407f43fdbbfa26b4d63f947497a bash-completion-20040711.ebuild 2088
-MD5 f6bee54f0c35dc47430924ecb49c03fb bash-completion-20040704.ebuild 2092
+MD5 a0448c365c10abc3d81edf1d4622ee4f bash-completion-20041017-r2.ebuild 2361
 MD5 7d4aeaf81dd9f767c41a81c3e47d01a2 bash-completion-20040704-r1.ebuild 2087
-MD5 c81da5bd1940ed64600a2e3c91623769 ChangeLog 11669
+MD5 7253ec998c71f88dc6d055554b6d2aa6 ChangeLog 12169
 MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
-MD5 3790b4d8b911d7cb16effa66acdc6e93 bash-completion-20041017.ebuild 2123
 MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017-r1 152
+MD5 23f48288589834ae8496f6dc07d0d689 files/digest-bash-completion-20041017-r2 152
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
-MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704 151
 MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151
-MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017 152
+MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
 MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBmMxyEZCkKN40op4RAgFEAJ9Ulv5Ef3iuiZQrkOHscrmJRZ5KYACfflvM
-1ZtCmwIsBZmJ9kCAbl/pgqQ=
-=yGl1
------END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20040704.ebuild b/app-shells/bash-completion/bash-completion-20040704.ebuild
deleted file mode 100644
index 8c57436fa9c9..000000000000
--- a/app-shells/bash-completion/bash-completion-20040704.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20040704.ebuild,v 1.2 2004/10/31 01:33:14 vapier Exp $
-
-GENCOMP_VERS="1.0_beta"
-
-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
-	mirror://sourceforge/gentoo-bashcomp/gentoo-bashcomp-${GENCOMP_VERS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-arch/tar
-	app-arch/bzip2"
-RDEPEND=">=app-shells/bash-2.05a"
-
-S=${WORKDIR}/${PN/-/_}
-
-src_install() {
-	insinto /etc
-	doins bash_completion
-
-	insinto /usr/share/bash-completion
-	doins contrib/*
-
-	exeinto /etc/profile.d
-	doexe ${FILESDIR}/bash-completion
-
-	dodoc Changelog README
-
-	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-	insinto /etc/bash_completion.d
-	doins src/gentoo
-
-	docinto gentoo
-	dodoc AUTHORS NEWS 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 ] && source /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"
-
-	if [ -f ${ROOT}/etc/bash_completion.d/gentoo.completion ]
-	then
-		echo
-		ewarn "The file 'gentoo.completion' in '/etc/bash_completion.d/' has been"
-		ewarn "replaced with 'gentoo'. Remove gentoo.completion to avoid problems."
-	fi
-
-	local bcfile moved
-	for bcfile in ${ROOT}/etc/bash_completion.d/{unrar,harbour,isql,larch,lilypond,p4,ri}
-	do
-
-		[ -f "${bcfile}" -a ! -L "${bcfile}" ] && moved="${bcfile##*/} ${moved}"
-	done
-
-	if [ -n "${moved}" ]
-	then
-		echo
-		ewarn "The contrib files: ${moved}"
-		ewarn "have been moved to /usr/share/bash-completion. Please DELETE"
-		ewarn "those old files in /etc/bash_completion.d and create symlinks."
-	fi
-	echo
-}
diff --git a/app-shells/bash-completion/bash-completion-20041017-r1.ebuild b/app-shells/bash-completion/bash-completion-20041017-r1.ebuild
index cb552a23af4f..485c62d11073 100644
--- a/app-shells/bash-completion/bash-completion-20041017-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-20041017-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017-r1.ebuild,v 1.2 2004/11/15 15:34:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017-r1.ebuild,v 1.3 2004/11/27 09:42:59 ka0ttic Exp $
 
 GENCOMP_VERS="1.0_beta2"
 
@@ -11,7 +11,7 @@ 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 ~s390 ~sparc ~x86 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~s390 ~sparc x86 ~ppc64"
 IUSE=""
 
 DEPEND="app-arch/tar
diff --git a/app-shells/bash-completion/bash-completion-20041017.ebuild b/app-shells/bash-completion/bash-completion-20041017-r2.ebuild
index 2445c1f5142d..887f85af16e4 100644
--- a/app-shells/bash-completion/bash-completion-20041017.ebuild
+++ b/app-shells/bash-completion/bash-completion-20041017-r2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017.ebuild,v 1.4 2004/11/04 17:27:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017-r2.ebuild,v 1.1 2004/11/27 09:42:59 ka0ttic Exp $
 
-GENCOMP_VERS="1.0_beta2"
+inherit eutils
+
+GENCOMP_VERS="1.0_beta3"
 
 DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)"
 HOMEPAGE="http://www.caliban.org/bash/index.shtml#completion"
@@ -20,10 +22,19 @@ RDEPEND=">=app-shells/bash-2.05a"
 
 S=${WORKDIR}/${PN/-/_}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gentoo.diff
+}
+
 src_install() {
 	insinto /etc
 	doins bash_completion
 
+	# >=dev-util/subversion-1.1.1-r3 provides extremely superior completions
+	has_version ">=dev-util/subversion-1.1.1-r3" && rm contrib/subversion
+
 	insinto /usr/share/bash-completion
 	doins contrib/*
 
@@ -44,7 +55,7 @@ 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 ] && source /etc/profile.d/bash-completion"
+	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"
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