Drop elog message about old browsers not working. #427458

Remove old.

(Portage version: 2.1.11.9/svn/Linux x86_64, signed Manifest commit with key 0xDA575EB7)

svn path=/java-overlay/; revision=9086

7 files changed, 22 insertions, 437 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index de09f954..0dd95458 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jul 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-web-1.1.4.ebuild,
+  -icedtea-web-1.1.4-r7.ebuild, -icedtea-web-1.1.4-r8.ebuild,
+  icedtea-web-1.2.ebuild, icedtea-web-1.2-r7.ebuild:
+  Drop elog message about old browsers not working. #427458
+  Remove old.
+
   14 Mar 2012; Ralph Sennhauser <sera@gentoo.org> icedtea-web-1.2.ebuild:
   Fix typo in handle name.
 
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 9fb8d8f3..9cd607ef 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866
-AUX fix-plugin-in-icedtea-7.patch 15838 RMD160 a072ac5bd931bc28f4fbb2f0671725596ae53212 SHA1 7772f2050787af819799dc203b58965f5636f51c SHA256 335ddc5f92751756f21a623f7ba82cb9046287c8eaaed574c96f71ccadb8e985
-DIST icedtea-web-1.1.4.tar.gz 812273 RMD160 2aac06c05d4513694968f86861225b5329307781 SHA1 9389030878d7c3aee17f641e3095830fe722fb60 SHA256 b17a742af0153b7887cf667a160f8519afad125bc515b0f4783c66e7ee1a7f26
-DIST icedtea-web-1.2.tar.gz 885793 RMD160 3686b66531088050934ba25c8ac5be3fc23ff899 SHA1 4b7e38b13101ac1f18dc276f17be37a0ed2b28df SHA256 3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d
-EBUILD icedtea-web-1.1.4-r7.ebuild 3947 RMD160 c2ca94f363127be835030b371e23eabdf0cdfbc5 SHA1 06d72d0ac062153b4e10e224becb85af5acf123f SHA256 658a99feffd54753b9ea3718e2870aa33cb9097578775448729b8e24c0c45ec5
-EBUILD icedtea-web-1.1.4-r8.ebuild 4074 RMD160 20d81aeeb1142b3c4b4b1cd258e668d737d3d0d5 SHA1 63599b3bd20407562c1506f7bde3e71f571607ed SHA256 110cb97e651d0aa2877c4dfe180695520061d127255a3380044768f6377c5a37
-EBUILD icedtea-web-1.1.4.ebuild 3956 RMD160 97b5d4c531d8bd0856407a305119b28a14ef5e27 SHA1 3fd09263950f4d062bdc4b3b207545cb6c14dd05 SHA256 324335acb6270fa0e32ab905f885b828fe1e1c0964182725179f3f2df90a2cc6
-EBUILD icedtea-web-1.2-r7.ebuild 3378 RMD160 561f726e27341ace8d58525f359cdeeb55b18a99 SHA1 296c476398d48976ac9d6df757e947c3c90117f0 SHA256 991495ee26e1c3d237035305457c001d57c3e7466eab2c007d83b8a577072f5d
-EBUILD icedtea-web-1.2.ebuild 3387 RMD160 80131a054209dfffbc7da6e739d87d9e211a846c SHA1 168eac66e58eb1706450234d05536fe19632df69 SHA256 9ddc493292d662b0741a84ff9436e67842bb11cf34ddbee6457cec366821e743
-MISC ChangeLog 6015 RMD160 0ba2e9e0bbb39409acb7638fb6e9ca9d53220120 SHA1 f1c068d552ec9433779b2e15f75d520e257a2638 SHA256 64ad4e9634b00042bb99a2c5cfab1d12e7af60b28f0dfc7456fbc263355a9bff
-MISC metadata.xml 532 RMD160 475b5d799d063ecc980d17896d8b591680ac2a7d SHA1 acf45999323b8df83b432973a11d64e2577ff022 SHA256 48eafb34adc623b7f298610feaac56f61a01f52658b83be30e4cc8d3a9b9f1d7
+AUX 0002-Respect-LDFLAGS.patch 352 SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866 SHA512 83e431505808e5e8b553d17b74590eaf232f69ccc7d0c9c3753af6995105a08b4cf8cc844295edb977e5a6456c5fe3b53ba0fa565607c99cc82ac025169dd16f WHIRLPOOL ef0f6ccdd1f879940351dbe0ece62c2f1ecc333df06328f7d12e07885579255f973689545e32ec7db679cc1ec516860f2b7acb52070dc4714c2a3b78b9eeae87
+AUX fix-plugin-in-icedtea-7.patch 15838 SHA256 335ddc5f92751756f21a623f7ba82cb9046287c8eaaed574c96f71ccadb8e985 SHA512 2baa7b48b1b2830ca1470383bfdee5cfd0850f8a96e9c28826566514bcbfc5534eff0f6f56ff41be488a38910e2a28f04cfc4a57407091e2c8e5f25b8a88d69b WHIRLPOOL 3c857c94b871592922ac97a9e57c82be3dd5674600f1e7779b42c2d9a505ecc1ba4c3b15c9aabaa32e1b686f3ffae700546464d05643356042087a70defbe23b
+DIST icedtea-web-1.2.tar.gz 885793 SHA256 3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d SHA512 42b6878457965ed3b077acb72940587efbf6b751e2a197fceed20c9cd0be8e878412a4a838c0dfbb5b02eeaae1833073c3bbf4baef7944c576f3c71c06b7419a WHIRLPOOL bd7bc02be559648290e852470daa9ad962fe7b5e168d1cfe2520b4cafdd9b0cbced96e1dfe75e04e20174a963086bce25ae199c8cd9f11b4add25a36c62e53d0
+EBUILD icedtea-web-1.2-r7.ebuild 3222 SHA256 36f1b84cca867de5977c4a8e8b3fe38ae846c01d6f945de62caec573b5f429ed SHA512 1ce62192d5f2f427cb036bdd780d5d7a3d10758104da858d1c77f338f0aa22769a973b08277451d55681a162ef0f71200e8afe6b7650ca0ee7dcbeb8cc986260 WHIRLPOOL a01051b1a3210def95e95ebf365f8b75f02eab8b885dbbb062b60d3f31be914858b8e779df131e369044b2245d0aae04553d764d0c7944711fc6d05bf8eb30bc
+EBUILD icedtea-web-1.2.ebuild 3231 SHA256 8cf32c2b4bd34b2096e0b08d24eee81c00c7b049f3ec8378ba6187183f05cc72 SHA512 2fac7b92ccada394ba1b98ad927a6ad31d9118c7d4e2771a30bf184405d127c0802c1e0070abdb142a7909bd7888c4b48f5d5b4acbfbf4bf68498f0c8627716d WHIRLPOOL 8a02a8e73b07033882a875f30ac195917ef39f171ecb48e96241e083817b7e83c26de09ef1680e6df2915fc4c019aa0ea91fe64d9751603a04e9f455660d0d07
+MISC ChangeLog 6282 SHA256 c519a4e041c4c9b224ef186f049789aa392c926c0ad3cfba2ab9c5c7231b6a1a SHA512 ee4f507518e52fa678253c860daaf8995bdfdb27b362f88b7bf75607c3d4c751503dd7a9de36bfd7446b319c78ed94ed109d8bd23787f99078875ef59991e995 WHIRLPOOL 5be485a64f19762cf795aff3eba2e7cfcb5ec988567d6040ac6f006171984870751d9b63f0f198cb61184ea585a698125b47d659353ec78ac2b607d211a92ea1
+MISC metadata.xml 532 SHA256 48eafb34adc623b7f298610feaac56f61a01f52658b83be30e4cc8d3a9b9f1d7 SHA512 7e87ec902c3cc65e7b3f8cf7ae4bc408caa57f037c415cea0ab9cafc492c85e26fae800d1a70762ac67e44b125736a4cc3a06c3fb2b22ca885ae6e012de836e9 WHIRLPOOL 1824a4e566404d40110520abb4db3cb58e673a04ea0c2f4c911fa84aa29da8658618647868ae23eab82b9d95f2e8f87486c23f917956d6af78deb50a2d9f5469
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPYMdLAAoJEIUJ+svaV163QcgH/Rb4RG/ZSpgEn8R0ArKI1Ac9
-7+jzlsPjDvLsY+YkUojBdrEifmIkIIErSwV82qFtQm+anPHlbTd8x0SKdShCkQAJ
-3PcNnd7aSBpBPSyhGdW04HNpnNBv2Sikrev7ZN0dLlY2pFync1+fiFIazTBVuI/J
-jmxhTrjGTaRJkrh08RHjue1Zen79BkQLkGKeV5fDMehQ+AHSm3qfAA6C29wQUvbG
-2RwXpMcE7k1tNZPkuht3W3nXT5kpXYZpHMEGwqQcrmSzKM18NbybF+qAysQy3SyK
-q8/ApoE8LJi1Z3LfIahdrD1Urorl0g/n22NupI2iFcfhAxqHuL1yY8upyG8SXMY=
-=ZfJ/
+iQEcBAEBCAAGBQJQCpeeAAoJEIUJ+svaV163fTAH/0nsJjnDtoUFQlz2gndhczPM
+hP0PHTmKn7joaUr73KZfm+9jo23Gga+wlVxqd1UJCI56duFDokCkdmsIJLbr/CsJ
++C/ltWdtMwceMleJ50FnPEg+Gz3Ro7lQtya90R6y9L0/VpXbSzKFvmueVehvUbb+
+WLw/7rPN/RcHUcpBCb+cHUGIUuihmds+kJ/HT6TssD/BJJXosj026+DiIHgd3Evm
+vlyl59EIXwnOP7L2ABg9/N+2LRh4yg8Lwg1P1Cz8J3wcTsxhJnvpa7xzP36eIga+
+Jpeubv+WhuP/yrG7uAN/rfa4rfI06CyX6r5x3EQaQ6voIKs/CkeYVP0UM5C+Csg=
+=GLau
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
deleted file mode 100644
index 6a50f0c1..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="4"
-
-inherit autotools eutils java-pkg-2 java-vm-2
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="build doc javascript +nsplugin test"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-# Need system junit 4.8+. Bug #389795
-DEPEND="${RDEPEND}
-	javascript? ( dev-java/rhino:1.6 )
-	nsplugin? (
-		|| ( net-misc/npapi-sdk
-			>=net-libs/xulrunner-1.9.1 ) )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
-	[[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423
-
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	else
-		# migration logic
-		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
-			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
-		else
-			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
-		fi
-	fi
-
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_prepare() {
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
-		installdir="/opt/icedtea-web-bin-${SLOT}"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea-${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino)
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	if use nsplugin; then
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
-		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
-	fi
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild
deleted file mode 100644
index 812f05f0..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="4"
-
-inherit autotools eutils java-pkg-2 java-vm-2
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="build doc javascript +nsplugin test"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-# Need system junit 4.8+. Bug #389795
-DEPEND="${RDEPEND}
-	javascript? ( dev-java/rhino:1.6 )
-	nsplugin? (
-		|| ( net-misc/npapi-sdk
-			>=net-libs/xulrunner-1.9.1 ) )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
-	[[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423
-
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	else
-		# migration logic
-		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
-			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
-		else
-			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
-		fi
-	fi
-
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_prepare() {
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	# this should be included in next release, plugin doesn't work without it
-	epatch "${FILESDIR}"/fix-plugin-in-icedtea-7.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
-		installdir="/opt/icedtea-web-bin-${SLOT}"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea-${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino)
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	if use nsplugin; then
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
-		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
-	fi
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
deleted file mode 100644
index b2666c3e..00000000
--- a/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="4"
-
-inherit autotools eutils java-pkg-2 java-vm-2
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="build doc javascript +nsplugin test"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-# Need system junit 4.8+. Bug #389795
-DEPEND="${RDEPEND}
-	javascript? ( dev-java/rhino:1.6 )
-	nsplugin? (
-		|| ( net-misc/npapi-sdk
-			>=net-libs/xulrunner-1.9.1 ) )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
-	[[ "${MERGE_TYPE}" == "binary" ]] && return # bug 258423
-
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	else
-		# migration logic
-		if [[ -L /usr/lib/jvm/icedtea${SLOT} ]]; then
-			JAVA_PKG_FORCE_VM="icedtea${SLOT}"
-		else
-			JAVA_PKG_FORCE_VM="icedtea-${SLOT}"
-		fi
-	fi
-
-	einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_prepare() {
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
-		installdir="/opt/icedtea-web-bin-${SLOT}"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea-${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino)
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	if use nsplugin; then
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
-		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
-	fi
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild
index 5714e8b3..a11f4cb8 100644
--- a/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2-r7.ebuild
@@ -109,8 +109,6 @@ pkg_postinst() {
 
 	if use nsplugin; then
 		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
-		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
 	fi
 }
 
diff --git a/dev-java/icedtea-web/icedtea-web-1.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.2.ebuild
index 63f80207..15badf3c 100644
--- a/dev-java/icedtea-web/icedtea-web-1.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2.ebuild
@@ -109,8 +109,6 @@ pkg_postinst() {
 
 	if use nsplugin; then
 		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
-		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
 	fi
 }