Unmasking for x86.

5 files changed, 3 insertions, 88 deletions

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 5959a7bf2ba4..506e576d8d2c 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,10 +1,7 @@
 MD5 ddf63ab506724620f31c5c0128f4d080 sun-jdk-1.3.1.08.ebuild 2252
-MD5 e6a84feb29e2b277e7e233e8dc66b39c sun-jdk-1.4.1.03.ebuild 1635
-MD5 497bb12bcd594ebfe5f7237849a4d2db sun-jdk-1.4.1.02-r1.ebuild 1638
+MD5 1bd2e4f4e5f769fd99be1f2396e6ec9a sun-jdk-1.4.1.03.ebuild 1635
 MD5 f9ee120eebe2b448bca523b4d952fe18 ChangeLog 10633
 MD5 8a81df1198a6df40e3b76b671c047f56 files/sun-jdk-1.3.1.08 625
-MD5 99a2cedb79eb346bcb0829f06628ed67 files/sun-jdk-1.4.1.02 601
 MD5 5a41bdc7140aa72827c82fbf14f08f9b files/sun-jdk-1.4.1.03 557
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.02-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.3.1.08 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.03 0
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.02-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.02-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.02-r1
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.1.02 b/dev-java/sun-jdk/files/sun-jdk-1.4.1.02
deleted file mode 100644
index 9d1f7c5c9fa7..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1.02
+++ /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/sun-jdk/files/sun-jdk-1.4.1.02,v 1.3 2003/05/27 16:33:51 strider Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.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/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild
deleted file mode 100644
index 6751675fe1ce..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild
+++ /dev/null
@@ -1,67 +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/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild,v 1.2 2003/05/24 06:19:45 absinthe Exp $
-
-IUSE="doc"
-
-inherit java nsplugins
-
-At="j2sdk-1_4_1_02-linux-i586.bin"
-S="${WORKDIR}/j2sdk1.4.1_02"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_02"
-HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
-SRC_URI=""
-
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
-
-DEPEND=">=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
-
-RDEPEND="sys-libs/lib-compat"
-
-PROVIDE="virtual/jre-1.4
-	virtual/jdk-1.4
-	virtual/java-scheme-2"
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE} (select the \"Linux self-extracting file\" package format of the SDK) and move it to ${DISTDIR}"
-	fi
-	tail +430 ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-}
-
-src_install () {
-	local dirs="bin include jre lib"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -a $i ${D}/opt/${P}/
-	done
-
-	dodoc COPYRIGHT README LICENSE
-	dohtml README.html
-
-	doman man/man1/*.1
-
-	dodir /opt/${P}/share/
-	cp -a demo src.zip ${D}/opt/${P}/share/
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
index 352e038abff9..3edd95b40946 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.03.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/sun-jdk/sun-jdk-1.4.1.03.ebuild,v 1.1 2003/06/07 03:21:47 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild,v 1.2 2003/06/16 22:32:20 absinthe Exp $
 
 IUSE="doc"
 
@@ -14,7 +14,7 @@ SRC_URI=""
 
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
 
 DEPEND=">=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )"