diff options
author | Aron Griffis <agriffis@gentoo.org> | 2005-10-18 20:22:25 +0000 |
---|---|---|
committer | Aron Griffis <agriffis@gentoo.org> | 2005-10-18 20:22:25 +0000 |
commit | 3c2481f94d7a71c198a33a53e4f60fcc9350e28e (patch) | |
tree | c8987ba8816c62022efd60cc01eb062035fa3e6f | |
parent | add back browserplugin, marked as deprecated (diff) | |
download | historical-3c2481f94d7a71c198a33a53e4f60fcc9350e28e.tar.gz historical-3c2481f94d7a71c198a33a53e4f60fcc9350e28e.tar.bz2 historical-3c2481f94d7a71c198a33a53e4f60fcc9350e28e.zip |
Warn about deprecated browserplugin useflag
Package-Manager: portage-2.0.53_rc5
30 files changed, 302 insertions, 192 deletions
diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog index 086b9a5e1cf2..ba24df11ad2f 100644 --- 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.88 2005/10/18 19:21:57 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.89 2005/10/18 20:20:27 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: + Warn about deprecated browserplugin useflag 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> blackdown-jdk-1.3.1-r8.ebuild, blackdown-jdk-1.3.1-r10.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 f61d3e929a96..9bf6ba2df15a 100644 --- 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.20 2005/10/18 19:21:57 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.21 2005/10/18 20:20:27 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 nsplugin mozilla" +IUSE="doc browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -51,7 +51,9 @@ src_install() { dohtml README.html # Install ns plugin - 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 if [ "${ARCH}" == "x86" ] ; then PLATFORM="i386" elif [ "${ARCH}" == "ppc" ] ; then @@ -80,10 +82,11 @@ src_install() { pkg_postinst() { java_pkg_postinst - 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" + 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 } 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 e1f7fa75fa37..df19c0b4e87e 100644 --- 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.23 2005/10/18 19:21:57 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.24 2005/10/18 20:20:27 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 nsplugin mozilla" +IUSE="doc browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -49,7 +49,9 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.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 if [ "${ARCH}" == "x86" ] ; then PLATFORM="i386" elif [ "${ARCH}" == "ppc" ] ; then @@ -77,15 +79,15 @@ pkg_postinst() { # Set as default system VM if none exists java_pkg_postinst - if use nsplugin || use mozilla; then + if use nsplugin || use browserplugin || 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 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" + 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 } 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 c09ef436176e..5d52f165f205 100644 --- 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.13 2005/10/18 19:21:57 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.14 2005/10/18 20:20:27 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 nsplugin mozilla" +IUSE="doc emul-linux-x86 browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.6 @@ -111,7 +111,7 @@ pkg_postinst() { # Set as default system VM if none exists java_pkg_postinst - if use nsplugin || use mozilla; then + if use nsplugin || use browserplugin || use mozilla; then echo einfo "nsplugin plugin NOT installed" einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt" @@ -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 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" + 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 - } 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 7eda60071264..4d36769608e9 100644 --- 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.11 2005/10/18 19:21:57 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild,v 1.12 2005/10/18 20:20:27 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 nsplugin mozilla" +IUSE="doc browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 @@ -94,7 +94,9 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.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 case ${ARCH} in amd64) platform="amd64" ;; x86) platform="i386" ;; @@ -150,10 +152,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 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" + 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 - } 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 7ab3072d1711..c30ba90319ce 100644 --- 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.6 2005/10/18 19:21:57 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild,v 1.7 2005/10/18 20:20:27 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 nsplugin mozilla" +IUSE="doc browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 @@ -94,7 +94,9 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.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 case ${ARCH} in amd64) platform="amd64" ;; x86) platform="i386" ;; @@ -150,10 +152,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 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" + 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 - } diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog index c09e197f7770..07d900ffe899 100644 --- 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.67 2005/10/18 19:22:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.68 2005/10/18 20:20:51 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: + Warn about deprecated browserplugin useflag 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1-r1.ebuild, 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 492c6f96788d..903c76a4032a 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-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.23 2005/10/18 19:22:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.24 2005/10/18 20:20:51 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-0.2.5 @@ -50,7 +50,9 @@ src_install() { dodoc COPYRIGHT LICENSE README INSTALL dohtml README.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 case ${ARCH} in amd64|x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -63,9 +65,10 @@ src_install() { set_java_env ${FILESDIR}/${VMHANDLE} - 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" + 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 } 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 47db8731cc81..0df7ea8a67e5 100644 --- 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.13 2005/10/18 19:22:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.14 2005/10/18 20:20:51 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 nsplugin mozilla" +IUSE="emul-linux-x86 browserplugin nsplugin mozilla" src_unpack () { typeset a want_gcc_ver @@ -92,15 +92,16 @@ src_install() { pkg_postinst() { java_pkg_postinst - if use nsplugin || use mozilla; then + if use nsplugin || use browserplugin || 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 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" + 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 } 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 48e76741d4a5..f3d7fde6ffaa 100644 --- 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.8 2005/10/18 19:22:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.9 2005/10/18 20:20:51 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" @@ -94,7 +94,9 @@ src_install() { dohtml README.html # Install mozilla plugin - 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 case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -121,9 +123,10 @@ src_install() { pkg_postinst() { java_pkg_postinst - 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" + 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 } 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 d9dd9c246c7d..1b0d090632b5 100644 --- 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.2 2005/10/18 19:22:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02-r1.ebuild,v 1.3 2005/10/18 20:20:51 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" @@ -101,7 +101,9 @@ src_install() { dohtml README.html # Install mozilla plugin - 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 case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -128,9 +130,10 @@ src_install() { pkg_postinst() { java_pkg_postinst - 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" + 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 } 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 2ef562f0f1f4..0abd62811786 100644 --- 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.7 2005/10/18 19:22:41 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.8 2005/10/18 20:20:51 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND="virtual/libc >=dev-java/java-config-1.2.11 >=sys-apps/sed-4" @@ -94,7 +94,9 @@ src_install() { dohtml README.html # Install mozilla plugin - 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 case ${ARCH} in x86) platform="i386" ;; ppc) platform="ppc" ;; @@ -121,9 +123,10 @@ src_install() { pkg_postinst() { java_pkg_postinst - 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" + 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 } diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog index 7ae8ec29bbd7..05b393737f33 100644 --- 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.32 2005/10/18 19:23:47 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.33 2005/10/18 20:21:14 agriffis Exp $ + + 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> ibm-jdk-bin-1.4.2.ebuild: + Warn about deprecated browserplugin useflag 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 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 60ae67fc3b34..bc3097ef297a 100644 --- 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.28 2005/10/18 19:23:47 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.29 2005/10/18 20:21:14 agriffis Exp $ inherit java eutils @@ -29,7 +29,7 @@ DEPEND="virtual/libc RDEPEND="${DEPEND} !ppc64? ( !amd64? ( sys-libs/lib-compat ) )" -IUSE="X doc javacomm nsplugin mozilla" +IUSE="X doc javacomm browserplugin nsplugin mozilla" if use ppc; then S="${WORKDIR}/IBMJava2-ppc-142" @@ -68,12 +68,16 @@ src_install() { doins ${FILESDIR}/cpuinfo fi - 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" + if ! use amd64 && ! use ppc && ! use ppc64; 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="libjavaplugin_oji.so" + if has_version '>=sys-devel/gcc-3' ; then + plugin="libjavaplugin_ojigcc3.so" + fi + install_mozilla_plugin /opt/${P}/jre/bin/${plugin} fi - install_mozilla_plugin /opt/${P}/jre/bin/${plugin} fi dohtml -a html,htm,HTML -r docs @@ -92,10 +96,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 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" + 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 - } diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog index 6047fd3bee7c..ed34b5931d08 100644 --- 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.21 2005/10/18 19:19:03 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.22 2005/10/18 20:21:36 agriffis Exp $ + + 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> ibm-jre-bin-1.4.2.ebuild: + Warn about deprecated browserplugin useflag 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 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 fe5587dd0fb1..7b7a838b7716 100644 --- 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.14 2005/10/18 19:19:03 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.15 2005/10/18 20:21:36 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" SLOT="1.4" LICENSE="IBM-J1.4" KEYWORDS="ppc ~x86 ppc64 -*" @@ -59,19 +59,24 @@ src_install() { > ${D}/etc/env.d/java/20${P} \ || die "unable to install environment file" - 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" + if ! use ppc && ! use ppc64; 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="libjavaplugin_oji.so" + if has_version '>=sys-devel/gcc-3' ; then + plugin="libjavaplugin_ojigcc3.so" + fi + install_mozilla_plugin /opt/${P}/bin/${plugin} fi - install_mozilla_plugin /opt/${P}/bin/${plugin} fi - } + pkg_postinst() { - 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" + 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 } diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 5f57cba86442..94aa60045781 100644 --- 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.124 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.125 2005/10/18 20:22:01 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: + Warn about deprecated browserplugin useflag 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, 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 ec7220d951f0..8db380c995eb 100644 --- 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.12 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.13 2005/10/18 20:22:01 agriffis Exp $ inherit java eutils @@ -24,7 +24,7 @@ SLOT="1.3" KEYWORDS="x86 -*" RESTRICT="fetch" -IUSE="doc nsplugin mozilla" +IUSE="doc browserplugin nsplugin mozilla" # this is needed for proper operating under a PaX kernel without activated grsecurity acl CHPAX_CONSERVATIVE_FLAGS="pemsv" @@ -87,7 +87,9 @@ src_install() { dodir /opt/${P}/share/ cp -a demo src.jar ${D}/opt/${P}/share/ - 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 install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so fi @@ -98,6 +100,13 @@ pkg_postinst () { # Set as default VM if none exists java_pkg_postinst + 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 + # if chpax is on the target system, set the appropriate PaX flags # this will not hurt the binary, it modifies only unused ELF bits # but may confuse things like AV scanners and automatic tripwire 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 c46daaac07b7..d0d1688a7078 100644 --- 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.2 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.16.ebuild,v 1.3 2005/10/18 20:22:01 agriffis Exp $ inherit java eutils @@ -24,7 +24,7 @@ SLOT="1.3" KEYWORDS="x86 -*" RESTRICT="fetch" -IUSE="doc nsplugin mozilla" +IUSE="doc browserplugin nsplugin mozilla" # this is needed for proper operating under a PaX kernel without activated grsecurity acl CHPAX_CONSERVATIVE_FLAGS="pemsv" @@ -87,7 +87,9 @@ src_install() { dodir /opt/${P}/share/ cp -a demo src.jar ${D}/opt/${P}/share/ - 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 install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so fi @@ -98,6 +100,13 @@ pkg_postinst () { # Set as default VM if none exists java_pkg_postinst + 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 + # if chpax is on the target system, set the appropriate PaX flags # this will not hurt the binary, it modifies only unused ELF bits # but may confuse things like AV scanners and automatic tripwire 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 0b2950fab80c..866d4cc1d1fa 100644 --- 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.7 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08-r1.ebuild,v 1.8 2005/10/18 20:22:01 agriffis Exp $ inherit java eutils @@ -20,7 +20,7 @@ SLOT="1.4" LICENSE="sun-bcla-java-vm" KEYWORDS="-* x86" RESTRICT="fetch" -IUSE="doc nsplugin jce mozilla" +IUSE="doc browserplugin nsplugin jce mozilla" #glibc dep: #102423 DEPEND=">=dev-java/java-config-1.1.5 @@ -123,7 +123,9 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - 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="ns610" if has_version '>=sys-devel/gcc-3.2' ; then plugin_dir="ns610-gcc32" @@ -196,9 +198,10 @@ 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 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" + 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 } 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 ee19fa620e56..f2d83f5507c3 100644 --- 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.10 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.08.ebuild,v 1.11 2005/10/18 20:22:01 agriffis Exp $ inherit java eutils @@ -20,7 +20,7 @@ SLOT="1.4" LICENSE="sun-bcla-java-vm" KEYWORDS="x86 -*" RESTRICT="fetch" -IUSE="doc nsplugin jce mozilla" +IUSE="doc browserplugin nsplugin jce mozilla" #glibc dep: #102423 DEPEND=">=dev-java/java-config-1.1.5 @@ -116,7 +116,9 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - 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="ns610" if has_version '>=sys-devel/gcc-3.2' ; then plugin_dir="ns610-gcc32" @@ -189,9 +191,10 @@ 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 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" + 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 } 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 c74a8b838a35..99309085cebb 100644 --- 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.7 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.09.ebuild,v 1.8 2005/10/18 20:22:01 agriffis Exp $ inherit java eutils @@ -20,7 +20,7 @@ SLOT="1.4" LICENSE="sun-bcla-java-vm" KEYWORDS="-* x86" RESTRICT="fetch" -IUSE="doc nsplugin jce mozilla" +IUSE="doc browserplugin nsplugin jce mozilla" #glibc dep: #102423 DEPEND=">=dev-java/java-config-1.1.5 @@ -123,7 +123,9 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - 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="ns610" if has_version '>=sys-devel/gcc-3.2' ; then plugin_dir="ns610-gcc32" @@ -196,9 +198,10 @@ 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 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" + 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 } 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 905fa7eab71f..50e8cde0767c 100644 --- 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.6 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.04.ebuild,v 1.7 2005/10/18 20:22:01 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 nsplugin jce mozilla" +IUSE="doc browserplugin nsplugin jce mozilla" # DEPEND=">=dev-java/java-config-1.2 @@ -129,7 +129,9 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - 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" @@ -218,9 +220,10 @@ pkg_postinst() { einfo " are not valid identifiers any more in that mode," einfo " which can cause incompatibility with certain sources." - 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" + 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 } 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 99f3f15edd9d..0eaf7148a010 100644 --- 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.3 2005/10/18 19:25:14 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.05.ebuild,v 1.4 2005/10/18 20:22:01 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 nsplugin jce mozilla" +IUSE="doc browserplugin nsplugin jce mozilla" # DEPEND=">=dev-java/java-config-1.2 @@ -137,7 +137,9 @@ src_install() { dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ fi - 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" @@ -226,9 +228,10 @@ pkg_postinst() { einfo " are not valid identifiers any more in that mode," einfo " which can cause incompatibility with certain sources." - 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." + 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 } diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 4db5b42c9705..bfb56c5c9fc4 100644 --- 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.33 2005/10/18 19:20:31 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.34 2005/10/18 20:22:25 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: + Warn about deprecated browserplugin useflag 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, 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 5fe0d543321d..44503f078929 100644 --- 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.7 2005/10/18 19:20:31 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08-r1.ebuild,v 1.8 2005/10/18 20:22:25 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND=">=dev-java/java-config-1.1.5 sys-apps/sed" @@ -85,7 +85,9 @@ src_install() { dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt dohtml Welcome.html ControlPanel.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="ns610" if has_version '>=sys-devel/gcc-3.2' ; then plugin_dir="ns610-gcc32" @@ -155,9 +157,10 @@ 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 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" + 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 } 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 5568fcd17d48..3fa66efcfa4d 100644 --- 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.7 2005/10/18 19:20:31 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.08.ebuild,v 1.8 2005/10/18 20:22:25 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND=">=dev-java/java-config-1.1.5 sys-apps/sed" @@ -78,7 +78,9 @@ src_install() { dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt dohtml Welcome.html ControlPanel.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="ns610" if has_version '>=sys-devel/gcc-3.2' ; then plugin_dir="ns610-gcc32" @@ -112,7 +114,14 @@ pkg_postinst () { 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" @@ -147,9 +156,4 @@ 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 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 } 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 e27ec2451a87..c9a74127e420 100644 --- 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.3 2005/10/18 19:20:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.09.ebuild,v 1.4 2005/10/18 20:22:25 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="nsplugin mozilla" +IUSE="browserplugin nsplugin mozilla" DEPEND=">=dev-java/java-config-1.1.5 sys-apps/sed" @@ -85,7 +85,9 @@ src_install() { dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt dohtml Welcome.html ControlPanel.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="ns610" if has_version '>=sys-devel/gcc-3.2' ; then plugin_dir="ns610-gcc32" @@ -119,7 +121,14 @@ pkg_postinst () { 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" @@ -154,10 +163,4 @@ 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 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 } 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 } 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 3d1eda1fb4a1..9a06b2677a96 100644 --- 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.2 2005/10/18 19:20:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.05.ebuild,v 1.3 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" @@ -105,7 +105,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" @@ -148,7 +150,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" @@ -183,10 +192,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 } |