From 1c0dad8e871b6ea752f6bc0a57c0ba85feceab41 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Mon, 14 May 2012 16:27:04 +0000 Subject: Version bump. Package-Manager: portage-2.1.10.58/cvs/Linux x86_64 --- dev-java/icedtea/ChangeLog | 7 +- dev-java/icedtea/Manifest | 18 +- dev-java/icedtea/icedtea-6.1.11.2.ebuild | 316 +++++++++++++++++++++++++++++++ 3 files changed, 339 insertions(+), 2 deletions(-) create mode 100644 dev-java/icedtea/icedtea-6.1.11.2.ebuild (limited to 'dev-java/icedtea') diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index d80957461b55..8d0367dcc553 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.72 2012/05/03 07:42:50 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.73 2012/05/14 16:27:04 sera Exp $ + +*icedtea-6.1.11.2 (14 May 2012) + + 14 May 2012; Ralph Sennhauser +icedtea-6.1.11.2.ebuild: + Version bump. 03 May 2012; Jeff Horelick icedtea-6.1.10.6.ebuild, icedtea-6.1.11.1.ebuild, icedtea-7.2.0.1.ebuild, icedtea-7.2.1.ebuild: diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index e9c7d489a38a..c74b405e7b99 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX fontconfig.Gentoo.properties.src 15602 RMD160 d5ae1cb403072b630c126a908d14b5b462e1514f SHA1 04af30bfae3decf6fdb51187a07bf75fb04a83f0 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 AUX icedtea-6.1.11.1-cacao_jvm.cfg.patch 5157 RMD160 37035f173e95b407896379f466d13b4edf74f822 SHA1 0e2e89f97a338cb62f6cff0c68f6a703253ce26e SHA256 2e62441cd0e19adc515cda23e726a5b533ef1b7efbf860490e55d535f0de34a8 @@ -26,6 +29,7 @@ DIST icedtea-2.0.1.tar.gz 4516686 RMD160 1689c4a1106db57514804a67d3dbc2fbcf19efd DIST icedtea-2.1.tar.gz 4687722 RMD160 94de5eb942e3ee68dbfcb6d9f6b7992f462e473f SHA1 707fc67bb404e38d36f877bf59055950f3e26066 SHA256 8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6 DIST icedtea6-1.10.6.tar.gz 6844249 RMD160 4d2c3943071e5e444afcc9e833b42fd3f17d5a07 SHA1 4833760551c8eac347df96676996834c918e1554 SHA256 4bdd8ff2e6a93455425eeabd6c073137bf3816ad16ce6e89979ec1521e03c7f1 DIST icedtea6-1.11.1.tar.gz 6344427 RMD160 fdcaba8fced7ecd30b17ca351424610e254ff735 SHA1 24c8a6e3f641b626349b8d199880b0a79213a814 SHA256 bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c +DIST icedtea6-1.11.2.tar.gz 6387625 RMD160 299ce2b420e5e6a4e3fd4d59b06b7e0ecf414c26 SHA1 ba3f48aa1569babde049220b3b23bfc49b7f8e71 SHA256 078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5 DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 RMD160 42b79f51a4f7210436f8dc381e8cc7a8fc356822 SHA1 58965961cf1b928c675fc47599a548c084e39063 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186 @@ -37,7 +41,19 @@ DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb8 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 RMD160 d0e21619c3f287b821da114b986336e106cba16c SHA1 5d6fe1e3ef84d6699bff18eabf109e63d6c0a1c3 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 EBUILD icedtea-6.1.10.6.ebuild 10469 RMD160 c8efc9d2bae44803d626862beb7150876817a869 SHA1 7a0054cc305a2dd5301ca18326b8998aa193e8d6 SHA256 7fe885605ca43891b18c572feaf481566c3c947151b1f4b12ccf279c402e7abe EBUILD icedtea-6.1.11.1.ebuild 10081 RMD160 5147993a3fc1e6041db2fe2b47e703ddb743affa SHA1 a3129b32fff2d1f1d31a123f7932d2ad8baaa82d SHA256 56d3b2e3865fec52bc8dea63a9352e6d99baea5e7bce3f724db0fd5d92fbc20b +EBUILD icedtea-6.1.11.2.ebuild 9965 RMD160 7f6708399f88ef3f466771b51d3b5f2fdcfa4416 SHA1 24c82e8fb2e0466a61df24629f63d63bd3afe50f SHA256 33c05dcaa376bcd598eccd3d942f98b854d2c1e8d95c56629b8f282387729366 EBUILD icedtea-7.2.0.1.ebuild 10626 RMD160 614163a25b86e1c8db0c884a9da722aced12d9f4 SHA1 bf08d1cfe78746a6937414a0418fb3f7ec7c2d43 SHA256 54de77141237937f30d6d89d28ad8c538ae4a93b7559669e8db27ea1f11d6ca7 EBUILD icedtea-7.2.1.ebuild 10768 RMD160 fb68994569b8beae51acf3bf9c71a86ca3ddac17 SHA1 d3006641de4f5fc7371322d6b5cc28ef23667ea7 SHA256 8dce1934db92cf728673fcfb12462e1e2852c9e5209d286b3bb80d32f551c364 -MISC ChangeLog 15756 RMD160 d5388b0e63485e91eeb9fd79b4ead7d4d7b2a72e SHA1 518ee5e89519f4d9b75cfd82a5bd895165e28301 SHA256 565184adb555050cf68505427f58ef124fba0e9e02e2151610c1765bb08d4e53 +MISC ChangeLog 15880 RMD160 72a2b6e4714d97e0fcd040fb674f50fde735d25a SHA1 83b87ea940bd2255c07f069160a423cde3b56b15 SHA256 f6235bf527c2f3ca8ba1eee5374b168d68d1cea3ff975ff63f78cfc31a315598 MISC metadata.xml 1453 RMD160 bb30b34303c3e053daa495840f1934b48c5a0013 SHA1 4f37b16a61ba1a6561ae8cfbda83ccd7f7f9444f SHA256 a4ef5cb3d610bb00db36e324edbc1df3b7f4f2794c80c9cfb4304239497622fe +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQEcBAEBAgAGBQJPsTJpAAoJEIUJ+svaV163zQkH+gNzob1zLqkmE11+xJi6q+Vv +Cneral0brN8R0EEJ3YfM81kwUIjLkabg01KovA/wZJ9Nll/HApIcwjH7gYxQMP+h +JBW4b4g1ZOxSo98hmXWODd0sB+0/cXIBAxr7gEGZtRCYotP/RpPiwfcTHrOb8XgX +IvcPILZ+NmfW56LfPjAPELmM7spA2yYh1A2CPXJFWI94LcWXk7jGt2JoB4JInfXT +2Ko8/AdKgMzCrUfhDZwh8wtHPYd+eYRxZnNKJ+SDTfIaQFjW4BtJrQGMGaWqBwAK +IL0G9zLVEFG63EAjfwtmcl7Z8OPRsGmVONeT2yW5tkUhLTvmiUhbDmPwbxx1hbs= +=IfNx +-----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-6.1.11.2.ebuild b/dev-java/icedtea/icedtea-6.1.11.2.ebuild new file mode 100644 index 000000000000..d5e806fe3d9e --- /dev/null +++ b/dev-java/icedtea/icedtea-6.1.11.2.ebuild @@ -0,0 +1,316 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.2.ebuild,v 1.1 2012/05/14 16:27:04 sera Exp $ +# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) + +# ********************************************************* +# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * +# ********************************************************* + +EAPI="4" + +inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx + +ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) +OPENJDK_BUILD="24" +OPENJDK_DATE="14_nov_2011" +OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" +JAXP_TARBALL="jaxp144_03.zip" +JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip" +JAF_TARBALL="jdk6-jaf-b20.zip" +CACAO_TARBALL="cff92704c4e0.tar.gz" + +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://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL} + http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL} + http://icedtea.classpath.org/download/drops/${JAF_TARBALL} + http://icedtea.classpath.org/download/drops/${JAXP_TARBALL} + !amd64? ( !sparc? ( !x86? ( + http://icedtea.classpath.org/download/drops/cacao/${CACAO_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 ~ia64 ~ppc ~ppc64 ~x86" + +IUSE="+X +alsa cjk +cups debug doc examples javascript +jbootstrap +nsplugin + +nss pax_kernel pulseaudio +source systemtap test +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/glib + >=media-libs/freetype-2.3.5 + >=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" +X_DEPEND=" + >=x11-libs/libXau-1.0.3 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXinerama-1.0.2 + >=x11-libs/libXp-1.0.0 + 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 + >=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 )" + +# 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} )" + +# 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.1 + dev-java/ant-nodeps + dev-lang/perl + >=dev-libs/libxslt-1.1.26 + dev-libs/openssl + virtual/pkgconfig + sys-apps/lsb-release + ${X_DEPEND} + jbootstrap? ( + || ( > 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 +} + +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 +} -- cgit v1.2.3-65-gdbad