From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5AE361381F3 for ; Mon, 9 Sep 2013 22:18:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7BD8E0762; Mon, 9 Sep 2013 22:17:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62E96E0762 for ; Mon, 9 Sep 2013 22:17:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29CEB33EC2C for ; Mon, 9 Sep 2013 22:17:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5BD3CE468F for ; Mon, 9 Sep 2013 22:17:52 +0000 (UTC) From: "Tom Wijsman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tom Wijsman" Message-ID: <1378764739.b08efc617131909dcf659eda2699538ab94f7bd2.tomwij@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/icedtea/icedtea-7.2.3.12.ebuild X-VCS-Directories: dev-java/icedtea/ X-VCS-Committer: tomwij X-VCS-Committer-Name: Tom Wijsman X-VCS-Revision: b08efc617131909dcf659eda2699538ab94f7bd2 X-VCS-Branch: master Date: Mon, 9 Sep 2013 22:17:52 +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: 459f0b79-a03a-4855-99c2-b652691bb721 X-Archives-Hash: 2a123dd3b4af6b36aab9694d994a1519 commit: b08efc617131909dcf659eda2699538ab94f7bd2 Author: Tom Wijsman live com> AuthorDate: Mon Sep 9 22:12:19 2013 +0000 Commit: Tom Wijsman gentoo org> CommitDate: Mon Sep 9 22:12:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=b08efc61 Removed version 7.2.3.122 of icedtea as it is brought to the Portage tree. --- dev-java/icedtea/icedtea-7.2.3.12.ebuild | 364 ------------------------------- 1 file changed, 364 deletions(-) diff --git a/dev-java/icedtea/icedtea-7.2.3.12.ebuild b/dev-java/icedtea/icedtea-7.2.3.12.ebuild deleted file mode 100644 index 3befa19..0000000 --- a/dev-java/icedtea/icedtea-7.2.3.12.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v 1.1 2011/12/02 12:27:17 sera Exp $ -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="4" - -inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx - -ICEDTEA_VER=$(get_version_component_range 2-) -ICEDTEA_BRANCH=$(get_version_component_range 2-3) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -CORBA_TARBALL="ea108ff3be9a.tar.gz" -JAXP_TARBALL="332f0234a53e.tar.gz" -JAXWS_TARBALL="fdc4ad9f30c6.tar.gz" -JDK_TARBALL="4a0cf2c05cc6.tar.gz" -LANGTOOLS_TARBALL="6c9b532f4281.tar.gz" -OPENJDK_TARBALL="e62743867f54.tar.gz" -HOTSPOT_TARBALL="37b254871acb".tar.gz -CACAO_TARBALL="a567bcb7f589.tar.gz" -JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz" - -CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}" -JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}" -JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}" -JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}" -LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}" -OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}" -HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}" -CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}" -JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="http://icedtea.classpath.org" -SRC_URI=" - http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL} - -> ${OPENJDK_GENTOO_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL} - -> ${CORBA_GENTOO_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL} - -> ${JAXP_GENTOO_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL} - -> ${JAXWS_GENTOO_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL} - -> ${JDK_GENTOO_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL} - -> ${HOTSPOT_GENTOO_TARBALL} - http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL} - -> ${LANGTOOLS_GENTOO_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="7" -KEYWORDS="~amd64 ~ia64 ~x86" - -IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin - +nss pax_kernel pulseaudio +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=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26 - media-libs/fontconfig - >=media-libs/freetype-2.3.5 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf: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/pango-1.24.5" -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/lcms-2.5 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg - javascript? ( dev-java/rhino:1.6 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) - systemtap? ( >=dev-util/systemtap-1 )" - -# cups is needed for X. #390945 #390975 -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - X? ( - ${CUPS_COMMON_DEP} - ${X_COMMON_DEP} - media-fonts/dejavu - cjk? ( - media-fonts/arphicfonts - media-fonts/baekmuk-fonts - media-fonts/lklug - media-fonts/lohit-fonts - media-fonts/sazanami - ) - ) - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} )" - -# 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 -# 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:7 - dev-java/icedtea-bin:6 - dev-java/icedtea:7 - dev-java/icedtea:6 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - >=dev-java/ant-core-1.8.1 - dev-java/ant-nodeps - dev-lang/perl - >=dev-libs/libxslt-1.1.26 - dev-libs/openssl - virtual/pkgconfig - sys-apps/attr - sys-apps/lsb-release - ${X_DEPEND} - pax_kernel? ( sys-apps/paxctl )" - -PDEPEND="webstart? ( dev-java/icedtea-web:7 ) - nsplugin? ( dev-java/icedtea-web:7[nsplugin] )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM=" - icedtea-7 icedtea-bin-7 icedtea7 - icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin - 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 ${ICEDTEA_PKG}.tar.gz -} - -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" -} - -bootstrap_impossible() { - # Fill this according to testing what works and what not - has "${1}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6 -} - -src_configure() { - local config bootstrap use_zero zero_config - local vm=$(java-pkg_get-current-vm) - - # Whether to bootstrap - bootstrap="disable" - if use jbootstrap; then - if bootstrap_impossible "${vm}"; then - einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap" - else - bootstrap="enable" - fi - fi - - if has "${vm}" gcj-jdk; then - # gcj-jdk ensures ecj is present. - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - bootstrap="enable" - local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" - config="${config} --with-ecj-jar=${ecj_jar}" - fi - - config="${config} --${bootstrap}-bootstrap" - - # Use Zero if requested - if use zero; then - use_zero="yes"; - fi - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use JamVM as it's the only possibility right now - if ! has "${ARCH}" amd64 sparc x86 ; then - if has "${ARCH}" ppc ppc64 arm ; then - config="${config} --enable-jamvm" - else - use_zero="yes"; - fi - fi - - # Turn on Zero if needed (non-HS/JamVM archs) or requested - if test "x${use_zero}" = "xyes"; then - zero_config="--enable-zero"; - fi - - # OpenJDK-specific parallelism support. Bug #389791, #337827 - # Implementation modified from waf-utils.eclass - # Note that "-j" is converted to "-j1" as the system doesn't support --load-average - local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) - config="${config} --with-parallel-jobs=${procs}"; - einfo "Configuring using --with-parallel-jobs=${procs}" - - if use javascript ; then - config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)" - else - config="${config} --without-rhino" - fi - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \ - --with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_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=/usr/$(get_libdir)/icedtea${SLOT} \ - --disable-downloading --disable-Werror \ - $(use_enable !debug optimizations) \ - $(use_enable doc docs) \ - $(use_enable nss) \ - $(use_enable pulseaudio pulse-java) \ - $(use_enable systemtap) \ - $(use_with pax_kernel pax paxctl) \ - ${zero_config} -} - -src_compile() { - # Would use GENTOO_VM otherwise. - export ANT_RESPECT_JAVA_HOME=TRUE - - # Load the least that's needed to avoid possible classpath collisions. - export ANT_TASKS="ant-nodeps" - - 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 can't handle symlinks. - cp -vRP bin include jre lib man "${ddest}" || die - - dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README - - if use doc; then - # java-pkg_dohtml needed for package-list #302654 - java-pkg_dohtml -r ../docs/* || die - fi - - if use examples; then - dodir "${dest}/share"; - cp -vRP demo sample "${ddest}/share/" || die - fi - - if use source; then - cp src.zip "${ddest}" || die - 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 - - # OpenJDK7 should be able to use fontconfig instead, but wont hurt to - # install it anyway. 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-7.2.0:7"; then - # portage would preserve the symlink otherwise, related to bug #384397 - rm -f "${EROOT}/usr/lib/jvm/icedtea7" - elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*" - elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1" - elog "If you had icedtea7 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 -}