dev-java/icedtea-bin: Version bump to 7.2.6.2

This version works with CACAO so the ~ppc keyword is restored. There
are still problems with ~ppc64. :(

Sorry for changing the X/awt flag again but upstream preferred the
term headless, which is technically more accurate than awt, so I
compromised and went with headless-awt.

The nss flag has been added. This comments or uncomments the same line
that the icedtea package does via this flag. This more or less fixes
bug #528338 but manual intervention may still be required for I2P.

Package-Manager: portage-2.2.20.1

3 files changed, 197 insertions, 0 deletions

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 2af2548863da..a44a524e1040 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -5,9 +5,14 @@ DIST icedtea-bin-core-7.2.5.6-r1-ppc.tar.xz 42627680 SHA256 c0af7c735b01f0ddb809
 DIST icedtea-bin-core-7.2.6.1-amd64.tar.xz 52856100 SHA256 48d596cf5f9ba52368c48d6cc94e12a3a5d6e8c2ed880e689f005eeeade7cc72 SHA512 4dd5709400033fcdf2948b418b9aa4bbb90a3903d40f6a22571b4b181eec2336b802f100bf1e524ea1d13bfd340e60bb00bcde24d4f80fe925585f1971c55f54 WHIRLPOOL dec45c96d8c1a35bd4d83724eff84aaffc73b5671bbcd8837a3030f2adee9716517f950a2e606d2a4b021a83d25e8feb7457b3b3d83e8da920cf95533c057095
 DIST icedtea-bin-core-7.2.6.1-arm.tar.xz 43914036 SHA256 215dbe4907da2038d0aed3e37149afce56fb837ad3ba0d521cd92b5ebb15c5d5 SHA512 df6179db20db3e12e9688816fee18f1782a3400c91d3bd691cd3fb88322f7855b08582d57ca8a9da3bda1d0c30106518d9d02b911f4f8cc24d95636be22807ee WHIRLPOOL d313aac6f33ff28e873976be055b879e3c8e559022f15c21401ccc5a5c35715a08a43feb60d0c52250161cdea815be2edddd51a6965695287c25627f2779f9d9
 DIST icedtea-bin-core-7.2.6.1-x86.tar.xz 53528524 SHA256 b7f24f28b70c2b0886b94f48daeebe0391cce2e57ad83bd876dd302b67c96d42 SHA512 bf4aac17ff754bacb35e5b597d9bc60d88a7fa40619cf8c9613fa2d2776097e4c781132b4d66a8ca32ed49a2a07556d2a839b818e613116cc2f2b5f9e257d6a1 WHIRLPOOL 0e033c6e819edaa52eab51267a71236aedb9648f3b63f62a35db329e0fda2dc1dddf370c3da115360ffb2bd1c97aac88f6400cea9fb29f6210d9385720489062
+DIST icedtea-bin-core-7.2.6.2-amd64.tar.xz 52999196 SHA256 6a91616948e46312f9a8ee5b3b3f685d9052485e1f2b120f4a45b472a50c9228 SHA512 bf424b0923cb3ad3181d3b618b439b68f767f6757905b4cfa2b0cc8cc71618f33c596102129c861ecc98f18a1ef73eb84a4277d7d6ac245513779c15750722d9 WHIRLPOOL 3fbad963bcb576c4d0d58ce089e87f2c5d2bf6f7d01e29d8406bf29dd938a247418694341203dc3d66cddf0e9361959276e694e0691203275dbc7cc108720c73
+DIST icedtea-bin-core-7.2.6.2-arm.tar.xz 43981456 SHA256 4e3db1a1bf9e50b4c688adc639c6de97653840ac2407c78ab1122005fa13e2bc SHA512 33f3e2c2781376817b07bd89ebff3abbf2c8a820fe7d44b2f79eba43fa3ca0d73496d910ae3f92fa560cacbc737215399f6baf3659d1e8abe7c0dfaf5e7ef9ac WHIRLPOOL 3deebdbd62e4e23925d9b94bbe77e7d475b9d7cc9f8d896e1593d64590a623f295a76322b23972a5df7ee3fb8bb4747f1f4b0f6722336749eb4c19407a130128
+DIST icedtea-bin-core-7.2.6.2-ppc.tar.xz 42889628 SHA256 606f3075153f6d158e9e3388a6270170109dd98f212c61ffb89d220d8d6329c8 SHA512 8a0887f27c9d07f78e3d0321478576c3761c23686e009e9e17aec03adff0e1dfb10433d5280e09862127d313108863414f0a4bfd319fa89fa886092c7f92d310 WHIRLPOOL 653cb61da00a3f3494fea12f5eee0491b80b1c9bbac1e93248ebdcbb8152501290ada111cf4430ef53f138095a05dc3f8951f3f20fdab01667655e0c08767309
+DIST icedtea-bin-core-7.2.6.2-x86.tar.xz 54652528 SHA256 dada0681098ed67f6ad665cb2a005d26a3ab365e2aca85d0dd9e924e6943065c SHA512 2a0e4b934e7aa734d8d0cc0d8851182bbf17a7cb29d66ce3490ce157a8b282b974501c9106160c9dccffb7565b994136cb39952efe0c530855b14491255f55a9 WHIRLPOOL 3ee3f13b51a3c587612026ae686a46bddb457ba2fec4ffc8fd7fa94af697c039761436fcba634ccb6ceda6705844346617cc48f0532af41f78a8978ad54aa3b4
 DIST icedtea-bin-doc-6.1.13.8.tar.xz 9844756 SHA256 71cffd016040d28366f8e50c983ca55a3af1d7b08a56c501838b78fc0d1837c1 SHA512 36a0691ad720869c2855345bd20dcccd60e7adfa90c511d829131997e9e995ab929a2f24955955b638b21672912a39774deacf72ee3390ae41e3d44e58eea5eb WHIRLPOOL 11892894ddae46a6f999e8e835a5d428fcb86643c20f44639d8b692090468ddecfdd7db4cebef0c422983950cfaf6d337b540effef64c6fb1f7d58ffd2e069e7
 DIST icedtea-bin-doc-7.2.5.6.tar.xz 10420552 SHA256 97cafad29d26e1fba75fd848a3d35de0e84e83f36a9e345852f1d684a81e148b SHA512 53261dbbafad7af9b97cdc9b55430ebbbc7e4975acff7b73013f893eba5583c303abf32d77ab8fb641bac35ac5549c313bc1f4c94c27faed88ab23bc5c22aec4 WHIRLPOOL 6213996e1435acac287b2993814ae1f49c13ce58f9315731d2e327c3f9765b6119202e83735c504919b9487e04de23ee28ac2695f8a67a49652a4c01f19aa0c0
 DIST icedtea-bin-doc-7.2.6.1.tar.xz 10603004 SHA256 33175237a2d35709197a59f26b5ea8bc5f3d60679964b8f3e985714080ce7a0d SHA512 e79ef83cbc7c33defb10bcdf1f5e56e07e3f187d181444a92edbe6cdbf58323c3c009bbddbdca35d2065145290cf5641bb688971b6c1fee337827c3b06394ec6 WHIRLPOOL 15a101cdc4f5cf3426980893e864fe04807c7d552971f249e09bc9bae0fa5c93a7839652c2d4d4099ba07cc32d50bb1d339b6ae6a9b8757776e391d1b30c34d7
+DIST icedtea-bin-doc-7.2.6.2.tar.xz 10624484 SHA256 ed677d27cebe61433f12b0b586b29671121210e495374ed575d28b0a79f77c09 SHA512 e1475cee4db80eb071defe7af05483a1a6799bfd7511791cc3db01cc86decc956fe09f50cc19bd1850b917c02aa3c9a4b0d6c368031034d30a7e3c867d0eace8 WHIRLPOOL 2b80fc301c5e36d895b0934c55c3f17968e0cfac8a509a5b54dce77617b96fc53fa8baea6c6136983d7fbb7f0b43e465c2931b999a7991e530732949eeb0de25
 DIST icedtea-bin-examples-6.1.13.8-amd64.tar.xz 1904080 SHA256 29c2933d4fc4c7e240c7406d403a2667a42c5a3faee82413d2255d7dccea6873 SHA512 84771c52b816f4d3f065871df83bdd05408b69941c807de0bdc7ea423cff436878aa58dd5d61cb1bfae35cb37e56e2b5d29be6f6073a744e6af2125d66578713 WHIRLPOOL a08c748dd757c5927abd65088b0961d2dfb716030cc07e64589e5394a434123cb018630766e0223c6578ceb7f67ee0a68f5b2a548b1c9f701a5cc13732b84ecc
 DIST icedtea-bin-examples-6.1.13.8-ppc.tar.xz 1889932 SHA256 62bc68f31b1118d890c2add87a4d14663b0595aeb5fdfd8d904a59a19c4ed7f4 SHA512 22d38c9efa794165e1ecdb8cabb1ecaf8b9c27027cf28562721789c33c1a714e3d226b95a8c5420ff48a769c869ef09c575e76e8995f089037263ddfd72d21c5 WHIRLPOOL 031a8ffb8609028d089d047f1324352db90ef72be951bcedc158f671f2930c4ae5087e65e53ec59e4457a9e09b40ad6848b980b63e3494e0d1dd70721e6e640e
 DIST icedtea-bin-examples-6.1.13.8-x86.tar.xz 1902616 SHA256 cd74d0b8056f7373f370ca62388c2e44786c3b68dccbf30cb9a3bc8ecc8353e4 SHA512 babcc73227115e19fe50b16f79f09e3a35d0c60de44823c3f6617c7276ff4b9efbfb5f03f1149948d4005524b3a136e74b0049a292d83ddf763626fc179d1883 WHIRLPOOL 6621c65b3f871cdc0769dd5361d7a4a17c56f5ca8eb2de1f4abc79ca6343784a5a43834e4906f4d371144615a3b3ed6db44370dc0950508d327587bf2e770ed2
@@ -15,6 +20,11 @@ DIST icedtea-bin-examples-7.2.5.6-ppc.tar.xz 1785152 SHA256 5e798c0172e20653df30
 DIST icedtea-bin-examples-7.2.6.1-amd64.tar.xz 1794976 SHA256 712c0077274e89f601ccd89af5393b959879930d511d5de1b5b377963297fd61 SHA512 70ca271ea0c764fb53009fe4e5f6f3abac9db8e687615c9153a90390fce22fb4f9712fd4a431f7475d2857a7b053b3cd82a9e151f8688e0835cc45dd79a060a3 WHIRLPOOL 53e36eab616a41c70841e37a0be93a0a71dd62169028fc873a52373f8a02c30ae48f5e6b23cdaa9da34d1246029f1737ebc21d519c5763bb0a2aff4c1c6436e5
 DIST icedtea-bin-examples-7.2.6.1-arm.tar.xz 1778216 SHA256 3589b3bfefcfb13f3007852645c72760845014cde52c467a3ba627dfb27f7fc7 SHA512 1ae5b8316bdcf55275e436bfe8647c173be26a9a71ed3f79afa7b2e1d0e556aa7569f95f178c5b183376f6a8418021fcd79e73eae8775177ee1fe50647a23370 WHIRLPOOL d56c37d274b8227ffa2528a3ade58b38f154eade82fc33f545e8b6360a090ecbdf548501d5bf91f5c5a83005f6a42022e83456f02a576ef9bf79ccae2297c7a0
 DIST icedtea-bin-examples-7.2.6.1-x86.tar.xz 1794276 SHA256 21561ec74d5f416f9ce26b849107cd5ed2326d34ecc9fd1315891c3c61cfc13c SHA512 ccf468cf55256fbf2f005762558281f3605b02f7877782d84aaaf5e9cfe030e4d296bc04b21af1c4a98e8ded97e9fafeb33722c81f8a91e5b9b10e864cb5074d WHIRLPOOL 77e70bec0c555c6fa7cc7b8d220aed8d86139bc4f423b96b7fde6d68f1b6176466e53a65f329d0c156925e9f3d7d9e086dbacbc920291c9103a517250faaacb0
+DIST icedtea-bin-examples-7.2.6.2-amd64.tar.xz 1796688 SHA256 d1fa34dc87ef7947fd98fa222d6ed5fe30833dcdebb523edd2271913a2f21ee6 SHA512 0a6bdd498e1203d2fd6168b91dc3b2081ce0c102107523dbab78ca0e2b605c1f88c246f554f077245d76945726dc4151a898e5b2e42f6a5df4d04098b26f42bf WHIRLPOOL 42049d21a6e5b72cc091e63d60bdb84a774fb80d0f828d4d85e48efb219c51ad3c5239bbf466d2f80f56ddb9e57832f739eb783d2ff8ed4f23277f55b3f9adff
+DIST icedtea-bin-examples-7.2.6.2-arm.tar.xz 1779804 SHA256 3fb597b80d4ef1253d36b032126622b91cbe030b492e68c372ebf1304f0d86ac SHA512 af210e3ab3b234c767fad0b0442276b8ac7d5e0c3bd98aa7e9c729a9239247911b6788a1e4415561ef889b63a242fffd7cb97452a611e84fb30a6413287ec26f WHIRLPOOL 95d4fbb9cbb74e279291d8a823158a66111211dee8d5a21e2665a89406f3f89dd69e40c57c48cb91e12ace620abc34a2b65977c4c3a96f66604c103e66f69284
+DIST icedtea-bin-examples-7.2.6.2-ppc.tar.xz 1786908 SHA256 2506a0fa0f38008a5edffcab637a2c9091bd895fdcc8b25713c536e4c15957a4 SHA512 ad1bbf7ad71036c4f48efb0861776e3dd733249a19cb7ac5d154f55e3b3ee15f1a8642a45ffeaf7fb39f82416dc7ea2b8239c464a0c8284aa53502bcc2400f1c WHIRLPOOL a321523cf23211f565d47e16d0d3d539053a047bb7bf875e7a702288e01b807651024a8cee8b2b8a61929687ab9d0cba7ed62c857e28a900a066f0d8b1a2da87
+DIST icedtea-bin-examples-7.2.6.2-x86.tar.xz 1796540 SHA256 58a876ab7452199456a4fa35f550a9aa8775df8a70e687073f7106eb69702c9e SHA512 c759f97f0ba22e0ebc1d70b3cb9a339b6e1186c707cef4a6d8f3dd512792e2a729fb89d1110aafc25d4438853c066ad4f1f3ac7ee12bf3d12d8ffb961a7af8c0 WHIRLPOOL 5aebeeb861616d8da0e14409223d886ffa99bcad34c0419e5e21ad52cf9f088d26952a8f3be4d9b0a0dbe720b31afc55308c499140a7456d4dca5bd2090611f6
 DIST icedtea-bin-src-6.1.13.8.tar.xz 39773388 SHA256 c01deb2ef8ed9cf58284538e9f52651ff70b8349ec001f13314d69137f99ff4b SHA512 dba0cc027f3ed7589c7cb0ba7d9f1a401ef47a20a5ff502ad7e9b27d0f552a77f28ebbd9032d191ba3ac441955545b632d6fb242f67bc590a5f1a8d855b89ad8 WHIRLPOOL 6b835a7a6123a3843bd74506e52befafbc4792e792798660829d75ede09f6c283933d30d51ba01c87a16095b9faa1795bfec6539cb55709032e22d6395566d19
 DIST icedtea-bin-src-7.2.5.6.tar.xz 39999236 SHA256 dba9a16d6ed8ba6bcd1090e469d176c979395a4828ea8875cde271d8bfff4a43 SHA512 9f7c7377d90058fecdbe08259b8b1b0678ba3df1ebfd13b7664088fe3bae0823631b0b548a0b65981c79318b7a63d566c79a6c3b3b77df434d5b4e0b9b8095f6 WHIRLPOOL 214c9fd79be0ef3f650a64c15e02e889475ee27c9c2b975ade20689bd8d2799617b2ba0eae55cb1596b77e987f5b14cd4ccaa583ff5ef4dd83e4dcbedff869af
 DIST icedtea-bin-src-7.2.6.1.tar.xz 40026520 SHA256 60786fec57ebfa29297d03e3cded177fab8de09dbaebf74f82535d92fd3665ba SHA512 d045222dd06db827f0ceb62bb5fded08de66402803a978710d61005f9344d230450101b2fffcb3b8e05676682bd90ebe29e9e1ac57fdfd5197035f130ac483f0 WHIRLPOOL 793dd24fe432e54369490fcba7f8ed95f2e2b428c595570612cecd9a3194df9027fcec29a466f9c97b1c25c55d28eab7fe6565f21ae760cd8ea00f052f3b067d
+DIST icedtea-bin-src-7.2.6.2.tar.xz 40010036 SHA256 d4cc4954ccaf2f4ee77eb44e7d16c568eff835a5e6ead4971c611774caaf2c02 SHA512 f2dace8e37dcfd23b6f5e6806fc21a62686e9addd545fd141e47d4c24e574a65c8ea5b9b4b6462e8633ebf61bac2a3ee0a1dcd94367a7b8723bbb5fc7a125bab WHIRLPOOL 6087cf6fc2463c2e7069379c75d01258247fa1613575a736f5653b4f969d3fa03291f4acd1a9c26863014af8838af96107a4e49766e0e09372d51f85b46d7c63
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
new file mode 100644
index 000000000000..a5622c6627b9
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~x86"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.40:2
+	>=dev-libs/nss-3.16.1-r1
+	>=dev-libs/nspr-4.10
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.3:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	!headless-awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.12
+		>=x11-libs/cairo-1.12
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	# NSS is already required because of SunEC. The nss flag in the
+	# icedtea package just comments or uncomments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 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
+}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index d7730d654013..0c161d9e63fc 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -4,6 +4,8 @@
   <herd>java</herd>
 <use>
   <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
+  <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+  <flag name="nss">Enable NSS security provider support</flag>
   <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 </use>
 </pkgmetadata>