Dropped old versions. Version bump. Updated bash-completion file and Exuberant ctags patch.

Package-Manager: portage-2.1.2_rc3

6 files changed, 302 insertions, 4 deletions

diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog
index d708ced47355..e33cd86320f9 100644
--- a/dev-util/source-highlight/ChangeLog
+++ b/dev-util/source-highlight/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/source-highlight
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.19 2005/10/17 14:22:39 ka0ttic Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.20 2006/12/18 00:15:13 dev-zero Exp $
+
+*source-highlight-2.5 (18 Dec 2006)
+
+  18 Dec 2006; Tiziano Müller <dev-zero@gentoo.org>
+  +files/source-highlight-2.5-exuberant-ctags.diff,
+  +files/source-highlight-2.5.bash-completion,
+  -files/source-highlight-exuberant-ctags.diff, metadata.xml,
+  -source-highlight-2.1.2.ebuild, -source-highlight-2.2.ebuild,
+  +source-highlight-2.5.ebuild:
+  Dropped old versions. Version bump. Updated bash-completion file and
+  Exuberant ctags patch.
 
 *source-highlight-2.2 (17 Oct 2005)
 
diff --git a/dev-util/source-highlight/files/digest-source-highlight-2.5 b/dev-util/source-highlight/files/digest-source-highlight-2.5
new file mode 100644
index 000000000000..0cb36d511a2e
--- /dev/null
+++ b/dev-util/source-highlight/files/digest-source-highlight-2.5
@@ -0,0 +1,3 @@
+MD5 1d0b3d821e6102b24b2bff8a305ee8b5 source-highlight-2.5.tar.gz 681021
+RMD160 f5dd7747960b0534cfb57744c036842c2643423d source-highlight-2.5.tar.gz 681021
+SHA256 8238d03250a5a940ab3326ac6d93ae43f0359adb33eb5e8b961318840eeea9ff source-highlight-2.5.tar.gz 681021
diff --git a/dev-util/source-highlight/files/source-highlight-2.5-exuberant-ctags.diff b/dev-util/source-highlight/files/source-highlight-2.5-exuberant-ctags.diff
new file mode 100644
index 000000000000..b24aec3d1c01
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-2.5-exuberant-ctags.diff
@@ -0,0 +1,183 @@
+diff -Naur source-highlight-2.5.orig/configure.ac source-highlight-2.5/configure.ac
+--- source-highlight-2.5.orig/configure.ac	2006-12-18 00:06:32.000000000 +0100
++++ source-highlight-2.5/configure.ac	2006-12-18 00:07:16.000000000 +0100
+@@ -150,7 +150,8 @@
+ AM_CONDITIONAL(NO_HELP2MAN, test -z "$ac_cv_path_HELP2MAN" )
+ 
+ dnl this is for generating references
+-AC_PATH_PROGS(CTAGS, ctags)
++AC_PATH_PROGS(CTAGS, exuberant-ctags)
++AC_SUBST([$CTAGS])
+ AM_CONDITIONAL(NO_CTAGS, test -z "$ac_cv_path_CTAGS" )
+ 
+ dnl *******************
+@@ -250,4 +251,4 @@
+ generate references (--gen-references).
+ Furthermore, if you run make check, then some
+ tests are going to fail.])
+-fi
+\ No newline at end of file
++fi
+diff -Naur source-highlight-2.5.orig/doc/Makefile.am source-highlight-2.5/doc/Makefile.am
+--- source-highlight-2.5.orig/doc/Makefile.am	2006-12-18 00:06:32.000000000 +0100
++++ source-highlight-2.5/doc/Makefile.am	2006-12-18 00:13:08.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ CPP2HTML = $(SRCHILITEPROG) -s cpp -f html $(STD_STYLE)
+ 
+-CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="ctags --excmd=n --tag-relative=yes -o my_test_ref.tags"
++CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="@CTAGS@ --excmd=n --tag-relative=yes -o my_test_ref.tags"
+ 
+ CHANGELOG2HTML = $(SRCHILITEPROG) -s changelog -f html $(STD_STYLE)
+ 
+@@ -47,68 +47,68 @@
+ endif
+ 
+ lang-list.texinfo: $(top_srcdir)/src/lang.map
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ --lang-list | sed -e 's/@/@@/' > $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ --lang-list | sed -e 's/@/@@/' > $@
+ 
+ outlang-list.texinfo: $(top_srcdir)/src/outlang.map
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ --outlang-list | sed -e 's/@/@@/' > $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ --outlang-list | sed -e 's/@/@@/' > $@
+ 
+ test.java.texinfo: $(top_srcdir)/tests/test.java
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test.java --style-file=$(top_srcdir)/src/texinfo.style -n > $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test.java --style-file=$(top_srcdir)/src/texinfo.style -n > $@
+ 
+ debug.java.texinfo: $(top_srcdir)/tests/debug.java
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/debug.java --style-file=$(top_srcdir)/src/texinfo.style -n > $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/debug.java --style-file=$(top_srcdir)/src/texinfo.style -n > $@
+ 
+ %.lang.texinfo: $(top_srcdir)/src/%.lang
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ %.langelems.texinfo: $(top_srcdir)/src/%.lang
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ --show-lang-elements=$< > $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ --show-lang-elements=$< > $@
+ 
+ %.txt.texinfo: $(srcdir)/%.txt
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ %.txt.texinfo.texinfo: $(srcdir)/%.txt.texinfo
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=nohilite.lang
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=nohilite.lang
+ 
+ %.outlang.texinfo: $(top_srcdir)/src/%.outlang
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ %.lang.texinfo: $(top_srcdir)/tests/%.lang
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ %.lang.texinfo: $(srcdir)/%.lang
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ %.style.texinfo: $(top_srcdir)/src/%.style
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ %.diff.texinfo: %.diff
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ %.cpp.texinfo: $(top_srcdir)/tests/%.cpp
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $< --style-file=$(top_srcdir)/src/texinfo.style -o $@
+ 
+ test_extreme_comment_wrong.texinfo: $(top_srcdir)/tests/test_extreme_comment.cpp
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment.lang
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment.lang
+ 
+ test_extreme_comment_1.texinfo: $(top_srcdir)/tests/test_extreme_comment.cpp
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment2.lang
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment2.lang
+ 
+ test_extreme_comment_wrong2.texinfo: $(top_srcdir)/tests/test_extreme_comment2.cpp
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment2.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment2.lang
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment2.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment2.lang
+ 
+ test_extreme_comment_2.texinfo: $(top_srcdir)/tests/test_extreme_comment2.cpp
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment2.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment3.lang
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment2.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment3.lang
+ 
+ test_extreme_comment_3.texinfo: $(top_srcdir)/tests/test_extreme_comment3.cpp
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment3.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment3.lang
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test_extreme_comment3.cpp --style-file=$(top_srcdir)/src/texinfo.style -o $@ --lang-def=extreme_comment3.lang
+ 
+ %.show.texinfo: %.lang
+ 	$(SRCHILITEEXE) --show-regex=$< > $@
+ 	sed -i -e 's/@/@@/g' $@
+ 
+ test_ref.h.texinfo: $(top_srcdir)/tests/test.h
+-	$(SRCHILITEEXE) --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test.h --style-file=$(top_srcdir)/src/texinfo.style -n --gen-references=postline > $@
++	$(SRCHILITEEXE) --ctags=@CTAGS@ --data-dir=$(top_srcdir)/src/ -f texinfo -i $(top_srcdir)/tests/test.h --style-file=$(top_srcdir)/src/texinfo.style -n --gen-references=postline > $@
+ 
+ # the dependence on config.h is to ensure the correct version number
+ # in the generated man file
+@@ -161,7 +161,7 @@
+ # note that $(srcdir) actually points to doc dir
+ 
+ langdef.lang.html: $(top_srcdir)/src/langdef.lang
+-	$(SRCHILITEPROG) $(STD_STYLE) -i $(top_srcdir)/src/langdef.lang -o langdef.lang.html
++	$(SRCHILITEPROG) --ctags=@CTAGS@ $(STD_STYLE) -i $(top_srcdir)/src/langdef.lang -o langdef.lang.html
+ 
+ startapp.cc.html: $(top_srcdir)/src/startapp.cc
+ 	$(CPP2HTML) --doc $(OUTPUT_HERE) $(top_srcdir)/src/startapp.cc
+@@ -273,4 +273,4 @@
+ texinfo-clean:
+ 	rm -f $(GENERATEDINFOS)
+ 
+-DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS) tags langdef.lang.html
+\ No newline at end of file
++DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS) tags langdef.lang.html
+diff -Naur source-highlight-2.5.orig/tests/Makefile.am source-highlight-2.5/tests/Makefile.am
+--- source-highlight-2.5.orig/tests/Makefile.am	2006-12-18 00:20:22.000000000 +0100
++++ source-highlight-2.5/tests/Makefile.am	2006-12-18 00:21:18.000000000 +0100
+@@ -40,7 +40,7 @@
+ 
+ JAVA2TEXINFO = $(PROGNAME) -s java -f texinfo --style-file $(top_srcdir)/src/texinfo.style
+ 
+-CPP2TEXINFO_WREFS = $(PROGNAME) -s cpp -f texinfo --style-file $(top_srcdir)/src/texinfo.style --gen-references=postline --line-number --ctags=""
++CPP2TEXINFO_WREFS = $(PROGNAME) -s cpp -f texinfo --style-file $(top_srcdir)/src/texinfo.style --gen-references=postline --line-number --ctags="@CTAGS@"
+ 
+ # this refers to an "absolute" path (../doc/) without using the automake
+ # variables.  However this way the generated files will always be the
+@@ -322,11 +322,11 @@
+ 
+ CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html --footer=$(srcdir)/footer.html --title="Header and footer test"
+ 
+-CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="ctags --excmd=n --tag-relative=yes -o my_test_ref.tags"
++CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="@CTAGS@ --excmd=n --tag-relative=yes -o my_test_ref.tags"
+ 
+-CPP2LATEX_WREFS = $(CPP2TEX) --title="Contains references to tags" --gen-references=postline --line-number --ctags=""
++CPP2LATEX_WREFS = $(CPP2TEX) --title="Contains references to tags" --gen-references=postline --line-number --ctags="@CTAGS@"
+ 
+-CPP2LATEX_WREFSPOST = $(CPP2TEX) --title="Contains references to tags" --gen-references=postdoc --line-number --ctags=""
++CPP2LATEX_WREFSPOST = $(CPP2TEX) --title="Contains references to tags" --gen-references=postdoc --line-number --ctags="@CTAGS@"
+ 
+ CTAGS_CMD=$(CTAGS) --excmd=n --tag-relative=yes 
+ 
+@@ -754,4 +754,4 @@
+ clean_html:
+ 	rm -f *.h.html *.java.html *.cc.html *.pas.html *.pl.html *.pm.html *.php3.html *.py.html *.chlog.html *.chlog_css.html *.l.html test_xhtml.html test_notfixed.html test_css.html test_css_nodoc.html test_header.html *.rb.html *.js.html *.java.txt *.java.tex *.java.texinfo *.lua.html *.ml.html *.sml.html test_*_lines.html *.log.html *.y.html *.simple.html *.tex.html *.lgt.html *.diff.html *.lang.html *.htm.html *.style.html *.cs.html *.xml.html *.sh.html *.url.html *.txt.html *.unknown.html *.tcl.html
+ 
+-DISTCLEANFILES=test_ref.html test_ref.tags my_test_ref.tags tags test_ref.tex test_ref_post.tex test_ref.texinfo
+\ No newline at end of file
++DISTCLEANFILES=test_ref.html test_ref.tags my_test_ref.tags tags test_ref.tex test_ref_post.tex test_ref.texinfo
+diff -Naur source-highlight-2.5.orig/src/lib/Makefile.am source-highlight-2.5/src/lib/Makefile.am
+--- source-highlight-2.5.orig/src/lib/Makefile.am	2006-12-18 00:29:22.000000000 +0100
++++ source-highlight-2.5/src/lib/Makefile.am	2006-12-18 00:29:39.000000000 +0100
+@@ -127,7 +127,7 @@
+ test_langinfer_LDADD = libcommon.a -l$(BOOST_REGEX_LIB)
+ 
+ mytags: $(srcdir)/test_readtags_main.cpp
+-	ctags --excmd=n --fields=+n -o mytags $(srcdir)/test_readtags_main.cpp $(srcdir)/readtags.h
++	@CTAGS@ --excmd=n --fields=+n -o mytags $(srcdir)/test_readtags_main.cpp $(srcdir)/readtags.h
+ 
+ outlangtest.outlang: $(srcdir)/outlangtest.outlang.tmpl
+ 	rm -f outlangtest.outlang
diff --git a/dev-util/source-highlight/files/source-highlight-2.5.bash-completion b/dev-util/source-highlight/files/source-highlight-2.5.bash-completion
new file mode 100644
index 000000000000..5f8986656bb3
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-2.5.bash-completion
@@ -0,0 +1,52 @@
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/files/source-highlight-2.5.bash-completion,v 1.1 2006/12/18 00:15:13 dev-zero 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 \
+    --lang-list --outlang-list -f --out-format -d --doc --no-doc -c --css \
+    -T --title -t --tab -H --header -F --footer --style-file --outlang-def \
+    --outlang-map --data-dir --output-dir --lang-def --lang-map --show-lang-elements \
+    --infer-lang -n --line-number --line-number-ref --gen-references --ctags-file \
+    --ctags -v --verbose --statistics --gen-version --check-lang --check-outlang \
+    --failsafe -g --debug-langdef --show-regex"
+
+    if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then
+	COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
+	return 0
+    fi
+
+    case "${prev}" in
+	-T|--title|-t|--tab|--gen-references)
+	    COMPREPLY=()
+	    ;;
+	-i|--input|-o|--output|-c|--css|-H|--header|-F|--footer|--style-file|--outlang-def|--outlang-map|--lang-def|--lang-map|--show-lang-elements|--ctags-file|--check-lang|--check-outlang|--show-regex)
+	    COMPREPLY=($(compgen -A file -- "${cur}"))
+	    ;;
+	-s|--src-lang)
+	    COMPREPLY=($(compgen -W "C H bib bison c caml cc changelog cls cpp cs csharp \
+		diff docbook dtx eps flex fortran h hh hpp htm html java javascript js l lang \
+		langdef latex lex lgt ll log logtalk lua ml mli outlang pas pascal patch perl php php3 \
+		pl pm postscript prolog ps py python rb ruby sh shell sig sml sql sty style syslog tcl \
+		tex tk txt xhtml xml y yacc yy" -- "${cur}"))
+	    ;;
+	-f|--out-format)
+	    COMPREPLY=($(compgen -W "docbook esc esc-doc html html-css html-css-doc html-doc \
+	    javadoc latex latex-doc latexcolor latexcolor-doc texinfo xhtml xhtml-css xhtml-css-doc xhtml-doc" -- "${cur}"))
+	    ;;
+	--data-dir|--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/metadata.xml b/dev-util/source-highlight/metadata.xml
index d31152aca840..78170ac0a566 100644
--- a/dev-util/source-highlight/metadata.xml
+++ b/dev-util/source-highlight/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>ka0ttic@gentoo.org</email>
-		<name>Aaron Walker</name>
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/source-highlight/source-highlight-2.5.ebuild b/dev-util/source-highlight/source-highlight-2.5.ebuild
new file mode 100644
index 000000000000..0dcca33567b6
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-2.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.5.ebuild,v 1.1 2006/12/18 00:15:13 dev-zero Exp $
+
+inherit autotools eutils bash-completion
+
+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="~amd64 ~mips ~ppc ~x86"
+SLOT="0"
+IUSE="doc"
+
+DEPEND=">=dev-libs/boost-1.33.1-r1
+	dev-util/ctags"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-exuberant-ctags.diff"
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	built_with_use dev-libs/boost threadsonly && \
+		myconf="--with-boost-regex=boost_regex-gcc-mt"
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dobashcompletion "${FILESDIR}/${P}.bash-completion" ${PN}
+
+	# That's not how we want it
+	rm -fr "${D}/usr/share/doc"
+	dodoc AUTHORS ChangeLog CREDITS NEWS README THANKS TODO.txt
+
+	if use doc ; then
+		cd "${S}/doc"
+		dohtml *.html *.css *.java
+	fi
+}