Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/dbus-java: ChangeLog dbus-java-2.7-r1.ebuild
Date: Sun, 09 May 2010 09:55:09
Message-Id: 20100509095505.E3CB62950A@corvid.gentoo.org
1 pacho 10/05/09 09:55:05
2
3 Modified: ChangeLog dbus-java-2.7-r1.ebuild
4 Log:
5 Fix build against >=dev-tex/tex4ht-20090611_p1038-r1. Thanks to andreas schürch for reporting bug #318963
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.12 dev-java/dbus-java/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dbus-java/ChangeLog?rev=1.12&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dbus-java/ChangeLog?rev=1.12&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dbus-java/ChangeLog?r1=1.11&r2=1.12
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v
18 retrieving revision 1.11
19 retrieving revision 1.12
20 diff -u -r1.11 -r1.12
21 --- ChangeLog 5 Apr 2010 15:11:56 -0000 1.11
22 +++ ChangeLog 9 May 2010 09:55:05 -0000 1.12
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-java/dbus-java
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.11 2010/04/05 15:11:56 phajdan.jr Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-java/dbus-java/ChangeLog,v 1.12 2010/05/09 09:55:05 pacho Exp $
28 +
29 + 09 May 2010; Pacho Ramos <pacho@g.o> dbus-java-2.7-r1.ebuild:
30 + Fix build against >=dev-tex/tex4ht-20090611_p1038-r1. Thanks to andreas
31 + schürch for reporting bug #318963
32
33 05 Apr 2010; Pawel Hajdan jr <phajdan.jr@g.o>
34 dbus-java-2.7-r1.ebuild:
35
36
37
38 1.3 dev-java/dbus-java/dbus-java-2.7-r1.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dbus-java/dbus-java-2.7-r1.ebuild?rev=1.3&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dbus-java/dbus-java-2.7-r1.ebuild?rev=1.3&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dbus-java/dbus-java-2.7-r1.ebuild?r1=1.2&r2=1.3
43
44 Index: dbus-java-2.7-r1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-java/dbus-java/dbus-java-2.7-r1.ebuild,v
47 retrieving revision 1.2
48 retrieving revision 1.3
49 diff -u -r1.2 -r1.3
50 --- dbus-java-2.7-r1.ebuild 5 Apr 2010 15:11:56 -0000 1.2
51 +++ dbus-java-2.7-r1.ebuild 9 May 2010 09:55:05 -0000 1.3
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $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 $
56 +# $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 $
57
58 EAPI="2"
59
60 @@ -30,6 +30,13 @@
61
62 java_prepare() {
63 epatch "${FILESDIR}/${PN}-2.5.1-jarfixes.patch"
64 +
65 + # dev-tex/tex4ht changed htlatex path, see bug #318963
66 + if use doc; then
67 + if has_version ">=dev-tex/tex4ht-20090611_p1038-r1" ; then
68 + sed -i -e 's:htlatex:/usr/share/texmf/tex/generic/tex4ht/htlatex:' Makefile || die
69 + fi
70 + fi
71 }
72
73 src_compile() {