gentoo resync : 12.07.2021

24 files changed, 121 insertions, 79 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 32489d150dc4..84138cb0bfd3 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 a9342f00f37c..f8713ce99e77 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
 
+# Lars Wendler <polynomial-c@gentoo.org> (2021-07-09)
+# dev-libs/libbpf is not keyworded for alpha (yet?)
+sys-apps/iproute2 bpf
+
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 144a5e516b1b..e2b47d92c069 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-07-12)
+# Haskell is (only) available on amd64/x86 right now in Gentoo
+# bug #801649
+dev-util/diffoscope -haskell
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
 # gui-libs/egl-wayland with nvidia-drivers is supported on this arch.
 x11-base/xwayland -video_cards_nvidia
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index f1751dec36f1..8fa70e683bc3 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -10,10 +10,6 @@
 python_single_target_python3_10
 python_targets_python3_10
 
-# Michał Górny <mgorny@gentoo.org> (2021-01-07)
-# Prebuilt kernel rebuilds are supported on stable yet.
-dist-kernel
-
 # Sam James <sam@gentoo.org> (2020-12-22)
 # Not yet stable
 lirc
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index bb546ad7d536..ff0cafe9ef98 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -10,10 +10,6 @@
 python_single_target_python3_10
 python_targets_python3_10
 
-# Michał Górny <mgorny@gentoo.org> (2021-01-07)
-# Prebuilt kernel rebuilds are supported on stable yet.
-dist-kernel
-
 # Sam James <sam@gentoo.org> (2020-12-23)
 # dev-lang/luajit is not yet stable
 lua_single_target_luajit
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 522059cbd0bb..e9acf79d2f25 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-07-12)
+# Haskell is only available on amd64/x86 right now in Gentoo
+# bug #801649
+dev-util/diffoscope haskell
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
 # gui-libs/egl-wayland with nvidia-drivers is only usable on some arches.
 x11-base/xwayland video_cards_nvidia
@@ -9,7 +14,7 @@ x11-wm/mutter video_cards_nvidia
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-06-16)
 # sci-libs/pcl-1.11.1 is missing support for >=sci-libs/vtk-9
 # bug #796368
-=media-gfx/freecad-0.19.2-r2 pcl
+~media-gfx/freecad-0.19.2 pcl
 
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-06-11)
 # Has unpackaged depdencies, bug #795459
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 8b000f6489c6..c375bcdc9f57 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (2021-07-09)
+# dev-libs/libbpf is not keyworded for m68k (yet?)
+sys-apps/iproute2 bpf
+
 # Matt Turner <mattst88@gentoo.org> (2020-12-05)
 # dev-python/parameterized is not keyworded
 dev-util/gtk-doc test
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 5b0df73f6d2b..885311c091f4 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-11)
+# Causes 35 tests to fail with "fatal llvm error"
+dev-db/postgresql llvm
+
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # sys-cluster/ucx fails to compile on this arch
 sys-cluster/slurm ucx
@@ -9,13 +13,6 @@ sys-cluster/slurm ucx
 # net-dialup/mgetty fails to compile on this arch
 mail-mta/courier fax
 
-# Marek Szuba <marecki@gentoo.org> (2021-07-05)
-#   dev-db/postgresql not keyworded here yet
-dev-db/libdbi-drivers postgres
-dev-libs/cyrus-sasl postgres
-mail-mta/courier postgres
-net-libs/courier-authlib postgres
-
 # Ye Cao <ye.c@rioslab.org> (2021-07-02)
 # Dependencies not keyworded, not tested
 app-text/texlive-core xetex
@@ -43,8 +40,8 @@ dev-cpp/eigen doc test
 dev-python/networkx extras pandas
 #  - sci-libs/umfpack (and a lot of its own deps in turn)
 dev-python/scipy sparse
-#  - dev-db/libdbi, sys-cluster/ceph
-net-analyzer/rrdtool dbi rados
+#  - sys-cluster/ceph
+net-analyzer/rrdtool rados
 #  - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
 sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_dynamic-sl openmpi_ofed_features_rdmacm openmpi_ofed_features_udcm
 #  - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
@@ -52,7 +49,7 @@ sys-cluster/slurm hdf5 ofed slurmdbd
 
 # Ye Cao <ye.c@rioslab.org> (2021-06-24)
 # Dependencies not keyworded, not tested
-media-gfx/imagemagick fftw openexr wmf
+media-gfx/imagemagick openexr wmf
 
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
 # Dependencies not keyworded, not tested
@@ -129,12 +126,10 @@ dev-libs/libpcre jit
 # This includes also packages which do not support python-3 or
 # do not support python-3.7 yet.
 
-app-admin/syslog-ng amqp dbi geoip2 kafka mongodb redis spoof-source smtp snmp test
+app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp snmp test
 app-arch/p7zip wxwidgets
-app-crypt/mit-krb5 doc
 app-doc/doxygen doc
 app-editors/emacs mailutils
-app-misc/pax-utils python
 app-text/asciidoc test
 app-text/ghostscript-gpl cups
 app-text/po4a test
@@ -153,7 +148,6 @@ dev-python/urllib3 test
 dev-util/catalyst iso
 dev-util/pkgconf test
 dev-vcs/git cvs highlight subversion
-dev-vcs/mercurial zsh-completion
 media-libs/harfbuzz doc
 sys-libs/libcxx libcxxabi libunwind static-libs
 sys-libs/libcxxabi libunwind
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 1da3c44b0864..df40319274bd 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -21,10 +21,6 @@ lua_single_target_lua5-2
 lua_single_target_luajit
 lua_targets_lua5-2
 lua_targets_luajit
-# dev-lang/lua:5.1 needs run-time testing, it passes build-time tests
-# but its test suite is much less comprehensive than that of 5.2+
-lua_single_target_lua5-1
-lua_targets_lua5-1
 
 # Ben Kohler <bkohler@gentoo.org> (2019-01-09)
 # no fam providers keyworded yet
@@ -42,7 +38,6 @@ java
 kerberos
 latex
 libedit
-lua
 mono
 motif
 opencl
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index db99db7e76b6..4f1ddc270e52 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-07-12)
+# Haskell is (only) available on amd64/x86 right now in Gentoo
+# bug #801649
+dev-util/diffoscope -haskell
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
 # Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
 games-fps/yamagi-quake2 vulkan
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 469e5f74c244..e0bd80001526 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -10,10 +10,6 @@
 python_single_target_python3_10
 python_targets_python3_10
 
-# Michał Górny <mgorny@gentoo.org> (2021-01-07)
-# Prebuilt kernel rebuilds are supported on stable yet.
-dist-kernel
-
 # Sam James <sam@gentoo.org> (2020-11-10)
 # media-gfx/openvdb is not stable on x86
 # ... and has failing tests right now anyway
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 6f21ce80d960..f6ee04f609fa 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (06.07.2021)
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-06)
 # Root privilege escalation, CVE-2017-18925, bug 751415
 sys-apps/opentmpfiles
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d9a86e696f2b..83513d5d82c1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -136,10 +136,6 @@ media-gfx/blender doc
 # but making it do so while vendored is a non-trivial task.
 mail-mta/protonmail-bridge gui
 
-# Michał Górny <mgorny@gentoo.org> (2020-11-29)
-# libclangformat-ide is masked for removal.
-dev-qt/qt-creator clang
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-27)
 # The respective dependencies are masked for removal.
 net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 4cf756030c95..eaa49d098f58 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sam James <sam@gentoo.org> (2021-07-12)
+# Haskell isn't stable on amd64 (or anywhere)
+# bug #801649
+dev-util/diffoscope haskell
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-30)
 # dev-perl/Net-Netmask-2.0.100 needs ... and ... which ends
 # up pulling in a Test-Simple version newer than 5.32.
@@ -43,12 +48,6 @@ dev-php/theseer-Autoload test
 # Cinnamon is not stable on any architecture.
 x11-themes/arc-theme cinnamon
 
-# Sam James <sam@gentoo.org> (2020-10-09)
-# Depends on dev-libs/boost[python,numpy], not fully working atm
-# bug #733830, bug #746740, bug #753566
-media-gfx/openvdb python numpy
-media-libs/openimageio python
-
 # Pacho Ramos <pacho@gentoo.org> (2020-08-21)
 # app-text/pandoc is hard to stabilize #737612
 sys-apps/earlyoom docs
@@ -65,11 +64,6 @@ app-emulation/winetricks test
 # Dependency (net-wireless/blueman) has no stable keywords
 mate-base/mate bluetooth
 
-# David Seifert <soap@gentoo.org> (2020-03-31)
-# Numpy support in Boost.Python is brittle and shouldn't be enabled
-# on stable systems or force a stable upgrade.
-dev-libs/boost numpy
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 12955cfde540..1201801394bb 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.
 
+# Hans de Graaff <graaff@gentoo.org> (2021-07-09)
+# Mask Ruby 2.5 as EOL
+ruby_targets_ruby25
+
 # Aaron W. Swenson <titanofold@gentoo.org> (2021-07-05)
 # PostgreSQL 9.5 masked for removal
 postgres_targets_postgres9_5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/eapi b/profiles/default/linux/amd64/17.1/no-multilib/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/parent b/profiles/default/linux/amd64/17.1/no-multilib/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 845b9573adfb..0171a016d3c9 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,6 +1,10 @@
 # Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Mask in favor of opentmpfiles until usable on selinux profiles (bug #801217)
+sys-apps/systemd-tmpfiles
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-04-06)
 # depends on sys-apps/systemd
 kde-plasma/plasma-firewall
diff --git a/profiles/features/selinux/package.unmask b/profiles/features/selinux/package.unmask
new file mode 100644
index 000000000000..e3b106221de5
--- /dev/null
+++ b/profiles/features/selinux/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Unmask opentmpfiles on selinux profiles until systemd-tmpfiles is
+# usable (bug #801217).
+sys-apps/opentmpfiles
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index c81f0fe19e48..fe51d352f2f1 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -5,6 +5,10 @@ sys-libs/musl
 sys-libs/glibc
 sys-libs/pam
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
+sys-apps/systemd-tmpfiles
+
 # David Seifert <soap@gentoo.org> (2021-02-08)
 # nvidia-drivers only works against glibc.
 x11-drivers/nvidia-drivers
diff --git a/profiles/features/uclibc/package.unmask b/profiles/features/uclibc/package.unmask
new file mode 100644
index 000000000000..73afa680a140
--- /dev/null
+++ b/profiles/features/uclibc/package.unmask
@@ -0,0 +1,7 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
+# Unmask opentmpfiles on uclibc profiles until systemd-tmpfiles is
+# usable (bug #801106).
+sys-apps/opentmpfiles
diff --git a/profiles/package.mask b/profiles/package.mask
index 8efa2137c149..221b957f41ca 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,52 @@
 
 #--- END OF EXAMPLES ---
 
+# Craig Andrews <candrews@gentoo.org> (2021-07-10)
+# Masked until November, 2021
+# This release adds enforcement of the Taproot protocol change to the Bitcoin
+# rules, beginning in November. Protocol changes require user consent to be
+# effective, and if enforced inconsistently within the community may compromise
+# your security or others! If you do not know what you are doing, learn more
+# before November. (You must make a decision either way - simply not upgrading
+# is insecure in all scenarios.)
+# To learn more, see https://bitcointaproot.cc
+>=net-p2p/bitcoind-0.21.1
+>=net-p2p/bitcoin-qt-0.21.1
+>=net-libs/libbitcoinconsensus-0.21.1
+
+# Lars Wendler <polynomial-c@gentoo.org> (2021-07-10)
+# Masked for testing
+>=mail-client/claws-mail-4.0.0
+
+# Craig Andrews <candrews@gentoo.org> (2021-07-09)
+# deprecated; replaced by media-plugins/kodi-audiodecoder-sacd
+# No reverse dependencies
+# See https://bugs.gentoo.org/801406
+# Masked for removal in 30 days.
+media-plugins/kodi-vfs-sacd
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-09)
+# Last release in 2016. Tests fail with recent git versions.
+# No reverse dependencies, no maintainer.
+# Masked for removal in 30 days.
+dev-vcs/git-num
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-09)
+# Last release in 2014 and no longer supported upstream. Obsolete CSS
+# framework with known issues.
+# Masked for removal in 30 days.
+dev-ruby/compass
+dev-ruby/compass-core
+dev-ruby/compass-import-once
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-09)
+# Mask ruby25 for removal. This version is no longer supported
+# upstream. Use a newer ruby version, e.g ruby26.
+# Masked for removal in 30 days.
+dev-lang/ruby:2.5
+=dev-ruby/rubygems-2.7*
+dev-ruby/did_you_mean:2.5
+
 # Pacho Ramos <pacho@gentoo.org> (2021-07-08)
 # Doesn't support Gnome 40, use gnome-shell-extension-desktop-icons-ng
 # instead. Removal in 30 days.
@@ -271,11 +317,6 @@ dev-python/pyls-black
 # see bug: https://bugs.gentoo.org/787410
 media-gfx/povtree
 
-# Joonas Niilola <juippis@gentoo.org> (2021-06-12)
-# A library without consumers, old dep of tree-cleaned gnome-mplayer,
-# EAPI-5. Removal in ~30 days. #776898
-media-libs/gmtk
-
 # Sam James <sam@gentoo.org> (2021-06-12)
 # Masked until all reverse dependencies support
 # OCaml 4.12.
@@ -283,11 +324,6 @@ media-libs/gmtk
 >=dev-lang/ocaml-4.12
 =dev-ml/camlp4-4.12
 
-# Alfredo Tupone <tupone@gentoo.org> (2021-06-11)
-# Masked for removal in 30 days. No more supported
-<dev-lang/gnat-gpl-2017
-<dev-ada/gnat-suite-bin-2017
-
 # Tomáš Mózes <hydrapolic@gmail.com> (2021-06-10)
 # Based on unsupported grub-legacy, replaced by
 # pvgrub2.
@@ -541,12 +577,6 @@ dev-go/qt
 media-plugins/kodi-game-libretro-nestopia
 media-plugins/kodi-game-libretro-dosbox
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-30)
-# broken acl handling, possible broken chattr handling
-# needs more testing
-# bug #751739
-=sys-apps/opentmpfiles-0.3.1
-
 # 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:
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 3f917d7f4b0e..ac95c81b37bc 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -34,6 +34,7 @@ amd64		default/linux/amd64/17.1/developer			stable
 amd64		default/linux/amd64/17.1/no-multilib			stable
 amd64		default/linux/amd64/17.1/no-multilib/hardened		stable
 amd64		default/linux/amd64/17.1/no-multilib/hardened/selinux	stable
+amd64		default/linux/amd64/17.1/no-multilib/systemd		dev
 amd64		default/linux/amd64/17.1/systemd			stable
 
 # AMD64 Profiles
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4f0d7bea508f..0dd7d0dd2379 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -606,6 +606,7 @@ app-emulation/snapd:apparmor - Enable AppArmor support.
 app-emulation/snapd:cgroup-hybrid - Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).
 app-emulation/snapd:forced-devmode - Automatically disable application confinement if feature detection fails.
 app-emulation/spice:smartcard - Enable smartcard remoting using app-emulation/libcacard
+app-emulation/uade:fuse - Enable sys-fs/fuse uadefs frontend for on-the-fly WAV conversion
 app-emulation/vagrant:virtualbox - Use VirtualBox provider.
 app-emulation/vice:cpuhistory - Enable 65xx CPU history support (may decrease performance)
 app-emulation/vice:ethernet - Enable ethernet emulation
@@ -1730,8 +1731,6 @@ dev-lang/gnat-gpl:graphite - Add support for the framework for loop optimization
 dev-lang/gnat-gpl:libssp - Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)
 dev-lang/gnat-gpl:lto - Build using Link Time Optimizations (LTO)
 dev-lang/gnat-gpl:mpx - Enable support for Intel Memory Protection Extensions (MPX)
-dev-lang/gnat-gpl:nopie - Disable PIE support (NOT FOR GENERAL USE)
-dev-lang/gnat-gpl:nossp - Disable SSP support (NOT FOR GENERAL USE)
 dev-lang/gnat-gpl:nptl - Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)
 dev-lang/gnat-gpl:objc - Build support for the Objective C code language
 dev-lang/gnat-gpl:objc++ - Build support for the Objective C++ language
@@ -2542,7 +2541,6 @@ dev-qt/qt-creator:ctfvisualizer - Build the Chrome Trace Format visualizer plugi
 dev-qt/qt-creator:designer - Enable designer for QtWidgets-based UIs
 dev-qt/qt-creator:glsl - Build the GLSL editor plugin
 dev-qt/qt-creator:help - Enable the integrated documentation viewer
-dev-qt/qt-creator:ios - Build plugin for Apple iOS devices
 dev-qt/qt-creator:lsp - Add support for the Language Server Protocol (LSP)
 dev-qt/qt-creator:mcu - Build plugin for MCU devices
 dev-qt/qt-creator:mercurial - Add support for dev-vcs/mercurial version control system
@@ -2564,7 +2562,6 @@ dev-qt/qt-creator:systemd - Add support for retrieving application output from j
 dev-qt/qt-creator:valgrind - Enable integration with dev-util/valgrind
 dev-qt/qt-creator:webassembly - Build WebAssembly plugin
 dev-qt/qt-creator:webengine - Use dev-qt/qtwebengine to view documentation
-dev-qt/qt-creator:winrt - Build plugin for WinRT devices
 dev-qt/qt-docs:3d - Install documentation for dev-qt/qt3d
 dev-qt/qt-docs:assistant - Install documentation for dev-qt/assistant
 dev-qt/qt-docs:bluetooth - Install documentation for dev-qt/qtbluetooth
@@ -2782,7 +2779,6 @@ dev-util/diffoscope:squashfs - Use sys-fs/squashfs-tools
 dev-util/diffoscope:ssh - Use net-misc/openssh
 dev-util/diffoscope:tar - Use app-arch/tar
 dev-util/diffoscope:tcpdump - Use net-analyzer/tcpdump
-dev-util/diffoscope:xz - Use app-arch/xz-utils
 dev-util/diffoscope:zip - Use app-arch/unzip
 dev-util/edb-debugger:jumbo-build - Experimental jumbo (also known as unity) build capability
 dev-util/edi:clang - Provide integration with sys-devel/clang and dev-util/bear for autocompletion, inline errors and information about compilation units.
@@ -3153,7 +3149,6 @@ games-fps/yamagi-quake2:softrender - Build software renderer
 games-fps/yamagi-quake2:vulkan - Build experimental Vulkan renderer
 games-fps/yamagi-quake2:xatrix - Build support for the 'The Reckoning' Mission Pack
 games-kids/gcompris:kiosk - Enable kiosk mode by default (for use by small children or on a self-service host machine)
-games-misc/little-inferno:bundled-libs - Use bundled libraries.
 games-misc/ponysay:fish-completion - Enable fish completion support
 games-misc/ponysay:non-free - Install non-free ponies (i.e. from the MLP franchise)
 games-misc/xcowsay:fortune - Enable support for fortune cookies via games-misc/fortune-mod
@@ -3956,16 +3951,13 @@ media-gfx/fontforge:truetype-debugger - Enable truetype debugger in fontforge
 media-gfx/fontforge:woff2 - Enable support for WOFF2 format
 media-gfx/fotowall:webcam - Enable webcam support
 media-gfx/freecad:addonmgr - Build the addon manager module for automatic handling of 3rd party addons
-media-gfx/freecad:arch - Build the architecture workbench for working with architectural elements
 media-gfx/freecad:cloud - Build the Cloud workbench, to access cloud providers (mostly Amazon S3).
-media-gfx/freecad:drawing - Build the drawing module and workbench to display 3D work on a 2D sheet
 media-gfx/freecad:fem - Build the FEM module and workbench which provides Finite Element Analysis (FEA) workflows
 media-gfx/freecad:headless - Build FreeCAD without a GUI, usable for server-side instances. The Python modules are still available, without their GUI parts though.
 media-gfx/freecad:idf - Build the IDF module to provide file exchange capabilities with IDF files
 media-gfx/freecad:image - Build the image module and workbench for working with bitmap images
 media-gfx/freecad:inspection - Build the inspection workbench which gives you specific tools for examination of shapes (experimental)
 media-gfx/freecad:material - Build the material module and workbench to work with materials
-media-gfx/freecad:mesh - Build the mesh module and workbench to work with triangulated meshes
 media-gfx/freecad:openscad - Build the OpenSCAD module for interoperability with OpenSCAD and repairing Constructive Solid Geometry (CSG) history
 media-gfx/freecad:part-design - Build the part design module and workbench for build part shapes from sketches
 media-gfx/freecad:path - Build the path module and workbench to procude G-Code instructions for CNC
@@ -3976,7 +3968,6 @@ media-gfx/freecad:raytracing - Build the raytracing module and workbench for ray
 media-gfx/freecad:robot - Build the robot module and workbench for studying robot movements
 media-gfx/freecad:ship - Build the ship module and workbench which works over ship entities, that must be created on top of provided geometry. NOTE: This conflicts with the external ship workbench, which you can add via the Addon Manager!
 media-gfx/freecad:show - Build the show module, a helper module for visibility automation
-media-gfx/freecad:spreadsheet - Build the spreadsheet module and workbench to create and manipulate spreadsheet data
 media-gfx/freecad:surface - Build the surface module and workbench
 media-gfx/freecad:techdraw - Build the techdraw module and workbench, a more advanced and feature-rich successor of the drawing workbench
 media-gfx/freecad:tux - Build the Tux module
@@ -4133,7 +4124,6 @@ media-libs/gd:webp - Enable support for the webp format
 media-libs/gegl:lensfun - Enable support for media-libs/lensfun.
 media-libs/gegl:umfpack - Enable sparse solving via sci-libs/umfpack.
 media-libs/gmmlib:custom-cflags - Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.
-media-libs/gmtk:dconf - Enable support for gnome-base/dconf
 media-libs/grilo:playlist - Enable support for playlists through dev-libs/totem-pl-parser
 media-libs/gst-plugins-bad:bzip2 - Enable bzip2 encoder/decoder plugin
 media-libs/gst-plugins-bad:egl - Enable EGL support
@@ -4148,8 +4138,9 @@ media-libs/gst-plugins-base:pango - Enable pango GStreamer plugin
 media-libs/gst-plugins-base:wayland - Enable Wayland EGL windowing system support (requires egl and at least one of gles2 or opengl)
 media-libs/gstreamer:orc - Disable some PaX memory protections to allow plugins that use dev-lang/orc for runtime optimization to be used on hardened PaX systems
 media-libs/gstreamer:unwind - Enable sys-libs/libunwind usage for better backtrace support in leaks tracer module
-media-libs/harfbuzz:glib - Compile with GLib Unicode support
-media-libs/harfbuzz:graphite - Use graphite to render complex non-Roman writing systems
+media-libs/harfbuzz:experimental - Enable experimental APIs
+media-libs/harfbuzz:glib - Enable dev-libs/glib unicode functions
+media-libs/harfbuzz:graphite - Enable media-gfx/graphite2 complementary shaper
 media-libs/ilmbase:large-stack - Enables code to take advantage of large stack support
 media-libs/imlib2:X - Use the X window system
 media-libs/imlib2:bzip2 - Bzip2 loader support
@@ -4995,6 +4986,7 @@ media-video/libva-utils:examples - Build and install decode, encode, videoproces
 media-video/libva-utils:putsurface - Build and install putsurface tool.
 media-video/libva-utils:test-va-api - Install test_va_api tool for thorough testing of the installed VA-API.
 media-video/libva-utils:vainfo - Build and install vainfo tool.
+media-video/makemkv:java - Handle additional Blu-ray protection mechanisms involving Java
 media-video/mjpegtools:sdlgfx - Enables y4mhist to display a graphical histogram
 media-video/mjpg-streamer:input-control - Plugin giving ability to control camera movement (only specific cameras)
 media-video/mjpg-streamer:input-file - Plugin that watches given directory and send it's content