summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-10-01 14:01:48 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-10-01 14:01:48 +0000
commit6b6afe4cfa72b6efbc91ec2c275c052ca0fab57d (patch)
tree314f18f0c568bc02f3671d8b9bdea4849d9e8086 /dev-java/gjdoc
parentunmask cairo 1.8.0 since it's ready to go (diff)
downloadgentoo-2-6b6afe4cfa72b6efbc91ec2c275c052ca0fab57d.tar.gz
gentoo-2-6b6afe4cfa72b6efbc91ec2c275c052ca0fab57d.tar.bz2
gentoo-2-6b6afe4cfa72b6efbc91ec2c275c052ca0fab57d.zip
Don't run econf twice.
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'dev-java/gjdoc')
-rw-r--r--dev-java/gjdoc/ChangeLog5
-rw-r--r--dev-java/gjdoc/gjdoc-0.7.9.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-java/gjdoc/ChangeLog b/dev-java/gjdoc/ChangeLog
index ae88c0035494..e57bc6ad1438 100644
--- a/dev-java/gjdoc/ChangeLog
+++ b/dev-java/gjdoc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/gjdoc
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.33 2008/09/27 12:28:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.34 2008/10/01 14:01:48 betelgeuse Exp $
+
+ 01 Oct 2008; Petteri Räty <betelgeuse@gentoo.org> gjdoc-0.7.9.ebuild:
+ Don't run econf twice.
27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> gjdoc-0.7.9.ebuild:
Use EAPI 2 use dependencies to require antlr with the java use flag. Fixes
diff --git a/dev-java/gjdoc/gjdoc-0.7.9.ebuild b/dev-java/gjdoc/gjdoc-0.7.9.ebuild
index 3ece8917c74b..d7b137342ce2 100644
--- a/dev-java/gjdoc/gjdoc-0.7.9.ebuild
+++ b/dev-java/gjdoc/gjdoc-0.7.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild,v 1.2 2008/09/27 12:28:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.9.ebuild,v 1.3 2008/10/01 14:01:48 betelgeuse Exp $
EAPI=2
JAVA_PKG_IUSE="source"
@@ -39,7 +39,7 @@ src_unpack() {
AT_M4DIR="m4" eautoreconf
}
-src_compile() {
+src_configure() {
# I think that configure will do --enable-native if it finds gcj
# so we'll disable it explicitly
local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native"
@@ -52,8 +52,10 @@ src_compile() {
JAVA="java" JAVAC="javac $(java-pkg_javac-args)" \
econf ${myc} \
$(use_enable xmldoclet) || die "econf failed"
+}
- emake || die "emake failed"
+src_compile() {
+ default # Don't use from java-pkg-2
}
src_install() {