commit:     311f1544af3c25b62092f027978ae07164c7bb2d
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 09:39:33 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 09:40:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311f1544

dev-java/icedtea-bin: Version bump to 7.2.6.11 wrt bug #627682

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/icedtea-bin/Manifest                    |   6 +
 dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild | 207 +++++++++++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 56ebf03e794..442022d0067 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -10,9 +10,12 @@ DIST icedtea-bin-core-3.5.1-ppc64le.tar.xz 54240304 SHA256 
0bac113ea9e165fcf2cf5
 DIST icedtea-bin-core-3.5.1-x86.tar.xz 61349068 SHA256 
85bea3a4291b8140a1ed5d7e5585fb3fdd67c0f05dbfde41df7882e7f3f4f171 SHA512 
89bbcc3f5340894c6500179e3be8f75d9eead0480758db76133ca18ce6d216a6ede2f4ab820f56b220fd66060433d1c135fe7993339384d70cbfed0aa072ed20
 WHIRLPOOL 
6c3660bac05571c1a25e53ad20bb06d622e9286c6cd0c080c99e15b14ddba72567e8912ead3078745e2874ce0e9441bf879afd5d2fc8e10dc55fa1890ccb93e0
 DIST icedtea-bin-core-7.2.6.10-amd64.tar.xz 53414248 SHA256 
332468fbfacd89cffd6f6f7f4860bbf9a4e49446e09d4a38154cef1f018a154d SHA512 
11e2d094c3f53ffce8ddd639501d0ded25b991ede87521208da66cfe60c9d43ba1d5a0bb8b7985db5555796c1beaf931cc385a4c78910c1ddfc790322a678bc2
 WHIRLPOOL 
e6a9a4b3043c53fb07d2b39bff08e13393a5cf515f901334397a3a6409efb79b98ac752830a6d73a7fa767e46589fc28d137c8422488b7b68b0da7a180e7e507
 DIST icedtea-bin-core-7.2.6.10-x86.tar.xz 55334952 SHA256 
717ebb14e834390206578c9ed487a03f3e80e663eb7c08d39dd05785641a1332 SHA512 
4e0a8eb204d1144d9f784f0bc4de3f7ff6d84585c34c154f9f49b3bed2c2896ccbaadb016bd252c7f4d8402d4857f3541da1a953325d0bd962ff0674587c6d76
 WHIRLPOOL 
6d4f161aa8a403fd2517b390a4465c3513e470ed5ff9f8b5fdbfc659411668951dc336b972740d558f39b91234ab4e7cc764faa0ca59ee9a747685eed93422c3
+DIST icedtea-bin-core-7.2.6.11-amd64.tar.xz 53452816 SHA256 
19db272211ea35da58ecc1ad8ac6f8daf0e2834501c3cab3ca765d6d28451967 SHA512 
2801c07230c8fe041ff7b945afc67da582dc820c02ab4c948919ada7e728613a20afb86cf0f552102047c2e10738f0e16d388eebc5b3a44cb245e1eb2829ec4a
 WHIRLPOOL 
1887e66db8312c56ac92b27eda55f19f6621fbb795eb94c888be6766c10b50ca257de961eb72f93702fcee4a37188242cb474c974f23421b958be94c479bb97d
+DIST icedtea-bin-core-7.2.6.11-x86.tar.xz 55369568 SHA256 
90143af039d56edebf073c38f199dd9c2f7a0f8f22ee28cdd25d5ce5f77c094e SHA512 
90b2bd9b79bf287a6a76850e7d60f26de309b07180b8ca42709784c9ecef04e150a35760398b47967a87fb6391aea430ec22d6e7d1e7b8068e8069b27d26646c
 WHIRLPOOL 
bad37af054535d964e696d43ae99acde61228d84110350c852fff5ff97cd6fc6a70d053c4962aeb52b99c24a4b7c87625696e3c4fcb7f01c6363ae0ff5c86963
 DIST icedtea-bin-doc-3.4.0.tar.xz 11684272 SHA256 
fb6d16f81bfc1b6d8c9bbf93a07797a3b667c7e3fbf6083292cfb858b6f58056 SHA512 
06682cdb16fa7a49918f892aeb9ab6bf3fb4a4fc2b64cc555b38d38f826a70fa2451a5c549d0f1c113fc20f216d9ae3ab2fd81cd88ea79a14af94854e9ef3799
 WHIRLPOOL 
666aec67b8f1fe8d4bc2bdb0a5873ece59cebb44c480074d694365a04c40c17bc54913394fcbf6ce6257bac35e9e831217ec0806e63d9f7a66a97a480e6d4dbd
 DIST icedtea-bin-doc-3.5.1.tar.xz 11682876 SHA256 
09df364aac70225f2dc19e43c157e1283e6e76a6f813de61a1ce35be7ac87d08 SHA512 
df43658202c08e10ada2f5179c9f6eae15ffed3981b95495cc7ee7a9b4bf3b5f7957dce156451ef589edb0f0b9f50eb4faff1942263dfec665a83e75fad55caf
 WHIRLPOOL 
1563a7d4bfc21acaf576ff291a110ab9bf4280cf9c5f9e582665faa32fd87969213b98540c0ec4cdabaf64c0a94ddedc9cbe3e1d134ca59a3796d1a58b7f8015
 DIST icedtea-bin-doc-7.2.6.10.tar.xz 10614336 SHA256 
e8a79fd42c8b6341df6dfc9a5a277aaecadcfe48e214988c900d1773313a95e2 SHA512 
fa0748d0042f297527f5af11beccdad0b671225b8f258495ec93faa3f55b8669488575e53375ec71a8a8c75d17db4b26fd5980ce0381ed5ab598fb5c07c80af6
 WHIRLPOOL 
3f9f82c115869c5f849527485ef841d6b985139c3494e388a4d0a4a5c9adeba6c45aabe2da87d9717c692866a8baad0170f1059dd22d0911ba8b88e84f55f777
+DIST icedtea-bin-doc-7.2.6.11.tar.xz 10611016 SHA256 
b1d785364491a62420f8fded47a936c292e962e5b208b852c7235e1a80f69667 SHA512 
6a1d43f469b98288b138b0a0e520185d89e487c61afaadfa82afffd7b0c5c5377c2fb03ce6abfb12da22ce54eb989371d82dca5b49d561e63bd2230961c2fa17
 WHIRLPOOL 
b7482657675223cbe924e75cb428191e7dd23ab203a56ccd466c522fa0d52299aca2b12f811d27b44a4a8e2b038216184c311344d44a0499530d0c7214f518d4
 DIST icedtea-bin-examples-3.4.0-amd64.tar.xz 1856216 SHA256 
05d187bf937fb162ec828ae7fe214e739d4fb1d237320897eff5e196626c86af SHA512 
0ec78903919ad524cdd0d9458c6c2ab437d38f2487807e8854e28df04a8126a43529f22080958e90ec16d7a0d9c72d01570058b383e507b2f1a96b7b7d9578e3
 WHIRLPOOL 
8dfaed413f1f722458e3b1c5616beacebe65b9a8dbec4e892e0c3b69135a0fbc3c2af2aba19ec0a2841a15bdbab4e051275e1ef84a2c870c6e2c6e11e3be85cb
 DIST icedtea-bin-examples-3.4.0-arm.tar.xz 1840060 SHA256 
546f99327d2dc1908a057842781c91693bd92c18663e4af65ab82da929de64cf SHA512 
0bd3a13f77e69099b11c0dfee8437b43d64bee4f9ed411af523042c5a53ebff592832e5ff8973bfd9c2858789938b1cabbd230e9b6498721249315b7442a7d9e
 WHIRLPOOL 
e9096453f7d8fbde8636981aa140d7606380c05b31d8b1fa03430438f4650bc87dc51e890b8416d2fc06922a8e32f7ce32cb8ef0fdcf89dc0fc6706392904a2b
 DIST icedtea-bin-examples-3.4.0-ppc64.tar.xz 1848048 SHA256 
0fe715e84b6f405dc4a24e4c0e958b4691938c12452452747eccee3983c74967 SHA512 
89565814818b8a07db3e65b49fd1d750521018ae9acc7800184fe511e327b904fdd6d91c7d7bdf85243685719ee9981abd19d4a727c12b936d75acc57ed80f76
 WHIRLPOOL 
dd8a28b15c32c35c9bdfba9a24b6417ea984c15395de106e432b99dd2874a2aa90abd62aaf11f8ad822418ec1bf0068126c433115ee65b5e41d7fbd062538025
@@ -25,6 +28,9 @@ DIST icedtea-bin-examples-3.5.1-ppc64le.tar.xz 1845336 SHA256 
1332ae34d932fcb70c
 DIST icedtea-bin-examples-3.5.1-x86.tar.xz 1862744 SHA256 
bfe2ca3d365c83eb56f74e5f1c92ae72b82ba1b350d0a72145723aa7c2227522 SHA512 
a803c9c91401f1a85a81d49b261445121b9ee9b5858df6ee711900684421027b4543b6f789395dff30a38afc726d5cc2e5b8307ad18996cc88ef235e6f9546a5
 WHIRLPOOL 
4faf5df1382c6b4021e6bb2086c35c6192240658ca5f75fb5279431ad9bb49585f5eab0142ada0c0bce42684f145c3d01374e323d6a58d3928aa3ded0cbe06f9
 DIST icedtea-bin-examples-7.2.6.10-amd64.tar.xz 1796152 SHA256 
a50a708e234055912ef8f7374d0d9a86f5dae80efd760ce0c58fb7fb9529dd4f SHA512 
f3f2322d6c631130a21320fc4aa82f3c927ef9b877e557adc149d09794c859cd281542b71cacc761516eccf8b5b18ab9a7cd53a37b62cb591c738f5d60fb2301
 WHIRLPOOL 
f47782336d8e6c1539a210f395d7bb999a7fd473ca9ef610fbb873d901a8674aa16bf05db7596a778585cac5de45cc38eb11dd35b5ba620f655facd07df02121
 DIST icedtea-bin-examples-7.2.6.10-x86.tar.xz 1797320 SHA256 
2f4de71a29f92b54b151640620853bd71cfa7ee1bd3e4713ed745ada353801aa SHA512 
afa5e924bfff796a13e096ef94c708b9192350e86746fe9c86874db2a937add8050daddfba5a50109a6ebc226fa62f66dfc019d27e4053364bfe9249e40a87da
 WHIRLPOOL 
1f6214b2f9fd777ed10a4f5c3f0830f0f3f171d032fffb1ff281f3eea648b9b7994de31fcd7ad65d734bb45d7816819c3d3b34657d52a6b91fa4aea093904464
+DIST icedtea-bin-examples-7.2.6.11-amd64.tar.xz 1796180 SHA256 
18757fb3b88ff425340a389109487931906c9237158ce75597be8d3e125e111b SHA512 
c2f714674956cac81b24d1a929638a38fa972dd9aed1e05ae17397b58ea334053d2e5fd2800c8242c25c1f9ccddc814f4e42aa49cb82b00dca7e18b31a6f3670
 WHIRLPOOL 
72874ed26a3e0b363edc29187e94e6c9b2121c2946323639556c02050e3539ce92c10593ec797593c85224b3b9692313676741e030c068c4438b7897dad8508c
+DIST icedtea-bin-examples-7.2.6.11-x86.tar.xz 1797116 SHA256 
f2dd2bef16173d55c0865f471637475ff1a39d027cf7044f2c4dd5c251745abe SHA512 
2b91c01e2495914d0c70a6c9885246ebf7b48a9edfdb8fc0f9904db65eb3aa65ce97cec50062e39e91fc55217abccc408a4893137379e88689873907f74fd4dc
 WHIRLPOOL 
018f9b102f06f2304b66f006b3f6a17fad00daf9815140ce5dd383ab69ef2055ebb9d92ad25c3d4a5043eea0f512f25c83bc0ad6163b621c8e421698664dcba6
 DIST icedtea-bin-src-3.4.0.tar.xz 45704380 SHA256 
c5a91481c3830148041404785316a203e37cbc3f8673cc97feccff443a4d61a5 SHA512 
00cf87bbcb271202aaa08efdb3d804f92a5a8f158f998f689f0360a715485180c767fead34cbfdb8230465427227edf9c16c8779ee010301f25a7a2ad8a06c54
 WHIRLPOOL 
bf80985e409636a0d0bab7849efd48eb19ea8bfaac75663e106129c9b2f511865f3ccaac4cd2a9f2402ae70d905aad2efd6a3edab2dcd0503f423f3ba645d4b7
 DIST icedtea-bin-src-3.5.1.tar.xz 45725832 SHA256 
713c32f6d7b4a7ecd790a5749f6505ef11d4268643f254316f3d50ab38c0ff90 SHA512 
f16d760c810c48dcd3f0d152a88e4adf14631cf6e4bbf3caa61cd0aa95a82fd7c6845708077b1ec0c61e91bd35bd9ef7e24d9b8266d9902cd32588c75f84ca17
 WHIRLPOOL 
9f43f63bbf884e4b78a305c737e9cf825cd0d4583cbd95c388aa65d0c136b8cd6a98c3896633d196fbf26bbc9575adf6c7edbca0eceeb4777b423fbe465dee56
 DIST icedtea-bin-src-7.2.6.10.tar.xz 40201568 SHA256 
354b76311fb9e28857dd64c3ca4b53504f5acfaa567d424aa2b24e73b692316a SHA512 
c9310a5e776435f2192b046372f051a974e1c9b3be9265a51b344cb46ed82ff4d6cc5870f04ff7a3adb300aadbdbc7b9fda808b890a3a69d7b3ea960a7dddf54
 WHIRLPOOL 
107b64bfff32317e0439d38a5fbbc79c211048935d00abfebc541e0274123048a59b033e31b07c63156f1726ee127996f4ac0fa95fd5bf2238256bea09fd968c
+DIST icedtea-bin-src-7.2.6.11.tar.xz 40213908 SHA256 
f5bcfa36dcf9e4320b27ea66bda2e44396600a6e2ee1b4ab57483e0603b48177 SHA512 
2a1c699ea3e781d2ff81ebbb803cd06ecf1438195a6d40f04eeb8dfb03cbc4eb4934a9563f6328a7ae4ce67f6bc14aa5cd72c84948e45632d0ab92cc14f6ecc5
 WHIRLPOOL 
71d1f05099e6b1f2633624b33f34d38471a13ddca187437cdc10f08cd4abb861715903b9cc856ee1dbacdef3b54eb8bb83df36f3ca2e27cea9b0a88dee2e691e

diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild 
b/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
new file mode 100644
index 00000000000..44b3528e267
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.11.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~x86"
+
+inherit java-vm-2 multilib-build prefix toolchain-funcs
+
+abi_uri() {
+       echo "${2-$1}? (
+                       ${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
+                       examples? ( 
${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
+               )"
+}
+
+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 ) ) )
+       $(abi_uri amd64)
+       $(abi_uri x86)"
+
+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%
+       >=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:0/7%
+               =media-libs/libpng-1.6*%
+               >=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%
+       )
+       nss? (
+               >=dev-libs/nss-3.16.1-r1%
+               >=dev-libs/nspr-4.10%
+       )"
+
+# 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-5.4.0[multilib?]
+       >=sys-libs/glibc-2.23[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() {
+       default
+
+       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
+
+       # The nss flag in the icedtea package just (un)comments 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
+               hprefixify ${lib}/fontconfig.Gentoo.properties.src
+               mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
+       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
+}

Reply via email to