New gentoo distcc-config completion feature. Removed old versions.

10 files changed, 49 insertions, 124 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 63631a64676c..d60a6c3caeaa 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.40 2003/09/12 16:14:33 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.41 2003/09/24 22:31:40 joker Exp $
+
+*bash-completion-20030911-r1 (25 Sep 2003)
+
+  25 Sep 2003; Christian Birchinger <joker@gentoo.org>
+  bash-completion-20030505-r1.ebuild, bash-completion-20030713.ebuild,
+  bash-completion-20030721.ebuild, bash-completion-20030911-r1.ebuild,
+  files/gentoo.completion:
+  New gentoo distcc-config completion feature. Removed old versions.
 
 *bash-completion-20030911 (12 Sep 2003)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 3a4df8a77a4c..1c1537b5cde4 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,14 +1,10 @@
-MD5 7f9d716429b44b78ee5160e0a1b8538d ChangeLog 4993
-MD5 822273ec32f2d50fd50a34a3e91fd585 bash-completion-20030505-r1.ebuild 1464
-MD5 404e3e265fe61db29a8d6557f018a9c9 bash-completion-20030713.ebuild 1466
-MD5 4e281359f4e0adb7356cab7bb57b4c5c bash-completion-20030721.ebuild 1466
+MD5 b166e22605a875678eafc00e3a20b9b1 ChangeLog 5331
+MD5 08842292a3c766f25177d4bc7beec53f bash-completion-20030911-r1.ebuild 1461
 MD5 50fcce59b9431ba9f2793307e242816e bash-completion-20030821.ebuild 1458
 MD5 1649be05c198e025a4f55fad21039188 bash-completion-20030911.ebuild 1466
 MD5 c85a85bd33aac22ae4872c85733e581f files/README.gentoo 491
 MD5 9b22241df7258cb9677cf9a1497e07c5 files/bash-completion 625
-MD5 86466a747ec82cd05ba511f06125c947 files/digest-bash-completion-20030505-r1 76
-MD5 3df1918a609a7b2fb8a30f9dd59f552f files/gentoo.completion 15096
-MD5 069e386b2f6e85a4b86d4929bfb1f585 files/digest-bash-completion-20030713 76
-MD5 60d3ff2b99d75697ce01c2ca72ade293 files/digest-bash-completion-20030721 76
+MD5 659a0dbd2bc885c9b718cb86d91f6a16 files/digest-bash-completion-20030911-r1 76
+MD5 f96c9b92f176d02ecb313feb104f8af1 files/gentoo.completion 15731
 MD5 27ea6237a77a7e7edf98246e855b0a82 files/digest-bash-completion-20030821 76
 MD5 659a0dbd2bc885c9b718cb86d91f6a16 files/digest-bash-completion-20030911 76
diff --git a/app-shells/bash-completion/bash-completion-20030713.ebuild b/app-shells/bash-completion/bash-completion-20030713.ebuild
deleted file mode 100644
index 7ecf5b340b0e..000000000000
--- a/app-shells/bash-completion/bash-completion-20030713.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 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-20030713.ebuild,v 1.1 2003/07/18 16:29:52 joker Exp $
-
-S=${WORKDIR}/${PN/-/_}
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64"
-
-DEPEND="sys-apps/tar
-	sys-apps/bzip2"
-
-RDEPEND=">=app-shells/bash-2.05a"
-
-src_install() {
-	insinto /etc
-	doins bash_completion
-
-	insinto /etc/bash_completion.d
-
-	doins contrib/unrar
-	doins contrib/harbour
-	doins contrib/isql
-	doins contrib/larch
-	doins contrib/lilypond
-	doins contrib/p4
-	doins contrib/ri
-
-	newins ${FILESDIR}/gentoo.completion gentoo
-
-	insinto /etc/profile.d
-	doins ${FILESDIR}/bash-completion
-
-	dodoc COPYING Changelog README
-}
-
-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 ] && source /etc/profile.d/bash-completion"
-	echo
-
-	if [ -f /etc/bash_completion.d/gentoo.completion ]
-	then
-		echo
-		ewarn "The file 'gentoo.completion' in '/etc/bash_completion.d/' has been"
-		ewarn "replaced with 'gentoo'. Remove gentoo.completion to avoid problems."
-		echo
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-20030721.ebuild b/app-shells/bash-completion/bash-completion-20030721.ebuild
deleted file mode 100644
index c578fd6f73be..000000000000
--- a/app-shells/bash-completion/bash-completion-20030721.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 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-20030721.ebuild,v 1.1 2003/07/21 12:06:19 joker Exp $
-
-S=${WORKDIR}/${PN/-/_}
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64"
-
-DEPEND="sys-apps/tar
-	sys-apps/bzip2"
-
-RDEPEND=">=app-shells/bash-2.05a"
-
-src_install() {
-	insinto /etc
-	doins bash_completion
-
-	insinto /etc/bash_completion.d
-
-	doins contrib/unrar
-	doins contrib/harbour
-	doins contrib/isql
-	doins contrib/larch
-	doins contrib/lilypond
-	doins contrib/p4
-	doins contrib/ri
-
-	newins ${FILESDIR}/gentoo.completion gentoo
-
-	insinto /etc/profile.d
-	doins ${FILESDIR}/bash-completion
-
-	dodoc COPYING Changelog README
-}
-
-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 ] && source /etc/profile.d/bash-completion"
-	echo
-
-	if [ -f /etc/bash_completion.d/gentoo.completion ]
-	then
-		echo
-		ewarn "The file 'gentoo.completion' in '/etc/bash_completion.d/' has been"
-		ewarn "replaced with 'gentoo'. Remove gentoo.completion to avoid problems."
-		echo
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-20030505-r1.ebuild b/app-shells/bash-completion/bash-completion-20030911-r1.ebuild
index c97100a45f74..e7161fb1b51e 100644
--- a/app-shells/bash-completion/bash-completion-20030505-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-20030911-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-20030505-r1.ebuild,v 1.2 2003/06/22 05:33:05 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20030911-r1.ebuild,v 1.1 2003/09/24 22:31:40 joker Exp $
 
 S=${WORKDIR}/${PN/-/_}
 DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)."
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20030505-r1 b/app-shells/bash-completion/files/digest-bash-completion-20030505-r1
deleted file mode 100644
index 944a25034898..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20030505-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4464d10f2986faa3484ec92269b10479 bash-completion-20030505.tar.bz2 64170
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20030713 b/app-shells/bash-completion/files/digest-bash-completion-20030713
deleted file mode 100644
index 08e1d3ab1e4b..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20030713
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ae25e017d7b80c129888531caf9a1b5 bash-completion-20030713.tar.bz2 65300
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20030721 b/app-shells/bash-completion/files/digest-bash-completion-20030721
deleted file mode 100644
index eaf90929069b..000000000000
--- a/app-shells/bash-completion/files/digest-bash-completion-20030721
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1776b63e25a16e36fb63c9cd215ae343 bash-completion-20030721.tar.bz2 66158
diff --git a/app-shells/bash-completion/files/digest-bash-completion-20030911-r1 b/app-shells/bash-completion/files/digest-bash-completion-20030911-r1
new file mode 100644
index 000000000000..1bda8a1127f4
--- /dev/null
+++ b/app-shells/bash-completion/files/digest-bash-completion-20030911-r1
@@ -0,0 +1 @@
+MD5 594efc56cc2b2d10a6118a6c01bee328 bash-completion-20030911.tar.bz2 71443
diff --git a/app-shells/bash-completion/files/gentoo.completion b/app-shells/bash-completion/files/gentoo.completion
index d3e5e32d83c3..2540f5ece742 100644
--- a/app-shells/bash-completion/files/gentoo.completion
+++ b/app-shells/bash-completion/files/gentoo.completion
@@ -10,12 +10,45 @@
 #
 
 #
+# distcc-config completion command
+#
+_distccconfig()
+{
+	local cur curword numwords opts
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	numwords=${#COMP_WORDS[*]}
+	curword=${COMP_CWORD}
+	if [ ${numwords} -gt 3 ]; then
+		return 0
+	fi
+	if [[ "${cur}" == -* ]] || [ ${curword} -eq 1 ]; then
+		if [ ${numwords} -le 2 ] && [ ${curword} -eq 1 ]; then
+			opts="--get-hosts \
+				--get-verbose \
+				--get-log \
+				--set-hosts \
+				--set-verbose \
+				--set-log \
+				--add-path \
+				--no-path"
+		else
+			opts=""
+		fi
+	else
+		opts=""
+	fi
+	COMPREPLY=($(compgen -W "${opts}" | grep ^$cur))
+	return 0
+}
+complete -F _distccconfig distcc-config
+
+#
 # simple completion for Gentoo style init
 #
 complete -W "start stop restart pause zap ineed needsme iuse usesme broken" \
 	$(for i in /etc/init.d/*; do echo ${i##*/}; done)
 
-
 #
 # emerge completion command
 #