Revision bump; gentoo-bashcomp patch update. See bug 75225. Thanks to Ed Catmur.

5 files changed, 61 insertions, 41 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 9c2b70afc566..c8c607af5c25 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,15 @@
 # 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.93 2005/01/09 01:50:14 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.94 2005/01/12 11:34:36 ka0ttic Exp $
+
+*bash-completion-20050103-r2 (12 Jan 2005)
+
+  12 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/gentoo-bashcomp-20040108.diff,
+  +files/gentoo-bashcomp-20050112.diff, -bash-completion-20050103-r1.ebuild,
+  +bash-completion-20050103-r2.ebuild:
+  Revision bump; gentoo-bashcomp patch update. See bug 75225. Thanks to Ed
+  Catmur.
 
 *bash-completion-20050103-r1 (08 Jan 2005)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 574de3fe61ff..a45f2205c57a 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,27 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5c025c16b6b1214ae6b54beb797a0af1 bash-completion-20041017-r1.ebuild 2265
 MD5 cb7dd2c202fcf41ce6b6f26737254847 bash-completion-20041017-r3.ebuild 2682
+MD5 2ca14a2d1fd770dd80526b5e43a01711 bash-completion-20050103-r2.ebuild 2787
 MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093
-MD5 eb7785c47de55c8e55af6cbc89f3bd25 bash-completion-20050103-r1.ebuild 2746
 MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091
-MD5 aff8e75a028c5940642e7d539c360c71 ChangeLog 14319
+MD5 0a42d5920550df65d4bc37745ccfc9c2 ChangeLog 14654
 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 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
-MD5 6bfeb038d793aa50d7496c6d08913183 files/digest-bash-completion-20050103-r1 152
+MD5 6bfeb038d793aa50d7496c6d08913183 files/digest-bash-completion-20050103-r2 152
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
 MD5 73c3177da25971c1db7bb6482b5d1580 files/digest-bash-completion-20040711 151
 MD5 62c632c282cbbd0b28ba064ec57e2111 files/20050103-gentoo.diff 2060
 MD5 61eddfb92948b070333a59498edf5266 files/20041017-gentoo.diff 2032
-MD5 e37d2cf380b26f330f85ab6485302f6b files/gentoo-bashcomp-20040108.diff 3726
 MD5 49e9f0b0674471ff56169ce7d9265fb2 files/digest-bash-completion-20040704-r1 151
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB4JANEZCkKN40op4RAu9KAKCs1wK674802H53ZKtqht3/gfo3tgCguv4C
-fCZWj12l2JEqhSA1ms8QSCw=
-=kPg5
------END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20050103-r1.ebuild b/app-shells/bash-completion/bash-completion-20050103-r2.ebuild
index 7692d4992938..b3e9b41e4566 100644
--- a/app-shells/bash-completion/bash-completion-20050103-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-20050103-r2.ebuild
@@ -1,10 +1,11 @@
 # 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-r1.ebuild,v 1.1 2005/01/09 01:50:14 ka0ttic Exp $
+# $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 $
 
 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"
@@ -30,7 +31,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo.diff
 	cd ${WORKDIR}/gentoo-bashcomp-${GENCOMP_VERS}
-	epatch ${FILESDIR}/gentoo-bashcomp-20040108.diff
+	epatch ${FILESDIR}/gentoo-bashcomp-${GENCOMP_PATCHVERS}.diff
 }
 
 src_install() {
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20050103-r1 b/app-shells/bash-completion/files/digest-bash-completion-20050103-r2
index 771839999aae..771839999aae 100644
--- a/app-shells/bash-completion/files/digest-bash-completion-20050103-r1
+++ b/app-shells/bash-completion/files/digest-bash-completion-20050103-r2
diff --git a/app-shells/bash-completion/files/gentoo-bashcomp-20040108.diff b/app-shells/bash-completion/files/gentoo-bashcomp-20050112.diff
index 5f97f595a058..627c0c52a215 100644
--- a/app-shells/bash-completion/files/gentoo-bashcomp-20040108.diff
+++ b/app-shells/bash-completion/files/gentoo-bashcomp-20050112.diff
@@ -1,6 +1,6 @@
---- gentoo-bashcomp-1.0_beta4/src/gentoo	2004-12-05 23:56:32.000000000 -0500
-+++ gentoo-bashcomp/src/gentoo	2005-01-08 20:57:40.681998239 -0500
-@@ -13,7 +13,7 @@
+--- 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()
  {
@@ -9,7 +9,7 @@
  		/etc/make.conf /etc/make.globals
  }
  
-@@ -273,7 +273,7 @@
+@@ -272,7 +272,7 @@
  	cur=${COMP_WORDS[COMP_CWORD]}
  	if [ $COMP_CWORD -eq 1 ]; then
  		#COMPREPLY=($(compgen -o filenames -X "!*.ebuild" $cur))
@@ -18,16 +18,38 @@
  	elif [ $COMP_CWORD -eq 2 ]; then
  		COMPREPLY=($(compgen -W 'clean compile config \
  			depend digest \
-@@ -295,7 +295,7 @@
+@@ -292,10 +292,27 @@
+ }
+ 
  #
- # simple completion for Gentoo style init
+-# simple completion for Gentoo style init
++# Gentoo init.d completion
  #
 -complete -W "start stop restart pause zap ineed needsme iuse usesme broken" \
-+complete -W "start stop restart pause zap status ineed needsme iuse usesme broken" \
- 	$(for i in /etc/init.d/*; do echo ${i##*/}; done)
+-	$(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/*
  
  #
-@@ -731,7 +731,7 @@
+ # rc completion command
+@@ -730,7 +747,7 @@
  	for i in "${COMP_WORDS[@]}"; do
  		if [ $j -lt $COMP_CWORD ]; then
  			j=$((j + 1))
@@ -36,7 +58,7 @@
  				mode=$i
  				;;
  			esac
-@@ -746,11 +746,11 @@
+@@ -745,11 +762,11 @@
  					COMPREPLY=($(compgen -W "-q --quiet -C --nocolor -h --help -V --version" -- $cur))
  					;;
  				*)
@@ -50,7 +72,7 @@
  			# These commands have not been implemented in 'equery' yet ...
  			echo -n "# Not implemented! "
  			;;
-@@ -830,12 +830,35 @@
+@@ -829,9 +846,32 @@
  						COMPREPLY=($(compgen -W "-U --no-useflags -l --linear" -- $cur))
  						;;
  					*)
@@ -58,10 +80,10 @@
 -						_pkgname -A $cur
 +						# Complete on installed package names.
 +						_pkgname -I $cur
- 						;;
- 				esac
- 			fi
- 			;;
++						;;
++				esac
++			fi
++			;;
 +		depends)
 +			# Only complete if the previous entry on the command line is not
 +			# a package name.
@@ -69,7 +91,7 @@
 +				case $cur in
 +					-*)
 +						COMPREPLY=($(compgen -W "-a --all-packages -d --direct -D --indirect" -- $cur))
-+						;;
+ 						;;
 +					*)
 +						case $prev in
 +						    -a|--all-packages)
@@ -82,13 +104,10 @@
 +							    ;;
 +
 +						esac
-+				esac
-+			fi
-+			;;
- 		check)
- 			# Only complete if the previous entry on the command line is not
- 			# a package name.
-@@ -859,12 +882,32 @@
+ 				esac
+ 			fi
+ 			;;
+@@ -858,12 +898,33 @@
  				esac
  			fi
  			;;
@@ -115,8 +134,9 @@
  complete -F _equery -o filenames equery
  }
  
++#
 +# ekeyword completion
-+# contributed by Ciaran McCreesh <ciaranm@gentoo.org>
++#
 +
  have ekeyword && {
  _ekeyword()