gentoo resync : 23.09.2020

4 files changed, 5 insertions, 15 deletions

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 5f26b6eab90f..c0600e4ae9f1 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -47,7 +47,3 @@ ABI_X86="32"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
-
-# Hans de Graaff <graaff@gentoo.org> (2020-09-14)
-# Set per-arch to facilitate stabling, bug 728192
-RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index fd1f1e3fd9c5..c995fc0f9260 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# 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
@@ -231,7 +235,6 @@ www-client/chromium widevine
 # Ian Delaney <idella4@gentoo.org> (2015-12-02)
 # mask revdeps of xen that emply a hypervisor in arch x86
 app-emulation/libvirt xen
-app-emulation/ganeti xen
 
 # Brian Evans <grknight@gentoo.org (2015-09-14)
 # Unmask new USE flags for mariadb on supported arches
@@ -241,11 +244,6 @@ app-emulation/ganeti xen
 # sys-boot/gnu-efi is not supported on all archs.
 sys-apps/systemd -gnuefi
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-28)
-# JavaFX and the browser plugin are included on x86 Linux.
-dev-java/oracle-jdk-bin -javafx -nsplugin
-dev-java/oracle-jre-bin -javafx -nsplugin
-
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag
 media-libs/libbluray -bdplus
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 23c5bfa1a89b..328ba2f9cc5d 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -89,4 +89,4 @@ dev-cpp/eigen test
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy3 -python_targets_python3_8
+dev-lang/python-exec -python_targets_pypy3
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index b3aa6061b2d5..b0ff96b03f16 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (2020-09-14)
-# Masked per-arch to facilitate stabling, bug 728192
-ruby_targets_ruby26
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl