From f9979999ad2cc354caa47252b0eff8a6fe01cfb5 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 9 May 2010 09:55:05 +0000 Subject: Fix build against >=dev-tex/tex4ht-20090611_p1038-r1. Thanks to andreas schürch for reporting bug #318963 (Portage version: 2.1.8.3/cvs/Linux x86_64) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-java/dbus-java/ChangeLog | 6 +++++- dev-java/dbus-java/dbus-java-2.7-r1.ebuild | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'dev-java/dbus-java') diff --git a/dev-java/dbus-java/ChangeLog b/dev-java/dbus-java/ChangeLog index 9e04f582dfa5..0fbf8dbb8c69 100644 --- a/dev-java/dbus-java/ChangeLog +++ b/dev-java/dbus-java/ChangeLog @@ -1,6 +1,10 @@ # 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.11 2010/04/05 15:11:56 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.12 2010/05/09 09:55:05 pacho Exp $ + + 09 May 2010; Pacho Ramos dbus-java-2.7-r1.ebuild: + Fix build against >=dev-tex/tex4ht-20090611_p1038-r1. Thanks to andreas + schürch for reporting bug #318963 05 Apr 2010; Pawel Hajdan jr dbus-java-2.7-r1.ebuild: 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 81a4b179aba3..c502b33a31a1 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.2 2010/04/05 15:11:56 phajdan.jr Exp $ +# $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 $ EAPI="2" @@ -30,6 +30,13 @@ DEPEND=">=virtual/jdk-1.5 java_prepare() { epatch "${FILESDIR}/${PN}-2.5.1-jarfixes.patch" + + # 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 + fi } src_compile() { -- cgit v1.2.3-65-gdbad