Partial fix for #9289.

4 files changed, 50 insertions, 10 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 3d55f88345ed..c86630aebe7c 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.31 2004/04/13 08:54:58 mr_bones_ Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.32 2004/06/03 16:58:21 karltk Exp $
+
+  03 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org 
+  blackdown-jdk-1.3.1-r9.ebuild, blackdown-jdk-1.4.1.ebuild,
+  blackdown-jdk-1.4.2_rc1.ebuild: Added check in pkg_postinst to
+  only install as default system VM if no JDK is found, partly fixes 
+  #9289.
+  
   13 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
   blackdown-jre-1.3.1-r9.ebuild:
   remove bogus sourcing of inherit.eclass
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
index 88876b78f709..91db9f2e4785 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.10 2004/04/28 05:51:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.11 2004/06/03 16:58:21 karltk Exp $
 
 inherit java nsplugins gcc
 
@@ -65,6 +65,18 @@ src_install () {
 }
 
 pkg_postinst () {
-	java_pkg_postinst
+	# Only install the JRE as the system default if there's no JDK 
+	# installed. Installing a JRE over an existing JDK will result
+	# in major breakage, see #9289.
+	if [ ! -e ${JAVAC} ] ; then
+		ewarn "Found no JDK, setting ${PF} as default system VM"
+		java_pkg_postinst
+	fi
 }
 
+pkg_postrm() {
+	if [ ! -z "$(java-config -J) | grep ${PV}" ] ; then
+		ewarn "It appears you are removing your default system VM!"
+		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
+	fi
+}
\ No newline at end of file
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
index b8cde363c869..81fe5e830989 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.8 2004/03/18 06:33:56 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.9 2004/06/03 16:58:21 karltk Exp $
 
 inherit java nsplugins gcc
 
@@ -73,6 +73,18 @@ src_install () {
 }
 
 pkg_postinst () {
-	java_pkg_postinst
+	# Only install the JRE as the system default if there's no JDK 
+	# installed. Installing a JRE over an existing JDK will result
+	# in major breakage, see #9289.
+	if [ ! -e ${JAVAC} ] ; then
+		ewarn "Found no JDK, setting ${PF} as default system VM"
+		java_pkg_postinst
+	fi
 }
 
+pkg_postrm() {
+	if [ ! -z "$(java-config -J) | grep ${PV}" ] ; then
+		ewarn "It appears you are removing your default system VM!"
+		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
+	fi
+}
\ No newline at end of file
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
index 973fbda15774..088bb278f2eb 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild,v 1.3 2004/03/18 06:33:56 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild,v 1.4 2004/06/03 16:58:21 karltk Exp $
 
 IUSE="doc"
 
@@ -145,8 +145,18 @@ src_install () {
 }
 
 pkg_postinst () {
-	# Set as default system VM if none exists
-	java_pkg_postinst
-
+	# Only install the JRE as the system default if there's no JDK 
+	# installed. Installing a JRE over an existing JDK will result
+	# in major breakage, see #9289.
+	if [ ! -e ${JAVAC} ] ; then
+		ewarn "Found no JDK, setting ${PF} as default system VM"
+		java_pkg_postinst
+	fi
 }
 
+pkg_postrm() {
+	if [ ! -z "$(java-config -J) | grep ${PV}" ] ; then
+		ewarn "It appears you are removing your default system VM!"
+		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
+	fi
+}
\ No newline at end of file