gentoo resync : 24.06.2021

56 files changed, 100 insertions, 74 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6377d0a1ab48..512b1e062b41 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 2b105478f5cb..5f3f70e98215 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
 
+# 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
+
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-06-11)
 # Has unpackaged depdencies, bug #795459
 >=media-libs/opencolorio-2.0.0 doc
diff --git a/profiles/arch/mips/mips64/make.defaults b/profiles/arch/mips/mips64/make.defaults
index aa6444d92e53..8a8e52113540 100644
--- a/profiles/arch/mips/mips64/make.defaults
+++ b/profiles/arch/mips/mips64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64"
diff --git a/profiles/arch/mips/mips64/multilib/make.defaults b/profiles/arch/mips/mips64/multilib/make.defaults
index 83b190993308..45c05a5cef70 100644
--- a/profiles/arch/mips/mips64/multilib/make.defaults
+++ b/profiles/arch/mips/mips64/multilib/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64"
diff --git a/profiles/arch/mips/mips64/multilib/n32/make.defaults b/profiles/arch/mips/mips64/multilib/n32/make.defaults
index 2b7c2e01f741..47342784ff37 100644
--- a/profiles/arch/mips/mips64/multilib/n32/make.defaults
+++ b/profiles/arch/mips/mips64/multilib/n32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MULTILIB_ABIS="n64 o32 n32"
diff --git a/profiles/arch/mips/mips64/multilib/n32/use.force b/profiles/arch/mips/mips64/multilib/n32/use.force
index 556bba21926f..f2c2deee3e12 100644
--- a/profiles/arch/mips/mips64/multilib/n32/use.force
+++ b/profiles/arch/mips/mips64/multilib/n32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n32
diff --git a/profiles/arch/mips/mips64/multilib/n64/make.defaults b/profiles/arch/mips/mips64/multilib/n64/make.defaults
index 6c19a1b016cd..38d067c5ed36 100644
--- a/profiles/arch/mips/mips64/multilib/n64/make.defaults
+++ b/profiles/arch/mips/mips64/multilib/n64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MULTILIB_ABIS="n32 o32 n64"
diff --git a/profiles/arch/mips/mips64/multilib/n64/use.force b/profiles/arch/mips/mips64/multilib/n64/use.force
index bb51328d7c99..84cd2044c51a 100644
--- a/profiles/arch/mips/mips64/multilib/n64/use.force
+++ b/profiles/arch/mips/mips64/multilib/n64/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n64
diff --git a/profiles/arch/mips/mips64/multilib/o32/make.defaults b/profiles/arch/mips/mips64/multilib/o32/make.defaults
index 535f84f6e25e..e102b38cdbdc 100644
--- a/profiles/arch/mips/mips64/multilib/o32/make.defaults
+++ b/profiles/arch/mips/mips64/multilib/o32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MULTILIB_ABIS="n64 n32 o32"
diff --git a/profiles/arch/mips/mips64/multilib/o32/use.force b/profiles/arch/mips/mips64/multilib/o32/use.force
index aac1b84a82dc..abe22f35a795 100644
--- a/profiles/arch/mips/mips64/multilib/o32/use.force
+++ b/profiles/arch/mips/mips64/multilib/o32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_o32
diff --git a/profiles/arch/mips/mips64/multilib/use.force b/profiles/arch/mips/mips64/multilib/use.force
index 559b27408235..ab52543c347d 100644
--- a/profiles/arch/mips/mips64/multilib/use.force
+++ b/profiles/arch/mips/mips64/multilib/use.force
@@ -1,4 +1,4 @@
-# Copyright 2011 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 multilib
diff --git a/profiles/arch/mips/mips64/multilib/use.mask b/profiles/arch/mips/mips64/multilib/use.mask
index 096bbf01de3c..4e762506450c 100644
--- a/profiles/arch/mips/mips64/multilib/use.mask
+++ b/profiles/arch/mips/mips64/multilib/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Matt Turner <mattst88@gentoo.org> (2013-07-29)
diff --git a/profiles/arch/mips/mips64/n32/make.defaults b/profiles/arch/mips/mips64/n32/make.defaults
index 692c9dac6e55..f8c31cbab3e0 100644
--- a/profiles/arch/mips/mips64/n32/make.defaults
+++ b/profiles/arch/mips/mips64/n32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64"
diff --git a/profiles/arch/mips/mips64/n32/use.force b/profiles/arch/mips/mips64/n32/use.force
index c2533b67088d..1da72314daaf 100644
--- a/profiles/arch/mips/mips64/n32/use.force
+++ b/profiles/arch/mips/mips64/n32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n32
diff --git a/profiles/arch/mips/mips64/n32/use.mask b/profiles/arch/mips/mips64/n32/use.mask
index a3007f8ee8c9..ef8c72c5ca0b 100644
--- a/profiles/arch/mips/mips64/n32/use.mask
+++ b/profiles/arch/mips/mips64/n32/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_n32
diff --git a/profiles/arch/mips/mips64/n64/make.defaults b/profiles/arch/mips/mips64/n64/make.defaults
index d21ecb953cfc..fb294e8deb8a 100644
--- a/profiles/arch/mips/mips64/n64/make.defaults
+++ b/profiles/arch/mips/mips64/n64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64"
diff --git a/profiles/arch/mips/mips64/n64/use.force b/profiles/arch/mips/mips64/n64/use.force
index ca1bea5c4016..53754ed0842a 100644
--- a/profiles/arch/mips/mips64/n64/use.force
+++ b/profiles/arch/mips/mips64/n64/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n64
diff --git a/profiles/arch/mips/mips64/n64/use.mask b/profiles/arch/mips/mips64/n64/use.mask
index 3d54e8b2760a..8e94648a641f 100644
--- a/profiles/arch/mips/mips64/n64/use.mask
+++ b/profiles/arch/mips/mips64/n64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_n64
diff --git a/profiles/arch/mips/mipsel/mips64el/make.defaults b/profiles/arch/mips/mipsel/mips64el/make.defaults
index 79c657845c29..07061b358499 100644
--- a/profiles/arch/mips/mipsel/mips64el/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64el"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
index 0a2ecd62de06..7c5fefd1874c 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64el"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n32/make.defaults
index 04e1ecd38846..de0cc767a9b3 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MULTILIB_ABIS="n64 o32 n32"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n32/use.force
index 556bba21926f..f2c2deee3e12 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32/use.force
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n64/make.defaults
index 0b8a5c45cf20..6175efd6666b 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MULTILIB_ABIS="n32 o32 n64"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/n64/use.force
index bb51328d7c99..84cd2044c51a 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64/use.force
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/n64/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/o32/make.defaults
index f338725f0d48..a0387dc9d10c 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2011-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MULTILIB_ABIS="n64 n32 o32"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/o32/use.force
index aac1b84a82dc..abe22f35a795 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32/use.force
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/o32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/use.force b/profiles/arch/mips/mipsel/mips64el/multilib/use.force
index 559b27408235..ab52543c347d 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/use.force
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/use.force
@@ -1,4 +1,4 @@
-# Copyright 2011 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 multilib
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/use.mask b/profiles/arch/mips/mipsel/mips64el/multilib/use.mask
index 096bbf01de3c..4e762506450c 100644
--- a/profiles/arch/mips/mipsel/mips64el/multilib/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/multilib/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 2013-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Matt Turner <mattst88@gentoo.org> (2013-07-29)
diff --git a/profiles/arch/mips/mipsel/mips64el/n32/make.defaults b/profiles/arch/mips/mipsel/mips64el/n32/make.defaults
index 0c623e27edeb..a3cda54eb436 100644
--- a/profiles/arch/mips/mipsel/mips64el/n32/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/n32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64el"
diff --git a/profiles/arch/mips/mipsel/mips64el/n32/use.force b/profiles/arch/mips/mipsel/mips64el/n32/use.force
index c2533b67088d..f2c2deee3e12 100644
--- a/profiles/arch/mips/mipsel/mips64el/n32/use.force
+++ b/profiles/arch/mips/mipsel/mips64el/n32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n32
diff --git a/profiles/arch/mips/mipsel/mips64el/n32/use.mask b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
index a3007f8ee8c9..ef8c72c5ca0b 100644
--- a/profiles/arch/mips/mipsel/mips64el/n32/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_n32
diff --git a/profiles/arch/mips/mipsel/mips64el/n64/make.defaults b/profiles/arch/mips/mipsel/mips64el/n64/make.defaults
index 50a4bfaaef8d..68295e4ad957 100644
--- a/profiles/arch/mips/mipsel/mips64el/n64/make.defaults
+++ b/profiles/arch/mips/mipsel/mips64el/n64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mips64el"
diff --git a/profiles/arch/mips/mipsel/mips64el/n64/use.force b/profiles/arch/mips/mipsel/mips64el/n64/use.force
index ca1bea5c4016..84cd2044c51a 100644
--- a/profiles/arch/mips/mipsel/mips64el/n64/use.force
+++ b/profiles/arch/mips/mipsel/mips64el/n64/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_n64
diff --git a/profiles/arch/mips/mipsel/mips64el/n64/use.mask b/profiles/arch/mips/mipsel/mips64el/n64/use.mask
index 3d54e8b2760a..8e94648a641f 100644
--- a/profiles/arch/mips/mipsel/mips64el/n64/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/n64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_n64
diff --git a/profiles/arch/mips/mipsel/o32/make.defaults b/profiles/arch/mips/mipsel/o32/make.defaults
index 1e82f441cae4..995ceab6b59d 100644
--- a/profiles/arch/mips/mipsel/o32/make.defaults
+++ b/profiles/arch/mips/mipsel/o32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROFILE_ARCH="mipsel"
diff --git a/profiles/arch/mips/mipsel/o32/use.force b/profiles/arch/mips/mipsel/o32/use.force
index 3ad34479a840..4bbf2731ca03 100644
--- a/profiles/arch/mips/mipsel/o32/use.force
+++ b/profiles/arch/mips/mipsel/o32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/o32/use.mask b/profiles/arch/mips/mipsel/o32/use.mask
index 19a83980be88..3930c442e397 100644
--- a/profiles/arch/mips/mipsel/o32/use.mask
+++ b/profiles/arch/mips/mipsel/o32/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/use.mask b/profiles/arch/mips/mipsel/use.mask
index 0e0a660d1e63..8993e385a33c 100644
--- a/profiles/arch/mips/mipsel/use.mask
+++ b/profiles/arch/mips/mipsel/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2015-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # James Le Cuirot <chewi@gentoo.org> (2017-06-29)
diff --git a/profiles/arch/mips/o32/make.defaults b/profiles/arch/mips/o32/make.defaults
index 74a8db7216ff..7dae236e9550 100644
--- a/profiles/arch/mips/o32/make.defaults
+++ b/profiles/arch/mips/o32/make.defaults
@@ -1,7 +1,7 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-PROFILE_ARCH="mipsel"
+PROFILE_ARCH="mips"
 
 CHOST="mips-unknown-linux-gnu"
 CHOST_o32="mips-unknown-linux-gnu"
diff --git a/profiles/arch/mips/o32/use.force b/profiles/arch/mips/o32/use.force
index 3ad34479a840..4bbf2731ca03 100644
--- a/profiles/arch/mips/o32/use.force
+++ b/profiles/arch/mips/o32/use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 abi_mips_o32
diff --git a/profiles/arch/mips/o32/use.mask b/profiles/arch/mips/o32/use.mask
index 19a83980be88..3930c442e397 100644
--- a/profiles/arch/mips/o32/use.mask
+++ b/profiles/arch/mips/o32/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -abi_mips_o32
diff --git a/profiles/arch/mips/package.mask b/profiles/arch/mips/package.mask
index 6b2c964b76b5..0bd14092c6f4 100644
--- a/profiles/arch/mips/package.mask
+++ b/profiles/arch/mips/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2006-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Mask pam_ldap and nss_ldap - openldap dep missing.
diff --git a/profiles/arch/mips/use.force b/profiles/arch/mips/use.force
index 82c0a4788533..a7a49e49beb0 100644
--- a/profiles/arch/mips/use.force
+++ b/profiles/arch/mips/use.force
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Gentoo Foundation
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force the flag which corresponds to ARCH.
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index c665107ad643..bec7b1f09274 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2021-06-23)
+# Pandoc is a required dep, and not keyworded.
+sys-apps/exa man
+
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 9cca3ab02351..d783fb8e7afe 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-06-22)
+# Dependencies not keyworded here yet
+dev-python/pillow imagequant test tk
+
 # Marek Szuba <marecki@gentoo.org> (2021-06-21)
 # net-libs/mbedtls not keyworded here, not tested
 net-libs/libssh2 mbedtls
@@ -177,7 +181,7 @@ sys-libs/libcxx libcxxabi libunwind static-libs
 sys-libs/libcxxabi libunwind
 media-gfx/graphviz devil svg pdf
 media-libs/mesa lm-sensors unwind
-media-libs/tiff jbig jpeg test webp
+media-libs/tiff jbig webp
 net-fs/nfs-utils nfsv41
 media-libs/fontconfig doc
 net-irc/irssi socks5
@@ -200,4 +204,5 @@ sys-fs/squashfs-tools lzma
 sys-libs/libcap-ng python
 sys-process/audit gssapi
 x11-base/xorg-server  unwind
+x11-base/xwayland unwind
 x11-libs/libvdpau doc
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/eapi b/profiles/default/linux/riscv/20.0/rv64gc/multilib/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults b/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults
new file mode 100644
index 000000000000..42e660f1a345
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# we need to reset the two-level libdirs here, otherwise the one-level
+# paths lead to collisions... note that the default abi libdir remains
+# "lib64"
+
+LIBDIR_lp64="lib64/lp64"
+LIBDIR_ilp32d="lib32/ilp32d"
+LIBDIR_ilp32="lib32/ilp32"
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 7cad03095d25..2714c11fb220 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -24,10 +24,7 @@ dev-perl/Gtk2-Unique
 
 # Miroslav Šulc <fordfrog@gentoo.org> (2021-04-18)
 # version older than 3 don't compile with java 1.5+ and will be removed
-# slot 3.1 (versions < 3.6) are 99% compatible with slot 3.6 and should
-# not be used, use slot 3.6 or newer
 # see: https://bugs.gentoo.org/779472
-#      https://bugs.gentoo.org/784023
 <dev-java/commons-lang-3.6
 
 # Miroslav Šulc <fordfrog@gentoo.org> (2021-04-14)
diff --git a/profiles/package.mask b/profiles/package.mask
index ca4aa7a6c9eb..fc04f5325f94 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,24 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2021-06-24)
+# Package of huge complexity, given its premise.  Unmaintained
+# in Gentoo.  No revdeps.
+# Removal on 2021-07-24.  Bug #798291.
+dev-python/frozendict
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-06-23)
+# obsolete, no consumers
+# see bug: https://bugs.gentoo.org/797739
+dev-java/xml-commons
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-06-21)
+# libraries without consumers, removal in 30 days
+dev-java/bytelist
+dev-java/jcodings
+dev-java/joni
+dev-java/jvyamlb
+
 # David Seifert <soap@gentoo.org> (2021-06-20)
 # Abandoned upstream, last release 17 years ago, unmaintained, tons of
 # QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
@@ -118,11 +136,6 @@ dev-python/pyls-black
 # see bug: https://bugs.gentoo.org/787410
 media-gfx/povtree
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-06-13)
-# no consumer, removal in 30 days
-# see bug: https://bugs.gentoo.org/785856
-dev-java/commons-validator
-
 # 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
@@ -193,6 +206,7 @@ dev-python/csv23
 # be patient and report bugs if you choose to
 # unmask.
 # bug #756298, bug #690468.
+~dev-python/gst-python-1.18.4
 ~media-libs/gst-plugins-bad-1.18.4
 ~media-libs/gst-plugins-base-1.18.4
 ~media-libs/gst-plugins-good-1.18.4
@@ -285,13 +299,6 @@ dev-python/csv23
 # dev-java/jakarta-activation-api-2.0.1 depends on masked >=virtual/{jdk,jre}-11
 >=dev-java/jakarta-activation-api-2.0.1
 
-# Fabian Groffen <grobian@gentoo.org> (2021-05-24)
-# Hack on hack no longer sustainable
-# - seemingly dead upstream
-# - no (official) Python 3 support
-# removal in 30 days, bug: https://bugs.gentoo.org/791613
-app-admin/diamond
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2021-05-24)
 # it's just a demo project, not a real app, see disclaimer
 # at https://github.com/romainguy/jext
@@ -356,12 +363,6 @@ dev-java/werken-xpath
 # https://bugs.gentoo.org/782697
 >=dev-java/xerces-2.12.1
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-04-15)
-# dev-java/jcodings-1.0.55 depends on masked >=virtual/{jdk,jre}-11
-# dev-java/joni-2.1.41 depends on masked >=virtual/{jdk,jre}-11
->=dev-java/jcodings-1.0.55
->=dev-java/joni-2.1.41
-
 # Lars Wendler <polynomial-c@gentoo.org> (2021-04-08)
 # Masked for testing
 >=app-crypt/gnupg-2.3.0
@@ -453,11 +454,6 @@ kde-apps/kdebase-meta:5
 ~app-i18n/scim-sunpinyin-3.0.0_rc1
 ~app-i18n/xsunpinyin-3.0.0_rc1
 
-# Alfredo Tupone <tupone@gentoo.org> (2020-08-23)
-# Ported to py3 but not yet released
-# Masked to allow py2.7 removal
-dev-lang/spark
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2020-02-27)
 # >=dev-java/ant-eclipse-ecj-4.10 depends on masked >=virtual/{jdk,jre}-11
 # www-servers/tomcat >= 9 depends on masked dev-java/eclipse-ecj
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index bb9409df2bbc..6328acc2d092 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -209,6 +209,8 @@ riscv		default/linux/riscv/20.0/rv64gc/lp64d		stable
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd	stable
 riscv		default/linux/riscv/20.0/rv64gc/lp64		stable
 riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd	stable
+riscv		default/linux/riscv/20.0/rv64gc/multilib		exp
+riscv		default/linux/riscv/20.0/rv64gc/multilib/systemd	exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index b3dc61737a40..abd5c105a70c 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -1,4 +1,4 @@
-apache		http://apache.lauf-forum.at/ http://apache.mirror.digionline.de/ http://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://ftp.halifax.rwth-aachen.de/apache/ http://mirror.23media.de/apache/ http://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ https://apache.osuosl.org/
+apache		https://apache.lauf-forum.at/ https://apache.mirror.digionline.de/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://ftp.halifax.rwth-aachen.de/apache/ http://mirror.23media.de/apache/ https://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ https://apache.osuosl.org/
 cpan		https://cpan.metacpan.org https://www.cpan.org
 cran		https://cran.r-project.org https://cran.us.r-project.org
 debian		https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
diff --git a/profiles/updates/2Q-2021 b/profiles/updates/2Q-2021
index a37b7d1d620e..d47fc8034029 100644
--- a/profiles/updates/2Q-2021
+++ b/profiles/updates/2Q-2021
@@ -5,3 +5,4 @@ move dev-util/robin-hood-hashing dev-cpp/robin-hood-hashing
 move dev-python/awscli app-admin/awscli
 move dev-util/dwarves dev-util/pahole
 move net-irc/oragono net-irc/ergo
+move app-misc/OpenRGB app-misc/openrgb
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d3be978f1cfc..fbb881260ff8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -53,8 +53,6 @@ app-admin/conky:weather-metar - Enable support for metar weather service
 app-admin/conky:webserver - Enable support to act as a webserver serving conkys output using net-libs/libmicrohttpd
 app-admin/conky:xmms2 - Enable monitoring of music played by media-sound/xmms2
 app-admin/conserver:freeipmi - Compile in FreeIPMI support via sys-libs/freeipmi
-app-admin/diamond:mongo - Enable MongoDB support
-app-admin/diamond:redis - Enable Redis support
 app-admin/diradm:automount - Support for automount data in LDAP
 app-admin/diradm:irixpasswd - Support for storing separate IRIX passwords
 app-admin/doas:persist - Adds support for "persist" feature (experimental)
@@ -603,6 +601,7 @@ app-emulation/snapd:cgroup-hybrid - Default to hybrid (legacy) cgroup hierarchy
 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/vagrant:virtualbox - Use VirtualBox provider.
+app-emulation/vice:cpuhistory - Enable 65xx CPU history support (may decrease performance)
 app-emulation/vice:ethernet - Enable ethernet emulation
 app-emulation/vice:headless - Include the headless variant of the emulator
 app-emulation/vice:mpg123 - Enable mp3@64 cartridge support
@@ -2252,7 +2251,6 @@ dev-lisp/ecls:libatomic - Use dev-libs/libatomic_ops library
 dev-lisp/ecls:precisegc - Use type information during garbage collection (experimental)
 dev-lisp/gcl:ansi - Build a GCL with ANSI support (else build a traditional CLtL1 image)
 dev-lisp/gcl:athena - Build xgcl - an interface to x11-libs/libXaw
-dev-lisp/sbcl:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 dev-lua/lua-cjson:internal-fpconv - Enable internal number conversion routines, can increase overall performance by up to 50%
 dev-ml/dose3:parmap - Adds multi-core CPU support via dev-ml/parmap.
 dev-ml/dose3:rpm4 - Adds support for handling rpm4 files.
@@ -5045,7 +5043,7 @@ media-video/mpv:tools - Install extra tools: mpv_identify.sh, mpv_idet.sh, and u
 media-video/mpv:uchardet - Enable subtitles charset discovery via app-i18n/uchardet
 media-video/mpv:vulkan - Enable support for various Vulkan-based video backends
 media-video/mpv:zimg - Enable libzimg support (for vf_fingerprint)
-media-video/noad:libmpeg2 - Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg
+media-video/noad:libmpeg2 - Build support for mpeg2 through media-libs/libmpeg2 rather than using media-video/ffmpeg
 media-video/nvidia_video_sdk:tools - Build and install example tools.
 media-video/obs-studio:decklink - Build the Decklink plugin.
 media-video/obs-studio:fdk - Build with LibFDK AAC support.
@@ -8657,6 +8655,9 @@ x11-base/xorg-server:xnest - Build the Xnest server
 x11-base/xorg-server:xorg - Build the Xorg X server (HIGHLY RECOMMENDED)
 x11-base/xorg-server:xvfb - Build the Xvfb server
 x11-base/xorg-x11:fonts - Install fonts from X.Org
+x11-base/xwayland:rpc - Enable secure rpc
+x11-base/xwayland:unwind - Enable libunwind usage for backtraces
+x11-base/xwayland:xcsecurity - Build Security extension
 x11-drivers/nvidia-drivers:driver - Install kernel driver modules
 x11-drivers/nvidia-drivers:tools - Install additional tools such as nvidia-settings
 x11-drivers/xf86-video-geode:ztv - Enable building the V4L2 ZTV driver