dev-java/openjdk: don't die on binpkg installation if no jvm on host
authorGeorgy Yakovlev <gyakovlev@gentoo.org>
Fri, 31 May 2019 18:41:15 +0000 (11:41 -0700)
committerGeorgy Yakovlev <gyakovlev@gentoo.org>
Fri, 31 May 2019 18:44:28 +0000 (11:44 -0700)
Closes: https://bugs.gentoo.org/687040
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild

index 960d7ca146c6c231d8e2d278b68bb0ff62a99631..3a4668d70da88ff4083da365874f03f75cbe0932 100644 (file)
@@ -115,11 +115,13 @@ pkg_setup() {
        if has_version --host-root dev-java/openjdk:${SLOT}; then
                export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
        else
-               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
+               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
 }