Security bump. #438706

Use QA_PREBUILT instead of individual variables.
Fix desktop files for newer standard.

Package-Manager: portage-2.1.11.27/cvs/Linux x86_64
Manifest-Sign-Key: 0xDA575EB7

3 files changed, 131 insertions, 9 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index e8980d8c0308..c7f0d10ce5ff 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.118 2012/09/28 15:33:43 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.119 2012/10/17 14:45:17 sera Exp $
+
+*emul-linux-x86-java-1.6.0.37 (17 Oct 2012)
+
+  17 Oct 2012; Ralph Sennhauser <sera@gentoo.org>
+  +emul-linux-x86-java-1.6.0.37.ebuild:
+  Security bump. #438706
+  Use QA_PREBUILT instead of individual variables.
+  Fix desktop files for newer standard.
 
   28 Sep 2012; Ralph Sennhauser <sera@gentoo.org>
   -emul-linux-x86-java-1.6.0.33.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 07fc255defd8..54a84683f8ad 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -6,17 +6,19 @@ AUX emul-linux-x86-java-1.6.env 894 SHA256 47fa2c1923a0ee6940cc1deb8a12258d900ca
 AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4 SHA512 c6f257971d1ad52b1af6041f84978d7029598b7abef7bd25e3d4f7e83cf170325fc80a53eaad70085bc1f45f14af6f0dc322ac729535fd6e0c80704dedb32811 WHIRLPOOL 33d29b11ef6ebe62672cb4a483867e2e38cd73827f902ed3b4d1784a466c266446b8306447e9c7ed175d7b4e416165159aef51a73b31a14df611efdeca185fed
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 DIST jre-6u35-linux-i586.bin 21697122 SHA256 55959143e602cb4edf2786d0f78c288eb44e7f105836aa949f2e0081a2fbd70c SHA512 981c9177b910f3530acf9b0998e33c79c9d5e0bb6da73694d87d48be50a30ba349e088e7b32ba8bf3b3c6b48789d12948eb82477123944dfef61d2972ddf88a5 WHIRLPOOL 8313107f4aee0b877bc4ba4f4fe22738a41a0229e04af7b0b528fe23b820ec207efff6a7565c97985e8b9497ff73c1b7f4117b281ab286b49d91583f45a67835
+DIST jre-6u37-linux-i586.bin 21704353 SHA256 aeba98f45e3dcddd460e28165d89de521e69dfa69b76ca6aa21bda633dce4776 SHA512 5f80c83c4b359d044c09b8854536a04c59f0e8d0699c29920114866b348c666f6227719bdf2236961cd0ee2bbaf82d3d75f97d413e6a26a02a4b075ac0d0907c WHIRLPOOL 6ebdc24c344173fe2011cf3197e66f7291b2985e99357740d543e3f715dce14101cac7213ff2e782b0a1af328e94d813e8843a5fe22b12dc96002b97e05cd8b1
 EBUILD emul-linux-x86-java-1.6.0.35.ebuild 5333 SHA256 de4e2f9466a424530255acc5f942071bf9c2c4e0fdd02f662fbd536abb1f0301 SHA512 67e76acc742027d33ca7a507c9acdf9dae59cf87d461738167cd25fbee52b1a81736e855224ed58bccd5d589f97ff6fe357d76c3063e11a13f3cbabba8fec4e9 WHIRLPOOL cf5a9ae6c91c7c21c307567dff17c78deb56bcb3b90ae012575f0774c9b3ff028cbecf47decbdb6ba40856741c1ebe0cf1d73c4d72a14ea7b169b9445c74e9ff
-MISC ChangeLog 23913 SHA256 07a8c7672a4f5e69924d53220409090c70a888c2ad8b53db1e38f65a589a5359 SHA512 832b8d2c278b51c6dd7db2e774d05b43029b7b9ec54a3766896d9cbfa991531cf89367ab1b30e49f2d4fbc403da24a90cfd6ddbcd03dfeb555b94f68e0f282c0 WHIRLPOOL 3353a370e30a1bd61d21ec81561812dff48577f3412306c40c80d3d45d4843e1d8cd302bc466f5d8a02710d1f5473173888dc96ac314df983de13005dd4b3795
+EBUILD emul-linux-x86-java-1.6.0.37.ebuild 3466 SHA256 f30c3fc8d403490ca6a7df0e08d51c9fd397134c6448b343bd053d6092399715 SHA512 5a12e8220ae06c178019f7d63b0684a3bbdfc44029ed01063c24565de9499cc2cd51c7872a4b090256614e8dbc3118cb7166e924f68dca52f08f7a31b6af3f64 WHIRLPOOL 36f7a673c1d7f1505eca0cebe413ee4ceb1d9fa0491b218cc1906ac61b2eef327a54a389a485e0df9ac965ebf077274597d130a2b889447aac97d5bc807a09af
+MISC ChangeLog 24165 SHA256 949c95ccba8bd32ea5dde3b299023ad7429bcf1b7cc919ccb5820dee4d07b08d SHA512 a9fb0db68823de9b56944c612e6dd0d5b10356692837d4bd02f3ee4ac4eccb423f1db6d876665a653ecf24c295cea284a49c56b2a655e4ec58234d4783f2616a WHIRLPOOL 1ee2aa1fca56cfd04ca6ae5dcb8fc1e373113dada5d8cf4876c85de0e19642f27d05aa1b9054a0baa73f73ff0f5f1a6415860ce738f6135fff593c134b7a9413
 MISC metadata.xml 270 SHA256 68c40f50bd74b9038081e459c015f5786407bce5a45e2e1614566739d70cb21c SHA512 58bf7182934eb5030bae7032efde8e8b277fb4820a256d271a501904ded69b19937b1d17058ef770e3ecb7a526739bd1fae7d2163b5332fdd7e5c782cfbc647d WHIRLPOOL bf2557c8836c581b51c65a2f2488c77192072524696f36615a309d2bdb74ea7ed069f73438fe7ee0b5b83aaa7cf20162ffcdd5cbc6469411116e75805b67aeb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZcNlAAoJEIUJ+svaV163/UQH/jzNmPlm2h8KKejSInp581z6
-wTmWhPvz1JYNEKTaVPRqm+L+o3wcJc+g2dlztR6CqJQCb55OxL0u9BIMd7MZwU+s
-4y/jGwshCZjDdvZlsUAZbWfe1Hf80c3ZKnB/3Mj6ngYpoL2lv/FHXXDS8jFIX10J
-ur01McUF9m6z2wrCy+4Z5Ozh7fJQHb6lpWiz5vh0gD+OGKQ2PgXdYHcn9BcmNIZ8
-egUkA0IQzGImVa3Df+/MyiSE/ddZNFjCwrmt0e4WWjcAE/IIo3GC+xUnMzXkm+PO
-cMM/DW/FAFxSvmjYuwfq5CLgrJ+IcFdyQwzKbaR/Wtk3WS5Lp21L6vJdCkS12Zc=
-=CWw3
+iQEcBAEBCAAGBQJQfsSFAAoJEIUJ+svaV163dtQH/i6avP0ZS09tjsfj/kS+8iBj
+c9C2HWWztUoVnJbm2CluC+RU9bq4iJXXSmcLrYjcflD2amWxVuJxNTvBlF4R7Hjo
+LqB5/S9xaEX4xEoJY6v/GkLcao5Mbc9cJQR3AXtqtYn+ABof+OSuVyqzkfzfzmAm
+XfzNKgKDpfVpOebnEhGQ/wKKBXg6MKrsV7uydlmFYRwoLnljLHxj4gput2eQMCh8
+t8qxsHlt29DOLj1N/fs6qNo1uci3UsLzkkTvqz8XfxHKGpty1TgIdYbUQgEoRt9J
+G6yNq9VSBhd/3MPk2DPU44qG86GAUqCB3zvXC5OOmaBKo1bKW2dP/rLIwXtoYsw=
+=0Md0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild
new file mode 100644
index 000000000000..bc3910833a04
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild,v 1.1 2012/10/17 14:45:17 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/jre6u37-downloads-1859589.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"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="${X86_AT}"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.6"
+KEYWORDS="-* ~amd64"
+IUSE="X alsa nsplugin pax_kernel"
+
+RESTRICT="fetch strip"
+QA_PREBUILT="*"
+
+RDEPEND="
+	X? ( app-emulation/emul-linux-x86-xlibs )
+	alsa? ( app-emulation/emul-linux-x86-soundlibs )"
+# 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}"
+
+pkg_nofetch() {
+	einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
+	einfo ""
+	einfo "Please download '${X86_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"
+	bin/java -client -Xshare:dump || die
+	bin/java -server -Xshare:dump || die
+}
+
+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
+	rm -vf lib/i386/libjavaplugin_oji.so \
+		lib/i386/libjavaplugin_nscp*.so
+	rm -vrf plugin/i386
+	# Without nsplugin flag, also remove the new plugin
+	arch=i386;
+	if ! use nsplugin; then
+		rm -vf lib/${arch}/libnpjp2.so \
+			lib/${arch}/libjavaplugin_jni.so
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin lib man "${ddest}" || die
+
+	# Remove empty dirs we might have copied
+	find "${D}" -type d -empty -exec rmdir {} + || die
+
+	dodoc COPYRIGHT README
+
+	if use nsplugin; then
+		install_mozilla_plugin "${dest}"/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=${dest}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+	eprefixify "${T}"/fontconfig.properties
+	insinto "${dest}"/lib/
+	doins "${T}"/fontconfig.properties
+
+	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
+	java-vm_revdep-mask
+}