profiles/arch/*: re-structure openjdk[javafx] masks

to use profile inheritance properly

mask in arch/base
unmask on working arches
stable.mask on working arches

Bug: https://bugs.gentoo.org/788118
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>

8 files changed, 11 insertions, 14 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index c5d4f9be7ece..3833aa4debab 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -150,6 +150,7 @@ mail-client/claws-mail -litehtml
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-22)
 # openjfx is keyworded on amd64
+dev-java/openjdk:8 -javafx
 dev-java/openjdk:11 -javafx
 
 # Matt Turner <mattst88@gentoo.org> (2019-06-20)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 33d1a456737a..41ae83a7573f 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,7 +17,7 @@
 
 #--- END OF EXAMPLES ---
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-05)
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)
 # openjfx:8 will never be stabilized
 # openjfx:11 probably will neither
 dev-java/openjdk:8 javafx
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 8416e8749c7d..8a1bfb3f418c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -197,10 +197,6 @@ sys-apps/flashrom jlink-spi
 # dep not keyworded here
 media-gfx/gnome-photos upnp-av
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-01)
-# not yet keyworded
-dev-java/openjdk javafx
-
 # Aaron Bauman <bman@gentoo.org> (2019-04-08)
 # app-text/dblatex not keyword yet
 net-firewall/nftables doc
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index af46ee0f7552..a920061900cb 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -128,7 +128,8 @@ dev-lang/rust-bin doc
 media-tv/kodi raspberry-pi
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-22)
-# mask javafx until it's keyworded on other arches
+# mask here and unmask in profiles for specific arches
+dev-java/openjdk:8 javafx
 dev-java/openjdk:11 javafx
 
 # Matt Turner <mattst88@gentoo.org> (2019-06-20)
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 671ff88dd947..d885c5238943 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -91,10 +91,6 @@ sys-firmware/seabios -debug
 # app-misc/graphlcd-base won't work on PowerPC/PowerPC64
 app-misc/lcdproc freetype lcd_devices_glcd png
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-01)
-# not yet keyworded
-dev-java/openjdk:11 javafx
-
 # Patrick McLean <chutzpah@gentoo.org> (2019-04-15)
 # deps not available on platform
 sys-cluster/ceph babeltrace lttng
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 2d307a37a11d..32bb967a3518 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -15,6 +15,7 @@ app-emulation/crun -criu
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-19)
 # openjfx is keyworded on ppc64le
+dev-java/openjdk:8 -javafx
 dev-java/openjdk:11 -javafx
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-02-26)
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
index e6a445260d75..6dbcf7edfcd2 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
@@ -1,6 +1,12 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)
+# openjfx:8 will never be stabilized
+# openjfx:11 probably will neither
+dev-java/openjdk:8 javafx
+dev-java/openjdk:11 javaf
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-02-27)
 # vulkan tested and works on ppc64le, but not stabilized yet
 dev-qt/qtdeclarative vulkan
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 23823f2901da..8052860579a4 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -51,10 +51,6 @@ sys-libs/compiler-rt-sanitizers -profile
 # (See 9.3.8 in the Guile manual)
 dev-scheme/guile -jit
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-18)
-# swt 4.10 not keyworded on x86
-dev-java/openjdk:8 javafx
-
 # Thomas Deutschmann <whissi@gentoo.org> (2020-08-17)
 # Columnstore engine is supported on x86
 dev-db/mariadb -columnstore