gentoo resync : 23.09.2020

3 files changed, 28 insertions, 18 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0a5debe1fa7d..76990b816f40 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,18 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2020-09-21)
+# The respective dependencies are masked for removal.
+gnome-base/libgnome-keyring test
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-20)
+# The respective dependencies are masked for removal.
+net-nntp/pan gnome-keyring
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-19)
+# The respective dependencies are masked for removal.
+app-office/lyx docbook
+
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
 media-plugins/mythplugins mythnetvision
@@ -18,7 +30,6 @@ sys-cluster/pacemaker heartbeat
 # The respective dependencies are masked for removal.
 app-metrics/collectd collectd_plugins_gmond
 app-metrics/collectd collectd_plugins_onewire
-sci-libs/dealii gmsh
 
 # Stephan Hartmann <sultan@gentoo.org> (2020-09-06)
 # Causes seccomp sandbox violation or chromium might hang on startup.
@@ -40,10 +51,6 @@ sci-geosciences/qgis grass
 # CMake checks will only allow on amd64 & x86
 dev-db/mariadb columnstore
 
-# Michał Górny <mgorny@gentoo.org> (2020-08-16)
-# dev-python/pyminuit is being removed.
-sci-visualization/veusz minuit
-
 # Michał Górny <mgorny@gentoo.org> (2020-08-01)
 # Require dev-python/twisted with py2.7.
 net-voip/telepathy-haze test
@@ -127,10 +134,6 @@ net-fs/samba test
 # Tests are very sensitive to the host environment.
 dev-util/meson test
 
-# Michał Górny <mgorny@gentoo.org> (2020-04-22)
-# Requires dev-python/filemagic that is broken and masked for removal.
-dev-python/jira magic
-
 # Michał Górny <mgorny@gentoo.org> (2020-04-19)
 # Requires dev-vcs/ghp-import that is masked for removal.
 www-apps/nikola ghpages
@@ -416,7 +419,6 @@ media-video/ffmpeg appkit
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
 dev-java/openjdk-jre-bin:11 gentoo-vm
-dev-java/oracle-jdk-bin:11 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
 
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 6cb7ba9f2616..beed0172cac6 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,14 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2020-09-20)
+# Always build python-exec with all the targets.
+dev-lang/python-exec -python_targets_python3_9
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-18)
+# openjfx:8 will never be stabilized
+dev-java/openjdk:8 javafx
+
 # Pacho Ramos <pacho@gentoo.org> (2020-08-21)
 # app-text/pandoc is hard to stabilize #737612
 sys-apps/earlyoom docs
@@ -113,10 +121,6 @@ net-analyzer/wireshark doc
 # Depends on lots of unstable dependencies
 dev-python/s3fs test
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-03-03)
-# sci-geosciences/grass is not stable
-sci-geosciences/qgis grass
-
 # Matthias Maier <tamiko@gentoo.org> (2018-03-18)
 # dev-libs/capstone hasn't been stabilized yet
 app-emulation/qemu capstone
@@ -193,10 +197,6 @@ net-libs/gnutls test-full
 # on a vulnerable libgcrypt version is in tree
 dev-db/mariadb sst-xtrabackup
 
-# Sergey Popov <pinkbyte@gentoo.org> (2016-02-15)
-# Mask monitoring capabilities of Ganeti on stable branches
-app-emulation/ganeti monitoring
-
 # Pacho Ramos <pacho@gentoo.org> (2015-05-15)
 # Version compatible with current ffmpeg is not ready to be stabilized
 # bug #539212
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index c0db71b19156..75585df7490c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -118,3 +118,11 @@ prelude
 # Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-27)
 # netlink is a Linux-specific interface
 netlink
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-09-18)
+# mask removed ABI_RISCV flags so they do not trigger rebuild
+# in emerge
+abi_riscv_lp64
+abi_riscv_lp64d
+abi_riscv_ilp32
+abi_riscv_ilp32d