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 E89BD158087 for ; Thu, 20 Jan 2022 08:57:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43FE62BC009; Thu, 20 Jan 2022 08:57:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DDAF2BC009 for ; Thu, 20 Jan 2022 08:57:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6109034333B for ; Thu, 20 Jan 2022 08:57:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D64CD239 for ; Thu, 20 Jan 2022 08:57:34 +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: <1642669050.5e22bb7a45589eb71e5f428c83ec1d0788b7c000.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 dev-java/openjdk/openjdk-17.0.2_p8.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 5e22bb7a45589eb71e5f428c83ec1d0788b7c000 X-VCS-Branch: master Date: Thu, 20 Jan 2022 08:57:34 +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: 1031c194-6751-4dea-81af-50d3e458c80e X-Archives-Hash: ddaaf0802869c8b182790664c7b2872d commit: 5e22bb7a45589eb71e5f428c83ec1d0788b7c000 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jan 20 08:56:28 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jan 20 08:57:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e22bb7a dev-java/openjdk: fix logic in !system-bootstrap Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/openjdk-11.0.14_p9.ebuild | 2 +- dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild index 452a5d1fe3b4..4e6f5d74d0bb 100644 --- a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild +++ b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild @@ -138,7 +138,7 @@ pkg_setup() { fi done else - [[ ${MERGE_TYPE} != "binary" ]] && return + [[ ${MERGE_TYPE} == "binary" ]] && return local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" fi diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild index 1396149efca2..b1f71eb6dafc 100644 --- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild +++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild @@ -150,7 +150,7 @@ pkg_setup() { local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" else - if [[ ${MERGE_TYPE} != "binary" ]]; then + 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#*/}