commit: 2436b440b61db32787500d180cedaa482ba4aeeb Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Nov 14 22:30:49 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Nov 14 22:30:49 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2436b440
dev-java/icedtea: Version bump to 7.2.6.2 This version works with CACAO so the ~ppc keyword is restored. There are still problems with ~ppc64. :( Sorry for changing the X/awt flag again but upstream preferred the term headless, which is technically more accurate than awt, so I compromised and went with headless-awt. Package-Manager: portage-2.2.20.1 dev-java/icedtea/Manifest | 8 + dev-java/icedtea/files/7-cacao-dynmaxheap.patch | 28 +- dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild | 416 ++++++++++++++++++++++++ dev-java/icedtea/metadata.xml | 1 + 4 files changed, 439 insertions(+), 14 deletions(-) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 366d921..b405ad2 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -8,13 +8,21 @@ DIST icedtea-2.5-langtools-a6d3d79b4547.tar.bz2 1702391 SHA256 9f272f88ea0e8c090 DIST icedtea-2.5-openjdk-44f140fd2873.tar.bz2 127517 SHA256 d100158d10a47b064f700f516874c987f105e05947e580d5a143e00fb0b30fad SHA512 82bceecd1fb29b184ea45e5cfbf819b497707e041bc8d25a4ca8447e736db5f5d859dd9ad0129ba2fe300ce3d2ace18d8e528967ec43e467ef12991a860ea5d3 WHIRLPOOL e037bbbd9f85d81ce57759e68f40116db3178a43f4260806e0734fc2a1cd05f86f43cdd82aacaa8f4780e75a1ec7c7e0a7780baf722803a0a711506f0ba847f2 DIST icedtea-2.5.6.tar.xz 2034152 SHA256 bb3c7e9fd372c737849d9d3129d935174492a0d924a2801223c822426338b8c4 SHA512 773601e4fc08d9a448f6f306e5678eca6f0b5b4704cdca66a40434de6e6b8208bc826e2a63235160b6b88bd92d746f8f7d1a74cfcfc0eaa58417ac3c8cb8aeb3 WHIRLPOOL 2443d7e1387f7d4d9f5b05d85a1768c9346e394713333862e62e24585091aaab0d74f9099c8aa1bd6add5b4cd5179132c238021f1a40576c7a40de43ab170bce DIST icedtea-2.6-corba-2545636482d6.tar.bz2 1071895 SHA256 cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8 SHA512 16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12 WHIRLPOOL 98a317a85c4eed1098c7391f67e6687869337a1576bedc65ec4ddfde5885b4c514d12a5aebdac20a70970bb4c79d8b14f7bc153bf0b105b747f4e63ac79c3b79 +DIST icedtea-2.6-corba-a4d55c5cec23.tar.bz2 1072249 SHA256 92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af SHA512 819974b10fe3d0ba15e45da843b3bc908e7caafb9fe264c43026bfa1a10daecef6e4cf23bd486f89cae0d6952ef812a170cf297a934679fc6dec29ca941c4826 WHIRLPOOL 69317e8f7d426cd338a1c698251b17bd6dc27d5010288cfacc008c3029b1ababc66541c4af6c5b8c12e5755503dd50e36dc4ab173851811bc3162b7d59f55bd5 DIST icedtea-2.6-hotspot-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53 +DIST icedtea-2.6-hotspot-f40363c11191.tar.bz2 8164274 SHA256 984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a SHA512 37c80f977b22e6cab2bda5c2f579f016feb0f910bc5c7b4426f22983e74eb53c6b495681301cfd60e0773034c93ca2a60af512275cff4851a2857c2eb338b769 WHIRLPOOL 0c914f92902b982a0a85dae119d33cfd0485a025f80e0f2442c817e658341ac7bc8ab2b4e512a67aaf33027e0bf378386925f498d7400054cf80ec4efeac66b3 +DIST icedtea-2.6-jaxp-f1202fb27695.tar.bz2 2733459 SHA256 94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0 SHA512 d0aa1a744b3f5522fe2264af26766a3945d7b5e4555b229a9f837b457bafe068111fdae6ac3d7349ce8907e0b1c747a0b31a11936e4794f646b5827cca5cde0c WHIRLPOOL f447ad445ea9abc5dffd3c49da50ca1063f59bfdaedb4702bcc48a6bfe217794cc8eae16f2cdfc8fb455104f47f6cccb40dbcf959077a9d33f1d34f18901e920 DIST icedtea-2.6-jaxp-ffbe529eeac7.tar.bz2 2737160 SHA256 c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb SHA512 1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493 WHIRLPOOL e85c5840883eaef4b1ebbb2dd0bae7d82457e01b6591653ac8d2d12a045f0736cb85b4c056a33614df7bb3b63cd61cf9e7caecdb5dae5f1d6be4f7ed1456cb53 +DIST icedtea-2.6-jaxws-14c411b1183c.tar.bz2 2022452 SHA256 14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4 SHA512 3dd649f7565a449e831f14c2242e0fe9126f62380aa166bff627557774656c1604f8512ec93ec3ae243a851000b0fc014767de8ad58df8bb8892c88b8465d0e0 WHIRLPOOL 41665b394fc3ba3657e61cb3f45c43bfdce3e9c9a44f0a68ddc25bf19994c275da43c1f3b01f0fe96ff63d27901a529ff10183fa0d7c28196af3d8d08570a059 DIST icedtea-2.6-jaxws-b9776fab65b8.tar.bz2 2021243 SHA256 2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f SHA512 0d5fc0001571381d151033b4e8ca98658bed3943c34faafc73ffea2d537d44b433ad49e246fc00335828418fc6e1c40d75fd1ee2280ebf0bf4014b4551f80bb0 WHIRLPOOL f35173656c30525678a1a09a5b30ef019816ee006e7c0682c3852df7a92523eef28b936418805d6dc874a31db3d3ddd1d02938227a8ba6b9080d17239c68ff74 DIST icedtea-2.6-jdk-61d3e001dee6.tar.bz2 32421128 SHA256 a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363 SHA512 d5921683a63cca12fb73224ddd248ae37a986af1f9df131a130fb6f2f808631730298770382a90468b136c2bedb699985d129acb7e0fa2de662ab7543bcfba4c WHIRLPOOL 17d84d00f39774e08ba2934fd3e59cf5a372d0a8180576b2dbe6add617f36482cbd31f6d982e0b50b27fea54b9d35aec8552ab8d399cf7bd75047d4e55c1356d +DIST icedtea-2.6-jdk-db69ae53157a.tar.bz2 32431054 SHA256 7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1 SHA512 8107583bd87227460d030f0cab87d526e8aa097f073ccedb21eb634affc9e22ae908b722d92f9c9357d2d3f50c65a48a9f5b62cd86845dbdfd37bbc0750edff2 WHIRLPOOL 36a2cb4a23bbf14683c65c53b30dff1af9858d45a25a2bb55e4308d30d6042de3d27875c9fdc8a8a56b8fe707da437469ebbad07868061bd8ccad97853a0a66a +DIST icedtea-2.6-langtools-73356b81c5c7.tar.bz2 1710526 SHA256 a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335 SHA512 e049b6ec3abf28de05e96c882add05e87ea2edb75219e94739e4ea2e543166c9a663be43a2c2c82c95fe14b457eb675b8d1b96a4a289888941cd0b1b67b7539a WHIRLPOOL 78346964728729d3b4bdd87b9dbd30097ee6ce68f5872ea1878c288aff31a9cac25120ab485cf4c94b6a0d3a2d825893cbeee99b9021fea0601bd0c2fdbf455e DIST icedtea-2.6-langtools-9c6e1de67d7d.tar.bz2 1710699 SHA256 6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43 SHA512 38136bba4d52b8de60e9a38f6ad47253d7513e46d82830ebb8f2f8659f66f99b7e3d7c4ad31c604cc5c516f1de331f2cdaf0ab0b37cff1dfd327c25ccc0f246f WHIRLPOOL 697447e27419d265a4e3f178f665ba59ba11ae0865acb4133c3e20096501b119b10c566c3a15ab5bd8b83a96fa48de36ca7be41cab92cff73c2e269e470bf333 DIST icedtea-2.6-openjdk-39b2c4354d0a.tar.bz2 129720 SHA256 0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f SHA512 b17315b58d6662953f7a6d73eb222a5a81165f55bed2f48f3d3915a169e8c8e503b5f22c59fce5cd3202ed2392f946f8701d9cff92d235ae44696d370f2efd28 WHIRLPOOL 5f14c467228f0a96c4b2e9b67a64836d871fbbfa13daec5b77adb8b39d8db4d20d18130f548c838826d58523f1cdc7972744ddbb564d07dc0fe27f6fa456a629 +DIST icedtea-2.6-openjdk-601ca7147b8c.tar.bz2 129844 SHA256 4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49 SHA512 e3a61447569e39817e7c7ebf0a8fadaf0c708dfee2815a8f576b6d5fa91479ecf2f7fd30285b9d18c8286f3911f2ddc226d8f8da1219da8c2c80fa1fbf47607c WHIRLPOOL 8397f49988174b2027bcb3674981260d0e6651cded064baf8067820eb6dca6c12d0bceb94b86e83b856455b008a7ca517e04be5820dee4dec63a4b8397e07efd DIST icedtea-2.6.1.tar.xz 2049108 SHA256 cce4fac1e729690e986ef6f6d1c47b507f622a61da33d57d2b0a8c12e23e2068 SHA512 b465a025cd44c5395b43067042882cf272f5a9c71f06380a9bc4dedbd5e99c512161c84eaad8175aeb87d0477cd568aca4968862f02b9bd969736d2ee904b990 WHIRLPOOL 682dc4e4b14a604b1f30bf4a315ec56e91fddb72445dfe4110517e0e0dc5c4deb68565accf0600e6959febd818161078f1c65cf74a87e848c803820afce2bdb1 +DIST icedtea-2.6.2.tar.xz 2074196 SHA256 bee8565c507a484ea876b62474aec379ac0e434acb9de8213279f47e1fe22076 SHA512 30772a71b53afb5f6acfcf8e31fd8c2ce25d056669b82af0024fb3e6623e27cbcc158ab39c7157e78e11949389fe576e220d8f70f32d98456464b53d4ee2ed51 WHIRLPOOL 32028cbd37fcfc9d2f1378938e7a7d6a34d9c03295fbfa0ac7f02c9e9c32933a3668947b7fa0b260bfb73b381a5297bc3cef26657534aded62689c2d2621b99c 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-e215e36be9fc.tar.gz 4263463 SHA256 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab SHA512 2f27fbdd64d2b6ea2fa39c55bcd2344c49d02269492bd1aa1b334555bc66aa59d021bce12af60fdbf81e810fa4b8e488354025bf0f770ba4582c85592cd6c22f WHIRLPOOL 7865532185aa0a6e5c6caf8cb7affefdfb473b1c5686ada1f2e071776b4faae153c2086c2c2df9e2b2b2124b629433b849bd10f82cf8f8e3f0e7aa84b5bfebba diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch index 33b9818..edce1e8 100644 --- a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch +++ b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch @@ -1,26 +1,26 @@ # HG changeset patch # User James Le Cuirot <[email protected]> -# Date 1441543564 -3600 -# Sun Sep 06 13:46:04 2015 +0100 -# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf -# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5 +# Date 1441541110 -3600 +# Sun Sep 06 13:05:10 2015 +0100 +# Node ID 80e5553df66e3abb3680f747cbb8e32b394b4211 +# Parent 468081e3e037df27b6427aa298dfaaa20f4ba4bf Dynamically set the maximum heap size on Linux -diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp ---- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100 -+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100 -@@ -33,6 +33,10 @@ - #include <errno.h> - #include <stdlib.h> +diff -r 468081e3e037 -r 80e5553df66e src/vm/vm.cpp +--- cacao/cacao/src/vm/vm.cpp Wed Jun 10 19:52:58 2015 +0200 ++++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:05:10 2015 +0100 +@@ -32,6 +32,10 @@ + #include <stdint.h> + #include <inttypes.h> +#if defined(__LINUX__) +#include <unistd.h> +#endif + - #include "vm/types.h" + #include "md-abi.hpp" - #include "arch.h" -@@ -702,6 +706,19 @@ + #include "mm/codememory.hpp" +@@ -690,6 +694,19 @@ opt_heapstartsize = HEAP_STARTSIZE; opt_stacksize = STACK_SIZE; @@ -38,5 +38,5 @@ diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp +#endif + // First of all, parse the -XX options. + options_xx(vm_args); - #if defined(ENABLE_VMLOG) diff --git a/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild new file mode 100644 index 0000000..9aed560 --- /dev/null +++ b/dev-java/icedtea/icedtea-7.2.6.2-r1.ebuild @@ -0,0 +1,416 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +# Build written by Andrew John Hughes ([email protected]) + +# ********************************************************* +# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * +# ********************************************************* + +EAPI="5" +SLOT="7" + +inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx + +ICEDTEA_VER=$(get_version_component_range 2-4) +ICEDTEA_BRANCH=$(get_version_component_range 2-3) +ICEDTEA_PKG=icedtea-${ICEDTEA_VER} +ICEDTEA_PRE=$(get_version_component_range _) +CORBA_TARBALL="a4d55c5cec23.tar.bz2" +JAXP_TARBALL="f1202fb27695.tar.bz2" +JAXWS_TARBALL="14c411b1183c.tar.bz2" +JDK_TARBALL="db69ae53157a.tar.bz2" +LANGTOOLS_TARBALL="73356b81c5c7.tar.bz2" +OPENJDK_TARBALL="601ca7147b8c.tar.bz2" +HOTSPOT_TARBALL="f40363c11191.tar.bz2" + +CACAO_TARBALL="cacao-c182f119eaad.tar.gz" +JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.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-${CACAO_TARBALL}" +JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" + +DROP_URL="http://icedtea.classpath.org/download/drops"; +ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}" + +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} + ${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL} + ${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL} + ${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL} + ${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL} + ${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL} + ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} + ${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_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 ~arm ~ppc ~x86" +RESTRICT="test" + +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality + jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel + pulseaudio sctp selinux smartcard source +sunec test zero +webstart" + +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" +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=" + >=dev-libs/glib-2.26:2 + >=dev-util/systemtap-1 + media-libs/fontconfig + >=media-libs/freetype-2.5.3:2=[infinality?] + >=media-libs/lcms-2.5 + >=sys-libs/zlib-1.2.3:= + virtual/jpeg:0= + gtk? ( + >=dev-libs/atk-1.30.0 + >=x11-libs/cairo-1.8.8:= + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.8:2= + >=x11-libs/pango-1.24.5 + ) + javascript? ( dev-java/rhino:1.6 ) + kerberos? ( virtual/krb5 ) + nss? ( >=dev-libs/nss-3.12.5-r1 ) + sctp? ( net-misc/lksctp-tools ) + smartcard? ( sys-apps/pcsc-lite ) + sunec? ( >=dev-libs/nss-3.16.1-r1 )" + +# gsettings-desktop-schemas is needed for native proxy support. #431972 +RDEPEND="${COMMON_DEP} + !dev-java/icedtea:0 + !dev-java/icedtea-web:7 + >=gnome-base/gsettings-desktop-schemas-3.12.2 + 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} ) + !headless-awt? ( ${X_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 +DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} + || ( + >=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.2 + dev-lang/perl + >=dev-libs/libxslt-1.1.26 + dev-libs/openssl + sys-apps/attr + sys-apps/lsb-release + virtual/pkgconfig + pax_kernel? ( sys-apps/elfix )" + +PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) + nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) + pulseaudio? ( dev-java/icedtea-sound )" + +S="${WORKDIR}"/${ICEDTEA_PKG} + +icedtea_check_requirements() { + local CHECKREQS_DISK_BUILD + + if use doc; then + CHECKREQS_DISK_BUILD="9000M" + else + CHECKREQS_DISK_BUILD="8500M" + fi + + check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + icedtea_check_requirements +} + +pkg_setup() { + icedtea_check_requirements + + JAVA_PKG_WANT_BUILD_VM=" + icedtea-7 icedtea-bin-7 + 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() { + if ! use cups; then + # CUPS is always needed at build time but you can at least make it dlopen. + sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die + fi + + # 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 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, arm64, ppc64 (be&le), SPARC and x86. + if { use amd64 || use arm || use arm64 || use ppc64 || 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; 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" + + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2612 + export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch" + ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die + 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_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)" \ + --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-hotspot-tests --disable-jdk-tests \ + --enable-system-lcms --enable-system-jpeg \ + --enable-system-zlib \ + $(use_enable !headless-awt system-gif) \ + $(use_enable !headless-awt system-png) \ + $(use_enable !debug optimizations) \ + $(use_enable doc docs) \ + $(use_enable gtk system-gtk) \ + $(use_enable infinality) \ + $(use_enable kerberos system-kerberos) \ + $(use_enable nss) \ + $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ + $(use_enable sctp system-sctp) \ + $(use_enable smartcard system-pcsc) \ + $(use_enable sunec) \ + ${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() { + default + + local dest="/usr/$(get_libdir)/icedtea${SLOT}" + local ddest="${ED}${dest#/}" + + if ! use alsa; then + rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die + fi + + if use headless-awt; then + rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \ + "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die + fi + + if ! use examples; then + rm -r "${ddest}"/demo "${ddest}"/sample || die + fi + + if ! use source; then + rm -v "${ddest}"/src.zip || 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 + + # 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" + 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 + + gnome2_icon_savelist; +} + +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index 3b78fab..1deac51 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -17,6 +17,7 @@ <use> <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag> <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag> + <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> <flag name="infinality">Enable better font rendering using fontconfig.</flag> <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag> <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
