bug 94056: useflag rename mozilla -> browserplugin

Package-Manager: portage-2.0.51.22-r1

3 files changed, 25 insertions, 15 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 211078541ba3..24ceb2196dfb 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.28 2005/05/18 15:45:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.29 2005/07/11 13:25:54 axxo Exp $
+
+  11 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.2.ebuild:
+  bug 94056: useflag rename mozilla -> browserplugin
 
   18 May 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.1-r2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
index e6604cce3a5c..d20342cbad0e 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-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/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.11 2005/05/18 15:45:53 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.12 2005/07/11 13:25:54 axxo Exp $
 
 inherit java eutils
 
@@ -17,7 +17,7 @@ PROVIDE="virtual/jdk
 	virtual/jre"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
-KEYWORDS="ppc ~x86 ppc64"
+KEYWORDS="ppc ~x86 ppc64 -*"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
@@ -26,7 +26,7 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	!ppc64? ( sys-libs/lib-compat )"
 
-IUSE="X doc javacomm mozilla"
+IUSE="X doc javacomm browserplugin mozilla"
 
 if use ppc; then
 	S="${WORKDIR}/IBMJava2-ppc-141"
@@ -53,7 +53,7 @@ src_install() {
 		insinto /etc
 		doins ${FILESDIR}/cpuinfo
 	fi
-	if use mozilla && ! use ppc; then
+	if ( use browserplugin || use mozilla ) && ! use ppc; then
 		local plugin="libjavaplugin_oji.so"
 		if has_version '>=gcc-3*' ; then
 			plugin="libjavaplugin_ojigcc3.so"
@@ -77,7 +77,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
+		ewarn
+		ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
+		ewarn "has been renamed to 'browserplugin' please update your USE"
+	fi
 
-	ebeep 5
-	epause 8
 }
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 fe55694aa46e..ae9638005549 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.23 2005/05/22 15:53:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.24 2005/07/11 13:25:54 axxo Exp $
 
 inherit java eutils
 
@@ -19,7 +19,7 @@ PROVIDE="virtual/jdk
 	virtual/jre"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
-KEYWORDS="ppc ~x86 ppc64 amd64"
+KEYWORDS="ppc ~x86 ppc64 amd64 -*"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
@@ -28,7 +28,7 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	!ppc64? ( !amd64? ( sys-libs/lib-compat ) )"
 
-IUSE="X doc javacomm mozilla"
+IUSE="X doc javacomm browserplugin mozilla"
 
 if use ppc; then
 	S="${WORKDIR}/IBMJava2-ppc-142"
@@ -51,14 +51,14 @@ src_install() {
 	cp -a ${S}/{demo,src.jar} ${D}opt/${P}/share/
 
 	# setting the ppc stuff
-	if useq ppc; then
+	if use ppc; then
 		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
 		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
 		insinto /etc
 		doins ${FILESDIR}/cpuinfo
 	fi
 
-	if useq mozilla && ! useq ppc && ! useq amd64 && ! useq ppc64; then
+	if ( use browserplugin || use mozilla ) && ! use ppc && ! use amd64 && ! use ppc64; then
 		local plugin="libjavaplugin_oji.so"
 		if has_version '>=gcc-3*' ; then
 			plugin="libjavaplugin_ojigcc3.so"
@@ -75,14 +75,17 @@ src_install() {
 
 pkg_postinst() {
 	java_pkg_postinst
-	if ! useq X; then
+	if ! use X; then
 		echo
 		eerror "You're not using X so its possible that you dont have"
 		eerror "a X server installed, please read the following warning: "
 		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
+		ewarn
+		ewarn "The 'mozilla' useflag to enable the java browser plugin for applets"
+		ewarn "has been renamed to 'browserplugin' please update your USE"
+	fi
 
-	ebeep 5
-	epause 8
 }