Respect the global USE=nsplugin instead of the local USE=browserplugin

Package-Manager: portage-2.0.53_rc5

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 4bc01619ab246e7347a4a23cf5302bd1778a24a3..086b9a5e1cf23d5f9558854f1687405e5b6f15f5 100644 (file)
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.87 2005/08/26 13:10:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.88 2005/10/18 19:21:57 agriffis Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  blackdown-jdk-1.3.1-r8.ebuild, blackdown-jdk-1.3.1-r10.ebuild,
+  blackdown-jdk-1.4.1-r1.ebuild, blackdown-jdk-1.4.2.01-r2.ebuild,
+  blackdown-jdk-1.4.2.02.ebuild:
+  Respect the global USE=nsplugin instead of the local USE=browserplugin
 
   26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   blackdown-jdk-1.4.2.02.ebuild:

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
index da828166a4396e82caff3bd5c82440e2e891d385..f61d3e929a96b3f2c60490695eb6954a0ae99b5e 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.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/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.19 2005/09/10 18:10:20 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.20 2005/10/18 19:21:57 agriffis Exp $
 
 inherit java toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/soft
 LICENSE="sun-bcla-java-vm"
 SLOT="1.3"
 KEYWORDS="ppc -*"
-IUSE="doc browserplugin mozilla"
+IUSE="doc nsplugin mozilla"
 
 DEPEND="virtual/libc
        >=dev-java/java-config-0.2.5
@@ -51,7 +51,7 @@ src_install() {
        dohtml README.html
 
        # Install ns plugin
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                if [ "${ARCH}" == "x86" ] ; then
                        PLATFORM="i386"
                elif [ "${ARCH}" == "ppc" ] ; then
@@ -80,10 +80,10 @@ src_install() {
 
 pkg_postinst() {
        java_pkg_postinst
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }
 

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
index b437ff6eb0bff6b883d4ea69ab9b4ae010a679e0..e1f7fa75fa37a24219e69e0dabf9bd217959547d 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.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/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.22 2005/07/11 13:24:41 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.23 2005/10/18 19:21:57 agriffis Exp $
 
 inherit java
 
@@ -14,7 +14,7 @@ SRC_URI="x86? ( mirror://blackdown.org/JDK-${PV}/i386/FCS/j2sdk-${PV}-FCS-linux-
 LICENSE="sun-bcla-java-vm"
 SLOT="1.3"
 KEYWORDS="x86 ~ppc sparc -*"
-IUSE="doc browserplugin mozilla"
+IUSE="doc nsplugin mozilla"
 
 DEPEND="virtual/libc
        >=dev-java/java-config-0.2.5
@@ -49,7 +49,7 @@ src_install() {
        dodoc COPYRIGHT LICENSE README INSTALL
        dohtml README.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                if [ "${ARCH}" == "x86" ] ; then
                        PLATFORM="i386"
                elif [ "${ARCH}" == "ppc" ] ; then
@@ -77,15 +77,15 @@ pkg_postinst() {
        # Set as default system VM if none exists
        java_pkg_postinst
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                einfo "The java mozilla plugin supplied by this package does not"
                einfo "work with newer version mozilla/firefox."
                einfo "You need >=${PN}-1.4 for them."
        fi
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild
index fec9f3783e3d1b334aaa4523c900703cf36880f8..c09ef436176e2745e33fc879bf32422a632b9b0a 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.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/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.12 2005/09/14 15:57:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.13 2005/10/18 19:21:57 agriffis Exp $
 
 
 inherit java
@@ -21,7 +21,7 @@ CHPAX_CONSERVATIVE_FLAGS="pemsv"
 LICENSE="sun-bcla-java-vm"
 SLOT="1.4.1"
 KEYWORDS="-* x86 sparc amd64"
-IUSE="doc emul-linux-x86 browserplugin mozilla"
+IUSE="doc emul-linux-x86 nsplugin mozilla"
 
 DEPEND="virtual/libc
        >=dev-java/java-config-0.2.6
@@ -77,7 +77,7 @@ src_install() {
        # do not install plugins, security vulnerability   #72221
        rm -rf ${D}/opt/${P}/jre/plugin/
 
-       #if use browserplugin || use mozilla; then
+       #if use nsplugin || use mozilla; then
        #       if [ "${ARCH}" = "x86" ] ; then
        #               PLATFORM="i386"
        #       fi
@@ -111,9 +111,9 @@ pkg_postinst() {
        # Set as default system VM if none exists
        java_pkg_postinst
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                echo
-               einfo "browserplugin plugin NOT installed"
+               einfo "nsplugin plugin NOT installed"
                einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt"
        fi
        # if chpax is on the target system, set the appropriate PaX flags
@@ -138,10 +138,10 @@ pkg_postinst() {
                ewarn "on the physical files - help for PaX and grsecurity"
                ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
        fi
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 
 }

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild
index 5fdfe4dee355009292f95ec256e58c889026df0a..7eda600712640e37242d3318377a75d3beb4f5fc 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.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/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild,v 1.10 2005/09/14 15:57:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild,v 1.11 2005/10/18 19:21:57 agriffis Exp $
 
 inherit java versionator
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.blackdown.org"
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* x86 amd64"
-IUSE="doc browserplugin mozilla"
+IUSE="doc nsplugin mozilla"
 
 DEPEND="virtual/libc
        >=dev-java/java-config-1.2.11
@@ -94,7 +94,7 @@ src_install() {
        dodoc COPYRIGHT LICENSE README INSTALL
        dohtml README.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                case ${ARCH} in
                        amd64) platform="amd64" ;;
                        x86) platform="i386" ;;
@@ -150,10 +150,10 @@ pkg_postinst() {
                ewarn "on the physical files - help for PaX and grsecurity"
                ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
        fi
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 
 }

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild
index 68fe10a9c1826ce0743e0b04cce7e5fa7d801986..7ab3072d171195d83f30312e805e0258de32453b 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.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/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild,v 1.5 2005/09/14 15:57:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild,v 1.6 2005/10/18 19:21:57 agriffis Exp $
 
 inherit java versionator
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.blackdown.org"
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* x86 amd64"
-IUSE="doc browserplugin mozilla"
+IUSE="doc nsplugin mozilla"
 
 DEPEND="virtual/libc
        >=dev-java/java-config-1.2.11
@@ -94,7 +94,7 @@ src_install() {
        dodoc COPYRIGHT LICENSE README INSTALL
        dohtml README.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                case ${ARCH} in
                        amd64) platform="amd64" ;;
                        x86) platform="i386" ;;
@@ -150,10 +150,10 @@ pkg_postinst() {
                ewarn "on the physical files - help for PaX and grsecurity"
                ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
        fi
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 
 }

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 421085bbb1c5efccf773bea493abfcbe7c1a7cfe..c09e197f7770d31e689673ec66404c4e56b969c3 100644 (file)
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.66 2005/10/06 20:33:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.67 2005/10/18 19:22:41 agriffis Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild,
+  blackdown-jre-1.4.2.01-r1.ebuild, blackdown-jre-1.4.2.02.ebuild,
+  blackdown-jre-1.4.2.02-r1.ebuild:
+  Respect the global USE=nsplugin instead of the local USE=browserplugin
 
 *blackdown-jre-1.4.2.02-r1 (06 Oct 2005)
 

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 6a0b9c6d7215e1da4f0443a0da517182959ea205..492c6f96788dd869bc470ae6954e5d1a854d1a47 100644 (file)
--- 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-2005 Gentoo Foundation
 # 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.22 2005/07/11 13:23:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.23 2005/10/18 19:22:41 agriffis Exp $
 
 inherit java toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/soft
 LICENSE="sun-bcla-java-vm"
 SLOT="0"
 KEYWORDS="ppc -*"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 
 DEPEND="virtual/libc
        >=dev-java/java-config-0.2.5
@@ -50,7 +50,7 @@ src_install() {
        dodoc COPYRIGHT LICENSE README INSTALL
        dohtml README.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                case ${ARCH} in
                        amd64|x86) platform="i386" ;;
                        ppc) platform="ppc" ;;
@@ -63,9 +63,9 @@ src_install() {
 
        set_java_env ${FILESDIR}/${VMHANDLE}
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild
index b04e561d8584cc9ca25f0334c04d5e58dea6c55d..47db8731cc81b6e74f48ecce827184b36ea37fb5 100644 (file)
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.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/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.12 2005/09/10 18:07:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.13 2005/10/18 19:22:41 agriffis Exp $
 
 inherit java toolchain-funcs
 
@@ -30,7 +30,7 @@ PROVIDE="virtual/jre"
 SLOT="0"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 sparc amd64 -*"
-IUSE="emul-linux-x86 browserplugin mozilla"
+IUSE="emul-linux-x86 nsplugin mozilla"
 
 src_unpack () {
        typeset a want_gcc_ver
@@ -69,7 +69,7 @@ src_install() {
        # Install mozilla plugin
        # do not install plugins, security vulnerability   #72221
        rm -rf ${D}/opt/${P}/plugin/
-       #if use browserplugin || use mozilla; then
+       #if use nsplugin || use mozilla; then
        #       case ${ARCH} in
        #               amd64|x86) platform="i386" ;;
        #               ppc) platform="ppc" ;;
@@ -92,15 +92,15 @@ src_install() {
 pkg_postinst() {
        java_pkg_postinst
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                echo
                einfo "mozilla plugin NOT installed"
                einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt"
        fi
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild
index 1edf1de841fe0269ab979bc310c758da6192fe84..48e76741d4a575aacd1b9c78ecd75c76194abfb0 100644 (file)
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.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/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.7 2005/09/10 18:07:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.8 2005/10/18 19:22:41 agriffis Exp $
 
 inherit java versionator
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.blackdown.org"
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* amd64 x86"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 DEPEND="virtual/libc
        >=dev-java/java-config-1.2.11
        >=sys-apps/sed-4"
@@ -94,7 +94,7 @@ src_install() {
        dohtml README.html
 
        # Install mozilla plugin
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                case ${ARCH} in
                        x86) platform="i386" ;;
                        ppc) platform="ppc" ;;
@@ -121,9 +121,9 @@ src_install() {
 
 pkg_postinst() {
        java_pkg_postinst
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild
index 57fd6c381a48f3c5443c57b946bd90223cd6c5c1..d9dd9c246c7d8859d6a0b7e23a9b2da45c9b1ae8 100644 (file)
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.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/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild,v 1.1 2005/10/06 20:33:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild,v 1.2 2005/10/18 19:22:41 agriffis Exp $
 
 inherit java versionator
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.blackdown.org"
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 DEPEND="virtual/libc
        >=dev-java/java-config-1.2.11
        >=sys-apps/sed-4"
@@ -101,7 +101,7 @@ src_install() {
        dohtml README.html
 
        # Install mozilla plugin
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                case ${ARCH} in
                        x86) platform="i386" ;;
                        ppc) platform="ppc" ;;
@@ -128,9 +128,9 @@ src_install() {
 
 pkg_postinst() {
        java_pkg_postinst
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild
index 49cb898810305c37e253fec679cb84a1beb2a005..2ef562f0f1f48f5507bb3241c7b56a2d50726783 100644 (file)
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.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/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.6 2005/09/10 18:07:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.7 2005/10/18 19:22:41 agriffis Exp $
 
 inherit java versionator
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.blackdown.org"
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* amd64 x86"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 DEPEND="virtual/libc
        >=dev-java/java-config-1.2.11
        >=sys-apps/sed-4"
@@ -94,7 +94,7 @@ src_install() {
        dohtml README.html
 
        # Install mozilla plugin
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                case ${ARCH} in
                        x86) platform="i386" ;;
                        ppc) platform="ppc" ;;
@@ -121,9 +121,9 @@ src_install() {
 
 pkg_postinst() {
        java_pkg_postinst
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index a413c628968b97c35a3955835fa8456204e66ebd..7ae8ec29bbd7052c89f3e12f7a7ec37de103281a 100644 (file)
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.31 2005/10/01 07:29:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.32 2005/10/18 19:23:47 agriffis Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> ibm-jdk-bin-1.4.2.ebuild:
+  Respect the global USE=nsplugin instead of the local USE=browserplugin
 
   01 Oct 2005; Thomas Matthijs <axxo@gentoo.org>
   -ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.2.ebuild:

diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
index f637a89a465e286dc180200c560900d68eea88f7..60ae67fc3b34868d239067b8c80dff0a63182808 100644 (file)
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.27 2005/10/01 07:29:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.28 2005/10/18 19:23:47 agriffis Exp $
 
 inherit java eutils
 
@@ -29,7 +29,7 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
        !ppc64? ( !amd64? ( sys-libs/lib-compat ) )"
 
-IUSE="X doc javacomm browserplugin mozilla"
+IUSE="X doc javacomm nsplugin mozilla"
 
 if use ppc; then
        S="${WORKDIR}/IBMJava2-ppc-142"
@@ -68,7 +68,7 @@ src_install() {
                doins ${FILESDIR}/cpuinfo
        fi
 
-       if ( use browserplugin || use mozilla ) && ! use ppc && ! use amd64 && ! use ppc64; then
+       if ( use nsplugin || use mozilla ) && ! use ppc && ! use amd64 && ! use ppc64; then
                local plugin="libjavaplugin_oji.so"
                if has_version '>=sys-devel/gcc-3' ; then
                        plugin="libjavaplugin_ojigcc3.so"
@@ -92,10 +92,10 @@ pkg_postinst() {
                eerror "Some parts of IBM JDK require XFree86 to be installed."
                eerror "Be careful which Java libraries you attempt to use."
        fi
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 
 }

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index d40715d77a0295ed300171ce8a1f97dc6ea39fb1..6047fd3bee7cd7d2b02b5da65031d6b67dc98909 100644 (file)
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.20 2005/10/01 07:34:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.21 2005/10/18 19:19:03 agriffis Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> ibm-jre-bin-1.4.2.ebuild:
+  Respect the global USE=nsplugin instead of the local USE=browserplugin
 
   01 Oct 2005; Thomas Matthijs <axxo@gentoo.org>
   -ibm-jre-bin-1.4.1-r1.ebuild, ibm-jre-bin-1.4.2.ebuild:

diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
index b7c6f208def1e7de367f5326d56a1315ad2ad841..fe5587dd0fb1ddbd896f2cd7ae3464acf7497e82 100644 (file)
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.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/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.13 2005/10/01 07:34:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.14 2005/10/18 19:19:03 agriffis Exp $
 
 inherit java
 
@@ -11,7 +11,7 @@ SRC_URI="ppc? ( IBMJava2-JRE-142.ppc.tgz )
        ppc64? ( IBMJava2-JRE-142.ppc64.tgz )
        x86? ( IBMJava2-JRE-142.tgz )"
 PROVIDE="virtual/jre"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86 ppc64 -*"
@@ -59,7 +59,7 @@ src_install() {
                > ${D}/etc/env.d/java/20${P} \
                || die "unable to install environment file"
 
-       if ( use browserplugin || use mozilla ) && ! ( use ppc || use ppc64 ); then
+       if ( use nsplugin || use mozilla ) && ! ( use ppc || use ppc64 ); then
                local plugin="libjavaplugin_oji.so"
                if has_version '>=sys-devel/gcc-3' ; then
                        plugin="libjavaplugin_ojigcc3.so"
@@ -69,9 +69,9 @@ src_install() {
 
 }
 pkg_postinst() {
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index fa745cb362d0f277f6db6dd4deb4597b94a79b7e..5f57cba86442fa77bf12ab12158261146a47d2f2 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.123 2005/10/13 09:50:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.124 2005/10/18 19:25:14 agriffis Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> sun-jdk-1.3.1.13.ebuild,
+  sun-jdk-1.3.1.16.ebuild, sun-jdk-1.4.2.08.ebuild,
+  sun-jdk-1.4.2.08-r1.ebuild, sun-jdk-1.4.2.09.ebuild,
+  sun-jdk-1.5.0.04.ebuild, sun-jdk-1.5.0.05.ebuild:
+  Respect the global USE=nsplugin instead of the local USE=browserplugin
 
 *sun-jdk-1.3.1.16 (13 Oct 2005)
 

diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
index 070c693232b2785f7cccf2fef37f0db67e0fa8d5..ec7220d951f0816d859538d5e417df28f1536027 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.13.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-jdk/sun-jdk-1.3.1.13.ebuild,v 1.11 2005/09/10 18:18:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.12 2005/10/18 19:25:14 agriffis Exp $
 
 inherit java eutils
 
@@ -24,7 +24,7 @@ SLOT="1.3"
 KEYWORDS="x86 -*"
 RESTRICT="fetch"
 
-IUSE="doc browserplugin mozilla"
+IUSE="doc nsplugin mozilla"
 # this is needed for proper operating under a PaX kernel without activated grsecurity acl
 CHPAX_CONSERVATIVE_FLAGS="pemsv"
 
@@ -87,7 +87,7 @@ src_install() {
        dodir /opt/${P}/share/
        cp -a demo src.jar ${D}/opt/${P}/share/
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                install_mozilla_plugin  /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so
        fi
 

diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild
index c7661ea2cf1e118246efc75f09196821706b3635..c46daaac07b7629895a4717fd15e9baf7111c938 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.16.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-jdk/sun-jdk-1.3.1.16.ebuild,v 1.1 2005/10/13 09:50:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild,v 1.2 2005/10/18 19:25:14 agriffis Exp $
 
 inherit java eutils
 
@@ -24,7 +24,7 @@ SLOT="1.3"
 KEYWORDS="x86 -*"
 RESTRICT="fetch"
 
-IUSE="doc browserplugin mozilla"
+IUSE="doc nsplugin mozilla"
 # this is needed for proper operating under a PaX kernel without activated grsecurity acl
 CHPAX_CONSERVATIVE_FLAGS="pemsv"
 
@@ -87,7 +87,7 @@ src_install() {
        dodir /opt/${P}/share/
        cp -a demo src.jar ${D}/opt/${P}/share/
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                install_mozilla_plugin  /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so
        fi
 

diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild
index 875d2acf10b2d754326da33932240c27ecd4fdeb..0b2950fab80ce57f005633119287d78b0cf32099 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.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-jdk/sun-jdk-1.4.2.08-r1.ebuild,v 1.6 2005/09/30 18:13:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild,v 1.7 2005/10/18 19:25:14 agriffis Exp $
 
 inherit java eutils
 
@@ -20,7 +20,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* x86"
 RESTRICT="fetch"
-IUSE="doc browserplugin jce mozilla"
+IUSE="doc nsplugin jce mozilla"
 
 #glibc dep: #102423
 DEPEND=">=dev-java/java-config-1.1.5
@@ -123,7 +123,7 @@ src_install() {
                dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
        fi
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns610"
                if has_version '>=sys-devel/gcc-3.2' ; then
                        plugin_dir="ns610-gcc32"
@@ -196,9 +196,9 @@ pkg_postinst() {
        eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
        eerror "Be careful which Java libraries you attempt to use."
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
index da2231c4c00e623b6ff511433ec4f56a6e753129..ee19fa620e560341dc5e119b8cc348d95ab879ee 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.08.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-jdk/sun-jdk-1.4.2.08.ebuild,v 1.9 2005/09/30 15:34:19 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild,v 1.10 2005/10/18 19:25:14 agriffis Exp $
 
 inherit java eutils
 
@@ -20,7 +20,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 -*"
 RESTRICT="fetch"
-IUSE="doc browserplugin jce mozilla"
+IUSE="doc nsplugin jce mozilla"
 
 #glibc dep: #102423
 DEPEND=">=dev-java/java-config-1.1.5
@@ -116,7 +116,7 @@ src_install() {
                dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
        fi
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns610"
                if has_version '>=sys-devel/gcc-3.2' ; then
                        plugin_dir="ns610-gcc32"
@@ -189,9 +189,9 @@ pkg_postinst() {
        eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
        eerror "Be careful which Java libraries you attempt to use."
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild
index 46cbd67487032e7ca238805dd77cc33d7acae2be..c74a8b838a35a0c3e3bb7bc32b50d2f51249ea58 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.09.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-jdk/sun-jdk-1.4.2.09.ebuild,v 1.6 2005/09/30 18:13:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild,v 1.7 2005/10/18 19:25:14 agriffis Exp $
 
 inherit java eutils
 
@@ -20,7 +20,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* x86"
 RESTRICT="fetch"
-IUSE="doc browserplugin jce mozilla"
+IUSE="doc nsplugin jce mozilla"
 
 #glibc dep: #102423
 DEPEND=">=dev-java/java-config-1.1.5
@@ -123,7 +123,7 @@ src_install() {
                dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
        fi
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns610"
                if has_version '>=sys-devel/gcc-3.2' ; then
                        plugin_dir="ns610-gcc32"
@@ -196,9 +196,9 @@ pkg_postinst() {
        eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
        eerror "Be careful which Java libraries you attempt to use."
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild
index 22e0ae4fe48905d78fa584d39b4badd95a45c99d..905fa7eab71f6a3a45b49ba12624ccc90c472454 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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-jdk/sun-jdk-1.5.0.04.ebuild,v 1.5 2005/09/10 18:18:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild,v 1.6 2005/10/18 19:25:14 agriffis Exp $
 
 inherit java eutils
 
@@ -27,7 +27,7 @@ SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64 -*"
 RESTRICT="fetch nostrip"
-IUSE="doc browserplugin jce mozilla"
+IUSE="doc nsplugin jce mozilla"
 
 #
 DEPEND=">=dev-java/java-config-1.2
@@ -129,7 +129,7 @@ src_install() {
                dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
        fi
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns7-gcc29"
                if has_version '>=sys-devel/gcc-3' ; then
                        plugin_dir="ns7"
@@ -218,9 +218,9 @@ pkg_postinst() {
        einfo " are not valid identifiers any more in that mode,"
        einfo " which can cause incompatibility with certain sources."
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
index 480d6f1ff0379e28d06f2623f2c4b0eb75fee724..99f3f15edd9d053619731ea82936b5751791dc7f 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.05.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-jdk/sun-jdk-1.5.0.05.ebuild,v 1.2 2005/10/10 16:23:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild,v 1.3 2005/10/18 19:25:14 agriffis Exp $
 
 inherit java eutils
 
@@ -27,7 +27,7 @@ SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64 -*"
 RESTRICT="fetch nostrip"
-IUSE="doc browserplugin jce mozilla"
+IUSE="doc nsplugin jce mozilla"
 
 #
 DEPEND=">=dev-java/java-config-1.2
@@ -137,7 +137,7 @@ src_install() {
                dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
        fi
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns7-gcc29"
                if has_version '>=sys-devel/gcc-3' ; then
                        plugin_dir="ns7"
@@ -226,9 +226,9 @@ pkg_postinst() {
        einfo " are not valid identifiers any more in that mode,"
        einfo " which can cause incompatibility with certain sources."
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE."
+               ewarn "has been renamed to 'nsplugin' please update your USE."
        fi
 }

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 2548bcaabb9609abe40e1874c19535dc553d09eb..4db5b42c970523f107468985eb1a3bb8ddeba21c 100644 (file)
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.32 2005/10/10 16:00:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.33 2005/10/18 19:20:31 agriffis Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  sun-jre-bin-1.4.2.08.ebuild, sun-jre-bin-1.4.2.08-r1.ebuild,
+  sun-jre-bin-1.4.2.09.ebuild, sun-jre-bin-1.5.0.04.ebuild,
+  sun-jre-bin-1.5.0.05.ebuild:
+  Respect the global USE=nsplugin instead of the local USE=browserplugin
 
 *sun-jre-bin-1.5.0.05 (10 Oct 2005)
 

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild
index d06e005241f2e63fd775eb2d987918bae87c4006..5fe0d543321d41854e3aec9af05ead7d2207306e 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.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.4.2.08-r1.ebuild,v 1.6 2005/09/14 15:59:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild,v 1.7 2005/10/18 19:20:31 agriffis Exp $
 
 inherit java eutils
 
@@ -15,7 +15,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm-1.4.2"
 KEYWORDS="-* x86"
 RESTRICT="fetch"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 
 DEPEND=">=dev-java/java-config-1.1.5
        sys-apps/sed"
@@ -85,7 +85,7 @@ src_install() {
        dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
        dohtml Welcome.html ControlPanel.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns610"
                if has_version '>=sys-devel/gcc-3.2' ; then
                        plugin_dir="ns610-gcc32"
@@ -155,9 +155,9 @@ pkg_postinst () {
        eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
        eerror "Be careful which Java libraries you attempt to use."
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild
index 65317a4d7fdf8543f0348518998eb018627dabb7..5568fcd17d485b20366a5a95d4643311ec7f0eaa 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.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.4.2.08.ebuild,v 1.6 2005/09/14 15:59:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild,v 1.7 2005/10/18 19:20:31 agriffis Exp $
 
 inherit java eutils
 
@@ -15,7 +15,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm-1.4.2"
 KEYWORDS="x86 -*"
 RESTRICT="fetch"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 
 DEPEND=">=dev-java/java-config-1.1.5
        sys-apps/sed"
@@ -78,7 +78,7 @@ src_install() {
        dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
        dohtml Welcome.html ControlPanel.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns610"
                if has_version '>=sys-devel/gcc-3.2' ; then
                        plugin_dir="ns610-gcc32"
@@ -147,9 +147,9 @@ pkg_postinst () {
        echo
        eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
        eerror "Be careful which Java libraries you attempt to use."
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild
index b398c2f9a8b393443b35299d3461e31e458ea40f..e27ec2451a8759a2a3c0f53843fcd342a9c2860d 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.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.4.2.09.ebuild,v 1.2 2005/09/14 15:59:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild,v 1.3 2005/10/18 19:20:32 agriffis Exp $
 
 inherit java eutils
 
@@ -15,7 +15,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm-1.4.2"
 KEYWORDS="-* ~x86"
 RESTRICT="fetch"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 
 DEPEND=">=dev-java/java-config-1.1.5
        sys-apps/sed"
@@ -85,7 +85,7 @@ src_install() {
        dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
        dohtml Welcome.html ControlPanel.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns610"
                if has_version '>=sys-devel/gcc-3.2' ; then
                        plugin_dir="ns610-gcc32"
@@ -155,9 +155,9 @@ pkg_postinst () {
        eerror "Some parts of Sun's JDK require virtual/x11 to be installed."
        eerror "Be careful which Java libraries you attempt to use."
 
-       if ! use browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

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 6802635b8cdcfe0e165032f3169fead35c03532f..48bb74c4c7142901c056f8b8ffa93c7338644481 100644 (file)
--- 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.6 2005/09/14 15:59:11 axxo Exp $
+# $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 $
 
 inherit java eutils
 
@@ -24,7 +24,7 @@ SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64 -*"
 RESTRICT="fetch"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 
 DEPEND=">=dev-java/java-config-1.2
        sys-apps/sed"
@@ -97,7 +97,7 @@ src_install() {
        dodoc COPYRIGHT LICENSE README
        dohtml Welcome.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns7-gcc29"
                if has_version '>=sys-devel/gcc-3' ; then
                        plugin_dir="ns7"
@@ -176,9 +176,9 @@ pkg_postinst() {
        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 browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE"
+               ewarn "has been renamed to 'nsplugin' please update your USE"
        fi
 }

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.05.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.05.ebuild
index e4bb8a5811cfb7515c08c15515abcefcaf931844..3d1eda1fb4a17a08536a910f483369109a662d2e 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.05.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.05.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.05.ebuild,v 1.1 2005/10/10 16:00:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.05.ebuild,v 1.2 2005/10/18 19:20:32 agriffis Exp $
 
 inherit java eutils
 
@@ -24,7 +24,7 @@ SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64 -*"
 RESTRICT="fetch"
-IUSE="browserplugin mozilla"
+IUSE="nsplugin mozilla"
 
 DEPEND=">=dev-java/java-config-1.2
        sys-apps/sed"
@@ -105,7 +105,7 @@ src_install() {
        dodoc COPYRIGHT LICENSE README
        dohtml Welcome.html
 
-       if use browserplugin || use mozilla; then
+       if use nsplugin || use mozilla; then
                local plugin_dir="ns7-gcc29"
                if has_version '>=sys-devel/gcc-3' ; then
                        plugin_dir="ns7"
@@ -184,9 +184,9 @@ pkg_postinst() {
        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 browserplugin && use mozilla; then
+       if ! use nsplugin && use mozilla; then
                ewarn
                ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
-               ewarn "has been renamed to 'browserplugin' please update your USE."
+               ewarn "has been renamed to 'nsplugin' please update your USE."
        fi
 }