summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-01-23 08:40:41 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-01-23 08:40:41 +0000
commit9d77a33b74136672ff28af454721d3c3972dca8a (patch)
treefe203321a219585aeafa304b8bea5ddb1a47ded5
parentAdded missing ~amd64 keyword. (diff)
downloadgentoo-2-9d77a33b74136672ff28af454721d3c3972dca8a.tar.gz
gentoo-2-9d77a33b74136672ff28af454721d3c3972dca8a.tar.bz2
gentoo-2-9d77a33b74136672ff28af454721d3c3972dca8a.zip
Forcing to use java and javac binaries to solve bug #116804. Thanks to Zac Medico <zmedico@gmail.com> for the fix.
(Portage version: 2.1_pre3-r1)
-rw-r--r--dev-java/gjdoc/ChangeLog8
-rw-r--r--dev-java/gjdoc/Manifest12
-rw-r--r--dev-java/gjdoc/gjdoc-0.7.7.ebuild10
3 files changed, 14 insertions, 16 deletions
diff --git a/dev-java/gjdoc/ChangeLog b/dev-java/gjdoc/ChangeLog
index 6f58fe0c42a0..02bb20a5698c 100644
--- a/dev-java/gjdoc/ChangeLog
+++ b/dev-java/gjdoc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/gjdoc
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.6 2005/12/19 22:30:22 betelgeuse Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/ChangeLog,v 1.7 2006/01/23 08:40:41 betelgeuse Exp $
+
+ 23 Jan 2006; Petteri Räty <betelgeuse@gentoo.org> gjdoc-0.7.7.ebuild:
+ Forcing to use java and javac binaries to solve bug #116804. Thanks to Zac
+ Medico <zmedico@gmail.com> for the fix.
*gjdoc-0.7.7 (19 Dec 2005)
diff --git a/dev-java/gjdoc/Manifest b/dev-java/gjdoc/Manifest
index 68ba2053913a..17d23d88b41b 100644
--- a/dev-java/gjdoc/Manifest
+++ b/dev-java/gjdoc/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 7e6044567363cd5301cb58a97af02b8f ChangeLog 1086
MD5 40aac295afe989059e3e986ffa925c68 files/digest-gjdoc-0.7.6 63
MD5 40b0dffd7b5e5a46ff066bf04a1fdb82 files/digest-gjdoc-0.7.7 63
MD5 09c41d12fbdde13c5d1d4a64aa66bd0f files/gjdoc 137
MD5 76cd0302fff68515662bf77e893fde95 gjdoc-0.7.6.ebuild 1517
-MD5 7be61f211919f5e3fb54a3278cb2625f gjdoc-0.7.7.ebuild 1630
+MD5 4282fe571ec4acdffb663054e0ffcbd2 gjdoc-0.7.7.ebuild 1760
MD5 0d8df1cd88e392aa059af56ac1d368e9 metadata.xml 535
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDsvo6QiJ/wx066S4RAh09AJ0YEwlo0O9EJzkbJz/Zx8aJQUSuRgCggw1x
-tTqZLfG0wxyd0yUWuwLfE24=
-=Urc1
------END PGP SIGNATURE-----
diff --git a/dev-java/gjdoc/gjdoc-0.7.7.ebuild b/dev-java/gjdoc/gjdoc-0.7.7.ebuild
index 9fb285bd754f..27b59475b382 100644
--- a/dev-java/gjdoc/gjdoc-0.7.7.ebuild
+++ b/dev-java/gjdoc/gjdoc-0.7.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.7.ebuild,v 1.2 2005/12/28 20:48:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gjdoc/gjdoc-0.7.7.ebuild,v 1.3 2006/01/23 08:40:41 betelgeuse Exp $
inherit java-pkg
@@ -35,7 +35,11 @@ src_compile() {
local myc="--with-antlr-jar=$(java-pkg_getjar antlr antlr.jar) --disable-native"
myc="${myc} --disable-dependency-tracking"
- econf ${myc} \
+ # Does not work with gcc 3.* and without these it tries to use gij
+ # see bug #116804 for details
+
+ JAVA="java" JAVAC="javac" \
+ econf ${myc} \
$(use_enable xmldoclet) || die "econf failed"
emake || die "emake failed"