Merge updates from master

38 files changed, 517 insertions, 32 deletions

diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
index 06474c9be4bd..f33802bc1fe6 100644
--- a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-admin/pydf/pydf-12-r2.ebuild b/app-admin/pydf/pydf-12-r2.ebuild
index 76d281b91643..b37578c22046 100644
--- a/app-admin/pydf/pydf-12-r2.ebuild
+++ b/app-admin/pydf/pydf-12-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
diff --git a/app-benchmarks/hyperfine/hyperfine-1.12.0.ebuild b/app-benchmarks/hyperfine/hyperfine-1.12.0.ebuild
index 57db3305c0d3..3b8a58be0553 100644
--- a/app-benchmarks/hyperfine/hyperfine-1.12.0.ebuild
+++ b/app-benchmarks/hyperfine/hyperfine-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -104,7 +104,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Boost-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
diff --git a/app-benchmarks/pmbw/pmbw-0.6.3.ebuild b/app-benchmarks/pmbw/pmbw-0.6.3.ebuild
index 88aace3e6ec4..4436a0ace6a4 100644
--- a/app-benchmarks/pmbw/pmbw-0.6.3.ebuild
+++ b/app-benchmarks/pmbw/pmbw-0.6.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 src_prepare() {
 	default
diff --git a/app-benchmarks/stress-ng/stress-ng-0.14.03.ebuild b/app-benchmarks/stress-ng/stress-ng-0.14.03.ebuild
index e112cd3fe456..20d7652d4d57 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.14.03.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.14.03.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 IUSE="apparmor sctp"
 
 DEPEND="
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index bf2bee5adcc3..c39be45acb21 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,3 +1,4 @@
 DIST buildah-1.25.1.tar.gz 14212065 BLAKE2B ec4f668654011f1b93745e1a1d575fdda0cd5f4d6f9f7f7b3106c24aa7d405951ecd645a54c2dd5a3ad2695069e66ad847bdb15f0e73a9c7efba2a7e283d4f58 SHA512 628f8095eb4488ae2be06a2a92de85dde4f3841e8ed9882132c119f27b0c93f26ba10f5dd259d63654b90539d762f6c1973d460f073c0b2450ac5d9582a6a68d
 DIST buildah-1.26.1.tar.gz 14159554 BLAKE2B bf17a51653bb07591c19fca449d6f4eeb87693a4d20ae5f12f669b10c328fadd763e0c0fa76605154a5a6439f4e250bc8f00c2d01c9fbf1e266aa67189aafdbd SHA512 07225ebb23e5a815be1ef8acb5d15ef9fb8c6e9324fa9b65ec024f7b6bbe892721f9feaac2911d1b466c2cf336bd0c68e3d1b4df953f13a3390da84a93f76723
 DIST buildah-1.26.2.tar.gz 14155439 BLAKE2B 3f858f86221b64623d94783c0ef3dd15fa14cef730b30cc5f0554e37f9e3e609a6381842b90b7614b6708434ee5c109497ee89f2da89bb9cc5360e2f8b345adb SHA512 f50a7ee787d10a8f8d1a7e0ff9f86990de975df427af894be5bcc84bceafd2eb87dfe75c1b967ae57056299893c942df257aef1e9aaeb712022a8abceeaebba9
+DIST buildah-1.26.3.tar.gz 14468210 BLAKE2B 1ec44501e63bf3594c72575d7460c6478a9d996977659b9fb466fbc658e4923892a77bea9f48a503f02a6101615be9a663f9701ee343436d140d580d8ab01875 SHA512 5d8ea60246085ba27795b52152765fc3c85c92c5caf4515c1b2973aec17844eb9da2ffff82f6c503e36f675089c998b9ee51c4b4b899104ccd9fa771308c8048
diff --git a/app-containers/buildah/buildah-1.26.3.ebuild b/app-containers/buildah/buildah-1.26.3.ebuild
new file mode 100644
index 000000000000..25c8fa9e6852
--- /dev/null
+++ b/app-containers/buildah/buildah-1.26.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=ad138d8e
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild
index d9ea7d1a79d0..c4fa60f54b83 100644
--- a/dev-java/hamcrest/hamcrest-2.2.ebuild
+++ b/dev-java/hamcrest/hamcrest-2.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-python/PyQt6_WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest
index 59d365d91651..59d365d91651 100644
--- a/dev-python/PyQt6_WebEngine/Manifest
+++ b/dev-python/PyQt6-WebEngine/Manifest
diff --git a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild
index f304d9d147f4..b1ee942b454a 100644
--- a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild
+++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.3.1.ebuild
@@ -8,10 +8,12 @@ PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1 flag-o-matic multiprocessing qmake-utils
 
 QT_PV="6.3:6" # minimum tested qt version
+MY_P="${P/-/_}"
 
 DESCRIPTION="Python bindings for QtWebEngine"
 HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -42,8 +44,7 @@ src_prepare() {
 src_configure() {
 	append-cxxflags -std=c++17 # for clang and old gcc that default to <17
 
-	# hack: currently lacking qt6_get_bindir (or alternatively have
-	# qmake6 in PATH like qmake5 is so it wouldn't matter)
+	# workaround until bug 863395 has something to offer
 	local qmake6=$(qt5_get_bindir)/qmake6
 	qmake6=${qmake6//qt5/qt6}
 
diff --git a/dev-python/PyQt6_WebEngine/metadata.xml b/dev-python/PyQt6-WebEngine/metadata.xml
index 88c4a67e1477..88c4a67e1477 100644
--- a/dev-python/PyQt6_WebEngine/metadata.xml
+++ b/dev-python/PyQt6-WebEngine/metadata.xml
diff --git a/dev-python/PyQt6_sip/Manifest b/dev-python/PyQt6-sip/Manifest
index d34878af07fa..d34878af07fa 100644
--- a/dev-python/PyQt6_sip/Manifest
+++ b/dev-python/PyQt6-sip/Manifest
diff --git a/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild b/dev-python/PyQt6-sip/PyQt6-sip-13.4.0.ebuild
index c0e19cedab8a..fca26761e4a1 100644
--- a/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild
+++ b/dev-python/PyQt6-sip/PyQt6-sip-13.4.0.ebuild
@@ -7,9 +7,12 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
+MY_P="${P/-/_}"
+
 DESCRIPTION="sip module support for PyQt6"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0"
diff --git a/dev-python/PyQt6_sip/metadata.xml b/dev-python/PyQt6-sip/metadata.xml
index a999cde076c9..a999cde076c9 100644
--- a/dev-python/PyQt6_sip/metadata.xml
+++ b/dev-python/PyQt6-sip/metadata.xml
diff --git a/dev-python/PyQt6/PyQt6-6.3.1.ebuild b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
index 4eee1c118cf4..ba0245d7b232 100644
--- a/dev-python/PyQt6/PyQt6-6.3.1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
@@ -16,9 +16,9 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-# currently keeping defaults in sync with qtbase, and beside that trying to
-# stay minimal'ish given each builds relatively slowly (but still subject to
-# change if something is needed by most consumers)
+# currently keeping defaults in sync with qtbase (no extra deps), but trying
+# to stay minimal'ish given each builds relatively slowly (subject to change,
+# perhaps more or less depending on consumers and if qtbase is ever split)
 IUSE="
 	+dbus debug qml designer examples gles2-only +gui help multimedia
 	+network opengl positioning printsupport quick quick3d serialport
@@ -59,7 +59,7 @@ DEPEND="
 	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )"
 RDEPEND="
 	${DEPEND}
-	>=dev-python/PyQt6_sip-13.4[${PYTHON_USEDEP}]"
+	>=dev-python/PyQt6-sip-13.4[${PYTHON_USEDEP}]"
 BDEPEND="
 	>=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}]
 	>=dev-qt/qtbase-${QT_PV}
@@ -84,8 +84,7 @@ src_configure() {
 		echo ${*/#/${state}}
 	}
 
-	# hack: currently lacking qt6_get_bindir (or alternatively have
-	# qmake6 in PATH like qmake5 is so it wouldn't matter)
+	# workaround until bug 863395 has something to offer
 	local qmake6=$(qt5_get_bindir)/qmake6
 	qmake6=${qmake6//qt5/qt6}
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 2820539c0d36..47ef69b43c53 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,4 +1,8 @@
 DIST Django-3.2.14.checksum.txt 2552 BLAKE2B 8949b6bbc05160539ba26e4a9a2b774e450890b1668ee9794b087e97c772a78e010f0f33d7f15b9b43fb749bc7804a6c9ea7f24125b6f93c8af6d408d29e530d SHA512 84de32c72c72f2dd8d7c5e159fb77d82b04fe3cb66f30e808249eb1778305f29c75569c3ebf7e89ffdeca12a68a6f8334830db202f230901ddff1f47a3b03b8f
 DIST Django-3.2.14.tar.gz 9814965 BLAKE2B d2081621598ca9743b056b752775d8fe87748e7e0ad4e252f9bb0d50bbdd942cf5908aafc7757668a5dd041aafecd94f63b38441e4dbb8e1810babde1aaec436 SHA512 daa18a0a64870789af4627b1cd345fef66d4b227d71cbd9b4766332728c37e3fb17472924c290851f8bc2111efe90c5e22eebf9b6f7a26e77bdc8edaa8e42e16
+DIST Django-3.2.15.checksum.txt 2560 BLAKE2B 35a4f28005a07cee0b667ec55838d846cb7f1970be41ce08f2191992b1247263f7632bb9dcaa3d20f9df4e050b370416a2a9af6f0e5cc3523484016161a7a47e SHA512 b3d00d18e14be7dec77901ddd8818b41e2b592dbafb2c66b314478f0b2ac0f8486ce41a73a71da9bed4d9ad92a6d6bf21765ede79055c1fb2a9972e3f16cfac7
+DIST Django-3.2.15.tar.gz 9833828 BLAKE2B 4b914b1e3c192340d9a1bbd68b7d3bf3d1c1b3f41da6e4a67149e811a2312f646e2ced83af23ae035cf590e526dad00537aa5b4aee14a657f6952675eca94b30 SHA512 fccdad52d39c8757972d5e987b94b13d8ce5ce08ad480ef79407b0d9b88cff69336770409cbe18ce9529bf10966ad63105a0b0f1ffe39b681a41be3718ec886b
 DIST Django-4.0.6.checksum.txt 2543 BLAKE2B 4d38a86dc468f1cf9553557073fa6d5aad6875739c5cd3e50dd79954254dc25a0345b32fc771f4db3d566858c58b48d4f0fba434903eae0e0709666627b5e38c SHA512 b701e13371bdc00b61e7ff7f5a2b2d39a9d703616ce79640700e53a252f8aefd8bbf5560b082420bd4ff921110a44ac6a353c61db664b0ee899905d5cf65de59
 DIST Django-4.0.6.tar.gz 10389543 BLAKE2B c458b2b2a782d95771df00ed529d4b0ef0f42720f19258d32ea955e90806b61aabf03a5eb39a7a36c5d220af32dd35e78244db4d17a3f074601952905fd5e0fa SHA512 1050511bd9345519d8382a58e4e6ccc39cd41a6777c9575540dcc655f11dd36316cfc2431f94da9ac4a0fa6e41640a9131c8d49df4188a2ffc26f7ff56d40a6a
+DIST Django-4.0.7.checksum.txt 2551 BLAKE2B 6fa44707d33af485d3c55096dcc650b4e2384421c57c30cedee9f9577488783836a3ad8261dceaf5c718c1a5fcbe5852b081596525b22639c310c9aa6e86c639 SHA512 4b2453be8090c2a9d48bbe34f6e5dd55859b9debc3a116519c69da39d04ecca202e6da62ae9114790a9da8c55cfcfe176a972bb25576305a8e23736e2e063e3e
+DIST Django-4.0.7.tar.gz 10407810 BLAKE2B 77c994d042ace329699aa33e14098cbcd4f24fa4db880dd78ed87828b02c25298a1c1664511547de53eb80ebade7bdfb16412a615027e512ded437ae7de79b54 SHA512 51574ab7423a3948318a5985f74bd781269bf1c95dc77838c11e8f9d5e9233f0a3be5dfa4798d523473b9f1fd3196d4c10284e3a28d9543084b2a63179167731
diff --git a/dev-python/django/django-3.2.15.ebuild b/dev-python/django/django-3.2.15.ebuild
new file mode 100644
index 000000000000..3065555963a8
--- /dev/null
+++ b/dev-python/django/django-3.2.15.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py || die
+	# TODO: this suddenly started failing
+	sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-4.0.7.ebuild b/dev-python/django/django-4.0.7.ebuild
new file mode 100644
index 000000000000..16e1a7824c10
--- /dev/null
+++ b/dev-python/django/django-4.0.7.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+	"${FILESDIR}"/django-4.0.5-py311.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	# TODO: this suddenly started failing
+	sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index fbdc591aff04..88ff6a14cef6 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,3 +1,4 @@
 DIST fotoxx-22.16.tar.gz 8984376 BLAKE2B 4a5665313133405b4a53d7e40986e37601b5c9552f20c07d5f0889f3dacbabce1b4a712fcb216fe3358e7ad1de12da608961a996b081e4b3d644c5581ebcc6ee SHA512 ff78b0d7bbde0de5d98ac42d63c36f4bdcd425ae210dfcda6f64f4307be02dfca2966475df3f962751f73afc8e9442d2eb975725db31745109e174fe1665f804
 DIST fotoxx-22.18.tar.gz 8917288 BLAKE2B 252e0e4a812e1f510da29f844f1f854f779c44f49d864952a5fb151f27bbac8af207308352f20ed976986cff8a6ce0a78f8d57b874d630d32a4d928f06dc820e SHA512 385a01201d18f75f5b2f6d2f3609c90fae7ba016279c42f3b0aaee65c0c28c71eae6d589ace71a9714629838d2de57ac93cb24c05339aadb6a3751e3081af795
 DIST fotoxx-22.20.tar.gz 8687337 BLAKE2B 013a1f154ea9971c5ff5c33f3ab62bcec9a364f0d47a65648b251966a0b798e00dd80ced399bcfb3657cf2e95534d1e694dc2d2c36066502ddc3b50a645cdba0 SHA512 c9b6cb298546ab121be6ef2c907ce51e4a4060a52829ed1ef51475ae1e542c7cb39037402381969519907a2a66bd8f741452786ff3a25f30fbbd22b24032a436
+DIST fotoxx-22.30.tar.gz 8692758 BLAKE2B 34688f3328af3e656ccaddd7f0656d4ac9e4f09d87e0960018ba773a80ead7f8776d4457986b9af537c46f9279da87c41b06d5ad6f3b3db108892dbd3819ab56 SHA512 9e10971e5ffed807bf0c6f1cc9c885d3a09f43b8a2004c1752863c4caf17a9d159fd1321f73e61f91f5e2e2cc737d2c45b60e44962de4976aa2605b713314b22
diff --git a/media-gfx/fotoxx/fotoxx-22.30.ebuild b/media-gfx/fotoxx/fotoxx-22.30.ebuild
new file mode 100644
index 000000000000..5819421d21bf
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-22.30.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0
+	media-libs/tiff:0
+	media-libs/libchamplain[gtk]
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-22.18-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
+	elog "be placed at /home/<user>/.fotoxx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libmpdclient/libmpdclient-2.20.ebuild b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
index 223b5fe1687f..418d47275cd6 100644
--- a/media-libs/libmpdclient/libmpdclient-2.20.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/mpc/mpc-0.34.ebuild b/media-sound/mpc/mpc-0.34.ebuild
index b981f972b16d..1a68200c9ced 100644
--- a/media-sound/mpc/mpc-0.34.ebuild
+++ b/media-sound/mpc/mpc-0.34.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc iconv test"
 
 BDEPEND="
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
index f32c1802c024..25b78d0db30a 100644
--- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz -> ${P}.t
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc ~x86"
 
 RDEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )"
 
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
index e0583cea138b..33890a293014 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
index a21696d1d329..49c09b371892 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios/nagios-4.4.7.ebuild b/net-analyzer/nagios/nagios-4.4.7.ebuild
index 25c696692b74..22ed2f7c2865 100644
--- a/net-analyzer/nagios/nagios-4.4.7.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.7.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
index 2d9d334da161..52328140ab7a 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 8ddd7647fae5..5ab09809bb60 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -34,7 +34,7 @@ media-gfx/freecad
 # reverse-dependencies.
 dev-qt/qtwebengine
 dev-qt/qtwebview
-dev-python/PyQt6_WebEngine
+dev-python/PyQt6-WebEngine
 dev-python/PyQtWebEngine
 app-admin/calamares
 app-doc/zeal
diff --git a/profiles/package.mask b/profiles/package.mask
index 94171d0fe9ce..ec9b6047b97a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -37,7 +37,7 @@
 # Masked for testing. The split of some packages may still
 # change. bug #838970.
 dev-python/PyQt6
-dev-python/PyQt6_WebEngine
+dev-python/PyQt6-WebEngine
 dev-qt/qt5compat:6
 dev-qt/qtbase:6
 dev-qt/qtdeclarative:6
diff --git a/profiles/prefix/darwin/macos/11.0/arm64/gcc/parent b/profiles/prefix/darwin/macos/11.0/arm64/gcc/parent
index fceecddb55c7..5ebbfd24d627 100644
--- a/profiles/prefix/darwin/macos/11.0/arm64/gcc/parent
+++ b/profiles/prefix/darwin/macos/11.0/arm64/gcc/parent
@@ -1,2 +1,2 @@
 ..
-../../../features/fsf-gcc-ld64
+../../../features/fsf-gcc-nold
diff --git a/profiles/prefix/darwin/macos/12.0/arm64/gcc/parent b/profiles/prefix/darwin/macos/12.0/arm64/gcc/parent
index fceecddb55c7..5ebbfd24d627 100644
--- a/profiles/prefix/darwin/macos/12.0/arm64/gcc/parent
+++ b/profiles/prefix/darwin/macos/12.0/arm64/gcc/parent
@@ -1,2 +1,2 @@
 ..
-../../../features/fsf-gcc-ld64
+../../../features/fsf-gcc-nold
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index d0aa69694857..0ac639a1c5db 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -9,3 +9,5 @@ move kde-apps/kdesdk-kioslaves dev-util/kio-perldoc
 move kde-apps/zeroconf-ioslave net-misc/kio-zeroconf
 move net-misc/cni-plugins app-containers/cni-plugins
 move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector
+move dev-python/PyQt6_sip dev-python/PyQt6-sip
+move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1a677c223d0a..0a40d84f1ea8 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -76,6 +76,9 @@ DIST genpatches-5.10-142.extras.tar.xz 3868 BLAKE2B fdff4c1e3ac6b09322168d92469b
 DIST genpatches-5.10-143.base.tar.xz 3888492 BLAKE2B 981a8e21ffff29acfb070164fef85e6beaf41e36a6e9b139a7bbc2027750321286d7e1a6cc51604841352bd65fcc363a80edbb6455c9d8ae83be560603350f95 SHA512 6556642c9d99f0e8160c4e50f99dff42982346ba132abe77bdb83c1fcaf9435fd2573fa56380ce140efff7773ee5ef1cf9475360e6d5703caf4c38b14c135ec0
 DIST genpatches-5.10-143.experimental.tar.xz 16872 BLAKE2B 1b6bea488f7e2016a107b0d1b841e53ae9fdc60c9bb0737913215c8e3e2298d4cde47df57022727ba7786ffc6fb5e039bee51196a7f35edb1c4a467f9285d9fc SHA512 dcd5c51c26105c3cc7a58673000d14669e606b8d971bc025c12bce265f3faf15f640b09f5dca7bcae2d2b4f8b908ed23c425d5382657fdc8eb2f4f0eb14a0fce
 DIST genpatches-5.10-143.extras.tar.xz 3868 BLAKE2B 8bcfec127807585e1145930a119e5f8b6f4f481370c4243dfa0b3f5aac36f5b19ce566b458718128224ae63ed3ac8d232a60a917e80890a13a9b48325bd7253f SHA512 ad4f8a858caf876456536ddb7f6998f7d11c81047efa23cf3289fa93b6b9067fbdaa9329cf7b3e3089c0c07b9adabeca49ffa7a1a7eea7d9f5c0a306996d1fb1
+DIST genpatches-5.10-144.base.tar.xz 3907764 BLAKE2B 41b8ce08ca73879811e11d91f9365ddfbbc15617a4b825ba00144e71feb86e0ef24b3418b77b203a13ad6299237085a2a1c796beb6ac9aa98a5990a39fd1dd02 SHA512 1b946439d9cf6d97df1acadd7b36ef657fac40ff98b31e2237f3cc412e9efd6d4d1d409339af9d48779dbd9d88aac124f67e07afcf99e7760f93afb6d226131c
+DIST genpatches-5.10-144.experimental.tar.xz 16876 BLAKE2B 7be06890636984bcfec45818726c48dee9b2de69a3278bad8a79b1f9d4443695bf9fa56132b4f41c21564a43fe309f1191b2ce794430f6a697c58308d32396ff SHA512 677edca73f20e9c41fda7c400daf4870d00141cbd6ba8ced934ce785e3e6270db15f820ba5561202687fd437aa64ad2f71bb1a3f397c577d7d1dde90e1cc79e1
+DIST genpatches-5.10-144.extras.tar.xz 3868 BLAKE2B 0d956a61fb525b8ce3b14c215a0c0a6ffa46f21fcf87a63884d31418946a64de0c680472a62fc9bc0d83f67b49dfe88ed373e3ff2ba2f369a0909e3947b27c16 SHA512 c870f84b1a4ae7b95518d08ab46fc7e632a47884e43a9c774be34335ebf825388136ed360f5129c8c97567600e79ce2889d64d9b60a1a8bd2a5b4052e74e2973
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.experimental.tar.xz 5420 BLAKE2B 984a3e683708e1a1ec4e77fcacc592caca20d134a994e3922548b2cce0aea6b69e0dd3ae93899182b147e42a171b2dc5b230e601cb3b06b09ee6c8ca88bf489f SHA512 7305e4777e3001ea5526b059ed1684c16879e07f83f54536d1326c03a495915cd1f9776865d0bff024053312d9e9f4a94d27e4c047fffaff831995a5aa69561d
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
@@ -94,6 +97,9 @@ DIST genpatches-5.15-61.extras.tar.xz 3932 BLAKE2B f2579301f9ee4e2dd46dd65472bf2
 DIST genpatches-5.15-62.base.tar.xz 2506840 BLAKE2B 29d99833ceb0835a02f5acdcb9fac48d7e12107303caf9eb218f9ca4914b3a82fdda0e47399cab1c76d3fe4e0f17378aa466453a5409e01f69ef37ab1753b648 SHA512 5e0725ec3a7f07ff8506c8db54fe5842e0e71f5b5e62e70af43a14e7c2002a71e9b59b73ff943fa64feee453750c63b92033340405098f072a547251d2623dc0
 DIST genpatches-5.15-62.experimental.tar.xz 5416 BLAKE2B 1fad57f413aba9a61c3795a835e84c033863d057a8a35c9e42065458379bfd3ad59c9ef52ec4c18533c63acb8e695504e91e2ecd143eb354cf010838a2288fc0 SHA512 ab3980140db60b93b45c3ddd80949af772e1005a8beb4eb294349d8222b02ee13b4d4f65df13c392af0eda2111e8f7788166f6acdbba0d6b615c97b659318f9b
 DIST genpatches-5.15-62.extras.tar.xz 3932 BLAKE2B e4478eeb5bdf3b6db3e9e9de9c02641477aeca08ed07e0b0ab66419301f273b8a79f4b28fc7a22095fde8521479878bc71d70fc585d934efeefe4a408af3493a SHA512 6c241a54f503205408b8b07c1389636fd4ac0e8785d12aec2a363842f8b172e06b9568a8fa9f7607b6ab2f09b5d7892294f3618d1a7549a9c41a78f0c4e02d2c
+DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
+DIST genpatches-5.15-63.experimental.tar.xz 5416 BLAKE2B 15f4bec8ad60aeca18c9af152cd7ad505da4dad900e9d3bb12225b1cdd6893b53eea320ac1213240ec3bd169abb518a081dabbd4c64c63eb9aad5239425a8faa SHA512 794cd9c41fa86bd28199af6145acac8bba4fce15944f1f54061452501fc0dbc9a0670dbc42c6caf4b2f0972e512f028e20a61141c58f8490f69a03f6ee540c93
+DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
 DIST genpatches-5.18-14.base.tar.xz 610104 BLAKE2B 1bb79a0ab1239773023c353305c30c8c9ba5cc9ad50c539f1bceb069ad20e6feacc45bc8249b6d23f2f707d9ec3870afc5425140698411070f54593fa33b26f8 SHA512 b646dc8f7dd8177d2d97a52e8bff958ce036edcf1d1304164c8e9e7e6b796383593fb0838cf3ab16b3aadb31aede16eb763c915062763b78676c69a094234626
 DIST genpatches-5.18-14.experimental.tar.xz 69876 BLAKE2B 9e38a5a18642ebbce2c0463dc13157dfcff8c4cc9cdde604353333762c6987deb59c4427906176c0297cf4da968cf79a2c229ada5e99bdbe5eaf89c194e898c8 SHA512 00bace0749a8eb19743c1e17c034b46cf125f2f6f05c4f2a7aa550b022ec9cfd389b6af9fc54e19b9c2ae1926cc12363fa159bc07552561ff877aa9214a28184
 DIST genpatches-5.18-14.extras.tar.xz 3928 BLAKE2B 6daca2ba0f7a1a2f318f3a398a37303bc9e1524bcb9cfb2713642eeafc86f1919f2e16789815780b78a391607d2f6fc34a84682f257360fbb3793e34aa56c84a SHA512 58e6fe384be03255599468c196b89e8f3f266f113a6b7f623494937205892d5f7dd301361ead1569790f05c4bf0a6f3813b4511a11cc77294dfc2d2e69590140
@@ -109,6 +115,9 @@ DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cf
 DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
 DIST genpatches-5.18-19.experimental.tar.xz 69896 BLAKE2B a1028e0a5dd71507cb86a3d04103eebfb6f6bba5c539fe788f2d8569186b1c5d7045a1a68bf943c26e0eadb74ce9074899ce6ad21c633f5badb3167a3ebf8596 SHA512 52b47420a51b013d58ee900295f028be3a9bf8378368d1100f8cfa87c52f0f4e27c547ee286107d36755ad7f42aaf316669f7c2801bf38a9dcc8bd6de3581f46
 DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
+DIST genpatches-5.18-20.base.tar.xz 776528 BLAKE2B 3d7a0cf2c6f9a5d28049c42b6e2ffccbb707232aef139c9b9aae33c37d6cef22b45261094ac5c3e23019123709c642c69d3f181683d790305f97d72d93a48177 SHA512 db5a44c919f29f0c37cd21384a5ffa6b528575f5b5dbf71800d3a6277f793ad4ee6a6d04a35c3ef5f90906133a91f4a0e23ae43e86f678a25b23bb1c77761c22
+DIST genpatches-5.18-20.experimental.tar.xz 69912 BLAKE2B af0ce62b24f9ad72f9c3f4521ea2fe4288e30f7d821a232a2a6a155d4560c6495e0a9059f9b710bfc16b543c27b5c1f03fef4791695b21e3d11f9814bb37fe56 SHA512 4212b8e4460fdc27602af043db445929a4eef49354529887633f19bc28080974aae617f9904a89fd63561e44be19d71e0d3618f883e2cd08b702d58214f584bb
+DIST genpatches-5.18-20.extras.tar.xz 3924 BLAKE2B ddea420397d5b64ac5e964db6b2d863cca0a4fd46a3969af7f24b7803b0f07278b54363c1b43fbc4f305ac4b44e5880d5af0bb10cd2a0a08bc0e4fbd51c9e35e SHA512 51203e404cc8084974725f78dd521f5d7864f40380bc1f45596b8754a57f30535e32c3984c01a4d12b38b6118eb1448126f96042d8a2b5007167428e09761726
 DIST genpatches-5.19-1.base.tar.xz 4080 BLAKE2B 27fe512fd700cc6fc1946ebe0b39b423f35fbdce3b6c2181e1e1c197dccf436c6ba285b8bbf74500c80c64c486831a88f0f548cbd787d925eefafe740764a839 SHA512 8ff90b26202ddb80890ce8a33debbb8b6b85432412e7f76fdbdd98e257e9be23ffa5c03c81cb8482b7a35099083dec800f766354b5886d4f8f7647e3354f97b6
 DIST genpatches-5.19-1.experimental.tar.xz 5400 BLAKE2B 7c85f3452ed817de0831beb3af12ff88f49e8ce07555aefdb245c500b76527aafc1d4f26d5cd1af2e1c4fd2999f10de0977fdf376624b5719bfef44835d3d449 SHA512 d3ba95e091800d981364e60fa7068c1f633297793dd05ba9c2c0d505c9c4404bc8d940b016baf04494ffa93a89a007c6c7331ad9df3ccd10b790ef2428c2309d
 DIST genpatches-5.19-1.extras.tar.xz 3772 BLAKE2B 1d418c3d5d328e9704ba10d7483cd562e511f345a5cc6799abc52e6cdeca20efa61417f62eaf7aae2078a8bb05c7dbabe4f4ddba7ad4221b458bd5c589f29b47 SHA512 479d957a3348485baf6504a08cf06b334938656701b15067512c0f48e530c2e87ca281ad3af6e55c75a53d2e9e584d94fc030ee82c538a97a85cea9a9c8fe214
@@ -133,6 +142,9 @@ DIST genpatches-5.4-212.extras.tar.xz 1812 BLAKE2B 8016640dadf0add8c91a6631fba83
 DIST genpatches-5.4-213.base.tar.xz 4933392 BLAKE2B ce7ea84b52c60d4ae9cef1ddc3abd3f37de0ad5d7344645b3e4376db29d45b2acfe7b7b89e557c6265b4abbda9827fc68d4ef7c63eb418d3707166d7ed50586e SHA512 6107308eb5f3a0b1b079297fa7815a335620a2a0023250f1c4a92c84dfcf2ab7afea9388906e93fcc21d9ef85f350d638a8d245c29cca5b38968b71ce1a4d06e
 DIST genpatches-5.4-213.experimental.tar.xz 16892 BLAKE2B c2ec3c171e2e31a08681666b093c2f3ec2a8f613922d7a44861d54ef2fbefde5286ef2d1baf5c4fa8392a4ed70c7b1938041c4ffa6482700a29388a79cdf1a47 SHA512 f18a4b89c7afe9e276216717d4ff62c5a66ecef56243f0d28df3452f2dc44af0d2e5e8b964da86f245fceeeccc5d7daa3b1687c5f6de11df4ab8d3f1cb4ee144
 DIST genpatches-5.4-213.extras.tar.xz 1812 BLAKE2B b6812b7e126a55b2079832ddce8c9ba09aee71b8cfcc137c5d0e553a7878e9fdc6e57e64b3670123cb90661d52b3aa0818fbfb7d3d48bd0521c0a0f46ee420e9 SHA512 1deba84aabde4c35213ab38e0f40fe1aa696470bcd5a6f103635d0078726622574ebdbb5caeed7d1516ef45a326052b2ac9d4f6ef2dfb0e0f84f837f9a350927
+DIST genpatches-5.4-214.base.tar.xz 4943544 BLAKE2B 5b7d27e1b520cdaff98dc9fe6ddfe102a9c09fb8a5fd36a57d5f36ebbd7639ce1a59dbeb55e71ede1129a3890318b740b24bc654716f81840d6d2e6d8a95de20 SHA512 6494bb7d1b9ef0e46fa31a164b3c807338463dcd4d8108e5a0c5d944196f1b3e1df51192f733861514a302af3eefee530b1e173dec9b6ddd3bb0120e47714fbf
+DIST genpatches-5.4-214.experimental.tar.xz 16908 BLAKE2B 6f18616f3b6637b4aa8602616eb5535e315cb1833035f45d34d170f1f48061949b1e11a2deac94d61e20517269eeffd11ee1016d5521edd16a9e380d84a88e86 SHA512 d3932bef02b1b45b8ebc6e7f36c13fc35b03659f3e67da33cc44cf0e8152623cd0d38a05a71e39acbf5678bc1a6cff5f48763a4b73c94d84c2aab22fa1239eff
+DIST genpatches-5.4-214.extras.tar.xz 1812 BLAKE2B f82f9d703ed7fafa1abae01e9ab15db88b318ef84254360d105490bc727244795064fc6b21fbf771626da9adb62aba44a170165518fae58d8adfde7319e1971c SHA512 a3d8f94e4d9b7e5c29be7c1b336273f89ed38bbd4c21e6b34a51421ef71581a6e8ecc15751fe0bd7dbc1c98a754d1491304383f21925c0018b6e57891f76f303
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild
new file mode 100644
index 000000000000..037770c006a4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="144"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild
new file mode 100644
index 000000000000..3f13fd3d9ef1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="63"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.18.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.16.ebuild
new file mode 100644
index 000000000000..0a603bb74fae
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.18.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="20"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.209.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.209.ebuild
new file mode 100644
index 000000000000..19ef3248f18a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.209.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="214"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index 50f156d349ff..baadc7dc34b0 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 		dev-qt/qtbase:6[icu]
 		$(python_gen_cond_dep '
 			dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
-			dev-python/PyQt6_WebEngine[${PYTHON_USEDEP},widgets]')
+			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]')
 	)
 	!qt6? (
 		dev-qt/qtcore:5[icu]