Fixes #2213 (again).

6 files changed, 12 insertions, 41 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 0fc4eb36c922..870443b4ab5e 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/kaffe
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.3 2002/05/04 15:24:21 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.4 2002/05/05 02:06:46 karltk Exp $
+
+*kaffe-1.0.6-r3 (05 May 2002)
+
+  05 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> kaffe-1.0.6-r3.ebuild files/digest-kaffe-1.0.6-r3:
+
+  Bumped revision for the patch-fix.
+
+  Removed kaffe-1.0.6-r2.ebuild files/digest-kaffe-1.0.6-r2
+  Removed kaffe-1.0.6-r1.ebuild files/digest-kaffe-1.0.6-r1
 
 
 *kaffe-1.0.6-r2 (12 Apr 2002)
diff --git a/dev-java/kaffe/files/digest-kaffe-1.0.6-r2 b/dev-java/kaffe/files/digest-kaffe-1.0.6-r2
deleted file mode 100644
index d8e798deedbd..000000000000
--- a/dev-java/kaffe/files/digest-kaffe-1.0.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a900dd33e7bde48d2fa94ada273e80e kaffe-1.0.6.tar.gz 3586207
diff --git a/dev-java/kaffe/files/digest-kaffe-1.0.6-r1 b/dev-java/kaffe/files/digest-kaffe-1.0.6-r3
index d8e798deedbd..d8e798deedbd 100644
--- a/dev-java/kaffe/files/digest-kaffe-1.0.6-r1
+++ b/dev-java/kaffe/files/digest-kaffe-1.0.6-r3
diff --git a/dev-java/kaffe/files/kaffe-1.0.6-r1-gentoo.diff b/dev-java/kaffe/files/kaffe-1.0.6-r3-gentoo.diff
index fd859c4fa0c8..fd859c4fa0c8 100644
--- a/dev-java/kaffe/files/kaffe-1.0.6-r1-gentoo.diff
+++ b/dev-java/kaffe/files/kaffe-1.0.6-r3-gentoo.diff
diff --git a/dev-java/kaffe/kaffe-1.0.6-r1.ebuild b/dev-java/kaffe/kaffe-1.0.6-r1.ebuild
deleted file mode 100644
index c4191e45ea26..000000000000
--- a/dev-java/kaffe/kaffe-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.6-r1.ebuild,v 1.1 2002/02/03 17:53:22 karltk 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.0.7
-	virtual/glibc
-	virtual/x11"
-
-src_unpack() {
-	unpack ${A}
-	patch -p0 <${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	./configure --host=${CHOST}					\
-		    --prefix=/opt/kaffe 
-	assert
-
-	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.6-r2.ebuild b/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
index 6ca2ed671b81..9b954cf2538d 100644
--- a/dev-java/kaffe/kaffe-1.0.6-r2.ebuild
+++ b/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.6-r2.ebuild,v 1.2 2002/05/04 15:24:21 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.6-r3.ebuild,v 1.1 2002/05/05 02:06:46 karltk Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A cleanroom, open source Java VM and class libraries"
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 
 src_unpack() {
 	unpack ${A}
-	patch -p0 <${FILESDIR}/${PV}-gentoo.diff
+	patch -p0 <${FILESDIR}/${PF}-gentoo.diff || die
 }
 
 src_compile() {