Revision bump; new gentoo-bashcomp release.

(Portage version: 2.0.51-r13)

8 files changed, 25 insertions, 301 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index c46a8419df60..abe984f278d6 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,14 @@
 # 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.96 2005/01/18 00:22:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.97 2005/01/18 00:42:27 ka0ttic Exp $
+
+*bash-completion-20050112-r1 (17 Jan 2005)
+
+  17 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/20050103-gentoo.diff, -files/gentoo-bashcomp-20050112.diff,
+  -bash-completion-20050103-r2.ebuild, +bash-completion-20050112-r1.ebuild,
+  -bash-completion-20050112.ebuild:
+  Revision bump; new gentoo-bashcomp release.
 
   18 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
   bash-completion-20041017-r3.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 6bb0947d9c98..3b23845323ab 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,30 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9f2287e69aba6e5ac342c5ae3bb955a3 bash-completion-20050103-r2.ebuild 2787
-MD5 98d09cb72a59b1116b890bf503978985 ChangeLog 14944
-MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093
+MD5 41434a7aa829b72605325a90c5c3bac2 bash-completion-20050112-r1.ebuild 2695
+MD5 5c025c16b6b1214ae6b54beb797a0af1 bash-completion-20041017-r1.ebuild 2265
 MD5 e960befabcf54165d9a1851fcca4b17e bash-completion-20041017-r3.ebuild 2681
-MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
-MD5 8f0244373a6236caaf8dec93b7f54f3d bash-completion-20050112.ebuild 2784
+MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093
 MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091
-MD5 5c025c16b6b1214ae6b54beb797a0af1 bash-completion-20041017-r1.ebuild 2265
-MD5 e28f67bfedacaea6b188a01b00d231de files/digest-bash-completion-20050112 152
-MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
-MD5 62c632c282cbbd0b28ba064ec57e2111 files/20050103-gentoo.diff 2060
-MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
+MD5 e163eee141ef628d36488ae33e3fb1a5 ChangeLog 15265
+MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
 MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017-r1 152
-MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151
-MD5 6492c00ec4dae35750b6e391a3e4e41c files/gentoo-bashcomp-20050112.diff 4246
 MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152
-MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
-MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
-MD5 6bfeb038d793aa50d7496c6d08913183 files/digest-bash-completion-20050103-r2 152
 MD5 62c632c282cbbd0b28ba064ec57e2111 files/20050112-gentoo.diff 2060
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB7FbsugEuf3OQ0akRAiyvAJ416EJx9mKZtmmQ7/feUpDxgLR1tQCbBPs0
-JYfDnN8ZENHnVFAobyLBJHU=
-=DdDY
------END PGP SIGNATURE-----
+MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
+MD5 fe7237a19c3586f2a331066b19b287ee files/digest-bash-completion-20050112-r1 152
+MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
+MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151
+MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
+MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
diff --git a/app-shells/bash-completion/bash-completion-20050103-r2.ebuild b/app-shells/bash-completion/bash-completion-20050112-r1.ebuild
index b3e9b41e4566..0de520dba224 100644
--- a/app-shells/bash-completion/bash-completion-20050103-r2.ebuild
+++ b/app-shells/bash-completion/bash-completion-20050112-r1.ebuild
@@ -1,16 +1,15 @@
 # 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-20050103-r2.ebuild,v 1.1 2005/01/12 11:34:36 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050112-r1.ebuild,v 1.1 2005/01/18 00:42:27 ka0ttic Exp $
 
 inherit eutils
 
-GENCOMP_VERS="1.0_beta4"
-GENCOMP_PATCHVERS="20050112"
+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
-	mirror://sourceforge/gentoo-bashcomp/gentoo-bashcomp-${GENCOMP_VERS}.tar.gz"
+	http://download.berlios.de/gentoo-bashcomp/gentoo-bashcomp-${GENCOMP_VERS}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,7 +30,6 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo.diff
 	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-	epatch ${FILESDIR}/gentoo-bashcomp-${GENCOMP_PATCHVERS}.diff
 }
 
 src_install() {
@@ -49,7 +47,7 @@ src_install() {
 
 	# gentoo-bashcomp
 	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-	doins src/gentoo || die "failed to install gentoo completions"
+	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"
diff --git a/app-shells/bash-completion/bash-completion-20050112.ebuild b/app-shells/bash-completion/bash-completion-20050112.ebuild
deleted file mode 100644
index babccf0933e8..000000000000
--- a/app-shells/bash-completion/bash-completion-20050112.ebuild
+++ /dev/null
@@ -1,84 +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-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/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()
- {