diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-05-09 14:38:53 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-05-09 14:38:53 +0000 |
| commit | 1329e651d9a336d1be99b19a0a28764e1ca704dc (patch) | |
| tree | d6713debd43b9a41f754537ad790a3323c1a3bfa /dev-java/dbus-java | |
| parent | Fix findutils SELinux patch to deal with whitespace changes in findutils 4.4.... (diff) | |
| download | gentoo-2-1329e651d9a336d1be99b19a0a28764e1ca704dc.tar.gz gentoo-2-1329e651d9a336d1be99b19a0a28764e1ca704dc.tar.bz2 gentoo-2-1329e651d9a336d1be99b19a0a28764e1ca704dc.zip | |
Always use proper htlatex using mk4ht as suggested by Alexis Ballier in bug #318963
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/dbus-java')
| -rw-r--r-- | dev-java/dbus-java/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/dbus-java/dbus-java-2.7-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-java/dbus-java/files/dbus-java-htlatex.patch | 11 |
3 files changed, 19 insertions, 5 deletions
diff --git a/dev-java/dbus-java/ChangeLog b/dev-java/dbus-java/ChangeLog index 0fbf8dbb8c69..03b3221d199c 100644 --- a/dev-java/dbus-java/ChangeLog +++ b/dev-java/dbus-java/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/dbus-java # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.12 2010/05/09 09:55:05 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.13 2010/05/09 14:38:53 pacho Exp $ + + 09 May 2010; Pacho Ramos <pacho@gentoo.org> dbus-java-2.7-r1.ebuild, + +files/dbus-java-htlatex.patch: + Always use proper htlatex using mk4ht as suggested by Alexis Ballier in + bug #318963 09 May 2010; Pacho Ramos <pacho@gentoo.org> dbus-java-2.7-r1.ebuild: Fix build against >=dev-tex/tex4ht-20090611_p1038-r1. Thanks to andreas diff --git a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild index c502b33a31a1..91561fc93d1d 100644 --- a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild +++ b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/dbus-java-2.7-r1.ebuild,v 1.3 2010/05/09 09:55:05 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/dbus-java-2.7-r1.ebuild,v 1.4 2010/05/09 14:38:53 pacho Exp $ EAPI="2" @@ -33,9 +33,7 @@ java_prepare() { # dev-tex/tex4ht changed htlatex path, see bug #318963 if use doc; then - if has_version ">=dev-tex/tex4ht-20090611_p1038-r1" ; then - sed -i -e 's:htlatex:/usr/share/texmf/tex/generic/tex4ht/htlatex:' Makefile || die - fi + epatch "${FILESDIR}/${PN}-htlatex.patch" fi } diff --git a/dev-java/dbus-java/files/dbus-java-htlatex.patch b/dev-java/dbus-java/files/dbus-java-htlatex.patch new file mode 100644 index 000000000000..ebb278ad169b --- /dev/null +++ b/dev-java/dbus-java/files/dbus-java-htlatex.patch @@ -0,0 +1,11 @@ +--- Makefile~ 2009-11-01 14:53:27.000000000 +0100 ++++ Makefile 2010-05-08 16:26:10.000000000 +0200 +@@ -131,7 +131,7 @@ + (cd doc; pdflatex ../dbus-java.tex) + doc/dbus-java/index.html: dbus-java.tex .doc + mkdir -p doc/dbus-java/ +- (cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate") ++ (cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env mk4ht htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate") + rm -f doc/dbus-java/*{4ct,4tc,aux,dvi,idv,lg,log,tmp,xref} + cp doc/dbus-java/dbus-java.html doc/dbus-java/index.html + doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc |