[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/

[Georgy Yakovlev]

commit:     5e22bb7a45589eb71e5f428c83ec1d0788b7c000
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 08:56:28 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 <gyakovlev <AT> 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#*/}