Some changes, please see ChangeLog

4 files changed, 27 insertions, 17 deletions

diff --git a/dev-java/ibm-jdk/ChangeLog b/dev-java/ibm-jdk/ChangeLog
index da55aac71040..6eaa26c13a76 100644
--- a/dev-java/ibm-jdk/ChangeLog
+++ b/dev-java/ibm-jdk/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-java/ibm-jdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.22 2002/12/13 10:56:23 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.23 2002/12/23 16:18:54 strider Exp $
 
   12 Dec 2002; Adrian Almenar <strider@gentoo.org> :
   Updated Slots on all ebuilds. Fixes #11984.
@@ -10,8 +10,18 @@
   03 Dec 2002; Martin Schlemmer <azarah@gentoo.org> :
   Removed invalid sourcing of the eclasses (this is depricated).
 
+*ibm-jdk-1.4.0-r2 (23 Dec 2002)
+
+  23 Dec 2002; Adrian Almenar <strider@gentoo.org> ibm-jdk-1.4.0-r2.ebuild files/digest-ibm-jdk-1.4.0-r2:
+  Switched to the new nsplugins layout.
+
 *ibm-jdk-1.4.0-r1 (02 Dec 2002)
 
+  23 Dec 2002; Adrian Almenar <strider@gentoo.org> ibm-jdk-1.4.0-r1.ebuild
+  Unmasking from package.mask, going to testing phase.
+  Install java plugin as it doesnt segfault like 1.3.x plugin. Installing as
+  the old fashion way, not the new way made by phoenix.
+
   03 Dec 2002; Adrian Almenar <strider@gentoo.org> ibm-jdk-1.4.0-r1.ebuild
   Fixed a typo in the ebuild and in ChangeLog. Thanks azarah !!.
 
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0
+++ b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.4.0-r2
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
index e9d8213a0f69..2da003bde362 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.4.0-r1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 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.5 2002/12/12 11:35:34 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.4.0-r1.ebuild,v 1.6 2002/12/23 16:18:54 strider Exp $
 
 IUSE="doc"
 
@@ -20,7 +20,7 @@ PROVIDE="virtual/jre-1.4.0
 	virtual/java-scheme-2"
 LICENSE="IBM-ILNWP"
 SLOT="1.4"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
+KEYWORDS="~x86 -ppc -sparc -alpha"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
@@ -45,10 +45,14 @@ src_install () {
 	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}
 
-	# Plugin is disabled as it crashes all the time
-	# inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
+
 
 }
-# NOTE: We don't install the plugin, as it always segfaults.
+
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.4.0.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.4.0-r2.ebuild
index 147387af8c81..eb5707d00532 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.4.0.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.4.0-r2.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2002 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.ebuild,v 1.4 2002/12/12 11:35:35 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.4.0-r2.ebuild,v 1.1 2002/12/23 16:18:54 strider Exp $
 
 IUSE="doc"
 
 inherit java nsplugins
 
-At=IBMJava2-SDK-14.tgz
-S=${WORKDIR}/IBMJava2-14
+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.0* )"
@@ -21,7 +20,7 @@ PROVIDE="virtual/jre-1.4.0
 	virtual/java-scheme-2"
 LICENSE="IBM-ILNWP"
 SLOT="1.4"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
+KEYWORDS="x86 -ppc -sparc -alpha"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
@@ -42,14 +41,11 @@ src_install () {
 	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}	
+	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.