Fresh snapshot from upstream. Has a few issues, but better 1.4 coverage than 1.1.4 release.

5 files changed, 78 insertions, 12 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index cd5ea9336bda..2973ac0c9706 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.25 2004/11/12 12:19:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.26 2004/12/22 13:52:26 karltk Exp $
+
+*kaffe-1.1.4_p20041220 (22 Dec 2004)
+
+  22 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/kaffe-1.1.4_p20041220, +kaffe-1.1.4_p20041220.ebuild:
+  Snapshot of upstream development. They don't release early, nor often, but
+  work frantically. A lot of Java 1.4 stuff works a lot better with this 
+  snapshot than the 1.1.4 release, but it contains unresolved deadlocks in
+  the gc.
 
   12 Nov 2004; Thomas Matthijs <axxo@gentoo.org> kaffe-1.1.4.ebuild:
   follow ewarn/einfo policy #70872
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index 9c0c0648e0e1..3bf961922de0 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0392c5ef88e0dec390cabee9f44d9c52 ChangeLog 3513
+MD5 c622f691eb4630bb55445b71f8c32ab0 kaffe-1.1.4_p20041220.ebuild 1419
+MD5 6484d70337e004fc882e992b9e57c291 ChangeLog 3910
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d532b38d3ba6571d5b6c59e3c50e80d2 kaffe-1.1.4.ebuild 1241
+MD5 4a6fc17bcff6810e87fb591315e3d110 files/kaffe-1.1.4_p20041220 514
 MD5 5705b7951b83fc326ce97b101de8cb49 files/kaffe-1.1.4 506
 MD5 22d8f8b117ca1322d67d6343f07aca01 files/30kaffe 89
+MD5 89ab9ab78ed555baabd7d861d042b7c2 files/digest-kaffe-1.1.4_p20041220 75
 MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBlKpj/rLF9B432nYRAqk7AKDAxhn/t2YvXa4XN6KeI1mMDspUuACgm6+m
-2PRrKGYvYmBjwA0WL1U5shw=
-=F437
------END PGP SIGNATURE-----
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.4_p20041220 b/dev-java/kaffe/files/digest-kaffe-1.1.4_p20041220
new file mode 100644
index 000000000000..b368666b9e7f
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.4_p20041220
@@ -0,0 +1 @@
+MD5 aa49ee1b292b854baec34bb80c83a927 kaffe-20041220-gentoo.tar.gz 10767200
diff --git a/dev-java/kaffe/files/kaffe-1.1.4_p20041220 b/dev-java/kaffe/files/kaffe-1.1.4_p20041220
new file mode 100644
index 000000000000..d4f12e244617
--- /dev/null
+++ b/dev-java/kaffe/files/kaffe-1.1.4_p20041220
@@ -0,0 +1,13 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.4_p20041220,v 1.1 2004/12/22 13:52:26 karltk Exp $
+
+VERSION="Kaffe @PV@"
+JAVA_HOME=/opt/@P@
+CLASSPATH=/opt/@P@/jre/lib/rt.jar
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+MANPATH=/opt/@P@/man
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib/i386/"
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild b/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild
new file mode 100644
index 000000000000..d8e1718d2566
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4_p20041220.ebuild,v 1.1 2004/12/22 13:52:26 karltk Exp $
+
+inherit java
+
+date=${PV/*_p/}
+DESCRIPTION="A cleanroom, open source Java VM and class libraries"
+SRC_URI="http://dev.gentoo.org/~karltk/projects/java/distfiles/kaffe-${date}-gentoo.tar.gz"
+HOMEPAGE="http://www.kaffe.org/"
+DEPEND=">=dev-libs/gmp-3.1
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	virtual/libc
+	virtual/x11
+	>=dev-java/java-config-0.2.4
+	dev-java/jikes"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="alsa esd"
+
+PROVIDE="virtual/jdk-1.4
+	virtual/jre-1.4
+	virtual/java-scheme-2"
+S=${WORKDIR}/kaffe-${date}
+
+src_compile() {
+	./configure \
+		--prefix=/opt/${P} \
+		--host=${CHOST} \
+		`use_enable alsa`\
+		`use_enable esd` \
+		--with-jikes || die "Failed to configure"
+	# --with-bcel
+	# --with-profiling
+	make || die "Failed to compile"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "Failed to install"
+	set_java_env ${FILESDIR}/${VMHANDLE} || die "Failed to install environment files"
+}
+
+pkg_postinst() {
+	ewarn "By all means, do not use Kaffe as your default JDK/JRE!"
+	ewarn "Kaffe is currently meant for testing... it should be"
+	ewarn "only be used by developers or bug-hunters willing to deal"
+	ewarn "with oddities that are bound to come up while using Kaffe!"
+}