From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D8B3158087 for ; Thu, 20 Jan 2022 07:23:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BE232BC010; Thu, 20 Jan 2022 07:23:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90A1B2BC00A for ; Thu, 20 Jan 2022 07:23:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CABE83432D9 for ; Thu, 20 Jan 2022 07:23:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35CB92A4 for ; Thu, 20 Jan 2022 07:23:45 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1642663398.3b1eccfee723451e2a4ef919e9414bb61446d417.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk/openjdk-11.0.14_p9.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 3b1eccfee723451e2a4ef919e9414bb61446d417 X-VCS-Branch: master Date: Thu, 20 Jan 2022 07:23:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 94824476-4b7e-4c5f-9edc-030cf9c0710d X-Archives-Hash: 84774e185434985fefed7e31ac6a3cc6 commit: 3b1eccfee723451e2a4ef919e9414bb61446d417 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jan 20 06:45:33 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jan 20 07:23:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1eccfe dev-java/openjdk: get rid of gentoo-vm in openjdk-11.0.14_p9 Bug: https://bugs.gentoo.org/810613 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/openjdk-11.0.14_p9.ebuild | 40 ++++++++---------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild index 7371e06cde2b..dc2c182e5e64 100644 --- a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild +++ b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild @@ -42,7 +42,7 @@ SRC_URI=" LICENSE="GPL-2" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap pch selinux source system-bootstrap systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap pch selinux source system-bootstrap systemtap" COMMON_DEPEND=" media-libs/freetype:2= @@ -128,35 +128,17 @@ pkg_setup() { 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} - elif use !system-bootstrap ; then + if use system-bootstrap; then + 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 + else + [[ ${MERGE_TYPE} != "binary" ]] && return local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" - 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 } @@ -291,7 +273,7 @@ src_install() { 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_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter