From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Fri, 31 May 2019 18:40:08 +0000 (-0700)
Subject: dev-java/openjdk: don't die on binpkg installation if no jvm on host
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=284b1f61cff4b549ab177d03c3bea3553b20ec62;p=gentoo.git

dev-java/openjdk: don't die on binpkg installation if no jvm on host

Bug: https://bugs.gentoo.org/687040

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
index b10d08e19c72..2f13332849d1 100644
--- a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
+++ b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
@@ -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
 }