Use paxctl for pax marking as the fallback won't create the headers. Thanks to blueness. #427642

Prune unused font configuration files.
Remove vulnarable.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 59 insertions, 242 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 59f1df983b69..704f4a3398c1 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.216 2012/07/14 21:06:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.217 2012/07/23 18:41:43 sera Exp $
+
+*sun-jre-bin-1.6.0.33-r2 (23 Jul 2012)
+
+  23 Jul 2012; Ralph Sennhauser <sera@gentoo.org> -sun-jre-bin-1.6.0.31.ebuild,
+  -sun-jre-bin-1.6.0.32.ebuild, +sun-jre-bin-1.6.0.33-r2.ebuild, metadata.xml:
+  Use paxctl for pax marking as the fallback won't create the headers. Thanks
+  to blueness. #427642
+  Prune unused font configuration files.
+  Remove vulnarable.
 
   14 Jul 2012; Jeff Horelick <jdhore@gentoo.org>
   sun-jre-bin-1.6.0.33-r1.ebuild:
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index dd51da3116c2..ee77184c955f 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,32 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX construct-1.6.sh 6799 SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 SHA512 a625b1b414f63370ce802669d569ee254f7f256a927a267629267a60bf66c5d887e1557b83d21a602008b39222499d56e20cad17b0ab5dbfc13d44e8f7b0ba69 WHIRLPOOL 69459effacb42f56d339ec8010b22e5c0ede7c7a35657f42e08ead5928039c4394031c1e210914131c86d563f8c1e7b5b23ef9b2e11233c69038b6641dfb9b48
 AUX fontconfig.Gentoo.properties 10932 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 SHA512 bd63d2e910fd22b398ef838a48d52314c241180ee3e29f5af5a8ae4021c78c693beee451e3ca3409fc7ba39d00a1433717257d0115947185288e3dab44983482 WHIRLPOOL fe29c889df02f8faea096adeb8bc4388aba8848227feff6205e440cc0b9b38c4db40c25cc9da9a676bd6ddc5bac77278cedabca6af58c15b960d31e7a3c05042
 AUX fontconfig.Gentoo.properties-r1 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX sun-jre-bin-1.6.env 891 SHA256 6fd0124892813113266857364834fb8fa9f08db9f72045e639ec0b5acdfc4c09 SHA512 f5504327bc1a73ee9be87d4b7bac5a62ba1a30babc55c24840e6d69f44682ae2b15729d4e66bc22703599eff8bf883c63d056b72e63211dc71de210289ccbf5d WHIRLPOOL 24b56c02dd07a8c72818fd87e0ab3530d5292537ed8debba375fb0e73517067e8513dee246bd0fdcc714f5555489fc6f2c29a8783286326e1ed218f9b8b8521b
 AUX sun-jre-bin-1.6.env-r1 966 SHA256 2825f19a60ecf19c4164a27aa24312c521145236c013759c62242a7772e44efe SHA512 c6975b48f38fc7ed4060c380d0f08c35c331c08a1c20b75455f007b68cdd23137b86b5b1263ad3db9408393f1920f189b119d85e6c99d50580c765403a03a316 WHIRLPOOL 4cb95b06911b859ee01e5be2069154f8bd3d1816bfd60f170af1e84b93bae6b1b426d6d5728a650a990110ceeffcc8a8b5369e9634f0248ee2bd06d7f71b9e7a
-DIST jre-6u31-linux-i586.bin 21699103 SHA256 c7c6882b8018e95ded4d145ae28692e2a0a4c13e66c5310d8f5c42b90b5b4dd0 SHA512 55b360877c21499d9031193c50d74d055ab581a83d21f12aed186184fa1bf697fbf71275cdcd0947259d987da223a11e0e2b06dc184d92bd098811852342f19b WHIRLPOOL b936620fb4d55fa697a16c10d4156693f9cb6b7db865a891d18a11f9f93af1fea547ca6febca6da462a59fba2670c4e5a6fd9fac2913b250cd2fc39c0792d4ce
-DIST jre-6u31-linux-x64.bin 21312981 SHA256 3af56f72a76ad48940b45726f94770f12285c21b5f3194fc56cd63c3d4ed3329 SHA512 d31249812cae7a01a5e2410c04cd663fa97d2e5128b0fbb2a724a4924941c03418d8b7524205d9383e2e1c4826f6303b5cc1b665c30c15617524d1bf483aaf92 WHIRLPOOL 39cf25f22d67f319b5d87a629f0fb5604c6393ec4065a2ff100af8093869c8f1393d5ff98f1d26bf735f4b079b2e86033a1e213e68cd104f43407d2f75c2a2d4
-DIST jre-6u32-linux-i586.bin 21694324 SHA256 2261ef71f3fa889e34cf304200561488d4f921b3de93eaa1fe5688d4e3672611 SHA512 5e6a0a4c13e4d37031c30f61de205ef7a0d473271220cb7ef17f646779a951d5dd09e4fd599bbb77eae567d9e651882170d5421c67de4ad9500e3b72f0a6d4b9 WHIRLPOOL eccd13b13d64a3f9ebe9badd7f0409430f2dce6c22e61d45a1c5a5b7505b5c941d3da9266eeccbcfc53cde812e30a17034c9fafc43b018583ca80f68e81abbca
-DIST jre-6u32-linux-x64.bin 21305045 SHA256 1b72f2d71717ffa98e1f0002485d6691ad53fc63e9088f96deeecd77acbba88f SHA512 5aa19a5eed6375ba811a2dd1df14c1dce3aab8b290862577bdf28200129551816549cbf34901ee8d42285a8e951ad867c9aad7e04edfdfbd426a009045d4a70c WHIRLPOOL f9686f8ae1325004d223fd18c3e80b75fe8ac0c985ebf4176921da180043c01578ae3261c9b327be09f5d697047db222dc9190ba68933349e1907c80014d2ae2
 DIST jre-6u33-linux-i586.bin 21693738 SHA256 a824c38cb57110642678f21739fe995e84c876dfcbc3d64f3091ef08adacad4a SHA512 71e92b9c650234a3c0069f7c23146e78043fbac4f9e75cb37f0401b5a2d43bf5d64471f14890bd2d7680d5fa7b2a38b443321815c207e1df378ac688827226bb WHIRLPOOL 5a001c0358edb77f169972f269a68809301f777b80f85634d2c8a214ac451ab52c65fa42900e1969c2092ac37e194c0a6eaf31458d150e2a62c9e17b3c6484c1
 DIST jre-6u33-linux-ia64.bin 22876388 SHA256 d39f06a0f6a18e94cc1d884f8d1c9d695ef002a9453efd087dbdf23f1ac83ed3 SHA512 8fbfbcfec1900db8f931f6812800f835ce4ca493b7e1c0b8e90d3ffa9c611f8df3d034ac5c9412ae2356f37ca8529c0632baef930b35364839f279b45981a75d WHIRLPOOL 5225a721e7d35a2f3fe1f66f7e1802479d6a759fbfc590de03069dec4717644f83757bf1bb65a2ee9b5be464220348269862eaa921537ffe94fe27b7dd4fe2fe
 DIST jre-6u33-linux-x64.bin 21300793 SHA256 c8a596ece07c79131fd33c65ab61f6099b203a42c0fe2daedb24360a15ab70ab SHA512 ced532e0eedab8312dfd242c624e59fde3ed8428eb1ec443ca0183522261b4af5979b566e3c88e27882e7eca9af7210735ed88841164ca06a9fb2d0fd6db1349 WHIRLPOOL 6ffcbd081e277e32e596eb0f4faf2de47b5c523622f7972e2bee4e7c60e8caea13111fea677bde7a076c1e051529a80bce1d0bc03713dcb4a837aabd63a28711
-EBUILD sun-jre-bin-1.6.0.31.ebuild 6687 SHA256 f3fecda47453852f069a00117d68df0a34fb53235c44c3c8b3cc39e83c578ac5 SHA512 0ef704a825828db09c7e33e3dbb00e2e9035a5a344e4b288ba8068623ab0734c110664a697bdcd1d963f701182b5059c4ca447a38e8c03e831ee130d6f5f0a6b WHIRLPOOL 26eef546915f54b2cdc6209d1e165decc8ed0505ca0492faa3f086c30200aed7646bc351a98c46e8539573bf433907ff01500107e70f1cfee6d30f10e4169264
-EBUILD sun-jre-bin-1.6.0.32.ebuild 6795 SHA256 3fde7a0bd5222c3727126d4c1faa1d6d265690b51835b7a84495d8330e33750e SHA512 79eb39dcc2f6bb7a6ca9dd7b21959bc923b1ac91f83ec273faf4efdae2d55ad24edde62f977ec395f082677f1318da1f00d792a6be3601deaed6973106606667 WHIRLPOOL 9c5b830704abe55bd4219af85b25b79d138943aa781f1b91d13e0015e6ed7026a681d1f55d33b48e42b986c3489d375d0c510b4b80e4753f0699d05baf4378cc
 EBUILD sun-jre-bin-1.6.0.33-r1.ebuild 6908 SHA256 20b05e1bf90ad0f97647680868787bb2b1cd6b7a53d7cb4829005c330c07de4d SHA512 c20caaf25afc2cb2e434b9a0f50dea268760c166fa8872381a9ea9c9b0c747d4e341fd8782408c7b13647fa2991e011438738f26a3fc03a219abe60a5ac562fc WHIRLPOOL 3e7f9d3114ba5a2d2b800fb12af105d53e02583e61f9fd022501a8e3a19e14ab56947720f14777df575ca03a2d89962b4a7106628eee7f2569978cb94d067018
+EBUILD sun-jre-bin-1.6.0.33-r2.ebuild 7179 SHA256 13a41f882b7d8eede69a5d176c898fe4b0aa94aea6424ea3674a1cfe3000dd64 SHA512 e81e2c450871d6b996a7a12dd90993889d676f1237489cb0dcd768518a248ae03acaf322ee4aeb6f86625f74a5801f75fa0eef6ff03ed88cc012f33322e739cf WHIRLPOOL 408d92ccf99aaadbc16261bb7ecab489d63b2f7e2fade64a34db743a299b9f3547b74978e7a779cf8707c55c80728e857d2268b7f379932a4f5406716d9525f6
 EBUILD sun-jre-bin-1.6.0.33.ebuild 6904 SHA256 6b9b4042f9fe6ea91cf0399e66675d1b9747686b689aefaceeb0545fe96b8cbc SHA512 4ca3aa3c3e5492bbfc64ad7f23a1078fd4c2009371ae422f7dab6637bef44fb9b96dec79ec9444ccca57bf8ab0a49b07fb40dc9f3bde8f3e0e4a30e40b9d54b2 WHIRLPOOL 249bdae80e1dbd16b1816b82ab16d69f6f89b91518dc43b5cbed637735608c7de92065e26ba2c4c984f82929105c6b152907d567d63474971b23ed19998fbf2c
-MISC ChangeLog 37769 SHA256 ec37c9c16a457bb6b6da2acf059b19d4b061fe83a72471542f236b390b8a7b1f SHA512 9874a4143a5b70eb58f9408b7c0ae34dcbf94fb82f99727cd95eca0674e2ac7671c1770772471352024236e592e4349a1623ba95c720781db69b87bb28c6efdf WHIRLPOOL d5543bc4fe809f74ed228e026a02ce7068015356a912d4f4eab39a1ebd2b62e1eadb39833cf88d42735fd477efb20e762347f0a80b5360ddf662e99dc24cdc8f
-MISC metadata.xml 349 SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d SHA512 d569a3be38e37e914c91e6b548a1f8c96665da723a0d11cf02dc431a521898f5e29fecaf015b9f9df2285aec050c0ac06760fdcde63892082a095e9fc17fa024 WHIRLPOOL a94d594ec778384561dd79509d729d20ca6584ceb05f85ddcf178b12b6799ddf61cdb7513bc74f0ea4d88711e5325a3a33486c892ec05c63929e5dfbdcdd13e4
+MISC ChangeLog 38130 SHA256 5aeec0dd7b2e173968be58c62699f6acae23b87e9170c07f927a76ff56d8973f SHA512 0ad5c79741bf6fce6781a46acd7f40d26c813dcd7911b1487816e39387f2b411fef140b0adb8a72ae637d32ff81f4b49f03e2a78315c2f17b1177cf06e0b037a WHIRLPOOL 3b62dee19a9469a2add2761eb6e9a54f4bc853b0dae46e8fa01e448c5598d8bbb1e2f0b76ef3ddfce07ecbec8201250b2d4aecab541fafa7fdc6f9af6c9d78d8
+MISC metadata.xml 427 SHA256 567a5ce3eef1c4b18ed6b9f04b664a159cfe9367bba0886feef6b1069f2d6416 SHA512 e9c46980a3afe93ced0225b63841d19bd7382673e5d7c36d3e66085339d2eede7c666dcc8cb07658fd349f56e079da24196b884df5f28d0e60becdab8a790e05 WHIRLPOOL ac6a4606217946f8968cb1200ef971fc3879518bfad0ccc463284a3c39ccbecad4515ce3f22415dff4bd74b335da23a57a70af3192f9d92be84a5c3979f935d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQAd9aAAoJEPUd7O0j6ekAH+gH/0R60ci9qB/OqtGMMqNvv412
-zpA02k0EGXAwd07XaiYC8+gtjXafnHVyxjPfq6C7f8PJeVfpZAdMIPluBKwIEZRM
-+o+JLGP2+FR9WQzeSNvZ7cQWVh34330t4xoWePWm9Y88whrGBQdI9jILIiKdxsiu
-xV66P97/JElxeVXyuRa/xEJkq6uv1RmAK529sSjypaQmJlvNkG2+h1m6mTl8zOsy
-7/9Z+Qr7i3dfKnTxdvmi1gxucsvZJ6/y62u07cDQsuO78puM8/UOMDBBTBLnmQQl
-fk6s+LC+6GjXUc5ZkWdYh8aflayJhUC8wkycBObT94h/kuE9TXYMU8Rc6Ko1ikg=
-=1iXW
+iQEcBAEBCAAGBQJQDZr2AAoJEIUJ+svaV163NWgIAIPXFcPQXRe4NSGBnC7E8b8A
+JnZIAA5DnUQkGMl3HOM3JVMTBuxLjgibuuMQOq4wBMQiSFnzZ18V36EXp3CTo4TL
+CEUTlGnvszs8SpA2SHwMuX0hPS4sGqEOB1VwXKhng4Rt3h3C9kFYsw9tBrX0OKzm
+MQjWAPP8L40V1TFV+aY2FXn6WqNC2BEU+EctTFHHWyQRj+bibEyBNQ64dOlz7r9c
+4rZGm9TRl/M5RdbL4bfB/qDP/umtAiZZJQF89yq0174lnBSb6vEuTYgDRg1EePZB
+GqAgMczws33ZOEVSxm7An+wT4J1DyEVHyfI1DyTokpoH/mGlLkfyqTzodimzleg=
+=bz2b
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/metadata.xml b/dev-java/sun-jre-bin/metadata.xml
index 2cd8ee0ff34f..20318a349b45 100644
--- a/dev-java/sun-jre-bin/metadata.xml
+++ b/dev-java/sun-jre-bin/metadata.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<longdescription>Sun Java Resource Package, also known as J2SE</longdescription>
-	<use>
-		<flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
-	</use>
+  <herd>java</herd>
+  <longdescription>Sun Java Resource Package, also known as J2SE</longdescription>
+  <use>
+    <flag name="jce">Enable Java Cryptographic Extension Unlimited Strength Policy files</flag>
+    <flag name="pax_kernel">Use paxctl to mark the JVM binaries.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.31.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.31.ebuild
deleted file mode 100644
index ca43ec17fb4c..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.31.ebuild
+++ /dev/null
@@ -1,201 +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/sun-jre-bin/sun-jre-bin-1.6.0.31.ebuild,v 1.5 2012/05/07 11:58:18 sera Exp $
-
-EAPI="4"
-
-inherit java-vm-2 eutils prefix versionator
-
-# This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-6u31-download-1501637.html"
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-S_PV="$(replace_version_separator 3 '_')"
-
-X86_AT="jre-${MY_PV}-linux-i586.bin"
-AMD64_AT="jre-${MY_PV}-linux-x64.bin"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AMD64_AT} )
-	x86? ( ${X86_AT} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.6"
-KEYWORDS="amd64 x86"
-
-IUSE="X alsa jce nsplugin"
-
-RESTRICT="fetch strip"
-
-RDEPEND="
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	jce? ( dev-java/sun-jce-bin:1.6 )
-	!prefix? ( sys-libs/glibc )"
-
-S="${WORKDIR}/jre${S_PV}"
-
-pkg_nofetch() {
-	if use x86; then
-		AT=${X86_AT}
-	elif use amd64; then
-		AT=${AMD64_AT}
-	fi
-
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
-	einfo "Alternatives are switching to dev-java/icedtea-bin or the source-based dev-java/icedtea:6"
-	einfo ""
-	einfo "Please download ${AT} from:"
-	einfo "${JRE_URI}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack"
-}
-
-src_compile() {
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${S}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	if use x86; then
-		bin/java -client -Xshare:dump || die
-	fi
-	# limit heap size for large memory on x86 #405239
-	# this is a workaround and shouldn't be needed.
-	bin/java -server -Xmx64m -Xshare:dump || die
-}
-
-src_install() {
-	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
-	# writable executable segments
-	if use x86; then
-		rm -vf lib/i386/libjavaplugin_oji.so \
-			lib/i386/libjavaplugin_nscp*.so
-		rm -vrf plugin/i386
-	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
-
-	dodir /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || die
-
-	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
-
-	dodoc COPYRIGHT README
-
-	if use jce; then
-		dodir /opt/${P}/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			/opt/${P}/lib/security/US_export_policy.jar
-		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
-			/opt/${P}/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# bug #56444
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
-	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/lib/
-	doins "${T}"/fontconfig.properties
-
-	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
-	java-vm_revdep-mask
-}
-
-QA_TEXTRELS_x86="
-	opt/${P}/lib/i386/client/libjvm.so
-	opt/${P}/lib/i386/motif21/libmawt.so
-	opt/${P}/lib/i386/server/libjvm.so"
-QA_FLAGS_IGNORED="
-	/opt/${P}/bin/java
-	/opt/${P}/bin/java_vm
-	/opt/${P}/bin/javaws
-	/opt/${P}/bin/keytool
-	/opt/${P}/bin/orbd
-	/opt/${P}/bin/pack200
-	/opt/${P}/bin/policytool
-	/opt/${P}/bin/rmid
-	/opt/${P}/bin/rmiregistry
-	/opt/${P}/bin/servertool
-	/opt/${P}/bin/tnameserv
-	/opt/${P}/bin/unpack200
-	/opt/${P}/lib/jexec"
-for java_system_arch in amd64 i386; do
-	QA_FLAGS_IGNORED+="
-		/opt/${P}/lib/${java_system_arch}/headless/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/jli/libjli.so
-		/opt/${P}/lib/${java_system_arch}/libawt.so
-		/opt/${P}/lib/${java_system_arch}/libcmm.so
-		/opt/${P}/lib/${java_system_arch}/libdcpr.so
-		/opt/${P}/lib/${java_system_arch}/libdeploy.so
-		/opt/${P}/lib/${java_system_arch}/libdt_socket.so
-		/opt/${P}/lib/${java_system_arch}/libfontmanager.so
-		/opt/${P}/lib/${java_system_arch}/libhprof.so
-		/opt/${P}/lib/${java_system_arch}/libinstrument.so
-		/opt/${P}/lib/${java_system_arch}/libioser12.so
-		/opt/${P}/lib/${java_system_arch}/libj2gss.so
-		/opt/${P}/lib/${java_system_arch}/libj2pcsc.so
-		/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so
-		/opt/${P}/lib/${java_system_arch}/libjaas_unix.so
-		/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so
-		/opt/${P}/lib/${java_system_arch}/libjava.so
-		/opt/${P}/lib/${java_system_arch}/libjawt.so
-		/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so
-		/opt/${P}/lib/${java_system_arch}/libjdwp.so
-		/opt/${P}/lib/${java_system_arch}/libjpeg.so
-		/opt/${P}/lib/${java_system_arch}/libjsig.so
-		/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so
-		/opt/${P}/lib/${java_system_arch}/libjsound.so
-		/opt/${P}/lib/${java_system_arch}/libmanagement.so
-		/opt/${P}/lib/${java_system_arch}/libmlib_image.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod_g.so
-		/opt/${P}/lib/${java_system_arch}/libnative_chmod.so
-		/opt/${P}/lib/${java_system_arch}/libnet.so
-		/opt/${P}/lib/${java_system_arch}/libnio.so
-		/opt/${P}/lib/${java_system_arch}/libnpt.so
-		/opt/${P}/lib/${java_system_arch}/librmi.so
-		/opt/${P}/lib/${java_system_arch}/libsplashscreen.so
-		/opt/${P}/lib/${java_system_arch}/libunpack.so
-		/opt/${P}/lib/${java_system_arch}/libverify.so
-		/opt/${P}/lib/${java_system_arch}/libzip.so
-		/opt/${P}/lib/${java_system_arch}/motif21/libmawt.so
-		/opt/${P}/lib/${java_system_arch}/native_threads/libhpi.so
-		/opt/${P}/lib/${java_system_arch}/server/libjvm.so
-		/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so"
-done
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.32.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r2.ebuild
index 0373eb413c02..a7cab1c446a3 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.32.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r2.ebuild
@@ -1,31 +1,33 @@
 # Copyright 1999-2012 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.6.0.32.ebuild,v 1.2 2012/05/07 11:58:18 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.33-r2.ebuild,v 1.1 2012/07/23 18:41:43 sera Exp $
 
 EAPI="4"
 
 inherit java-vm-2 eutils prefix versionator
 
 # This URIs need to be updated when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-6u32-downloads-1594646.html"
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6-downloads-1637595.html"
 
 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
 S_PV="$(replace_version_separator 3 '_')"
 
 X86_AT="jre-${MY_PV}-linux-i586.bin"
 AMD64_AT="jre-${MY_PV}-linux-x64.bin"
+IA64_AT="jre-${MY_PV}-linux-ia64.bin"
 
 DESCRIPTION="Oracle's Java SE Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="
 	amd64? ( ${AMD64_AT} )
+	ia64? ( ${IA64_AT} )
 	x86? ( ${X86_AT} )"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="X alsa jce nsplugin"
+IUSE="X alsa jce nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
 
@@ -40,6 +42,10 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	jce? ( dev-java/sun-jce-bin:1.6 )
 	!prefix? ( sys-libs/glibc )"
+# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
+# marking. #427642
+DEPEND="
+	pax_kernel? ( sys-apps/paxctl )"
 
 S="${WORKDIR}/jre${S_PV}"
 
@@ -48,10 +54,13 @@ pkg_nofetch() {
 		AT=${X86_AT}
 	elif use amd64; then
 		AT=${AMD64_AT}
+	elif use ia64; then
+		AT=${IA64_AT}
 	fi
 
-	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
-	einfo "Alternatives are switching to dev-java/icedtea-bin or the source-based dev-java/icedtea:6"
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package"
+	einfo "has become fetch restricted again. Alternatives are switching to"
+	einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6"
 	einfo ""
 	einfo "Please download ${AT} from:"
 	einfo "${JRE_URI}"
@@ -77,6 +86,9 @@ src_compile() {
 }
 
 src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest}"
+
 	# We should not need the ancient plugin for Firefox 2 anymore, plus it has
 	# writable executable segments
 	if use x86; then
@@ -92,28 +104,28 @@ src_install() {
 			lib/${arch}/libjavaplugin_jni.so
 	fi
 
-	dodir /opt/${P}
-	cp -pPR bin lib man "${ED}"/opt/${P} || die
+	dodir "${dest}"
+	cp -pPR bin lib man "${ddest}" || die
 
 	# Remove empty dirs we might have copied
-	rmdir -v $(find "${D}" -type d -empty) || die
+	find "${D}" -type d -empty -exec rmdir {} + || die
 
 	dodoc COPYRIGHT README
 
 	if use jce; then
-		dodir /opt/${P}/lib/security/strong-jce
-		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
-		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
-			"${ED}"/opt/${P}/lib/security/strong-jce || die
+		dodir "${dest}"/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
 		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar \
-			/opt/${P}/lib/security/US_export_policy.jar
+			"${dest}"/lib/security/US_export_policy.jar
 		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar \
-			/opt/${P}/lib/security/local_policy.jar
+			"${dest}"/lib/security/local_policy.jar
 	fi
 
 	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
+		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
 	fi
 
 	# Install desktop file for the Java Control Panel.
@@ -122,16 +134,17 @@ src_install() {
 	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
 		sun-jcontrol-${PN}-${SLOT}.png || die
 	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
 		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \
 		lib/desktop/applications/sun_java.desktop > \
 		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
 	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
 
-	# bug #56444
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
 	cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.properties || die
 	eprefixify "${T}"/fontconfig.properties
-	insinto /opt/${P}/lib/
+	insinto "${dest}"/lib/
 	doins "${T}"/fontconfig.properties
 
 	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"