New upstream version.

6 files changed, 75 insertions, 10 deletions

diff --git a/dev-java/ibm-jre/Manifest b/dev-java/ibm-jre/Manifest
index 16ddbabca952..6195d38b80a4 100644
--- a/dev-java/ibm-jre/Manifest
+++ b/dev-java/ibm-jre/Manifest
@@ -1,11 +1,13 @@
+MD5 580e25c197d305277835b6fbebe7a856 ChangeLog 4012
 MD5 1fff1680f8255c28f0a81a5717724f4e ibm-jre-1.3.0-r3.ebuild 1682
-MD5 c937d18c5faa2e6eed7fd8874a4ed46c ibm-jre-1.3.1-r2.ebuild 1111
+MD5 109ccc22ea6c2107aa6df02c9ea86e39 ibm-jre-1.4.1-r2.ebuild 1115
+MD5 3e5cd63ac11ae1cc14cbd46d0d78dca6 ibm-jre-1.3.1-r2.ebuild 1112
 MD5 9b9bd16b55d2b413b1929c4825d6096c ibm-jre-1.4.1.ebuild 1085
-MD5 8f783472ed052451c5fde70882834bb4 ChangeLog 3878
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.4.1 0
-MD5 a73a7fe7c8d1fdc4b889de313c038fa5 files/ibm-jre-1.3.0 524
-MD5 9d2bb8d0966243d813fa88c5d0563a6c files/ibm-jre-1.3.1 524
-MD5 57e3e27785689594b9711c9e0243988b files/ibm-jre-1.4.1 771
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.0-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.4.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.1-r2 0
+MD5 57e3e27785689594b9711c9e0243988b files/ibm-jre-1.4.1 771
+MD5 fb6ad5a25869a2abd57b7caa6f8b6405 files/digest-ibm-jre-1.4.1-r2 67
+MD5 35761731c07d7034a5a93817ffbf2d16 files/ibm-jre-1.3.0 525
+MD5 ffef27912383f4c7f104e78945ecd7c9 files/ibm-jre-1.3.1 525
diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index bcf0d4c2f04d..2d9201551a1d 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.11 2003/10/05 15:52:33 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.12 2004/01/09 09:23:46 karltk Exp $
 
+*kaffe-1.1.3 (09 Jan 2004)
+
+  09 Jan 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  kaffe-1.1.3.ebuild files/kaffe-1.1.3: New upstream version.
+  
   05 Oct 2003; David Holm <dholm@gentoo.org> kaffe-1.1.0.ebuild:
   Added to ~ppc.
 
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index 72eea66cca54..99430988cade 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,12 +1,15 @@
-MD5 9ba0173aec2d6fecd2a8e04353f67a28 ChangeLog 1827
+MD5 0bdce886e5f3517f63c4d649394d1bc6 ChangeLog 1978
 MD5 6ca75d42cc5f9d5abcb8288cbb748644 kaffe-1.0.6-r3.ebuild 902
 MD5 ad55937f63a11874f18afa20ec5afad8 kaffe-1.0.7_rc1-r1.ebuild 840
 MD5 cee7ebfd6273eab3199a9040518ddb88 kaffe-1.1.0.ebuild 840
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 838059907282265dbee0d6dfec0a982c kaffe-1.1.3.ebuild 913
 MD5 0a77b3e87d6be7b2253a581fedc865bf files/kaffe-1.1.0 550
 MD5 22d8f8b117ca1322d67d6343f07aca01 files/30kaffe 89
+MD5 63bb35d4480ac67d75e064e275936710 files/kaffe-1.1.3 550
 MD5 9a19e608288e9877e97f98ca8de8ef9a files/digest-kaffe-1.0.6-r3 64
 MD5 08588ae6ef3e4824baadb98e32d77267 files/digest-kaffe-1.0.7_rc1-r1 68
-MD5 ef9811f6125f5297bd5af820e74053c9 files/digest-kaffe-1.1.0 64
 MD5 e1e85617ddd8dde310270aca97602090 files/kaffe-1.0.6-r3-gentoo.diff 380
-MD5 e553b1020af1c1c8d98041dffca2f51b files/kaffe-1.0.7_rc1 603
+MD5 3140583f6fb7d3b73227b446e463cc30 files/kaffe-1.0.7_rc1 604
+MD5 ef9811f6125f5297bd5af820e74053c9 files/digest-kaffe-1.1.0 64
+MD5 10a58379e740914e03778358a2864f77 files/digest-kaffe-1.1.3 64
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.3 b/dev-java/kaffe/files/digest-kaffe-1.1.3
new file mode 100644
index 000000000000..a5b77c164d41
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.3
@@ -0,0 +1 @@
+MD5 2563e002e554b1c1644cb84cc3eaba74 kaffe-1.1.3.tar.gz 8937585
diff --git a/dev-java/kaffe/files/kaffe-1.1.3 b/dev-java/kaffe/files/kaffe-1.1.3
new file mode 100644
index 000000000000..7b1548d64a17
--- /dev/null
+++ b/dev-java/kaffe/files/kaffe-1.1.3
@@ -0,0 +1,14 @@
+# Copyright 2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Karl Trygve Kalleberg
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/files/kaffe-1.1.3,v 1.1 2004/01/09 09:23:46 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.3.ebuild b/dev-java/kaffe/kaffe-1.1.3.ebuild
new file mode 100644
index 000000000000..a49c268f59cd
--- /dev/null
+++ b/dev-java/kaffe/kaffe-1.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.3.ebuild,v 1.1 2004/01/09 09:23:46 karltk Exp $
+
+inherit java
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="A cleanroom, open source Java VM and class libraries"
+SRC_URI="http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/${P/_/-}.tar.gz"
+HOMEPAGE="http://www.kaffe.org/"
+DEPEND=">=dev-libs/gmp-3.1
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	virtual/glibc
+	virtual/x11
+	>=dev-java/java-config-0.2.4"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_compile() {
+	./configure \
+		--prefix=/opt/${P} \
+		--host=${CHOST} \
+		`use_enable alsa`\
+		`use_enable esd`
+	# --with-bcel
+	# --with-profiling
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
+}