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 560D3158087 for ; Thu, 20 Jan 2022 19:15:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A41E62BC022; Thu, 20 Jan 2022 19:15:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 394542BC022 for ; Thu, 20 Jan 2022 19:15:10 +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 32EF4342D4C for ; Thu, 20 Jan 2022 19:15:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98FC9275 for ; Thu, 20 Jan 2022 19:15:02 +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: <1642706088.66e6e94d2da2ebb0b239a67895cc58f05a475d21.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-17.0.2_p8.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 66e6e94d2da2ebb0b239a67895cc58f05a475d21 X-VCS-Branch: master Date: Thu, 20 Jan 2022 19:15:02 +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: ab95b815-b807-4eb5-b97a-c5395e9c3418 X-Archives-Hash: 079e629495c717d28060d694162f6dc9 commit: 66e6e94d2da2ebb0b239a67895cc58f05a475d21 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jan 20 19:13:52 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jan 20 19:14:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e6e94d dev-java/openjdk: fix bootstrap logic err in 17 commit 5e22bb7a45589eb71e5f428c83ec1d0788b7c000 broke it. should have been applied only for 11 Closes: https://bugs.gentoo.org/831574 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild index c64d7b3baf67..cf327d5a4be5 100644 --- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild +++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild @@ -151,7 +151,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#*/}