Always use proper htlatex using mk4ht as suggested by Alexis Ballier in bug #318963

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 25 insertions, 10 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/Manifest b/dev-java/dbus-java/Manifest
index 80bb23fd9de0..0c1aae06b86a 100644
--- a/dev-java/dbus-java/Manifest
+++ b/dev-java/dbus-java/Manifest
@@ -4,16 +4,17 @@ Hash: SHA1
 AUX TestSignalInterface2-2.5.1.java 1353 RMD160 9487889e8c6d473e4f00e7faeae6e45d19ea8354 SHA1 c7a49f45ff34f2b4e307b76285d9b7f29762ec83 SHA256 8d96e31741c9047cd69e90de1227f66c291a018bec8889934b08a93f1d4ee715
 AUX dbus-java-2.5.1-jarfixes.patch 1761 RMD160 bddd441f449e4265141f08ab3760cb123b545e20 SHA1 cf67191e25ab3cc113b924436b79b2313aeebf25 SHA256 62ac2a80728468a4e32c07a67c244eba088b6bc434fa6e3ede4bd3cf508fb557
 AUX dbus-java-2.6-disconnectfix.patch 867 RMD160 51a9e4ec3617d73e1c8f9fb17fede84122d2c6b3 SHA1 615dae684fd5d5ba8693bff190f30b8dc342e90a SHA256 7e61e58fc37f24ff797993da089b35906f4fb68a10aa6e979d3eb47891fc5c3c
+AUX dbus-java-htlatex.patch 638 RMD160 aba1ca1c3866009746e657ad18e8dd006bd19aa0 SHA1 a50b379a720e3fecf0c91dc73070661e93f257bd SHA256 2744afb097919c3ffdca8e2846c7d8644097b38da916dec402c55bb51da77919
 DIST dbus-java-2.5.1.tar.gz 140675 RMD160 bf0b6219837be8b313ccfabb39aba5a3a71c31e0 SHA1 7df2a9eef164ec4127df7c598dbe02e2fda75da9 SHA256 46db0d65ecadaa0bf90eb7b285609454a0b7439e09655dc722e3f61f2d01bdb2
 DIST dbus-java-2.7.tar.gz 145450 RMD160 b0e3603538b1ee009f83e33b8e2b570cf81411b2 SHA1 85f7b0900646fb21cf549b90bd45d34e80cd6ad8 SHA256 be404ea36284d938646192d0ee42e146853064217d4e3aaf89b56bd351ebca33
 EBUILD dbus-java-2.5.1.ebuild 2848 RMD160 df16071ef7798ba085eeed8b4c20f0fdabb1330a SHA1 3808a3bbc9f6bc2219193ac132f78d440bbb0d5e SHA256 d0e899f4bd11a19166d64a959481354a7d0d3a67593d06ebb09ed0b0beedecc8
-EBUILD dbus-java-2.7-r1.ebuild 2953 RMD160 efb5c53b41d4986eedfcf2d759ad810fa7763d7a SHA1 e4254fd973a7a4c04cb658dba045769ec122e877 SHA256 fcf70fb1666cb5859aaaa87d083afb52922adf5fd152ea737227c8218d967cd8
-MISC ChangeLog 2031 RMD160 3ef5d511203a6f3d87730687ddbd92a1a9f82f6f SHA1 236ae160e5f7647fc944e4862ea26ba1d5fdd459 SHA256 f0f6b30da2b27bbeb7ad6d53492b451bbcceae55408f710f958a7993747b3ff2
+EBUILD dbus-java-2.7-r1.ebuild 2844 RMD160 a9ba5bb0638389bec11e5518a7cf93f8ecb595f0 SHA1 557d7f23a1bbe81777d20e4d3b3967cf4d4ae79f SHA256 8d103bf1ece9ff986417edfa0c8e06f0a747522047e19e13ba5a1809eddb30e1
+MISC ChangeLog 2225 RMD160 a6c799e9da0986a265a62b037489026fb8cdeeb7 SHA1 7202eaa69fe3f0c19a3a3c85271dfbd9f570a4bf SHA256 a5671647401c840f81b17be61d753744d1730c4b542aa6b4d8abba94585d3b1a
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvmhn8ACgkQCaWpQKGI+9RWFQCfQ4P59SGbs2D949VwKuRU/n7d
-lTIAoIar168ISaj4ADpPnbra/ncYx/U9
-=6nq3
+iEYEARECAAYFAkvmyQMACgkQCaWpQKGI+9QbcQCcD+EK5tR5imym1X+GsgRMF2Mt
+hkcAn1b137szGNLOZjb+4VrD/41PI7My
+=pctn
 -----END PGP SIGNATURE-----
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