Clean up the tree a little updated keywords on 1.3.1-r3

10 files changed, 10 insertions, 200 deletions

diff --git a/dev-java/ibm-jdk/ChangeLog b/dev-java/ibm-jdk/ChangeLog
index 2db914b51630..b754cba53aa7 100644
--- a/dev-java/ibm-jdk/ChangeLog
+++ b/dev-java/ibm-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ibm-jdk
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.28 2003/09/22 03:15:56 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.29 2003/10/04 02:40:37 strider Exp $
+
+  03 Oct 2003; Adrian Almenar <strider@gentoo.org> ibm-jdk-1.3.0-r4.ebuild,
+  ibm-jdk-1.3.1-r1.ebuild, ibm-jdk-1.3.1-r3.ebuild, ibm-jdk-1.4.0-r1.ebuild,
+  files/ibm-jdk-1.3.0:
+  Clean up the tree a little updated keywords on 1.3.1-r3
 
   21 Sep 2003; Adrian Almenar <strider@gentoo.org> ibm-jdk-1.4.1.ebuild:
   Moved to stable for x86
diff --git a/dev-java/ibm-jdk/Manifest b/dev-java/ibm-jdk/Manifest
index 1bfd6592d543..234f2e483615 100644
--- a/dev-java/ibm-jdk/Manifest
+++ b/dev-java/ibm-jdk/Manifest
@@ -1,21 +1,14 @@
-MD5 8c9632e28d597200d5176e56b5326755 ibm-jdk-1.4.0-r1.ebuild 1226
 MD5 07b2728373dff64e3b4665c1085b8875 ibm-jdk-1.3.1-r2.ebuild 1251
-MD5 0e49c103ca84f2e2d2166f5a8ab652cd ibm-jdk-1.3.1-r1.ebuild 1332
-MD5 8cbe5468165d37bdfe35aa0f7456e577 ibm-jdk-1.3.0-r4.ebuild 1273
 MD5 96866baefcdee0f34b345bcfccc0fe20 ibm-jdk-1.4.0-r2.ebuild 1132
-MD5 594d19b5157a7a29a3fe10f5008aef22 ibm-jdk-1.3.1-r3.ebuild 1776
-MD5 cd8fcc70e58977dcf3e666f85c82c4fd ChangeLog 5908
+MD5 702a3fa4819558c1cd64ef5f1b6bc0ef ibm-jdk-1.3.1-r3.ebuild 1780
+MD5 779869d3a5511312b13420d9ad1269d6 ChangeLog 6143
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 0874dc9e9e028754455f311b4a5369b1 ibm-jdk-1.4.1.ebuild 1911
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.0-r4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.1-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.1-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.0-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.0-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.1 0
-MD5 75736c3713a763a0f9a45efd9e1da3a4 files/ibm-jdk-1.3.0 580
 MD5 9ae91d234d420cc6d86162f6baee6909 files/ibm-jdk-1.3.1 580
 MD5 676087c42e5c3d2cb63de0199ad6fb75 files/ibm-jdk-1.4.0 726
 MD5 c2a3afcbcfa06a46b04f5f93adf0c0c2 files/ibm-jdk-1.4.1 581
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r4 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r4
+++ /dev/null
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r1 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r1
+++ /dev/null
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r1 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r1
+++ /dev/null
diff --git a/dev-java/ibm-jdk/files/ibm-jdk-1.3.0 b/dev-java/ibm-jdk/files/ibm-jdk-1.3.0
deleted file mode 100644
index d54ad8e04ed3..000000000000
--- a/dev-java/ibm-jdk/files/ibm-jdk-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Karl Trygve Kalleberg
-# Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/files/ibm-jdk-1.3.0,v 1.5 2002/09/06 21:28:02 owen Exp $
-
-VERSION="IBM JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/jre/lib/rt.jar:.
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="/opt/@P@/jre/lib/"
-
-ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
deleted file mode 100644
index e8fb7b97a48b..000000000000
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
+++ /dev/null
@@ -1,57 +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/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.15 2003/09/06 22:26:46 msterret Exp $
-
-IUSE="doc"
-
-inherit java
-
-At=IBMJava2-SDK-13.tgz
-S=${WORKDIR}/IBMJava2-13
-DESCRIPTION="IBM JDK 1.3.0"
-SRC_URI=""
-HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
-
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
-	virtual/jdk-1.3.1
-	virtual/java-scheme-2"
-LICENSE="IBM-ILNWP"
-SLOT="1.3"
-KEYWORDS="x86 -ppc -sparc "
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	unpack ${At} || die
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-	for i in bin include jre lib ; do
-		cp -dpR $i ${D}/opt/${P}/
-	done
-
-	dodir /opt/${P}/share
-	for i in demo javasrc.jar ; do
-		cp -dpR $i ${D}/opt/${P}/share/
-	done
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc docs/COPYRIGHT
-
-	# Plugin is disabled as it crashes all the time
-#	if [ "`use mozilla`" ] ; then
-#		dodir /usr/lib/mozilla/plugins
-#		dosym /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-#	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
deleted file mode 100644
index 5e4de568320a..000000000000
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,58 +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/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.16 2003/09/06 22:26:46 msterret Exp $
-
-IUSE="doc"
-
-inherit java
-
-At=IBMJava2-SDK-131.tgz
-S=${WORKDIR}/IBMJava2-131
-DESCRIPTION="IBM JDK 1.3.1"
-SRC_URI=""
-HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
-
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
-	virtual/jdk-1.3.1
-	virtual/java-scheme-2"
-LICENSE="IBM-ILNWP"
-SLOT="1.3"
-KEYWORDS="x86 -ppc -sparc "
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	unpack ${At} || die
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-	for i in bin include jre lib ; do
-		cp -dpR $i ${D}/opt/${P}/
-	done
-
-	dodir /opt/${P}/share
-	for i in demo src.jar ; do
-		cp -dpR $i ${D}/opt/${P}/share/
-	done
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc docs/COPYRIGHT
-
-	# Plugin is disabled as it crashes all the time
-#	if [ "`use mozilla`" ] ; then
-#		dodir /usr/lib/mozilla/plugins
-#		dosym /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-#	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-# NOTE: We don't install the plugin, as it always segfaults.
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild
index 96ce8f0ad2dc..f5e8487ba2ab 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild,v 1.3 2003/09/08 07:20:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild,v 1.4 2003/10/04 02:40:37 strider Exp $
 
 IUSE="doc"
 
@@ -31,7 +31,7 @@ PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 LICENSE="IBM-ILNWP"
 SLOT="1.3"
-KEYWORDS="ppc"
+KEYWORDS="~x86 ppc"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.4.0-r1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.4.0-r1.ebuild
deleted file mode 100644
index 16050bf0264d..000000000000
--- a/dev-java/ibm-jdk/ibm-jdk-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,58 +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/ibm-jdk/ibm-jdk-1.4.0-r1.ebuild,v 1.9 2003/07/11 21:41:53 aliz Exp $
-
-IUSE="doc"
-
-inherit java nsplugins
-
-At="IBMJava2-SDK-14.tgz"
-S="${WORKDIR}/IBMJava2-14"
-DESCRIPTION="IBM JDK 1.4.0"
-SRC_URI=""
-HOMEPAGE="https://www6.software.ibm.com/dl/lxdk/lxdk-p"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.4* )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.4.0
-	virtual/jdk-1.4.0
-	virtual/java-scheme-2"
-LICENSE="IBM-ILNWP"
-SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	unpack ${At} || die
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-	for i in bin include jre lib ; do
-		cp -dpR $i ${D}/opt/${P}/
-	done
-
-	dodir /opt/${P}/share
-	for i in demo src.jar ; do
-		cp -dpR $i ${D}/opt/${P}/share/
-	done
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc docs/COPYRIGHT
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-
-
-}
-