Revbump -r0 to -r2 (straight to stable) and -r1 to -r3, so that everyone gets the sandbox control files. Bug #502280.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4E61DE84

4 files changed, 318 insertions, 6 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 434d7600d4ae..927fe70a7ee7 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.64 2014/06/12 19:40:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.65 2014/06/27 14:34:24 caster Exp $
+
+*icedtea-bin-6.1.13.3-r3 (27 Jun 2014)
+*icedtea-bin-6.1.13.3-r2 (27 Jun 2014)
+
+  27 Jun 2014; Vlastimil Babka <caster@gentoo.org>
+  +icedtea-bin-6.1.13.3-r2.ebuild, +icedtea-bin-6.1.13.3-r3.ebuild:
+  Revbump -r0 to -r2 (straight to stable) and -r1 to -r3, so that everyone gets
+  the sandbox control files. Bug #502280.
 
   12 Jun 2014; Jeroen Roovers <jer@gentoo.org> icedtea-bin-6.1.13.3.ebuild,
   icedtea-bin-6.1.13.3-r1.ebuild:
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index e065cbebf442..300e780ae2bf 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX fontconfig.Gentoo.properties.src 15624 SHA256 06dc1c588fdf939f3942d435a9a695679b9d6b44591f6efb7bef3a5e38972b59 SHA512 beaf931cee245eddb8d595dd2c74eff5eb2617ab1332cad0c0c70c1bd382ef35d702707549a552f27dc8fd56c7605957361fddf6e2420bb5d0a1f1cbea2a5a55 WHIRLPOOL 8a1819e3acf1c1e5fa0b6ddf37b2339361c818a72788a65cc1349af437239b4561276866af766162b697cb3d81b3aaee04bef4271afbd98eb286e84559fd43ab
 AUX icedtea-bin-6.env 1061 SHA256 a6aedf9a1a5eaa3bc5c26b0bd0ef5b79b12f7384e705a1f202929aee76399d92 SHA512 4a50072c1f4719dc2fcb70b3c3acd217359027968fbf585beaeede2c8fa8e9da97d8e2247c2c028e0456aed59c438abeab03b6e17d0c4d1fadf3a705db5446b0 WHIRLPOOL 61eb22e04523a20d4edc2f82a6d0d24823c326f40b6af4baff0bfc483956232e636c73080b68cdc4206d0b19f5161001af8d4da9d9a116107c5d26be1f06609d
@@ -38,15 +38,17 @@ DIST icedtea-bin-src-7.2.4.3.tar.bz2 41348380 SHA256 e9944fac46c7333c4c5065f346f
 DIST icedtea-bin-src-7.2.4.7.tar.bz2 41388334 SHA256 4e6c1320d2c63727b521355018e024ad1f60c96e3ef7ca6f57faaf34aed83c47 SHA512 44a284b857a100b44ef5e7cbce50304f7f11bfeaf3149f85a89e8ae2f83c5e7e571b6bf4504581c55afcc6a5be272714638175b9884c785f3e909d4e567c01d1 WHIRLPOOL 6d0a41c00e52a4a3fe07f8ebf1630c6e007c2f7cc7b3b68c7130aecc951cc010abfab06cfb21d56867ff4260e52ee4b60525c8525d4ba9345580aaf2f0510e24
 EBUILD icedtea-bin-6.1.12.7.ebuild 4737 SHA256 83efab2f3591f608b2d10d798c07bc8f7357e154e59aa1a6b1f9a097bc33ba16 SHA512 ead0163d922d1c70019987effc68242864647c953990873fa4a17dc842135064a255f8f05aeac4a520d1bc116b7310d7b0340fe6fb539db2043dcb05954afe53 WHIRLPOOL f8d2830addff1a5464afd10ec96a4e50474c206ee640936b380db12d623acadc7297652f006e89e557f6f924e566f5951464947e0a168719882244857d7f10f2
 EBUILD icedtea-bin-6.1.13.3-r1.ebuild 4597 SHA256 e7e8becec1e1d06d4748daf51ff4b0afe6c5820ff40e689b6756fadbe23a23ae SHA512 6956f6913b66662bf1a6aa7429006a3eec4894fe0209a9e3e5c6e213568387d9996271b5b06ccbbbbebdf983cb212ffc944c878f25e99186b3f4d50a9767e68b WHIRLPOOL 30e5fb7a9b253b6d241225bb2f9b6195831d3da49b8cb8851a7a3456d624fbfb2e633d95a110b1e670a3961f7863d1c4b15f6351eaf55c972eb506eeae5f6c6a
+EBUILD icedtea-bin-6.1.13.3-r2.ebuild 4373 SHA256 fd69d4fddcf4e95c4b09b9cce6a5d868d831330de97bd489a9c07a0ab033014e SHA512 eb0cf952f503762c5c782e274bfaec57b138118d363d67b428899057e648f7925caa03acd6c9c140a19eaf0b5422c881cd14efa3a91c3566936161fd6c8631ca WHIRLPOOL 799f79e54a32be5582b1e7317a8127b226785f254063ef5fab6c466f6679be108faf9c4379d92a4c1d0fc1682a8ef2aba69ad246e51111e78900f3eb00de50f3
+EBUILD icedtea-bin-6.1.13.3-r3.ebuild 4600 SHA256 1d68a82a2981d278f838abfd05374cdeae76e6773160d2d24934661aaa0fbcf5 SHA512 565c471bf717b5537c7cdc7161a101c1cc0ea81f32cee7010a9b4e22bcdfa453c0e67b4152172c2a0866c68013aaf8e0452df284eca90a2508013cba279e7baa WHIRLPOOL 648389af81d91f424e1620919ad4f73ed4195d231ca85d3f0cdd3b10310c9f4d999e5db2d8213ad9975698e8704c0c1e2bffcf14d4d40b69a74f26be59917752
 EBUILD icedtea-bin-6.1.13.3.ebuild 4369 SHA256 99572ee29dc7861f5fa7a3232d440a95512dace3cf315473851b9bd787088b6a SHA512 d57facb16bd1bd752c33bfbbc4b670a3600e108d26bd196c9aa6f136be2259f6ca533e7f8f4e7ee0e36cc82eb7e199dc29200f03acf3b1225c61d474c2beaf2c WHIRLPOOL 6ee971ad824f7106190e51c2d7488372530ef8a3f89d4e73f930aacfec9f7a1fa67aacf36b1cfb567ea07deb629a24eeb89863be8d35fd3d4890e2683316deda
 EBUILD icedtea-bin-7.2.4.3.ebuild 4214 SHA256 ef00a75c9274e4b9ce6b4128c4f0fed8552aa66182592450182de621a242710c SHA512 64198feba779b8e8ec79264c4e5bd531aeaa2a68afd40a43fe4c73dc6e507bd9f6f001266ef570fd89997128439fdbad2755296a9a5ddc791fec79c71e9a116d WHIRLPOOL e71c83078b2a0cfa485bc1b0aeceef67c84f2b67cd1a84650762471a6ba4b8ae68c4f148d1b7b926290e0ae6aab937b0d10eaf0c7022d7d5ad585ba81afc352c
 EBUILD icedtea-bin-7.2.4.7.ebuild 4269 SHA256 ae2ad973eab94cd59bed13f6ed118d5957a4a0c663d288d85b999c785f9baed0 SHA512 a603b023988c1f87158e3995e3ad054fc14af9f2a30a172ad8c486826c762b875820521b59c9d5fd6e07fa482728a6d1bd4ffc0710146989c75919c641e74ff8 WHIRLPOOL a2d772020f1497544d06b4a204d70360712efa8678ed3ac4d312b2078b2423c96c2f31e049c1cd94ba21818c696d3dcfc2524bbba0bc560e4a6e90878a3343a3
-MISC ChangeLog 24246 SHA256 baf9dc46f47df2132c543557e828e9da88edd65a4372eb38928c0e526f668fbb SHA512 4058679a848c7231fd5c6ca1bf8871e1d20a7960c9fa6e8c701dd8e30b459b62bbe79009c32a7d84937eae31961cbbd66bead81cd647d72f685b05f510206b6d WHIRLPOOL 1a3cdc35ac31722f2f7a8d04f2f92bf5479c2379b47aef5be3b1c6736f22c039199366b4acd7dffbf11961489d5de13fa4ac493fef1f8ee166376d0c03167c50
+MISC ChangeLog 24570 SHA256 e1c000f6e61c97eb74a8e4468ca4f8cc9ca9935d16ef79c1d81c383ce9238409 SHA512 0f32c504e12e0f41c30928fad3943274370a686536491e12842070cc29cf807a7798b6cfe889fe370730beff844f33835d8ce971a6e469f75354ab9ed5135e0d WHIRLPOOL f856d667d9c67a97085ae12859020acaacef7b46e526086a5001f13369660419048f9cf73aec8a5f937084e64b969da7c46032de53d3c27f6009a0187579d2de
 MISC metadata.xml 257 SHA256 37f9ed73f859488e9c2867d732418cb2085c859c37cff96e08c0ff27bf5e5681 SHA512 5379f4a96e1e75fe55ce5a09b065eb6776cdee3c8ace023465c9b45c10e53f3be937a163f0e6a087f0b5a4e9f47399084600da73d4ea19039a40a4ba93585420 WHIRLPOOL 5a24444176940118d01866d9db3a46efbc421bd230941563d2a4157aac018268b422c1eaddde7f9950e6bc13c9b4189b23a2798a2a1ee694d9b386f6a1da5615
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOaAjAACgkQVWmRsqeSphPCIACeJ1sU0ukyKVkU7/0bZ8dASr5H
-t7UAnR1td+JPGWV3/v4KWp5jD9aFQWJD
-=C7RP
+iEYEAREKAAYFAlOtgPcACgkQtbrAj05h3oTT6ACgjp7pTJuAU0UVCe3ObdyvDD3W
+OLsAnRbdTQBjht5K7iDYSQ82qOGiCunx
+=9eCD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild
new file mode 100644
index 000000000000..b772fb5a18fe
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild,v 1.1 2014/06/27 14:34:25 caster Exp $
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* amd64 x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/freetype-2.4.9:2
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/libX11-1.4
+	>=x11-libs/libXext-1.3
+	>=x11-libs/libXi-1.6
+	>=x11-libs/libXtst-1.2"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/libpng-1.6:0=
+	>=sys-devel/gcc-4.5.4
+	>=sys-libs/glibc-2.15
+	>=sys-libs/zlib-1.2.3-r1
+	|| ( virtual/jpeg:62 media-libs/jpeg:62 )
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/pango-1.24.5
+
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin; then
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild
new file mode 100644
index 000000000000..efe6608dabdd
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild,v 1.1 2014/06/27 14:34:25 caster Exp $
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/freetype-2.4.9:2
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/libX11-1.4
+	>=x11-libs/libXext-1.3
+	>=x11-libs/libXi-1.6
+	>=x11-libs/libXtst-1.2"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/libpng-1.6:0=
+	>=sys-devel/gcc-4.5.4
+	>=sys-libs/glibc-2.15
+	>=sys-libs/zlib-1.2.3-r1
+	|| ( virtual/jpeg:62 media-libs/jpeg:62 )
+	selinux? ( sec-policy/selinux-java )"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7] )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	if use webstart || use nsplugin; then
+		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/bin/javaws
+		dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/jre/bin/javaws
+	fi
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}