bug 94056: useflag rename mozilla -> browserplugin

(Portage version: 2.0.51.22-r1)

5 files changed, 49 insertions, 17 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 72dc3579b25d..69f12596d80c 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,11 @@
 # 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.63 2005/06/20 12:55:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.64 2005/07/11 13:23:11 axxo Exp $
+
+  11 Jul 2005; Thomas Matthijs <axxo@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:
+  bug 94056: useflag rename mozilla -> browserplugin
 
   20 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
   blackdown-jre-1.4.2.02.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 400134befb0c..6a0b9c6d7215 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.21 2005/05/18 15:41:26 axxo Exp $
+# $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 $
 
 inherit java toolchain-funcs
 
@@ -11,8 +11,8 @@ SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/soft
 
 LICENSE="sun-bcla-java-vm"
 SLOT="0"
-KEYWORDS="ppc"
-IUSE="mozilla"
+KEYWORDS="ppc -*"
+IUSE="browserplugin mozilla"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
@@ -50,8 +50,7 @@ src_install() {
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
-	# Install mozilla plugin
-	if use mozilla; then
+	if use browserplugin || use mozilla; then
 		case ${ARCH} in
 			amd64|x86) platform="i386" ;;
 			ppc) platform="ppc" ;;
@@ -63,4 +62,10 @@ src_install() {
 	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
+
+	if ! use browserplugin && 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"
+	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 8e47739b85de..f012cd82201d 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.9 2005/06/06 18:34:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.10 2005/07/11 13:23:11 axxo Exp $
 
 inherit java toolchain-funcs
 
@@ -29,8 +29,8 @@ RDEPEND="${DEPEND}
 PROVIDE="virtual/jre"
 SLOT="0"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86 sparc amd64"
-IUSE="emul-linux-x86 mozilla"
+KEYWORDS="x86 sparc amd64 -*"
+IUSE="emul-linux-x86 browserplugin 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 mozilla; then
+	#if use browserplugin || use mozilla; then
 	#	case ${ARCH} in
 	#		amd64|x86) platform="i386" ;;
 	#		ppc) platform="ppc" ;;
@@ -90,9 +90,15 @@ src_install () {
 }
 
 pkg_postinst() {
-	if use mozilla; then
+	if 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 browserplugin && 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"
+	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 410a80225b2a..48e76c3d22aa 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.4 2005/06/06 18:34:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01-r1.ebuild,v 1.5 2005/07/11 13:23:11 axxo 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="mozilla"
+IUSE="browserplugin 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 mozilla; then
+	if use browserplugin || use mozilla; then
 		case ${ARCH} in
 			x86) platform="i386" ;;
 			ppc) platform="ppc" ;;
@@ -118,3 +118,11 @@ src_install () {
 
 	unpack_jars
 }
+
+pkg_postinst() {
+	if ! use browserplugin && 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"
+	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 378db3f1b6df..f20d24e49778 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.2 2005/06/20 12:55:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.02.ebuild,v 1.3 2005/07/11 13:23:11 axxo 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="mozilla"
+IUSE="browserplugin 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 mozilla; then
+	if use browserplugin || use mozilla; then
 		case ${ARCH} in
 			x86) platform="i386" ;;
 			ppc) platform="ppc" ;;
@@ -118,3 +118,11 @@ src_install () {
 
 	unpack_jars
 }
+
+pkg_postinst() {
+	if ! use browserplugin && 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"
+	fi
+}