dev-java/icedtea-bin: Bump to 7.2.6.7, adds multilib for amd64

Package-Manager: portage-2.3.0

2 files changed, 210 insertions, 0 deletions

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 010526f59725..5cb939035c29 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -8,9 +8,12 @@ DIST icedtea-bin-core-3.1.0-ppc64.tar.xz 54025844 SHA256 2183b3c2764d3c4293d9af7
 DIST icedtea-bin-core-3.1.0-x86.tar.xz 61073964 SHA256 f8ab3a75f48444fa608fda61163423db473f99a8923a4f7ea17c520382578fd6 SHA512 1380b1875c7ea48000cc1bc557f8f6a222afd2304afd145db413f7949e7919d6d1838aadc84c6059b6aa105879b2f0b92c99a19da96906c107aa7d42c85c94a8 WHIRLPOOL 34a0800d86460fbde7b8d3f036a4310866ab7b7c65b46ddc58ef6c4f97344f530e346e111dfd76d2dd9f22546b75a883b9e296ede8d033ed1b20d72f1b770b3c
 DIST icedtea-bin-core-7.2.6.6-amd64.tar.xz 53051836 SHA256 9729ac37ed34b60f6a9c18c6865e99648379c79e24f189842c0f8dc81424fd9b SHA512 ee621f3dfcc19fb274acb8b936f7256b2053ff97864340732e6cf97db5a265d81ace7269c9f90ee7e4135b4299d7ecdd2b660f5e806ede64e4d74a4dd80b0592 WHIRLPOOL bfd8dd85fd074f7f16d296a41bf7ccaaa167fbeeb3bfcde4119c2b2ee8a59aa2dad9e627a15dd3790f318b9fc8fa8328ead9c472af527a82a93c153b1d92de02
 DIST icedtea-bin-core-7.2.6.6-x86.tar.xz 54697212 SHA256 c33e89990e1207458abc56ab0b2720b239ee0a3924e73360e19f52e7a29f8ee6 SHA512 7ebca976f2864cee1e08ed858e93c0dbbc850d127c9359b7e1edb7abacd7e14e0b5cdbb1f042ffd40232cbcea72f21074caad2a669096a5a5a7808c246d4e04d WHIRLPOOL 6640c59170b451f81541cf98451325d596115ad8e530b9d5fabb6f060e4e32e09c9ac49b6799694508108f09b58b82f98c4bd4d678ea8d9319c5653ba342d873
+DIST icedtea-bin-core-7.2.6.7-amd64.tar.xz 53121664 SHA256 3c43a1b1ae0b49ab9c5b01fb925fc2e40e36b26ee94bb134a9041ba550abb301 SHA512 7c468356464ace98396b68596444b4e6b8545883fbe4a83e61413955f3a7f5f49d2f6eb3b97108633b03e37ac95fc328d28ec1eaff1464887e394752266da5a5 WHIRLPOOL 8f0f73fbe8d2e1fd6a3393868210c8b7d44b249392b2aa54cd399215607da8984d4979c23ae36563d04cd37b4cc9041018bf508a7596c4923abc15269fedd15f
+DIST icedtea-bin-core-7.2.6.7-x86.tar.xz 54806556 SHA256 644b8355a62484ec38357bde77ffa72843bf7c1391be305f834f43be374c62e5 SHA512 380968a2da744d2ea2a67c882416c909cc4132bb2fc9b79eb8ff263c8aa5d49c262e41792884c67a09fb93bfee371002a5fb9ebd630982d02429bd268489c264 WHIRLPOOL 84669bae688cd043ace4eb2b6912510d1f0358a7dacfbb193d8e6655b038ff82fd156743b5498c763435863cb22fd021dd7a2dbf38d6827990c6a5acf6e0c769
 DIST icedtea-bin-doc-3.0.1.tar.xz 11681216 SHA256 5f05fb2fb4a8eb6e52d2d26100d04e121e1afb5611ff68114bde323f5540581d SHA512 1eea99d62e8fc0c917e4622b798df6d32ec3ea6f90ad9b949530dcdf64dd14a4fbb6d7c334634b8aec22b2775fbb9a67b0f70afb79ea678015bc266743afa794 WHIRLPOOL 8ad6d54042627374948447b48fc52123af37fdfcf9bbdf757240d42623b3c3d9d69b76775efb70b9b8e5bd6a7b914e77d0f0f34352d8fe32b6f70f87169684f5
 DIST icedtea-bin-doc-3.1.0.tar.xz 11683216 SHA256 05e5ed8110123e4a0941458f4b4b73ee999029db98fcbad35033d0de97e14b25 SHA512 cd4d3f60e29777240a26ac6fffead099ee31eb05bfb2faa8f3c2c5a7c2aded3159ad0a8aecdc298e7a84bf96cae626d7c1b1cf18af24c39f02c6455d260a64a5 WHIRLPOOL a008c276bf6da08385524c8886366d2f62c2975659d6181991bcbab9f2396a8a8c5a1cdee847d71d6c994ded738d126aeacc4c7180f4a1f5202a7e01f171db00
 DIST icedtea-bin-doc-7.2.6.6.tar.xz 10603724 SHA256 150a8aa157b442569b60491c5261909a7a381e0a253070e2bf6d9fd8d0344708 SHA512 39ab65e002d9f780c881cbdea41a4fbae792080399a020c189d7fccf24a83c604ecc90b6fad47b9657eba11254b1021d8c45d83cb8a0dcfe62011f9cede53ce3 WHIRLPOOL 480fb25b1b551699163fc07ad5bf31e774c38f4ef51694d906d0f5c5c5d3f4941806b352ee472fdc3e02c007d96a28d395c41adc4d4965f826babb2465011bb9
+DIST icedtea-bin-doc-7.2.6.7.tar.xz 10603912 SHA256 951c33293ec4161084c6d1b40c9af836547c138985ccca2a7062f03c915aae61 SHA512 ea5b0f092388641c82a31bc143565c245dcc3eefa511ec89cd2e4ecafb8ef06b738cfea007fb6530f416d1ae1b8203a3ef495791ec0d6ce14ee4e7574c096d4f WHIRLPOOL a4745cf762dc1877e01cfb65675d990623d740015ee54c7d5b9d5f5fc72cab14a8c547aa3987f49158eb8e7013867c772365fe2905974d6e1b239c0400cfb994
 DIST icedtea-bin-examples-3.0.1-amd64.tar.xz 1811748 SHA256 9728a787131d892eef67c0b10882f6a7e33d0fde2a6856c84f1c910086eae7fb SHA512 a76caf7a7927e28dc0e46a4e851540231971fd7fd0f4be1c46c1b72e71952495590a10f56aaa60defd0f9d00c77830dc716fe6ecb1c4777e7d0862804d72d463 WHIRLPOOL aca2ade6113814dd4ac89bb1a730cdd36cd6c33162986bedc58df790b10d7ab469192a36e854f2ff34eb13a787420c01e48c5c6d5636be2159a1ca10b5261c9f
 DIST icedtea-bin-examples-3.0.1-arm.tar.xz 1794448 SHA256 3cce37e8ee7786c80a1dc90088ca278c81e2239481e7ede4f59c2c3178fa7db0 SHA512 08645c50ca1ad770bb7da044a74b47f4c8590b5382874af3f8683ddc741ba87d0bc3ddcbe0617a551d18da6bd8746fc75ba9c5bcb237b56fa7f4c0dafd73acdc WHIRLPOOL 36ae06e990e1d5aa88692e49eaf2ef4f4dd8ff498cba5eb7259a516b29b543f4522d4fe78ff40baf53e93faad93792ace115e48bc5173211ce18b04902297da4
 DIST icedtea-bin-examples-3.0.1-ppc64.tar.xz 1805088 SHA256 5a07a075c4bb3319b734daf1dcbd22670100cb133706aa5594718efa79802cb8 SHA512 4a81748d24f2e3c05445d7331c5327aa05606692c96cd983dbdb29cfc2e96bb2b0fb306fcf97e7fedb90aca8a64ec229c0355be26c4d5b829979ffad79e2b9dd WHIRLPOOL 0f1f5cd66f085e7e430f7a636e6d6e59c8c108fd437bc9ddfd98b6e8c71f7b921900565e2c6c5a7ae768214dd700663286f75365e8c8cf36e542f59ff08b5a4f
@@ -21,6 +24,9 @@ DIST icedtea-bin-examples-3.1.0-ppc64.tar.xz 1849324 SHA256 8ccc52218af73fe29ef1
 DIST icedtea-bin-examples-3.1.0-x86.tar.xz 1861868 SHA256 34b7e8c4baa1145c86790cf8ebd90df9ba3e466c4743f405c13682eaeedd7691 SHA512 d4f77345dea35c7ffdf06bd6a24d117c9dac26802562724a048f4baa95c9d0d463005e6537b79d7948ff6b1ff3fc87690b531c09cf2130f34af829168bc5b615 WHIRLPOOL 07c3b24782f47cba8ff57c89d2459bfb1c083fd160948e4d6b8f01258d1c9ef1ca8326b214e7ce2868e92f924ff02062d526117dc0f291ab09dda54f025676ce
 DIST icedtea-bin-examples-7.2.6.6-amd64.tar.xz 1796808 SHA256 b6add78d86e3420f589f6bcfee1e4a9fb983fc4d0b6a905fe162dfca56e73500 SHA512 38e2d91f6621e38959c2d0bef84f4d566370303a5b50cc468cae6fc97da46d752fccd8c980b6490f43709c0c6340c3af88dd9f7c9a0d7f400289127aa568b3ac WHIRLPOOL c212b2a953f784a05759a1b82d7120fbb5f642d8d7f014750f8c509aa44c29f193f17dc86257b1b653f0e5334e167054f71021726745adc8b8d1c57273902223
 DIST icedtea-bin-examples-7.2.6.6-x86.tar.xz 1796496 SHA256 5f7a4f52ed2f36d06ecc6c37041e2b400ed84c56ef4921375a925682b4523d88 SHA512 e80c965ca8cccf60561138fb5c4f21e293b6e44b5a4cecc97d94ffbccffe4f18da40942e2659c7264df54563c8db327b5e7a7f71fbf6ef873a4e74afc122050a WHIRLPOOL 402a1e10aa17e875dd83adff72dbe9d37c05b40a44c26e3212658ea690efec3dc9a61b57aebe24c77f16c52961dcd925f412c645e828e9e0456ae3a8d77ebd9a
+DIST icedtea-bin-examples-7.2.6.7-amd64.tar.xz 1796532 SHA256 711c3f1591bd3defc6ffdbaafe7e4b4a461147fdff3012e80728421b432e43aa SHA512 07abe3a1887231a8869df1cdfef616e9ed2e22b63541edb854720400bbd2256a1f50839e12102e958cd6214f5142c73b939606d2969f7330dc88636210244cc8 WHIRLPOOL 907d97a54709a1406523940affcdb08459d5c90437b135ad71d5591a8cc7843baa74d5da924466632e8b741ae831568a4781e9218529493479e300f888e76417
+DIST icedtea-bin-examples-7.2.6.7-x86.tar.xz 1796696 SHA256 82e40bf4724268a1305a664e34b5d75548f83e24c73a0fb92dd6ddda8192b534 SHA512 6b4fdeb8cdb08fb9ecc09bed84a6c61c3b17382a86c3ce6934da02302302de5bfbfbab7414bc28325da01d04f695065603d9c48dfd21671a978784e25ce923a8 WHIRLPOOL 48d737e0b1a5fd738d76ee26e4573f6c54bb76b4ca80c7495d6daec9c46e4b2e11f4800de96d809465952961a6e75608b343969db1c87bc55eabaa19fca68dba
 DIST icedtea-bin-src-3.0.1.tar.xz 45656168 SHA256 0820242fa98a918f0a25c248cb43a01ba13f87848eba43aa1b731b9ca17f576a SHA512 ece43dcc77812a1e212b48cc4d30a795055e74d52c2f5faac9b8e07fc26f51d3963cd333f71d2603cf3ac82f3ec80fea5093787f079fbb1cea969193b120a4ce WHIRLPOOL 5f7546142824747ae2d551d004223d577ed4d32acb988d1d3cd4f42fedd0a94903366b0b3bf042c0b86d5093b4c32c3c44ae6abb82aceae390de45d8d44cfd1f
 DIST icedtea-bin-src-3.1.0.tar.xz 45670204 SHA256 4a96edba2b2d8cf91253bf2ceb55316729e9688f456abfd46695dceb96dfeaa6 SHA512 f1416398761f66bb57803368aca9bf17a14b4366b99ab3fe8ca3e470c026e962a2554c1b089b879e6d0ce43626a3eacbc81bf6b6f13f9593df54fe05b78256bd WHIRLPOOL 10ee09c2d860f6f0ea1f2fb3d545fd5909e1d6b6fa16d59f873ec35bcfd02d229a294df6ef3b9bdec8c9d899b562df4056d0cfa626454d9d774499b805d5c8cc
 DIST icedtea-bin-src-7.2.6.6.tar.xz 40045788 SHA256 4d759dfc12a39ff44650b61a5a89f2ee4dcc5d6d0a863c54f8c6e2c86023ce8c SHA512 13cf426366bd7ced497d16b76dd5d49aadfac45e9686b78c185b4d7c95b47f96fecfc789b14138780592580c39857a2d68d8d35a6d016fb4ba1c0c8103b74f9f WHIRLPOOL f645c6da2a5c08e48bd6598bda025776d4e4fceb3a92898b4c5d9ca7321797e834df572656c07cf24fbd2eb0cde097b38137472857d968b663ccba2788406c07
+DIST icedtea-bin-src-7.2.6.7.tar.xz 40090732 SHA256 99f5fe4d198751551b9ba35dcc24deaafa978f1e33c95aaf4e561ef20884f6b8 SHA512 4d7fc20910e7c18d7ec4dbeb85210390a606e05df5696b5b87eb097e1335741695b037f477c21eefcac69455040fae03827589f3b78cba563f98ff8aefed7a0a WHIRLPOOL 2b538dba26778bec9f651c4bf98e285418a0b60f142beba5234fb0697d6673c6109d67a38e4776d89782cfbe89723b1eabefcb380c7bf8697efe0382f414c622
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.7.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.7.ebuild
new file mode 100644
index 000000000000..36fa6fbe4ced
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.7.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib-build prefix toolchain-funcs
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~x86"
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )"
+
+for abi in amd64 x86; do
+	SRC_URI+="
+		${abi}? (
+			${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
+		)"
+done
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="7"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=dev-libs/nss-3.16.1-r1%
+	>=dev-libs/nspr-4.10%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.6:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.16.0%
+		>=x11-libs/cairo-1.14.2%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.36%
+	)
+	!headless-awt? (
+		>=media-libs/giflib-4.1.6-r1%
+		media-libs/libpng:0/16%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.8%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=sys-devel/gcc-4.9.3[multilib?]
+	>=sys-libs/glibc-2.22[multilib?]
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+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/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v */jre/lib/*/libjavagtk.* || die
+	fi
+
+	local lib=${P}-${ABI}/jre/lib
+
+	# 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 '/' '/#')/" \
+		${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.
+		rm ${lib}/fontconfig.Gentoo.bfc || die
+		mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
+		hprefixify ${lib}/fontconfig.Gentoo.properties.src
+	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
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	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}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}