diff options
Diffstat (limited to 'dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild')
| -rw-r--r-- | dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild index 48bb74c4c714..6c9cf9f36ac0 100644 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild,v 1.7 2005/10/18 19:20:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.04.ebuild,v 1.8 2005/10/18 20:22:25 agriffis Exp $ inherit java eutils @@ -24,7 +24,7 @@ SLOT="1.5" LICENSE="sun-bcla-java-vm" KEYWORDS="~x86 ~amd64 -*" RESTRICT="fetch" -IUSE="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND=">=dev-java/java-config-1.2 sys-apps/sed" @@ -97,7 +97,9 @@ src_install() { dodoc COPYRIGHT LICENSE README dohtml Welcome.html - if use nsplugin || use mozilla; then + if use nsplugin || # global useflag for netscape-compat plugins + use browserplugin || # deprecated but honor for now + use mozilla; then # wrong but used to honor it local plugin_dir="ns7-gcc29" if has_version '>=sys-devel/gcc-3' ; then plugin_dir="ns7" @@ -140,7 +142,14 @@ pkg_postinst() { # Set as default VM if none exists java_pkg_postinst - #Show info about netscape + if ! use nsplugin && ( use browserplugin || use mozilla ); then + echo + ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in" + ewarn "future jdk/jre ebuilds for plugin installation. Please" + ewarn "update your USE to include 'nsplugin'." + fi + + # Show info about netscape if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then echo einfo "If you want to install the plugin for Netscape 4.x, type" @@ -175,10 +184,4 @@ pkg_postinst() { echo eerror "Some parts of Sun's JRE require virtual/x11 and virtual/lpr to be installed." eerror "Be careful which Java libraries you attempt to use." - - if ! use nsplugin && use mozilla; then - ewarn - ewarn "The 'mozilla' useflag to enable the java browser plugin for applets" - ewarn "has been renamed to 'nsplugin' please update your USE" - fi } |