diff options
| author |   Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-06-03 18:27:18 +0000 |
|---|---|---|
| committer | Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-06-03 18:27:18 +0000 |
| commit | 7327f2edfe434de7f20ff9ae407f50ddedce0aeb (patch) | |
| tree | e5598bc494fd05d35e55d8a0889970642949d0d2 /dev-java | |
| parent | Moved from dev-java/sun-jre. Partial fix for #9289. (diff) | |
| download | historical-7327f2edfe434de7f20ff9ae407f50ddedce0aeb.tar.gz historical-7327f2edfe434de7f20ff9ae407f50ddedce0aeb.tar.bz2 historical-7327f2edfe434de7f20ff9ae407f50ddedce0aeb.zip | |
Minor fixaroo.
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild | 10 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild | 8 | ||||
| -rw-r--r-- | dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild | 10 | ||||
| -rw-r--r-- | dev-java/jai/Manifest | 8 |
4 files changed, 16 insertions, 20 deletions
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 91db9f2e4785..e4b9cb730e56 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.11 2004/06/03 16:58:21 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.12 2004/06/03 18:27:18 karltk Exp $ inherit java nsplugins gcc @@ -68,14 +68,14 @@ 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" + if [ ! -f "${JAVAC}" ] ; then + ewarn "Found no JDK, setting ${P} as default system VM" java_pkg_postinst fi } -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/blackdown-jre/blackdown-jre-1.4.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild index 81fe5e830989..8a705febc974 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.9 2004/06/03 16:58:21 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.10 2004/06/03 18:27:18 karltk Exp $ inherit java nsplugins gcc @@ -76,14 +76,14 @@ 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" + if [ ! -f "${JAVAC}" ] ; then + ewarn "Found no JDK, setting ${P} as default system VM" java_pkg_postinst fi } pkg_postrm() { - if [ ! -z "$(java-config -J) | grep ${PV}" ] ; then + 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/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild index 088bb278f2eb..564094e2fe18 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.4 2004/06/03 16:58:21 karltk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild,v 1.5 2004/06/03 18:27:18 karltk Exp $ IUSE="doc" @@ -148,14 +148,14 @@ 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" + if [ ! -f "${JAVAC}" ] ; then + ewarn "Found no JDK, setting ${P} as default system VM" java_pkg_postinst fi } -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/jai/Manifest b/dev-java/jai/Manifest index 2ee95d739e32..4a8d7b689442 100644 --- a/dev-java/jai/Manifest +++ b/dev-java/jai/Manifest @@ -1,8 +1,4 @@ -MD5 f531c3095b553a5a5477d5d438a16fc1 jai-1.1.2-r2.ebuild 1344 -MD5 a630f7d188d82374c068d60b9618ba3c jai-1.1.2-r1.ebuild 1179 -MD5 ee5dbafbd6fc86e97c55144b0c6e3ab7 jai-1.1.2.ebuild 2448 -MD5 f4b5625632f8284483b7a79a8477ce14 ChangeLog 798 +MD5 4f4db5c9cc998735f9151f3cd1f5e3ec ChangeLog 903 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 e60e96e8d350d2e30cf45902dd277268 files/digest-jai-1.1.2 78 -MD5 e60e96e8d350d2e30cf45902dd277268 files/digest-jai-1.1.2-r1 78 +MD5 f531c3095b553a5a5477d5d438a16fc1 jai-1.1.2-r2.ebuild 1344 MD5 e60e96e8d350d2e30cf45902dd277268 files/digest-jai-1.1.2-r2 78 |