Version bump. Fix for bug #36910. Removed old versions. Fixed year in copyright header.

11 files changed, 64 insertions, 25 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 75f6be0d5f55..38fc8ce5b85d 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.50 2003/12/25 11:46:50 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.51 2004/01/04 16:40:57 joker Exp $
+
+*bash-completion-20040101 (04 Jan 2004)
+
+  04 Jan 2004; Christian Birchinger <joker@gentoo.org>
+  bash-completion-20040101.ebuild, files/gentoo.completion,
+  files/gentoo.completion-20040101:
+  Version bump and fix for bug #36910
 
 *bash-completion-20031225 (25 Dec 2003)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 42dc8a161e01..58eff562e014 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,13 +1,13 @@
-MD5 3055eb5bea9721822a0d7f49691566a4 ChangeLog 6780
-MD5 fad70e9b2b45ec8846f83b565fe812e4 bash-completion-20031225.ebuild 1478
-MD5 441d0966dd93e10f2f710b8a2bf3e08a bash-completion-20031215.ebuild 1470
+MD5 00576bd3d1d81487791db6f922b25454 ChangeLog 7011
+MD5 c1fd20c5c38900865146f364f2472a56 bash-completion-20031225.ebuild 1478
+MD5 badb994fceee48f4f44f01794d624bc9 bash-completion-20031215.ebuild 1470
 MD5 1dc8e7503e7e350f3382d37b612178cc metadata.xml 1023
-MD5 f0b200452477f05371b05c637e08107c bash-completion-20031125.ebuild 1458
+MD5 2152937d826819a5b42a0260aa175078 bash-completion-20040101.ebuild 1478
 MD5 c85a85bd33aac22ae4872c85733e581f files/README.gentoo 491
-MD5 9b22241df7258cb9677cf9a1497e07c5 files/bash-completion 625
-MD5 3c7995eee919c34f968dcde5d7b05ae0 files/digest-bash-completion-20031125 76
+MD5 38a707ba9274991e61239ce569e840ff files/bash-completion 623
+MD5 e64a9d70ece3d6edcde031cea71617bb files/digest-bash-completion-20040101 76
 MD5 b8d28a6cbf61ef90046af1b20810498b files/digest-bash-completion-20031225 76
 MD5 e305c1d5975de631e7be98e887a893e2 files/digest-bash-completion-20031215 76
-MD5 f96c9b92f176d02ecb313feb104f8af1 files/gentoo.completion 15731
-MD5 53adaff03778976e18fbc32c4ae59387 files/gentoo.completion-20031225 16310
-MD5 53adaff03778976e18fbc32c4ae59387 files/gentoo.completion-20031215 16310
+MD5 934fe6aa56dbe4fc4008c4d9ef1ec6fc files/gentoo.completion-20031225 16310
+MD5 934fe6aa56dbe4fc4008c4d9ef1ec6fc files/gentoo.completion-20031215 16310
+MD5 07cfbd320ed881dcaeb8bd868cf5e06e files/gentoo.completion-20040101 16380
diff --git a/app-shells/bash-completion/bash-completion-20031215.ebuild b/app-shells/bash-completion/bash-completion-20031215.ebuild
index 08a1a2c6cfb5..db34b526d8b5 100644
--- a/app-shells/bash-completion/bash-completion-20031215.ebuild
+++ b/app-shells/bash-completion/bash-completion-20031215.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20031215.ebuild,v 1.2 2003/12/25 11:46:50 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20031215.ebuild,v 1.3 2004/01/04 16:40:57 joker Exp $
 
 S=${WORKDIR}/${PN/-/_}
 DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)."
diff --git a/app-shells/bash-completion/bash-completion-20031225.ebuild b/app-shells/bash-completion/bash-completion-20031225.ebuild
index a5d96cb7ad59..c49f488df51d 100644
--- a/app-shells/bash-completion/bash-completion-20031225.ebuild
+++ b/app-shells/bash-completion/bash-completion-20031225.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20031225.ebuild,v 1.1 2003/12/25 11:46:50 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20031225.ebuild,v 1.2 2004/01/04 16:40:57 joker Exp $
 
 S=${WORKDIR}/${PN/-/_}
 DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)."
diff --git a/app-shells/bash-completion/bash-completion-20031125.ebuild b/app-shells/bash-completion/bash-completion-20040101.ebuild
index 5b5650e686b4..43bee6248506 100644
--- a/app-shells/bash-completion/bash-completion-20031125.ebuild
+++ b/app-shells/bash-completion/bash-completion-20040101.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20031125.ebuild,v 1.2 2003/12/13 17:33:00 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20040101.ebuild,v 1.1 2004/01/04 16:40:57 joker Exp $
 
 S=${WORKDIR}/${PN/-/_}
 DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)."
@@ -9,7 +9,7 @@ SRC_URI="http://www.caliban.org/files/bash/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64"
 
 DEPEND="app-arch/tar
 	app-arch/bzip2"
@@ -30,7 +30,7 @@ src_install() {
 	doins contrib/p4
 	doins contrib/ri
 
-	newins ${FILESDIR}/gentoo.completion gentoo
+	newins ${FILESDIR}/gentoo.completion-${PVR/-r0/} gentoo
 
 	insinto /etc/profile.d
 	doins ${FILESDIR}/bash-completion
diff --git a/app-shells/bash-completion/files/bash-completion b/app-shells/bash-completion/files/bash-completion
index ba91d940f4f2..83d9d07549d0 100644
--- a/app-shells/bash-completion/files/bash-completion
+++ b/app-shells/bash-completion/files/bash-completion
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion,v 1.1 2002/06/20 18:57:59 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion,v 1.2 2004/01/04 16:40:57 joker Exp $
 #
 # START bash completion -- do not remove this line
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20031125 b/app-shells/bash-completion/files/digest-bash-completion-20031125
deleted file mode 100644
index 09228e9de058..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20031125
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56a19bf89972f2d6e129933e7d76d626 bash-completion-20031125.tar.bz2 72975
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20040101 b/app-shells/bash-completion/files/digest-bash-completion-20040101
new file mode 100644
index 000000000000..9aa580dd8464
--- /dev/null
+++ b/app-shells/bash-completion/files/digest-bash-completion-20040101
@@ -0,0 +1 @@
+MD5 7e11b9aa5e1be10ed5d6d1fd71437f0a bash-completion-20040101.tar.bz2 77154
diff --git a/app-shells/bash-completion/files/gentoo.completion-20031215 b/app-shells/bash-completion/files/gentoo.completion-20031215
index bce5ae4c1235..c9f152520d7e 100644
--- a/app-shells/bash-completion/files/gentoo.completion-20031215
+++ b/app-shells/bash-completion/files/gentoo.completion-20031215
@@ -2,7 +2,7 @@
 #
 # Gentoo Linux command completion.
 #
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 #
 # Author: Geert Bevin  <gbevin@theleaf.be>
diff --git a/app-shells/bash-completion/files/gentoo.completion-20031225 b/app-shells/bash-completion/files/gentoo.completion-20031225
index bce5ae4c1235..c9f152520d7e 100644
--- a/app-shells/bash-completion/files/gentoo.completion-20031225
+++ b/app-shells/bash-completion/files/gentoo.completion-20031225
@@ -2,7 +2,7 @@
 #
 # Gentoo Linux command completion.
 #
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 #
 # Author: Geert Bevin  <gbevin@theleaf.be>
diff --git a/app-shells/bash-completion/files/gentoo.completion b/app-shells/bash-completion/files/gentoo.completion-20040101
index 2540f5ece742..076e220d43a5 100644
--- a/app-shells/bash-completion/files/gentoo.completion
+++ b/app-shells/bash-completion/files/gentoo.completion-20040101
@@ -2,7 +2,7 @@
 #
 # Gentoo Linux command completion.
 #
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 #
 # Author: Geert Bevin  <gbevin@theleaf.be>
@@ -10,6 +10,36 @@
 #
 
 #
+# rc & rc-status completion command
+#
+_rc()
+{
+	local cur
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	if [ ${#COMP_WORDS[*]} -le 2 ]; then
+		COMPREPLY=( $( compgen -W "$(for i in /etc/runlevels/*; do echo ${i##*/}; done)" -- $cur ) )
+
+	fi
+	return 0
+}
+complete -F _rc rc
+
+_rcstatus()
+{
+	local cur opts
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	if [ ${#COMP_WORDS[*]} -le 2 ]; then
+		opts="-a -all -l --list -u --unused"
+		COMPREPLY=( $( compgen -W "${opts} $(for i in /etc/runlevels/*; do echo ${i##*/}; done)" -- $cur ) )
+
+	fi
+	return 0
+}
+complete -F _rcstatus rc-status
+
+#
 # distcc-config completion command
 #
 _distccconfig()
@@ -256,7 +286,9 @@ _emerge()
 		fi
 
 		if [ "${cur}" ]; then
-			if [ $(echo "${cur}" | grep '/') ]; then
+			if [[ "${cur} " == @('/'|'.'|'~'|'$')* ]]; then
+				COMPREPLY=''
+			elif [ $(echo "${cur}" | grep '/') ]; then
 				setbig=$(compgen -G "${cur}*" | ${sedcmd})"${systemactions}"
 				COMPREPLY=($(echo "${setbig}" | $grepcmd))
 			else