6 files changed, 25 insertions, 107 deletions
diff --git a/profiles/base/package.use b/profiles/base/package.use
index b215ecbea495..c08d631f4f45 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,14 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# David Seifert <soap@gentoo.org> (2017-04-17)
-# These py2-only packages also support pypy, enable
-# Python 2.7 as the default implementation, preparing
-# for the eventual switch to py3 in PYTHON_SINGLE_TARGET
-dev-vcs/git-bz python_single_target_python2_7 python_targets_python2_7
-gnome-base/libglade python_single_target_python2_7 python_targets_python2_7
-sci-chemistry/pdb-tools python_single_target_python2_7 python_targets_python2_7
-
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Enable the BPF target by default
 dev-ml/llvm-ocaml llvm_targets_BPF
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index a9612f0c2bc5..d266201073f1 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,9 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Alfredo Tupone <tupone@gentoo.org> (2020-04-06)
-# USE=ada is mandatory to build a gnat compiler
-sys-devel/gnat-gpl ada
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-05-24)
+# Many base packages still rely on unqualified tools.
+# To contain the breakage flags are masked. Once most packages
+# build with unqualified tools missing we will lift
+# the force flag. More details are at:
+#    https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
+sys-devel/binutils-config native-symlinks
+sys-devel/gcc-config      native-symlinks
+
+# Michał Górny <mgorny@gentoo.org> (2017-12-30)
+# Require user configs unless we supply our own .config.
+sys-kernel/gentoo-kernel savedconfig
+sys-kernel/vanilla-kernel savedconfig
 
 # Matt Turner <mattst88@gentoo.org> (2020-03-28)
 # wget is the default FETCHCOMMAND, and most distfiles are distributed via
@@ -15,12 +25,6 @@ net-misc/wget ssl
 # is maintained for experts only.
 sys-libs/libcxx libcxxabi
 
-# Lars Wendler <polynomial-c@gentoo.org> (2019-12-23)
-# This release does no longer build with x11-libs/gtk+:2
-# and upstream has no intention to fix this.
-# https://bugs.gentoo.org/703592
-~www-client/seamonkey-2.49.5 force-gtk3
-
 # Michał Górny <mgorny@gentoo.org> (2019-12-06)
 # Non-initramfs builds do not work with the default .config.  Force
 # the mask, so that users don't brick their systems.  If somebody wants
@@ -123,6 +127,7 @@ dev-lang/python-exec python_targets_python2_7
 dev-lang/python-exec python_targets_python3_6
 dev-lang/python-exec python_targets_python3_7
 dev-lang/python-exec python_targets_python3_8
+dev-lang/python-exec python_targets_python3_9
 dev-lang/python-exec python_targets_pypy3
 
 # Zac Medico <zmedico@gentoo.org> (2010-10-20)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0f953392ec90..a885706f6a9e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -30,12 +30,6 @@ www-apps/nikola ghpages
 # oracle-jdk-bin masked for removal, mask revdep useflag.
 =app-forensics/sleuthkit-4.7.0 java
 
-# Ulrich Müller <ulm@gentoo.org> (2020-04-15, updated 2020-04-22)
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2020-04-17)
-# app-i18n/man-pages-{de,fr,nl,pl} masked for removal.
-# Bug #713590, bug #717744.
-<sys-apps/man-pages-5.05-r1 l10n_de l10n_fr l10n_nl l10n_pl
-
 # Ulrich Müller <ulm@gentoo.org> (2020-04-08)
 # Old versions of libjpeg-turbo have known security issues.
 # Use the bundled lib on your own risk. Bug #715106.
@@ -53,10 +47,7 @@ net-analyzer/hydra ncp
 # Michał Górny <mgorny@gentoo.org> (2020-03-28)
 # Requires masked dev-vcs/bzr.  Remove the mask if breezy is packaged
 # and the package is confirmed to work with it.
-app-portage/layman bazaar
-dev-qt/qt-creator bazaar
 dev-vcs/cvs2svn bazaar
-kde-apps/kdesdk-meta bazaar
 <=dev-util/rosinstall-0.7.8 test
 <=dev-util/wstool-0.1.18 test
 <=dev-python/vcstools-0.1.42 test
@@ -84,10 +75,6 @@ dev-util/buildbot doc
 # Requires deprecated python2 and pygtk
 mail-client/claws-mail python
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-25)
-# Requires www-servers/tornado with py2.
-app-backup/bup web
-
 # Michał Górny <mgorny@gentoo.org> (2020-03-24)
 # Require dev-python/recommonmark with py2.
 <sys-devel/llvm-9 doc
@@ -125,12 +112,6 @@ kde-frameworks/frameworkintegration appstream
 # The dependency is python-single-r1 while the package (and its revdeps)
 # are python-r1.
 dev-python/rdflib redland
-www-apps/venus redland
-
-# Michał Górny <mgorny@gentoo.org> (2020-02-05)
-# Requires google-api-python-client with Python 2 which is no longer
-# supported by its dependencies.
-www-client/weboob X
 
 # Michał Górny <mgorny@gentoo.org> (2020-02-04)
 # Unsatisfiable dep due to missing impls.
@@ -143,20 +124,8 @@ dev-python/zeep tornado
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-29)
 # Require dev-python/epydoc which is being removed.
-<=app-admin/system-config-printer-1.5.12-r1 doc
-<=dev-python/cosmolopy-0.1.104-r2 doc
-<=dev-python/dbus-python-1.2.4 doc
-<=dev-python/pycrypto-2.6.1-r2 doc
-<=dev-python/pycups-1.9.73-r1 doc
-<=dev-python/pycups-1.9.73-r2 doc
-<=dev-python/pygene-0.2.1-r1 doc
-<=dev-python/python-musicbrainz-0.7.4-r1 doc
-<=dev-python/python-nss-0.16.0 doc
-<=dev-python/qpid-python-0.20 doc
 <=dev-python/restkit-4.2.2 doc
 <=dev-python/suds-0.6-r1 doc
-<=sci-libs/pymmlib-1.2.1-r1 doc
-<=sys-apps/portage-2.3.86 epydoc
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-27)
 # Requires old split dev-python/twisted-*.
@@ -165,7 +134,6 @@ net-voip/telepathy-rakia test
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-27)
 # dev-python/zsi is being removed.
-media-sound/sonata lyrics
 sci-chemistry/pdb2pqr opal
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-12)
@@ -176,7 +144,6 @@ sys-libs/libcxx libcxxrt
 # PHP 7.1 is end of life and has security issues Bug 703326
 # Associated packages are not ready for new versions tracked in bug 702110
 dev-libs/ossp-uuid php
-www-servers/nginx-unit php7-1
 
 # Michał Górny <mgorny@gentoo.org> (2019-12-16)
 # Requires old x11-libs/fox:1.6 slot.
@@ -203,7 +170,6 @@ dev-python/restkit cli
 # using any-r1 API to build docs or cond-deps.
 dev-python/matplotlib doc
 dev-python/pandas doc
-<dev-python/pandas-0.24.2 full-support test
 dev-python/pandas-datareader doc
 dev-python/patsy doc
 dev-python/statsmodels doc
@@ -212,25 +178,12 @@ dev-python/statsmodels doc
 # broken static-linking in glibc and maybe others
 >app-shells/mksh-57-r1 static
 
-# Michał Górny <mgorny@gentoo.org> (2019-11-29)
-# Requires dev-python/astropy that's being removed.
-sci-visualization/veusz fits
-
-# Michał Górny <mgorny@gentoo.org> (2019-11-25)
-# Requires old version of dev-python/sphinx that's being removed.
-~dev-python/fabric-2.3.1 doc
-
-# Michał Górny <mgorny@gentoo.org> (2019-11-09)
-# eMovix is being removed.
-kde-apps/k3b emovix
-
 # Patrick McLean <chutzpah@gentoo.org> (2019-11-07)
 # Collides with sys-libc/glibc[crypt]
 sys-libs/libxcrypt split-usr system
 
 # Michał Górny <mgorny@gentoo.org> (2019-10-05)
 # net-libs/openslp is being removed.
-net-nds/openldap slp
 sys-block/open-iscsi slp
 sys-block/open-isns slp
 
@@ -240,7 +193,6 @@ sys-block/open-isns slp
 =dev-libs/xapian-bindings-1.2.25 php
 media-gfx/exact-image php
 sci-geosciences/mapserver php
-www-servers/nginx-unit php5-6
 
 # Michał Górny <mgorny@gentoo.org> (2019-09-28)
 # media-fonts/hkscs-ming is slated for removal.
@@ -269,10 +221,6 @@ games-fps/doomsday fmod
 # <dev-scheme/guile-2 is package.mask'd
 www-client/elinks guile
 
-# Michał Górny <mgorny@gentoo.org> (2019-08-27)
-# net-misc/tokyotyrant is slated for removal.
-app-metrics/collectd collectd_plugins_tokyotyrant
-
 # Kent Fredric <kentnl@gentoo.org> (2019-08-07)
 # Newer versions of nqp need newer versions of jdk to run on the jvm,
 # but these currently don't exist in gentoo. The USE flags have to be
@@ -316,12 +264,6 @@ app-text/ghostscript-gpl l10n_ja
 # x11-wm/afterstep is slated for removal.
 x11-terms/aterm background
 
-# Brian Evans <grknight@gentoo.org> (2019-03-15)
-# Prepare to remove the mysqlcompat USE from mariadb-connector-c
-# Has multiple issues including symlinks and threading.
-# Packages should use and access libmariadb.so instead
-dev-db/mariadb-connector-c mysqlcompat
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-03-05)
 # Not keyworded on non-x86 arches
 app-admin/conserver freeipmi
@@ -370,7 +312,6 @@ sys-libs/glibc cet
 # Bugs #651604, #651606.
 <dev-libs/leveldb-1.20 static-libs
 sys-block/fio static
-sys-cluster/ceph static-libs
 
 # Michał Górny <mgorny@gentoo.org> (2018-05-16)
 # Depends on last-rited sci-libs/coinhsl.
@@ -442,11 +383,6 @@ net-analyzer/nrpe command-args
 # sys-kernel/openvz-sources is being treecleaned wrt #580516.
 app-emulation/libvirt openvz
 
-# Michał Górny <mgorny@gentoo.org> (2017-07-30)
-# The Z3 backend is unstable and causes assertion failures. Mask it
-# until upstream fixes it properly.
-<sys-devel/clang-8 z3
-
 # Mike Gilbert <floppym@gentoo.org> (2017-07-09)
 # Matthias Dahl <matthias.dahl@binary-island.eu> (2017-07-05)
 # Both are not your typical garden-variety Linux programs and are
@@ -457,12 +393,6 @@ app-emulation/libvirt openvz
 sys-boot/gnu-efi custom-cflags
 sys-boot/refind custom-cflags
 
-# Michał Górny <mgorny@gentoo.org> (2017-06-29)
-# Upstream switched to CMake and no longer provides option to build
-# static and shared libs. The flag is preserved not to break USE
-# depenencies.
->=app-arch/snappy-1.1.5 static-libs
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-29)
 # Does not build
 sci-libs/linux-gpib php
@@ -552,7 +482,6 @@ dev-lang/moarvm asan
 # (see bug #556378 and others)
 www-client/firefox system-cairo
 mail-client/thunderbird system-cairo
->=www-client/seamonkey-2.41 system-cairo
 
 # James Le Cuirot <chewi@gentoo.org> (2016-04-10)
 # Slower and less reliable than HotSpot and we don't support Java on
@@ -624,11 +553,6 @@ app-leechcraft/lc-azoth sarin
 # Needs hardmasked lua-5.2
 >=media-plugins/grilo-plugins-0.2.12 lua
 
-# Rick Farina <zerochaos@gentoo.org> (2015-12-30)
-# mask test use flag since tests do not pass
-# mask development use flag since most of it isn't packaged (or useful)
-net-analyzer/metasploit development test
-
 # Tom Wijsman <TomWij@gentoo.org> (2014-05-14)
 # Documentation generation needs APIviz which is not in the Portage tree yet.
 # Tracked in Gentoo bug #509602.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 243fed2cc60b..ece807d30479 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -22,14 +22,6 @@ mate-base/mate bluetooth
 # on stable systems or force a stable upgrade.
 dev-libs/boost numpy
 
-# Brian Evans <grknight@gentoo.org> (2020-02-27)
-# Two packages are delayed during stable of PHP 7.4
-# arm, arm64 and hppa necessary to not disruput consistency
-# but this will allow all other packages to be used
-# Bug 706180, 710942
-dev-php/pecl-apcu php_targets_php7-4
-dev-php/pecl-yaz php_targets_php7-4
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
@@ -52,10 +44,6 @@ media-libs/opencv vtk
 # instead if you can.
 dev-perl/DBD-mysql mariadb
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-08-16)
-# dev-libs/libical[glib] was not stable tested, bug #689434
-=dev-libs/libical-3.0.5 glib
-
 # Michał Górny <mgorny@gentoo.org> (2019-07-31)
 # Freshly added test dependency for a test-restricted package.  Mask
 # the flag to avoid stabilizing it for the time being.
@@ -157,7 +145,7 @@ dev-php/PEAR-Text_Password test
 # Andreas Sturmlechner <asturm@gentoo.org> (2017-10-22)
 # Requires unmaintained unstable dependency net-libs/gloox.
 # The go flag requires stable masked dev-lang/go[gccgo].
-www-servers/uwsgi go pypy uwsgi_plugins_alarm_xmpp
+www-servers/uwsgi go uwsgi_plugins_alarm_xmpp
 
 # Michael Palimaka <kensington@gentoo.org> (2017-09-30)
 # Required dependeny is not stable
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 7e3b27676be3..388ed4586aa4 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Ben Kohler <bkohler@gentoo.org> (2020-05-15)
+# Mask 9.4 target to match <9.5 package.mask entry
+postgres_targets_postgres9_4
+
 # Matt Turner <mattst88@gentoo.org> (2020-03-25)
 # media-libs/libav is masked for removal
 libav
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 3d7804a385c6..a8422351f10a 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -1,9 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2020-05-25)
+# Python 3.9 is not yet stable.
+python_targets_python3_9
+python_single_target_python3_9
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs