Fixes #30579.

6 files changed, 116 insertions, 7 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 6ddf5ca63242..647430b26789 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.3 2004/05/01 08:27:54 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.4 2004/05/28 12:07:18 karltk Exp $
+
+*ibm-jdk-bin-1.4.1-r1 (28 May 2004)
+
+  28 May 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  ibm-jdk-bin-1.4.1-r1.ebuild:
+  Added javacomm useflag and support. Fixes #30579.
 
   01 May 2004; <SeJo@gentoo.org> ibm-jdk-bin-1.4.1.ebuild:
   removed ppc and added ~x86
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 9c55c62c041a..f6205d137681 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,6 +1,8 @@
-MD5 14db747ee9c412d5b1d88fe2e8988121 ChangeLog 588
-MD5 28961db38125105878a7e260c91d3678 ibm-jdk-bin-1.4.1.ebuild 3074
+MD5 6c240e9c0da81475760f04d59dbd9fb9 ChangeLog 768
+MD5 2a8b87467fa9dbad3fa042e9b38eb657 ibm-jdk-bin-1.4.1.ebuild 3131
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 8aab7efc7a88a7eae31e9561299bac8f ibm-jdk-bin-1.4.1-r1.ebuild 3134
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
-MD5 de9e44ca05e6dc855700ef2c5844b60e files/digest-ibm-jdk-bin-1.4.1 138
+MD5 0373b1cdf596fac6b3a784ddcb95e6f1 files/digest-ibm-jdk-bin-1.4.1 207
 MD5 6abf225f93a87dd76d44b734d0a0cf48 files/ibm-jdk-bin-1.4.1 457
+MD5 0373b1cdf596fac6b3a784ddcb95e6f1 files/digest-ibm-jdk-bin-1.4.1-r1 207
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1
index 19f4ce919c79..c2699a09c4d4 100644
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1
@@ -1,2 +1,3 @@
 MD5 fedb35c08896f5f99d4ed67885248da7 IBMJava2-SDK-141.ppc.tgz 57070530
 MD5 3cadd3d32817dd33888b5645e0d1987a IBMJava2-SDK-141.tgz 54177447
+MD5 992e805364a53ff18e624aa6c18789b3 IBMJava2-JAVACOMM-141.tgz 46867
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1-r1 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1-r1
new file mode 100644
index 000000000000..c2699a09c4d4
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.1-r1
@@ -0,0 +1,3 @@
+MD5 fedb35c08896f5f99d4ed67885248da7 IBMJava2-SDK-141.ppc.tgz 57070530
+MD5 3cadd3d32817dd33888b5645e0d1987a IBMJava2-SDK-141.tgz 54177447
+MD5 992e805364a53ff18e624aa6c18789b3 IBMJava2-JAVACOMM-141.tgz 46867
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..75fb06fad16b
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r1.ebuild,v 1.1 2004/05/28 12:07:18 karltk Exp $
+
+IUSE="doc javacomm"
+
+inherit java nsplugins
+
+if [ `use ppc` ]; then
+	S="${WORKDIR}/IBMJava2-ppc-141"
+else
+	S="${WORKDIR}/IBMJava2-141"
+fi
+
+DESCRIPTION="IBM Java Development Kit ${PV}"
+SRC_URI="ppc? ( mirror://IBMJava2-SDK-141.ppc.tgz )
+	x86? ( mirror://IBMJava2-SDK-141.tgz )
+	javacomm? ( mirror://IBMJava2-JAVACOMM-141.tgz )"
+PROVIDE="virtual/jdk-1.4.1
+	virtual/jre-1.4.1
+	virtual/java-scheme-2"
+SLOT="1.4"
+LICENSE="IBM-J1.4"
+KEYWORDS="ppc ~x86"
+
+DEPEND="virtual/glibc
+	>=dev-java/java-config-0.2.5
+	doc? ( =dev-java/java-sdk-docs-1.4.1* )
+	X? ( virtual/x11 )"
+RDEPEND="sys-libs/lib-compat"
+
+# No compilation needed!
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	mkdir -p ${D}opt/${P}
+	cp -dpR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
+
+	mkdir -p ${D}/opt/${P}/share
+	cp -a ${S}/{demo,src.jar} ${D}opt/${P}/share/
+
+	# setting the ppc stuff
+	if [ `use ppc` ]; then
+		dosed s:/proc/cpuinfo:/etc/cpuinfo:g ${D}opt/${P}/jre/bin/libjitc.so
+		dosed s:/proc/cpuinfo:/etc/cpuinfo:g ${D}opt/${P}/jre/bin/libjitc_g.so
+		insinto ${D}/etc
+		doins ${FILESDIR}/cpuinfo
+	else
+		# No java-plugin on ppc
+		inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
+	fi
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc ${S}/docs/COPYRIGHT
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+
+}
+
+pkg_postinst() {
+	#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 warning: "
+		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
+	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
+}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
index ee7a26018d33..89aba78c7485 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild,v 1.4 2004/05/01 20:59:57 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1.ebuild,v 1.5 2004/05/28 12:07:18 karltk Exp $
 
-IUSE="doc"
+IUSE="doc javacomm"
 
 inherit java nsplugins
 
@@ -14,7 +14,8 @@ fi
 
 DESCRIPTION="IBM Java Development Kit ${PV}"
 SRC_URI="ppc? ( mirror://IBMJava2-SDK-141.ppc.tgz )
-	x86? ( mirror://IBMJava2-SDK-141.tgz )"
+	x86? ( mirror://IBMJava2-SDK-141.tgz )
+	javacomm? ( mirror://IBMJava2-JAVACOMM-141.tgz )"
 PROVIDE="virtual/jdk-1.4.1
 	virtual/jre-1.4.1
 	virtual/java-scheme-2"