New upstream release.

5 files changed, 139 insertions, 5 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index c8c607af5c25..e553154ea92b 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,12 @@
 # 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.94 2005/01/12 11:34:36 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.95 2005/01/13 12:30:50 ka0ttic Exp $
+
+*bash-completion-20050112 (13 Jan 2005)
+
+  13 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/20050112-gentoo.diff, +bash-completion-20050112.ebuild:
+  New upstream release.
 
 *bash-completion-20050103-r2 (12 Jan 2005)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 8d66c00e307e..0d5166323807 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -5,23 +5,26 @@ MD5 5c025c16b6b1214ae6b54beb797a0af1 bash-completion-20041017-r1.ebuild 2265
 MD5 cb7dd2c202fcf41ce6b6f26737254847 bash-completion-20041017-r3.ebuild 2682
 MD5 9f2287e69aba6e5ac342c5ae3bb955a3 bash-completion-20050103-r2.ebuild 2787
 MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093
+MD5 8f0244373a6236caaf8dec93b7f54f3d bash-completion-20050112.ebuild 2784
 MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091
-MD5 10688ffacf600ea998918eb079517297 ChangeLog 14654
+MD5 3db0c6b3e2308df066b6a476968bd45b ChangeLog 14834
 MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
 MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017-r1 152
 MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152
 MD5 6492c00ec4dae35750b6e391a3e4e41c files/gentoo-bashcomp-20050112.diff 4246
+MD5 62c632c282cbbd0b28ba064ec57e2111 files/20050112-gentoo.diff 2060
 MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
 MD5 6bfeb038d793aa50d7496c6d08913183 files/digest-bash-completion-20050103-r2 152
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
 MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151
+MD5 e28f67bfedacaea6b188a01b00d231de files/digest-bash-completion-20050112 152
 MD5 62c632c282cbbd0b28ba064ec57e2111 files/20050103-gentoo.diff 2060
 MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
 MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5QueEZCkKN40op4RAps1AJ0Ydf6oTgddUEybubUTp4q2JvKy4wCgt0ex
-PNuxfGtZ/B+jcFScUnJxn4I=
-=CiMA
+iD8DBQFB5moEEZCkKN40op4RAkgQAJ9725Wpdgv5UlKSfCxnHua4slYknwCgrnro
+w/VOsZQA+RQskrsoY2Ml0wo=
+=X1NJ
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20050112.ebuild b/app-shells/bash-completion/bash-completion-20050112.ebuild
new file mode 100644
index 000000000000..babccf0933e8
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-20050112.ebuild
@@ -0,0 +1,84 @@
+# 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-20050112.ebuild,v 1.1 2005/01/13 12:30:50 ka0ttic Exp $
+
+inherit eutils
+
+GENCOMP_VERS="1.0_beta4"
+GENCOMP_PATCHVERS="20050112"
+
+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 ~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_PATCHVERS}.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-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/* || die "failed to install contrib completions"
+
+	dodoc Changelog README
+
+	# gentoo-bashcomp
+	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
+	doins src/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/files/20050112-gentoo.diff b/app-shells/bash-completion/files/20050112-gentoo.diff
new file mode 100644
index 000000000000..0e2f0a239a86
--- /dev/null
+++ b/app-shells/bash-completion/files/20050112-gentoo.diff
@@ -0,0 +1,39 @@
+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-20050112 b/app-shells/bash-completion/files/digest-bash-completion-20050112
new file mode 100644
index 000000000000..2fd04a51946b
--- /dev/null
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050112
@@ -0,0 +1,2 @@
+MD5 82fbd64d75fb9942519763c7188407e7 bash-completion-20050112.tar.bz2 89401
+MD5 d6d22c935ff339c2ebcc0757f5d306d0 gentoo-bashcomp-1.0_beta4.tar.gz 15477