Please see the ChangeLog.

8 files changed, 59 insertions, 149 deletions

diff --git a/dev-java/ibm-jdk/Manifest b/dev-java/ibm-jdk/Manifest
index d861171c863f..09c624012eb4 100644
--- a/dev-java/ibm-jdk/Manifest
+++ b/dev-java/ibm-jdk/Manifest
@@ -1,20 +1,9 @@
-MD5 f01f6b82426299c4475560ae915c01fc .ibm-jdk-1.4.1.ebuild.swp 12288
-MD5 07b2728373dff64e3b4665c1085b8875 ibm-jdk-1.3.1-r2.ebuild 1251
-MD5 aba1e231a4ce0070a51cd98e0dbbfadf ibm-jdk-1.3.1-r4.ebuild 2076
-MD5 bdc529ccc1118ba3efef580b9e57ad10 .ibm-jdk-1.4.1-r1.ebuild.swp 12288
-MD5 96866baefcdee0f34b345bcfccc0fe20 ibm-jdk-1.4.0-r2.ebuild 1132
-MD5 702a3fa4819558c1cd64ef5f1b6bc0ef ibm-jdk-1.3.1-r3.ebuild 1780
-MD5 814388263eb74a1ff73777afb492eea5 ibm-jdk-1.4.1-r1.ebuild 2184
-MD5 8b4492cd64f3bf7ec7b5336f636919fc ChangeLog 6259
+MD5 57c9cb781641086e14bc0d936305e7f1 ibm-jdk-1.3.1-r3.ebuild 2688
+MD5 a559e45172c2e0687f85fb4fd00deca0 ChangeLog 6539
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 0874dc9e9e028754455f311b4a5369b1 ibm-jdk-1.4.1.ebuild 1911
+MD5 a51e7a804d9c51f965ae6df627fbe073 ibm-jdk-1.4.1.ebuild 2870
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
-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.3.1-r4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.0-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.1 0
 MD5 9ae91d234d420cc6d86162f6baee6909 files/ibm-jdk-1.3.1 580
-MD5 634be54669e8f09f4e3c7f6e2eb8de58 files/ibm-jdk-1.4.0 806
 MD5 50d601a332e0b5b35f731bdeeefd82fc files/ibm-jdk-1.4.1 806
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r2 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r2
+++ /dev/null
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r2 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r2
+++ /dev/null
diff --git a/dev-java/ibm-jdk/files/ibm-jdk-1.4.0 b/dev-java/ibm-jdk/files/ibm-jdk-1.4.0
deleted file mode 100644
index 6c3720118347..000000000000
--- a/dev-java/ibm-jdk/files/ibm-jdk-1.4.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.4.0,v 1.4 2003/10/04 02:54:59 strider Exp $
-
-VERSION="IBM JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/jre/lib/tools.jar:/opt/@P@/lib/dt.jar:/opt/@P@/jre/lib/xml.jar:/opt/@P@/jre/lib/security.jar:/opt/@P@/jre/lib/server.jar:/opt/@P@/jre/lib/graphics.jar:/opt/@P@/jre/lib/core.jar:/opt/@P@/jre/lib/charsets.jar:/opt/@P@/jre/lib/:/opt/@P@/lib:.
-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.1-r2.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r2.ebuild
deleted file mode 100644
index f4422c9af0b3..000000000000
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,55 +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-r2.ebuild,v 1.6 2003/09/06 22:26:46 msterret Exp $
-
-IUSE="doc"
-
-inherit java nsplugins
-
-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
-	## inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
-
-	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 f5e8487ba2ab..b0ab53ebae63 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.4 2003/10/04 02:40:37 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild,v 1.5 2003/12/07 17:55:32 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="~x86 ppc"
+KEYWORDS="x86 ppc"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then
@@ -66,11 +66,31 @@ src_install () {
 
 pkg_postinst() {
 
-	einfo "*******************************************"
-	einfo "To set ${P} as the default JVM run"
-	einfo "java-config --set-system-vm=ibm-jdk-1.3.1"
-	einfo "Then run env-update and logout and back in."
-	einfo "*******************************************"
-}
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	if [ !"`use X`" ] ; then
+		einfo "********************************************************"
+		eerror "You're not using X so its possible that you dont have"
+		eerror "a X server installed, please read the following warn: "
+		eerror "Some parts of Sun's JDK require XFree86 to be installed."
+		eerror "Be careful which Java libraries you attempt to use."
+		einfo "********************************************************"
+		echo
+	fi
 
+	einfo "******************************************************"
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "    /usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
+	einfo "******************************************************"
+
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 8
+}
 # NOTE: We don't install the plugin, as it always segfaults.
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.4.0-r2.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.4.0-r2.ebuild
deleted file mode 100644
index d1957b328760..000000000000
--- a/dev-java/ibm-jdk/ibm-jdk-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,51 +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-r2.ebuild,v 1.3 2003/05/20 03:36:53 tberman 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
-	virtual/jdk-1.4
-	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
-
-	inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild
index 6fea1a76f958..dde4be79086a 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.4.1.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.4.1.ebuild,v 1.3 2003/09/22 03:15:56 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.4.1.ebuild,v 1.4 2003/12/07 17:55:32 strider Exp $
 
 IUSE="doc"
 
@@ -15,7 +15,7 @@ DESCRIPTION="IBM Java Development Kit, version 1.4.1"
 HOMEPAGE="https://www6.software.ibm.com/dl/lxdk/lxdk-p"
 SRC_URI=""
 RESTRICT="fetch"
-SLOT="1.4.1"
+SLOT="1.4"
 LICENSE="IBM-ILNWP"
 KEYWORDS="x86 ~ppc -sparc -alpha -mips -arm"
 
@@ -74,8 +74,30 @@ src_install () {
 
 pkg_postinst() {
 
-	einfo "*******************************************"
-	einfo "To set ${P} as the default JVM run"
-	einfo "java-config --set-system-vm=ibm-jdk-1.4.1"
-	einfo "*******************************************"
+	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
+	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
+	if [ !"`use X`" ] ; then
+		einfo "********************************************************"
+		eerror "You're not using X so its possible that you dont have"
+		eerror "a X server installed, please read the following warn: "
+		eerror "Some parts of IBM JDK require XFree86 to be installed."
+		eerror "Be careful which Java libraries you attempt to use."
+		einfo "********************************************************"
+		echo
+	fi
+
+	einfo "******************************************************"
+	einfo " After installing ${P} this"
+	einfo " was set as the default JVM to run."
+	einfo " When finished please run the following so your"
+	einfo " enviroment gets updated."
+	eerror "    /usr/sbin/env-update && source /etc/profile"
+	einfo " Or use java-config program to set your preferred VM"
+	einfo "******************************************************"
+
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+	echo -ne "\a" ; sleep 1
+	sleep 8
 }