From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Tue, 5 Feb 2019 05:09:29 +0000 (-0800)
Subject: dev-java/openjdk: unset _JAVA_OPTIONS
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3f6b5753f261cf3a48c19a57e1eb684a4b892cb5;p=gentoo.git

dev-java/openjdk: unset _JAVA_OPTIONS

If build vm is a unregistered one (built without gentoo-vm flag)
java-pkg-2_pkg_setup() and hence java-pkg_init() is not called and
_JAVA_OPTIONS is not handled.
Just unset it.

Closes: https://bugs.gentoo.org/677236

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

diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
index 1a48fa81cb9c..f546f4783e35 100644
--- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
@@ -107,6 +107,7 @@ pkg_setup() {
 		JDK_HOME=${JDK_HOME#*/}
 		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
 		export JDK_HOME
+		unset _JAVA_OPTIONS
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild
index b1c57e60f8d2..b0ad1d7bd36e 100644
--- a/dev-java/openjdk/openjdk-8.202_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.202_p08.ebuild
@@ -122,6 +122,7 @@ pkg_setup() {
 		JDK_HOME=${JDK_HOME#*/}
 		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
 		export JDK_HOME
+		unset _JAVA_OPTIONS
 	fi
 }