Added 20041017-rcs.diff which fixes a rcs completion issue (see bug 75253); Thanks to Ed Catmur <ed@catmur.co.uk> for the patch. Waiting on a few gentoo-bashcomp bugs to be closed before revbumping to r4.

4 files changed, 36 insertions, 9 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index ea4878fe0601..6549925bb26d 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.89 2005/01/01 15:56:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.90 2005/01/02 16:13:44 ka0ttic Exp $
+
+  02 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/20041017-rcs.diff,
+  bash-completion-20041017-r3.ebuild:
+  Added 20041017-rcs.diff which fixes a rcs completion issue (see bug 75253);
+  Thanks to Ed Catmur <ed@catmur.co.uk> for the patch. Waiting on a few
+  gentoo-bashcomp bugs to be closed before revbumping to r4.
 
   28 Dec 2004; Guy Martin <gmsoft@gentoo.org>
   bash-completion-20041017-r1.ebuild:
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 37d5bfc902b5..46ebd9278792 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,14 +1,15 @@
-MD5 fab7f3a0e661fbd69dfb311c907bf78e ChangeLog 13285
 MD5 5c025c16b6b1214ae6b54beb797a0af1 bash-completion-20041017-r1.ebuild 2265
-MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
-MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091
+MD5 53e3c2e89dd3d6249e8448f638993397 bash-completion-20041017-r3.ebuild 2692
 MD5 1e7793d7236ad87efdd637cb3901f980 bash-completion-20040711.ebuild 2093
 MD5 fa1078f6300ecb232f9dbbc9e1bf6bdb bash-completion-20041017-r2.ebuild 2364
-MD5 af6c7b606c12ae4b42dfdad4be63a20d bash-completion-20041017-r3.ebuild 2657
-MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
+MD5 b14e733dad85348f883a6214d21cfee7 bash-completion-20040704-r1.ebuild 2091
+MD5 6e5406180a3f8167afee43248b22c27b ChangeLog 13610
+MD5 00e8cae3d9ece63e4be61f4a2b3afd5e metadata.xml 930
 MD5 236fd9c517ac5642cae8df109dbaf9f6 files/digest-bash-completion-20041017-r1 152
+MD5 23f48288589834ae8496f6dc07d0d689 files/digest-bash-completion-20041017-r2 152
+MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152
+MD5 b6b11ab0684a97cfd9a9ba78f5fa9f9a files/20041017-rcs.diff 574
+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
-MD5 23f48288589834ae8496f6dc07d0d689 files/digest-bash-completion-20041017-r2 152
-MD5 9aca91cdcddd5454ebc4f17efe465d71 files/digest-bash-completion-20041017-r3 152
diff --git a/app-shells/bash-completion/bash-completion-20041017-r3.ebuild b/app-shells/bash-completion/bash-completion-20041017-r3.ebuild
index 05705af27bbe..c2d9f74e5059 100644
--- a/app-shells/bash-completion/bash-completion-20041017-r3.ebuild
+++ b/app-shells/bash-completion/bash-completion-20041017-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-20041017-r3.ebuild,v 1.3 2005/01/01 15:56:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20041017-r3.ebuild,v 1.4 2005/01/02 16:13:44 ka0ttic Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-gentoo.diff
+	epatch ${FILESDIR}/${PV}-rcs.diff
 }
 
 src_install() {
diff --git a/app-shells/bash-completion/files/20041017-rcs.diff b/app-shells/bash-completion/files/20041017-rcs.diff
new file mode 100644
index 000000000000..75602c017051
--- /dev/null
+++ b/app-shells/bash-completion/files/20041017-rcs.diff
@@ -0,0 +1,19 @@
+--- bash_completion/bash_completion	2004/12/21 21:40:48	1.1
++++ bash_completion/bash_completion	2004/12/21 21:41:49
+@@ -4409,10 +4409,15 @@ _rcs()
+ 
+ 	for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
+ 		file=${COMPREPLY[$i]##*/}
+-		file=${file%,v}
+ 		dir=${COMPREPLY[$i]%RCS/*}
+ 		COMPREPLY[$i]=$dir$file
+ 	done
++	
++	COMPREPLY=( "${COMPREPLY[@]}" $( compgen -G "$dir/$file*,v" ) )
++
++	for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
++		COMPREPLY[$i]=${COMPREPLY[$i]%,v}
++	done
+ 
+ 	# default to files if nothing returned and we're checking in.
+ 	# otherwise, default to directories