Version bump.

(Portage version: 2.0.53_rc5)

5 files changed, 191 insertions, 15 deletions

diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog
index 4c86a9be70f0..d708ced47355 100644
--- a/dev-util/source-highlight/ChangeLog
+++ b/dev-util/source-highlight/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2005/09/08 17:07:20 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.19 2005/10/17 14:22:39 ka0ttic Exp $
+
+*source-highlight-2.2 (17 Oct 2005)
+
+  17 Oct 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/source-highlight-exuberant-ctags.diff,
+  +source-highlight-2.2.ebuild:
+  Version bump.
 
 *source-highlight-2.1.2 (08 Sep 2005)
 
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 4563f311c3c5..303a12922c78 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5cadb4172cf419b459ffc2e2d70fe1ef source-highlight-2.1.2.ebuild 1087
-MD5 a14c15abad083ecd2d10a02282b53e71 source-highlight-1.11-r2.ebuild 1015
-MD5 f1d66465b01ac9f9f6f78bddb7b7f2e6 ChangeLog 3891
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 e6e01716273dfadd35bb1e09adb56b45 ChangeLog 4074
 MD5 ec136e3bf2efb4bdb6934e287a23cd6a files/digest-source-highlight-1.11-r2 73
 MD5 28242883659cebf7a8b81de6c906067d files/digest-source-highlight-2.1.2 74
+MD5 e548a55cccb87455d6d99cadb49451da files/digest-source-highlight-2.2 72
+MD5 31e175c50dba5eee83d342be007c3871 files/source-highlight-exuberant-ctags.diff 8330
 MD5 8010d26caf8fbdd5b9c6ab34da1e492b files/source-highlight.bash-completion 1383
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIHADEZCkKN40op4RAlrbAKCqJFqomNp1kBTf0gu4wvqa6MRV6ACdGD9q
-BR7mqU8iua2evj/sY76kQGg=
-=eWjc
------END PGP SIGNATURE-----
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 a14c15abad083ecd2d10a02282b53e71 source-highlight-1.11-r2.ebuild 1015
+MD5 5cadb4172cf419b459ffc2e2d70fe1ef source-highlight-2.1.2.ebuild 1087
+MD5 1824071751d884e388188e696ca1efab source-highlight-2.2.ebuild 1454
diff --git a/dev-util/source-highlight/files/digest-source-highlight-2.2 b/dev-util/source-highlight/files/digest-source-highlight-2.2
new file mode 100644
index 000000000000..091d0d12ae8c
--- /dev/null
+++ b/dev-util/source-highlight/files/digest-source-highlight-2.2
@@ -0,0 +1 @@
+MD5 f9e86829095fbb32d233c4bb38fad3d5 source-highlight-2.2.tar.gz 618405
diff --git a/dev-util/source-highlight/files/source-highlight-exuberant-ctags.diff b/dev-util/source-highlight/files/source-highlight-exuberant-ctags.diff
new file mode 100644
index 000000000000..fbed026484ef
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-exuberant-ctags.diff
@@ -0,0 +1,121 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.2.orig/configure.ac source-highlight-2.2/configure.ac
+--- source-highlight-2.2.orig/configure.ac	2005-10-17 09:48:06.000000000 -0400
++++ source-highlight-2.2/configure.ac	2005-10-17 09:58:52.000000000 -0400
+@@ -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 *******************
+@@ -244,4 +245,4 @@
+ 
+ ctags is not installed so you won't be able to
+ generate references (--gen-references).])
+-fi
+\ No newline at end of file
++fi
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.2.orig/doc/Makefile.am source-highlight-2.2/doc/Makefile.am
+--- source-highlight-2.2.orig/doc/Makefile.am	2005-10-17 09:48:06.000000000 -0400
++++ source-highlight-2.2/doc/Makefile.am	2005-10-17 10:12:10.000000000 -0400
+@@ -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)
+ 
+@@ -44,55 +44,55 @@
+ 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 > $@
+ 
+ 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 > $@
+ 
+ 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 $@
+ 
+ %.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=$< 2> $@
+@@ -143,7 +143,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
+@@ -236,4 +236,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 --git a/dev-util/source-highlight/source-highlight-2.2.ebuild b/dev-util/source-highlight/source-highlight-2.2.ebuild
new file mode 100644
index 000000000000..900c851bdc1c
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-2.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2005 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.2.ebuild,v 1.1 2005/10/17 14:22:39 ka0ttic Exp $
+
+inherit 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
+	dev-util/ctags"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-exuberant-ctags.diff
+}
+
+src_compile() {
+	local myconf
+
+	einfo "Regenerating autoconf/automake files"
+	libtoolize --copy --force || die "libtoolize failed"
+	aclocal || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake --add-missing --copy || die "automake failed"
+	autoconf || die "autoconf failed"
+
+	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 () {
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -fr ${D}/usr/share/doc
+
+	dodoc AUTHORS ChangeLog COPYING CREDITS INSTALL \
+		NEWS README THANKS TODO.txt || die
+	dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN}
+
+	if use doc ; then
+		cd ${S}/doc
+		dohtml *.html *.css *.java
+	fi
+}