Add bash-completion; tidy up old ebuilds.

8 files changed, 59 insertions, 111 deletions

diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog
index 66d19d33518d..4590da7e5e5e 100644
--- a/dev-util/source-highlight/ChangeLog
+++ b/dev-util/source-highlight/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/source-highlight
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.10 2004/10/30 22:10:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.11 2004/11/07 11:35:25 ka0ttic Exp $
+
+  07 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/source-highlight.bash-completion, source-highlight-1.11-r1.ebuild,
+  -source-highlight-1.7.ebuild, -source-highlight-1.8.ebuild:
+  Add bash-completion; tidy up old ebuilds.
 
   30 Oct 2004; Aaron Walker <ka0ttic@gentoo.org>
   source-highlight-1.11-r1.ebuild:
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 8b63d85d33fc..9b9c1dafae2f 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ccbfa75e085cd5918d30773c09c1cd5c source-highlight-1.8.ebuild 1017
-MD5 1c5eda3875bf38a16a6820455bc2af3b source-highlight-1.11-r1.ebuild 1082
-MD5 b48b914cca345967182d71f2cd0ee96f ChangeLog 1743
+MD5 93b7a347bca209fa01fa38922ae8a3ee source-highlight-1.11-r1.ebuild 1015
+MD5 ae2f2a36c2c51e47e88a00484692b340 ChangeLog 1975
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 72f59744fd53d7e841a0fb28688d4bef source-highlight-1.7.ebuild 913
 MD5 ec136e3bf2efb4bdb6934e287a23cd6a files/digest-source-highlight-1.11-r1 73
-MD5 7a6a4d064118692e6f6832c0f83265aa files/digest-source-highlight-1.7 72
-MD5 04795a8ef0e1c5d6720e5b802cd85fbc files/digest-source-highlight-1.8 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBhBFDEZCkKN40op4RAgzWAJ4hhrTxuFcNvgf7FQC9Q49IVQof4gCfejaq
-PKAHcRtwzr8iX6jx7m9V53M=
-=R3t8
------END PGP SIGNATURE-----
+MD5 c80dc899db93bad2dc240b60117a72ae files/source-highlight.bash-completion 1256
diff --git a/dev-util/source-highlight/files/digest-source-highlight-1.7 b/dev-util/source-highlight/files/digest-source-highlight-1.7
deleted file mode 100644
index e954e3979cb7..000000000000
--- a/dev-util/source-highlight/files/digest-source-highlight-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 922a4543490691affde8fe8c3826a033 source-highlight-1.7.tar.gz 570404
diff --git a/dev-util/source-highlight/files/digest-source-highlight-1.8 b/dev-util/source-highlight/files/digest-source-highlight-1.8
deleted file mode 100644
index a341adacb925..000000000000
--- a/dev-util/source-highlight/files/digest-source-highlight-1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d8f1b6aab702f8c5ce952542cd5fb02 source-highlight-1.8.tar.gz 611213
diff --git a/dev-util/source-highlight/files/source-highlight.bash-completion b/dev-util/source-highlight/files/source-highlight.bash-completion
new file mode 100644
index 000000000000..f3b718c8d577
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight.bash-completion
@@ -0,0 +1,45 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/files/source-highlight.bash-completion,v 1.1 2004/11/07 11:35:25 ka0ttic Exp $
+# completion for source-highlight
+
+_source-highlight()
+{
+    local cur prev opts 
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    opts="-h --help -V --version -i --input -o --output -s --src-lang \
+    -f --out-format -v --verbose -d --doc --no-doc -c --css -T --title \
+    -t --tab -H --header -F --footer --tags-file -n --line-number \
+    --line-number-ref --output-dir --gen-version"
+
+    if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
+	COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
+	return 0
+    fi
+
+    case "${prev}" in
+	-T|--title|-t|--tab)
+	    COMPREPLY=()
+	    ;;
+	-i|--input|-o|--output|-c|--css|-H|--header|-F|--footer|--tags-file)
+	    COMPREPLY=($(compgen -A file -- "${cur}"))
+	    ;;
+	-s|--src-lang)
+	    COMPREPLY=($(compgen -W "java javascript cpp prolog perl php3 \
+	    python ruby flex changelog lua caml sml" -- "${cur}"))
+	    ;;
+	-f|--out-format)
+	    COMPREPLY=($(compgen -W "html xhtml esc" -- "${cur}"))
+	    ;;
+	--output-dir)
+	    COMPREPLY=($(compgen -A directory -- "${cur}"))
+	    ;;
+	*)
+	    COMPREPLY=($(compgen -W "${opts/${preprev}}" -- "${cur}"))
+	    ;;
+    esac
+}
+complete -F _source-highlight source-highlight
+
+# vim: set ft=sh tw=80 sw=4 et :
diff --git a/dev-util/source-highlight/source-highlight-1.11-r1.ebuild b/dev-util/source-highlight/source-highlight-1.11-r1.ebuild
index 3fcd43256ed0..85eb4ff06ab9 100644
--- a/dev-util/source-highlight/source-highlight-1.11-r1.ebuild
+++ b/dev-util/source-highlight/source-highlight-1.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-1.11-r1.ebuild,v 1.3 2004/10/30 22:10:02 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-1.11-r1.ebuild,v 1.4 2004/11/07 11:35:25 ka0ttic Exp $
 
-IUSE=""
+inherit bash-completion
 
 DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="http://www.gnu.org/software/src-highlite/source-highlight.html"
@@ -11,24 +11,14 @@ SRC_URI="ftp://ftp.gnu.org/gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="x86 amd64 ~ppc"
 SLOT="0"
+IUSE=""
 
-DEPEND="sys-apps/gawk
-	sys-apps/grep
-	sys-devel/bison
-	sys-devel/gcc
-	sys-devel/flex
-	virtual/libc"
-
-RDEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install () {
 	dodoc AUTHORS ChangeLog COPYING CREDITS INSTALL \
 		NEWS README THANKS TODO.txt || die
+	dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN}
 
 	cd ${S}/src
 	dobin source-highlight cpp2html java2html source-highlight-cgi \
diff --git a/dev-util/source-highlight/source-highlight-1.7.ebuild b/dev-util/source-highlight/source-highlight-1.7.ebuild
deleted file mode 100644
index 8677cd029234..000000000000
--- a/dev-util/source-highlight/source-highlight-1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-1.7.ebuild,v 1.7 2004/10/09 23:31:57 ka0ttic Exp $
-
-IUSE=""
-
-DESCRIPTION="Generate highlighted source code as an (x)html document"
-SRC_URI="ftp://ftp.gnu.org/gnu/source-highlight/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/src-highlite/source-highlight.html"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-SLOT="0"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-	dodoc AUTHORS ChangeLog COPYING CREDITS INSTALL \
-		NEWS README THANKS TODO.txt
-
-	cd ${S}/src
-	dobin source-highlight cpp2html java2html source-highlight-cgi
-	dodir /usr/share/source-highlight
-	insinto /usr/share/source-highlight
-	doins tags.j2h tags2.j2h
-
-	cd ${S}/doc
-	dohtml *.html *.css *.java
-	doman source-highlight.1
-}
diff --git a/dev-util/source-highlight/source-highlight-1.8.ebuild b/dev-util/source-highlight/source-highlight-1.8.ebuild
deleted file mode 100644
index c9d96e790dfe..000000000000
--- a/dev-util/source-highlight/source-highlight-1.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-1.8.ebuild,v 1.8 2004/10/19 10:04:26 absinthe Exp $
-
-IUSE=""
-
-DESCRIPTION="Generate highlighted source code as an (x)html document"
-HOMEPAGE="http://www.gnu.org/software/src-highlite/source-highlight.html"
-SRC_URI="ftp://ftp.gnu.org/gnu/src-highlite/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ~ppc"
-SLOT="0"
-
-DEPEND="sys-apps/gawk
-	sys-apps/grep
-	sys-devel/bison
-	sys-devel/gcc
-	sys-devel/flex
-	virtual/libc"
-
-RDEPEND="virtual/libc"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-	dodoc AUTHORS ChangeLog COPYING CREDITS INSTALL \
-		NEWS README THANKS TODO.txt
-
-	cd ${S}/src
-	dobin source-highlight cpp2html java2html source-highlight-cgi
-	dodir /usr/share/source-highlight
-	insinto /usr/share/source-highlight
-	doins tags.j2h tags2.j2h
-
-	cd ${S}/doc
-	dohtml *.html *.css *.java
-	doman source-highlight.1
-}