summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-02-14 19:27:55 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-02-14 19:27:55 +0000
commit2ebf8cae20b8563f342a2a12e3fcabe5ecf97139 (patch)
treea42149091d32f760e1d65eb382e810041781cbc4
parentFix .desktop files, bug 147735, and drop monolithic X deps and virtual/libc a... (diff)
downloadgentoo-2-2ebf8cae20b8563f342a2a12e3fcabe5ecf97139.tar.gz
gentoo-2-2ebf8cae20b8563f342a2a12e3fcabe5ecf97139.tar.bz2
gentoo-2-2ebf8cae20b8563f342a2a12e3fcabe5ecf97139.zip
Use jikes-bin directly instead of the wrapper so that it's possible to emerge kaffe without a jdk already installed (bug #163801).
(Portage version: 2.1.2-r9)
-rw-r--r--dev-java/kaffe/ChangeLog8
-rw-r--r--dev-java/kaffe/kaffe-1.1.7-r4.ebuild8
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 3504b0b92183..30a2233a0f56 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/kaffe
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.65 2006/12/01 18:44:57 betelgeuse Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.66 2007/02/14 19:27:55 betelgeuse Exp $
+
+ 14 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> kaffe-1.1.7-r4.ebuild:
+ Use jikes-bin directly instead of the wrapper so that it's possible to
+ emerge kaffe without a jdk already installed (bug #163801).
*kaffe-1.1.7-r4 (01 Dec 2006)
diff --git a/dev-java/kaffe/kaffe-1.1.7-r4.ebuild b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild
index f21e5adb8313..0f750eff589a 100644
--- a/dev-java/kaffe/kaffe-1.1.7-r4.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r4.ebuild,v 1.1 2006/12/01 18:44:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r4.ebuild,v 1.2 2007/02/14 19:27:55 betelgeuse Exp $
JAVA_SUPPORTS_GENERATION_1="true"
inherit base eutils java-vm-2 flag-o-matic
@@ -19,7 +19,7 @@ DEPEND="
>=media-libs/jpeg-6b
>=media-libs/libpng-1.2.1
app-arch/zip
- dev-java/jikes
+ >=dev-java/jikes-1.22-r13
dev-libs/libxml2
sys-libs/zlib
gtk? (
@@ -99,7 +99,7 @@ src_compile() {
$(use_enable nls) \
$(use_enable gtk gtk-peer) \
${confargs} \
- --with-jikes \
+ --with-jikes=/usr/bin/jikes-bin \
--disable-gjdoc || die "Failed to configure."
# --with-bcel