gentoo resync : 23.09.2020

50 files changed, 72 insertions, 183 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 91b9103649ea..ba108db8a5f2 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-09-18)
+# media-libs/libilbc is not ported to alpha
+net-analyzer/wireshark ilbc
+
 # Sam James <sam@gentoo.org> (2020-09-02)
 # dev-python/mysqlclient lacks keywords here
 mail-filter/pyzor mysql
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 6e4e7e3cd1a9..69cf88d03b51 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -226,11 +226,6 @@ sys-boot/grub:2 -grub_platforms_xen-32
 # 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 x64 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 amd64, so unmask the useflag
 media-libs/libbluray -bdplus
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 0020c0a53bb4..5d986026fe8e 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -97,4 +97,4 @@ gnustep-base/gnustep-make libobjc2
 # 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/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index c5665e8060f6..e5be3f2d07e7 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2020-09-20)
+# Binary-only with no x32 support
+app-office/libreoffice-bin
+app-office/libreoffice-bin-debug
+
 # Ben Kohler <bkohler@gentoo.org> (2020-08-12)
 # Breaks several portage features, see bug 736904
 =sys-libs/glibc-2.31-r6
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 1f29982d9de9..98cfda535a61 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -5,7 +5,6 @@
 # sys-cluster/ceph no longer supports x86, versions that support
 # it no longer build thanks to python2 removals
 app-backup/bareos ceph cephfs rados rados-striper
-app-emulation/ganeti rbd
 app-emulation/libvirt rbd
 app-emulation/qemu rbd
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index e6d4425270f3..46cb68385f1a 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -8,8 +8,3 @@
 -media-video/rav1e
 -net-news/newsboat
 -net-libs/quiche
-
-# James Le Cuirot <chewi@gentoo.org> (2016-01-09)
-# This is built for armv6 so unmask against the wider arm mask.
--dev-java/oracle-jdk-bin
--dev-java/oracle-jre-bin
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 21e261c5adf4..3e820a0a2fc8 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -13,11 +13,6 @@
 # Valgrind works on ARMv7
 -dev-util/valgrind
 
-# James Le Cuirot <chewi@gentoo.org> (2016-01-09)
-# This is built for armv6 so unmask against the wider arm mask.
--dev-java/oracle-jdk-bin
--dev-java/oracle-jre-bin
-
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a so unmask against the wider arm mask.
 -dev-java/icedtea-bin
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 1857d1bddeb4..4348dc0b782f 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -15,11 +15,6 @@ net-libs/quiche
 # https://valgrind.org/info/platforms.html
 dev-util/valgrind
 
-# James Le Cuirot <chewi@gentoo.org> (2016-01-09)
-# This is built for armv6 and will not work on earlier generations.
-dev-java/oracle-jdk-bin
-dev-java/oracle-jre-bin
-
 # James Le Cuirot <chewi@gentoo.org> (2015-05-24)
 # This is built for armv7a and will not work on earlier generations.
 dev-java/icedtea-bin
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 9772a35c0e09..d804d1a26a7a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -184,10 +184,6 @@ net-misc/bfgminer adl lm-sensors
 # no point in pursuing it right now.
 app-shells/bash-completion test
 
-# James Le Cuirot <chewi@gentoo.org> (2017-04-25)
-# Oracle doesn't include VisualVM on this platform.
-dev-java/oracle-jdk-bin visualvm
-
 # Patrice Clement <monsieurp@gentoo.org> (2017-04-09)
 # Enable MQTT support on supported architectures
 app-metrics/collectd -collectd_plugins_mqtt
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 503325f879dd..97e4c149897b 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -22,8 +22,3 @@ dev-lang/rust llvm_targets_AArch64
 dev-ml/llvm-ocaml llvm_targets_AArch64
 sys-devel/clang llvm_targets_AArch64
 sys-devel/llvm llvm_targets_AArch64
-
-# James Le Cuirot <chewi@gentoo.org> (2016-05-16)
-# For reasons best known to themselves, Oracle do not ship the
-# libawt_xawt.so library on arm64 even though they do on arm32.
-dev-java/oracle-jdk-bin headless-awt
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index f3ef3b29d96b..a0f74262bbfc 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -338,10 +338,6 @@ app-crypt/heimdal afs
 # Only available on some architectures.
 dev-java/icedtea -shenandoah
 
-# James Le Cuirot <chewi@gentoo.org> (2017-04-25)
-# Oracle doesn't include VisualVM on this platform.
-dev-java/oracle-jdk-bin visualvm
-
 # Markus Meier <maekke@gentoo.org> (2017-03-24)
 # unkeyworded deps, bug #552330
 app-portage/g-sorcery bson
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index e95a85a5d18a..87ba55bdeea2 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2020-09-20)
+# (for Mikle Kolyada <zlogene@gentoo.org>)
+# libgcrypt et al no longer support static-libs
+# Need to determine whether crypt is possible dynamically?
+sys-power/suspend crypt
+
+# Sam James <sam@gentoo.org> (2020-09-20)
+# (for Mikle Kolyada <zlogene@gentoo.org>)
+# libgcrypt et al no longer support static-libs
+# Need to determine whether dar's static use
+# is worthwhile without it.
+app-backup/dar static static-libs
+
 # Thomas Deutschmann <whissi@gentoo.org> (2020-09-07)
 # dev-util/nvidia-cuda-toolkit is only available on amd64
 app-metrics/collectd collectd_plugins_gpu_nvidia
@@ -198,11 +211,6 @@ media-video/ffmpeg mmal
 # sys-boot/gnu-efi is not supported on all archs.
 sys-apps/systemd gnuefi
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# JavaFX and the browser plugin are not included on some platforms.
-dev-java/oracle-jdk-bin javafx nsplugin
-dev-java/oracle-jre-bin javafx nsplugin
-
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # Mask bdplus support and unmask on arches where libbdplus is keyworded.
 media-libs/libbluray bdplus
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 1287a5f40973..366da76c51fb 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -195,10 +195,6 @@ abi_mips_n32
 abi_mips_n64
 abi_ppc_32
 abi_ppc_64
-abi_riscv_lp64d
-abi_riscv_lp64
-abi_riscv_ilp32d
-abi_riscv_ilp32
 abi_s390_32
 abi_s390_64
 
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 38268c9d0759..e25a2f2759a3 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -24,7 +24,3 @@ CHOST_hppa="${CHOST}"
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
-
-# 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/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index d8e4276c3cfd..1f0160769c66 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -80,7 +80,8 @@ net-im/pidgin gadu
 
 # Jeroen Roovers <jer@gentoo.org> (2020-01-28)
 # sys-apps/systemd is not stable
-net-analyzer/wireshark sdjournal
+# media-libs/libilbc has not been ported to HPPA
+net-analyzer/wireshark ilbc sdjournal
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
 # media-libs/libheif is not keyworded
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index e6217f6a5a9f..eb4f6d029843 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -11,10 +11,6 @@
 # Unlikely.
 vulkan
 
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-21)
-# ruby2.4 will go away soon, avoid keywording older packages
-ruby_targets_ruby24
-
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-06)
 # media-libs/libvpx is not keyworded, bug #698956
 system-libvpx
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index bb3bb243752e..35d799148af9 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/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
-
 # Michał Górny <mgorny@gentoo.org> (2020-06-18)
 # Not ready for stable yet.
 python_targets_python3_8
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f373e08deb1c..17c90c29cb04 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-09-18)
+# media-libs/libilbc is not ported to ia64
+net-analyzer/wireshark ilbc
+
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
@@ -38,7 +42,7 @@ app-text/texlive context l10n_ja
 # Requires unsupported dev-python/gevent.
 dev-python/socketpool eventlet gevent
 
-# # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-12)
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-04-12)
 # ruby-2.7 dropped ia64 support, mask dependencies requiring ruby.
 # These pull in:
 # - direct ruby dependency:
@@ -108,7 +112,6 @@ app-admin/syslog-ng kafka
 # No ia64 arch support for jit. Version 17 USE=debug
 # required USE=jit.
 dev-lang/spidermonkey jit
-=dev-lang/spidermonkey-17* debug
 
 # Mart Raudsepp <leio@gentoo.org> (2019-03-17)
 # Unkeyworded media-libs/opencv dependency, bug #680656
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 7e2b3c4d4caa..fa03543e207a 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -66,10 +66,6 @@ dev-python/twisted conch crypt http2 test
 # net-libs/libnetfilter_conntrack is not keyworded on mips
 net-dns/dnsmasq conntrack
 
-# Thomas Deutschmann <whissi@gentoo.org> (2016-08-23)
-# net-libs/openpgm is not keyworded on mips
-net-libs/zeromq pgm
-
 # Davide Pesavento <pesa@gentoo.org> (2015-10-26)
 # Tests require non-keyworded qt5
 dev-qt/qtchooser test
diff --git a/profiles/arch/powerpc/package.mask b/profiles/arch/powerpc/package.mask
new file mode 100644
index 000000000000..882732a1338b
--- /dev/null
+++ b/profiles/arch/powerpc/package.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-22)
+# criu does not work on ppc64be and ppc32
+sys-process/criu
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index ebf8ca404e12..862862971801 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -68,7 +68,7 @@ app-misc/lcdproc freetype lcd_devices_glcd png
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-01)
 # not yet keyworded
-dev-java/openjdk javafx
+dev-java/openjdk:11 javafx
 
 # Patrick McLean <chutzpah@gentoo.org> (2019-04-15)
 # deps not available on platform
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 7b5e8303091b..53fa05df9882 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -140,10 +140,6 @@ net-misc/connman openconnect
 # pidgin-opensteamworks is only available for amd64, ppc32 and x86
 net-im/telepathy-connection-managers -steam
 
-# Pacho Ramos <pacho@gentoo.org> (2015-01-14)
-# Missing keywords
-app-misc/workrave mate
-
 # Julian Ospald <hasufell@gentoo.org> (2013-11-23)
 # FIXME: app-arch/innoextract not available under ppc yet
 games-fps/duke3d-data gog
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index f4f3331dfe35..14fd84971a86 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,7 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <gyakovlev@gentoo.org) (2020-08-27)
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-22
+# criu works on ppc64le
+-sys-process/criu
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-18)
+# openjfx:11 works on ppc64le
+-dev-java/openjfx:11
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-08-27)
 # little-endian power8 ppc64 configs are provided
 -sys-kernel/gentoo-kernel
 -sys-kernel/vanilla-kernel
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index e990694a3c80..856f7f86c25d 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-19)
+# openjfx is keyworded on ppc64le
+dev-java/openjdk:11 -javafx
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-02-26)
 # vulkan tested and works on ppc64le
 dev-qt/qtdeclarative -vulkan
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 1d366bf3ff1b..3a653412066e 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.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)
+# openjfx:11 does not work on ppc64be
+dev-java/openjfx:11
+
 # Georgy Yakovlev <gyakovlev@gentoo.org) (2020-08-27)
 # big-endian ppc64 configs are not provided
 # however users can unmask and use savedconfig feature
diff --git a/profiles/arch/riscv/packages b/profiles/arch/riscv/packages
index b089d412189e..9de5ab734497 100644
--- a/profiles/arch/riscv/packages
+++ b/profiles/arch/riscv/packages
@@ -1,5 +1,2 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# For the initial hot experimentation phase...
-*sys-devel/gdb
diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
index 959de434af0f..1065af43c9a8 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
@@ -7,6 +7,3 @@
 MULTILIB_ABIS="ilp32"
 DEFAULT_ABI="ilp32"
 ABI="ilp32"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
index dc5b60c2dd26..aacc29b1d56e 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/package.use.force
+++ b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
@@ -1,5 +1,3 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force
index e54ac40ffd20..82bb958a577a 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/use.force
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.force
@@ -1,5 +1,2 @@
-# Un-force the original multilib default-abi flag
--abi_riscv_ilp32d
-
-# Force the abi of this profile here
-abi_riscv_ilp32
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask
index c717be8a4aa4..991c792750ad 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask
@@ -3,8 +3,3 @@
 
 # Mask multilib, since we do not want to use it.
 multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64d
-abi_riscv_lp64
-abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
index bd66a518eab8..a53334741ede 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
@@ -10,6 +10,3 @@ FCFLAGS="${CFLAGS}"
 
 # We have only one ABI
 MULTILIB_ABIS="ilp32d"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
index cf764cd54132..9de5ab734497 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
+++ b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
index b2c900da5041..d8172baa5f5f 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
@@ -1,10 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mask multilib, since we do not want to use it.
 multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64d
-abi_riscv_lp64
-abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv32imac/make.defaults b/profiles/arch/riscv/rv32imac/make.defaults
index e23fe63fb251..da381b453f83 100644
--- a/profiles/arch/riscv/rv32imac/make.defaults
+++ b/profiles/arch/riscv/rv32imac/make.defaults
@@ -12,12 +12,3 @@ CHOST="riscv32-unknown-linux-gnu"
 MULTILIB_ABIS="ilp32d ilp32"
 DEFAULT_ABI="ilp32d"
 ABI="ilp32d"
-
-# Enable ilp32d by default
-ABI_RISCV="ilp32d"
-
-# Unhide the riscv/riscv-specific USE_EXPANDs
-USE_EXPAND_HIDDEN="-ABI_RISCV"
-
-# Implicitly enable ilp32d in ebuilds without multilib support
-IUSE_IMPLICIT="abi_riscv_ilp32d"
diff --git a/profiles/arch/riscv/rv32imac/use.force b/profiles/arch/riscv/rv32imac/use.force
index 069813e17719..9de5ab734497 100644
--- a/profiles/arch/riscv/rv32imac/use.force
+++ b/profiles/arch/riscv/rv32imac/use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Force the flag corresponding to the default ABI.
-abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/use.mask
index d57df4d6abeb..9de5ab734497 100644
--- a/profiles/arch/riscv/rv32imac/use.mask
+++ b/profiles/arch/riscv/rv32imac/use.mask
@@ -1,6 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Unmask the multilib flags for this arch.
--abi_riscv_ilp32d
--abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults
index f4b3042683c5..4aeb573215d2 100644
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -12,6 +12,3 @@ FCFLAGS="${CFLAGS}"
 MULTILIB_ABIS="lp64"
 DEFAULT_ABI="lp64"
 ABI="lp64"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv64gc/lp64/package.use.force b/profiles/arch/riscv/rv64gc/lp64/package.use.force
index e25bb13182b5..9de5ab734497 100644
--- a/profiles/arch/riscv/rv64gc/lp64/package.use.force
+++ b/profiles/arch/riscv/rv64gc/lp64/package.use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64d
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force b/profiles/arch/riscv/rv64gc/lp64/use.force
index d04bb8b3d835..9de5ab734497 100644
--- a/profiles/arch/riscv/rv64gc/lp64/use.force
+++ b/profiles/arch/riscv/rv64gc/lp64/use.force
@@ -1,5 +1,2 @@
-# Un-force the original multilib default-abi flag
--abi_riscv_lp64d
-
-# Force the abi of this profile here
-abi_riscv_lp64
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask
index 1e0176b85cb0..d8172baa5f5f 100644
--- a/profiles/arch/riscv/rv64gc/lp64/use.mask
+++ b/profiles/arch/riscv/rv64gc/lp64/use.mask
@@ -1,10 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mask multilib, since we do not want to use it.
 multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64d
-abi_riscv_ilp32d
-abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
index 85372ab59289..f595f6ac4437 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
@@ -10,6 +10,3 @@ FCFLAGS="${CFLAGS}"
 
 # We have only one ABI
 MULTILIB_ABIS="lp64d"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
index 73fe93666cc9..9de5ab734497 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/package.use.force
+++ b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64
diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask b/profiles/arch/riscv/rv64gc/lp64d/use.mask
index 101528080621..991c792750ad 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/use.mask
+++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask
@@ -3,8 +3,3 @@
 
 # Mask multilib, since we do not want to use it.
 multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64
-abi_riscv_ilp32d
-abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults
index a5963cb2fcba..e35f63c8d1e1 100644
--- a/profiles/arch/riscv/rv64gc/make.defaults
+++ b/profiles/arch/riscv/rv64gc/make.defaults
@@ -12,12 +12,3 @@ CHOST="riscv64-unknown-linux-gnu"
 MULTILIB_ABIS="lp64d lp64 ilp32d ilp32"
 DEFAULT_ABI="lp64d"
 ABI="lp64d"
-
-# Enable lp64d by default
-ABI_RISCV="lp64d"
-
-# Unhide the riscv/rv64gc-specific USE_EXPANDs
-USE_EXPAND_HIDDEN="-ABI_RISCV"
-
-# Implicitly enable lp64d in ebuilds without multilib support
-IUSE_IMPLICIT="abi_riscv_lp64d"
diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force
index eb2add7ba6b7..9de5ab734497 100644
--- a/profiles/arch/riscv/rv64gc/use.force
+++ b/profiles/arch/riscv/rv64gc/use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Force the flag corresponding to the default ABI.
-abi_riscv_lp64d
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask
index b38fe8be382f..9de5ab734497 100644
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ b/profiles/arch/riscv/rv64gc/use.mask
@@ -1,8 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Unmask the multilib flags for this arch.
--abi_riscv_lp64d
--abi_riscv_lp64
--abi_riscv_ilp32d
--abi_riscv_ilp32
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