Version bump of emul-linux-x86-java wrt bug #537214

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

3 files changed, 147 insertions, 10 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 3f0aac10cd58..212fcc57867a 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.145 2014/11/04 18:05:44 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.146 2015/01/23 17:54:04 ercpe Exp $
+
+*emul-linux-x86-java-1.7.0.76 (23 Jan 2015)
+
+  23 Jan 2015; Johann Schmitz <ercpe@gentoo.org>
+  +emul-linux-x86-java-1.7.0.76.ebuild:
+  Version bump of emul-linux-x86-java wrt bug #537214
 
 *emul-linux-x86-java-1.7.0.72 (04 Nov 2014)
 
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 73373b2778f0..5bee43f8bc20 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -6,18 +6,20 @@ AUX emul-linux-x86-java-1.7.env-r1 969 SHA256 536aaac1a5f9336cbc0fe8626fd1553af3
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 DIST jre-7u71-linux-i586.tar.gz 48461842 SHA256 b616145b22aafd53433bef76c873d50c4557469d15fc14bd852885cc4fa2947d SHA512 6d63fbcf2601660bb57c8496c024a5186ac41ef6fe96f8eb36e089a2a80bac4c26c43e356417e8ac7568685df005bda0fa4c74033e6501718ca90277ab75137e WHIRLPOOL 804ca029a0d4d8d345eba9f8924735bb82f74d47098f0ff876a4104c005bad2b2e69ba1585f7c11ebba43e4923bea7f85a8061902ce72a04b2df6acb411d3cdf
 DIST jre-7u72-linux-i586.tar.gz 48474551 SHA256 7e9fee89daad3fed1ef2f12dcb496ff2de4ec1aaf9cae6dbbb327747e2b95bd6 SHA512 40d21ccb21656d4d54723991d1acc18da70a51ff466ca32441a6304978dd1d6a0f06144392f42fd80da6f19692154a345ad1d61c6ebba84bc8c6ba38e86e3096 WHIRLPOOL fda875fe86f6bc9c0df62958620baa9d24207913e3f3890b5459173a7815811e9b18d0d4de133a4e28d0fc71e8464618c0bb132ee0244c8d38a287647f78c145
+DIST jre-7u76-linux-i586.tar.gz 48501515 SHA256 38aecf5f6c8706f293b40db0133fca0aca5e6ab520c1b9b0a3fc38ef2988b3cf SHA512 084752d9f41352df061be8327d6eecdd07d4065de8c0a7201f36cbc1fbd62c1ca45b21dc882601c34a09bca29317ebe952ac589904d4893545544134ed619cce WHIRLPOOL c6f90d86a5b1e06385996354a8aa450b83e0516345a014a2f55a41e436e2e00121d200d5d83ff96691237330945589de97d8e6e5895ef5dae0aa352c4b476768
 EBUILD emul-linux-x86-java-1.7.0.71.ebuild 4006 SHA256 9619e043fac0f732c97a938b1a5a07f49ebc47624c01d14f9cdb983db2c73b50 SHA512 84da075c26b6aff6089969fe75bdfb103f060167d7c0a525b5d0ac8c488a0cb4f4f1005973359522099126d51d7a3e497d441060e0e26e77345794d2ed2adb81 WHIRLPOOL 4220dc89f960e0821ab26f6f85d2e65ad4cd8c139f681043de054b8f8cd2c3f22e63a633f72addc6c6fbfd9a30951d59cd268924c21038a521e879cc9a9d0669
 EBUILD emul-linux-x86-java-1.7.0.72.ebuild 4009 SHA256 0a3abc18f553404fd3042d7dde334722f096a5c9ef2123dc8598f76cce397bf6 SHA512 2dd868da4189aba07deb67d66c66c1eeaddde3f8ab46161759d49cc0fc0fc1e3e5dc4a4ef315371fe6f4b5cdc7b6ea3d402fb85e77e8a8ee88d7201f7a053a40 WHIRLPOOL 5df0d5d4dfc8b5f6d1a97d586c54404cfd69d99778a175c706a9025afff74c72dea3c8167362e9e514b9efc0aa877eda2a0932542fc0e023617ddd8984e0ec31
-MISC ChangeLog 28419 SHA256 08187840591843e7fd1b41d1bba611b349f366e4120178e9d59a28e709d9687a SHA512 2e7cc84ba4cab769ecc3781641cc290b4b43e7d2d5cffc4db7a5bf8deaed4a3e326b3e1738f7c984baa917c3cd8219913c4ea797f66312570cb469df7a52d711 WHIRLPOOL 76b0219df49f9539d81cd2faad9468d62257ede6026ab25e00e5317a3a2ef6da6d8bf35ffcb78a7383d69a0f22d4e1e6f8c834a19022a6fdc34cb88e813b3046
+EBUILD emul-linux-x86-java-1.7.0.76.ebuild 4009 SHA256 55acfcd6b23eaf58783a74d3bfdff1f10c1c844dbbc2e1741ade6638f11f1657 SHA512 8b8073b98efdba5fd5d9c764a1b523695d9606cfb75ade1411240b1cc687d659640c97e93e928d4ad78970828bff727adbbfc8accd75964210bd4ab150ab56e3 WHIRLPOOL 2417c65bdf0cd5461f7b4020e7ccea05c9d24132e710e176c3efaecb7150a72b9258850f93330199265ffbed838d0965cc0d719f337e90160488fdf771b6cfe2
+MISC ChangeLog 28608 SHA256 ea9c3882a23719918e8f3dee21449218b00b10427cd18e021d2b59766fe33429 SHA512 071fd2ae50699d0e25491cdb3ddce0ba1d3b61ae53f765dbcb05ce68bda4a4beeea9d48697c0ecf83f228ef8cd58b6c4759558156bc9abbf228947a881893e36 WHIRLPOOL 74b9b4a235c43e38b13998393aa71253035744dfaa9e568c7df4f0b3dd5bc8e480f0bcf296073410ee2a86d63fb68f931e32ed0c00495a848c8faab1e5830659
 MISC metadata.xml 243 SHA256 bec7d825ae2052459b6f40ddcf9a807c18caf8f5aa3e5844de29a9b337230536 SHA512 5a5dc347f5a2a29e3f122631df69dca812d0f649921a32ad21dfc33d57ac9757d2552c59a14c5a4275de5376c9b0f19fc0dde030eba69d47dd6682b1638536e1 WHIRLPOOL 9bdb79b376c2c7652455ab2e7117a9abd4e4110caa276c31e4b3e2ed8b0f49b4736083234b8bbc5012edc8b6ee866de055c6cfdf98794b11619cbd517ee2dd64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUWRV9AAoJEKCEBkJ3xQHtkEcH/3UGqlMbeEQg2T9FrqCwddyf
-XdKNTUJ7/u7uPC59/m1OOK5GLOLdFYNspZNJ9T8bDygawY5RZKROfOP74RFyDJEl
-1szjyUkccPuW1fSd7mpSvRM/KLZTMa0q52D/ZXHfO1G2cMB/Cjrv5CT5ACPoCUBs
-+Wf9R94Fc9VpzXjQqIJtkD/v2cjr/psI8Ms888FzkLUnZykJ7Bt4GjfmVrLWLwqI
-2xhTn0ZTFKJhZGDAb+5Kd/Nbj14TuRhpu3EZ7ctH/wEojLTRFhNe5wFxuhV3zpD6
-cnKm/i6PVNITlnjz4v+zubM5bs5Hi0K7SNfrjX0T7+gBH0auluSKctGW2R+9Njc=
-=o2cC
+iQEcBAEBCAAGBQJUwoq9AAoJEKCEBkJ3xQHtrLMH/jXaAs9PO46U4+9ag5vIDQXX
+UKd4k3qkZZv/MfmTc7+nmas5xqSRJ8Y1q5933PmO6q3KiWuYDpCUuxoYIEQu53fB
+kjuIs0NDZXvSEW00StsAawhkNCX6EX9t54EXJRKd+Q7Yl1tW7kO+TB+QcIiQ18Dd
+zroITNeLR6xBXX38/TnvPr3UEgQtaFGSCuE/fZRC1nlERzyLGBIOChMcNk5+TJee
+MhJHM0Fb8foG7MC4KLBDQKREIBkSpfuRSZNst0+YpFYFDRg7RYg109H3mC3DRjz8
+SIdzKPL2C4u5i+vGKZNg/MsgvLVyGuzbB2LrsKUXakPIjZ4fWAKoRbTLuoReyxU=
+=tzTR
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.76.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.76.ebuild
new file mode 100644
index 000000000000..8a5006c166ee
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.76.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 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.76.ebuild,v 1.1 2015/01/23 17:54:04 ercpe 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? (
+				x11-libs/libXext[abi_x86_32(-)]
+				x11-libs/libXi[abi_x86_32(-)]
+				x11-libs/libXrender[abi_x86_32(-)]
+				x11-libs/libXtst[abi_x86_32(-)]
+				x11-libs/libX11[abi_x86_32(-)] )
+			alsa? (	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
+		)
+		(
+			X? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+			alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+		)
+	)
+"
+
+# 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}'"
+	einfo
+	einfo "If the above mentioned urls do not point to the correct version anymore,"
+	einfo "please download the files from Oracle's java download archive:"
+	einfo
+	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jre-${MY_PV}-oth-JPR"
+	einfo
+}
+
+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
+}