diff options
6 files changed, 287 insertions, 11 deletions
diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog index 7b0d156e6bff..0e7dfcde3abd 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.24 2007/02/04 19:27:06 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.25 2007/06/07 23:02:41 dev-zero Exp $ + +*source-highlight-2.6 (07 Jun 2007) + + 07 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> + +files/source-highlight-2.6-exuberant-ctags.diff, + source-highlight-2.5.ebuild, +source-highlight-2.6.ebuild: + Version bump, fixed bug #181220. 04 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> -files/source-highlight.bash-completion, -source-highlight-1.11-r2.ebuild: diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest index 57125b2a5d81..7c40ff7aba9c 100644 --- a/dev-util/source-highlight/Manifest +++ b/dev-util/source-highlight/Manifest @@ -6,15 +6,24 @@ AUX source-highlight-2.5.bash-completion 2220 RMD160 a48855f3e44128fc2823be1c6dd MD5 d7230de2f997046eefa6bf7cf54059d1 files/source-highlight-2.5.bash-completion 2220 RMD160 a48855f3e44128fc2823be1c6ddf6b8795b03313 files/source-highlight-2.5.bash-completion 2220 SHA256 9bea75f6aee602a3b65ca0fd567238af8ab29c40a8ccbba48d5fb58104bb635c files/source-highlight-2.5.bash-completion 2220 +AUX source-highlight-2.6-exuberant-ctags.diff 13885 RMD160 89aff305f1ed61d7dcd47989bb5e03a8830c7cec SHA1 05af03aeee74bb6d4f5e201cdc667e467a806fff SHA256 4ac7b43042e451594b6191954de837cf5a92335179f3a232819d701b5a3647be +MD5 000a3c27134e3c5524588af8cbc5c2c2 files/source-highlight-2.6-exuberant-ctags.diff 13885 +RMD160 89aff305f1ed61d7dcd47989bb5e03a8830c7cec files/source-highlight-2.6-exuberant-ctags.diff 13885 +SHA256 4ac7b43042e451594b6191954de837cf5a92335179f3a232819d701b5a3647be files/source-highlight-2.6-exuberant-ctags.diff 13885 DIST source-highlight-2.5.tar.gz 681021 RMD160 f5dd7747960b0534cfb57744c036842c2643423d SHA1 4ba76ae656098f54904955cd227e53f18be454f7 SHA256 8238d03250a5a940ab3326ac6d93ae43f0359adb33eb5e8b961318840eeea9ff -EBUILD source-highlight-2.5.ebuild 1214 RMD160 3321bef286380dc7f5a14988cfa4d5fbdd9d349a SHA1 45fbb544c7e231d07776ebdc51bfda4322fae283 SHA256 6d54a88fa0608ac5e61b5466c6e2c857a49515dd0bdb9f9e838b37cca45c9131 -MD5 f238f9501d81cb1ad55ec7701ecdeaaa source-highlight-2.5.ebuild 1214 -RMD160 3321bef286380dc7f5a14988cfa4d5fbdd9d349a source-highlight-2.5.ebuild 1214 -SHA256 6d54a88fa0608ac5e61b5466c6e2c857a49515dd0bdb9f9e838b37cca45c9131 source-highlight-2.5.ebuild 1214 -MISC ChangeLog 5054 RMD160 2b121e715018c94347ab9298282323011b8e4417 SHA1 99060a37f84ce0b30f8a4c460bd197f6ad0019c3 SHA256 26c04a6f83e278acc337a4a09118c0a47076c584440253f5fe0a743244659815 -MD5 78864e3ccb14af08597f43504c3657d7 ChangeLog 5054 -RMD160 2b121e715018c94347ab9298282323011b8e4417 ChangeLog 5054 -SHA256 26c04a6f83e278acc337a4a09118c0a47076c584440253f5fe0a743244659815 ChangeLog 5054 +DIST source-highlight-2.6.tar.gz 986369 RMD160 cca6bc31921d544053a59f67c02dd8eb67e6c777 SHA1 ae23b07595f40815708dc5e271517d0450664462 SHA256 71a3504fcdee1f5fb3884e20ea33bd954aed43e3c59d2d6234653b435547c61d +EBUILD source-highlight-2.5.ebuild 1264 RMD160 e2be4fb4ec5797d2438bcb48b55225c25efef8f9 SHA1 7ab6faa1b6127c5096da2dde510a694026d37363 SHA256 5236f97377131b298dfcba81df31610881694d65911287c6aad257a75d0e9e97 +MD5 b71f7c06dbfd9c7f06b8c632a3f069fb source-highlight-2.5.ebuild 1264 +RMD160 e2be4fb4ec5797d2438bcb48b55225c25efef8f9 source-highlight-2.5.ebuild 1264 +SHA256 5236f97377131b298dfcba81df31610881694d65911287c6aad257a75d0e9e97 source-highlight-2.5.ebuild 1264 +EBUILD source-highlight-2.6.ebuild 1291 RMD160 8efc984d1c1aacf8dcd5245425cf9f6444dc1532 SHA1 45f2a462372fcd730d4391252d07b3468a2fea6f SHA256 03f2a04c27968d08a94300f6927549f3ffe16fb473128e90089c643e1446196d +MD5 5608bd381123a6900a93516658201ce8 source-highlight-2.6.ebuild 1291 +RMD160 8efc984d1c1aacf8dcd5245425cf9f6444dc1532 source-highlight-2.6.ebuild 1291 +SHA256 03f2a04c27968d08a94300f6927549f3ffe16fb473128e90089c643e1446196d source-highlight-2.6.ebuild 1291 +MISC ChangeLog 5293 RMD160 a158111168d75b465488d799e7659734e904dadd SHA1 96315c1698c529301b7205e772a986b542030774 SHA256 03cfd61543b318957cf09f57c6b18e77f48876c2e02c3f25742a94337fd446c5 +MD5 7479aca78a3cfcfd4cb5a5485a2fff45 ChangeLog 5293 +RMD160 a158111168d75b465488d799e7659734e904dadd ChangeLog 5293 +SHA256 03cfd61543b318957cf09f57c6b18e77f48876c2e02c3f25742a94337fd446c5 ChangeLog 5293 MISC metadata.xml 258 RMD160 f41059a7f29a2b5493ad80203a94a9a519bc5dcf SHA1 ebaf62e3133e26efd7eaac694e53d0398c2bc0de SHA256 79e17085ca01237995cedc73430ae1c4bbd3092968cffe18ea41237f7a2c1939 MD5 85ea14bf3eb159f0771ec096dc151131 metadata.xml 258 RMD160 f41059a7f29a2b5493ad80203a94a9a519bc5dcf metadata.xml 258 @@ -22,3 +31,6 @@ SHA256 79e17085ca01237995cedc73430ae1c4bbd3092968cffe18ea41237f7a2c1939 metadata MD5 66963391075a9e7282ad5f916942ca5f files/digest-source-highlight-2.5 262 RMD160 837c969e640a4f13de2c97bd0e4fc5b3636af8d2 files/digest-source-highlight-2.5 262 SHA256 e969aae9a22e37eedeac6e7b35b92d2ef94fae22c248be629beb1e88d708caca files/digest-source-highlight-2.5 262 +MD5 bd18c4962818dcc736e5340f15754248 files/digest-source-highlight-2.6 262 +RMD160 666f1ad2238b9ef9f260a1c360dced8f7c8c53ef files/digest-source-highlight-2.6 262 +SHA256 c53dcbea4f92531c04b3b1100337b092ecdbac864da5ea92d1c9a5eeafa64428 files/digest-source-highlight-2.6 262 diff --git a/dev-util/source-highlight/files/digest-source-highlight-2.6 b/dev-util/source-highlight/files/digest-source-highlight-2.6 new file mode 100644 index 000000000000..2bfaf892c74d --- /dev/null +++ b/dev-util/source-highlight/files/digest-source-highlight-2.6 @@ -0,0 +1,3 @@ +MD5 f36f813a0e5e2a55e9f8050a65dbc594 source-highlight-2.6.tar.gz 986369 +RMD160 cca6bc31921d544053a59f67c02dd8eb67e6c777 source-highlight-2.6.tar.gz 986369 +SHA256 71a3504fcdee1f5fb3884e20ea33bd954aed43e3c59d2d6234653b435547c61d source-highlight-2.6.tar.gz 986369 diff --git a/dev-util/source-highlight/files/source-highlight-2.6-exuberant-ctags.diff b/dev-util/source-highlight/files/source-highlight-2.6-exuberant-ctags.diff new file mode 100644 index 000000000000..e1376f60c99e --- /dev/null +++ b/dev-util/source-highlight/files/source-highlight-2.6-exuberant-ctags.diff @@ -0,0 +1,202 @@ +diff -Naur source-highlight-2.6.orig/configure.ac source-highlight-2.6/configure.ac +--- source-highlight-2.6.orig/configure.ac 2007-06-08 00:28:50.000000000 +0200 ++++ source-highlight-2.6/configure.ac 2007-06-08 00:31:09.000000000 +0200 +@@ -125,7 +125,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 ******************* +@@ -229,4 +230,4 @@ + generate references (--gen-references). + Furthermore, if you run make check, then some + tests are going to fail.]) +-fi +\ Kein Zeilenumbruch am Dateiende. ++fi +diff -Naur source-highlight-2.6.orig/doc/Makefile.am source-highlight-2.6/doc/Makefile.am +--- source-highlight-2.6.orig/doc/Makefile.am 2007-06-08 00:28:50.000000000 +0200 ++++ source-highlight-2.6/doc/Makefile.am 2007-06-08 00:35:55.000000000 +0200 +@@ -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,80 +47,80 @@ + 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 $@ + + %.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 $@ + + %.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 $@ + + %.style.texinfo: $(top_srcdir)/tests/%.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 $@ + + %.css.texinfo: %.css +- $(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 $@ + + %.css.texinfo: $(top_srcdir)/src/%.css +- $(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 +@@ -189,7 +189,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 +@@ -310,4 +310,4 @@ + texinfo-clean: + rm -f $(GENERATEDINFOS) + +-DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS) tags langdef.lang.html +\ Kein Zeilenumbruch am Dateiende. ++DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS) tags langdef.lang.html +diff -Naur source-highlight-2.6.orig/src/lib/Makefile.am source-highlight-2.6/src/lib/Makefile.am +--- source-highlight-2.6.orig/src/lib/Makefile.am 2007-06-08 00:28:50.000000000 +0200 ++++ source-highlight-2.6/src/lib/Makefile.am 2007-06-08 00:38:29.000000000 +0200 +@@ -127,7 +127,7 @@ + test_langinfer_LDADD = libcommon.la + + 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 -Naur source-highlight-2.6.orig/tests/Makefile.am source-highlight-2.6/tests/Makefile.am +--- source-highlight-2.6.orig/tests/Makefile.am 2007-06-08 00:28:50.000000000 +0200 ++++ source-highlight-2.6/tests/Makefile.am 2007-06-08 00:38:10.000000000 +0200 +@@ -50,7 +50,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 +@@ -360,13 +360,13 @@ + + CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html --footer=$(srcdir)/footer.html + +-CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="$(CTAGS) --excmd=number --tag-relative=yes -o my_test_ref.tags" ++CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="@CTAGS@ --excmd=number --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=number --tag-relative=yes ++CTAGS_CMD=@CTAGS@ --excmd=number --tag-relative=yes + + test_header.html: test.h + $(CPP2HTML_WHEADERS) -i test.h -o $@ +@@ -847,4 +847,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 *.bib.html *.makefile.html *.css.html + +-DISTCLEANFILES=test_ref.html test_ref.tags my_test_ref.tags tags test_ref.tex test_ref_post.tex test_ref.texinfo syslog.style.html +\ Kein Zeilenumbruch am Dateiende. ++DISTCLEANFILES=test_ref.html test_ref.tags my_test_ref.tags tags test_ref.tex test_ref_post.tex test_ref.texinfo syslog.style.html diff --git a/dev-util/source-highlight/source-highlight-2.5.ebuild b/dev-util/source-highlight/source-highlight-2.5.ebuild index 0348ebfbb3d6..bce011f7889b 100644 --- a/dev-util/source-highlight/source-highlight-2.5.ebuild +++ b/dev-util/source-highlight/source-highlight-2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.4 2007/02/04 18:36:18 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.5.ebuild,v 1.5 2007/06/07 23:02:41 dev-zero Exp $ inherit autotools eutils bash-completion @@ -26,8 +26,9 @@ src_unpack() { src_compile() { local myconf - built_with_use dev-libs/boost threadsonly && \ + if has_version "<dev-libs/boost-1.34.0" && built_with_use dev-libs/boost threadsonly ; then myconf="--with-boost-regex=boost_regex-gcc-mt" + fi econf ${myconf} || die "econf failed" emake || die "emake failed" diff --git a/dev-util/source-highlight/source-highlight-2.6.ebuild b/dev-util/source-highlight/source-highlight-2.6.ebuild new file mode 100644 index 000000000000..927cefe7f400 --- /dev/null +++ b/dev-util/source-highlight/source-highlight-2.6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2007 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.6.ebuild,v 1.1 2007/06/07 23:02:41 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="mirror://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" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${A} + cd ${S} + epatch "${FILESDIR}/${P}-exuberant-ctags.diff" + eautoreconf +} + +src_compile() { + local myconf + + if has_version "<dev-libs/boost-1.34.0" && built_with_use dev-libs/boost threadsonly ; then + myconf="--with-boost-regex=boost_regex-gcc-mt" + fi + + econf ${myconf} || die "econf failed" + emake || die "emake failed" +} + +src_install () { + emake DESTDIR="${D}" install || die "make install failed" + + dobashcompletion "${FILESDIR}/${PN}-2.5.bash-completion" + + # 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 +} |