Cleaned up plugin instalation, Moved some messages to the eclass, see #22395 for more information

32 files changed, 313 insertions, 431 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 56ec2f98eee0..296fdb6bcaf0 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.56 2004/09/21 13:58:18 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.57 2004/09/29 20:59:28 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  blackdown-jdk-1.3.1-r10.ebuild, blackdown-jdk-1.3.1-r8.ebuild,
+  blackdown-jdk-1.4.1.ebuild, blackdown-jdk-1.4.2_rc1-r1.ebuild,
+  blackdown-jdk-1.4.2_rc1.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   21 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
   -blackdown-jdk-1.3.1-r7.ebuild, blackdown-jdk-1.3.1-r8.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 01a3b5458f87..d7dc7c2c79f8 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,8 +1,8 @@
 # Copyright 1999-2004 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.12 2004/07/14 01:44:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.13 2004/09/29 20:59:28 axxo Exp $
 
-inherit java nsplugins gcc
+inherit java gcc
 
 S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
@@ -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"
+IUSE="doc mozilla"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
@@ -52,15 +52,17 @@ src_install() {
 	dohtml README.html
 
 	# Install ns plugin
-	if [ "${ARCH}" == "x86" ] ; then
-		PLATFORM="i386"
-	elif [ "${ARCH}" == "ppc" ] ; then
-		PLATFORM="ppc"
-	elif [ "${ARCH}" == "sparc" ] ; then
-		PLATFORM="sparc"
-	fi
+	if use mozilla; then
+		if [ "${ARCH}" == "x86" ] ; then
+			PLATFORM="i386"
+		elif [ "${ARCH}" == "ppc" ] ; then
+			PLATFORM="ppc"
+		elif [ "${ARCH}" == "sparc" ] ; then
+			PLATFORM="sparc"
+		fi
 
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+		install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/libjavaplugin_oji.so
+	fi
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -76,8 +78,3 @@ src_install() {
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
-
-pkg_postinst () {
-	# Set as default system VM if none exists
-	java_pkg_postinst
-}
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 28eebc786acd..4a536452eb79 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,8 +1,8 @@
 # Copyright 1999-2004 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.16 2004/09/21 13:58:18 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.17 2004/09/29 20:59:28 axxo Exp $
 
-inherit java nsplugins
+inherit java
 
 S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
@@ -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"
+IUSE="doc mozilla"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
@@ -23,7 +23,7 @@ PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
 
-src_unpack () {
+src_unpack() {
 	if use ppc || use sparc ; then
 		tail -n +400 ${DISTDIR}/${A} | tar jxpf -
 	else
@@ -37,7 +37,7 @@ src_unpack () {
 }
 
 
-src_install () {
+src_install() {
 
 	dodir /opt/${P}
 
@@ -49,16 +49,17 @@ src_install () {
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
-	# Install ns plugin
-	if [ "${ARCH}" == "x86" ] ; then
-		PLATFORM="i386"
-	elif [ "${ARCH}" == "ppc" ] ; then
-		PLATFORM="ppc"
-	elif [ "${ARCH}" == "sparc" ] ; then
-		PLATFORM="sparc"
-	fi
+	if use mozilla; then
+		if [ "${ARCH}" == "x86" ] ; then
+			PLATFORM="i386"
+		elif [ "${ARCH}" == "ppc" ] ; then
+			PLATFORM="ppc"
+		elif [ "${ARCH}" == "sparc" ] ; then
+			PLATFORM="sparc"
+		fi
 
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+		install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+	fi
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -72,7 +73,13 @@ src_install () {
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Set as default system VM if none exists
 	java_pkg_postinst
+
+	if 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
 }
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
index d2c36e5e1881..ad4b7187c753 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 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.ebuild,v 1.20 2004/09/21 08:14:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.21 2004/09/29 20:59:28 axxo Exp $
 
 
-inherit java nsplugins
+inherit java
 
 JREV="01"
 
@@ -21,7 +21,7 @@ CHPAX_CONSERVATIVE_FLAGS="pemsv"
 LICENSE="sun-bcla-java-vm"
 SLOT="1.4.1"
 KEYWORDS="x86 -ppc sparc amd64"
-IUSE="doc"
+IUSE="doc mozilla"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.6
@@ -48,7 +48,7 @@ get_offset() {
 	eval echo $offset
 }
 
-src_unpack () {
+src_unpack() {
 	local offset="`get_offset ${DISTDIR}/${A}`"
 
 	if [ -z "${offset}" ] ; then
@@ -61,7 +61,7 @@ src_unpack () {
 }
 
 
-src_install () {
+src_install() {
 	local PLATFORM=
 
 	dodir /opt/${P}
@@ -74,20 +74,21 @@ src_install () {
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
-	# Install mozilla plugin
-	if [ "${ARCH}" = "x86" ] ; then
-		PLATFORM="i386"
-	fi
+	if use mozilla; then
+		if [ "${ARCH}" = "x86" ] ; then
+			PLATFORM="i386"
+		fi
 
-	if [ "${ARCH}" = "amd64" ] ; then
-		PLATFORM="i386"
-	fi
+		if [ "${ARCH}" = "amd64" ] ; then
+			PLATFORM="i386"
+		fi
 
-	if [ "${ARCH}" = "sparc" ] ; then
-		PLATFORM="sparc"
-	fi
+		if [ "${ARCH}" = "sparc" ] ; then
+			PLATFORM="sparc"
+		fi
 
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+		install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+	fi
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -104,7 +105,7 @@ src_install () {
 	fi
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Set as default system VM if none exists
 	java_pkg_postinst
 
@@ -113,6 +114,7 @@ pkg_postinst () {
 	# but may confuse things like AV scanners and automatic tripwire
 	if has_version "sys-apps/chpax"
 	then
+		echo
 		einfo "setting up conservative PaX flags for jar and javac"
 
 		for paxkills in "jar" "javac" "java"
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
index e7b38377343a..6296afbeaf21 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 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_rc1-r1.ebuild,v 1.2 2004/07/14 01:44:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild,v 1.3 2004/09/29 20:59:28 axxo Exp $
 
 IUSE="doc mozilla"
 
-inherit java nsplugins
+inherit java
 
 JREV=${PV#*_}
 JV=${PV%_*}
@@ -44,7 +44,7 @@ get_offset() {
 	echo $offset
 }
 
-src_unpack () {
+src_unpack() {
 	local offset=$(get_offset ${DISTDIR}/${A})
 
 	if [ -z "${offset}" ] ; then
@@ -56,7 +56,7 @@ src_unpack () {
 }
 
 unpack_jars() {
-	# New to 1.4.2 
+	# New to 1.4.2
 	local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
 	local JAVAHOME="${D}/opt/${P}"
 	local UNPACK_CMD=""
@@ -81,7 +81,7 @@ unpack_jars() {
 	rm -f "$UNPACK_CMD"
 }
 
-src_install () {
+src_install() {
 	typeset platform
 
 	dodir /opt/${P}
@@ -102,7 +102,8 @@ src_install () {
 			sparc*) platform="sparc" ;;
 			x86) platform="i386" ;;
 		esac
-		inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
 	fi
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
@@ -120,7 +121,7 @@ src_install () {
 	unpack_jars
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Set as default system VM if none exists
 	java_pkg_postinst
 
@@ -129,6 +130,7 @@ pkg_postinst () {
 	# but may confuse things like AV scanners and automatic tripwire
 	if has_version "sys-apps/chpax"
 	then
+		echo
 		einfo "setting up conservative PaX flags for jar and javac"
 
 		for paxkills in "jar" "javac" "java"
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
index 8e33d46f5a7b..63c842bccd49 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 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_rc1.ebuild,v 1.13 2004/07/14 01:44:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v 1.14 2004/09/29 20:59:28 axxo Exp $
 
-IUSE="doc"
-
-inherit java nsplugins
+inherit java
 
 JREV=${PV#*_}
 JV=${PV%_*}
@@ -30,6 +28,8 @@ PROVIDE="virtual/jdk-1.4.2
 	virtual/jre-1.4.2
 	virtual/java-scheme-2"
 
+IUSE="doc mozilla"
+
 # Extract the 'skip' value (offset of tarball) we should pass to tail
 get_offset() {
 	[ ! -f "$1" ] && return
@@ -44,7 +44,7 @@ get_offset() {
 	echo $offset
 }
 
-src_unpack () {
+src_unpack() {
 	local offset=$(get_offset ${DISTDIR}/${A})
 
 	if [ -z "${offset}" ] ; then
@@ -56,7 +56,7 @@ src_unpack () {
 }
 
 unpack_jars() {
-	# New to 1.4.2 
+	# New to 1.4.2
 	local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
 	local JAVAHOME="${D}/opt/${P}"
 	local UNPACK_CMD=""
@@ -81,7 +81,7 @@ unpack_jars() {
 	rm -f "$UNPACK_CMD"
 }
 
-src_install () {
+src_install() {
 	typeset platform
 
 	dodir /opt/${P}
@@ -95,12 +95,15 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	case ${ARCH} in
-		amd64|x86) platform="i386" ;;
-		ppc) platform="ppc" ;;
-		sparc*) platform="sparc" ;;
-	esac
-	inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/javaplugin_oji.so
+	if use mozilla; then
+		case ${ARCH} in
+			amd64|x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+		esac
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -118,7 +121,7 @@ src_install () {
 	unpack_jars
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Set as default system VM if none exists
 	java_pkg_postinst
 
@@ -127,6 +130,7 @@ pkg_postinst () {
 	# but may confuse things like AV scanners and automatic tripwire
 	if has_version "sys-apps/chpax"
 	then
+		echo
 		einfo "setting up conservative PaX flags for jar and javac"
 
 		for paxkills in "jar" "javac" "java"
diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index f55009c9071f..b689dd5da28d 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.42 2004/07/30 23:36:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.43 2004/09/29 20:59:21 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.4.1.ebuild,
+  blackdown-jre-1.4.2_rc1-r1.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   31 Jul 2004; Daniel Black <dragonheart@gentoo.org>
   blackdown-jre-1.4.1.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 789d5347439f..b4cef980cc90 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,8 +1,8 @@
 # Copyright 1999-2004 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.17 2004/07/14 12:22:27 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.18 2004/09/29 20:59:21 axxo Exp $
 
-inherit java nsplugins gcc
+inherit java gcc
 
 S=${WORKDIR}/j2re1.3.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
@@ -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=""
+IUSE="mozilla"
 
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5
@@ -21,7 +21,7 @@ DEPEND="virtual/libc
 PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 
-src_unpack () {
+src_unpack() {
 	for a in ${A}; do
 		if [[ ${a} == *.bin ]]; then
 			echo ">>> Unpacking ${a}..."
@@ -40,7 +40,7 @@ src_unpack () {
 	fi
 }
 
-src_install () {
+src_install() {
 	typeset platform
 
 	dodir /opt/${P}
@@ -52,31 +52,16 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	case ${ARCH} in
-		amd64|x86) platform="i386" ;;
-		ppc) platform="ppc" ;;
-		sparc*) platform="sparc" ;;
-	esac
-	inst_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
+	if use mozilla; then
+		case ${ARCH} in
+			amd64|x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+		esac
+		install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
+	fi
 
 	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
 }
-
-pkg_postinst () {
-	# Only install the JRE as the system default if there's no JDK 
-	# installed. Installing a JRE over an existing JDK will result
-	# in major breakage, see #9289.
-	if [ ! -f "${JAVAC}" ] ; then
-		ewarn "Found no JDK, setting ${P} as default system VM"
-		java_pkg_postinst
-	fi
-}
-
-pkg_prerm() {
-	if java-config -J | grep -q ${P} ; then
-		ewarn "It appears you are removing your default system VM!"
-		ewarn "Please run java-config -L then java-config -S to set a new system VM!"
-	fi
-}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
index 0d6164e1c288..54a6b86f0ae2 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.ebuild,v 1.15 2004/07/30 23:36:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.16 2004/09/29 20:59:21 axxo Exp $
 
-inherit java nsplugins gcc
+inherit java gcc
 
 S=${WORKDIR}/j2re1.4.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.4.1"
@@ -32,7 +32,7 @@ PROVIDE="virtual/jre-1.4.1
 SLOT="0"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 sparc amd64"
-IUSE=""
+IUSE="mozilla"
 
 src_unpack () {
 	typeset a want_gcc_ver
@@ -69,12 +69,14 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	case ${ARCH} in
-		amd64|x86) platform="i386" ;;
-		ppc) platform="ppc" ;;
-		sparc*) platform="sparc" ;;
-	esac
-	inst_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
+	if use mozilla; then
+		case ${ARCH} in
+			amd64|x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+		esac
+		install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
+	fi
 
 	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
 
@@ -87,20 +89,3 @@ src_install () {
 			${D}/etc/env.d/java/20blackdown-jre-1.4.1
 	fi
 }
-
-pkg_postinst () {
-	# Only install the JRE as the system default if there's no JDK 
-	# installed. Installing a JRE over an existing JDK will result
-	# in major breakage, see #9289.
-	if [ ! -f "${JAVAC}" ] ; then
-		ewarn "Found no JDK, setting ${P} as default system VM"
-		java_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if java-config -J | grep -q ${P} ; then
-		ewarn "It appears you are removing your default system VM!"
-		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
-	fi
-}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild
index 6ccabe20a5d4..14d74f3d7a7a 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 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_rc1-r1.ebuild,v 1.4 2004/07/14 01:45:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r1.ebuild,v 1.5 2004/09/29 20:59:21 axxo Exp $
 
-IUSE=""
-
-inherit java nsplugins
+inherit java
 
 JREV="rc1"
 
@@ -24,7 +22,7 @@ HOMEPAGE="http://www.blackdown.org"
 SLOT="1.4.2"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="-* amd64"
-
+IUSE="mozilla"
 DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.6
 	>=sys-apps/sed-4
@@ -63,7 +61,7 @@ src_unpack () {
 }
 
 unpack_jars() {
-	# New to 1.4.2 
+	# New to 1.4.2
 	local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
 	local JAVAHOME="${D}/opt/${P}"
 	local UNPACK_CMD=""
@@ -99,12 +97,14 @@ src_install () {
 	dohtml README.html
 
 	# Install mozilla plugin
-	case ${ARCH} in
-		amd64|x86) platform="i386" ;;
-		ppc) platform="ppc" ;;
-		sparc*) platform="sparc" ;;
-	esac
-	inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	if use mozilla; then
+		case ${ARCH} in
+			amd64|x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+		esac
+		install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
 
 	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties
 
@@ -121,20 +121,3 @@ src_install () {
 
 	unpack_jars
 }
-
-pkg_postinst () {
-	# Only install the JRE as the system default if there's no JDK 
-	# installed. Installing a JRE over an existing JDK will result
-	# in major breakage, see #9289.
-	if [ ! -f "${JAVAC}" ] ; then
-		ewarn "Found no JDK, setting ${P} as default system VM"
-		java_pkg_postinst
-	fi
-}
-
-pkg_prerm() {
-	if java-config -J | grep -q ${P} ; then
-		ewarn "It appears you are removing your default system VM!"
-		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
-	fi
-}
diff --git a/dev-java/compaq-jdk/ChangeLog b/dev-java/compaq-jdk/ChangeLog
index b3db636b5806..f7080666f482 100644
--- a/dev-java/compaq-jdk/ChangeLog
+++ b/dev-java/compaq-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/compaq-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/ChangeLog,v 1.11 2004/07/02 04:19:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/ChangeLog,v 1.12 2004/09/29 20:59:24 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> compaq-jdk-1.3.1-r1.ebuild,
+  compaq-jdk-1.3.1-r2.ebuild, compaq-jdk-1.3.1-r3.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   compaq-jdk-1.3.1-r1.ebuild, compaq-jdk-1.3.1-r2.ebuild,
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild
index 58498cf22c24..e4afb19cedfa 100644
--- a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild
+++ b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild,v 1.3 2004/07/02 04:19:42 eradicator Exp $
-
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r1.ebuild,v 1.4 2004/09/29 20:59:24 axxo Exp $
 
 inherit java
 
@@ -24,6 +22,7 @@ PROVIDE="virtual/jre-1.3.1
 LICENSE="compaq-sdla"
 SLOT="1.3"
 KEYWORDS="-* alpha"
+IUSE="doc"
 
 src_unpack() {
 	rpm2targz ${DISTDIR}/jdk-1.3.1-1-linux-alpha.rpm
@@ -44,8 +43,3 @@ src_install () {
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-}
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild
index 4f99116bd6a1..114720746c04 100644
--- a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild
+++ b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild,v 1.3 2004/07/02 04:19:42 eradicator Exp $
-
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r2.ebuild,v 1.4 2004/09/29 20:59:24 axxo Exp $
 
 inherit java fixheadtails
 
@@ -24,6 +22,7 @@ PROVIDE="virtual/jre-${PV}
 LICENSE="compaq-sdla"
 SLOT="1.3"
 KEYWORDS="-* alpha"
+IUSE="doc"
 
 src_unpack() {
 	rpm2targz ${DISTDIR}/jdk-${PV}-1-linux-alpha.rpm
@@ -45,8 +44,3 @@ src_install () {
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-}
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
index 700bd756b072..3f2cc34d1ec2 100644
--- a/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
+++ b/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild,v 1.3 2004/07/02 04:19:42 eradicator Exp $
-
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1-r3.ebuild,v 1.4 2004/09/29 20:59:24 axxo Exp $
 
 inherit java fixheadtails
 
@@ -24,6 +22,7 @@ PROVIDE="virtual/jre-${PV}
 LICENSE="compaq-sdla"
 SLOT="1.3"
 KEYWORDS="-* alpha"
+IUSE="doc"
 
 src_unpack() {
 	rpm2targz ${DISTDIR}/jdk-${PV}-1-linux-alpha.rpm
@@ -45,8 +44,3 @@ src_install () {
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-}
diff --git a/dev-java/compaq-jre/ChangeLog b/dev-java/compaq-jre/ChangeLog
index 2a18ae6e1d4b..dfc6419967c9 100644
--- a/dev-java/compaq-jre/ChangeLog
+++ b/dev-java/compaq-jre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/compaq-jre
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/ChangeLog,v 1.12 2004/07/02 04:19:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/ChangeLog,v 1.13 2004/09/29 20:59:14 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> compaq-jre-1.3.1-r3.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   compaq-jre-1.3.1-r3.ebuild:
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
index 114883b9b376..6b52ddfb9f53 100644
--- a/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
+++ b/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild,v 1.4 2004/07/02 04:19:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1-r3.ebuild,v 1.5 2004/09/29 20:59:14 axxo Exp $
 
 IUSE="doc"
 
@@ -41,16 +41,3 @@ src_install () {
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
-
-pkg_postinst () {
-	if [ ! -e "${JAVAC}" ] ; then
-		java_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if [ ! -z "$(java-config -J) | grep ${P}" ] ; then
-		ewarn "It appears you are removing your default system VM!"
-		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
-	fi
-}
diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index bd605cad337c..60900289a8ba 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.15 2004/09/23 15:40:24 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.16 2004/09/29 20:59:27 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  ibm-jdk-bin-1.4.1-r2.ebuild, ibm-jdk-bin-1.4.2.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   23 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -ibm-jdk-bin-1.4.1-r1.ebuild,
   -ibm-jdk-bin-1.4.1.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 a523cfd31ba9..d751a3b3aad4 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,18 +1,8 @@
 # Copyright 1999-2004 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.8 2004/09/06 18:12:45 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.1-r2.ebuild,v 1.9 2004/09/29 20:59:27 axxo Exp $
 
-IUSE="X doc javacomm"
-
-inherit java nsplugins eutils
-
-if use ppc; then
-	S="${WORKDIR}/IBMJava2-ppc-141"
-elif use ppc64; then
-	S="${WORKDIR}/IBMJava2-ppc64-141"
-else
-	S="${WORKDIR}/IBMJava2-141"
-fi
+inherit java eutils
 
 DESCRIPTION="IBM Java Development Kit ${PV}"
 SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-141.ppc.tgz )
@@ -34,8 +24,16 @@ DEPEND="virtual/libc
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )
 	X? ( virtual/x11 )"
 RDEPEND=" !ppc64? sys-libs/lib-compat"
+IUSE="X doc javacomm mozilla"
+
+if use ppc; then
+	S="${WORKDIR}/IBMJava2-ppc-141"
+elif use ppc64; then
+	S="${WORKDIR}/IBMJava2-ppc64-141"
+else
+	S="${WORKDIR}/IBMJava2-141"
+fi
 
-# No compilation needed!
 src_compile() { :; }
 
 src_install() {
@@ -50,11 +48,15 @@ src_install() {
 	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 ${D}/etc
+		insinto /etc
 		doins ${FILESDIR}/cpuinfo
-	else
-		# No java-plugin on ppc
-		inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
+	fi
+	if use mozilla && ! use ppc; then
+		local plugin="libjavaplugin_oji.so"
+		if has_version '>=gcc-3*' ; then
+			plugin="libjavaplugin_ojigcc3.so"
+		fi
+		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
 	fi
 
 	dohtml -a html,htm,HTML -r docs
@@ -67,23 +69,13 @@ src_install() {
 pkg_postinst() {
 	java_pkg_postinst
 	if ! use X; then
-		einfo "********************************************************"
+		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."
-		einfo "********************************************************"
-		echo
 	fi
 
-	einfo " After installing ${P} this"
-	einfo " was set as the default JVM to run."
-	einfo " When finished please run the following so your"
-	einfo " enviroment gets updated."
-	eerror "    /usr/sbin/env-update && source /etc/profile"
-	einfo " Or use java-config program to set your preferred VM"
-	einfo "******************************************************"
-
 	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 8671044c1080..8c655d5a5b96 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,18 +1,8 @@
 # Copyright 1999-2004 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.10 2004/09/06 18:12:45 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.ebuild,v 1.11 2004/09/29 20:59:27 axxo Exp $
 
-IUSE="X doc javacomm"
-
-inherit java nsplugins eutils
-
-if use ppc; then
-	S="${WORKDIR}/IBMJava2-ppc-142"
-elif use ppc64; then
-	S="${WORKDIR}/IBMJava2-ppc64-142"
-else
-	S="${WORKDIR}/IBMJava2-142"
-fi
+inherit java eutils
 
 DESCRIPTION="IBM Java Development Kit ${PV}"
 SRC_URI="ppc? ( mirror://gentoo/IBMJava2-SDK-142.ppc.tgz )
@@ -35,7 +25,16 @@ DEPEND="virtual/libc
 	X? ( virtual/x11 )"
 RDEPEND=" !ppc64? sys-libs/lib-compat"
 
-# No compilation needed!
+IUSE="X doc javacomm mozilla"
+
+if use ppc; then
+	S="${WORKDIR}/IBMJava2-ppc-142"
+elif use ppc64; then
+	S="${WORKDIR}/IBMJava2-ppc64-142"
+else
+	S="${WORKDIR}/IBMJava2-142"
+fi
+
 src_compile() { :; }
 
 src_install() {
@@ -52,9 +51,14 @@ src_install() {
 		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
 		insinto /etc
 		doins ${FILESDIR}/cpuinfo
-	else
-		# No java-plugin on ppc
-		inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
+	fi
+
+	if use mozilla && ! use ppc; then
+		local plugin="libjavaplugin_oji.so"
+		if has_version '>=gcc-3*' ; then
+			plugin="libjavaplugin_ojigcc3.so"
+		fi
+		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
 	fi
 
 	dohtml -a html,htm,HTML -r docs
@@ -67,23 +71,13 @@ src_install() {
 pkg_postinst() {
 	java_pkg_postinst
 	if ! use X; then
-		einfo "********************************************************"
+		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."
-		einfo "********************************************************"
-		echo
 	fi
 
-	einfo " After installing ${P} this"
-	einfo " was set as the default JVM to run."
-	einfo " When finished please run the following so your"
-	einfo " enviroment gets updated."
-	eerror "    /usr/sbin/env-update && source /etc/profile"
-	einfo " Or use java-config program to set your preferred VM"
-	einfo "******************************************************"
-
 	ebeep 5
 	epause 8
 }
diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 4d24d647d7e1..8af268282c5d 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.11 2004/09/23 15:48:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.12 2004/09/29 20:59:12 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  ibm-jre-bin-1.4.1-r1.ebuild, ibm-jre-bin-1.4.2.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
+
+*ibm-jre-bin-1.4.2 (29 Sep 2004)
 
   23 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -ibm-jre-bin-1.4.1.ebuild:
   prune older ebuilds
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
index 0fb53ae2fd9c..9a2f3952b7f8 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.1-r1.ebuild,v 1.10 2004/08/04 12:52:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.11 2004/09/29 20:59:12 axxo Exp $
 
-inherit java nsplugins
+inherit java
 
 S="${WORKDIR}/j2sdk${PV}"
 DESCRIPTION="IBM Java Development Kit ${PV}"
@@ -11,7 +11,7 @@ SRC_URI="ppc?(mirror://gentoo/IBMJava2-JRE-141.ppc.tgz)
 	x86?(mirror://gentoo/IBMJava2-JRE-141.tgz)"
 PROVIDE="virtual/jre-1.4.1
 	virtual/java-scheme-2"
-IUSE=""
+IUSE="mozilla"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86 ppc64"
@@ -19,7 +19,6 @@ DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5"
 RDEPEND="${DEPEND}"
 
-
 if use ppc; then
 	S=${WORKDIR}/IBMJava2-ppc-141
 elif use ppc64; then
@@ -33,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	# Copy all the files to the designated directory 
+	# Copy all the files to the designated directory
 	dodir /opt/${P}
 	cp -dpR ${S}/jre/* ${D}/opt/${P}/
 
@@ -48,16 +47,13 @@ src_install() {
 		< ${FILESDIR}/${P} \
 		> ${D}/etc/env.d/java/20${P} \
 		|| die "unable to install environment file"
-}
 
-pkg_postinst(){
-	inst_plugin /opt/${P}/bin/javaplugin.so
-	true
-}
-
-pkg_prerm() {
-	if [ ! -z "$(java-config -J | grep ${P})" ] ; then
-		ewarn "It appears you are removing your default system VM!"
-		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
+	if use mozilla; then
+		local plugin="libjavaplugin_oji.so"
+		if has_version '>=gcc-3*' ; then
+			plugin="libjavaplugin_ojigcc3.so"
+		fi
+		install_mozilla_plugin /opt/${P}/bin/${plugin}
 	fi
+
 }
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 168b472ea628..83ea4a46ac81 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,8 +1,8 @@
 # Copyright 1999-2004 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.2 2004/08/04 15:25:57 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.3 2004/09/29 20:59:12 axxo Exp $
 
-inherit java nsplugins
+inherit java
 
 S="${WORKDIR}/j2sdk${PV}"
 DESCRIPTION="IBM Java Development Kit ${PV}"
@@ -11,7 +11,7 @@ SRC_URI="ppc?(mirror://gentoo/IBMJava2-JRE-142.ppc.tgz)
 	x86?(mirror://gentoo/IBMJava2-JRE-142.tgz)"
 PROVIDE="virtual/jre-1.4.2
 	virtual/java-scheme-2"
-IUSE=""
+IUSE="mozilla"
 SLOT="1.4"
 LICENSE="IBM-J1.4"
 KEYWORDS="ppc ~x86 ppc64"
@@ -19,7 +19,6 @@ DEPEND="virtual/libc
 	>=dev-java/java-config-0.2.5"
 RDEPEND="${DEPEND}"
 
-
 if use ppc; then
 	S=${WORKDIR}/IBMJava2-ppc-142
 elif use ppc64; then
@@ -33,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	# Copy all the files to the designated directory 
+	# Copy all the files to the designated directory
 	dodir /opt/${P}
 	cp -dpR ${S}/jre/* ${D}/opt/${P}/
 
@@ -48,16 +47,13 @@ src_install() {
 		< ${FILESDIR}/${P} \
 		> ${D}/etc/env.d/java/20${P} \
 		|| die "unable to install environment file"
-}
 
-pkg_postinst(){
-	inst_plugin /opt/${P}/bin/javaplugin.so
-	true
-}
-
-pkg_prerm() {
-	if [ ! -z "$(java-config -J | grep ${P})" ] ; then
-		ewarn "It appears you are removing your default system VM!"
-		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
+	if use mozilla; then
+		local plugin="libjavaplugin_oji.so"
+		if has_version '>=gcc-3*' ; then
+			plugin="libjavaplugin_ojigcc3.so"
+		fi
+		install_mozilla_plugin /opt/${P}/bin/${plugin}
 	fi
+
 }
diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog
index 6a3d1637c2f3..7e69dfc624a9 100644
--- a/dev-java/sun-j2sdk/ChangeLog
+++ b/dev-java/sun-j2sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-j2sdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.31 2004/09/21 14:08:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.32 2004/09/29 21:01:53 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.1-r1.ebuild,
+  sun-j2sdk-1.4.2.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   21 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-j2sdk-1.4.2.ebuild:
   x86
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
index d11972fbb3ab..3009bb98bc9b 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.13 2004/07/28 10:58:57 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.14 2004/09/29 21:01:53 axxo Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -8,9 +8,7 @@
 # Based on http://www.linuxfromscratch.org/~tushar/hints/javafromscratch.txt (LFS)
 # By Tushar Teredesai <Tush@Yahoo.Com>
 
-IUSE="nptl doc"
-
-inherit java nsplugins
+inherit java
 
 JAVA_PATCHES="disable-sanity-check
 	fix-intl-files
@@ -51,6 +49,8 @@ PROVIDE="virtual/jre-1.4.1
 	virtual/jdk-1.4.1
 	virtual/java-scheme-2"
 
+IUSE="nptl doc mozilla"
+
 pkg_nofetch() {
 	einfo "Please download"
 	einfo "  - ${SRC_MOZHEADERS}"
@@ -152,7 +152,7 @@ src_install () {
 
 	chown -R root:root ${D}/opt/${P}
 
-	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+	use mozilla && install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
 	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
index 60a4becfce24..d173d05ad208 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.12 2004/09/21 14:08:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.2.ebuild,v 1.13 2004/09/29 21:01:53 axxo Exp $
 
-IUSE="nptl doc"
-
-inherit java nsplugins
+inherit java
 
 JAVA_PATCHES="
 	remove-fixed-paths
@@ -27,6 +25,7 @@ HOMEPAGE="http://wwws.sun.com/software/java2/download.html"
 SLOT="0"
 KEYWORDS="x86 -ppc -alpha -sparc"
 LICENSE="sun-csl"
+IUSE="nptl doc mozilla"
 
 RDEPEND="virtual/libc
 	virtual/x11
@@ -149,7 +148,7 @@ src_install () {
 
 	chown -R root:root ${D}/opt/${P}
 
-	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+	use mozilla && install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
 	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index ad96aaa33a6e..ea7b0dc8830c 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.90 2004/09/28 00:33:36 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.91 2004/09/29 20:59:31 axxo Exp $
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org> sun-jdk-1.2.2.017.ebuild,
+  sun-jdk-1.3.1.13.ebuild, sun-jdk-1.4.2.05.ebuild,
+  sun-jdk-1.5.0_rc1.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/sun-jdk-1.2.2.017,
   files/sun-jdk-1.3.1.13, files/sun-jdk-1.4.2.05:
diff --git a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
index e73ee407b116..9d5dd20f3552 100644
--- a/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 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.2.2.017.ebuild,v 1.2 2004/07/23 16:07:40 squinky86 Exp $
-
-IUSE="doc mozilla X"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.2.2.017.ebuild,v 1.3 2004/09/29 20:59:31 axxo Exp $
 
 inherit java
 
@@ -18,7 +16,7 @@ LICENSE="sun-bcla-java-vm-1.2"
 SLOT="1.2"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
 RESTRICT="fetch"
-
+IUSE="doc mozilla X"
 # NOTE:  Sun's JDK also requires the XFree86 be installed to use the graphical
 # libraries.  Even some non-graphical libraries (such as JavaMail) have bizarre
 # dependencies on windowing toolkits.
@@ -50,7 +48,7 @@ pkg_setup() {
 	echo
 }
 
-src_install () {
+src_install() {
 	# Make the root directory for the installation.
 	dodir /opt/${P}
 
@@ -80,21 +78,21 @@ src_install () {
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Set as default VM if none exists
 	java_pkg_postinst
 
 	# Again, this will not work as a Mozilla plugin.
 	if use mozilla ; then
+		echo
 		einfo "JDK 1.2.2 does not work with Mozilla.  A more recent JDK is"
 		einfo "required."
-		echo
 	fi
 
 	# Warn the user if they don't appear to have XFree86 installed.
 	if ! use X ; then
+		echo
 		ewarn "Some parts of Sun's JDK require XFree86 to be installed."
 		ewarn "Be careful which Java libraries you attempt to use."
-		echo
 	fi
 }
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 c4ac133d57b6..369e06a8f25b 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,10 +1,8 @@
 # Copyright 1999-2004 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.1 2004/09/23 16:51:23 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.13.ebuild,v 1.2 2004/09/29 20:59:31 axxo Exp $
 
-IUSE="doc mozilla"
-
-inherit java nsplugins eutils
+inherit java eutils
 
 MY_PV=${PV%.*}_${PV##*.}
 MY_P=jdk${MY_PV}
@@ -27,6 +25,7 @@ SLOT="1.3"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
 RESTRICT="fetch"
 
+IUSE="doc mozilla"
 # this is needed for proper operating under a PaX kernel without activated grsecurity acl
 CHPAX_CONSERVATIVE_FLAGS="pemsv"
 
@@ -90,8 +89,7 @@ src_install () {
 	cp -a demo src.jar ${D}/opt/${P}/share/
 
 	if use mozilla ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
+		install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
 	fi
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
@@ -100,13 +98,13 @@ src_install () {
 pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
-	inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so
 
 	# 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
 	if has_version "sys-apps/chpax"
 	then
+		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
 		for paxkills in "jar" "javac" "java"
@@ -124,22 +122,9 @@ pkg_postinst () {
 		ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
 	fi
 
-	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
-	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
-	einfo "********************************************************"
+	echo
 	eerror "Some parts of Sun's JDK require XFree86 to be installed."
 	eerror "Be careful which Java libraries you attempt to use."
-	einfo "********************************************************"
-	echo
-
-	einfo "******************************************************"
-	einfo " After installing ${P} this"
-	einfo " was set as the default JVM to run."
-	einfo " When finished please run the following so your"
-	einfo " enviroment gets updated."
-	eerror "    /usr/sbin/env-update && source /etc/profile"
-	einfo " Or use java-config program to set your preferred VM"
-	einfo "******************************************************"
 
 	ebeep 5
 	epause 8
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
index 23f2b8bd6774..c269b85f0c68 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 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.05.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.05.ebuild,v 1.4 2004/09/29 20:59:31 axxo Exp $
 
-IUSE="doc gnome kde mozilla jce"
-
-inherit java nsplugins eutils
+inherit java eutils
 
 MY_PV=${PV%.*}_${PV##*.}
 MY_P=j2sdk${MY_PV}
@@ -22,6 +20,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa"
 RESTRICT="fetch"
+IUSE="doc gnome kde mozilla jce"
 
 DEPEND=">=dev-java/java-config-1.1.5
 	sys-apps/sed
@@ -59,13 +58,11 @@ pkg_nofetch() {
 
 src_unpack() {
 	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${MY_PV}.bin. Please check the permission and try again."
-		die
+		die "cannot read ${MY_PV}.bin. Please check the permission and try again."
 	fi
 	if use jce; then
 		if [ ! -r ${DISTDIR}/${jce_policy} ]; then
-			eerror "cannot read ${jce_policy}. Please check the permission and try again."
-			die
+			die "cannot read ${jce_policy}. Please check the permission and try again."
 		fi
 	fi
 	#Search for the ELF Header
@@ -90,7 +87,7 @@ src_unpack() {
 	fi
 }
 
-src_install () {
+src_install() {
 	local dirs="bin include jre lib man"
 	dodir /opt/${P}
 
@@ -117,14 +114,14 @@ src_install () {
 		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
 	fi
 
-	local plugin_dir="ns610"
-	if has_version '>=gcc-3.2*' ; then
-		plugin_dir="ns610-gcc32"
-	fi
-	if use mozilla ; then
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
+	if use mozilla; then
+		local plugin_dir="ns610"
+		if has_version '>=gcc-3.2*' ; then
+			plugin_dir="ns610-gcc32"
+		fi
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so
 	fi
-	inst_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
 
 	# create dir for system preferences
 	dodir /opt/${P}/.systemPrefs
@@ -154,7 +151,7 @@ src_install () {
 	#      is a directory and will not be gzipped ;)
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Create files used as storage for system preferences.
 	touch /opt/${P}/.systemPrefs/.system.lock
 	chmod 644 /opt/${P}/.systemPrefs/.system.lock
@@ -166,13 +163,11 @@ pkg_postinst () {
 
 	#Show info about netscape
 	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
-		einfo "********************************************************"
+		echo
 		einfo "If you want to install the plugin for Netscape 4.x, type"
 		einfo
 		einfo "   cd /usr/lib/nsbrowser/plugins/"
 		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-		einfo "********************************************************"
-		echo
 	fi
 
 	# if chpax is on the target system, set the appropriate PaX flags
@@ -180,6 +175,7 @@ pkg_postinst () {
 	# but may confuse things like AV scanners and automatic tripwire
 	if has_version "sys-apps/chpax"
 	then
+		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
 		for paxkills in "jar" "javac" "java"
@@ -197,22 +193,9 @@ pkg_postinst () {
 		ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
 	fi
 
-	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
-	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
-	einfo "*********************************************************"
+	echo
 	eerror "Some parts of Sun's JDK require XFree86 to be installed."
 	eerror "Be careful which Java libraries you attempt to use."
-	einfo "*********************************************************"
-	echo
-
-	einfo "******************************************************"
-	einfo " After installing ${P} this"
-	einfo " was set as the default JVM to run."
-	einfo " When finished please run the following so your"
-	einfo " enviroment gets updated."
-	eerror "    /usr/sbin/env-update && source /etc/profile"
-	einfo " Or use java-config program to set your preferred VM"
-	einfo "******************************************************"
 
 	ebeep 5
 	epause 8
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
index 72bc086b376f..a296b882bf23 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 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_rc1.ebuild,v 1.3 2004/09/06 18:44:20 ciaranm Exp $
-
-IUSE="doc gnome kde mozilla jce"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0_rc1.ebuild,v 1.4 2004/09/29 20:59:31 axxo Exp $
 
 inherit java eutils
 
@@ -26,6 +24,7 @@ SLOT="1.5"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~amd64"
 RESTRICT="fetch"
+IUSE="doc gnome kde mozilla jce"
 
 #
 DEPEND=">=dev-java/java-config-1.2
@@ -66,13 +65,11 @@ pkg_nofetch() {
 
 src_unpack() {
 	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
+		die "cannot read ${At}. Please check the permission and try again."
 	fi
 	if use jce; then
 		if [ ! -r ${DISTDIR}/${jcefile} ]; then
-			eerror "cannot read ${jcefile}. Please check the permission and try again."
-			die
+			die "cannot read ${jcefile}. Please check the permission and try again."
 		fi
 	fi
 
@@ -102,7 +99,7 @@ src_unpack() {
 	${S}/bin/java -client -Xshare:dump
 }
 
-src_install () {
+src_install() {
 	local dirs="bin include jre lib man"
 	dodir /opt/${P}
 
@@ -128,13 +125,12 @@ src_install () {
 		dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
 	fi
 
+	if use mozilla; then
+		local plugin_dir="ns7-gcc29"
+		if has_version '>=gcc-3*' ; then
+			plugin_dir="ns7"
+		fi
 
-	local plugin_dir="ns7-gcc29"
-	if has_version '>=gcc-3*' ; then
-		plugin_dir="ns7"
-	fi
-
-	if use mozilla ; then
 		if use x86 ; then
 			install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so
 		else
@@ -175,7 +171,7 @@ src_install () {
 	#      is a directory and will not be gzipped ;)
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Create files used as storage for system preferences.
 	PREFS_LOCATION=/opt/${P}/jre
 	mkdir -p ${PREFS_LOCATION}/.systemPrefs
@@ -193,13 +189,11 @@ pkg_postinst () {
 
 	#Show info about netscape
 	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
-		einfo "********************************************************"
+		echo
 		einfo "If you want to install the plugin for Netscape 4.x, type"
 		einfo
 		einfo "   cd /usr/lib/nsbrowser/plugins/"
 		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-		einfo "********************************************************"
-		echo
 	fi
 
 	# if chpax is on the target system, set the appropriate PaX flags
@@ -207,6 +201,7 @@ pkg_postinst () {
 	# but may confuse things like AV scanners and automatic tripwire
 	if has_version "sys-apps/chpax"
 	then
+		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
 		for paxkills in "jar" "javac" "java"
@@ -224,30 +219,15 @@ pkg_postinst () {
 		ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
 	fi
 
-	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
-	#comment found on the sun-jdk 1.2.2 ebuild that he sent.
-	einfo "*********************************************************"
+	echo
 	eerror "Some parts of Sun's JDK require XFree86 to be installed."
 	eerror "Be careful which Java libraries you attempt to use."
-	einfo "*********************************************************"
-	echo
 
-	einfo "*********************************************************"
-	einfo " After installing ${P} this"
-	einfo " was set as the default JVM to run."
-	einfo " When finished please run the following so your"
-	einfo " enviroment gets updated."
-	eerror "    /usr/sbin/env-update && source /etc/profile"
-	einfo " Or use java-config program to set your preferred VM"
-	einfo "*********************************************************"
-
-	# warn about a default setting in Java 1.5.0 rc
-	einfo "*********************************************************"
+	echo
 	einfo " Be careful: ${P}'s Java compiler uses"
 	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
 	einfo " are not valid identifiers any more in that mode,"
 	einfo " which can cause incompatibility with certain sources."
-	einfo "*********************************************************"
 
 	ebeep 5
 	epause 8
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 7f0dfad5ed30..72193de4dca0 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.9 2004/09/23 16:45:52 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.10 2004/09/29 20:59:00 axxo Exp $
+
+*sun-jre-bin-1.4.2.05-r1 (29 Sep 2004)
+
+  29 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  sun-jre-bin-1.4.2.05-r1.ebuild:
+  Cleaned up plugin instalation, Moved some messages to the eclass, see #22395
+  for more information
 
   23 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -sun-jre-bin-1.4.2.05.ebuild:
   prune older
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild
index 6a386a1be9e8..80982c3451eb 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 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.05-r1.ebuild,v 1.1 2004/09/10 21:43:17 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.05-r1.ebuild,v 1.2 2004/09/29 20:59:00 axxo Exp $
 
-IUSE="gnome kde mozilla"
-
-inherit java nsplugins eutils
+inherit java eutils
 
 At="j2re-1_4_2_05-linux-i586.bin"
 S="${WORKDIR}/j2re1.4.2_05"
@@ -15,6 +13,7 @@ SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa"
 RESTRICT="fetch"
+IUSE="gnome kde mozilla"
 
 DEPEND=">=dev-java/java-config-1.1.5
 	sys-apps/sed"
@@ -77,14 +76,13 @@ src_install () {
 	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
 	dohtml Welcome.html ControlPanel.html
 
-	local plugin_dir="ns610"
-	if has_version '>=gcc-3.2*' ; then
-		plugin_dir="ns610-gcc32"
-	fi
 	if use mozilla ; then
+		local plugin_dir="ns610"
+		if has_version '>=gcc-3.2*' ; then
+			plugin_dir="ns610-gcc32"
+		fi
 		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
 	fi
-	inst_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
 
 	# create dir for system preferences
 	dodir /opt/${P}/.systemPrefs
@@ -121,15 +119,15 @@ pkg_postinst () {
 	touch /opt/${P}/.systemPrefs/.systemRootModFile
 	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
 
+	java_pkg_postinst
+
 	#Show info about netscape
 	if has_version '>=netscape-navigator-4.79-r1' || has_version '>=netscape-communicator-4.79-r1' ; then
-		einfo "********************************************************"
+		echo
 		einfo "If you want to install the plugin for Netscape 4.x, type"
 		einfo
 		einfo "   cd /usr/lib/nsbrowser/plugins/"
 		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-		einfo "********************************************************"
-		echo
 	fi
 
 	# if chpax is on the target system, set the appropriate PaX flags
@@ -137,6 +135,7 @@ pkg_postinst () {
 	# but may confuse things like AV scanners and automatic tripwire
 	if has_version "sys-apps/chpax"
 	then
+		echo
 		einfo "setting up conservative PaX flags for jar, javac and java"
 
 		for paxkills in "java"
@@ -154,36 +153,10 @@ pkg_postinst () {
 		ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
 	fi
 
-	#Thanks to Douglas Pollock <douglas.pollock@magma.ca> for this
-	#comment found on the sun-jre 1.2.2 ebuild that he sent.
-	einfo "*********************************************************"
+	echo
 	eerror "Some parts of Sun's JDK require XFree86 to be installed."
 	eerror "Be careful which Java libraries you attempt to use."
-	einfo "*********************************************************"
-	echo
-
-	# Set as default VM if none exists
-	if [ ! -f "${JAVAC}" ] ; then
-		java_pkg_postinst
-
-		einfo "******************************************************"
-		einfo " After installing ${P} this"
-		einfo " was set as the default JVM to run."
-		einfo " When finished please run the following so your"
-		einfo " enviroment gets updated."
-		eerror "    /usr/sbin/env-update && source /etc/profile"
-		einfo " Or use java-config program to set your preferred VM"
-		einfo "******************************************************"
-	fi
 
 	ebeep 5
 	epause 8
 }
-
-pkg_prerm() {
-	if [ ! -z "$(java-config -J | grep ${P})" ] ; then
-		java-config -J
-		ewarn "It appears you are removing your default system VM!"
-		ewarn "Please run java-config -L then java-config-S to set a new system VM!"
-	fi
-}