Gentoo Archives: gentoo-commits

From: "Petteri Raty (betelgeuse)" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/gjdoc: ChangeLog gjdoc-0.7.9.ebuild
Date: Wed, 01 Oct 2008 14:01:52
Message-Id: E1Kl2Gz-0007b9-0p@stork.gentoo.org
1 betelgeuse 08/10/01 14:01:49
2
3 Modified: ChangeLog gjdoc-0.7.9.ebuild
4 Log:
5 Don't run econf twice.
6 (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)
7
8 Revision Changes Path
9 1.34 dev-java/gjdoc/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gjdoc/ChangeLog?rev=1.34&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gjdoc/ChangeLog?rev=1.34&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gjdoc/ChangeLog?r1=1.33&r2=1.34
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v
18 retrieving revision 1.33
19 retrieving revision 1.34
20 diff -u -r1.33 -r1.34
21 --- ChangeLog 27 Sep 2008 12:28:26 -0000 1.33
22 +++ ChangeLog 1 Oct 2008 14:01:48 -0000 1.34
23 @@ -1,6 +1,9 @@
24 # ChangeLog for dev-java/gjdoc
25 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.33 2008/09/27 12:28:26 betelgeuse Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.34 2008/10/01 14:01:48 betelgeuse Exp $
28 +
29 + 01 Oct 2008; Petteri Räty <betelgeuse@g.o> gjdoc-0.7.9.ebuild:
30 + Don't run econf twice.
31
32 27 Sep 2008; Petteri Räty <betelgeuse@g.o> gjdoc-0.7.9.ebuild:
33 Use EAPI 2 use dependencies to require antlr with the java use flag. Fixes
34
35
36
37 1.3 dev-java/gjdoc/gjdoc-0.7.9.ebuild
38
39 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild?rev=1.3&view=markup
40 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild?rev=1.3&content-type=text/plain
41 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild?r1=1.2&r2=1.3
42
43 Index: gjdoc-0.7.9.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild,v
46 retrieving revision 1.2
47 retrieving revision 1.3
48 diff -u -r1.2 -r1.3
49 --- gjdoc-0.7.9.ebuild 27 Sep 2008 12:28:26 -0000 1.2
50 +++ gjdoc-0.7.9.ebuild 1 Oct 2008 14:01:48 -0000 1.3
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2008 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild,v 1.2 2008/09/27 12:28:26 betelgeuse Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild,v 1.3 2008/10/01 14:01:48 betelgeuse Exp $
56
57 EAPI=2
58 JAVA_PKG_IUSE="source"
59 @@ -39,7 +39,7 @@
60 AT_M4DIR="m4" eautoreconf
61 }
62
63 -src_compile() {
64 +src_configure() {
65 # I think that configure will do --enable-native if it finds gcj
66 # so we'll disable it explicitly
67 local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native"
68 @@ -52,8 +52,10 @@
69 JAVA="java" JAVAC="javac $(java-pkg_javac-args)" \
70 econf ${myc} \
71 $(use_enable xmldoclet) || die "econf failed"
72 +}
73
74 - emake || die "emake failed"
75 +src_compile() {
76 + default # Don't use from java-pkg-2
77 }
78
79 src_install() {