From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05AF0139694 for ; Tue, 14 Feb 2017 04:50:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDB97E0C4E; Tue, 14 Feb 2017 04:50:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92F10E0C4E for ; Tue, 14 Feb 2017 04:50:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46A6B34106E for ; Tue, 14 Feb 2017 04:50:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E017472A for ; Tue, 14 Feb 2017 04:50:22 +0000 (UTC) From: "Andrew John Hughes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew John Hughes" Message-ID: <1487047739.38a5dc631b5d3db29e2ec9f1dc3b84a366e916cf.gnu_andrew@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/icedtea/ChangeLog dev-java/icedtea/Manifest dev-java/icedtea/icedtea-6.1.13.13.ebuild dev-java/icedtea/icedtea-6.9999.ebuild X-VCS-Directories: dev-java/icedtea/ X-VCS-Committer: gnu_andrew X-VCS-Committer-Name: Andrew John Hughes X-VCS-Revision: 38a5dc631b5d3db29e2ec9f1dc3b84a366e916cf X-VCS-Branch: master Date: Tue, 14 Feb 2017 04:50:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ae576f4b-e4f6-474d-9076-d9bf539cabea X-Archives-Hash: befe6577746a705e8014cfc332621341 commit: 38a5dc631b5d3db29e2ec9f1dc3b84a366e916cf Author: Andrew John Hughes member fsf org> AuthorDate: Tue Feb 14 04:48:59 2017 +0000 Commit: Andrew John Hughes member fsf org> CommitDate: Tue Feb 14 04:48:59 2017 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=38a5dc63 dev-java/icedtea: Remove unsupported IcedTea 1.x ebuilds. Package-Manager: portage-2.3.2 dev-java/icedtea/ChangeLog | 4 + dev-java/icedtea/Manifest | 3 - dev-java/icedtea/icedtea-6.1.13.13.ebuild | 364 ----------------------------- dev-java/icedtea/icedtea-6.9999.ebuild | 366 ------------------------------ 4 files changed, 4 insertions(+), 733 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 2d2bea86..c54b9c67 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Feb 2017; Andrew John Hughes + -icedtea-6.1.13.13.ebuild, -icedtea-6.9999.ebuild: + dev-java/icedtea: Remove unsupported IcedTea 1.x ebuilds. + *icedtea-7.2.6.9 (14 Feb 2017) 14 Feb 2017; Andrew John Hughes diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 5c8de620..e30f38ab 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -32,9 +32,6 @@ DIST icedtea-3.4-langtools-d10a13bdc98c.tar.xz 2070432 SHA256 1b0b0fb49c81955573 DIST icedtea-3.4-nashorn-8c0fe384c4e7.tar.xz 2229336 SHA256 0ec045c9c4506f63602d86e72b0c3fdccd75fa95c47ee6a1238639274dc8e92d SHA512 c0aec36e921288b6ad11e71daa32111a4ee45302a2bbe407229cc143f05869372993f7b0dd366c07ecb31fac47e1d3cdb0c59cc1a48375d3719656c2159fee95 WHIRLPOOL 0e9421c077d617f2c67a67e590ad8e8322ebf33559a1f127efbcfaa1e30f3437bb8749d656fca211f4f848fcd98ebc5f41449a39499a9dadc64990d45fe000cd DIST icedtea-3.4-openjdk-d5760f7cce54.tar.xz 337064 SHA256 887c5bc24b068efced7d5209367149ca27d8fea330cd5a5fff7767c353b00921 SHA512 d98790823408e09f3fa9946ceeeda48187dddd3302625fc546d64a4ecc89967235c550af23c05368a90d8dd2ceb38c092cd3130958132d18d30692342bd1151e WHIRLPOOL e5477deaf846a1c78fba313ab6f5fdc2b053fccdad8d096d1e29eebfa33da2196243d6d77818d7d8fe78a69208578ba3ea42c6a683bf52208be81ea67dae7bd0 DIST icedtea-3.4-shenandoah-d9a978177779.tar.xz 6866276 SHA256 0593a1105f0e1e59ec05298d608a2fa5d610a0e548e849ab013119f3b7a67229 SHA512 df658cea99bb306962fe393d6babc4e69b363f0e03d64ac90ef4ce8c14faec723cb6d338598e7b6739139f9e9aa447e3463fd9ab773fad95b5c5266955f5c53f WHIRLPOOL 8e0681fb8e843f6d05a0e82883c574574676689fcb9876fadb712c0ee64bcf6b29f4240b156e57a3e9548e0600b8218e2f1e86418ae993b02ed6f192d323ef22 -DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 -DIST icedtea6-1.13.13.tar.xz 4536860 SHA256 4fcfd0a4114f7b116e7a429894819b40bd43ee0935b90fd83978e1e3c8d2e92d SHA512 51e8c444fdcb5c14546b9e83d4c2173cbdf14ecaf5ac516a4a265f38282ebf47121e4f5afcab177225362dad58af35738eb37e1060d09d14918a0a92c0badd70 WHIRLPOOL d2f39a11722c861391a179cbbc517a9dfc8e00ecf407455d32f2abd6a9fdd7ffb822f511eadc22132c13a9c4c195be1ee17b8fd49bc59e7c3dde2f0c5ce40eaf -DIST openjdk-6-src-b41-04_jan_2017.tar.xz 34402516 SHA256 8e34d451cec65fae8b4304651058ed4dc8d07bd45baa2f49780009097afc1a15 SHA512 263524e877b9398b8c67476cc527135939a62b74cf90f5f96bd8390e27943fa4ee99c95550e909433b7fe8a5c1f09208eae406514761cebc9bba6cf142d5ea0a WHIRLPOOL 3f40b603193d1764fd37336a4cf4a25c2be7ea2f59b151786369c182af4a296033535393e4f67ec3c5900c18540f3bdeeebfe9d6e20db821fc9f2a588e97ecc8 diff --git a/dev-java/icedtea/icedtea-6.1.13.13.ebuild b/dev-java/icedtea/icedtea-6.1.13.13.ebuild deleted file mode 100644 index 3e24b6c3..00000000 --- a/dev-java/icedtea/icedtea-6.1.13.13.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="6" -SLOT="6" - -inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx - -ICEDTEA_VER=$(get_version_component_range 2-4) -ICEDTEA_BRANCH=$(get_version_component_range 2-3) -ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER} -OPENJDK_BUILD="41" -OPENJDK_DATE="04_jan_2017" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" -# Download cacao and jamvm regardless for use with EXTRA_ECONF -CACAO_TARBALL="cacao-68fe50ac34ec.tar.gz" -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" - -CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}" -JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" - -DROP_URL="http://icedtea.classpath.org/download/drops" - -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} - ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} - ${DROP_URL}/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" -KEYWORDS="~amd64" -RESTRICT="test" - -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt - jamvm javascript +jbootstrap kerberos libressl nsplugin +nss pax_kernel - pulseaudio selinux smartcard source systemtap test +webstart zero" - -REQUIRED_USE="gtk? ( !headless-awt )" - -# 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/giflib-4.1.6:= - >=media-libs/libpng-1.2:0= - >=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 - x11-libs/libXcomposite" -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=" - app-misc/mime-types - >=media-libs/freetype-2.3.5:2= - >=media-libs/lcms-2.5 - >=sys-libs/zlib-1.2.3:= - virtual/jpeg:0= - javascript? ( dev-java/rhino:1.6 ) - kerberos? ( virtual/krb5 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - systemtap? ( >=dev-util/systemtap-1 )" - -RDEPEND="${COMMON_DEP} - !dev-java/icedtea6 - !dev-java/icedtea-web:6 - media-fonts/dejavu - alsa? ( ${ALSA_COMMON_DEP} ) - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - cups? ( ${CUPS_COMMON_DEP} ) - gtk? ( >=x11-libs/gtk+-2.8:2 ) - !headless-awt? ( ${X_COMMON_DEP} ) - selinux? ( sec-policy/selinux-java ) - smartcard? ( sys-apps/pcsc-lite )" - -# 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 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} - || ( - >=dev-java/gcj-jdk-4.3 - 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 - !libressl? ( dev-libs/openssl ) - libressl? ( dev-libs/libressl ) - sys-apps/lsb-release - virtual/pkgconfig - pax_kernel? ( sys-apps/elfix )" - -PDEPEND="webstart? ( dev-java/icedtea-web:0 ) - nsplugin? ( dev-java/icedtea-web:0[nsplugin] ) - pulseaudio? ( dev-java/icedtea-sound )" - -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 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} -} - -src_configure() { - # 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" - - local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm 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 JamVM if requested - if use jamvm; then - use_jamvm="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 JamVM if needed (non-HS archs) or requested - if test "x${use_jamvm}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-jamvm"' - fi - jamvm_config="--enable-jamvm" - 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 - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.' - fi - 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}" \ - --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ - --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --with-pkgversion="Gentoo ${PF}" \ - --disable-downloading --disable-Werror --disable-tests \ - --enable-system-lcms --enable-system-jpeg \ - --enable-system-zlib --disable-pulse-java --disable-systemtap-tests\ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable kerberos system-kerberos) \ - $(use_enable nss) \ - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ - $(use_enable systemtap) \ - ${zero_config} ${cacao_config} ${jamvm_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 - - cd openjdk.build/j2sdk-image || die - - if ! use alsa; then - rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die - fi - - if use headless-awt ; then - rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \ - {,jre/}bin/policytool bin/appletviewer || 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 - - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - - # 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 - - java-vm_install-env "${FILESDIR}/icedtea.env.sh" - 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 -} diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild deleted file mode 100644 index 8112b14f..00000000 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ /dev/null @@ -1,366 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * -# ********************************************************* - -EAPI="6" -SLOT="6" - -inherit autotools check-reqs java-pkg-2 java-vm-2 mercurial multiprocessing pax-utils prefix versionator virtualx - -ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) -ICEDTEA_BRANCH=$(get_version_component_range 1-3) -OPENJDK_BUILD="41" -OPENJDK_DATE="04_jan_2017" -OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" -# Download cacao and jamvm regardless for use with EXTRA_ECONF -CACAO_TARBALL="cacao-68fe50ac34ec.tar.gz" -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" - -CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}" -JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" - -DROP_URL="http://icedtea.classpath.org/download/drops" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - https://java.net/downloads/openjdk6/${OPENJDK_TARBALL} - ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} - ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" -EHG_REPO_URI="http://icedtea.classpath.org/hg/icedtea6" - -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" -KEYWORDS="" - -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt - jamvm javascript +jbootstrap kerberos libressl nsplugin +nss pax_kernel - pulseaudio selinux smartcard source systemtap test +webstart zero" - -REQUIRED_USE="gtk? ( !headless-awt )" - -# 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/giflib-4.1.6:= - >=media-libs/libpng-1.2:0= - >=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 - x11-libs/libXcomposite" -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=" - app-misc/mime-types - >=media-libs/freetype-2.3.5:2= - >=media-libs/lcms-2.5 - >=sys-libs/zlib-1.2.3:= - virtual/jpeg:0= - javascript? ( dev-java/rhino:1.6 ) - kerberos? ( virtual/krb5 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - systemtap? ( >=dev-util/systemtap-1 )" - -RDEPEND="${COMMON_DEP} - !dev-java/icedtea6 - !dev-java/icedtea-web:6 - media-fonts/dejavu - alsa? ( ${ALSA_COMMON_DEP} ) - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - cups? ( ${CUPS_COMMON_DEP} ) - gtk? ( >=x11-libs/gtk+-2.8:2 ) - !headless-awt? ( ${X_COMMON_DEP} ) - selinux? ( sec-policy/selinux-java ) - smartcard? ( sys-apps/pcsc-lite )" - -# 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 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} - || ( - >=dev-java/gcj-jdk-4.3 - 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 - !libressl? ( dev-libs/openssl ) - libressl? ( dev-libs/libressl ) - sys-apps/lsb-release - virtual/pkgconfig - pax_kernel? ( sys-apps/elfix )" - -PDEPEND="webstart? ( dev-java/icedtea-web:0 ) - nsplugin? ( dev-java/icedtea-web:0[nsplugin] ) - pulseaudio? ( dev-java/icedtea-sound )" - -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 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() { - mercurial_src_unpack -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # 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" - - local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm 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 JamVM if requested - if use jamvm; then - use_jamvm="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 JamVM if needed (non-HS archs) or requested - if test "x${use_jamvm}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-jamvm"' - fi - jamvm_config="--enable-jamvm" - 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 - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.' - fi - 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}" \ - --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ - --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --with-pkgversion="Gentoo ${PF}" \ - --disable-downloading --disable-Werror --disable-tests \ - --enable-system-lcms --enable-system-jpeg \ - --enable-system-zlib --disable-pulse-java --disable-systemtap-tests\ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable kerberos system-kerberos) \ - $(use_enable nss) \ - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ - $(use_enable systemtap) \ - ${zero_config} ${cacao_config} ${jamvm_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 - - cd openjdk.build/j2sdk-image || die - - if ! use alsa; then - rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die - fi - - if use headless-awt ; then - rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \ - {,jre/}bin/policytool bin/appletviewer || 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 - - dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT} - - # 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 - - java-vm_install-env "${FILESDIR}/icedtea.env.sh" - 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 -}