Version bump to 1.7.0.55; fixes bug #508716, reported by Bradley Broom.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 125 insertions, 9 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 12a8ca02e6c7..fa757a0a2883 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.136 2014/01/28 12:25:58 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.137 2014/04/25 20:41:39 tomwij Exp $
+
+*emul-linux-x86-java-1.7.0.55 (25 Apr 2014)
+
+  25 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+  +emul-linux-x86-java-1.7.0.55.ebuild:
+  Version bump to 1.7.0.55; fixes bug #508716, reported by Bradley Broom.
 
   28 Jan 2014; Tom Wijsman <TomWij@gentoo.org>
   -emul-linux-x86-java-1.6.0.43.ebuild, -emul-linux-x86-java-1.6.0.45.ebuild:
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 126e8c1f9063..8cccc68e326b 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -5,17 +5,19 @@ AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0f
 AUX emul-linux-x86-java-1.7.env-r1 969 SHA256 536aaac1a5f9336cbc0fe8626fd1553af3ddddea91fc0f73ce142f60da68e029 SHA512 404b2ed452567fbc3dfcb85d55bc0d48a90ed2d81c8d214c33dbf985d2e363ef7a31e7fd28a64065648c7e18db958dba4a85129953582d908f1493da97cd0d80 WHIRLPOOL 95d52fe1f178ad62e011c13a3a88cfdcd64dd4ecf38879ef9a5f069615b4e4e7a53f554a1dcdc56751780f086638907c3168e68bb1a63d46adc037a530e97b76
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 DIST jre-7u51-linux-i586.tar.gz 48333427 SHA256 f6807069ff45576ffff173a2ee4355bdf5a493e9b463bde9196b942af4f6fcdb SHA512 e5a2d841e7f924b606d3d3e94f75bad273f9952ff94b94f081d73614d0001326a9ac974412840c994e66dcc5d2bf582c193a08cb725f435f2770fb01d9546b3a WHIRLPOOL 5cf27c761ea3c2c8ad395dcb8563dc5e4933552a48d1e64e77071bf84e86bd34aa19f590859a143a9c986fda0b7594f4ef6e27d89fcaef0c52a678bd30a6eaa0
+DIST jre-7u55-linux-i586.tar.gz 48340455 SHA256 fa674c83c25a65edeca289321c9bb1c0fe9c0eaae64dc1bf3409e2c6a5f46c80 SHA512 f365a2548ea6ff9cf263b0dd71100eb70d842a4abd72d852e7698d9d7dbee97c4da2654795035adbc4519705a3d7eb81031566f2a97eaeeadaa439ca9a8867fa WHIRLPOOL 88abacb65259fd59c89a70e72ff0a258f6b0b178afa826502eb46e7109abe586094d79762148b14c1d97dce2d1b3a9e06736a92d82c839ef2fe8c8e8310918b5
 EBUILD emul-linux-x86-java-1.7.0.51.ebuild 3391 SHA256 4716c9886b168b5a036d23e8938460523f1e9f6c8444990a469ea03de0434d09 SHA512 f433b0b9d7c003e795f56f64a683a88ad38fc0862ca418d65b42bc699277ad7f5bbcb13539dc54057316a0a1244acf2cd668bd255f7c7420fd9ad89ce13f6a98 WHIRLPOOL 0fde7cbd85d0984580f3bda50d8ef91640c122038029124a70907c878b3f7d74305f496188bfdccc33d90de1b4855c50d5e39446af07c9719c69957824a5a25f
-MISC ChangeLog 26874 SHA256 22cf6c8fe983d30ed23a4a888f1038deb4855fb95af1b5bf3c9d01a4da7c552f SHA512 e993a94825ca0b1fbc9da6dc30343705bd5106588d30f6c4844e979ba262960016c6ea329d294ccaf1a2540ff978163378f7eea3e77319aaaa71ca4a6ceed791 WHIRLPOOL 6a0532a19da4cd7d9e5f405101e9ea6bc5246848192cfb6fceb71ffbfe5d6860c7556ccb04e7a09298408fcddd10e774a706131c80da773e54b068bace53a2bb
+EBUILD emul-linux-x86-java-1.7.0.55.ebuild 3391 SHA256 823ea2e91c86afa20c8840ed05872b8afd354870b8d7567e1116fb5524a77e83 SHA512 6419aec26e392c2666352e6473e45c033c5b5312d7d114a0f06230879dbfdfa9b8af678ce1968ee318b89432871f00c32f4c5c23bf6b837bbf8446d1764591f7 WHIRLPOOL 9095f2d380a32915df33d5f1d3b596174c8dbea200a0d8beec83a1eb5b3ad84386f854a0a7e52978c2640b97fbff82478d6c2bc762237fa340fc909f560d4652
+MISC ChangeLog 27081 SHA256 2c35d565654d96380265f00117f4e3aa55cd9b7a530ce450afebd6b1d2136bda SHA512 c76b0466f875aa0ff14421e7761d0757376f38e9277d580bf70cc09bf799635b64c8abd131848234080ace9417c7d66bbe1add01198771834e2a24445e0e3197 WHIRLPOOL 95c11de5139216d445ae8c155fd747957d53603d25cc73d1dea45019d5bbb0c9aac7a0b5b0a6c61fa9dcfc4ce8d1557404d47056c88952da02bb07ef24ce66cc
 MISC metadata.xml 243 SHA256 bec7d825ae2052459b6f40ddcf9a807c18caf8f5aa3e5844de29a9b337230536 SHA512 5a5dc347f5a2a29e3f122631df69dca812d0f649921a32ad21dfc33d57ac9757d2552c59a14c5a4275de5376c9b0f19fc0dde030eba69d47dd6682b1638536e1 WHIRLPOOL 9bdb79b376c2c7652455ab2e7117a9abd4e4110caa276c31e4b3e2ed8b0f49b4736083234b8bbc5012edc8b6ee866de055c6cfdf98794b11619cbd517ee2dd64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS56GVAAoJEJWyH81tNOV9sJEIAMSw1xRr+tKzbqMiDpTWjtpl
-amYjdLIWNtMFZpHB6OOyrMat2+CI77QhZ7MTCgXY9aMFqNdugBmz7SIu3YIH96DB
-8iH6mNwvN6WRa0lriJaUP8EATBFabkf3H2PIMl4hmKN49DiC0yCUfdFkEbmXEuY9
-+2wYsEv/5TX886P3aRlc6as7eQC3opfCl3hmIEjJmLZvHyHwrurft/5KKDKOqhUe
-c5GRxFECno6znYKRIu41meo7mI6oTLZbi3DTGTJIOZaNljQP9amHCFU/ZnmvfR8k
-sf9/H0zyjtIr+SFYm0b+m7E1GVNS2plIAjXkJu7cEGGYCllpWnk5EDE6CCekPJo=
-=0uB0
+iQEcBAEBCAAGBQJTWshCAAoJEJWyH81tNOV93/UH/2Nc92lYyZ0b+kgBy9x+zxiD
+GFsD3ZUJkLF4idGgH+pE1YB+LezX7Pc6ab1icjTtDCFgfDiEtMDOKtqqS1x5Jmi1
+2qyPgqRkljVSWiDZOJh9mhYMdjaB/rGeVTB3Ub/suL8k6ByKaz3KChfAseO/KPeh
+QJHgOKkO5zdyAnBVfaQJNIDEAeRlJW4nOYQyduSxZbAps6A8OcSXyELT9vJT6kCZ
+JsgDKqJidV7EbCIEP2eoa5XbPur26HDx6JRJjUDwlRh7ytC6eSQ2HrEflWlENim2
+ETry8xWaLP4e3aUai8j+ChA+dCxmcxLpJlT/RG0/qRuRJwtPpKi9N6ATvFZVZcQ=
+=n4bF
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.55.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.55.ebuild
new file mode 100644
index 000000000000..0390b6b6b6ef
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.55.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 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.7.0.55.ebuild,v 1.1 2014/04/25 20:41:39 tomwij Exp $
+
+EAPI="5"
+
+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/jre7-downloads-1880261.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.tar.gz"
+
+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.7"
+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_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
+}