gentoo resync : 10.09.2021

28 files changed, 179 insertions, 112 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index fbb7d2ba16ba..c12854bc67dc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 28ca080220da..dfb3c9ca0247 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# David Seifert <soap@gentoo.org> (2021-09-04)
+# dev-lang/go not keyworded here
+sys-libs/libcap tools
+
 # Marek Szuba <marecki@gentoo.org> (2021-08-17)
 # net-wireless/rtl-sdr not keyworded here
 sys-apps/rng-tools rtlsdr
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index be0cafe42b36..d753dcd3504a 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-04)
+# This code assumes 32-bit longs and must therefore be built as a 32-bit binary.
+sys-fs/atari-fdisk
+
 # David Seifert <soap@gentoo.org> (2018-01-03)
 # Requires 32-bit multilib compatibility
 sys-block/megamgr
diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults
index b509b305b008..0c9b008c9fd7 100644
--- a/profiles/arch/amd64/x32/make.defaults
+++ b/profiles/arch/amd64/x32/make.defaults
@@ -1,10 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 DEFAULT_ABI="x32"
 ABI="x32"
 MULTILIB_ABIS="amd64 x86 x32"
 
+# Mike Gilbert <floppym@gentoo.org> (2021-09-06)
+# x32 userspace runs on amd64 kernels.
+KERNEL_ABI="amd64"
+
 # Michał Górny <mgorny@gentoo.org> (2014-07-01)
 # Default to abi_x86_x32 for packages that don't have it forced.
 ABI_X86="x32"
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index ee7ea189a2a5..a0232eb6ec61 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-09-09)
+# Jupyterlab and friends require net-libs/nodejs
+dev-python/jupyterlab
+dev-python/jupyterlab-lsp
+
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-02-13)
 # Is reverse-dependency of dev-qt/qtwebengine
 media-gfx/freecad
@@ -81,7 +86,7 @@ media-gfx/digikam:5
 media-gfx/luminance-hdr
 media-sound/frescobaldi
 media-sound/teamspeak-client:3
->=media-video/openshot-2.5.1_p20210103
+>=media-video/openshot-2.6.0
 media-video/vidify
 media-video/vidify-audiosync
 net-analyzer/nmapsi
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index de57f5b8cf03..0b0f7f6b8122 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Anna Vyalkova <cyber@gentoo@sysrq.in> (2021-09-04)
+# net-libs/canlock not keyworded
+>=net-nntp/tin-2.6.0 cancel-locks
+
 # Sam James <sam@gentoo.org> (2021-08-14)
 # Needs Raspberry Pi specific applications
 media-video/mjpg-streamer -input-raspicam
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 5a86f34feaff..2c2966e181bd 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# David Seifert <soap@gentoo.org> (2021-09-04)
+# dev-lang/go not keyworded here
+sys-libs/libcap tools
+
 # Marek Szuba <marecki@gentoo.org> (2021-08-11)
 # dev-ruby/tty-editor not keyworded here yet (Bug #807685)
 app-text/htmltidy test
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index e5f2e3039e40..adfc8b764e9a 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2021-09-06)
+# net-dialup/linux-atm does not have stable keywords on hppa
+# dev-libs/libbpf does not have stable keywords on hppa
+# net-firewall/iptables does not have stable keywords on hppa
+sys-apps/iproute2 atm bpf iptables
+
 # Thomas Deutschmann <whissi@gentoo.org> (2021-06-20)
 # dev-libs/libzip does not have stable keywords on hppa
 >=media-gfx/imagemagick-7 zip
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 6927332333a6..7574729ef7d3 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# David Seifert <soap@gentoo.org> (2021-09-04)
+# dev-lang/go not keyworded here
+sys-libs/libcap tools
+
 # Marek Szuba <marecki@gentoo.org> (2021-08-17)
 # net-wireless/rtl-sdr not keyworded here
 sys-apps/rng-tools rtlsdr
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 63fa67cb5532..ec0d3456c1f3 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# David Seifert <soap@gentoo.org> (2021-09-04)
+# dev-lang/go not keyworded here
+sys-libs/libcap tools
+
 # Thomas Deutschmann <whissi@gentoo.org> (2021-08-04)
 # Requires net-misc/modemmanager[qmi], mask until keyworded
 sys-apps/fwupd modemmanager
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 45837d6ce138..cd56cfb4ff52 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,16 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-09-07)
+# firefox needs nodejs to build, no firefox-bin for riscv
+dev-ruby/capybara test
+# net-misc/memcached not keyworded yet due to failing tests (Bug #811477)
+dev-ruby/dalli test
+
+# Yixun Lan <dlan@gentoo.org> (2021-09-03)
+# dependencies not keyworded/tested
+media-sound/cmus pidgin
+
 # Jonathan Davies <jpds@protonmail.com> (2021-09-03)
 # Requires CPU with SSSE3 support
 net-analyzer/suricata hyperscan
@@ -62,16 +72,6 @@ kde-plasma/kwin accessibility screencast
 # sys-libs/libfaketime does not work properly on this arch
 sys-auth/sssd test
 
-# Marek Szuba <marecki@gentoo.org> (2021-08-14)
-# virtual/mysql & co. round-up:
-#  dev-db/mariadb fails tests here, see Bug #807995
-#  dev-db/mysql and dev-db/percona-server do not support this arch
-#  dev-db/mysql-cluster not tested yet, seriously outdated in the tree
-dev-python/mysqlclient test
-dev-python/pymysql test
-sci-libs/gdal mysql
-sys-cluster/slurm slurmdbd
-
 # Marek Szuba <marecki@gentoo.org> (2021-08-11)
 # dev-ruby/httpclient not keyworded here due to failing tests
 # (Bug #807727). That said, with httpclient-2.8.3 installed manually
@@ -160,7 +160,6 @@ sys-cluster/slurm ofed
 # Dependencies not keyworded, not tested
 virtual/notification-daemon gnome
 net-libs/gnome-online-accounts gnome
-xfce-extra/tumbler epub
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-17)
 # Ye Cao <ye.c@rioslab.org> (2021-07-31)
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 92fbe638651d..e592b1c4a5ba 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# David Seifert <soap@gentoo.org> (2021-09-04)
+# dev-lang/go not keyworded here
+sys-libs/libcap tools
+
 # Marek Szuba <marecki@gentoo.org> (2021-08-11)
 # dev-ruby/tty-editor not keyworded here yet (Bug #807685)
 app-text/htmltidy test
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index f17085509acf..ea6368da3dd5 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-09-07)
+# Reduce the stabilization nightmare.
+dev-python/ipython nbconvert notebook smp
+
 # Michał Górny <mgorny@gentoo.org> (2021-08-11)
 # Indirectly requires wxGTK[gstreamer] that is stable-masked here.
 dev-python/matplotlib wxwidgets
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index e27643adf12b..662415c672b6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-04)
+# Currently requires an unreleased version of FFmpeg. If you really want it,
+# unmask the flag and emerge ffmpeg-9999 with this environment variable set:
+# EGIT_OVERRIDE_COMMIT_FFMPEG=8649f5dca6688feb66f787dcf232d42ed20fdb28
+>=www-client/vivaldi-snapshot-4.2.2406.4 proprietary-codecs
+
 # Matt Turner <mattst88@gentoo.org> (2021-08-28)
 # Mask experimental options.
 gui-libs/gtk ffmpeg vulkan
diff --git a/profiles/default/linux/musl/mips/package.mask b/profiles/default/linux/musl/mips/package.mask
index 8b52dc4d8d35..038026c2c214 100644
--- a/profiles/default/linux/musl/mips/package.mask
+++ b/profiles/default/linux/musl/mips/package.mask
@@ -1,5 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation.
+# Copyright 1999-2021 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-dev-util/pkgconfig
 >sys-apps/kbd-1.15.5-r99
diff --git a/profiles/default/linux/uclibc/package.use b/profiles/default/linux/uclibc/package.use
deleted file mode 100644
index b60480214984..000000000000
--- a/profiles/default/linux/uclibc/package.use
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2014-08-17)
-# Avoid pulling in glib
-dev-util/pkgconfig internal-glib
diff --git a/profiles/default/linux/uclibc/packages.build b/profiles/default/linux/uclibc/packages.build
index 38c8653ce6ec..bcc0d2106efd 100644
--- a/profiles/default/linux/uclibc/packages.build
+++ b/profiles/default/linux/uclibc/packages.build
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2021 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file lists extra packages needed to build for
 # a stage 1 based on this profile.
 
-dev-util/pkgconfig
 dev-libs/libiconv
 dev-libs/libintl
diff --git a/profiles/features/uclibc/package.use b/profiles/features/uclibc/package.use
index a0b9b9391477..c5742cb3c80e 100644
--- a/profiles/features/uclibc/package.use
+++ b/profiles/features/uclibc/package.use
@@ -1,10 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Anthony G. Basile <blueness@gentoo.org> (2014-08-17)
-# Avoid pulling in glib
-dev-util/pkgconfig internal-glib
-
 # Anthony G. Basile <blueness@gentoo.org> (2018-07-14)
 # We need this to break a circular dependency with
 # 'sys-libs/libcap pam' in stage3 catalyst builds
diff --git a/profiles/features/uclibc/packages.build b/profiles/features/uclibc/packages.build
index bc9b89070183..eb8df49779a5 100644
--- a/profiles/features/uclibc/packages.build
+++ b/profiles/features/uclibc/packages.build
@@ -4,6 +4,5 @@
 # This file lists extra packages needed to build for
 # a stage 1 based on this profile.
 
-dev-util/pkgconfig
 dev-libs/libiconv
 dev-libs/libintl
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index 650516bcf853..99256f827b56 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -1,4 +1,4 @@
-# Copyright 2004-2019 Gentoo Authors
+# Copyright 2004-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ##
@@ -25,7 +25,6 @@ sys-devel/gcc
 sys-devel/gcc-config
 dev-java/java-config
 dev-util/cmake
-dev-util/pkgconfig
 # NOTE: portage no longer list /etc/gentoo-release,
 # so this is not redundant
 sys-apps/baselayout
diff --git a/profiles/license_groups b/profiles/license_groups
index 3f5fc3a68a06..fcebd32957d3 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -13,7 +13,7 @@
 # https://www.gnu.org/licenses/license-list.html
 # GPL or LGPL with various exceptions are also included here, because
 # they are more permissive than the licenses they are based on.
-GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FSFAP FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-openssl-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3-with-font-exception GPL-3+-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL
+GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FSFAP FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-openssl-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3-with-font-exception GPL-3+-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL
 
 # Free software licenses approved by the FSF
 FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 FraunhoferFDK gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL-1.0 Zend-2.0
diff --git a/profiles/package.mask b/profiles/package.mask
index 2864582190db..76df766f24bf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,81 @@
 
 #--- END OF EXAMPLES ---
 
+# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
+# Relies on setuptools' deprecated use_2to3 option.
+# Last release in 2019, no revdeps.
+# Removal on 2021-10-09. Bug #812236
+dev-python/sparql-wrapper
+
+# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
+# Relies on setuptools' deprecated use_2to3 option.
+# Last release in 2019, no revdeps.
+# Removal on 2021-10-09. Bug #812233
+dev-python/pybluez
+
+# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
+# Relies on setuptools' deprecated use_2to3 option.
+# Last release in 2015, no revdeps.
+# Removal on 2021-10-09. Bug #812224
+dev-python/lcdproc
+
+# Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
+# Relies on setuptools' use_2to3 option.
+# Last release in 2017, no revdeps.
+# Removal on 2021-10-09. Bug #812221
+dev-python/fudge
+
+# Anna Vyalkova <cyber+gentoo@sysrq.in> (2021-09-07)
+# Mask backwards-incompatible version to avoid autodeletion of previous one.
+# Data migration is not supported upstream and can't be done automatically.
+# https://github.com/martinrotter/rssguard/releases/tag/4.0.0
+# https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md#migratt
+>=net-news/rssguard-4.0.0
+
+# Louis Sautier <sbraz@gentoo.org> (2021-09-09)
+# No reverse dependencies, no upstream activity for more than 3 years.
+# dev-python/oauthlib is maintained and provides the same functionality.
+# Removal on 2021-10-09.
+dev-python/oauth2
+
+# Thomas Deutschmann <whissi@gentoo.org> (2021-09-07)
+# Masked while being tested and reverse deps aren't fully compatible
+# bug #797325.
+=dev-libs/openssl-3.0*
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-09-07)
+# EAPI-5, dead upstream, last (and only) version added in 2011
+# Bug 644344; Removal on 2021-10-07.
+net-libs/gsnmp
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-09-07)
+# EAPI-5, dead upstream, last bump in 2012
+# Bug 644344; Removal on 2021-10-07.
+net-analyzer/scli
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-09-04)
+# EAPI-5, dead, unused, bug 808213; Removal on 2021-10-04.
+x11-libs/mx
+
+# David Seifert <soap@gentoo.org> (2021-09-04)
+# Last upstream release over 2.5 years ago, removed by Fedora,
+# unresponsive maintainer in Gentoo, broken with linux-headers-5.13,
+# relies on glibc implementation details.
+# Bug #717114, #801457, removal in 30 days.
+dev-util/trinity
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-09-03)
+# Currently may not function with kde-plasma/kwin (black screen),
+# so keeping masked for testing due to being a primary consumer.
+# Should be safe to unmask if you are using x11-wm/mutter instead.
+>=gui-libs/egl-wayland-1.1.8
+
+# Sam James <sam@gentoo.org> (2021-09-03)
+# Mask broken version of setuptools_scm with
+# missing runtime dependency.
+# bug #811504
+=dev-python/setuptools_scm-6.3.0
+
 # David Seifert <soap@gentoo.org> (2021-08-29)
 # Broken for the past 5 years (#585942), no new upstream release in over
 # 5 years. Same issues as sci-biology/wgs-assembler, use a modern
@@ -141,42 +216,6 @@ app-office/plan
 # Removal on 2021-09-09.
 net-print/libgnomecups
 
-# Joshua Kinard <kumba@gentoo.org> (2021-08-09)
-# Dead upstream and has build issues in modern times.
-# See bugs #551786 and #715846.  Removal in 30 days.
-net-dialup/xc
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-09)
-# EAPI-5, dead, unused; bug #776403. Removal on 2021-09-08.
-dev-perl/Goo-Canvas
-x11-libs/goocanvas:0
-
-# Louis Sautier <sbraz@gentoo.org> (2021-08-07)
-# No reverse dependencies, no upstream activity for more than 5 years,
-# failing tests with Python 3.10. Removal on 2021-09-06.
-dev-python/pydiff
-
-# Ulrich Müller <ulm@gentoo.org> (2021-08-06)
-# Masked for removal in 30 days. Upstream has joined the
-# manpages-l10n project, so 5.06 was their ultimate release
-# as a separate package. Use app-i18n/man-pages-l10n[l10n_it]
-# as replacement. Bug #769017.
-app-i18n/man-pages-it
-
-# David Seifert <soap@gentoo.org> (2021-08-05)
-# Dead upstream, last release over 5 years ago, multiple
-# build issues, fails to build with GCC 11. Use something like
-# sci-biology/abyss or canu as a modern day replacement.
-# Bug #610094, #715874, #731860, #739486, removal in 30 days.
-sci-biology/wgs-assembler
-
-# Sam James <sam@gentoo.org> (2021-08-05)
-# Fails to build with GCC 11. No activity upstream.
-# bug #740308, bug #789816. Removal on 2021-09-05.
-app-eselect/eselect-audicle
-app-eselect/eselect-miniaudicle
-media-sound/audicle
-
 # David Seifert <soap@gentoo.org> (2021-08-04)
 # Last release over 4 years ago, upstream pretty much dead, the
 # ecosystem has switched to dev-util/pkgconf, which is alive. Testing
@@ -184,30 +223,23 @@ media-sound/audicle
 # (If you hit blockers, please run:
 # $ emerge --deselect dev-util/pkgconfig
 # This is necessary as your world file should not contain dependencies.)
-# Bug #245228, #632124, #691268, #767853, removal in 30 days.
 dev-util/pkgconfig
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
-# Two years after the tracker was opened it is time to mask dev-qt/qtwebkit
-# for good. No commits to upstream repository for >9 months, latest available
-# tarball still "alpha" with warning about known unpatched vulnerabilities.
-# Bugs: #684580, #685750, #709858, #740416
-dev-qt/qtwebkit:5
-app-text/fb2edit
+# Depends on Qt5WebKit with more holes in it than swiss cheese. Bug #685750
+# Last release in 2016. Removal on 2021-10-04.
 mail-client/trojita
-<media-video/openshot-2.5.1_p20210228
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-31)
-# Obsolete; all versions in current Perl core distributions
-# are newer, and no virtuals currently pull these packages.
-# Removal in 30 days.
-perl-core/ExtUtils-MakeMaker
-perl-core/ExtUtils-Manifest
-perl-core/File-Path
-perl-core/Getopt-Long
-perl-core/HTTP-Tiny
-perl-core/JSON-PP
-perl-core/libnet
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
+# Depends on Qt5WebKit with more holes in it than swiss cheese. Bug #740416
+# Removal on 2021-10-04.
+app-text/fb2edit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
+# No commits to upstream repository for >9 months, latest available tarball
+# still "alpha" with warning about known unpatched vulnerabilities. Bug #684580
+# Removal on 2021-10-04.
+dev-qt/qtwebkit:5
 
 # Joonas Niilola <juippis@gentoo.org> (2021-07-29)
 # Upstream provided migration instructions from 2. -> 3. update,
@@ -367,18 +399,6 @@ sys-libs/db:5.1
 media-plugins/kodi-game-libretro-nestopia
 media-plugins/kodi-game-libretro-dosbox
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-10-26)
-# Historical metapackage that exists in slot 5 only for transition from KDE SC4.
-# Masked for removal on 2021-08-31. Replaced by:
-# emerge --noreplace kde-plasma/plasma-meta kde-apps/kde-apps-meta
-kde-apps/kde-meta:5
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-10-26)
-# Historical metapackage that exists in slot 5 only for transition from KDE SC4.
-# Masked for removal on 2021-08-31. Replaced by:
-# emerge --noreplace kde-plasma/plasma-meta kde-apps/kdecore-meta
-kde-apps/kdebase-meta:5
-
 # Sam James <sam@gentoo.org> (2020-10-05)
 # Masked for testing. New major versions of Guile
 # often break reverse dependencies.
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.mask
index 913b4a72b20a..e7083708ab64 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-ld64/package.mask
@@ -2,5 +2,4 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # packages which link to framework and therefore fail (blocks)
-dev-util/pkgconfig
 =sys-devel/binutils-apple-11.3.1-r1
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index bcc732c3eb55..18d5f045ba27 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -1,10 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # unmask ld symlink package, due to missing blocks support we are not
 # able to compile binutils-apple
 sys-devel/binutils-apple
 -sys-devel/native-cctools
-
-# packages which link to framework and therefore fail (blocks)
-dev-util/pkgconfig
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 70b202547e6d..643431b48593 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,3 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-09-05)
+# gdbm-1.21 fails to build right now on macOS with:
+# ```gdbmshell.c:1013:54: error: ‘struct stat’ has no member named ‘st_mtim’```
+# bug #811792
+=sys-libs/gdbm-1.21
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index b94126cc4298..71ea5986a5e7 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -1,6 +1,5 @@
 slotmove net-irc/kvirc 4 0
 move x11-apps/xtitle x11-misc/xtitle
-move kde-base/kde-meta kde-apps/kde-meta
 move media-video/nvenc media-video/nvidia_video_sdk
 move dev-python/socksipy dev-python/PySocks
 slotmove <sci-libs/libint-2 0 1
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index 59da6b5d43f4..9dee69041650 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -9,3 +9,5 @@ move dev-python/python-musicbrainz-ngs dev-python/python-musicbrainzngs
 move dev-python/python-podman dev-python/podman-py
 move dev-python/u-msgpack dev-python/u-msgpack-python
 move sci-physics/geant-vmc sci-physics/geant4_vmc
+move dev-python/beautifulsoup dev-python/beautifulsoup4
+slotmove dev-python/beautifulsoup4 4 0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4d6444cd55b2..e9bac414093f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2854,8 +2854,7 @@ dev-util/perf:numa - Enable NUMA support
 dev-util/perf:perl - Add support for Perl as a scripting language for perf tools.
 dev-util/perf:systemtap - Add support to define SDT event in perf tools.
 dev-util/perf:unwind - Use sys-libs/libunwind for frame unwinding support.
-dev-util/pkgconf:pkg-config - Install as a replacement for dev-util/pkgconfig
-dev-util/pkgconfig:internal-glib - Use internal copy of dev-libs/glib
+dev-util/plan9port:freefonts - Don't install BigelowHolmes fonts
 dev-util/poke:machine-interface - enable machine-interface protocol using dev-libs/json-c
 dev-util/pycharm-community:bundled-jdk - Use bundled jdk
 dev-util/pycharm-professional:bundled-jdk - Use bundled jdk
@@ -3980,11 +3979,12 @@ media-gfx/graphicsmagick:dynamic-loading - Compile graphicsmagick with dynamical
 media-gfx/graphicsmagick:fpx - Enable FlashPix support with media-libs/libfpx
 media-gfx/graphicsmagick:q16 - Set storage quantum size to 16 (~2*memory)
 media-gfx/graphicsmagick:q32 - Set storage quantum size to 32 (~5*memory)
-media-gfx/graphviz:X - Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)
+media-gfx/graphviz:X - Builds dotty, lneato, unflatten, vimdot, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)
 media-gfx/graphviz:devil - Enables DevIL output plugin -Tdevil
 media-gfx/graphviz:gtk - Enables gtk+ output plugin -Tgtk (needs cairo)
 media-gfx/graphviz:gts - Enables support for GNU Triangulated Surface Library (required for sfdp to work)
 media-gfx/graphviz:lasi - Enables PostScript output via media-libs/lasi, for plugin -Tlasi (needs cairo)
+media-gfx/graphviz:lefty - Builds lefty front-end, requires x11-libs/libXmu and x11-libs/libXaw
 media-gfx/gthumb:http - Enable webservice integration through net-libs/webkit-gtk
 media-gfx/gthumb:slideshow - Enable slideshow plugin
 media-gfx/hugin:sift - automatically align images with media-gfx/autopano-sift-C
@@ -4190,6 +4190,7 @@ media-libs/libmp4v2:utils - Install command-line utilities
 media-libs/libmypaint:gegl - Add support for media-libs/gegl
 media-libs/libopenglrecorder:openh264 - Enable H.264 support using media-libs/openh264
 media-libs/libopenglrecorder:vpx - Enable VP8/VP9 codec support via media-libs/libvpx
+media-libs/libopenshot:opencv - Enable media-libs/opencv support
 media-libs/libpagemaker:tools - Build command line file format conversion tools
 media-libs/libplacebo:glslang - Use dev-util/glslang to compile GLSL
 media-libs/libplacebo:lcms - Add support for color management via media-libs/lcms
@@ -5953,6 +5954,7 @@ net-libs/axtls:static - Statically build axhttpd server
 net-libs/c-client:chappa - Enable Eduardo Chappa's patches for use with mail-client/alpine (mainly adds support for maildir)
 net-libs/c-client:doc - Install RFCs related to IMAP
 net-libs/c-client:topal - Enable support for net-mail/topal for use with mail-client/alpine
+net-libs/canlock:legacy - Enable or disable building legacy code (v2 compatible)
 net-libs/cvm:vpopmail - Enable vpopmail support
 net-libs/czmq:drafts - Build draft API, which may change at any time without any notice, and is therefore not recommended for normal use. (requires draft support in net-libs/zeromq as well)
 net-libs/czmq:http-client - Build support for HTTP client using net-misc/curl
@@ -6660,7 +6662,7 @@ net-nntp/sabnzbd:rar - Add support for extracting rar files
 net-nntp/sabnzbd:unzip - Add support for extracting zip files
 net-nntp/slrn:canlock - Add support for cancel locks via net-libs/canlock
 net-nntp/slrn:uudeview - Add support for yEnc coding and more using dev-libs/uulib
-net-nntp/tin:cancel-locks - Enable Cancel-Lock header functionality (also enables USE=evil)
+net-nntp/tin:cancel-locks - Enable Cancel-Lock header functionality
 net-nntp/tin:etiquette - Enable the display off posting etiquettes
 net-nntp/tin:gpg - Enable app-crypt/gnupg support
 net-nntp/tin:mime - Add MIME support
@@ -7217,7 +7219,6 @@ sci-libs/dealii:ginkgo - Add support for ginkgo (sci-libs/ginkgo)
 sci-libs/dealii:gmsh - Add support for gmsh (sci-libs/gmsh)
 sci-libs/dealii:metis - Add support for metis (sci-libs/metis)
 sci-libs/dealii:muparser - Add support for muparser (dev-cpp/muParser)
-sci-libs/dealii:nanoflann - Adds support for nanoflann (sci-libs/nanoflann)
 sci-libs/dealii:opencascade - Add support for opencascade (sci-libs/opencascade)
 sci-libs/dealii:p4est - Add support for p4est (sci-libs/p4est)
 sci-libs/dealii:petsc - Add support for petsc (sci-mathematics/petsc)
@@ -7226,7 +7227,6 @@ sci-libs/dealii:slepc - Add support for slepc (sci-mathematics/slepc)
 sci-libs/dealii:sparse - Add support for suitesparse (sci-libs/suitesparse)
 sci-libs/dealii:sundials - Add support for sundials (sci-libs/sundials)
 sci-libs/dealii:symengine - Add support for symengine (sci-libs/symengine)
-sci-libs/dealii:tbb - Add threading support with the help of the tbb library (dev-cpp/tbb)
 sci-libs/dealii:trilinos - Add support for trilinos (sci-libs/trilinos)
 sci-libs/dlib:cblas - Build with CBLAS virtual/cblas
 sci-libs/dlib:cuda - Enable support for CUDA for Deep Neural Networks (cuDNN) on GPU (experimental)
@@ -7580,6 +7580,9 @@ sci-visualization/gwyddion:sourceview - Enable support for x11-libs/gtksourcevie
 sci-visualization/labplot:cantor - Enable support for different open-source computer algebra systems via kde-apps/cantor
 sci-visualization/labplot:fits - Enable support for NASA's sci-libs/cfitsio library
 sci-visualization/labplot:libcerf - Enable special functions from sci-libs/libcerf
+sci-visualization/labplot:markdown - Enable Markdown support via app-text/discount
+sci-visualization/labplot:matio - Enable support for matio (sci-libs/matio)
+sci-visualization/labplot:origin - Enable support for reading OriginLab OPJ project files through sci-libs/liborigin
 sci-visualization/labplot:root - Enable support for CERN's ROOT file type
 sci-visualization/labplot:serial - Enable support for RS232 serial ports using dev-qt/qtserialport
 sci-visualization/opendx:cdf - Add support for sci-libs/cdf data exchange format
@@ -7815,6 +7818,7 @@ sys-apps/systemd:cryptsetup - Enable cryptsetup tools (includes unit generator f
 sys-apps/systemd:curl - Enable support for uploading journals
 sys-apps/systemd:dns-over-tls - Enable DNS-over-TLS support
 sys-apps/systemd:elfutils - Enable coredump stacktraces in the journal
+sys-apps/systemd:fido2 - Enable FIDO2 support
 sys-apps/systemd:gcrypt - Enable sealing of journal files using gcrypt
 sys-apps/systemd:gnuefi - Enable EFI boot manager and stub loader (built using sys-boot/gnu-efi)
 sys-apps/systemd:homed - Enable portable home directories
@@ -8315,6 +8319,7 @@ sys-libs/libblockdev:kbd - Enable kernel block device support.
 sys-libs/libblockdev:lvm - Enable support for Logical Volume Management via sys-fs/lvm2.
 sys-libs/libblockdev:tools - Build tools
 sys-libs/libblockdev:vdo - Enable Virtual Data Optimizer support.
+sys-libs/libcap:tools - Install captree, which requires dev-lang/go
 sys-libs/libcxx:libcxxabi - Build on top of sys-libs/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
 sys-libs/libcxx:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.
 sys-libs/libcxxabi:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependency on gcc
@@ -8950,12 +8955,14 @@ x11-wm/xpra:brotli - Enable brotli compression support
 x11-wm/xpra:client - Build client-side code
 x11-wm/xpra:clipboard - Enable clipboard support
 x11-wm/xpra:csc - Enable csc softscaler support
+x11-wm/xpra:html - Install the HTML5 client
 x11-wm/xpra:ibus - Use ibus input method via app-i18n/ibus
 x11-wm/xpra:pillow - Enable pillow support
 x11-wm/xpra:pinentry - Use app-crypt/pinentry for password entry
 x11-wm/xpra:server - Build server-side code
 x11-wm/xpra:vpx - Enable vpx image format support
 x11-wm/xpra:webcam - Enable webcam support via opencv
+x11-wm/xpra:xdg - Enable support for XDG-based menus
 xfce-base/libxfce4ui:glade - Build support for Glade 3's GtkBuilder implementation
 xfce-base/libxfce4ui:system-info - Enable system information in xfce4-about.
 xfce-base/thunar:trash-panel-plugin - Build the trash status indicator plugin for the XFCE panel