From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1056420-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 E2001138334
	for <garchives@archives.gentoo.org>; Fri,  9 Nov 2018 22:48:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 0226CE0A8D;
	Fri,  9 Nov 2018 22:48:45 +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 D65E4E0A8D
	for <gentoo-commits@lists.gentoo.org>; Fri,  9 Nov 2018 22:48:43 +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 1A8DB335CF2
	for <gentoo-commits@lists.gentoo.org>; Fri,  9 Nov 2018 22:48:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 5620345F
	for <gentoo-commits@lists.gentoo.org>; Fri,  9 Nov 2018 22:48:40 +0000 (UTC)
From: "James Le Cuirot" <chewi@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, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1541803577.ac6d74c54bc9dc580bb9b089abdb1cadaf5a2df5.chewi@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.1_p13.ebuild
X-VCS-Directories: dev-java/openjdk/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: ac6d74c54bc9dc580bb9b089abdb1cadaf5a2df5
X-VCS-Branch: master
Date: Fri,  9 Nov 2018 22:48:40 +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-Archives-Salt: 8fac8416-b604-4005-b8d3-8407c4002af8
X-Archives-Hash: 41cfeaf8a27fe74d2c1941ad6612b8bb

commit:     ac6d74c54bc9dc580bb9b089abdb1cadaf5a2df5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  9 22:46:17 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Nov  9 22:46:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6d74c5

dev-java/openjdk: Fix REQUIRED_USE wrt GLEP 73

This is very confusing but think I've got it right.

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-java/openjdk/openjdk-11.0.1_p13.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
index 8bc5d1fa01e..5b9ce2a9bd0 100644
--- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
@@ -24,17 +24,17 @@ JVM_VARIANTS="
 	zero
 "
 
-IUSE=+$(printf "jvm_variant_%s " ${JVM_VARIANTS})
-IUSE+="alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
+IUSE=$(printf "jvm_variant_%s " ${JVM_VARIANTS})
 
 REQUIRED_USE="
-	^^ (
-		|| ( jvm_variant_server jvm_variant_client jvm_variant_minimal )
-		jvm_variant_core
-		jvm_variant_zero
-	)
+	|| ( ${IUSE} )
+	?? ( jvm_variant_core jvm_variant_zero )
+	jvm_variant_core? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal )
+	jvm_variant_zero? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal )
 "
 
+IUSE="+${IUSE} alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
+
 CDEPEND="
 	media-libs/freetype:2=
 	net-print/cups