summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-06-03 20:28:45 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-06-03 20:28:45 +0000
commit33e7d442ddd0e48c87e38943ef206c3d949f7019 (patch)
treec3c16deb508dbb60bec329c43de3457085ac21fb /dev-java
parentversion bump; cleanup ebuild (diff)
downloadhistorical-33e7d442ddd0e48c87e38943ef206c3d949f7019.tar.gz
historical-33e7d442ddd0e48c87e38943ef206c3d949f7019.tar.bz2
historical-33e7d442ddd0e48c87e38943ef206c3d949f7019.zip
More uninstall fixes.
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ibm-jre-bin/Manifest4
-rw-r--r--dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild6
-rw-r--r--dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild6
3 files changed, 8 insertions, 8 deletions
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index f77a8cb13cbe..d1c87a9e2b46 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,7 +1,7 @@
MD5 143a30e8ca18bb1dec7c968c1425c635 ChangeLog 957
-MD5 98520be69e84696bb590235fd7a7cf5c ibm-jre-bin-1.4.1.ebuild 1406
+MD5 a53a342cf570cdba63805342e17aefa7 ibm-jre-bin-1.4.1.ebuild 1404
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 66da2c8a655ea20466944b96fa086593 ibm-jre-bin-1.4.1-r1.ebuild 1438
+MD5 7358bd50f60b75826012b9b5d52e869d ibm-jre-bin-1.4.1-r1.ebuild 1435
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
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 7e9de155a50a..763b4bbcb798 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,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/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.3 2004/06/03 17:07:58 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.4 2004/06/03 20:28:45 karltk Exp $
inherit java nsplugins
@@ -51,8 +51,8 @@ src_postinst(){
true
}
-pkg_postrm() {
- if [ ! -z "$(java-config -J) | grep ${PV}" ] ; then
+pkg_prerm() {
+ 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
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 13a7a2b57ac5..4d446d70fe3a 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,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/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild,v 1.6 2004/06/03 17:07:58 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1.ebuild,v 1.7 2004/06/03 20:28:45 karltk Exp $
inherit java nsplugins
@@ -51,8 +51,8 @@ src_postinst(){
true
}
-pkg_postrm() {
- if [ ! -z "$(java-config -J) | grep ${PV}" ] ; then
+pkg_prerm() {
+ 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