Partial fix for #9289.

6 files changed, 17 insertions, 101 deletions

diff --git a/dev-java/compaq-jre/ChangeLog b/dev-java/compaq-jre/ChangeLog
index 15863b48391b..430e3741e1f4 100644
--- a/dev-java/compaq-jre/ChangeLog
+++ b/dev-java/compaq-jre/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-java/compaq-jre
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/ChangeLog,v 1.9 2004/03/01 07:23:51 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/ChangeLog,v 1.10 2004/06/03 18:41:49 karltk Exp $
 
+  03 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  compaq-jre-1.3.1-r3.ebuild: Added checks to pkg_postinst and pkg_postrm to
+  solve #9289. Removed compaq-jre-1.3.1-r1.ebuild and 
+  compaq-jre-1.3.1-r2.ebuild.
+  
   01 Mar 2004; <mkennedy@gentoo.org> files/compaq-jre-1.3.1:
   Remove CLASSPATH from environment variable list.
 
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1-r1.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1-r1.ebuild
deleted file mode 100644
index 642afe62b5c2..000000000000
--- a/dev-java/compaq-jre/compaq-jre-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r1.ebuild,v 1.1 2004/01/10 15:20:27 agriffis Exp $
-
-IUSE="doc"
-
-inherit java
-
-S=${WORKDIR}/jre1.3.1
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jre-1.3.1-1-linux-alpha.rpm"
-HOMEPAGE="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/"
-DESCRIPTION="Compaq Java Development Kit 1.3.1 for Alpha/Linux/GNU"
-DEPEND="virtual/glibc
-	app-arch/rpm2targz
-	dev-libs/libots
-	dev-libs/libcpml
-	>=dev-java/java-config-0.2.5
-	>=x11-libs/openmotif-2.1.30-r1
-	doc? ( ~dev-java/java-sdk-docs-1.3.1 )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
-	virtual/java-scheme-2"
-LICENSE="compaq-sdla"
-SLOT="1.3"
-KEYWORDS="-* alpha"
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/jre-1.3.1-1-linux-alpha.rpm
-	tar zxf jre-1.3.1-1-linux-alpha.tar.gz >& /dev/null
-	mv usr/java/jre1.3.1 .
-}
-
-src_install () {
-	dodir /opt/${P}
-	cp -a bin lib ${D}/opt/${P}
-
-	dodoc COPYRIGHT CHANGES LICENSE
-	dohtml readme.html Welcome.html
-	doman man/man1/*.1
-
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-}
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1-r2.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1-r2.ebuild
deleted file mode 100644
index 8d749f52d484..000000000000
--- a/dev-java/compaq-jre/compaq-jre-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r2.ebuild,v 1.2 2004/01/13 03:47:59 agriffis Exp $
-
-IUSE="doc"
-
-inherit java fixheadtails
-
-S=${WORKDIR}/jre${PV}
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/jre-${PV}-1-linux-alpha.rpm"
-HOMEPAGE="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/"
-DESCRIPTION="Compaq Java Development Kit ${PV} for Alpha/Linux/GNU"
-DEPEND="virtual/glibc
-	app-arch/rpm2targz
-	dev-libs/libots
-	dev-libs/libcpml
-	>=dev-java/java-config-0.2.5
-	>=x11-libs/openmotif-2.1.30-r1
-	doc? ( ~dev-java/java-sdk-docs-${PV} )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-${PV}
-	virtual/java-scheme-2"
-LICENSE="compaq-sdla"
-SLOT="1.3"
-KEYWORDS="-* alpha"
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/jre-${PV}-1-linux-alpha.rpm
-	tar zxf jre-${PV}-1-linux-alpha.tar.gz >& /dev/null
-	mv usr/java/jre${PV} .
-	ht_fix_file jre${PV}/bin/.java_wrapper
-}
-
-src_install () {
-	dodir /opt/${P}
-	cp -a bin lib ${D}/opt/${P}
-
-	dodoc COPYRIGHT CHANGES LICENSE
-	dohtml readme.html Welcome.html
-	doman man/man1/*.1
-
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-}
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
index 2ef9fc0ba28c..254f26190e7a 100644
--- a/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
+++ b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.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/compaq-jre/compaq-jre-1.3.1-r3.ebuild,v 1.1 2004/01/15 17:03:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild,v 1.2 2004/06/03 18:41:49 karltk Exp $
 
 IUSE="doc"
 
@@ -43,6 +43,14 @@ src_install () {
 }
 
 pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
+	if [ ! -e "${JAVAC}" ] ; then
+		java_pkg_postinst
+	fi
 }
+
+pkg_postrm() {
+	if [ ! -z "$(java-config -J) | grep ${P}" ] ; 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/compaq-jre/files/digest-compaq-jre-1.3.1-r1 b/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r1
deleted file mode 100644
index 83c657349f6d..000000000000
--- a/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f6cc82115339b683951f8de591961f83 jre-1.3.1-1-linux-alpha.rpm 11934556
diff --git a/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r2 b/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r2
deleted file mode 100644
index 83c657349f6d..000000000000
--- a/dev-java/compaq-jre/files/digest-compaq-jre-1.3.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f6cc82115339b683951f8de591961f83 jre-1.3.1-1-linux-alpha.rpm 11934556