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 A5EB4139A83 for ; Wed, 9 Sep 2015 21:34:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1068021C03C; Wed, 9 Sep 2015 21:34:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AAF721C03C for ; Wed, 9 Sep 2015 21:34:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 413CC340906 for ; Wed, 9 Sep 2015 21:34:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 440CE19 for ; Wed, 9 Sep 2015 21:34:18 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1441834427.a9709359417616ede15e6325ad4f020ffd2684ef.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/icedtea/Manifest dev-java/icedtea/icedtea-6.9999.ebuild dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild dev-java/icedtea/metadata.xml X-VCS-Directories: dev-java/icedtea/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: a9709359417616ede15e6325ad4f020ffd2684ef X-VCS-Branch: master Date: Wed, 9 Sep 2015 21:34:18 +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: 7883fc27-aabc-4dfa-b74b-4a0cefbc0613 X-Archives-Hash: e047566d3b967b9f9cf84c0c9e857fab commit: a9709359417616ede15e6325ad4f020ffd2684ef Author: James Le Cuirot gentoo org> AuthorDate: Wed Sep 9 21:33:47 2015 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Wed Sep 9 21:33:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=a9709359 dev-java/icedtea: Sync 6 and 7 changes from the tree Sorry it took so long! The checksums are all wrong now but that's not my fault. :) I'll come back to icedtea-3 later. Package-Manager: portage-2.2.20.1 dev-java/icedtea/Manifest | 2 +- dev-java/icedtea/icedtea-6.9999.ebuild | 70 ++++++------ dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild | 146 ++++++++++++-------------- dev-java/icedtea/metadata.xml | 8 +- 4 files changed, 102 insertions(+), 124 deletions(-) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 45b8090..7e1427d 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -15,7 +15,7 @@ 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-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-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 openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234 diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild index bbf1dd8..8f52b8f 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.9999.ebuild @@ -36,8 +36,9 @@ SLOT="6" KEYWORDS="" 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" +IUSE="+alsa +awt cacao cjk +cups debug doc examples +gtk 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=" @@ -45,8 +46,8 @@ ALSA_COMMON_DEP=" 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= + >=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 @@ -63,42 +64,37 @@ X_DEPEND=" x11-proto/xproto" COMMON_DEP=" - >=media-libs/giflib-4.1.6:= - >=media-libs/libpng-1.2:0= + >=media-libs/freetype-2.3.5:2= + >=media-libs/lcms-2.5 >=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" + 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 - ) - ) + !dev-java/icedtea-web:6 + media-fonts/dejavu alsa? ( ${ALSA_COMMON_DEP} ) + awt? ( ${X_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 ) 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} +DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 @@ -112,9 +108,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl - virtual/pkgconfig sys-apps/lsb-release - ${X_DEPEND} + virtual/pkgconfig pax_kernel? ( sys-apps/elfix )" PDEPEND="webstart? ( dev-java/icedtea-web:0 ) @@ -235,13 +230,15 @@ src_configure() { --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ --with-pkgversion="Gentoo package ${PF}" \ --disable-downloading --disable-Werror \ + $(use_enable awt system-gif) \ + $(use_enable 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 pulseaudio pulse-java) \ $(use_enable systemtap) \ - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ ${zero_config} ${cacao_config} } @@ -272,9 +269,13 @@ src_install() { cd openjdk.build/j2sdk-image || die - # Ensures HeadlessGraphicsEnvironment is used. - if ! use X; then - rm -r jre/lib/$(get_system_arch)/xawt || die + if ! use alsa; then + rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die + fi + + if ! use awt ; then + rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \ + {,jre/}bin/policytool bin/appletviewer || die fi # Don't hide classes @@ -330,16 +331,7 @@ src_install() { 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 } diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild index 3f2c9c9..bbb7b41 100644 --- a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild +++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild @@ -24,7 +24,7 @@ LANGTOOLS_TARBALL="bc95d2472055.tar.bz2" OPENJDK_TARBALL="dbfa75121aca.tar.bz2" HOTSPOT_TARBALL="94f15794d5e7.tar.bz2" -CACAO_TARBALL="e215e36be9fc.tar.gz" +CACAO_TARBALL="cacao-c182f119eaad.tar.gz" JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}" @@ -35,7 +35,7 @@ LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBAL OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}" HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}" -CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}" +CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}" JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" DROP_URL="http://icedtea.classpath.org/download/drops" @@ -60,8 +60,11 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M KEYWORDS="" RESTRICT="test" -IUSE="+X +alsa cacao cjk +cups debug doc examples infinality jamvm javascript +jbootstrap kerberos +nsplugin - nss pax_kernel pulseaudio sctp selinux smartcard +source +sunec test zero +webstart" +IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality + jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel + pulseaudio sctp selinux smartcard source +sunec test zero +webstart" + +REQUIRED_USE="gtk? ( awt )" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -69,20 +72,14 @@ ALSA_COMMON_DEP=" CUPS_COMMON_DEP=" >=net-print/cups-1.2.12" X_COMMON_DEP=" - >=dev-libs/atk-1.30.0 - >=dev-libs/glib-2.26:2 - media-libs/fontconfig - >=media-libs/freetype-2.5.3:2=[infinality?] - >=x11-libs/cairo-1.8.8:= - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2= + >=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/pango-1.24.5" + x11-libs/libXt" X_DEPEND=" >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 @@ -93,46 +90,48 @@ X_DEPEND=" x11-proto/xproto" COMMON_DEP=" - >=media-libs/giflib-4.1.6:= + >=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 - >=media-libs/libpng-1.2:0= >=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 ) - nss? ( >=dev-libs/nss-3.12.5-r1 ) kerberos? ( virtual/krb5 ) - >=dev-util/systemtap-1 - smartcard? ( sys-apps/pcsc-lite ) - sunec? ( >=dev-libs/nss-3.16.1-r1 ) + nss? ( >=dev-libs/nss-3.12.5-r1 ) sctp? ( net-misc/lksctp-tools ) - !dev-java/icedtea-web:7" + smartcard? ( sys-apps/pcsc-lite ) + sunec? ( >=dev-libs/nss-3.16.1-r1 )" -# cups is needed for X. #390945 #390975 # gsettings-desktop-schemas is needed for native proxy support. #431972 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 - ) - ) + !dev-java/icedtea-web:7 + >=gnome-base/gsettings-desktop-schemas-3.12.2 + media-fonts/dejavu alsa? ( ${ALSA_COMMON_DEP} ) + awt? ( ${X_COMMON_DEP} ) + cjk? ( + media-fonts/arphicfonts + media-fonts/baekmuk-fonts + media-fonts/lklug + media-fonts/lohit-fonts + media-fonts/sazanami + ) cups? ( ${CUPS_COMMON_DEP} ) - selinux? ( sec-policy/selinux-java ) - >=gnome-base/gsettings-desktop-schemas-3.12.2" + 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 -# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} +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 @@ -148,10 +147,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl - virtual/pkgconfig sys-apps/attr sys-apps/lsb-release - ${X_DEPEND} + virtual/pkgconfig pax_kernel? ( sys-apps/elfix )" PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) @@ -205,7 +203,7 @@ java_prepare() { } src_configure() { - local cacao_config config hotspot_port jamvm_config use_jamvm use_zero zero_config + 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. @@ -295,21 +293,26 @@ src_configure() { --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-gif \ - --enable-system-jpeg --enable-system-png \ + --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib \ + $(use_enable awt system-gif) \ + $(use_enable awt system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ - $(use_enable nss) \ + $(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 smartcard system-pcsc) \ $(use_enable sctp system-sctp) \ + $(use_enable smartcard system-pcsc) \ $(use_enable sunec) \ - $(use_enable infinality) \ ${zero_config} ${cacao_config} ${jamvm_config} } @@ -331,44 +334,26 @@ src_test() { } src_install() { + default + 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 + if ! use alsa; then + rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || 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/* + if ! use 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 - cp -vRP demo sample "${ddest}" || die + if ! use examples; then + rm -r "${ddest}"/demo "${ddest}"/sample || die fi - if use source; then - cp src.zip "${ddest}" || die + 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 @@ -384,9 +369,6 @@ src_install() { # 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 @@ -406,9 +388,6 @@ src_install() { 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 } @@ -422,4 +401,9 @@ pkg_preinst() { 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 4f0e668..3b78fab 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -2,18 +2,20 @@ java +proxy-maintainers gnu_andrew@member.fsf.org Andrew John Hughes Proxy Maintainer - caster@gentoo.org - Vlastimil Babka - Committer (CC me) + chewi@gentoo.org + James Le Cuirot + Committer The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. + Install non-headless AWT libraries, needed by some GUIs (used to be X flag) Use the CACAO virtual machine rather than HotSpot. Enable better font rendering using fontconfig. Use the JamVM virtual machine rather than HotSpot.