From 580f05ea8f512d11e23e8da80177d27835cbdbbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Jan 2020 18:41:30 +0000 Subject: gentoo resync : 22.02.2020 --- dev-java/openjdk/Manifest | 14 +- dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild | 262 -------------------------- dev-java/openjdk/openjdk-11.0.4_p11.ebuild | 269 --------------------------- dev-java/openjdk/openjdk-11.0.5_p10.ebuild | 6 +- dev-java/openjdk/openjdk-8.222_p10.ebuild | 4 +- dev-java/openjdk/openjdk-8.232_p09.ebuild | 4 +- dev-java/openjdk/openjdk-8.242.ebuild | 4 +- 7 files changed, 15 insertions(+), 548 deletions(-) delete mode 100644 dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild delete mode 100644 dev-java/openjdk/openjdk-11.0.4_p11.ebuild (limited to 'dev-java/openjdk') diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 1ad7923a9f51..928ec4e19725 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,9 +1,8 @@ AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd -DIST jdk-11.0.3+7.tar.bz2 90300528 BLAKE2B db566140028ddbf9f6e10eaaac018ddf3ad13a954500c73abde8aec5c673c375f2cf0e56bc75c410a4ff90e6cb8e9c4580bb5719786e34865f00a92bd3ea8431 SHA512 46c1c13165e7d5ef480052810ccdc1b5d55f6b2b542e10303d3940536df7f17bf3d8a0cf774e73dc25af7cd69432790656a03c66d2df9efaf71cb9e44c2da684 -DIST jdk-11.0.4+11.tar.bz2 90420043 BLAKE2B 28e7ea146a14ed4629a42c69721a9d53a1c7d6a0346d96bedf15c7f3472d39b0b1d303ceb0c80dd226ba21236588a3c1222446bf98492235f9c18ca870eae26a SHA512 5211aa3d8b1215574b75137a6645ec1a3dd833a9815065f04cefa00c26d2aa6028074076645a22af2a6ffc1bd39cfa1e5e92d9ee3f24af32f9de914cf36b8056 DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6 +DIST openjdk-11.0.6.tar.bz2 90755968 BLAKE2B 5bf23cc107ffae4cfc82be4f9b4b17de57575ee13e8fd461027e319a441c89c65fc852affb89f98a54307fa865ed5cdfb216809c6196866b31dfaa7011ad3d57 SHA512 d2296556c947c46883c16df3c1b7d809e6987dd6fd1a2667333e1245049560f3da744f6a51609a918cd9c509316b01160de2c080d5b9d3ed1af0b312dcbc575e DIST openjdk-8.222_p10.tar.bz2 452194 BLAKE2B aa5a19245e9b5f79da217ef4e8ff87acaf6b4c7b930a6cd1c7a00d2c6d50bb3168c41da1b18e8beb072a84bca7f3956e939edd9f5fd88899d2cc3fe754ff19f8 SHA512 08f92327732fb54df847fe0b3e49460bcdd25fe2aef7bc9545d75ab6504ab92452f8f5daede6040d28fd9b8347f49d658dc7bf88abc90235d6cf4a72cb44fbba DIST openjdk-8.232_p09.tar.bz2 453185 BLAKE2B 9f78dc3a482f42937c9f4ed30492cf8348c903c6a419a7f2644251f853f92e2e112f72c16848adcc7102f41e8f1249e35d7019bf0b5c5fd823e4f068650f36fd SHA512 31fbaf8334b3a40f491ae87aeec5698ebac334b8425147b8f8fa1a397e64f5bf7025d22dd5ecf7c7029c07ca40424f07ae139aa5d9737b20a6eeec2e9a1d835d DIST openjdk-8.242.tar.bz2 452896 BLAKE2B 73176533ad62942f9a9547378aa5547a5f064076d24be527d0fb8b13c30a48680957bca731ee54771cae66e78f8800995426431ec266f0c61330a573efaacc23 SHA512 2a98dcead63b8e5dc6db841416b16c12a84f557c8efa6272bc4dc125333de1e20ab83050d1ee441a77f78b47b2c52dbc7d29810ce562218129eff29a5c79daca @@ -28,10 +27,9 @@ DIST openjdk-langtools-8.242.tar.bz2 2397745 BLAKE2B 94748fa5304217a6354b4de29e8 DIST openjdk-nashorn-8.222_p10.tar.bz2 2859130 BLAKE2B d43b2e05dea1f97eff9e6d81ac0a6c8bfbe8cd444ff23df4b7d2fec29b678386893c169742a80fca6f0a785189796d2a6f29c10011a835cf5ac9e74001ae2b72 SHA512 453cefcd3f34cf6fca9bb14176145c9e4620e4188461b49049e5363cd62d87cc4f7703356369677dcd1e4862de0b5c16d1c505d66317944226a590af56026ac4 DIST openjdk-nashorn-8.232_p09.tar.bz2 2858464 BLAKE2B a75eb94f81c4d94bb5df6a0799ce447a5a382753a95579ff0dc20e171233a84737067edd120412b14ffc93e82290998a2e8c4de6407888e7bae1f4d226034c38 SHA512 6e5d12b75735b1c51048b0e90e7d977766ae4711bccf139714e19f773e2cf6532d36492168ef6ccf797f86cb11b22b0bbfbb53d9399265a58b08ece702e96a3b DIST openjdk-nashorn-8.242.tar.bz2 2856246 BLAKE2B 87343677e79b13baa0181b988f248f1dc1ccd265117e407e5be8d848813322a0e7cc53f5ea50bd7796b06b9c0b07320ca1b0ad8623f690c5bda3a4519656b6d6 SHA512 3f5fb2917fc65c85f007aea7842d0f1fef6c20050ef66a593d7ae25ced38a9eb5f1a4bb3c3d6b9757832a7d450d1cde06f98e383523707d93046e34ee70814c6 -EBUILD openjdk-11.0.3_p7-r4.ebuild 7411 BLAKE2B ebccff73dbd5f3fc76f8d8097bf2eaa5595b02b664de276d6be6604f72bfdbef0aa3928803e70aebfdfd3e73b0146f09466c4e6f9592d604af62d8fc65d7853b SHA512 b8aedba3ca200054a3ca2e0fa1142766ba5ffdbdc946ade7c61e4c19373b8ab47285b25a76e9d6740432e25d749dc5d379e218081b8cf64e2cac79c8c181a097 -EBUILD openjdk-11.0.4_p11.ebuild 7532 BLAKE2B 9de8fc795b96eee82e2574c811971dcbe4ab9c291170be54ae91d8ac97654ac7889d055dbb3f186776964309e47ef10cd7cecb4ee9a6ca8fdeabe3ea725fa170 SHA512 6f49ac621b017fc14287709dc8e2665d0944a4ee9a3b50e4bdbfdd12e5a1ba1532f5c228d8dbc5b07ec0e33c665771fcc33829e1f262eeb9b573aef6b6def369 -EBUILD openjdk-11.0.5_p10.ebuild 7532 BLAKE2B 9de8fc795b96eee82e2574c811971dcbe4ab9c291170be54ae91d8ac97654ac7889d055dbb3f186776964309e47ef10cd7cecb4ee9a6ca8fdeabe3ea725fa170 SHA512 6f49ac621b017fc14287709dc8e2665d0944a4ee9a3b50e4bdbfdd12e5a1ba1532f5c228d8dbc5b07ec0e33c665771fcc33829e1f262eeb9b573aef6b6def369 -EBUILD openjdk-8.222_p10.ebuild 6841 BLAKE2B d7a8f87ae3f1661a970f3f3ba8e0e996a317069717b119365789b2a514e7349c294e05414656f069132e3435ad887128e38d84f9c2a536868dce8946e7187a82 SHA512 207c9f7dab1ed4afa6838c614d4db44afd856f1d093d0425d4316c2d46431d9e790f38c6a4ce6d39b39c5ae878dcff9260743cc787b2cf22b0053831a0773496 -EBUILD openjdk-8.232_p09.ebuild 6837 BLAKE2B 4347c1e82b103112b5c72ac9bec80396214ecf6d9b933782912ed27403c92bff11239ffa967b95ad9ca1b181bf04c4ed2b01f97598a07e67c806b0f0342bddd5 SHA512 c43b02291aace24ab806d143cabfd29106c7a8ec16d4e44bc5008aad1c50b7fcd1362e732fb3265af6cec4e7ff5f1b77d8150477ab5917f90d8b962110943266 -EBUILD openjdk-8.242.ebuild 5811 BLAKE2B cd7eaf4a32d78d47cbb9919d0ee30e6f05322df97ff09872b9b9a413979f489ceb89a8c26b7ecebb3df268c874543b35faee96f599d5e3bd45f7d50f7a41aabc SHA512 245eeef5d91967ea115cb1dcc8ff9a4c3869f9972a32f4147385f9d8cb867804d618aae21a0511fcea2ebb400f3f42be7fcc348436c0ad53c44f5f68e0daad3f +EBUILD openjdk-11.0.5_p10.ebuild 7521 BLAKE2B de076a9b7ccb2eb1e179e871d276504e2e22286e9132bf85dc8242016ddde90c2f4b6f0946e370e22b43846d1dce587b38f591d3c20dc703f4b263c14a982288 SHA512 eafa0f8562ca4aef4209499e6e4ce1e40a11317fc16b1a8cee294f42ef7d3aefcd4d496bf5854f1cad3ab8b4bbb8d21c901265ee70df09f627ffb4b88a9ecc62 +EBUILD openjdk-11.0.6.ebuild 7539 BLAKE2B 386888c85dac344cb07c894e7fc4436f2ea9408480eec628151e5bb2f5e1a555072f19fc64b639e6e91ab7ede6b7b2b78c5f97a6af8893edb191f075250211f3 SHA512 0969dc29ef201638ec529aa5d88da3e8e6e4a3615ccca2d6db313bfcd3e61debc55c5be166fcec1e239a4557af45d7a195d5428768cbe90ad12be716fbad2146 +EBUILD openjdk-8.222_p10.ebuild 6820 BLAKE2B aeef0d831bbc35a4fea1a3fbc68be8af17eedefb5f3132fc96c7f7e062b5e3eaad30f3c8a56aa3f72ce1ea768211118c6964f4980c4d7d2936d9c521c100229c SHA512 66f73bd50b960c2ccb6956fc4af216689afaf2bb70df0dc58ec1751fb4831df3c705800bc15816630386f91840eefb74338d2efa163755381487bbbb889eb7d2 +EBUILD openjdk-8.232_p09.ebuild 6816 BLAKE2B 0e260daaee8fae0ecc2987928d47d8239e0b16e8a2673bb67d6c3c3f2dd6d59407c58f431cad35d8234631a927d9c990679f0891493e54d08cfd829eeaa65607 SHA512 81bdbaa7469dc4b805abfb30e1a5ba4dab8b4ee039da06ccaef0b9b0a77ffa18544da7e9f1f8c9e370eed51e2a8ecfdd6372c1abfd5d67b8c1624e3529903ded +EBUILD openjdk-8.242.ebuild 5790 BLAKE2B f1056bc5f24dc464e5a16e82e0f8a86fe13c5763fbd84264d5b4f3babd06229acc94b7575168495090dfdcb23a35e25df4634d69188fa24e611b413004c273df SHA512 dce306230e2460c40b0a33a58454947000c16ff65aa6e714a6f71ac3221b242ee553a41becbf3280ac458e53d938d66e9e41565f47950b8d5489192579f19c14 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959 diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild deleted file mode 100644 index 5bdff86cde05..000000000000 --- a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" -SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT} ) - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) -" - -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME - fi - fi -} - -src_prepare() { - default - chmod +x configure || die -} - -src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - # Enabling full docs appears to break doc building. If not - # explicitly disabled, the flag will get auto-enabled if pandoc and - # graphviz are detected. pandoc has loads of dependencies anyway. - - local myconf=( - --disable-ccache - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-giflib=system - --with-lcms=system - --with-libjpeg=system - --with-libpng=system - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PV}" - --with-version-pre=gentoo - --with-version-string=${MY_PV%+*} - --with-version-build=${MY_PV#*+} - --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - ) - - if use javafx; then - local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - emake -j1 \ - $(usex doc docs '') \ - $(usex jbootstrap bootcycle-images product-images) \ - JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - mv lib/security/cacerts lib/security/cacerts.orig || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - insinto /usr/share/doc/"${PF}"/html - doins -r "${S}"/build/*-release/images/docs/* - dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi -} diff --git a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild deleted file mode 100644 index 7c7b56ab423a..000000000000 --- a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" -SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT} ) - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) -" - -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME - fi - fi -} - -src_prepare() { - default - chmod +x configure || die -} - -src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - # Enabling full docs appears to break doc building. If not - # explicitly disabled, the flag will get auto-enabled if pandoc and - # graphviz are detected. pandoc has loads of dependencies anyway. - - local myconf=( - --disable-ccache - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-giflib=system - --with-lcms=system - --with-libjpeg=system - --with-libpng=system - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PV}" - --with-version-pre="" - --with-version-string=${MY_PV%+*} - --with-version-build=${MY_PV#*+} - --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - ) - - if use javafx; then - local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - local myemakeargs=( - JOBS=$(makeopts_jobs) - LOG=debug - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 #nowarn -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - insinto /usr/share/doc/"${PF}"/html - doins -r "${S}"/build/*-release/images/docs/* - dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi -} diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild index 7c7b56ab423a..8be378782e3e 100644 --- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild @@ -246,9 +246,9 @@ src_install() { java-vm_sandbox-predict /dev/random /proc/self/coredump_filter if use doc ; then - insinto /usr/share/doc/"${PF}"/html - doins -r "${S}"/build/*-release/images/docs/* - dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + docinto html + dodoc -r "${S}"/build/*-release/images/docs/* + dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild index 9a74ec428906..7f674fb94cc4 100644 --- a/dev-java/openjdk/openjdk-8.222_p10.ebuild +++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild @@ -234,8 +234,8 @@ src_install() { java-vm_sandbox-predict /dev/random /proc/self/coredump_filter if use doc ; then - insinto /usr/share/doc/${PF}/html - doins -r "${S}"/build/*-release/docs/* + docinto html + dodoc -r "${S}"/build/*-release/docs/* fi } diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild index ac104740441b..4fa1e0c103a0 100644 --- a/dev-java/openjdk/openjdk-8.232_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.232_p09.ebuild @@ -234,8 +234,8 @@ src_install() { java-vm_sandbox-predict /dev/random /proc/self/coredump_filter if use doc ; then - insinto /usr/share/doc/${PF}/html - doins -r "${S}"/build/*-release/docs/* + docinto html + dodoc -r "${S}"/build/*-release/docs/* fi } diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild index 0689a368ceb5..803f0b77b68d 100644 --- a/dev-java/openjdk/openjdk-8.242.ebuild +++ b/dev-java/openjdk/openjdk-8.242.ebuild @@ -208,8 +208,8 @@ src_install() { java-vm_sandbox-predict /dev/random /proc/self/coredump_filter if use doc ; then - insinto /usr/share/doc/${PF}/html - doins -r "${S}"/build/*-release/docs/* + docinto html + dodoc -r "${S}"/build/*-release/docs/* fi } -- cgit v1.2.3