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@gentoo.org>

diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
index 8bc5d1fa01e9f2f42c84335bbd353c357562ecc5..5b9ce2a9bd0e3e2223c35dd97fc764adbc6fd321 100644 (file)
--- 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