From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1070415-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C3B19138337
for <garchives@archives.gentoo.org>; Tue, 5 Feb 2019 06:35:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E9E7EE0CCF;
Tue, 5 Feb 2019 06:35:04 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C0C1BE0CE2
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Feb 2019 06:35:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DD01A340943
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Feb 2019 05:15:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CF858523
for <gentoo-commits@lists.gentoo.org>; Tue, 5 Feb 2019 05:15:42 +0000 (UTC)
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" <gyakovlev@gentoo.org>
Message-ID: <1549343594.3f6b5753f261cf3a48c19a57e1eb684a4b892cb5.gyakovlev@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/openjdk/openjdk-11.0.2_p7.ebuild dev-java/openjdk/openjdk-8.202_p08.ebuild
X-VCS-Directories: dev-java/openjdk/
X-VCS-Committer: gyakovlev
X-VCS-Committer-Name: Georgy Yakovlev
X-VCS-Revision: 3f6b5753f261cf3a48c19a57e1eb684a4b892cb5
X-VCS-Branch: master
Date: Tue, 5 Feb 2019 05:15:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7600705e-087f-469b-99fc-20dce5555b01
X-Archives-Hash: 99e1298b37006d1866090c6084c28732
commit: 3f6b5753f261cf3a48c19a57e1eb684a4b892cb5
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 5 05:09:29 2019 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 05:13:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6b5753
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 <AT> gentoo.org>
dev-java/openjdk/openjdk-11.0.2_p7.ebuild | 1 +
dev-java/openjdk/openjdk-8.202_p08.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
index 1a48fa81cb9..f546f4783e3 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 b1c57e60f8d..b0ad1d7bd36 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
}