9 files changed, 19 insertions, 12 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 94837d713335..2fcc38a4509f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 028f6883782a..2635ab9f45fa 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -223,7 +223,7 @@ sys-power/nut ups_drivers_nut-ipmipsu
 
 # Michał Górny <mgorny@gentoo.org> (2017-08-10)
 # Requires USE=octave which is masked in this profile.
-dev-python/ipython test
+<=dev-python/ipython-7.24.1 test
 
 # Michał Górny <mgorny@gentoo.org> (2017-08-08)
 # Requires USE=opencl that is masked in this profile.
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 3da146e52375..b33ff7a06401 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-06-16)
+# Drags in several not-yet-stable deps on arm64
+# glusterfs: sys-cluster/glusterfs
+# rbd: sys-cluster/ceph
+# bug #796362
+app-emulation/libvirt glusterfs rbd
+
 # Sam James <sam@gentoo.org> (2021-05-28)
 # media-gfx/inkscape is not yet stable on arm64
 # bug #785685
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index e610609a4b54..88f3708c7434 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -248,7 +248,8 @@ dev-ruby/haml test
 
 # Anthony G. Basile <blueness@gentoo.org> (2014-08-14)
 # Mask these flags since mongodb is broken on ppc/ppc64
-dev-python/ipython doc matplotlib nbconvert notebook test
+dev-python/ipython doc matplotlib nbconvert notebook
+<=dev-python/ipython-7.24.1 test
 
 # Anthony G. Basile <blueness@gentoo.org> (2014-08-12)
 # Ultimately pulls in nodejs which is broken.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 9f77283b5365..0be6a25cde1e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -123,7 +123,7 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (2018-05-23)
 # sys-apps/baselayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_9"
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr xml python_targets_python3_9"
 
 # Mike Gilbert <floppym@gentoo.org> (2012-05-15)
 # Default target(s) for python-r1.eclass
diff --git a/profiles/license_groups b/profiles/license_groups
index e86376351ce8..6aadd626e5aa 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA 2dboy-EULA AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion LOKI-EULA MakeMKV-EULA Microsemi Microsoft-vscode Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
+EULA 2dboy-EULA AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi Microsoft-vscode Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Deprecated license labels, used by repoman
 # Use Free-Art-1.2 or Free-Art-1.3 instead
diff --git a/profiles/package.mask b/profiles/package.mask
index 2427865ff314..64c49f33ba4c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -40,7 +40,7 @@
 # Fails to build with GCC 11. Strange build system that needs more
 # work to function properly (and integrate better). Several open bugs.
 # bug #795999, bug #787902, bug #766033, bug #724674, bug #713206.
-# Removal on 15-07-2021.
+# Removal on 2021-07-15.
 media-sound/sc2mpd
 
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-06-14)
@@ -230,8 +230,8 @@ dev-python/csv23
 <net-mail/courier-imap-5
 
 # Matthew Thode <prometheanfire@gentoo.org> (2021-05-27)
-# remove some stuff to make redacted happy
-# bug #793800
+# Remove some openstack-related packages due to high-burden,
+# unmaintainable python requirements. Bug #793800
 app-admin/glance
 app-emulation/spice-html5
 dev-python/aodhclient
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 9ffd66a13af1..49acf8ccc595 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -207,6 +207,8 @@ riscv		default/linux/riscv/17.0/rv32imac/ilp32		exp
 riscv		default/linux/riscv/17.0/rv32imac/ilp32d	exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d		exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd	exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd	exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9fac27a5e495..75106c062dd9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2206,7 +2206,6 @@ dev-libs/tntnet:server - Enable tntnet server daemon
 dev-libs/totem-pl-parser:archive - Enables ISO detection with app-arch/libarchive
 dev-libs/totem-pl-parser:crypt - Support AmazonAMZ decoding with dev-libs/libgcrypt
 dev-libs/totem-pl-parser:quvi - Use media-libs/libquvi for parsing video links
-dev-libs/tvision:gpm - Support text mode mouse through sys-libs/gpm
 dev-libs/userspace-rcu:regression-test - Run regression tests (requires FEATURES=test)
 dev-libs/weston:desktop - Enable the desktop shell
 dev-libs/weston:drm - Enable drm compositor support
@@ -3003,7 +3002,6 @@ games-board/crafty:no-opts - Don't try to enable crazy CFLAG options
 games-board/freedoko:backgrounds - Install additional background images
 games-board/freedoko:gnomecards - Install the gnome-games card set
 games-board/freedoko:kdecards - Install the KDE card set
-games-board/freedoko:net - Enable network game support
 games-board/freedoko:openclipartcards - Install the openclipartcards card set
 games-board/freedoko:pysolcards - Install the PySol card set
 games-board/freedoko:xskatcards - Install the XSkat card set
@@ -3884,7 +3882,6 @@ media-gfx/album:plugins - Install optional plugins
 media-gfx/album:themes - Install optional themes
 media-gfx/alembic:hdf5 - Add support sci-libs/hdf5
 media-gfx/alembic:test - Build and run the test-suite
-media-gfx/alembic:zlib - Use sys-libs/zlib for compressions
 media-gfx/apngasm:7z - Enable support for 7zip compression
 media-gfx/apngasm:zopfli - Enable support for Zopfli compression
 media-gfx/asymptote:boehm-gc - Enables using the Boehm-Demers-Weiser conservative garbage collector
@@ -6433,7 +6430,7 @@ net-misc/kafka-bin:connect - Install init for Kafka Connect Distributed mode
 net-misc/kafka-bin:internal-zookeeper - Use bundled local zookeeper instance
 net-misc/kafkacat:avro - Enable avro serialization/deserialization support
 net-misc/kafkacat:json - Enable json support
-net-misc/kea:openssl - Use dev-libs/openssl instead of Botan
+net-misc/kea:openssl - Use dev-libs/openssl instead of dev-libs/botan
 net-misc/kea:samples - Install sample configuration files
 net-misc/knock:server - Installs the knockd server daemon.
 net-misc/libteam:zmq - Build witch net-libs/zeromq support
@@ -7085,6 +7082,7 @@ sci-chemistry/avogadro2:rpc - Enable RPC server
 sci-chemistry/avogadro2:vtk - include vtk support
 sci-chemistry/chemtool:emf - EMF export support
 sci-chemistry/gnome-chemistry-utils:gnumeric - Add a Gnumeric plugin to provide a molarmass function for the spreadsheet
+sci-chemistry/gromacs:build-manual - Build manual instead of downloading it
 sci-chemistry/gromacs:cuda - Enable cuda non-bonded kernels
 sci-chemistry/gromacs:double-precision - More precise calculations at the expense of speed
 sci-chemistry/gromacs:gmxapi - Add support for gmxapi library
@@ -7422,7 +7420,6 @@ sci-libs/vtk:rendering - Building Redering modules
 sci-libs/vtk:tbb - Use dev-cpp/tbb to handle smp support
 sci-libs/vtk:views - Building Views modules
 sci-libs/vtk:web - Install web component
-sci-libs/vtk:xdmf2 - Support for xdmf2 formatted data
 sci-mathematics/agda:cpphs - Use cpphs instead of cpp.
 sci-mathematics/agda:debug - Enable debugging features that may slow Agda down.
 sci-mathematics/agda:enable-cluster-counting - Enable the --count-clusters flag. (If enable-cluster-counting is False, then the --count-clusters flag triggers an error message.)