Partial fix for #9289.

4 files changed, 35 insertions, 17 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index f8b701c22ab3..a482e3413566 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.4 2004/06/02 22:51:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.5 2004/06/03 17:07:58 karltk Exp $
 
+  03 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  ibm-jre-bin-1.4.1.ebuild, ibm-jre-bin-1.4.1-r1.ebuild:
+  Added check to pkg_postrm to warn if the user is uninstalling his
+  default system VM, partial fix for #9289.
+  
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> ibm-jre-bin-1.4.1-r1.ebuild,
   ibm-jre-bin-1.4.1.ebuild:
   Fix use invocation
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index ad8f9f930eac..f77a8cb13cbe 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,7 +1,7 @@
-MD5 36817585b1a7e69dd7b626814a21b83e ibm-jre-bin-1.4.1-r1.ebuild 1194
-MD5 5fba265acb3304bbbe4c04f1f1a0a140 ibm-jre-bin-1.4.1.ebuild 1161
-MD5 b505f5827b28a57521750324eb9fa208 ChangeLog 728
+MD5 143a30e8ca18bb1dec7c968c1425c635 ChangeLog 957
+MD5 98520be69e84696bb590235fd7a7cf5c ibm-jre-bin-1.4.1.ebuild 1406
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 66da2c8a655ea20466944b96fa086593 ibm-jre-bin-1.4.1-r1.ebuild 1438
+MD5 326caa9caaaba43ff9db04da0c8d30eb files/digest-ibm-jre-bin-1.4.1 138
 MD5 326caa9caaaba43ff9db04da0c8d30eb files/digest-ibm-jre-bin-1.4.1-r1 138
 MD5 cc1d07588af3e638d95cfcfe3bf637a8 files/ibm-jre-bin-1.4.1 691
-MD5 326caa9caaaba43ff9db04da0c8d30eb files/digest-ibm-jre-bin-1.4.1 138
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
index 7fa5bad55f26..7e9de155a50a 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
@@ -1,7 +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/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.2 2004/06/02 22:51:43 agriffis Exp $
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.3 2004/06/03 17:07:58 karltk Exp $
 
 inherit java nsplugins
 
@@ -11,11 +10,10 @@ SRC_URI="ppc?(mirror://IBMJava2-JRE-141.ppc.tgz)
 	x86?(mirror://IBMJava2-JRE-141.tgz)"
 PROVIDE="virtual/jre-1.4.1
 	virtual/java-scheme-2"
+IUSE="doc"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86"
-
-
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5"
 RDEPEND="${DEPEND}"
@@ -27,8 +25,9 @@ else
 	S=${WORKDIR}/IBMJava2-141
 fi;
 
-# No compilation needed!
-src_compile() { :; }
+src_compile() {
+	einfo "${PF} is a binary package, no compilation required"
+}
 
 src_install() {
 	# Copy all the files to the designated directory 
@@ -51,3 +50,10 @@ src_postinst(){
 	inst_plugin /opt/${P}/bin/javaplugin.so
 	true
 }
+
+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/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild
index 3eef5ca9429f..13a7a2b57ac5 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild
@@ -1,7 +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/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild,v 1.5 2004/06/02 22:51:43 agriffis Exp $
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild,v 1.6 2004/06/03 17:07:58 karltk Exp $
 
 inherit java nsplugins
 
@@ -11,11 +10,10 @@ SRC_URI="ppc?(mirror://IBMJava2-JRE-141.ppc.tgz)
 	x86?(mirror://IBMJava2-JRE-141.tgz)"
 PROVIDE="virtual/jre-1.4.1
 	virtual/java-scheme-2"
+IUSE="doc"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86"
-
-
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5"
 RDEPEND="${DEPEND}"
@@ -27,8 +25,9 @@ else
 	S=${WORKDIR}/IBMJava2-141
 fi;
 
-# No compilation needed!
-src_compile() { :; }
+src_compile() {
+	einfo "${PF} is a binary package, no compilation required"
+}
 
 src_install() {
 	# Copy all the files to the designated directory 
@@ -46,7 +45,15 @@ src_install() {
 		< ${FILESDIR}/ibm-jre-${PV} \
 		> ${D}/etc/env.d/java/20ibm-jre-${PV}
 }
+
 src_postinst(){
 	inst_plugin /opt/${P}/bin/javaplugin.so
 	true
 }
+
+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