Version bump and some clean up.

9 files changed, 45 insertions, 65 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 4b078cf470cd..e9721980a099 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.14 2004/03/11 01:46:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.15 2004/03/22 07:03:39 zx Exp $
+
+*kaffe-1.1.4 (22 Mar 2004)
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> kaffe-1.0.6-r3.ebuild,
+  kaffe-1.0.7_rc1-r1.ebuild, kaffe-1.1.0.ebuild, kaffe-1.1.4.ebuild,
+  files/kaffe-1.1.4:
+  Version bump and some clean up
 
   10 Mar 2004; Jason Wever <weeve@gentoo.org> kaffe-1.1.3.ebuild:
   Added ~sparc keyword.
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index 6ead2779cf6a..6a59e8fc63bb 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,16 +1,15 @@
-MD5 6b4c47696e98d735d183a4a5de543b81 ChangeLog 2208
-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 186bac22bdc5ea2a648beaaac61590dc kaffe-1.0.7_rc1-r1.ebuild 833
+MD5 5721374ab314ff1d8346f08f45962966 kaffe-1.1.3.ebuild 965
+MD5 40aa6c741b1e4ad74760b30aa675478c ChangeLog 2426
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 75dc79c5abbd565ffe60e12e3cf62c94 kaffe-1.1.3.ebuild 966
-MD5 7e69dac2cc4c9b397df5f10ae2937123 files/kaffe-1.1.0 513
+MD5 59fd388621540c099185debd084fef6b kaffe-1.1.4.ebuild 861
+MD5 53c2ea389cf31fb54d43d24f31de1e11 files/kaffe-1.1.0 512
+MD5 02019aa9201cc0e32b58d6987d2b802b files/kaffe-1.1.3 512
+MD5 d98cbcf9a8ec3894d5537fa9e2d22b96 files/kaffe-1.1.4 508
 MD5 22d8f8b117ca1322d67d6343f07aca01 files/30kaffe 89
-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 d585a2986080134588e2665f14479d24 files/kaffe-1.0.7_rc1 517
-MD5 10a58379e740914e03778358a2864f77 files/digest-kaffe-1.1.3 64
-MD5 94759a4fc6fd4cb9f73abef5182ea326 files/kaffe-1.1.3 513
 MD5 eba08dacb4ca2151bb44966c8f3fc005 files/kaffe-1.1.3-alsa-fix.patch 1129
+MD5 10a58379e740914e03778358a2864f77 files/digest-kaffe-1.1.3 64
+MD5 d9c1b3469316eb29e7b79058353f007f files/digest-kaffe-1.1.4 64
+MD5 dd7bce53599356136e6026d60d53518d files/kaffe-1.0.7_rc1 516
+MD5 08588ae6ef3e4824baadb98e32d77267 files/digest-kaffe-1.0.7_rc1-r1 68
diff --git a/dev-java/kaffe/files/digest-kaffe-1.0.6-r3 b/dev-java/kaffe/files/digest-kaffe-1.0.6-r3
deleted file mode 100644
index d8e798deedbd..000000000000
--- a/dev-java/kaffe/files/digest-kaffe-1.0.6-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a900dd33e7bde48d2fa94ada273e80e kaffe-1.0.6.tar.gz 3586207
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.0 b/dev-java/kaffe/files/digest-kaffe-1.1.0
deleted file mode 100644
index 6e1b2db4a2e4..000000000000
--- a/dev-java/kaffe/files/digest-kaffe-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b761b506bfb1d0995f4dd20abba9e24f kaffe-1.1.0.tar.gz 7713155
diff --git a/dev-java/kaffe/files/digest-kaffe-1.1.4 b/dev-java/kaffe/files/digest-kaffe-1.1.4
new file mode 100644
index 000000000000..ea8519bcf9a7
--- /dev/null
+++ b/dev-java/kaffe/files/digest-kaffe-1.1.4
@@ -0,0 +1 @@
+MD5 94d6e7035ba68c2221dce68bb5b3f6e9 kaffe-1.1.4.tar.gz 8891220
diff --git a/dev-java/kaffe/files/kaffe-1.1.4 b/dev-java/kaffe/files/kaffe-1.1.4
new file mode 100644
index 000000000000..e5186a88e639
--- /dev/null
+++ b/dev-java/kaffe/files/kaffe-1.1.4
@@ -0,0 +1,13 @@
+# 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/files/kaffe-1.1.4,v 1.1 2004/03/22 07:03:39 zx 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.0.6-r3.ebuild b/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
deleted file mode 100644
index aa6b2935ff3c..000000000000
--- a/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.6-r3.ebuild,v 1.8 2003/09/11 01:07:22 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A cleanroom, open source Java VM and class libraries"
-SRC_URI="http://www.kaffe.org/ftp/pub/kaffe/${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"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-src_unpack() {
-	unpack ${A}
-	patch -p0 <${FILESDIR}/${PF}-gentoo.diff || die
-}
-
-src_compile() {
-	./configure --host=${CHOST}					\
-		    --prefix=/opt/kaffe
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/30kaffe
-	#30kaffe will set up the ld.so.path, path, manpath, etc.
-}
diff --git a/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild b/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild
index f8350258a8d1..6f1a2a0ae40a 100644
--- a/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild
+++ b/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.0.7_rc1-r1.ebuild,v 1.6 2003/09/11 01:07:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.7_rc1-r1.ebuild,v 1.7 2004/03/22 07:03:39 zx Exp $
 
 inherit java
 
diff --git a/dev-java/kaffe/kaffe-1.1.0.ebuild b/dev-java/kaffe/kaffe-1.1.4.ebuild
index d486f22517d9..dbe7382874df 100644
--- a/dev-java/kaffe/kaffe-1.1.0.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.0.ebuild,v 1.3 2003/10/05 15:52:33 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4.ebuild,v 1.1 2004/03/22 07:03:39 zx 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/"
@@ -16,20 +15,20 @@ DEPEND=">=dev-libs/gmp-3.1
 	>=dev-java/java-config-0.2.4"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-src_unpack() {
-	unpack ${A}
-}
+KEYWORDS="~x86 ~sparc"
 
 src_compile() {
-	./configure --host=${CHOST} \
-		    --prefix=/opt/${P}
+	./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
 }