Fixes #2629.

10 files changed, 106 insertions, 66 deletions

diff --git a/dev-java/ibm-jdk/ChangeLog b/dev-java/ibm-jdk/ChangeLog
index d936f3aaf08d..1ffd14408b27 100644
--- a/dev-java/ibm-jdk/ChangeLog
+++ b/dev-java/ibm-jdk/ChangeLog
@@ -1,6 +1,22 @@
 # 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.5 2002/04/10 13:49:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.6 2002/05/12 17:49:25 karltk Exp $
+
+*ibm-jdk-1.3.1-r1 (12 May 2002)
+
+  12 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1-r1.ebuild files/digest-ibm-jdk-1.3.1-r1:
+
+  Disabled browser plugin as it does not work.
+
+  Removed ibm-jdk-1.3.1.ebuild files/digest-ibm-jdk-1.3.1
+
+*ibm-jdk-1.3.0-r4 (12 May 2002)
+
+  12 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.0-r4.ebuild files/digest-ibm-jdk-1.3.0-r4:
+
+  Disabled browser plugin as it does not work.
+
+  Removed ibm-jdk-1.3.0-r3.ebuild files/digest-ibm-jdk-1.3.0-r3
 
 *ibm-jdk-1.3.1 (10 Apr 2002)
 
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3
+++ b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r4
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1
+++ b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1-r1
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
index d4c3825736c1..94d795be0a0d 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild,v 1.1 2002/04/09 22:08:45 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.1 2002/05/12 17:49:25 karltk Exp $
 
 At=IBMJava2-SDK-13.tgz
 S=${WORKDIR}/IBMJava2-13
@@ -39,11 +39,12 @@ 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
+
+	# 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
 
 	dodir /etc/env.d/java
 	sed \
@@ -56,15 +57,16 @@ src_install () {
 
 src_postinst() {
 	
-	if [ -e /opt/netscape/plugins ] ; then
-		ln -sf /opt/${P}/jre/bin/javaplugin.so /opt/netscape/plugins/
-		einfo "Netscape 4.x Java plugin installed"
-	fi
+#	if [ -e /opt/netscape/plugins ] ; then
+#		ln -sf /opt/${P}/jre/bin/javaplugin.so /opt/netscape/plugins/
+#		einfo "Netscape 4.x Java plugin installed"
+#	fi
 
-	if [ "`use mozilla`" ] ; then
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins"
-	else
-		einfo "To install the browser plugin manually, do:"
-		einfo "ln -sf /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-	fi
+#	if [ "`use mozilla`" ] ; then
+#		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins"
+#	else
+#		einfo "To install the browser plugin manually, do:"
+#		einfo "ln -sf /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
+#	fi
+	true
 }
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
index cd990ba93b66..efe75416ab37 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1.ebuild,v 1.3 2002/04/10 13:49:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.1 2002/05/12 17:49:25 karltk Exp $
 
 At=IBMJava2-SDK-131.tgz
 S=${WORKDIR}/IBMJava2-131
@@ -39,11 +39,12 @@ 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
+
+	# 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
 
 	dodir /etc/env.d/java
 	sed \
@@ -56,15 +57,18 @@ src_install () {
 
 src_postinst() {
 	
-	if [ -e /opt/netscape/plugins ] ; then
-		ln -sf /opt/${P}/jre/bin/javaplugin.so /opt/netscape/plugins/
-		einfo "Netscape 4.x Java plugin installed"
-	fi
+	# Plugin is disabled as it crashes all the time.
 
-	if [ "`use mozilla`" ] ; then
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins"
-	else
-		einfo "To install the browser plugin manually, do:"
-		einfo "ln -sf /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-	fi
+#	if [ -e /opt/netscape/plugins ] ; then
+#		ln -sf /opt/${P}/jre/bin/javaplugin.so /opt/netscape/plugins/
+#		einfo "Netscape 4.x Java plugin installed"
+#	fi
+
+#	if [ "`use mozilla`" ] ; then
+#		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins"
+#	else
+#		einfo "To install the browser plugin manually, do:"
+#		einfo "ln -sf /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
+#	fi
+	true
 }
diff --git a/dev-java/ibm-jre/ChangeLog b/dev-java/ibm-jre/ChangeLog
index fc1ad57b88ab..58d1156c682b 100644
--- a/dev-java/ibm-jre/ChangeLog
+++ b/dev-java/ibm-jre/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-java/ibm-jre
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.5 2002/04/10 13:43:02 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.6 2002/05/12 17:49:25 karltk Exp $
+
+*ibm-jre-1.3.0-r3 (12 May 2002)
+
+  12 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jre-1.3.0-r3.ebuild files/digest-ibm-jre-1.3.0-r3:
+
+  Disabled browser plugin as it doesn't work.
+
+  Removed ibm-jre-1.3.0-r2.ebuild files/digest-ibm-jre-1.3.0-r2
+
+*ibm-jre-1.3.1-r1 (12 May 2002)
+
+  12 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jre-1.3.1-r1.ebuild files/digest-ibm-jre-1.3.1-r1:
+
+  Disabled browser plugin as it doesn't work.
+
+  Removed ibm-jre-1.3.1.ebuild files/digest-ibm-jre-1.3.1
 
 *ibm-jre-1.3.1 (10 Apr 2002)
 
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r2 b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r2
+++ b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r3
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.1 b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.1-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.1
+++ b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.1-r1
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.0-r2.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild
index b96b2ab220f3..31c915410a1a 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.0-r2.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.0-r2.ebuild,v 1.2 2002/04/10 13:50:15 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild,v 1.1 2002/05/12 17:49:25 karltk Exp $
 
 At=IBMJava2-JRE-13.tgz
 S=${WORKDIR}/IBMJava2-13
@@ -33,10 +33,11 @@ src_install () {
 	dohtml -a html,htm,HTML -r docs
 	dodoc docs/COPYRIGHT
 
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi
+	# Plugin is disabled as it crashes all the time
+#	if [ "`use mozilla`" ] ; then
+#		dodir /usr/lib/mozilla/plugins
+#		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
+#	fi
 	
 	dodir /etc/env.d/java
 	sed \
@@ -48,16 +49,16 @@ src_install () {
 }
 
 src_postinst() {
-	if [ -e /opt/netscape/plugins ] ; then
-		ln -sf /opt/${P}/bin/javaplugin.so /opt/netscape/plugins/
-		einfo "Netscape 4.x Java plugin installed"
-	fi
-
-	if [ "`use mozilla`" ] ; then
-                einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-        else
-                einfo "To install the browser plugin manually, do:"
-		einfo "ln -sf /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-        fi
+#	if [ -e /opt/netscape/plugins ] ; then
+#		ln -sf /opt/${P}/bin/javaplugin.so /opt/netscape/plugins/
+#		einfo "Netscape 4.x Java plugin installed"
+#	fi
 
+#	if [ "`use mozilla`" ] ; then
+#                einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
+#        else
+#                einfo "To install the browser plugin manually, do:"
+#		einfo "ln -sf /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
+#        fi
+	true
 }
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.1.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
index 7ae0e4694075..fa2c0d383210 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.1.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.1.ebuild,v 1.1 2002/04/10 13:43:02 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild,v 1.1 2002/05/12 17:49:25 karltk Exp $
 
 At=IBMJava2-JRE-131.tgz
 S=${WORKDIR}/IBMJava2-131
@@ -33,10 +33,11 @@ src_install () {
 	dohtml -a html,htm,HTML -r docs
 	dodoc docs/COPYRIGHT
 
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi
+	# Plugin as been disabled as it crashes all the time
+#	if [ "`use mozilla`" ] ; then
+#		dodir /usr/lib/mozilla/plugins
+#		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
+#	fi
 	
 	dodir /etc/env.d/java
 	sed \
@@ -48,16 +49,16 @@ src_install () {
 }
 
 src_postinst() {
-	if [ -e /opt/netscape/plugins ] ; then
-		ln -sf /opt/${P}/bin/javaplugin.so /opt/netscape/plugins/
-		einfo "Netscape 4.x Java plugin installed"
-	fi
-
-	if [ "`use mozilla`" ] ; then
-                einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-        else
-                einfo "To install the browser plugin manually, do:"
-		einfo "ln -sf /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-        fi
+#	if [ -e /opt/netscape/plugins ] ; then
+#		ln -sf /opt/${P}/bin/javaplugin.so /opt/netscape/plugins/
+#		einfo "Netscape 4.x Java plugin installed"
+#	fi
 
+#	if [ "`use mozilla`" ] ; then
+#                einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
+#        else
+#                einfo "To install the browser plugin manually, do:"
+#		einfo "ln -sf /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
+#        fi
+	true
 }