commit: 960f783f0efa5fe80638f8c3e64ed61ad0e16a83 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Thu Jul 30 21:44:41 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Thu Jul 30 21:44:41 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=960f783f
IcedTea 1.13.8 release: http://bitly.com/it11308 Package-Manager: portage-2.2.20 dev-java/icedtea/ChangeLog | 6 + dev-java/icedtea/Manifest | 3 + dev-java/icedtea/icedtea-6.1.13.8.ebuild | 355 +++++++++++++++++++++++++++++++ 3 files changed, 364 insertions(+) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 9b64fa0..dd74f2c 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*icedtea-6.1.13.8 (30 Jul 2015) + + 30 Jul 2015; Andrew John Hughes <[email protected]> + +icedtea-6.1.13.8.ebuild: + IcedTea 1.13.8 release: http://bitly.com/it11308 + *icedtea-7.2.5.6 (23 Jul 2015) 23 Jul 2015; Andrew John Hughes <[email protected]> diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index bdb8b49..5e76165 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -32,7 +32,10 @@ DIST icedtea-3.0-nashorn-bb36d4894aa4.tar.xz 2158376 SHA256 6932a9f964d766825952 DIST icedtea-3.0-openjdk-0503e9c58a13.tar.xz 320224 SHA256 50733aaaee4dd8df3206f63eb1a2a7ad001a58370c370da7846d3f32a44486f5 SHA512 82c01eeb012dc5e948c070d5c20476c0de8769efe419f1bb2dc8573715dcd0452fbcf06cb73838982d5724925f0676a8e6572bb4016f6e8a86bae336c5d0f88a WHIRLPOOL 4b97616b8d9cde6ccc718fd9701193d111b15e178dda7e939245b0d224ca020392ba54b05fe32685b057dea45c6c6b0407a716b648f47e5b1504f40e97373347 DIST icedtea-6.9999-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3 DIST icedtea-6.9999-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 +DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0 DIST icedtea-cacao-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 +DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4 DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234 +DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684 diff --git a/dev-java/icedtea/icedtea-6.1.13.8.ebuild b/dev-java/icedtea/icedtea-6.1.13.8.ebuild new file mode 100644 index 0000000..888ef87 --- /dev/null +++ b/dev-java/icedtea/icedtea-6.1.13.8.ebuild @@ -0,0 +1,355 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild,v 1.5 2015/07/21 22:10:28 chewi Exp $ +# Build written by Andrew John Hughes ([email protected]) + +# ********************************************************* +# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * +# ********************************************************* + +EAPI="5" + +inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx + +ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) +ICEDTEA_BRANCH=$(get_version_component_range 1-3) +OPENJDK_BUILD="36" +OPENJDK_DATE="22_jul_2015" +OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" +# Download cacao and jamvm regardless for use with EXTRA_ECONF +CACAO_TARBALL="68fe50ac34ec.tar.gz" +JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" + +CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}" +JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" + +DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" +HOMEPAGE="http://icedtea.classpath.org"; +SRC_PKG="${ICEDTEA_PKG}.tar.xz" +SRC_URI=" + http://icedtea.classpath.org/download/source/${SRC_PKG} + https://java.net/downloads/openjdk6/${OPENJDK_TARBALL} + http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} + http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" + +LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" +SLOT="6" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +RESTRICT="test" + +IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin + +nss pax_kernel pulseaudio selinux +source systemtap test zero +webstart" + +# Ideally the following were optional at build time. +ALSA_COMMON_DEP=" + >=media-libs/alsa-lib-1.0" +CUPS_COMMON_DEP=" + >=net-print/cups-1.2.12" +X_COMMON_DEP=" + >=media-libs/freetype-2.3.5:2= + >=x11-libs/gtk+-2.8:2= + >=x11-libs/libX11-1.1.3 + >=x11-libs/libXext-1.1.1 + >=x11-libs/libXi-1.1.3 + >=x11-libs/libXrender-0.9.4 + >=x11-libs/libXtst-1.0.3 + x11-libs/libXt" +X_DEPEND=" + >=x11-libs/libXau-1.0.3 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXinerama-1.0.2 + x11-proto/inputproto + >=x11-proto/xextproto-7.1.1 + x11-proto/xineramaproto + x11-proto/xproto" + +COMMON_DEP=" + >=media-libs/giflib-4.1.6:= + >=media-libs/libpng-1.2:0= + >=sys-libs/zlib-1.2.3:= + virtual/jpeg:0= + >=media-libs/lcms-2.5 + javascript? ( dev-java/rhino:1.6 ) + kerberos? ( virtual/krb5 ) + nss? ( >=dev-libs/nss-3.12.5-r1 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) + systemtap? ( >=dev-util/systemtap-1 ) + !dev-java/icedtea-web:6" + +# media-fonts/lklug needs ppc ppc64 keywords +RDEPEND="${COMMON_DEP} + !dev-java/icedtea6 + X? ( + ${X_COMMON_DEP} + media-fonts/dejavu + cjk? ( + media-fonts/arphicfonts + media-fonts/baekmuk-fonts + !ppc? ( !ppc64? ( media-fonts/lklug ) ) + media-fonts/lohit-fonts + media-fonts/sazanami + ) + ) + alsa? ( ${ALSA_COMMON_DEP} ) + cups? ( ${CUPS_COMMON_DEP} ) + selinux? ( sec-policy/selinux-java )" + +# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. +# ca-certificates, perl and openssl are used for the cacerts keystore generation +# xext headers have two variants depending on version - bug #288855 +# !eclipse-ecj-3.7 - bug #392587 +# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 +DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} + || ( + >=dev-java/gcj-jdk-4.3 + dev-java/icedtea-bin:6 + dev-java/icedtea:6 + ) + app-arch/cpio + app-arch/unzip + app-arch/zip + app-misc/ca-certificates + >=dev-java/ant-core-1.8.2 + dev-lang/perl + >=dev-libs/libxslt-1.1.26 + dev-libs/openssl + virtual/pkgconfig + sys-apps/lsb-release + ${X_DEPEND} + pax_kernel? ( sys-apps/elfix )" + +PDEPEND="webstart? ( dev-java/icedtea-web:0 ) + nsplugin? ( dev-java/icedtea-web:0[nsplugin] )" + +S="${WORKDIR}"/${ICEDTEA_PKG} + +icedtea_check_requirements() { + local CHECKREQS_DISK_BUILD + + if use doc; then + CHECKREQS_DISK_BUILD="8500M" + else + CHECKREQS_DISK_BUILD="8000M" + fi + + check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + icedtea_check_requirements +} + +pkg_setup() { + icedtea_check_requirements + + JAVA_PKG_WANT_BUILD_VM=" + icedtea-6 icedtea-bin-6 + gcj-jdk" + JAVA_PKG_WANT_SOURCE="1.5" + JAVA_PKG_WANT_TARGET="1.5" + + java-vm-2_pkg_setup + java-pkg-2_pkg_setup +} + +src_unpack() { + unpack ${SRC_PKG} +} + +java_prepare() { + # For bootstrap builds as the sandbox control file might not yet exist. + addpredict /proc/self/coredump_filter + + # icedtea doesn't like some locales. #330433 #389717 + export LANG="C" LC_ALL="C" +} + +src_configure() { + local cacao_config config hotspot_port use_cacao use_zero zero_config + local vm=$(java-pkg_get-current-vm) + + # gcj-jdk ensures ecj is present. + if use jbootstrap || has "${vm}" gcj-jdk; then + use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" + config+=" --enable-bootstrap" + else + config+=" --disable-bootstrap" + fi + + # Use Zero if requested + if use zero; then + use_zero="yes" + fi + + # Use CACAO if requested + if use cacao; then + use_cacao="yes" + fi + + # Are we on a architecture with a HotSpot port? + # In-tree JIT ports are available for amd64, arm, sparc and x86. + if { use amd64 || use arm || use sparc || use x86; }; then + hotspot_port="yes" + fi + + # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... + # Otherwise use CACAO on ppc and Zero on anything else + if test "x${hotspot_port}" != "xyes"; then + if { use ppc || use ppc64; }; then + use_cacao="yes" + else + use_zero="yes" + fi + fi + + # Turn on CACAO if needed (non-HS archs) or requested + if test "x${use_cacao}" = "xyes"; then + if test "x${hotspot_port}" = "xyes"; then + ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' + ewarn 'If so, please rebuild with USE="-cacao"' + fi + cacao_config="--enable-cacao" + fi + + # Turn on Zero if needed (non-HS/CACAO archs) or requested + if test "x${use_zero}" = "xyes"; then + zero_config="--enable-zero" + fi + + config+=" --with-parallel-jobs=$(makeopts_jobs)" + + if use javascript ; then + config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" + else + config+=" --without-rhino" + fi + + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS + + econf ${config} \ + --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \ + --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \ + --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ + --with-jdk-home="$(java-config -O)" \ + --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ + --with-pkgversion="Gentoo package ${PF}" \ + --disable-downloading --disable-Werror \ + $(use_enable !debug optimizations) \ + $(use_enable doc docs) \ + $(use_enable kerberos system-kerberos) \ + $(use_enable nss) \ + $(use_enable pulseaudio pulse-java) \ + $(use_enable systemtap) \ + $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ + ${zero_config} ${cacao_config} +} + +src_compile() { + # Would use GENTOO_VM otherwise. + export ANT_RESPECT_JAVA_HOME=TRUE + + # With ant >=1.8.2 all required tasks are part of ant-core + export ANT_TASKS="none" + + emake +} + +src_test() { + # Use Xvfb for tests + unset DISPLAY + + Xemake check +} + +src_install() { + local dest="/usr/$(get_libdir)/icedtea${SLOT}" + local ddest="${ED}${dest#/}" + dodir "${dest}" + + dodoc README NEWS AUTHORS + dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} + + cd openjdk.build/j2sdk-image || die + + # Ensures HeadlessGraphicsEnvironment is used. + if ! use X; then + rm -r jre/lib/$(get_system_arch)/xawt || die + fi + + # Don't hide classes + rm lib/ct.sym || die + + #402507 + mkdir jre/.systemPrefs || die + touch jre/.systemPrefs/.system.lock || die + touch jre/.systemPrefs/.systemRootModFile || die + + # doins doesn't preserve executable bits. + cp -vRP bin include jre lib man "${ddest}" || die + + dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README + + if use doc; then + docinto html + dodoc -r ../docs/* + fi + + if use examples; then + cp -vRP demo sample "${ddest}" || die + fi + + if use source; then + cp src.zip "${ddest}" || die + fi + + # provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool + if use webstart || use nsplugin; then + dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings + dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings + fi + if use webstart; then + dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws + dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws + fi + + # Fix the permissions. + find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die + + # Needs to be done before generating cacerts + java-vm_set-pax-markings "${ddest}" + + # We need to generate keystore - bug #273306 + einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/" + mkdir "${T}/certgen" && cd "${T}/certgen" || die + cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die + for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do + openssl x509 -text -in "${c}" >> all.crt || die + done + ./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die + cp -vRP cacerts "${ddest}/jre/lib/security/" || die + chmod 644 "${ddest}/jre/lib/security/cacerts" || die + + # Bug 390663 + cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die + eprefixify "${T}"/fontconfig.Gentoo.properties + insinto "${dest}"/jre/lib + doins "${T}"/fontconfig.Gentoo.properties + + set_java_env "${FILESDIR}/icedtea.env" + if ! use X || ! use alsa || ! use cups; then + java-vm_revdep-mask "${dest}" + fi + java-vm_sandbox-predict /proc/self/coredump_filter +} + +pkg_preinst() { + if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then + # portage would preserve the symlink otherwise, related to bug #384397 + rm -f "${EROOT}/usr/lib/jvm/icedtea6" + elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*" + elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1" + elog "If you had icedtea6 as system VM, the change should be automatic, however" + elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" + elog "and the same holds for any user VM settings. Sorry for the inconvenience." + fi +}
