dev-java/openjdk: don't die on binpkg installation if no jvm on host
authorGeorgy Yakovlev <gyakovlev@gentoo.org>
Fri, 31 May 2019 18:40:08 +0000 (11:40 -0700)
committerGeorgy Yakovlev <gyakovlev@gentoo.org>
Fri, 31 May 2019 18:44:27 +0000 (11:44 -0700)
Bug: 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-8.212_p03-r3.ebuild

index b10d08e19c72265c2d0844538617847cd7145a20..2f13332849d11a9c358955cf0528cb65bd29ff17 100644 (file)
@@ -122,11 +122,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
 }