diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2008-07-21 06:20:36 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-07-21 06:20:36 +0000 |
commit | b153fc00af5ff5d92235dfb9d9b0b3c10d7f5264 (patch) | |
tree | e49f1e834d0e2c78d76354ab45593c14bd85eff7 /dev-util/source-highlight | |
parent | fix building on Gentoo/FreeBSD (diff) | |
download | gentoo-2-b153fc00af5ff5d92235dfb9d9b0b3c10d7f5264.tar.gz gentoo-2-b153fc00af5ff5d92235dfb9d9b0b3c10d7f5264.tar.bz2 gentoo-2-b153fc00af5ff5d92235dfb9d9b0b3c10d7f5264.zip |
Version bump (bug #232397, updated bash-completion file). Dropped old versions.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'dev-util/source-highlight')
-rw-r--r-- | dev-util/source-highlight/ChangeLog | 13 | ||||
-rw-r--r-- | dev-util/source-highlight/files/source-highlight-2.10.bash-completion (renamed from dev-util/source-highlight/files/source-highlight-2.5.bash-completion) | 16 | ||||
-rw-r--r-- | dev-util/source-highlight/files/source-highlight-2.5-exuberant-ctags.diff | 183 | ||||
-rw-r--r-- | dev-util/source-highlight/source-highlight-2.10.ebuild (renamed from dev-util/source-highlight/source-highlight-2.8.ebuild) | 6 | ||||
-rw-r--r-- | dev-util/source-highlight/source-highlight-2.5.ebuild | 50 |
5 files changed, 23 insertions, 245 deletions
diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog index 3e4e59fbaabe..822e827d04fb 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.32 2008/04/26 20:31:52 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.33 2008/07/21 06:20:36 dev-zero Exp $ + +*source-highlight-2.10 (21 Jul 2008) + + 21 Jul 2008; 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-2.10.bash-completion, + -source-highlight-2.5.ebuild, -source-highlight-2.8.ebuild, + +source-highlight-2.10.ebuild: + Version bump (bug #232397, updated bash-completion file). Dropped old + versions. 26 Apr 2008; Markus Meier <maekke@gentoo.org> source-highlight-2.9.ebuild: x86 stable, bug #217413 diff --git a/dev-util/source-highlight/files/source-highlight-2.5.bash-completion b/dev-util/source-highlight/files/source-highlight-2.10.bash-completion index 5f8986656bb3..5cbe2f9bf61f 100644 --- a/dev-util/source-highlight/files/source-highlight-2.5.bash-completion +++ b/dev-util/source-highlight/files/source-highlight-2.10.bash-completion @@ -1,4 +1,4 @@ -# $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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/files/source-highlight-2.10.bash-completion,v 1.1 2008/07/21 06:20:36 dev-zero Exp $ # completion for source-highlight _source_highlight() @@ -29,15 +29,15 @@ _source_highlight() 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}")) + COMPREPLY=($(compgen -W "C H ac am autoconf bib bison c caml cc changelog cls cpp cs csh csharp css \ + diff docbook dtx eps fixed-fortran flex fortran free-fortran glsl h haxe hh hpp htm html hx in ini java javascript js kcfg kdevelop kidl ksh l lang \ + langdef latex ldap ldif lex lgt ll log logtalk lsm lua m4 ml mli moc outlang pas pascal patch perl php php3 php4 php5 \ + pl pm postscript prolog properties ps py python rb rc ruby sh shell sig sl slang slsh sml spec sql sty style syslog tcl tcsh \ + tex tk txt ui 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}")) + COMPREPLY=($(compgen -W "docbook esc html html-css htmltable\ + javadoc latex latexcolor texinfo xhtml xhtml-css xhtmltable" -- "${cur}")) ;; --data-dir|--output-dir) COMPREPLY=($(compgen -A directory -- "${cur}")) 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 deleted file mode 100644 index b24aec3d1c01..000000000000 --- a/dev-util/source-highlight/files/source-highlight-2.5-exuberant-ctags.diff +++ /dev/null @@ -1,183 +0,0 @@ -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/source-highlight-2.8.ebuild b/dev-util/source-highlight/source-highlight-2.10.ebuild index bc38714b8326..b93564f46011 100644 --- a/dev-util/source-highlight/source-highlight-2.8.ebuild +++ b/dev-util/source-highlight/source-highlight-2.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.8.ebuild,v 1.3 2008/03/12 10:32:33 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.10.ebuild,v 1.1 2008/07/21 06:20:36 dev-zero Exp $ inherit bash-completion @@ -8,7 +8,7 @@ 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" +KEYWORDS="~amd64 ~mips ~ppc ~x86" SLOT="0" IUSE="doc" @@ -19,7 +19,7 @@ RDEPEND="${DEPEND}" src_install () { emake DESTDIR="${D}" install || die "make install failed" - dobashcompletion "${FILESDIR}/${PN}-2.8.bash-completion" + dobashcompletion "${FILESDIR}/${PN}-2.10.bash-completion" # That's not how we want it rm -fr "${D}/usr/share/doc" diff --git a/dev-util/source-highlight/source-highlight-2.5.ebuild b/dev-util/source-highlight/source-highlight-2.5.ebuild deleted file mode 100644 index bce011f7889b..000000000000 --- a/dev-util/source-highlight/source-highlight-2.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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.5 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" - -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}/${P}.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 -} |