Marking stable on x86, hppa. Some clean up. Closes #53169 also.

4 files changed, 2 insertions, 55 deletions

diff --git a/dev-java/kaffe/files/kaffe-1.0.7_rc1 b/dev-java/kaffe/files/kaffe-1.0.7_rc1
deleted file mode 100644
index b200d7862e3b..000000000000
--- a/dev-java/kaffe/files/kaffe-1.0.7_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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.0.7_rc1,v 1.2 2004/02/13 19:30:08 vapier 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/files/kaffe-1.1.3 b/dev-java/kaffe/files/kaffe-1.1.3
deleted file mode 100644
index acd78e102ce3..000000000000
--- a/dev-java/kaffe/files/kaffe-1.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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.3,v 1.2 2004/02/13 19:30:08 vapier 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/files/kaffe-1.1.3-alsa-fix.patch b/dev-java/kaffe/files/kaffe-1.1.3-alsa-fix.patch
deleted file mode 100644
index ef72fefe5c0d..000000000000
--- a/dev-java/kaffe/files/kaffe-1.1.3-alsa-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmHWParams.c.ark 2003-12-09 15:24:29.000000000 +0100
-+++ kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmHWParams.c 2003-12-09 15:25:24.000000000 +0100
-@@ -20,6 +20,11 @@
-  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+/* The following is needed for ALSA 1.x and doesn't have any effect on
-+ * ALSA 0.9.x
-+ */
-+#define ALSA_PCM_OLD_HW_PARAMS_API 1
-+
- #include "org_tritonus_lowlevel_alsa_AlsaPcmHWParams.h"
- #include "common.h"
- 
---- kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmSWParams.c.ark 2003-12-09 15:25:46.000000000 +0100
-+++ kaffe-1.1.3/libraries/extensions/sound/alsa/org_tritonus_lowlevel_alsa_AlsaPcmSWParams.c 2003-12-09 15:26:09.000000000 +0100
-@@ -20,6 +20,11 @@
-  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+/* The following is required on ALSA 1.0.x and doesn't have any effect
-+ * on ALSA 0.9.x
-+ */
-+#define ALSA_PCM_OLD_SW_PARAMS_API 1
-+
- #include "common.h"
- #include "org_tritonus_lowlevel_alsa_AlsaPcmSWParams.h"
diff --git a/dev-java/kaffe/kaffe-1.1.4.ebuild b/dev-java/kaffe/kaffe-1.1.4.ebuild
index 46d102ee59a3..8081a473d7d0 100644
--- a/dev-java/kaffe/kaffe-1.1.4.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.4 2004/03/29 03:54:18 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.4.ebuild,v 1.5 2004/06/20 20:43:16 zx Exp $
 
 inherit java
 
@@ -15,7 +15,7 @@ DEPEND=">=dev-libs/gmp-3.1
 		>=dev-java/java-config-0.2.4"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa"
+KEYWORDS="x86 ~sparc ~ppc hppa"
 
 PROVIDE="virtual/jdk-1.4
 		virtual/jre-1.4