gentoo auto-resync : 10:08:2022 - 08:17:33

155 files changed, 3661 insertions, 396 deletions

diff --git a/Manifest b/Manifest
index 5dabb6028613..477a1a3b876b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29635 BLAKE2B 612a19da54044258ca916740b81b0fdb24e92108120247900c7a26296f1a689970fddf47929163fa9072a50498471e19e741fde6db155d8234c4f0f2f77b60f0 SHA512 3c34f0d60543728d36e75b12b97a1922b90d2a63d7b17b3eba31c4c33670f3ac370e19b6b29cb5b3d51c3ceda78af0de215dd008a0ecf4394eb4d9c9a8d333d5
-TIMESTAMP 2022-08-10T00:40:00Z
+MANIFEST Manifest.files.gz 29634 BLAKE2B 6203ae41b77ffc32823e6144f775d247c22c0275e014d4684c210930ea993f2828aab72792d1f01f8c166685d7c07210d669aaccafd70e5244c36ba4f1a85579 SHA512 970e58af45f7c0cfa079ce472b6b89ef6d600cd1988861aa3ef938ffe9059848b3d024c91205fa2a06dac050d33551308f8b66726915b299a517590e498d3782
+TIMESTAMP 2022-08-10T06:40:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLy/mBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA4CA/9HnDUDIM8N1N68hLDhwlY4n48uIMDdgfApptn9eZVww4vN7g2GxGBmhfQ
-4jDOrI/eAJzFhAPQiD+NgoyDIQVJqbmGaN+mA0Tr177QIUIoqN7pJeA9MgDASC46
-DAhys6tbVrewAdWo0mv+yMiYpYLsimti0YsTyDPYLRbYdxzYFIEpZfWxxaIXHbBy
-dHM2QZUddSSEugh4iHh9AgBsnVHXrgjxH18loAKuaTvO0noHUvRsIsZYuTx8rqS1
-m0LwFNlq7ztsIjoDpH6ba53HhRZQWjS71nY0/tcP5V08nVOVmT6eibMX+eAExyoq
-6ygzYV/X0TKHsE0WP/9kg5hH1Lf/JphMlgTuGOgxkcOBuv/WlIXMDTM3fci2Fi1J
-3Hw29TPsa3TLct6S01aImhKvM8BjM7ar4cSzPEYXXdETPwojK63ZOguxFdw/ymaQ
-cIbtprC6XgCasP046qUFldReuF8zofZojlhKrv703cCqpi7GM9IwnLSMSTfp8iwY
-0j6IGU9/KeKOzZtvnJXuz9XPdNN58Fae/RRv2egTQFzN0eyxntlnyDR3LO8SKZwq
-7dHk48Qsre2m8r0x5ks3Kb3epE3335CM76cZE1M2HKDb7mIwD1SR/iRSUUuXpXV3
-0LLegB1on3AKWl10lHOl4BIQQ7R/NljT1VeiTokfwX6ivx2LBwU=
-=Eufy
+klCH4g//TyyqtY+PaHbH0FRZrpK/kyfOZYYedzuAWbxdbeyGshOgnvCuXa715kRk
+Y5hGg5QDVruL/xjVYxmdxmZDoUu8nFmc/CqVmEpJ26fAWASj3YlFbM7rJPm5e8NY
+0bLNijU79bbeEpEWQ4hE9NkeHld/GwZv9X5XYj3smBAHOSHp3yb5e3aq3re53HXp
+Fpk6cZM8LLkjrCM9eTQFR9dqZ+4Na0NGtA6l8H0djXP4ZLnkh2LAQUZJ9kzhA+6Z
+e25gZMCcJPEjPbx3UjGEHnVQepghqZImSTdbnc55EJPCNgBwHuhoapOGqfWMgq7g
+WP1Z9VgcWI50RltBemo5ZSvZhCulJqEglJpnQKbKGM8+GUTbFW78bB3612ygTZJC
+d4R2+f2bb3/RYsYaJb2aIEt8uJ0dZLikNUBOcsV8ZaF4gkAD4YufJMFGXBBZ1RYW
+ylNl/3ZhzN0jHBvy4OjUdc7d8B3r0mLm1ajJdSnW0b+EtNM1cj8aHWURYy5OpZal
+yDWCrVxMzR9rfmo69bbiH1mEFd+4Irs27BGFwdbG2UXXUs5M72Ho/r5kmk9uGHWW
+tzQaqegGIsLektFSpQLn6qOYFGVyZloCDwfENngN3rR7IGvZthWG8ZLmiFDNmE54
+AlBFcwh2Q6F2CI3BEiAhCJ550rLHmpLi1afU/GcQIkZ7jo2ITfA=
+=0W8Q
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0a5153a01f14..5bfee5c19994 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index abe02a26a2f2..eac354ce9a74 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 2ac52cafce7c..baafc8173993 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,10 +1,13 @@
 AUX burp-2.0.54-server_user.patch 282 BLAKE2B b949a5f1b8d73048145a5efd62bcee605f77f272fe3d4759958092e0c37b14b7077e01b9c55a865728a856293b7acdae494f8583e4451cd02b9242807b05ed72 SHA512 a4cd302967deed776b663f037e509e354dcb5958d6a4c33770062e5455d2ff641d62604779d25c6bb542aa547548c39d8b529fa7787ab1b42dba262f1439fcea
 AUX burp-2.1.20-no_mkdir_run.patch 238 BLAKE2B 44ba927f8ca97386d70d52411f2fe5ca233160e85de56d58e33c9a038c542e6d8cc5a96f1e6eb60fefd5677c201a5416949742d1ba725575021cb28b0afae254 SHA512 b25ce17b66988cdcdb67d847160d7a80a8daf8470cbc5ece066a70dfae34b369e175a2ee2cf10b0e68f51b8fd99f52762dc4c429d6abbc4411fd09a8500c067c
 AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610dd918b583455fda6d13eef6292a7eeaac0d14266bf21f97caf6dba65f0a46b1534695e7b72b91c6958d86f70ac63e356b5e05691 SHA512 249a426a76a81a2582f824d2d767695bfd848a04190ee9a2f1d4296bed03f93d4eaa86c13b4b755700b1b552bb584f9b0031ec60a705f2b27b20d62eb58aef8c
+AUX burp-2.4.0-fix-musl-strptime.patch 2730 BLAKE2B 2518df052e42dd790e56776c33ae02b085a888f80faad39a9a25372f78a367eb7664a7b2b5ddf1bac37a3974179c8fcaaee005634197a2c8dfdf4e7cfa0b0c6d SHA512 d3b2df089fa0df1f65a347d90cf6896d05883c10a0828b045eacf8d5a3f911e046315aedc9eb0d74c43796eb822c96befa74c3c7da88adb954068f497844546b
 AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 DIST burp-2.4.0.tar.gz 624032 BLAKE2B 4a1ff48236dc631dd6d545480a33af3cdf8020c3088f1ca09ab66ac5cec8128d262b9b991bf9e3229c80f75a4746d338073a0a43fdb67a2fe21a0fd4f243469d SHA512 ea81a12e54c6d88b702dd09dc4fa5a724d1e322bdfba2643c9312a9077c9edc63f6ca0f6cb3a6ebecb6ad9feb1cc26c114277b2308d9903f4abb0442a9be7c19
 DIST burp-2.5.4.tar.gz 625018 BLAKE2B 83cb8e48c616f527b2271c6ea5855a303f2925d3d0b83182afc64fe139676a4b1b98349d0ba0636613d3409f100417c4a36b7b1f24bc64bba329940d4587cd2b SHA512 b283e34e76a6887517d72c99deac5e0299efa07dd922d1275666683cc3ba4b040b97e5ce4840cb06025926ea616778811bf4c9c6f9c7564da5122900cdd7bad0
+EBUILD burp-2.4.0-r1.ebuild 3020 BLAKE2B 4906867ee41540786a6a971035c9233d248e5130a0599607206e35230dd25624ec7a13cb4b9ce020f56ddba9864d482733a2e17c1abe025f63297ecf677ef158 SHA512 db1a203ea42f50ca5a352731c05850febc0fcaa4ee5c0f2d9251db632d1c8357b2862fd55e147ff5c287d8cc73fca52d89debd42cd5cee6567655436d7015d6a
 EBUILD burp-2.4.0.ebuild 2967 BLAKE2B 1750cbef2e51155f745308f1ae3913e46a9ed34e7bebdedc02994adc66679ae053a8ba6bbf3aee584c4ebb22ebb05dbcbdba23a6655d35d93eac069c947c4647 SHA512 0c484c2dbbdbe8b681facb1da7735167535265c483d5323b64b5932e4eb322b255b08d336b66290b4763267f3a6c27c358034e789496bae02462a2b3a38122dc
+EBUILD burp-2.5.4-r1.ebuild 3020 BLAKE2B 4906867ee41540786a6a971035c9233d248e5130a0599607206e35230dd25624ec7a13cb4b9ce020f56ddba9864d482733a2e17c1abe025f63297ecf677ef158 SHA512 db1a203ea42f50ca5a352731c05850febc0fcaa4ee5c0f2d9251db632d1c8357b2862fd55e147ff5c287d8cc73fca52d89debd42cd5cee6567655436d7015d6a
 EBUILD burp-2.5.4.ebuild 2969 BLAKE2B 4271114fa6845a377d910bc0a34bd4bb9e27aec4048822928b32b00ede5c64cc20f59216f530ed72d8231be46906ffe3bd66dbbfffbaccd9703393704be309f0 SHA512 96b0dfdcf82f220fd57771abf9b5f6b4787b5a506c698c2cf9a9c9afb36945d0acc1e0c1269d084d93df23139331b2f31392400eadfcd042f95ff2a44342ed83
 MISC metadata.xml 824 BLAKE2B 144475d686773901cee9f3926e843a2d9b3cab8a9db0c2b6d590b389dde0dda059bb06abb74e015d19a1f1ed60c4a2c7a11c06bf35e93bf1be8cb2a702447558 SHA512 1cc41b5f4c4d31355824a595f778702b79bec6a45b398e503834d55408bdbbf708bafc7c364f5fc038e31eef26baf4adcd8cd922ac18f6a41b5be446eb9ebf0c
diff --git a/app-backup/burp/burp-2.4.0-r1.ebuild b/app-backup/burp/burp-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..fdcea9103813
--- /dev/null
+++ b/app-backup/burp/burp-2.4.0-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl ipv6 test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	dev-libs/openssl:0=
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( dev-libs/check )"
+BDEPEND=">=sys-devel/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
+	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
+	"${FILESDIR}"/${PN}-2.4.0-fix-musl-strptime.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		--runstatedir=/run
+		$(use_enable acl)
+		$(use_enable ipv6)
+		$(use_enable xattr)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See https://github.com/grke/burp/issues/869
+	local -x CK_DEFAULT_TIMEOUT=10
+	default
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:${PN} /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:${PN} /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e ${EROOT}/etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  ${EROOT}/etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	# According to PMS this can be a space-separated list of version
+	# numbers, even though in practice it is typically just one.
+	local oldver
+	for oldver in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then
+			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+			ewarn "the server config file by default. If you use bedup, please"
+			ewarn "update your scripts to invoke it as"
+			ewarn ""
+			ewarn "  bedup -c ${EROOT}/etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}
diff --git a/app-backup/burp/burp-2.5.4-r1.ebuild b/app-backup/burp/burp-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..fdcea9103813
--- /dev/null
+++ b/app-backup/burp/burp-2.5.4-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl ipv6 test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	dev-libs/openssl:0=
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( dev-libs/check )"
+BDEPEND=">=sys-devel/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
+	"${FILESDIR}"/${PN}-2.0.54-server_user.patch
+	"${FILESDIR}"/${PN}-2.4.0-fix-musl-strptime.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		--runstatedir=/run
+		$(use_enable acl)
+		$(use_enable ipv6)
+		$(use_enable xattr)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See https://github.com/grke/burp/issues/869
+	local -x CK_DEFAULT_TIMEOUT=10
+	default
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:${PN} /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:${PN} /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e ${EROOT}/etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  ${EROOT}/etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	# According to PMS this can be a space-separated list of version
+	# numbers, even though in practice it is typically just one.
+	local oldver
+	for oldver in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then
+			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+			ewarn "the server config file by default. If you use bedup, please"
+			ewarn "update your scripts to invoke it as"
+			ewarn ""
+			ewarn "  bedup -c ${EROOT}/etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}
diff --git a/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch b/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch
new file mode 100644
index 000000000000..e8afca8fefa7
--- /dev/null
+++ b/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch
@@ -0,0 +1,86 @@
+https://github.com/grke/burp/commit/76b7f1ba9f4445108059b13f3d79a7fde8a292a3
+https://github.com/grke/burp/issues/908
+https://bugs.gentoo.org/862019
+
+From 76b7f1ba9f4445108059b13f3d79a7fde8a292a3 Mon Sep 17 00:00:00 2001
+From: Graham Keeling <grke@grke.net>
+Date: Mon, 8 Aug 2022 07:53:38 +1000
+Subject: [PATCH] 908: Only glibc supports %z in strptime()
+
+Change-Id: I220e4529073c92df856b892559725b323dc84334
+---
+ src/times.h                            |  8 ++++----
+ utest/client/monitor/test_json_input.c | 15 +++++++++++----
+ utest/test_times.c                     |  7 ++++---
+ 3 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/times.h b/src/times.h
+index 325419c2b..b0fd3876f 100644
+--- a/src/times.h
++++ b/src/times.h
+@@ -3,11 +3,11 @@
+ 
+ #define DEFAULT_TIMESTAMP_FORMAT_OLD	"%Y-%m-%d %H:%M:%S"
+ 
+-// Windows does not seem to support %z.
+-#ifdef HAVE_WIN32
+-#define DEFAULT_TIMESTAMP_FORMAT DEFAULT_TIMESTAMP_FORMAT_OLD
+-#else
++#ifdef __GLIBC__
+ #define DEFAULT_TIMESTAMP_FORMAT	"%Y-%m-%d %H:%M:%S %z"
++#else
++// Only glibc supports %z in strptime.
++#define DEFAULT_TIMESTAMP_FORMAT DEFAULT_TIMESTAMP_FORMAT_OLD
+ #endif
+ 
+ extern const char *getdatestr(const time_t t);
+diff --git a/utest/client/monitor/test_json_input.c b/utest/client/monitor/test_json_input.c
+index 516fc779b..aea2a4154 100644
+--- a/utest/client/monitor/test_json_input.c
++++ b/utest/client/monitor/test_json_input.c
+@@ -162,13 +162,20 @@ static struct sd sd1[] = {
+ 
+ static void assert_bu_minimal(struct bu *bu, struct sd *s)
+ {
+-	const char *sd_timestamp;
++	const char *cp;
++	const char *cp_end;
+ 	fail_unless(bu!=NULL);
+ 	fail_unless(s->bno==bu->bno);
+ 	fail_unless(s->flags==bu->flags);
+-	fail_unless((sd_timestamp=strchr(s->timestamp, ' '))!=NULL);
+-	sd_timestamp++;
+-	ck_assert_str_eq(sd_timestamp, bu->timestamp);
++	fail_unless((cp=strchr(s->timestamp, ' '))!=NULL);
++	cp++;
++#ifdef __GLIBC__
++	cp_end=s->timestamp+strlen(s->timestamp)-1;
++#else
++	// Only glibc supports %z in strptime.
++	fail_unless((cp_end=strrchr(s->timestamp, ' '))!=NULL);
++#endif
++	fail_unless(strncmp(cp, bu->timestamp, cp_end-cp)==0);
+ }
+ 
+ static void do_test_json_clients_with_backup(const char *path,
+diff --git a/utest/test_times.c b/utest/test_times.c
+index 98be11fd1..5a68203a6 100644
+--- a/utest/test_times.c
++++ b/utest/test_times.c
+@@ -35,12 +35,13 @@ struct ds
+ 
+ static struct ds ds[] = {
+ 	{ 0, "", "never" },
+-#ifdef HAVE_WIN32
+-	{ 1000, "", "1970-01-01 00:16:40" },
+-#else
++#ifdef __GLIBC__
+ 	{ 1000, "", "1970-01-01 00:16:40 +0000" },
+ 	{ 1000, "UTC+10", "1969-12-31 14:16:40 -1000" },
+ 	{ 1000, "UTC+10", "1969-12-31 14:16:40 -1000" },
++#else
++	// Only glibc supports %z in strptime.
++	{ 1000, "", "1970-01-01 00:16:40" },
+ #endif
+ };
+ 
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index d9f1158ce273..4298ac3fdb41 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,5 @@
 DIST dar-2.7.5.tar.gz 2404076 BLAKE2B 2887629cecf069cfb5063132299279b8be985785485c6f04a8389dfd4930f00b073b421fbb17915d69f5efd46ebb4c3d371c10d3936bfb16d82a191218af350d SHA512 a4e01dce8a078ba81b3032a1910d75f0f59a23511246f570a50ade135f49f11e522ed8916a947aece1799dcd1d37308ba6e4a009313b80d6a1561698c3d5623a
 DIST dar-2.7.6.tar.gz 2410200 BLAKE2B 925b4854c66fec9287e0f42d213f94f208b5248d09eb6abe4e36a41df1fc57641d7a6b41e1f8aaa202e6f74ad04399c70a8cb74dc63685985a5671ba54efdf93 SHA512 517fa06a5b8caa53ad111e4287446583f328ee2027169db067610877e05291e63179c1bdd92312a6885d1c7eba0566a86301e974d1d48df56f0fce9ccfdb3a19
 EBUILD dar-2.7.5.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
-EBUILD dar-2.7.6.ebuild 2230 BLAKE2B 7ad96a0246b7db5069e3c93b2ee6b32d711b82e24afc71a48bc3e7a77d18bb215c76e35193bffe3c6c13ff0c66f38e4e6d3d534dcf6774a1a3f040afbcf76223 SHA512 f5efb4de42e27c74f6910d368d18a3284d4d0007c792f1306f3d31ba85bb56edd56aaf64a52cd6a36002d2059c0ee60a50190ce91fe8e78e94e85845cfee6f44
+EBUILD dar-2.7.6.ebuild 2229 BLAKE2B 99607c20ed3ea2faac8c4b99ca0cd13e84d9518e43e6838225d336754f312a3512605ee1933e29dcac6a15e098da21babfec7ff76f866f0ff7d37521a3979290 SHA512 d988d0b34c957729ddb070299e41ca70e60f0fdafdd23b5366499a54dc354fded62f910c838191cbb5e4a9901fd20a67c2b491727059dff4f88d1ab22f055ea2
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.6.ebuild b/app-backup/dar/dar-2.7.6.ebuild
index ef7cc64225b7..e38b345ee35d 100644
--- a/app-backup/dar/dar-2.7.6.ebuild
+++ b/app-backup/dar/dar-2.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc sparc ~x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
 
 REQUIRED_USE="?? ( dar32 dar64 )
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fa93249dec25..72723f740094 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index dfb5a4000e3a..c7a9bd243c3b 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,7 @@
 DIST tracker-3.3.1.tar.xz 1976268 BLAKE2B 34492aac5c7a5cae20cc3b246de7a7f9948be05356508cffeec56cd6aa83b89a875c01d58c299299723e1aed8bba55d641dc817f77cecbe1379b49ea853aa8b3 SHA512 34a86ac58bf8b31f3beb106d3f8db38b764624b800f4cb1c015102f02616e4c2d356f58f0e6a13f66cca79a4173828748ad5e4217b21e83b2fe1606ddcd7ce88
 DIST tracker-3.3.2.tar.xz 1977512 BLAKE2B 92d8db9ad33b019f47194f086379e1f9370d9ce3643a2a2dc02d277be755e5a892ab4c6bead8c2d50db642aca37141c9961d2fd1f862be57a6e0f78b479eb03f SHA512 2009c7a9b82fd278e38bc71cb41ef1fccb23493bd84a71456c7568ed7a025ce68bab689b8f14b8008479a203a5fdc02acea1862f4f482467ed5c295bde3d4ad8
+DIST tracker-3.3.3.tar.xz 1976160 BLAKE2B aa61b83ac499736b1cc6273813ef0bf44dae9c4a30d49f28d97205b31ead7e55021312297973cf37be67edc76bf66ca19edd746ae2269e59da406d23bcc018c7 SHA512 0f8ad998a5de6914d1e24da1b2021967339a2e637996b3e672fe4991177e69b750cdd9eb894e5e6f5f394d991b680d40afc05b95f69171ec38278e30c9729a15
 EBUILD tracker-3.3.1.ebuild 2699 BLAKE2B 4bbdfc9f96765e836fd47aa2a57654d3f3ae503aebaf31a0b78167b00005c35bc53ead4246006bb4c2ed98254006d95962df1a1a6b96227ec921562c2fedfa46 SHA512 616baedeb9783e4682be844977fd0faf7e5f0e402af8a23e614eaa3ab65d25f16e6153048430adf05a2f60e847d9285de9f3db2519734e590a5f41d48abad98d
 EBUILD tracker-3.3.2.ebuild 2738 BLAKE2B 0905188614de0fc0fe90b33ed9dbdf0f4737efbdea78bfc3216c582bf672357bcdba311f19a8a5b4517f10674f809cf71190e38fe2275f5cfd9d946aac6a8289 SHA512 cf7ed294fb2b662995fb6cb4bca2bdcef3f4f6a8507e2584f24bb1553677d80eb32303721a07d1bfd81e405719393559244140387a9cf610ae1b57503bce56c3
+EBUILD tracker-3.3.3.ebuild 2741 BLAKE2B 4893be7f3da63b49df66da82a2a3b01fe8c4b5886b61b990ca7d8c9b472b5bd764993e78d31b7e1cd5c39d6f8fc3b2ba5268ea3b169965e1f52fc69447923733 SHA512 79c4832f39e9f9ab40f8cdf7b501083e5a0016e72f2f3e78608fb432cec4354c67148d9dcfc965b51c83bc7ff244c36201c7f07c4cab4efdf39521537313faf1
 MISC metadata.xml 498 BLAKE2B 53cd3148f5755776613afbd38fa6b0eac4d10bb60765e7af7922ff70c5875f78ba25a78ef81af69f7767bc9da9fc854d9c833f4aa8bf18e52811fc4292dc47f7 SHA512 b81b2eb4705e5280286c6b6d9cc37945c671cd9ab635d31d7cef7d7ed2a3cf7a2ba5107e37363a78d8c707a2095a3d002e4ca6c233555a075ae21a9f8885d6db
diff --git a/app-misc/tracker/tracker-3.3.3.ebuild b/app-misc/tracker/tracker-3.3.3.ebuild
new file mode 100644
index 000000000000..4c0399012f73
--- /dev/null
+++ b/app-misc/tracker/tracker-3.3.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3/0" # libtracker-sparql-3.0 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test"
+RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.4
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.29.0
+	stemmer? ( dev-libs/snowball-stemmer:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/asciidoc
+	dev-libs/libxslt
+	$(vala_depend)
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+	)
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b \
+		"dev-python/pygobject[${PYTHON_USEDEP}]" \
+		"dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dman=true
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+		$(meson_use test tests)
+		-Dintrospection=enabled
+		-Dsoup=soup2
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 99672f7481cf..072e6a81c3fb 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index b78464781d37..30fed8eb9f2a 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,5 +1,7 @@
 AUX iwdevtools-0.11.5-rcd-plain-name.patch 667 BLAKE2B 6f775ac87e50327e7240e204be7cfda9e1acf0455486c18e7d50522746ece2c90d97c27ce9b5d927fa87b4d71935941f3298bd8c22be7bfebc1c94593cceb8ca SHA512 cbb915f4a463e8c3dd68c043f73323ca624a36f178dab53ca3eee61dd74ec485d33b47ab8c6bd4a4db900e1516f84cfdd0a11c9365773f7fc438659246ab426c
 DIST iwdevtools-0.11.5.tar.gz 85698 BLAKE2B 0f5b0c81735017b82144c74b2396826b2e6ea97db70704977c7885bdb00442c83023f593aeb25ab2e51f3a35cd659be98440f51e4496418a92f1559212db5b5d SHA512 05e0169a465cd4956d663f54bdc66d3c17379229b23c26a94d9deff879ef9e53b1b28f59e7cf314d36127954cb75728f008d0b0728659436ad1e63de5fb11bbb
+DIST iwdevtools-0.11.6.tar.gz 85945 BLAKE2B 61c18ae0ed1c0f7e90d41af485f18f891cdd9ffbaff5437cb9f9ca88622efa0f5acd89ac8596e7d41c25a083a970143f3b226284f4566b0b8ee3718071cd6cbb SHA512 21ffda72945947658bf6867bf83d9b9ad4f6b930d4c2cee3dea551581030668ab286a4c4a07edeae937fd91f4aba08fe8e7c6506459808c4ada38502226b5b26
 EBUILD iwdevtools-0.11.5-r1.ebuild 1955 BLAKE2B 6d126fd53e92bdf29cb93ef168fddabf88e61d1a8fdd86ad6268ceeb76e47dcd391c7d4f7e8d66b13b6d85959ce32046e1a284636b322763d7278c2ff0526d70 SHA512 bfffcc7aa2ba0da26bf1d30576f02289d9e95cd2e2c3389456c6f1c2bee36eb669e3d15c46433b5fe145fd86fbad78205f13e81b1c8871d73d2a05cbaa4f3842
+EBUILD iwdevtools-0.11.6.ebuild 1909 BLAKE2B 7e32358db8ec521ba8712fc31cec84398c3e4deb3743df510b1fbf232e219ff46adb293e1d732783da6ccc8eff16cca170a09cafec5ab521e86718432ae3ff39 SHA512 671c69bbfda922fc8efef5f5ad299f7ffe7ae8f21dbda4d568d6966c3e2066c3bfd661da9856160f1e8101c5b4a302fb236f5d3aca0096033f089e2544a90a25
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.6.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.6.ebuild
new file mode 100644
index 000000000000..68858249d8a0
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.11.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 36a1db782ad6..31e003b9917a 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/path/Manifest b/dev-haskell/path/Manifest
index 21be63b346fc..97b2bfe16bc5 100644
--- a/dev-haskell/path/Manifest
+++ b/dev-haskell/path/Manifest
@@ -1,3 +1,3 @@
 DIST path-0.9.2.tar.gz 26341 BLAKE2B d9c3e70034e980306ed0c56cb028e4fb9a858a0a27ca6b13081ded57fadca14942d45955f0f89f41ccb22f2fb981ac93de9c9dfc594216d679f64c9b80cbfb97 SHA512 5d53506e7698f3966d867df8e8c5cc30a997a87145dab80893134d01ee526404e9eeffa1ca6fa2f70b8abed18e0a0d77b14799fe3cac79188b048dac56bce4ae
-EBUILD path-0.9.2.ebuild 1170 BLAKE2B 0f870e4bd29032bd464fdc4dffdebfb33d2f1b12c5e913a8180fcb61efb85f1201bba2c04b543c97e61129a06775b8837ee8cbc0b939efeb1499a4d9ed0541e0 SHA512 7a4847f9cd2106ca18123f74899695c2f13788f81173eee8ed57b94aa8e45c9d2be8d2079122631b520ecd7435b5e282d4a1ee5bf3cbf5200367509898fab529
-MISC metadata.xml 321 BLAKE2B fbee91ad115e2fd989c0a30707a65cda17d2eeb7c7241ed9b8745ca64b3067e8143893ca913787240712ac81d2ff09c79433b177918a553861a5ed99daec5975 SHA512 94d812530caf1b1c80f1b8fec3918418895b8d0280439785f59758c88ef898e56164a3bfd9635d2c3073969018f6f351475e7b8b8e4b84177d2c713b1dfce6cd
+EBUILD path-0.9.2-r1.ebuild 940 BLAKE2B b386621f8acb5397385cb98933ffb9e94986b879f4037cfcc38a2991f1859fc8b2bc04f9d0d707a279e3788278501d8507be7d2a220d264fc72bc3d1e78bb323 SHA512 333f188e9cc32700336e672970bbfe106941338cf2cfeea2d4be40234b409d8f16a0e80e078af726001ecd4806937bbd2e4757d8d4f79ec59778f75dd20534f6
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/path/metadata.xml b/dev-haskell/path/metadata.xml
index ba268d0dfee1..937381521944 100644
--- a/dev-haskell/path/metadata.xml
+++ b/dev-haskell/path/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="dev">Turn on development settings.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/path/path-0.9.2.ebuild b/dev-haskell/path/path-0.9.2-r1.ebuild
index 71683620a480..74a159e8e4ca 100644
--- a/dev-haskell/path/path-0.9.2.ebuild
+++ b/dev-haskell/path/path-0.9.2-r1.ebuild
@@ -3,40 +3,35 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.7.9999
-#hackport: flags: -validity
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -validity,-dev
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Support for well-typed paths"
 HOMEPAGE="https://hackage.haskell.org/package/path"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="dev"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
 	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.6.3:=
+	>=dev-lang/ghc-8.10.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
+	>=dev-haskell/cabal-3.2.0.0
 	test? ( >=dev-haskell/genvalidity-1.0
 		>=dev-haskell/genvalidity-hspec-0.7
 		>=dev-haskell/genvalidity-property-0.4
 		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
-		>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
 		dev-haskell/quickcheck
 		>=dev-haskell/validity-0.8.0.0 )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag dev dev) \
+		--flag=-dev \
 		--flag=-validity
 }
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index 2414d926d0e1..b4f670483f08 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -1,3 +1,3 @@
 DIST semigroupoids-5.3.7.tar.gz 35349 BLAKE2B c911fe203638714236211a9f40f638fd7e43255e57a4b1b3d0df0cf10a97cc93815776bb53c864a8a4c95fda74402f9a5f6003e3899c35015eacd9df8cc5b86b SHA512 5e908f3b1618cfeb45e03335284e8811ff443f3d7cd8013813337729da62570c052e854bde64c56535809340d0ba281e246d7d0cc8f14627deeb7b1047623849
-EBUILD semigroupoids-5.3.7.ebuild 1855 BLAKE2B 68f5711371f6d5c7c0948a2137cd769f93669e9ad22f14641fd44096f85655395fdf9f30cadc3b2aee36f15cc6e2cc453ff55edef0d4a5c8054cae921829d71f SHA512 540ac564375144500accbe18f6cdb2b74c781cf1cc4af51547347ea2568ebbe4ee0487c1cd660e57c9c46aefe78cb3f71ffbbc6daf177aff5a8efa5261de55e6
-MISC metadata.xml 2028 BLAKE2B e52e472eb18b5ea924355a6361001d9fd2465d994bcb1f9f139981d35a9c25ff6dcd0e71005559473dd9d18b65967d740a91378d36316244c4c891cf875ef2ac SHA512 4b14472f76a2c85a0a9c007b2430dd52c457c391eb25dd66c675d57ab46929438c35184ca28b9d8d50ee41da0dad7e4200b4eb5203e011925945a741bdc2f521
+EBUILD semigroupoids-5.3.7-r1.ebuild 1578 BLAKE2B 73bb95f428b55af2ba0360bf69c06e03d332c51cd32f6525a3e86427fbc5aee187139013157525e5c8f4ba982c7e63185af7221072b20a6f798a5d29415b899c SHA512 a38e78f2a3853a51ffc583a2247b9d1ab2cd0e718711b1c6e76cda14a8f76070c8dbad1c33b558b8bd5156047bb0bbe5d34e5df3048c81b7537b579efa900484
+MISC metadata.xml 335 BLAKE2B b6160ecfb7d4a16844f56fec3886f87d620e4081ef3f7681e8dd731f509c4fe74684dacaa5f6170ee6e6b8f6f9f8c6982509eb69cf1ab8c391f92fbbea1ea01c SHA512 4b3cc52c5edc32de1b829ea963d073c34e98e47d43895b3ec466f1e03ee3ae629835dc42154e06d3f9bf7ee154256cfbbaf558ce1d9207acadb1b859761a74dc
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index f45e50c138f1..20ce9f7e06c1 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -5,44 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="comonad">
-			You can disable the use of the `comonad`
-			package using `-f-comonad`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Comonad`
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers`
-			package using `-f-containers`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users.
-		</flag>
-		<flag name="contravariant">
-			You can disable the use of the `contravariant`
-			package using `-f-contravariant`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Contravariant`
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Distributive`
-		</flag>
-		<flag name="tagged">
-			You can disable the use of the `tagged` package
-			using `-f-tagged`. Disabing this is an unsupported
-			configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-		<flag name="unordered-containers">
-			Enable the use of the `unordered-containers` package (and also its
-			dependency `hashable`). Disabling this is an unsupported configuration,
-			but it may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-
-	</use>
 	<upstream>
 		<remote-id type="github">ekmett/semigroupoids</remote-id>
 	</upstream>
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
new file mode 100644
index 000000000000..a9c5d203da75
--- /dev/null
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: +doctests,+comonad,+containers,+contravariant,+distributive,+tagged,+unordered-containers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroupoids: Category sans id"
+HOMEPAGE="https://github.com/ekmett/semigroupoids"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=comonad \
+		--flag=containers \
+		--flag=contravariant \
+		--flag=distributive \
+		--flag=doctests \
+		--flag=tagged \
+		--flag=unordered-containers
+}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.7.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.7.ebuild
deleted file mode 100644
index eef0fed6d93d..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-#hackport: flags: +doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive +tagged +unordered-containers"
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-	comonad? ( >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
-				>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		--flag=doctests \
-		$(cabal_flag tagged tagged) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/streaming-commons/Manifest b/dev-haskell/streaming-commons/Manifest
index ab5267502fc4..55895424bcbc 100644
--- a/dev-haskell/streaming-commons/Manifest
+++ b/dev-haskell/streaming-commons/Manifest
@@ -1,3 +1,3 @@
-DIST streaming-commons-0.2.1.2.tar.gz 86776 BLAKE2B 01f4a88fb87055bb315278e0391880025b38765faa27e788d3b184c4942af0b8c26e147639e4413a029ae30e03991d083adf49aac89759b2fe2c058e945acd70 SHA512 7b6f39237f9ac13ca2d8205a43fee17c6edfe6609a1119903f8648aed151ef92779af7a8dfdfb108dea679cd26c83dfb5d21285d51f91dec0ad10debd100b8e7
-EBUILD streaming-commons-0.2.1.2.ebuild 889 BLAKE2B db253ebdd822e72778f2747ca2f031301300b6ff78a6f458f842ae68a0edb5dc0f298c31bbb48e055fbb86ac5cf7a4b486ee2f7c5353acc731f19183ad29b6ba SHA512 be44a2aa7151acc8bd73cfe270f025a9566ba70ed106c4900dd8ef128b636f697cd31fd5b0d34572e35b2c91527e51c66fd2fa554e37ef450c06567275e15116
+DIST streaming-commons-0.2.2.4.tar.gz 84330 BLAKE2B 08b729471b3fdc9c5508ffca0e9ce52f38a33b25855f027ae5924e28387e80b369e8c41a33fae49bbb6d5845985954377c2067d56b26995336faa51cb792f83d SHA512 e552bba766e5b816cbd448d1cec86c5c7593f3f13c6da42c74ebf2c9698be3a3174dd922cf70de1b4940b53e580f396a51cebff6b62db305fb0fb48a5c7658bb
+EBUILD streaming-commons-0.2.2.4.ebuild 851 BLAKE2B 18499d5c69ff8b04fd9dbf0a78959a47464bb33704bace381f724a01ec20cf8c65a708e92524db4e7988d1ce6e1b7395f13f1ca3e87804f786853d34993d26a7 SHA512 994166f0963fb17500e92d98900226f0fcdb086e0dedb34f5ffadd0215aa78cac718d71cb3d0794023c827aebf046ec882429d0c686d81fdb7d3ec218888aa66
 MISC metadata.xml 496 BLAKE2B a9610258f3b1b760ec6903fb664fa33a545328e2cd52fcc31907a37d45a73cf65c65d57caa1ba202697f6d47513108ee7fa8b84295ce32c2938038ffe3864003 SHA512 59295071d29e7a934cd141bdbf140a919a1b0b83c3b4516629028a55b179e5ad56120d35764c36c16119f37b14027510cb5f67ce9db9bbc59629f9b406d09348
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
index a05cae6ee487..50f3584f0943 100644
--- a/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
+++ b/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,7 +15,6 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 RESTRICT=test # requires network
 
@@ -23,12 +22,11 @@ RDEPEND="dev-haskell/async:=[profile?]
 	>=dev-haskell/network-2.4.0.0:=[profile?]
 	dev-haskell/random:=[profile?]
 	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
 	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.6.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
+	>=dev-haskell/cabal-2.4.0.1
 	test? ( >=dev-haskell/hspec-1.8
 		dev-haskell/quickcheck )
 "
diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
index 76e27034e274..c1241934a806 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1,3 +1,3 @@
-DIST tls-1.5.4.tar.gz 150171 BLAKE2B 03085bd5f0d20b27fd5ea31e5e6179a15ac5893cc585d5a274523444838e8e05e9f3f4028b44147d6bb20df2c37e293046255765c253b57d2be4584066f24f8b SHA512 fb95ab6012ed95d82a41810b83e6f779645fa56d46c57f34a954a6885c295737808edcdcdca9e88e5b3c663f5aee71f104fe1fdd9ab35fb6a8ade4a202376d4a
-EBUILD tls-1.5.4.ebuild 1373 BLAKE2B 4c5016b0d3630eb46261d49a4e4d452c72d20b6d3fbeea3a4717bfbf22182b7ff0704c12ceb726b7bb73dab7a694e03e33092f344c9cd9947b4838aca79f66bb SHA512 c0a8bf670c883681a0d779b0c2d4b37b7f6f3a761a4fd81a7be66d19564692ecbfc38c07fefa20430fb990ffa8226b0d7b9d32e65e68feb8e41c311ea3363472
+DIST tls-1.5.8.tar.gz 157923 BLAKE2B b6b1259f6950e15fcba584690f59fd66a1a597490cbcb76e7199c48677f0df00e86f27f12e0c02210ba83cac110346aec6e7afb460f7e9721f275d146040cac5 SHA512 81d0046aeb6342c5dcd3827d9315793b68436a4eec7c9bcae50f4b5b5365248c7c874addca77a50a19689f535386330435b5914386306a3f12d699a5fad1107a
+EBUILD tls-1.5.8.ebuild 1347 BLAKE2B 4d88b61d970a145b03e747f55712c8cfc0134e71c9243c12b223fe596d3b27909134b635341d12a9ce5403f0b79a5e1044638a11ce5fbb47ff9f725bb5814bba SHA512 785c97f1c64b20a3b409fad8b6f56dc4dbc29e2272aadbec81a6a12bdd0c411d9af0cb2c7b16a47179a1f09604ccba2cdbea24c3450369bc76de2a769b1f08e5
 MISC metadata.xml 1117 BLAKE2B fb0e95020ecd969d91024f27d453f419402a9d4d254e71d095f60786ef3bc2e4a3e02319f5ecfdb4b28e7e41efbf8bd47f8b9044c1989cc4bbfd360820d93535 SHA512 4a8173398c4fa2422f6345465c20ba4b1c584b0866d5df3d2d9f5bd207f065a5f1d318dc97d89eda761736c99d9ff003819f6f0da6a0fcfdfb8a36ee4cd270dd
diff --git a/dev-haskell/tls/tls-1.5.4.ebuild b/dev-haskell/tls/tls-1.5.8.ebuild
index ca7af8f05246..e020a9f1e3e6 100644
--- a/dev-haskell/tls/tls-1.5.4.ebuild
+++ b/dev-haskell/tls/tls-1.5.8.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.1.1.9999
 #hackport: flags: -hans
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
@@ -21,19 +22,18 @@ RDEPEND="dev-haskell/asn1-encoding:=[profile?]
 	>=dev-haskell/asn1-types-0.2.0:=[profile?]
 	>=dev-haskell/async-2.0:=[profile?]
 	>=dev-haskell/cereal-0.5.3:=[profile?]
-	>=dev-haskell/cryptonite-0.25:=[profile?]
+	>=dev-haskell/cryptonite-0.27:=[profile?]
 	dev-haskell/data-default-class:=[profile?]
 	dev-haskell/hourglass:=[profile?]
 	>=dev-haskell/memory-0.14.6:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
 	>=dev-haskell/x509-1.7.5:=[profile?]
 	>=dev-haskell/x509-store-1.6:=[profile?]
 	>=dev-haskell/x509-validation-1.6.5:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
+	>=dev-lang/ghc-8.4.3:=
 	network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( dev-haskell/quickcheck
 		dev-haskell/tasty
 		dev-haskell/tasty-quickcheck )
diff --git a/dev-haskell/wai/Manifest b/dev-haskell/wai/Manifest
index e0dfa1db0002..649c50f62658 100644
--- a/dev-haskell/wai/Manifest
+++ b/dev-haskell/wai/Manifest
@@ -1,3 +1,3 @@
-DIST wai-3.2.2.1.tar.gz 10221 BLAKE2B 5822bae6d3f0326206da9b14646654af135690ca134d48b5f8b7eb6acd39652d829c8d4daa5afc80926b2409cf9fe1d498ef2b727cd8baae7c1f266178a39861 SHA512 72c92389d3faff234003f835206ff6eae3f8e3d885d7519706f8b78df3cb1c92121c5de7e8272436aed22ade8440baaefb14d50a10f2f233badadf16d1b5e431
-EBUILD wai-3.2.2.1.ebuild 761 BLAKE2B a772001389597d8c9a6217d9e7abe3f57e8376a470062d8dd93c335ab369251f59cd69f38aa9d27a1879e59aba4599493733146c7c47b4638120c699187b9190 SHA512 0b0d39f01bb03209a56fc8d47367d7becf712363f3c7e5e2157f162460f2efa75f397b3e06fa4b400043c7513a57ca9e9fb8a2e5a224ccdb8196d2bd7aa3df63
+DIST wai-3.2.3.tar.gz 11619 BLAKE2B 3ef7328a252a21d23d885ac3ea36b6a25bf06c0678e2a8627337aeebb325314e64c7e3415b3f4143139d9c20d910809cdbaaaaf6e15757a5eceb4c5fe0c3e98b SHA512 1851da58310c45a809ec1cd3efd760e45bee814e41526a9f3404ea55e2428e92ff1563785b3118e8c605d5edaacd70670d21b5e5b300ce477f16b159c33a2040
+EBUILD wai-3.2.3.ebuild 756 BLAKE2B 185e8c53e111c21fb6a7cc020be3e749aa670a3b27cb05ababd3c801d7063f58437171c63d0bdf093adb4d6f22b88bb9ac2a85f7aa8084aa585e5c106626712d SHA512 43da95e5caf5253f240e62ee3254eee65b74d64352706c8584e8b87bded5f54dc0d1e74016d9bcc470a3da69bf50d328c471e663a730a82c4bd0ed24bae7eaea
 MISC metadata.xml 327 BLAKE2B 218e06e8cc3d6ffe2ecfde2149aacd275b343bfd4cc2e4ea5cc59a026f4cc7a137889f9b1fc310724e8a2b8a3293e828cfcbea933913ed1fbc984ce054ab8875 SHA512 16195ffb161bad5d1755577c272cd6d517252d34d548e3246c7f9fc4336fe0d83bd75b8322186c4fd734cfadd8120e147653348f6a4574137024e4b06314c694
diff --git a/dev-haskell/wai/wai-3.2.2.1.ebuild b/dev-haskell/wai/wai-3.2.3.ebuild
index 428b50520383..5c5d80964204 100644
--- a/dev-haskell/wai/wai-3.2.2.1.ebuild
+++ b/dev-haskell/wai/wai-3.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.2
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,15 +15,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND=">=dev-haskell/http-types-0.7:=[profile?]
 	>=dev-haskell/network-2.2.1.5:=[profile?]
 	>=dev-haskell/text-0.7:=[profile?]
 	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( dev-haskell/hspec )
 "
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 241964fefe2d..f045f046dfe8 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index b3f3f486083c..f58569c72f14 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,3 +1,5 @@
 DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
+DIST postgresql-jdbc-42.4.1.src.tar.gz 969554 BLAKE2B 76035b2362c304d6263b9549b2ecbedc6e1cfedeba9c2c35f07d29dada39e5bce93e939abb8cb2232a428b0341c5cd5e6ae22de6106292c4d28243e3e0e6fc00 SHA512 a49c5b68a26ba6fd1b150c45da2ec58ea4435b7c36b8aa9bf6c3d33b6a265dabe7da51705e9d7234a640c8f6ccb5c3abb639db2d7bc38e6f4e26550b05b4a844
 EBUILD jdbc-postgresql-42.4.0.ebuild 2019 BLAKE2B 6b0ebf8b68d03d0adaa6cf3764b9ea65225b33f6d2538f45a02f620d7d4e0bc1f957e923609bb3bef17ed0b69d64c1fddd9bd9751d99e9b6756e50dc7f2f1d2f SHA512 9b9dfeb0b2afea956039c6677e1479e8837b9244607b6731ac3381815991a3035e53518a9ce9ea316a0913385a19df89aaa8382c533b8309ffeb179dfd9ea09f
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+EBUILD jdbc-postgresql-42.4.1.ebuild 2067 BLAKE2B 1ba0b60ed6b33ad6067116d54e55e585c83691a6fcd664ee26ca4c5261238f78865d08fbe0b09cfcb08a4a28cd639d06fa6127d3de04675e7df5b16c67b98766 SHA512 32482872affdf4b64b63740e724ea13a91ca2c248fd51727276affe209f5787ebab31eaa178334738e41c9b02a4772d598b4a07382ad4ff922a95bd1cb3c8a8b
+MISC metadata.xml 295 BLAKE2B 1c8987c0d6f65d4e3019c2d6b8a0f8fac5f06e9144b118d3a0351f4a0e9b76ac4bc5b5ad678d92a691da7e8e8bb8c33f12d17d9dcc8b0ff007057d80307ebd24 SHA512 6a38ee7d2287a20ab89d7a92c59e74437877c4271cb38f00fccde9753c3caa8dccc3261fad23f81ec3dd2155f429aa4c3437bda024353640f8ed90ca096f9318
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
new file mode 100644
index 000000000000..96f23608ef89
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://jdbc.postgresql.org/download/postgresql-jdbc-42.4.1.src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-postgresql-42.4.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.postgresql:postgresql:42.4.1"
+# We don't have junit-vintage and junit-jupiter.
+#	JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
+HOMEPAGE="https://jdbc.postgresql.org/"
+SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.ongres.scram:client:2.1 -> !!!groupId-not-found!!!
+# uk.org.webcompere:system-stubs-jupiter:1.2.0 -> !!!groupId-not-found!!!
+
+CP_DEPEND="dev-java/scram:0"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.junit.jupiter:junit-jupiter-api:5.6.0 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-engine:5.6.0 -> !!!groupId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter-params:5.6.0 -> !!!groupId-not-found!!!
+# test? org.junit.vintage:junit-vintage-engine:5.6.0 -> !!!groupId-not-found!!!
+# test? se.jiderhamn:classloader-leak-test-framework:1.1.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+		${CP_DEPEND}"
+#		test? (
+#			!!!groupId-not-found!!!
+#		)
+#	"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+		${CP_DEPEND}"
+
+S="${WORKDIR}/postgresql-${PV}-jdbc-src"
+
+JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+#	JAVA_TEST_GENTOO_CLASSPATH="junit-4,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
+#	JAVA_TEST_SRC_DIR="src/test/java"
+#	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
diff --git a/dev-java/jdbc-postgresql/metadata.xml b/dev-java/jdbc-postgresql/metadata.xml
index 6021501589e0..941a1afc5359 100644
--- a/dev-java/jdbc-postgresql/metadata.xml
+++ b/dev-java/jdbc-postgresql/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pgjdbc/pgjdbc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 29bac7a25156..6deb5cdc4fd5 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 1735eec64491..6cfa87dfcf6e 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -19,21 +19,27 @@ DIST Python-3.9.13.tar.xz.asc 833 BLAKE2B db01c01be9d56cd15f9ab4a9e2cfa800faf4eb
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519dca4dc6625b743b07c7f7bbc62562f345d87723ba499893702310b1e96e443d2946e27a8d4971f32ca1125d4827d0d594ccaa6 SHA512 77f0478f7d0491e103857a83a97d6e04a9ec68740a7f9357cbbdd316462e7d98ea8236bd05a30e7556457ece5fbcfa4a7a78a25d4eb12779455ce2bb5b6f30d0
 DIST python-gentoo-patches-3.10.6.tar.xz 8580 BLAKE2B 4ff3839be2f6bf172acdca22bbded702804809d6334e088190cee4ae4c61e25580a3bdc105bfe27b7f3c3b5f219d363cdca21ef895a3e91f13515afb348a77a0 SHA512 c58a85f7c48a4e822527411a6e0618be5408e1a82fe72b21a254dac77b4e5d4b01ac24cf70dc277cd16ccdc8499a9fa53b7cebae3b9f8facc9c978adcc8a2876
+DIST python-gentoo-patches-3.10.6_p1.tar.xz 10592 BLAKE2B 0b0f54faf93e3b6a3ba5ae5fef01ff4adbb1560e3d5c0c8e7d69d80e2e10b15e7fc7f5471f82d5322c86a1eec762f10cda6e8ea650c993481342cda06a47a863 SHA512 c4a2ff7d16042729f5a23222d154bc0832f51b7ab5b1dafe4a6c6bd40b037c85a6d40d07516c1207cd0bc9a233865700d7cca4b01ed27a1f21516392992bc6eb
 DIST python-gentoo-patches-3.11.0b4.tar.xz 4388 BLAKE2B 16b112f1ecdce86022ed64d7c7007fb323b7bd4497b5802a48bb0a86667c282d1a9150d744f44cefbe9321af4916d35941707c1259a0cf175c0161c8e1b17e97 SHA512 f9c8c7180da20e839a0862571b9077b2702dbee8a1acd55ebb11329912cf9f81862ba615be484b92d39461c3eb6c38890f8d58bcbce2c4722418a967faedc1f5
 DIST python-gentoo-patches-3.11.0b5.tar.xz 4384 BLAKE2B b036e9103f8315d6e2bb6e85a2db12ec60f8e05ccff083183f24c0b4ba16c807a2eb1fa43b88f8d7a253d5bbeef0880b31d60e13b449f7de992156319753ef33 SHA512 af6315f97b0f2463d6c0f18a99a5ff5f96c3d18567ae0d73461f0fc82ca2173a8f6c3fedc2fada2b9460547a457d4264bc2acb90f1906599229afe85bcc2afde
 DIST python-gentoo-patches-3.11.0rc1.tar.xz 4384 BLAKE2B 31bcdc055bfaf3434dbb02543aaf66910eaccd01808d9a0e57bf7cb3b097fc0046c00ac44737d9c37e3b6d074c524f4dd3ab439a741e66d74a0425889ecaead5 SHA512 05b044e2d8f881c471528600ee300bfd9cf5160609dfb3d7cbdb8e43f47b681542582a85de97e28e6a3b89a3fb6c8d7398e029d31e20cea9c5a2a71700382d4e
 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
 DIST python-gentoo-patches-3.8.13_p4.tar.xz 23084 BLAKE2B 44be6b19275189bd04c9dcd3c4be4f4b8f92a0003710a12a12d60c0ab182942993a76d8d7f26b289cd0a4226eeeb9a39723822dfb896307fd6e75d6980c3898e SHA512 b78a39a15d361aed4ce887b4726c7967c09c0ee3add614f1dbca24b6f301bd20660fe074c03a58b325f8720ad853c109b334e41102de0b6cc362c467fb669feb
+DIST python-gentoo-patches-3.8.13_p5.tar.xz 26620 BLAKE2B 24d05e3f46acf339d2e1d0d86efdb6b61719c09aba08879397df6ed40ce41a5bae892f3677bbafe694b4ced5b469a81c27c4002c1de271565a6cd413e627ae7c SHA512 d18d4e6a5fc10990e9ce1cdda311016e9486d6aa90ad73bcd6e306ffe89ca180ae81a905b3b8d94569e0834103e77d5fffea34238b7aeaec8aeeeaf04fb2f72b
 DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be SHA512 e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
 DIST python-gentoo-patches-3.9.13_p1.tar.xz 17036 BLAKE2B baf534d002c610426f9f183f53b935d83a4cf084834d3946986baa5d983e8197719b1d3e8568cc7f78a6aaa95b084dd8796e8539169415e19f2d9eb8f296242a SHA512 c7eb503defcc5e91d5de39eed84aeba748f96ef28f0d9ae3b3a98f111543d09311f51ae4fe321ec5f397c5f46dc8c715ecc401124f4e4a94c9fe8e2a6db9e052
+DIST python-gentoo-patches-3.9.13_p2.tar.xz 20708 BLAKE2B e86a80405683228211ea763523e71aa130f716a19d4e343ec46d1d428804cd59d07cdad0efea09b09d92139bdec93f40f7667db20240b89ed3a7a6bb46b0981f SHA512 1e9f84d0cde9a251e191b3784ec551a307572e779350e7d20ace0164f6cbc47b883632ebc32638a8f5f16f9c0d618a13d9105ef471657a9745bc6a09bf1d13d9
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.5.ebuild 11701 BLAKE2B e83015ffd3bdcbceab4271ed82f6ee54d8b79494458a51ff46221ecfd1f39319fd00ad4d27471c73ef2fab3a3468b587138f9dd3d431ebf8192f31789c9d58f0 SHA512 fe2a00f53699a0ea809d891b66e0c1973402e8a504dc45bb67f57d1549b3809c2f894cb27264d8d8f35071c5fc967cb43c6250382e2627ec4197635d7f91a023
 EBUILD python-3.10.6.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
+EBUILD python-3.10.6_p1.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
 EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.11.0_beta5-r1.ebuild 13385 BLAKE2B 00d7c1d17bd8ad3acebfde6907fc27f77abc91a25f3d3e576bb6895c46f7cae88a8cd6dcf883dc3d91d0fba36349f3b209a512fff70cf4ff950a7f52d3e7d548 SHA512 56442b0cd0b7789c30d180b07e2e77b3203720e66084340cc85923410d54ca2ff40ce9096af844cde217f44bbd4e95ed4f8e69f192130de45bf14883d5127982
 EBUILD python-3.11.0_rc1.ebuild 13384 BLAKE2B 7ac3f74190fafd1321f2ae9b478cb1b7381f13ce88d1839bbe2eea12a9abb0f14286f3e6036ca65c2d37ca6b07b62c14f557a7af080f6f05f119e7bbd77764cc SHA512 3b94a9e45017c0ec3d2bb2ca346d423a0e31d3b1f2c1fa098aa2c4f0af58e49f3626688dacde9740b2c1f44c63f143bf43ec305d0ce69c3e68de3ff6ae0a88c3
 EBUILD python-3.8.13_p2.ebuild 10219 BLAKE2B c736d7417d2f7c8f8a6ee61182e1b2b9e22873343594a3779c83fc1af03103ae71f440f856d7dae7a661dc7190e70afa7c478dd7d8531d28637897c1ebd4106f SHA512 89f482e716b308565f41c4c6ce1db32f9a4023a41570070ddad4ac9d156f802d79f8ad7d2971b9ed02487482c50d8e4de64d212df092dd907d2c94838e6af921
 EBUILD python-3.8.13_p4.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
+EBUILD python-3.8.13_p5.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
 EBUILD python-3.9.13.ebuild 11462 BLAKE2B cfa217f58ee03528ce5dd467daa9023c67f89d4673def5a183eb7a0c2db6fe40527a78067803f7edcdcf32eef5dc72179b9be9d9a04f5766258945a4a16e3991 SHA512 4a7fbd6f6e7ae1fc1726a170879e26a6f7e74fe4fc2b52efacf5608350bd967ee52d63df4fb8d52aebe881bc003285e29d55fca5aedf74182cdb5f8b120ca8c4
 EBUILD python-3.9.13_p1.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
+EBUILD python-3.9.13_p2.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.6_p1.ebuild b/dev-lang/python/python-3.10.6_p1.ebuild
new file mode 100644
index 000000000000..5d9861331971
--- /dev/null
+++ b/dev-lang/python/python-3.10.6_p1.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_10(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.10/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.8.13_p5.ebuild b/dev-lang/python/python-3.8.13_p5.ebuild
new file mode 100644
index 000000000000..b92def0f1dcf
--- /dev/null
+++ b/dev-lang/python/python-3.8.13_p5.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk wininst +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_8(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+	if ! use wininst; then
+		rm "${libdir}/distutils/command/"wininst-*.exe || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.9.13_p2.ebuild b/dev-lang/python/python-3.9.13_p2.ebuild
new file mode 100644
index 000000000000..c3fe846a9d19
--- /dev/null
+++ b/dev-lang/python/python-3.9.13_p2.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
+	+readline +sqlite +ssl test tk +xml
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-lang/python-exec[python_targets_python3_9(-)]
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+	local disable
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.9/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index e08e63f1044f..a5fb5855111b 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 07cc58afff73..6a93f2abda7e 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-chess-42.0.tar.xz 661180 BLAKE2B e9fe75df1b298aad17b8b199949cb02eeea5116fa15adfedfac6ed067123ff73aad8ebb33e512f1eef97237232275528da6454de27c335a897e5e3b942a335bf SHA512 08af368b6fd032976c124a8fa8402494e73b004591eae331523a377acf72d98b9827ed189db1c1287f758f41614e878062bd1ab0b8323bf76d19b9cdedacf9a6
+DIST gnome-chess-42.1.tar.xz 663036 BLAKE2B 3e42f799d029c4122055420035dd1dadcf5d385ea363ebfe355dc25df31bd5160f2b791d715a2ab371af93e4f5f0a60ac8e818df2686b0f0fc30ae7c0f0795fc SHA512 ab84744910fbf65d50cadb7f63b9e5a5fd4af103adbacd349680c65ae70374ce9766e715656891ae8987ba3c6a694dd632b9154233a417b86a1eeacad875a61d
 EBUILD gnome-chess-42.0.ebuild 1125 BLAKE2B 765c5a536ddc2110b0335ac23f43d7320dd2a5f3719073c1c753e7d7b7a2191528ca7e112956bb26ea78281712dd17d14a00879d85d0e2dad479c90bcd18e14e SHA512 3d411e86b3f45666e25273b6f8662e79feba86953ab927b660a077964cbe18fa4e5ff20716a8620e2866b52357d7b8c59f0dc4f670727acd721164d31a4ca754
+EBUILD gnome-chess-42.1.ebuild 1187 BLAKE2B 9af61f3d8191fcf86ce4c3a929ebe606ca2a21756a11d9903ce1c221a0d4cc3fe987830bf2ad7a8a810a407a07496294c807ea48d78963dc5f8cab9b6b8e4d8e SHA512 691c2dfef4bb2816cb16c03e41fbf4af8a348ab2483c3bbcb79ae61914ddfa5fde72f515e8647ac2f958e8634078f9e94904e1e9480ca48ae59fc38f1a5abf72
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-board/gnome-chess/gnome-chess-42.1.ebuild b/games-board/gnome-chess/gnome-chess-42.1.ebuild
new file mode 100644
index 000000000000..a66534404419
--- /dev/null
+++ b/games-board/gnome-chess/gnome-chess-42.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+VALA_MIN_API_VERSION="0.52"
+
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Play the classic two-player boardgame of chess"
+HOMEPAGE="https://wiki.gnome.org/Apps/Chess https://gitlab.gnome.org/GNOME/gnome-chess"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	gui-libs/gtk:4
+	>=gui-libs/libadwaita-1.0.0:1
+	>=gnome-base/librsvg-2.46.0:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg:2[vala]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/itstool
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To be able to play against a computer you will need
+to install a chess engine package, for example games-board/gnuchess"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 243d879e0d98..58900185a190 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index dfb89b6c366f..6923cc93f1cf 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,7 @@
 AUX exaile-4.1.1-metainfo.patch 1472 BLAKE2B 5c466aa63e8fc4538d53f07fcb5c943bbabfb1f4a7b1037b13f013c3cb9286470ae56007e35772ad015863b0debf684f85fa56e1ba664ac2f2ca5a1afc50936b SHA512 80b642e037335706b24ec907bc7d50e2cfb9505c18bed33deecb7d8aa282d6fbdb9ac1272e49f561a99593e498c5b84ea9298297095910950ef5c0208288120e
 DIST exaile-4.1.1.tar.gz 3641073 BLAKE2B 34222ddba782dd51897c017d7a77da9a796e45dad69983f934e76cc559c2e52f2173ee418004943ca087fd894439bc42a6eff2a5d6146e6189ec1cd478f5d08b SHA512 babf37253054fbeb6dad33aedafe969201860d4f35222d577343256730be943682c1a5f2f7cec7c574695624cb2b7abbdff4e6eaada848d22fea073c2c44bd23
+DIST exaile-4.1.2.tar.gz 3708188 BLAKE2B 859d77bac62df0843291fdc0de4888079c8f103da3cdf3417d0cd5ba67cf5199a8a1e89d20403efbc6793dfcd7b8333708df74ff535e0912fb02502a13702a0a SHA512 7711f9e062088b02362bbd404f7c61a0f1c128e29e42ce657dc092cac351641f6000846c9da843866bf28ccbd68cf1b07731ba1c9854d52b33c0448e87d0e93b
 EBUILD exaile-4.1.1-r1.ebuild 1662 BLAKE2B 21a6b213f5f35d79d145e22fbc23ce4688aa296b5c7bc68cb3a742cd5b529aab9d5dea42da4352f26859dd4dfc6129f5017978fa2c8ee6d9c8529fe47999223e SHA512 f6c837c994063cb2ef07c4bbdd933f0793f37811809f9e876669b01e94c6fe4454be3dbe3afcb2786fa4f19183ede20de41d193262c3089b32298584ff2964c3
-EBUILD exaile-9999.ebuild 1670 BLAKE2B b1c52f10c2111f15a124d2a5eaee505b3a7c9faf45b1b41da1667707908a02f47255fa5b6fcf5175493fa192b9a6ae2e4b19f055220befe46b653f53ee55aed3 SHA512 c71a9e2afc4c6da2a7f054b69157dd42ccc9273f3c27fcd79672f6d5dd742583e00b442e7381a305ac917200e43193a0a55c22a8d2cd31a77bffbe6c296dfdb1
+EBUILD exaile-4.1.2.ebuild 1615 BLAKE2B 549c178edf176ec29f30d65664bc32a11d495a5f339dddddb352573e4f62370028bca85dec9827bf01366b2a694ff15fbbd63f269e1aa8b3e170b1c2fbf81efc SHA512 e3cba337f8a82e226b8c3c95c30372faadf5bd9348bfdc8333b9d4cb83f2ff0fe77e5da52621cccb5f9cf982958fe95f9a8d32f8c7ffddbcd9034dc62a3cbdf8
+EBUILD exaile-9999.ebuild 1615 BLAKE2B 549c178edf176ec29f30d65664bc32a11d495a5f339dddddb352573e4f62370028bca85dec9827bf01366b2a694ff15fbbd63f269e1aa8b3e170b1c2fbf81efc SHA512 e3cba337f8a82e226b8c3c95c30372faadf5bd9348bfdc8333b9d4cb83f2ff0fe77e5da52621cccb5f9cf982958fe95f9a8d32f8c7ffddbcd9034dc62a3cbdf8
 MISC metadata.xml 466 BLAKE2B 8c2ae9dfde18d1976a3c38a77de336e5f0489879adcdb030c9c6b3cb765e440d8bf908c57b2fe1670b090d90c570b3219201319d81319dda87c92c777c82757e SHA512 5bdedc04863ba9c8632a818d8f7a834687e3474cfe906b0ee82378f6c957ecc9778206f8b7f7abefda5cba06c4c0df930e5e170754fa8c59467dd4f1857be4f8
diff --git a/media-sound/exaile/exaile-4.1.2.ebuild b/media-sound/exaile/exaile-4.1.2.ebuild
new file mode 100644
index 000000000000..5fd5b6a75bca
--- /dev/null
+++ b/media-sound/exaile/exaile-4.1.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-single-r1 xdg
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
+HOMEPAGE="https://www.exaile.org/"
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+# IUSE+=cddb if have dev-python/cddb-py
+IUSE="libnotify nls scrobbler"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+RDEPEND="${PYTHON_DEPS}
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-libs/gtk+:3[introspection]
+	libnotify? ( x11-libs/libnotify[introspection] )
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	')
+"
+
+RESTRICT="test" #315589
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	use nls && emake locale
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/usr/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale)
+
+	python_optimize "${D}/usr/$(get_libdir)/${PN}"
+	python_optimize "${D}/usr/share/${PN}"
+}
diff --git a/media-sound/exaile/exaile-9999.ebuild b/media-sound/exaile/exaile-9999.ebuild
index 36c7f3272d08..5fd5b6a75bca 100644
--- a/media-sound/exaile/exaile-9999.ebuild
+++ b/media-sound/exaile/exaile-9999.ebuild
@@ -48,10 +48,6 @@ RDEPEND="${PYTHON_DEPS}
 
 RESTRICT="test" #315589
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.1-metainfo.patch"
-)
-
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5a73e3751a93..b81b8980f746 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f2675942396d..a03a3a561952 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 00:39:56 +0000
+Wed, 10 Aug 2022 06:39:56 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a7f4e91f919d..3b31a2898f90 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 519553 BLAKE2B 95b916bb9f20b609241e18817604d9aedbd9b94266162c0ae72c4075b346239f9bd4fbc73135a0dac0faa2a62330ae77a5fadd98fff5b4147580808a7c200ffe SHA512 4eb7457d78ec74e73c36af46d3c675bcb9bc9cf33d2f1fde05df8e517560b480fc8f920df111c03877fd301aeb0d0d260bbfc22b80cd0d7497e107fd5ded7e3c
-TIMESTAMP 2022-08-10T00:39:59Z
+MANIFEST Manifest.files.gz 520976 BLAKE2B 7dfaf17999dad5e80e78ca82a3453bad0d1dd93080c368421ff47c3671435b97874f1120a4f79883a4be6eef4c4ca625a2780e2baa63a836f2c65b64d721932b SHA512 b7a8242e7f468835252f7166256d06fc326a7b57876a83546b977c0010c88282d7526387515ddfdc846408f5965fd794a2d8be4351a3422ce499e998eaf2eb90
+TIMESTAMP 2022-08-10T06:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLy/l9fFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAC6A/+LJr+UH8CK5uDEZ9c7Av6cVlTQb27eLijA73S3AYHshWIC30iiwuWYv8/
-jUwdf6nFK0Ldv2Lk5IWBzP/jHKgtwHnGDhq5cf67dNnR7iP7f/CrsrNGkpa1vTHu
-yyzBX6KJd/p+g5cZiEQ9NuRocubgdWOG3Oqz59fp6e+3C1NNKlV78RVTTjzd2ABM
-v598dcd7S02zGKbKlGUQbdpwFbps1uGiywxprr2JYu1M7ntJkhGtJ1kxJb9zjv6M
-G6anVW5fAEGBUwVO260D+7OvVho3bim6SEZih0H+Go040sN6kbKlR5eTgKjc8NVq
-z8Wsc2vJYm3bdrTmjD6Zg1n+yF/FucrdZk1HmO3faW19v9bXgObQ6iVIlZoGeZZp
-ai/d6dwFwZCHwMXHqBUEdAFflBSt3BuEV2LB3Sy8wgUgabN/tO7/CpnnKKBdFIjP
-FYqMXrRoi+DS7+hSmxeQQVZftGo7ejpY2MiGiNepMLIFRUDHk0TNyk2HzkxcGM+2
-e4DUx5zD/+V2HfReExy1uGgK98l4mcd/R75EppEAv/6ZIDNuLRINlIore7wWoXlX
-NJkQqrbbejLV4uqAqoWz216w73go4SU/yCAy35TNVMdCrcmQ5GHP/+MCsBCSlFep
-ns1kekToN94qoLPU1YDtdK/d3MFbkfdQE/B5m40gU1L3hV5p3Hk=
-=3j5P
+klAf8A/2Ll3bnLdG5rVjUf4BFHaJkwKD/N2oLkaqHSN/P5FwCjuxkIXoR8Ufn8an
+OniZ9kPpyNNTDXYljRdRvlC+P8NjATTM/omp3Zsc2/P9R/KtqF4a/3c6/P5tkN+p
+vNcvrEfUvXx6i9hoYW3Y3nGrN21OuIP6jqvfNPguOxs1zPMnknouvb9MW0w1jsiy
+WpBGUtq9ciIINICrqNex1fxbhpl41CyggdE8wQsNBHj/2ae+KI7sfh+5mj34y5gs
+MyB0vMyU3uutRWk5NoHUJlZ1KHr0p48+d/lfRF3GIdjqC98YkdyEan72BbWauo03
+vOIToOHK70HiE1FxMgEGvemNe+4UFDGPVYsEQ6TEcJ6evMWwId8FqtdzY4uIsGv4
++P6uzYV8Gm2QMYXLtorrvRf9yV9kHFwdfS7JJtQEWU8kl/a6ypj38L7LSQ275cLl
+L7YHEdgD0urIuzK/zyT0FF2p5t6PhrtmFPczwjkaYBkBy1PJJCH8o5pcy8YKkK8Y
+ckA9nvVLkjn5uzNlfKL4p9gRspu1a1J4hhBZZ2LlMlXcgWMOUgKIBAg/nsf739Hj
+zMwZykwhhAOaqODZBnxKgJnodRa8ZioXtO8VXG/JpevsC5W+BZ9dZhv3ilzgIDob
+SHv4qhyFLaO2/ZsUr1WJKrRqxtVKhAAMKZvfwvTJZKQ74oSU/w==
+=sz+k
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 5b6ba51e4671..2b18dab9db4f 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202208-06.xml b/metadata/glsa/glsa-202208-06.xml
new file mode 100644
index 000000000000..825a5a80eb6e
--- /dev/null
+++ b/metadata/glsa/glsa-202208-06.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-06">
+    <title>lxml: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in lxml, the worst of which could result in denial of service.</synopsis>
+    <product type="ebuild">lxml</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>777579</bug>
+    <bug>829053</bug>
+    <bug>856598</bug>
+    <access>remote</access>
+    <affected>
+        <package name="dev-python/lxml" auto="yes" arch="*">
+            <unaffected range="ge">4.9.1</unaffected>
+            <vulnerable range="lt">4.9.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>lxml is a Pythonic binding for the libxml2 and libxslt libraries.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in lxml. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All lxml users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=dev-python/lxml-4.9.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28957">CVE-2021-28957</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43818">CVE-2021-43818</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2309">CVE-2022-2309</uri>
+        <uri>GHSL-2021-1037</uri>
+        <uri>GHSL-2021-1038</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T03:53:32.555864Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T03:53:32.562720Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-07.xml b/metadata/glsa/glsa-202208-07.xml
new file mode 100644
index 000000000000..7f95f0782958
--- /dev/null
+++ b/metadata/glsa/glsa-202208-07.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-07">
+    <title>LibRaw: Stack buffer overread</title>
+    <synopsis>A buffer overread in LibRaw might allow an attacker to cause denial of service.</synopsis>
+    <product type="ebuild">libraw</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>793956</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/libraw" auto="yes" arch="*">
+            <unaffected range="ge">0.20.2</unaffected>
+            <vulnerable range="lt">0.20.2</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>LibRaw is a library for reading RAW files obtained from digital photo cameras.</p>
+    </background>
+    <description>
+        <p>LibRaw incorrectly handles parsing DNG fields in some cases, potentially resulting in a buffer overread leading to denial of service.</p>
+    </description>
+    <impact type="low">
+        <p>An attacker capable of providing crafted input to LibRaw could trigger denial of service.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All LibRaw users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/libraw-0.20.2"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-24870">CVE-2020-24870</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:06:16.242209Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:06:16.247568Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-08.xml b/metadata/glsa/glsa-202208-08.xml
new file mode 100644
index 000000000000..025606af2fdc
--- /dev/null
+++ b/metadata/glsa/glsa-202208-08.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-08">
+    <title>Mozilla Firefox: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in Mozilla Firefox, the worst of which could result in the arbitrary execution of code.</synopsis>
+    <product type="ebuild">firefox,firefox-bin</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>834631</bug>
+    <bug>834804</bug>
+    <bug>836866</bug>
+    <bug>842438</bug>
+    <bug>846593</bug>
+    <bug>849044</bug>
+    <bug>857045</bug>
+    <bug>861515</bug>
+    <access>remote</access>
+    <affected>
+        <package name="www-client/firefox" auto="yes" arch="*">
+            <unaffected range="ge" slot="esr">91.12.0</unaffected>
+            <unaffected range="ge" slot="rapid">103.0</unaffected>
+            <vulnerable range="lt" slot="rapid">103.0</vulnerable>
+            <vulnerable range="lt" slot="esr">91.12.0</vulnerable>
+        </package>
+        <package name="www-client/firefox-bin" auto="yes" arch="*">
+            <unaffected range="ge" slot="esr">91.12.0</unaffected>
+            <unaffected range="ge" slot="rapid">103.0</unaffected>
+            <vulnerable range="lt" slot="esr">91.12.0</vulnerable>
+            <vulnerable range="lt" slot="rapid">103.0</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Mozilla Firefox is a popular open-source web browser from the Mozilla project.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Mozilla Firefox. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Mozilla Firefox ESR users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-91.12.0:esr"
+        </code>
+        
+        <p>All Mozilla Firefox ESR binary users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-bin-91.12.0:esr"
+        </code>
+        
+        <p>All Mozilla Firefox users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-103.0:rapid"
+        </code>
+        
+        <p>All Mozilla Firefox binary users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-bin-103.0:rapid"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0843">CVE-2022-0843</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1196">CVE-2022-1196</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1529">CVE-2022-1529</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1802">CVE-2022-1802</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1919">CVE-2022-1919</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2200">CVE-2022-2200</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2505">CVE-2022-2505</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24713">CVE-2022-24713</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26381">CVE-2022-26381</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26382">CVE-2022-26382</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26383">CVE-2022-26383</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26384">CVE-2022-26384</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26385">CVE-2022-26385</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26386">CVE-2022-26386</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26387">CVE-2022-26387</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26485">CVE-2022-26485</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26486">CVE-2022-26486</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28281">CVE-2022-28281</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28282">CVE-2022-28282</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28283">CVE-2022-28283</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28284">CVE-2022-28284</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28285">CVE-2022-28285</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28286">CVE-2022-28286</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28287">CVE-2022-28287</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28288">CVE-2022-28288</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28289">CVE-2022-28289</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29909">CVE-2022-29909</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29910">CVE-2022-29910</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29911">CVE-2022-29911</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29912">CVE-2022-29912</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29914">CVE-2022-29914</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29915">CVE-2022-29915</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29916">CVE-2022-29916</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29917">CVE-2022-29917</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29918">CVE-2022-29918</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31736">CVE-2022-31736</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31737">CVE-2022-31737</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31738">CVE-2022-31738</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31740">CVE-2022-31740</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31741">CVE-2022-31741</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31742">CVE-2022-31742</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31743">CVE-2022-31743</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31744">CVE-2022-31744</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31745">CVE-2022-31745</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31747">CVE-2022-31747</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31748">CVE-2022-31748</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34468">CVE-2022-34468</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34469">CVE-2022-34469</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34470">CVE-2022-34470</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34471">CVE-2022-34471</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34472">CVE-2022-34472</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34473">CVE-2022-34473</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34474">CVE-2022-34474</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34475">CVE-2022-34475</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34476">CVE-2022-34476</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34477">CVE-2022-34477</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34478">CVE-2022-34478</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34479">CVE-2022-34479</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34480">CVE-2022-34480</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34481">CVE-2022-34481</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34482">CVE-2022-34482</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34483">CVE-2022-34483</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34484">CVE-2022-34484</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34485">CVE-2022-34485</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36315">CVE-2022-36315</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36316">CVE-2022-36316</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36318">CVE-2022-36318</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36319">CVE-2022-36319</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36320">CVE-2022-36320</uri>
+        <uri>MFSA-2022-14</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:06:48.151092Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:06:48.153620Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-09.xml b/metadata/glsa/glsa-202208-09.xml
new file mode 100644
index 000000000000..e692833bfcdc
--- /dev/null
+++ b/metadata/glsa/glsa-202208-09.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-09">
+    <title>HashiCorp Consul: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in HashiCorp Consul, the worst of which could result in denial of service.</synopsis>
+    <product type="ebuild">consul</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>760696</bug>
+    <bug>783483</bug>
+    <bug>802522</bug>
+    <bug>812497</bug>
+    <bug>834006</bug>
+    <bug>838328</bug>
+    <access>remote</access>
+    <affected>
+        <package name="app-admin/consul" auto="yes" arch="*">
+            <unaffected range="ge">1.9.17</unaffected>
+            <vulnerable range="lt">1.9.17</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>HashiCorp Consul is a tool for service discovery, monitoring and configuration.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in HashiCorp Consul. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="low">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All HashiCorp Consul users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=app-admin/consul-1.9.17"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-25201">CVE-2020-25201</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-25864">CVE-2020-25864</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28053">CVE-2020-28053</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-28156">CVE-2021-28156</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-32574">CVE-2021-32574</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-36213">CVE-2021-36213</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38698">CVE-2021-38698</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24687">CVE-2022-24687</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29153">CVE-2022-29153</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:07:00.827758Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:07:00.832395Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-10.xml b/metadata/glsa/glsa-202208-10.xml
new file mode 100644
index 000000000000..17cef54e0664
--- /dev/null
+++ b/metadata/glsa/glsa-202208-10.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-10">
+    <title>Spice Server: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in Spice Server, the worst of which may result in the remote execution of arbitrary code.</synopsis>
+    <product type="ebuild">spice</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>746920</bug>
+    <bug>792618</bug>
+    <access>remote</access>
+    <affected>
+        <package name="app-emulation/spice" auto="yes" arch="*">
+            <unaffected range="ge">0.15.0</unaffected>
+            <vulnerable range="lt">0.15.0</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Provides a complete open source solution for remote access to virtual machines in a seamless way so you can play videos, record audio, share USB devices and share folders without complications.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Spice Server, please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Spice Server users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=app-emulation/spice-0.15.0"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-14355">CVE-2021-14355</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-20201">CVE-2021-20201</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:07:16.230391Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:07:16.235454Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-11.xml b/metadata/glsa/glsa-202208-11.xml
new file mode 100644
index 000000000000..b81aff9336a4
--- /dev/null
+++ b/metadata/glsa/glsa-202208-11.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-11">
+    <title>Yubico pam-u2f: Local PIN Bypass vulnerability</title>
+    <synopsis>A vulnerability has been discovered in pam-u2f which could allow a local attacker to bypass PIN entry.</synopsis>
+    <product type="ebuild">pam_u2f</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>792270</bug>
+    <access>local</access>
+    <affected>
+        <package name="sys-auth/pam_u2f" auto="yes" arch="*">
+            <unaffected range="ge">1.1.1</unaffected>
+            <vulnerable range="lt">1.1.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Yubico pam-u2f is a PAM module for FIDO2 and U2F keys.</p>
+    </background>
+    <description>
+        <p>A logic issue in Yubico pam-u2f could result in the bypass of a PIN entry requirement when authenticating with FIDO2.</p>
+    </description>
+    <impact type="low">
+        <p>An attacker with local access to certain applications using pam-u2f for authentication could incorrectly successfully authenticate without entering the authentication PIN.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Yubico pam-u2f users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=sys-auth/pam_u2f-1.1.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-31924">CVE-2021-31924</uri>
+        <uri>YSA-2021-03</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:07:59.824838Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:07:59.828973Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-12.xml b/metadata/glsa/glsa-202208-12.xml
new file mode 100644
index 000000000000..5cb982d78cf9
--- /dev/null
+++ b/metadata/glsa/glsa-202208-12.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-12">
+    <title>mdbtools: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in mdbtools, the worst of which</synopsis>
+    <product type="ebuild">mdbtools</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>773289</bug>
+    <bug>830371</bug>
+    <access>remote</access>
+    <affected>
+        <package name="app-office/mdbtools" auto="yes" arch="*">
+            <unaffected range="ge">0.9.3</unaffected>
+            <vulnerable range="lt">0.9.3</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>mdbtools is a set of libraries and utilities for reading Microsoft Access database (MDB) files.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in mdbtools. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="low">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All mdbtools users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=app-office/mdbtools-0.9.3"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-45926">CVE-2021-45926</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-45927">CVE-2021-45927</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:08:26.317866Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:08:26.320752Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-13.xml b/metadata/glsa/glsa-202208-13.xml
new file mode 100644
index 000000000000..e0ce4d13456e
--- /dev/null
+++ b/metadata/glsa/glsa-202208-13.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-13">
+    <title>libass: Denial of service</title>
+    <synopsis>A vulnerability in libass could result in denial of service.</synopsis>
+    <product type="ebuild">libass</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>803119</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/libass" auto="yes" arch="*">
+            <unaffected range="ge">0.15.1</unaffected>
+            <vulnerable range="lt">0.15.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format.</p>
+    </background>
+    <description>
+        <p>A one-byte buffer overwrite in ASS font decoding could trigger an assertion failure resulting in denial of service.</p>
+    </description>
+    <impact type="low">
+        <p>An attacker with control over the ASS track input to libass via an application using it could trigger a denial of service.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All libass users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/libass-0.15.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-36430">CVE-2020-36430</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:08:39.534267Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:08:39.537350Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/glsa-202208-14.xml b/metadata/glsa/glsa-202208-14.xml
new file mode 100644
index 000000000000..b9e3341e39a0
--- /dev/null
+++ b/metadata/glsa/glsa-202208-14.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202208-14">
+    <title>Mozilla Thunderbird: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in Mozilla Thunderbird, the worst of which could result in the arbitrary execution of code.</synopsis>
+    <product type="ebuild">thunderbird,thunderbird-bin</product>
+    <announced>2022-08-10</announced>
+    <revised count="1">2022-08-10</revised>
+    <bug>794085</bug>
+    <bug>802759</bug>
+    <bug>807943</bug>
+    <bug>811912</bug>
+    <bug>813501</bug>
+    <bug>822294</bug>
+    <bug>828539</bug>
+    <bug>831040</bug>
+    <bug>833520</bug>
+    <bug>834805</bug>
+    <bug>845057</bug>
+    <bug>846596</bug>
+    <bug>849047</bug>
+    <bug>857048</bug>
+    <bug>864577</bug>
+    <access>remote</access>
+    <affected>
+        <package name="mail-client/thunderbird" auto="yes" arch="*">
+            <unaffected range="ge">91.12.0</unaffected>
+            <vulnerable range="lt">91.12.0</vulnerable>
+        </package>
+        <package name="mail-client/thunderbird-bin" auto="yes" arch="*">
+            <unaffected range="ge">91.12.0</unaffected>
+            <vulnerable range="lt">91.12.0</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Mozilla Thunderbird is a popular open-source email client from the Mozilla project.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Mozilla Thunderbird. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Mozilla Thunderbird users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=mail-client/thunderbird-91.12.0"
+        </code>
+        
+        <p>All Mozilla Thunderbird binary users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=mail-client/thunderbird-bin-91.12.0"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4129">CVE-2021-4129</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4140">CVE-2021-4140</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29967">CVE-2021-29967</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29969">CVE-2021-29969</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29970">CVE-2021-29970</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29976">CVE-2021-29976</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29980">CVE-2021-29980</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29984">CVE-2021-29984</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29985">CVE-2021-29985</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29986">CVE-2021-29986</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29988">CVE-2021-29988</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-29989">CVE-2021-29989</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-30547">CVE-2021-30547</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38492">CVE-2021-38492</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38493">CVE-2021-38493</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38495">CVE-2021-38495</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38503">CVE-2021-38503</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38504">CVE-2021-38504</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38506">CVE-2021-38506</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38507">CVE-2021-38507</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38508">CVE-2021-38508</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-38509">CVE-2021-38509</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-40529">CVE-2021-40529</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43528">CVE-2021-43528</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43529">CVE-2021-43529</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43536">CVE-2021-43536</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43537">CVE-2021-43537</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43538">CVE-2021-43538</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43539">CVE-2021-43539</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43541">CVE-2021-43541</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43542">CVE-2021-43542</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43543">CVE-2021-43543</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43545">CVE-2021-43545</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-43546">CVE-2021-43546</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-0566">CVE-2022-0566</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1196">CVE-2022-1196</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1197">CVE-2022-1197</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1520">CVE-2022-1520</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1529">CVE-2022-1529</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1802">CVE-2022-1802</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-1834">CVE-2022-1834</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2200">CVE-2022-2200</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-2226">CVE-2022-2226</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22737">CVE-2022-22737</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22738">CVE-2022-22738</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22739">CVE-2022-22739</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22740">CVE-2022-22740</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22741">CVE-2022-22741</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22742">CVE-2022-22742</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22743">CVE-2022-22743</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22745">CVE-2022-22745</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22747">CVE-2022-22747</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22748">CVE-2022-22748</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22751">CVE-2022-22751</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22754">CVE-2022-22754</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22756">CVE-2022-22756</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22759">CVE-2022-22759</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22760">CVE-2022-22760</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22761">CVE-2022-22761</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22763">CVE-2022-22763</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-22764">CVE-2022-22764</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-24713">CVE-2022-24713</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26381">CVE-2022-26381</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26383">CVE-2022-26383</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26384">CVE-2022-26384</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26386">CVE-2022-26386</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26387">CVE-2022-26387</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26485">CVE-2022-26485</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-26486">CVE-2022-26486</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28281">CVE-2022-28281</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28282">CVE-2022-28282</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28285">CVE-2022-28285</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28286">CVE-2022-28286</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-28289">CVE-2022-28289</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29909">CVE-2022-29909</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29911">CVE-2022-29911</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29912">CVE-2022-29912</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29913">CVE-2022-29913</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29914">CVE-2022-29914</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29916">CVE-2022-29916</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-29917">CVE-2022-29917</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31736">CVE-2022-31736</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31737">CVE-2022-31737</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31738">CVE-2022-31738</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31740">CVE-2022-31740</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31741">CVE-2022-31741</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31742">CVE-2022-31742</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-31747">CVE-2022-31747</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34468">CVE-2022-34468</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34470">CVE-2022-34470</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34472">CVE-2022-34472</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34478">CVE-2022-34478</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34479">CVE-2022-34479</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34481">CVE-2022-34481</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-34484">CVE-2022-34484</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36318">CVE-2022-36318</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36319">CVE-2022-36319</uri>
+        <uri>MOZ-2021-0007</uri>
+        <uri>MOZ-2021-0008</uri>
+    </references>
+    <metadata tag="requester" timestamp="2022-08-10T04:08:55.757755Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2022-08-10T04:08:55.760111Z">ajak</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f2675942396d..a03a3a561952 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 00:39:56 +0000
+Wed, 10 Aug 2022 06:39:56 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 3c24c45fc243..605b15893661 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-911ba97fd465c36414fa2eb8a1fea31d4152990a 1659621622 2022-08-04T14:00:22+00:00
+8856093f804feeda5fe9097d49ba3307aaefc9c2 1660105056 2022-08-10T04:17:36+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e676616648fa..da37b3e8e479 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 514e1379d98c..797e21019b3b 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/burp-2.4.0-r1 b/metadata/md5-cache/app-backup/burp-2.4.0-r1
new file mode 100644
index 000000000000..7a149bf04bc3
--- /dev/null
+++ b/metadata/md5-cache/app-backup/burp-2.4.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/autoconf-2.71 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) elibc_musl? ( sys-libs/queue-standalone ) test? ( dev-libs/check )
+DESCRIPTION=Network backup and restore client and server for Unix and Windows
+EAPI=8
+HOMEPAGE=https://burp.grke.org/
+INHERIT=autotools systemd
+IUSE=acl ipv6 test xattr
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grke/burp/archive/2.4.0.tar.gz -> burp-2.4.0.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6e9af6994beef002c42ada2169d9e425
diff --git a/metadata/md5-cache/app-backup/burp-2.5.4-r1 b/metadata/md5-cache/app-backup/burp-2.5.4-r1
new file mode 100644
index 000000000000..868192323995
--- /dev/null
+++ b/metadata/md5-cache/app-backup/burp-2.5.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/autoconf-2.71 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) elibc_musl? ( sys-libs/queue-standalone ) test? ( dev-libs/check )
+DESCRIPTION=Network backup and restore client and server for Unix and Windows
+EAPI=8
+HOMEPAGE=https://burp.grke.org/
+INHERIT=autotools systemd
+IUSE=acl ipv6 test xattr
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grke/burp/archive/2.5.4.tar.gz -> burp-2.5.4.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6e9af6994beef002c42ada2169d9e425
diff --git a/metadata/md5-cache/app-backup/dar-2.7.6 b/metadata/md5-cache/app-backup/dar-2.7.6
index 91921a9761c1..f6e421d41213 100644
--- a/metadata/md5-cache/app-backup/dar-2.7.6
+++ b/metadata/md5-cache/app-backup/dar-2.7.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://dar.linux.free.fr/
 INHERIT=flag-o-matic
 IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~ppc sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.7.6.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6f428affa6a70121f03507d9cfd5350e
+_md5_=0e1a7a58bb669254a44a5198e1951cec
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 3b005b4dabb2..f01d3b1fe06c 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/tracker-3.3.3 b/metadata/md5-cache/app-misc/tracker-3.3.3
new file mode 100644
index 000000000000..c068fa8a7101
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-3.3.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils app-text/asciidoc dev-libs/libxslt || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0 stemmer? ( dev-libs/snowball-stemmer:= )
+DESCRIPTION=A tagging metadata database, search tool and indexer
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker
+INHERIT=bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+IUSE=gtk-doc +miners stemmer test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+PDEPEND=miners? ( >=app-misc/tracker-miners-3.3 )
+RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0 stemmer? ( dev-libs/snowball-stemmer:= )
+RESTRICT=!test? ( test )
+SLOT=3/0
+SRC_URI=mirror://gnome/sources/tracker/3.3/tracker-3.3.3.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	529bb8cd5756c8476d37ba89dd41e635	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	1c07e7167d9ef851ad187f5f3f02d34d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2cd7304a8cfee751482873a28d67e597
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index b58dfc26a802..2e67cc465363 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.11.6 b/metadata/md5-cache/app-portage/iwdevtools-0.11.6
new file mode 100644
index 000000000000..78879c71f5c5
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.11.6
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man || ( sys-apps/util-linux app-misc/getopt ) test? ( app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+INHERIT=meson optfeature
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.11.6.tar.gz -> iwdevtools-0.11.6.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d97c806050dcf3be85ebe63af3f67d82
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index b8ab965fddda..438896187e58 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/path-0.9.2 b/metadata/md5-cache/dev-haskell/path-0.9.2
deleted file mode 100644
index 161e3144dd1d..000000000000
--- a/metadata/md5-cache/dev-haskell/path-0.9.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/genvalidity-1.0 >=dev-haskell/genvalidity-hspec-0.7 >=dev-haskell/genvalidity-property-0.4 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 >=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 dev-haskell/quickcheck >=dev-haskell/validity-0.8.0.0 ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Support for well-typed paths
-EAPI=8
-HOMEPAGE=https://hackage.haskell.org/package/path
-INHERIT=haskell-cabal
-IUSE=dev doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-8.6.3:=
-RESTRICT=!test? ( test )
-SLOT=0/0.9.2
-SRC_URI=https://hackage.haskell.org/package/path-0.9.2/path-0.9.2.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=094f60f97950d85fff3af8b009808738
diff --git a/metadata/md5-cache/dev-haskell/path-0.9.2-r1 b/metadata/md5-cache/dev-haskell/path-0.9.2-r1
new file mode 100644
index 000000000000..a96e75b0193c
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/path-0.9.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.2.0.0 test? ( >=dev-haskell/genvalidity-1.0 >=dev-haskell/genvalidity-hspec-0.7 >=dev-haskell/genvalidity-property-0.4 >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3 dev-haskell/quickcheck >=dev-haskell/validity-0.8.0.0 ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Support for well-typed paths
+EAPI=8
+HOMEPAGE=https://hackage.haskell.org/package/path
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-lang/ghc-8.10.1:=
+RESTRICT=!test? ( test )
+SLOT=0/0.9.2
+SRC_URI=https://hackage.haskell.org/package/path-0.9.2/path-0.9.2.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=827ff0b0f162a2cf27f27a911eec70b9
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7
deleted file mode 100644
index c07c0eb8532f..000000000000
--- a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-lang/ghc-8.4.3:= comonad? ( >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Semigroupoids: Category sans id
-EAPI=8
-HOMEPAGE=https://github.com/ekmett/semigroupoids
-INHERIT=haskell-cabal
-IUSE=+comonad +containers +contravariant +distributive +tagged +unordered-containers doc hscolour profile
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-lang/ghc-8.4.3:= comonad? ( >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] ) contravariant? ( >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] ) distributive? ( >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) tagged? ( >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] ) unordered-containers? ( >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-SLOT=0/5.3.7
-SRC_URI=https://hackage.haskell.org/package/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz
-_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cb8e1d8d8611dcea7940a5d5d42478b9
diff --git a/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7-r1 b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7-r1
new file mode 100644
index 000000000000..1732a645e80e
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/semigroupoids-5.3.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Semigroupoids: Category sans id
+EAPI=8
+HOMEPAGE=https://github.com/ekmett/semigroupoids
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?] >=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?] >=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?] >=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?] >=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?] >=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?] >=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-lang/ghc-8.4.3:=
+SLOT=0/5.3.7
+SRC_URI=https://hackage.haskell.org/package/semigroupoids-5.3.7/semigroupoids-5.3.7.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=58f9c81942e37e0aef8810067f80b38b
diff --git a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2 b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
deleted file mode 100644
index a13b19919db7..000000000000
--- a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Common lower-level functions needed by various streaming data libraries
-EAPI=7
-HOMEPAGE=https://github.com/fpco/streaming-commons
-INHERIT=haskell-cabal
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/text:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:=
-RESTRICT=test
-SLOT=0/0.2.1.2
-SRC_URI=https://hackage.haskell.org/package/streaming-commons-0.2.1.2/streaming-commons-0.2.1.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d1a9d5710f7c046777170b304eabdf12
diff --git a/metadata/md5-cache/dev-haskell/streaming-commons-0.2.2.4 b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.2.4
new file mode 100644
index 000000000000..3a0e4d9f3382
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/streaming-commons-0.2.2.4
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hspec-1.8 dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Common lower-level functions needed by various streaming data libraries
+EAPI=8
+HOMEPAGE=https://github.com/fpco/streaming-commons
+INHERIT=haskell-cabal
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/network-2.4.0.0:=[profile?] dev-haskell/random:=[profile?] dev-haskell/stm:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.6.3:=
+RESTRICT=test !test? ( test )
+SLOT=0/0.2.2.4
+SRC_URI=https://hackage.haskell.org/package/streaming-commons-0.2.2.4/streaming-commons-0.2.2.4.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=629eaed2c1dcdf798519255d3f055d3c
diff --git a/metadata/md5-cache/dev-haskell/tls-1.5.4 b/metadata/md5-cache/dev-haskell/tls-1.5.4
deleted file mode 100644
index 2c3f5a83d60d..000000000000
--- a/metadata/md5-cache/dev-haskell/tls-1.5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/dos2unix
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/cereal-0.5.3:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/memory-0.14.6:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] >=dev-lang/ghc-8.0.1:= network? ( >=dev-haskell/network-2.4.0.0:=[profile?] ) >=dev-haskell/cabal-1.24.0.0 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=TLS/SSL protocol native implementation (Server and Client)
-EAPI=7
-HOMEPAGE=https://github.com/vincenthz/hs-tls
-INHERIT=haskell-cabal
-IUSE=+compat +network doc hscolour profile test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/cereal-0.5.3:=[profile?] >=dev-haskell/cryptonite-0.25:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/memory-0.14.6:=[profile?] >=dev-haskell/mtl-2:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] >=dev-lang/ghc-8.0.1:= network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/1.5.4
-SRC_URI=https://hackage.haskell.org/package/tls-1.5.4/tls-1.5.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8890a002051315266d07d4497e36cc8a
diff --git a/metadata/md5-cache/dev-haskell/tls-1.5.8 b/metadata/md5-cache/dev-haskell/tls-1.5.8
new file mode 100644
index 000000000000..df136e8d3a67
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/tls-1.5.8
@@ -0,0 +1,16 @@
+BDEPEND=app-text/dos2unix
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/cereal-0.5.3:=[profile?] >=dev-haskell/cryptonite-0.27:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/memory-0.14.6:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] >=dev-lang/ghc-8.4.3:= network? ( >=dev-haskell/network-2.4.0.0:=[profile?] ) >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=TLS/SSL protocol native implementation (Server and Client)
+EAPI=8
+HOMEPAGE=https://github.com/vincenthz/hs-tls
+INHERIT=haskell-cabal
+IUSE=+compat +network doc hscolour profile test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/asn1-encoding:=[profile?] >=dev-haskell/asn1-types-0.2.0:=[profile?] >=dev-haskell/async-2.0:=[profile?] >=dev-haskell/cereal-0.5.3:=[profile?] >=dev-haskell/cryptonite-0.27:=[profile?] dev-haskell/data-default-class:=[profile?] dev-haskell/hourglass:=[profile?] >=dev-haskell/memory-0.14.6:=[profile?] >=dev-haskell/x509-1.7.5:=[profile?] >=dev-haskell/x509-store-1.6:=[profile?] >=dev-haskell/x509-validation-1.6.5:=[profile?] >=dev-lang/ghc-8.4.3:= network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/1.5.8
+SRC_URI=https://hackage.haskell.org/package/tls-1.5.8/tls-1.5.8.tar.gz
+_eclasses_=ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=deeb00e6e1fa476d1c93af44bf0c51fd
diff --git a/metadata/md5-cache/dev-haskell/wai-3.2.2.1 b/metadata/md5-cache/dev-haskell/wai-3.2.3
index 724725047440..471d43c385b6 100644
--- a/metadata/md5-cache/dev-haskell/wai-3.2.2.1
+++ b/metadata/md5-cache/dev-haskell/wai-3.2.3
@@ -1,6 +1,6 @@
 BDEPEND=app-text/dos2unix
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( dev-haskell/hspec ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Web Application Interface
 EAPI=7
 HOMEPAGE=https://github.com/yesodweb/wai
@@ -8,9 +8,9 @@ INHERIT=haskell-cabal
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-7.10.1:=
+RDEPEND=>=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/network-2.2.1.5:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?] >=dev-lang/ghc-8.4.3:=
 RESTRICT=!test? ( test )
-SLOT=0/3.2.2.1
-SRC_URI=https://hackage.haskell.org/package/wai-3.2.2.1/wai-3.2.2.1.tar.gz
+SLOT=0/3.2.3
+SRC_URI=https://hackage.haskell.org/package/wai-3.2.3/wai-3.2.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	haskell-cabal	bd6d32a0289c486284bc0cdc06a639a6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7ab6058aa4a038d1345f85cdeac6aae8
+_md5_=ff86191c71265416cd9d422c9397a8d6
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index aa5f8f02a17f..55672b3b0e62 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
new file mode 100644
index 000000000000..476eda0ea23b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database
+EAPI=8
+HOMEPAGE=https://jdbc.postgresql.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.4.1.src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=01eb9945b506d46789d8ecbe2356eded
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 29cd1f05fc08..00f8ce87a6b6 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.10.6_p1 b/metadata/md5-cache/dev-lang/python-3.10.6_p1
new file mode 100644
index 000000000000..74353271d7b4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.6_p1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.6_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a9ec79b902daca7d9d5b8d094911f0b0
diff --git a/metadata/md5-cache/dev-lang/python-3.8.13_p5 b/metadata/md5-cache/dev-lang/python-3.8.13_p5
new file mode 100644
index 000000000000..a72e15e32487
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.13_p5
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.13_p5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.13/Python-3.8.13.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=91309b0c2ef4123f63a43a6084a5244d
diff --git a/metadata/md5-cache/dev-lang/python-3.9.13_p2 b/metadata/md5-cache/dev-lang/python-3.9.13_p2
new file mode 100644
index 000000000000..ea2889315bae
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.13_p2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.9
+SRC_URI=https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.13_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=24db5924ad4febe69c342bea080e6bac
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index d3fead1bd731..83fa48b3467c 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnome-chess-42.1 b/metadata/md5-cache/games-board/gnome-chess-42.1
new file mode 100644
index 000000000000..ab39a9fea9ab
--- /dev/null
+++ b/metadata/md5-cache/games-board/gnome-chess-42.1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 ) dev-util/itstool dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.44:2 gui-libs/gtk:4 >=gui-libs/libadwaita-1.0.0:1 >=gnome-base/librsvg-2.46.0:2 x11-libs/pango gnome-base/librsvg:2[vala]
+DESCRIPTION=Play the classic two-player boardgame of chess
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Chess https://gitlab.gnome.org/GNOME/gnome-chess
+INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 vala xdg
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.44:2 gui-libs/gtk:4 >=gui-libs/libadwaita-1.0.0:1 >=gnome-base/librsvg-2.46.0:2 x11-libs/pango
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-chess/42/gnome-chess-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	1c07e7167d9ef851ad187f5f3f02d34d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b8132188f49ed35ae6c584dc680abe29
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index b3029c125aed..a3447ea62875 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/exaile-4.1.2 b/metadata/md5-cache/media-sound/exaile-4.1.2
new file mode 100644
index 000000000000..61a8c0e0170c
--- /dev/null
+++ b/metadata/md5-cache/media-sound/exaile-4.1.2
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( dev-util/intltool sys-devel/gettext )
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DESCRIPTION=GTK+ based media player aiming to be similar to Amarok
+EAPI=8
+HOMEPAGE=https://www.exaile.org/
+INHERIT=python-single-r1 xdg
+IUSE=libnotify nls scrobbler python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3[introspection] libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_8? ( dev-python/bsddb3[python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/gst-python:1.0[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] media-libs/mutagen[python_targets_python3_8(-)] scrobbler? ( dev-python/pylast[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/bsddb3[python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/gst-python:1.0[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] media-libs/mutagen[python_targets_python3_9(-)] scrobbler? ( dev-python/pylast[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/bsddb3[python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/gst-python:1.0[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] scrobbler? ( dev-python/pylast[python_targets_python3_10(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/exaile/exaile/archive/4.1.2/exaile-4.1.2.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8ee4503d48a9ba892a38a2d92f9634ea
diff --git a/metadata/md5-cache/media-sound/exaile-9999 b/metadata/md5-cache/media-sound/exaile-9999
index 3b173d0f9fcb..55fd08882543 100644
--- a/metadata/md5-cache/media-sound/exaile-9999
+++ b/metadata/md5-cache/media-sound/exaile-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9eff752ebc875ad7776a09bb10b40df7
+_md5_=8ee4503d48a9ba892a38a2d92f9634ea
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 9336fb430226..f04c78105e05 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.5 b/metadata/md5-cache/net-firewall/nftables-1.0.5
new file mode 100644
index 000000000000..794342cfe447
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.5
@@ -0,0 +1,17 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-netfilter ) virtual/pkgconfig doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.3:0= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:= ) xtables? ( >=net-firewall/iptables-1.6.1:= )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=8
+HOMEPAGE=https://netfilter.org/projects/nftables/
+INHERIT=edo linux-info distutils-r1 systemd verify-sig
+IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.3:0= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:= ) xtables? ( >=net-firewall/iptables-1.6.1:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) libedit? ( !readline )
+RESTRICT=test? ( userpriv ) !test? ( test )
+SLOT=0/1
+SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.5.tar.bz2 verify-sig? ( https://netfilter.org/projects/nftables/files/nftables-1.0.5.tar.bz2.sig )
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	529bb8cd5756c8476d37ba89dd41e635	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=df3a632f36ceb256a0bea9fed3b55054
diff --git a/metadata/md5-cache/net-firewall/nftables-9999 b/metadata/md5-cache/net-firewall/nftables-9999
index 2ae6d33bb169..d60026817d76 100644
--- a/metadata/md5-cache/net-firewall/nftables-9999
+++ b/metadata/md5-cache/net-firewall/nftables-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.2:0= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:= ) xtables? ( >=net-firewall/iptables-1.6.1:= )
+DEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.3:0= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:= ) xtables? ( >=net-firewall/iptables-1.6.1:= )
 DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=8
 HOMEPAGE=https://netfilter.org/projects/nftables/
@@ -8,9 +8,9 @@ INHERIT=edo linux-info distutils-r1 systemd verify-sig autotools git-r3
 IUSE=debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.2:0= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:= ) xtables? ( >=net-firewall/iptables-1.6.1:= )
+RDEPEND=>=net-libs/libmnl-1.0.4:0= >=net-libs/libnftnl-1.2.3:0= gmp? ( dev-libs/gmp:= ) json? ( dev-libs/jansson:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:= ) xtables? ( >=net-firewall/iptables-1.6.1:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) libedit? ( !readline )
 RESTRICT=test? ( userpriv ) !test? ( test )
 SLOT=0/1
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=1c2cabf5d5af894554e0b8cc852842bb
+_md5_=df3a632f36ceb256a0bea9fed3b55054
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 730924a49d2b..325094cf5d5d 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.6.1 b/metadata/md5-cache/net-fs/nfs-utils-2.6.1
index 60aa88ae46a9..eec0f8bc2a9e 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.6.1
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.6.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=NFS client and server daemons
 EAPI=7
-HOMEPAGE=http://linux-nfs.org/
+HOMEPAGE=http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git
 INHERIT=autotools linux-info systemd
 IUSE=caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.6.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e9506fd50fad4d83bb5f13aafd38f150
+_md5_=7a7a3f4160c86ac376c46b75fd022561
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 306f6f4d2595..793d542e7329 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.2.3 b/metadata/md5-cache/net-libs/libnftnl-1.2.3
new file mode 100644
index 000000000000..dc46cfaf83ea
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnftnl-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-netfilter ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=>=net-libs/libmnl-1.0.4:=
+DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+INHERIT=linux-info usr-ldscript verify-sig
+IUSE=examples static-libs test split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:=
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.3.tar.bz2 verify-sig? ( https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.3.tar.bz2.sig )
+_eclasses_=linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=7e944e39b113a091adaf6f0e6c4d4394
diff --git a/metadata/md5-cache/net-libs/libnftnl-9999 b/metadata/md5-cache/net-libs/libnftnl-9999
index 254227147e4f..118b3367d459 100644
--- a/metadata/md5-cache/net-libs/libnftnl-9999
+++ b/metadata/md5-cache/net-libs/libnftnl-9999
@@ -12,4 +12,4 @@ RDEPEND=>=net-libs/libmnl-1.0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/11
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=773f99d202f53fb34a78fb61aa4d56a8
+_md5_=7e944e39b113a091adaf6f0e6c4d4394
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 004bfca5a1cb..1405e83f9daf 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-4.4.3.1-r1 b/metadata/md5-cache/net-p2p/qbittorrent-4.4.3.1-r1
new file mode 100644
index 000000000000..05f7ab366d65
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/qbittorrent-4.4.3.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/boost-1.65.0-r1:= dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.2.14:= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) gui? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=BitTorrent client in C++ and Qt
+EAPI=8
+HOMEPAGE=https://www.qbittorrent.org https://github.com/qbittorrent
+INHERIT=cmake multibuild systemd xdg
+IUSE=+dbus +gui webui
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.65.0-r1:= dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtxml:5 >=net-libs/libtorrent-rasterbar-1.2.14:= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) gui? ( dev-libs/geoip dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=dbus? ( gui ) || ( gui webui )
+SLOT=0
+SRC_URI=https://github.com/qbittorrent/qBittorrent/archive/release-4.4.3.1.tar.gz -> qbittorrent-4.4.3.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0902e398a080999e409d6037fefdbaf3
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-9999 b/metadata/md5-cache/net-p2p/qbittorrent-9999
index d49e7397009f..9d07a87c5340 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-9999
+++ b/metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/boost-1.65.0-r1:= dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/q
 REQUIRED_USE=dbus? ( gui ) || ( gui webui )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5d24bd7ac5aeccd97934a7791b1b9b79
+_md5_=29e5b4716866bdca9af6d696dda01c62
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index cdf613885c07..4928a8b2cdab 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/crmsh-4.2.1-r3 b/metadata/md5-cache/sys-cluster/crmsh-4.2.1-r3
new file mode 100644
index 000000000000..bfd5385124d1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/crmsh-4.2.1-r3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=sys-cluster/pacemaker-1.1.9
+DESCRIPTION=Pacemaker command line interface for management and configuration
+EAPI=7
+HOMEPAGE=https://crmsh.github.io/
+INHERIT=autotools python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) >=sys-cluster/pacemaker-1.1.9 python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/parallax[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] dev-python/parallax[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/crmsh/crmsh/archive/4.2.1.tar.gz -> crmsh-4.2.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=179966afb51511b690cf415d8bf2c09e
diff --git a/metadata/md5-cache/sys-cluster/rocm-k8s-device-plugin-0.3.0 b/metadata/md5-cache/sys-cluster/rocm-k8s-device-plugin-0.3.0
new file mode 100644
index 000000000000..bd359aea182c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/rocm-k8s-device-plugin-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=sys-apps/hwloc x11-libs/libdrm[video_cards_amdgpu]
+DESCRIPTION=AMD GPU device plugin for kubernetes
+EAPI=8
+HOMEPAGE=https://github.com/RadeonOpenCompute/k8s-device-plugin
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/hwloc x11-libs/libdrm[video_cards_amdgpu] sys-cluster/kubelet
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/RadeonOpenCompute/k8s-device-plugin/archive/amd-gpu-helm-0.3.0.tar.gz -> rocm-k8s-device-plugin-0.3.0.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=dd9b4f939c42bcb30c725f771a8fec3f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 64712fdf49c8..d8dfdaffb825 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lxcfs-5.0.2 b/metadata/md5-cache/sys-fs/lxcfs-5.0.2
new file mode 100644
index 000000000000..2f4829b7965f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lxcfs-5.0.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ) doc? ( sys-apps/help2man ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-fs/fuse:3
+DESCRIPTION=FUSE filesystem for LXC
+EAPI=8
+HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/
+INHERIT=cmake meson python-any-r1 systemd verify-sig
+IUSE=doc test verify-sig
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0 LGPL-2+
+RDEPEND=sys-fs/fuse:3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.2.tar.gz.asc )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b5d40a461220768d355e4e1fb408c8d6
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 30547fc1a82d..49f97967f6cf 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.37.3 b/metadata/md5-cache/www-apps/mediawiki-1.37.3
deleted file mode 100644
index 8f842a62549a..000000000000
--- a/metadata/md5-cache/www-apps/mediawiki-1.37.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
-DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
-EAPI=8
-HOMEPAGE=http://www.mediawiki.org
-INHERIT=webapp
-IUSE=imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-RESTRICT=test
-SLOT=1.37.3
-SRC_URI=http://releases.wikimedia.org/mediawiki/1.37/mediawiki-1.37.3.tar.gz
-_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=ec5e2a1f44c35e634e03d64caf5fa4bb
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d7d3acf26d12..95e8580409d0 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3_p20220429 b/metadata/md5-cache/www-client/w3m-0.5.3_p20220429
index 67db5adb295a..81af6e314ce7 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3_p20220429
+++ b/metadata/md5-cache/www-client/w3m-0.5.3_p20220429
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/boehm-gc:= sys-libs/ncurses:0= sys-libs/zlib gdk-pixbuf? ( x11-libs/gdk-pixbuf X? ( x11-libs/gdk-pixbuf-xlib ) ) !gdk-pixbuf? ( imlib? ( media-libs/imlib2[X?] ) ) gpm? ( sys-libs/gpm ) ssl? ( dev-libs/openssl:0= ) X? ( x11-base/xorg-proto x11-libs/libXdmcp x11-libs/libXext ) xface? ( media-libs/compface )
 DESCRIPTION=Text based WWW browser, supports tables and frames
@@ -13,4 +13,4 @@ REQUIRED_USE=fbcon? ( ?? ( gdk-pixbuf imlib ) ) X? ( ?? ( gdk-pixbuf imlib ) )
 SLOT=0
 SRC_URI=https://github.com/tats/w3m/archive/v0.5.3+git20220429.tar.gz -> w3m-0.5.3+git20220429.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3ea96de4bb55d5fd7b1016068e4b2389
+_md5_=814f46115bb2bf2a26011b6cd64e8c8d
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index bd12f005692d..303b7ffb487d 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/jwm-2.4.2 b/metadata/md5-cache/x11-wm/jwm-2.4.2
new file mode 100644
index 000000000000..68ce95975add
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/jwm-2.4.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXrender svg? ( x11-libs/cairo gnome-base/librsvg ) iconv? ( virtual/libiconv ) jpeg? ( media-libs/libjpeg-turbo ) nls? ( sys-devel/gettext virtual/libintl ) pango? ( x11-libs/pango ) png? ( media-libs/libpng:0= ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
+DESCRIPTION=Very fast and lightweight still powerful window manager for X
+EAPI=8
+HOMEPAGE=http://joewing.net/projects/jwm/
+INHERIT=wrapper
+IUSE=svg debug iconv jpeg nls png pango truetype xinerama xpm
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXrender svg? ( x11-libs/cairo gnome-base/librsvg ) iconv? ( virtual/libiconv ) jpeg? ( media-libs/libjpeg-turbo ) nls? ( sys-devel/gettext virtual/libintl ) pango? ( x11-libs/pango ) png? ( media-libs/libpng:0= ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
+SLOT=0
+SRC_URI=https://github.com/joewing/jwm/releases/download/v2.4.2/jwm-2.4.2.tar.xz
+_eclasses_=wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=8518c626c38fa3bd54042a74b549b949
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 36d0b435b72a..1fe1126dcc82 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-10T00:39:59Z
+TIMESTAMP 2022-08-10T06:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLy/l9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLzUsJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCNSxAAl6lPqYdwItzRdvrQLHVTdwMBrxNj6+ht+1iENQxGDxWXeoY17PvAmdA5
-8wBErpkZ/i7MshUwLMReF8M426Nl0R0pauNqcNOnT+SyF3u4qiq3ePx8gC3kQR8m
-sAb264Budc7+9D5xO5IGkdQBXfXSqAo4QHmSL4z2vL6B/ZIq7OAJI5ZahoVEl1rj
-zYF0hKrgvEa1eHFODjoJyqK6mtU8h/kAOrS0D0mvjnoTQ4uJbFac7e27zA2nrALf
-9OIsCZGLX4ZXebQsZa9ZJMtdhSiArWFKH1YpLdBK2BQG7gs3m45NnCFwFyk23ppc
-nxnzjuabvkqSMqpJEQSB16UN3KhkMR3OycnI1cwZesGQlfxveElcciW3gkYJC+Od
-C6B6jAz5DTSDf8XodVstmSb3P4EOvqMtG6DOYHKFUuSnejtHSr4ZCggWhGG4UPT0
-0I7Xp92ET8lryyfpCDjJSTFr51O9hNo1yj0f1TKbZJNZwwTnydN8bTM8Mgv6tUCo
-JiUmv3Kwn7R7zmTW/hEF3NThF1Hmj9CLKeDDapmcK3hLvFw0P3bE7h9HqkPBoQVi
-wO21BlfaW+LX84TETWdK9z6xIahNYuZQiX6kmfCkijx6iQ1Yh1oBkwp5mHgDv3GA
-K80q2fhjq/1uApKKLGJtruSslrN72bWsKkVjB78eBV8vB1Ok/a4=
-=mGr2
+klBO9A/6Aw0yWKkxGOyDrdUbsHaGWsRaUQQaSvvL8Y6r1h+mPUb+y2KgVfw3KA7G
+NZI7ImEpOZekDERYrudwPhGWhJc5OUoGP35+2dnlbCxLTfMnbcqHnhppEIykhJbg
+v/WPw6Adh+zdzs987CY/908BJFMIQKqeciGZS6rgcWJ9A5fnCJ/olqS05CTxKCaT
+UY04Tdcj6qnPa/AW04GLwKgogRAkXJGlUM63iZOdoNS9fqUcTULXn75remEQb6/L
+BvGxpOn16r+2SDpT0P3cFk4/NSCUIb34zw8t+Rk4ItsldLyMaU26d0TtUshzrsC+
+S5aRpNeow+9Y6EVDadBNOEsIcsXg9IoIUmx3sOn3PURF1EiRWB1hL/pAm79XCaAJ
+TerQ+FE8d35042M7rRVOxQwcz1GstWzo0Cbl7V47tQXnSBEihIgmGz3BADlZQqLi
+SBkGY9WqlTb1tCMeODrT+65oDOaSH6z92R6guBb317Shiy7+9rN2jwNQS/LvSi+4
+Xy3qS4SmOMmXuA7LdhpqfxsoKVSx7clPiHDhflCXLPce4nlLaNpldMmwLUK0y53H
+trCLD298MG9LaO6hugH6zBJaQ6Gi57esGR1dAW8zNp+gEz+roimSZtyB5MfYJum6
+oWT3+duDDcNZ4/xVGrYU+IeEXqMLmQnDCp9ta95oVWoOk/Hapss=
+=pQYu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f2675942396d..a03a3a561952 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 00:39:56 +0000
+Wed, 10 Aug 2022 06:39:56 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8e46a645eda4..59e932c1c380 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 10 12:39:56 AM UTC 2022
+Wed Aug 10 06:39:56 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fa9f5c77d0b7..ab629946f798 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 00:45:01 +0000
+Wed, 10 Aug 2022 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index debf0b9546b7..400695bd14af 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-06a24c2675fc025b8df27a1609915ed60f664fb5 1660082894 2022-08-09T22:08:14+00:00
+e793c8eeba9ada4be595b43295e2289b348eb66e 1660112303 2022-08-10T06:18:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7b94ec3faee7..3a95f5a9645f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660092001 Wed 10 Aug 2022 12:40:01 AM UTC
+1660113601 Wed 10 Aug 2022 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f2675942396d..a03a3a561952 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 Aug 2022 00:39:56 +0000
+Wed, 10 Aug 2022 06:39:56 +0000
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 285f3b819d53..051124037295 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 6c7817b75b99..aca376433ab1 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -14,7 +14,10 @@ DIST nftables-1.0.2.tar.bz2 970781 BLAKE2B 650ae6badb574ff3628d21c8aa99f81e73932
 DIST nftables-1.0.2.tar.bz2.sig 566 BLAKE2B 5b7a20b28c274a950b718e2e14313772707b6bdc3f4519f747350593c1eb3bfbcf8c5dd9ae7d5aa0488c5cde9af8b58e05349c75e8a8246c5634303a331f9d98 SHA512 9be59d771833ac315fd52cffe7074ed9d49fbf592aec8d94500bbc7cc1f44dcb54b3815c46831a5e7e4c4770901cbdd6b8ffc5aa8d8cb7e064ec1c8453d890f1
 DIST nftables-1.0.4.tar.bz2 979540 BLAKE2B 1b2c596245cb7f1bc574250d13b9ff6f424f98e98d5955befadb83ea0a71acc6524b066e39f1e9d151f3946b690b2dee45b7d416347371f88911c8d6a9de047e SHA512 7d96c791365d399b3b930a1f9d6c6aa4a8c2180c258bb5163d9d62ea4d094857e2ebb20fc3ef13b89f449f216d0a291d3bcf288704f1e3bd3ceb51b6cadf8215
 DIST nftables-1.0.4.tar.bz2.sig 566 BLAKE2B 1ac42a2eb678abcc21d01bbaf5f9a3af3f4c49fa1f0732f2522d3da14e94aacbb12075650d2786224f8fef869fcdc94a1463bd76272aa44fc50ea31a8ebae1bf SHA512 2d2acd4810c1ede844e1eac81a5480866ad40ae71dfcf92d166fd9295290adff70d35d7de8cf1ec81ab63d184b221419ff144bc7010e18884afa992173723af8
+DIST nftables-1.0.5.tar.bz2 982538 BLAKE2B 5d58170b8fc6feccc1581653cd0815d37b59b43b7f4f9bff9f7fb46928c6c7eee5a6f07150c404f7cf42f5a1d2e980860a4dd2589b99773179e019a093c42cfa SHA512 51cbf10579db7eed58f4358044840f2ce1bffe84533c5fb03e0ebcc702970856455576ac793169c94d38a9f8148e33631ad91444e54a8be189d93af7c27feb9a
+DIST nftables-1.0.5.tar.bz2.sig 566 BLAKE2B 7744a84c213999b35c3094fa5d9f974acec6fedac3d310422834285823825bcb14fb55b463d88b91fa41d79e33ce34498769992d912b7178fa1f70bd7a1e0977 SHA512 fbff6b5b28d81e964d4523729c7866d0b52d764d090cae70a43d850bc579b17308ec41a3d7fe6707877850028e99ad09c33b5e87fa16ac5199dfeba193a61511
 EBUILD nftables-1.0.2-r1.ebuild 5163 BLAKE2B 02bacad62aea322b42251fb73ea3e23e061167ae5bde03f751231db9b33f3d85cb8a8b0b28038140264092c2a1776e0a4c9b0a464775a0e30c57cc988ac09a36 SHA512 2b55eb2c17686e13ddde19d4da06d0ac1efe09500fd62cc205fcf95d9977f7d2478369aec51e2455aed69c49869afcc54badd08bc3c4bcf26d58972d095c8aa8
 EBUILD nftables-1.0.4-r2.ebuild 5973 BLAKE2B 33b0959b853cc3ae0a140549c105116addf23a8f48107e8279e61909927f69bdd718784dca12c5ea06148d64d2fd653e6c47b2a04e71414c8254f787b5fd6789 SHA512 746c7587ff389cb44f2a8b52a618e31dab6ea844b38d8d303a14c59d3aaffd314f37b64e281f3324228727ab629d7092e3836fc226f82d9cda7bc2562b829390
-EBUILD nftables-9999.ebuild 5877 BLAKE2B ffe8dd8c23b5755d231de39c1112db4f416481e67aafdc30b1d6b8909db5c6225f03044d8b69188091bb1681877fb57a20a1528601f049150289008019e48a15 SHA512 e3a5f820332022e502e2ae4c2f4ff0963d7711eed979e8a0dfca2f015c651418447866b0d9b53cf2dfb28de2e47c5adf37daa5c82b614b21c30a8a694f3855a1
+EBUILD nftables-1.0.5.ebuild 5877 BLAKE2B 772a44595ae0e3235edeb92f95496f08c9d0c7f4dc8c03355c9d2b73a882caba148b8eac4c894841b45aa49b4017b5cf2b6f95a545158e64324ef7042a251a69 SHA512 b0ce3867afdc7e1c65ef305ea2500392bf99352075caa80ec73e2555fc5c6af24fc3150283882d175d629a3ccd1af6002645cf2670834faf5c9d10ccf135712f
+EBUILD nftables-9999.ebuild 5877 BLAKE2B 772a44595ae0e3235edeb92f95496f08c9d0c7f4dc8c03355c9d2b73a882caba148b8eac4c894841b45aa49b4017b5cf2b6f95a545158e64324ef7042a251a69 SHA512 b0ce3867afdc7e1c65ef305ea2500392bf99352075caa80ec73e2555fc5c6af24fc3150283882d175d629a3ccd1af6002645cf2670834faf5c9d10ccf135712f
 MISC metadata.xml 933 BLAKE2B 8e76ce489c41dcc01e222d77af40f2ba5cb7ddffc2bc818c6fc8c16e24dc308c125ce4d78db1647e77af96f32c85dd3391f7079e2cee26c129c56557e0c48c8a SHA512 058d38df1dbb2c1d0e611bd992f37498d3977561c3b34846fdf0d569573f2ef93a29a216ab491e583cfc2399c55c839d256dfcf8b1d7aaba63ed6ea90f22df25
diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild b/net-firewall/nftables/nftables-1.0.5.ebuild
new file mode 100644
index 000000000000..24d357de9872
--- /dev/null
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit edo linux-info distutils-r1 systemd verify-sig
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+
+	BDEPEND="
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2
+		verify-sig? ( https://netfilter.org/projects/nftables/files/${P}.tar.bz2.sig )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables"
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:0=
+	>=net-libs/libnftnl-1.2.3:0=
+	gmp? ( dev-libs/gmp:= )
+	json? ( dev-libs/jansson:= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+	xtables? ( >=net-firewall/iptables-1.6.1:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND+="
+	virtual/pkgconfig
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	libedit? ( !readline )
+"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern-kernel && kernel_is lt 3 18; then
+			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} =~ ^[9]{4,}$ ]] ; then
+		eautoreconf
+	fi
+
+	if use python; then
+		pushd py >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--disable-static
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with libedit cli editline)
+		$(use_with readline cli readline)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		pushd py >/dev/null || die
+		distutils-r1_src_configure
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd py >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_test() {
+	emake check
+
+	edo tests/shell/run-tests.sh -v
+
+	# Need to rig up Python eclass if using this, but it doesn't seem to work
+	# for me anyway.
+	#cd tests/py || die
+	#"${EPYTHON}" nft-test.py || die
+}
+
+src_install() {
+	default
+
+	if ! use doc && [[ ! ${PV} =~ ^[9]{4,}$ ]]; then
+		pushd doc >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
+	# Do it here instead of in src_prepare to avoid eautoreconf
+	# rmdir lets us catch if more files end up installed in /etc/nftables
+	dodir /usr/share/doc/${PF}/skels/
+	mv "${ED}"/etc/nftables/osf "${ED}"/usr/share/doc/${PF}/skels/osf || die
+	rmdir "${ED}"/etc/nftables || die
+
+	local mksuffix="$(usex modern-kernel '-mk' '')"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	if use python ; then
+		pushd py >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_preinst() {
+	if [[ -d /sys/module/nf_tables ]] && [[ -x /sbin/nft ]] && [[ -z ${ROOT} ]]; then
+		if ! /sbin/nft -t list ruleset | "${ED}"/sbin/nft -c -f -; then
+			eerror "Your currently loaded ruleset cannot be parsed by the newly built instance of"
+			eerror "nft. This probably means that there is a regression introduced by v${PV}."
+			eerror "(To make the ebuild fail instead of warning, set NFTABLES_ABORT_ON_RELOAD_FAILURE=1.)"
+
+			if [[ -n ${NFTABLES_ABORT_ON_RELOAD_FAILURE} ]] ; then
+				die "Aborting because of failed nft reload!"
+			fi
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT}"/var/lib/nftables/rules-save
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f "${save_file}" ]]; then
+		( umask 177; touch "${save_file}" )
+	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
+		ewarn "Your system has dangerous permissions for ${save_file}"
+		ewarn "It is probably affected by bug #691326."
+		ewarn "You may need to fix the permissions of the file. To do so,"
+		ewarn "you can run the command in the line below as root."
+		ewarn "    'chmod 600 \"${save_file}\"'"
+	fi
+
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
+}
diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild
index 51f0627a762d..24d357de9872 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -33,7 +33,7 @@ RESTRICT="test? ( userpriv ) !test? ( test )"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:0=
-	>=net-libs/libnftnl-1.2.2:0=
+	>=net-libs/libnftnl-1.2.3:0=
 	gmp? ( dev-libs/gmp:= )
 	json? ( dev-libs/jansson:= )
 	python? ( ${PYTHON_DEPS} )
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b8b168e7db5e..1a43421549c4 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index d55d881860ff..c7e852cd0462 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -11,5 +11,5 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
 DIST nfs-utils-2.6.1.tar.bz2 946432 BLAKE2B fe6ec58b4c0def75a43f40a581a9d67d25ee2e6979f41da87453661b33460b99744e1799d6b1a3ef026027cafb1aae8a954cc6449d3eb77eee494fe72804751d SHA512 5b8949b3d30ccd33c9bc68875ba0993a22e490234d5eeebc189b3da2b1df0c290cd27d58226ffa5f4fe8b9548234fadb1c432b9c7d9b297c10a39fd2887d2f7f
-EBUILD nfs-utils-2.6.1.ebuild 6003 BLAKE2B 0ea1788b3ecb0de6e01f00955bcfce4ddee8ccb57670561834c5952553a08249dd82a063a3cd7d663241db8327d7dd003480bf1eb9ad97fac957ca703f69ad06 SHA512 959ee5059c9dd459d3d5a3f818f2a3f6d68a2caaff2363d44426e7c2ce3b03f2cb2be667cc3d014bd96ab8776b592e85b8ac03569f9f14bb427c6b2dfe059d11
+EBUILD nfs-utils-2.6.1.ebuild 6052 BLAKE2B 6300335bff0c8714b88f68379fdf8f71c6d92f413452e0df1417f9ab99114adfc4619a28ebaafb0b99bb7c1fd6a162e50e3418feb966302a4643d97ea4c0d07b SHA512 2667edceb1d4bce5413da011e6169b652229722a95a1d24a58e788cf6c74fb20ace6ceed066e07e09449a3b5ab5543929a9d51c3e3aeb5c3d66f2662833324f6
 MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
index 907d935c3310..207d20ce46cd 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.1.ebuild
@@ -6,9 +6,9 @@ EAPI=7
 inherit autotools linux-info systemd
 
 DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
+HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git"
 
-if [[ "${PV}" = *_rc* ]] ; then
+if [[ ${PV} == *_rc* ]] ; then
 	MY_PV="$(ver_rs 1- -)"
 	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1e2878fe614f..ea73119098c4 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index a7d709699f7d..d8887d8afe91 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -4,7 +4,10 @@ DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f
 DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456
 DIST libnftnl-1.2.2.tar.bz2 394955 BLAKE2B 69c3338e295dd158faad812ec05db8b8ab12c5626d0f33db14ee830a14d73dc5c3cd764a563cbb4fdeaa2657c99487a99fb0cc4f324a2832d5de21d922acd451 SHA512 657d48aa263043b80daa39eb8e2647c84c03b3e3a4a30b85bec1d8e4a0976075a71ad233bb384f4460d5f6662f285c12947feb8c1a6c9a534a2c9cf7ba04eee3
 DIST libnftnl-1.2.2.tar.bz2.sig 566 BLAKE2B ffdb35811e57f55ba30dfdd3e6656166b5f515348f99ee11c771b7460fd1b26b1e598146afdf76f4765e865ae76472d7071eabb30604cf78964e2fcbd6a39508 SHA512 dc4263e744a79f2b7e4ea619e740d66d6013e62aab655f040150552a6f069794ac59b8cc87a9f630dd42f087ef60523ecf08dc89cd1194637d988f85f67aaf43
+DIST libnftnl-1.2.3.tar.bz2 395208 BLAKE2B 893688a861bbb10609642bed912090b227d5d823cc1b94098b60ac85d137254ff3001971580e5059029a33c64e7226cc8473b0b9c1c79be77cbfb0c477254a1e SHA512 e2d16cbc062eb8900f0472abb8fe6b22910cc5a8efbb47445fe6ce6e2713a0637f74b46b2bf2031ba9ecb2e5eed932e3bbb49b015c7b7207591249de23d5149d
+DIST libnftnl-1.2.3.tar.bz2.sig 566 BLAKE2B 82b49ab1c7a9a588fea67b516d57afb455ceb5242bf774ff7ec92e240b5c2373fe7cc90dd60f302cb4e0615ec0036d995c1ddf25d9b26d6168eeaaa3c7027511 SHA512 73b8f75851dd30f5f54fe85d4c75d9ab18151c38e7c63961b52965e5e7478d240931a09a078fda1fe6b1a32a588e092c98e44b57fe1c9542874ac76bb04a29a1
 EBUILD libnftnl-1.2.1.ebuild 1596 BLAKE2B 4f0df58ffaba293aaee147690535e20e22a9f1e7bc6d115b0a5bac9039fd616b3d861786552c27661d3a7569f7ad8675bdabb818fd22a1bc57f5e00af1146e47 SHA512 bbf0ae2f34d3d3a9e102e11a3c466664989f37f145eb757587887bb3538c75b863073ebe8b61b9ad26dc8d8af071c66ae5680dea6ad98b4d82af13892f192cba
 EBUILD libnftnl-1.2.2-r1.ebuild 1963 BLAKE2B 329c5a51fb5bfaae4786f5026abf160619da328defe43faf08f9f4bb055595a1f227bbbef2d7ca3712ea234b280cab0b92766305916511449e55c615cdf1f893 SHA512 ce644a086b81d06859b252006352fed172d1ff2a2860c44cbae6cf1b3b71946e0d96eb7d5c26f98c1f2249c67712614cb79bc6864b9388dbb72f00ce8d2ddf65
-EBUILD libnftnl-9999.ebuild 1669 BLAKE2B 4844b4918c355fc65ad861eb1eb392605a707275a455ec302295899d53eca6516fd17cd12ede41e322947d879794832ac38d095baf861dbb87d045906d105dfa SHA512 9af24f8b7b40720caa9d4791ffba71b64de5886290d246ccedc3c9f84fa71ad2ada69cf93fa9e764e75baffe2dde4d8193bbd917550f50c8522001d426433922
+EBUILD libnftnl-1.2.3.ebuild 1616 BLAKE2B 33da1ea7acb7744a89396efd68da7b2bd4318d876e73fffbcf9734b810b3e37adb89b60e44b554d33a938f132a9264c0ea244c2b71798708da646817a8a59348 SHA512 ae5f73c91cf326c33900ed53a601b3550dcbbd07b0f65cf0823c5870eb55dddce4ed5e80d4edc822ffc20065f72c34613c0258fd8732361c39006482b4880ba4
+EBUILD libnftnl-9999.ebuild 1616 BLAKE2B 33da1ea7acb7744a89396efd68da7b2bd4318d876e73fffbcf9734b810b3e37adb89b60e44b554d33a938f132a9264c0ea244c2b71798708da646817a8a59348 SHA512 ae5f73c91cf326c33900ed53a601b3550dcbbd07b0f65cf0823c5870eb55dddce4ed5e80d4edc822ffc20065f72c34613c0258fd8732361c39006482b4880ba4
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnftnl/libnftnl-1.2.3.ebuild b/net-libs/libnftnl/libnftnl-1.2.3.ebuild
new file mode 100644
index 000000000000..e2640d03be0d
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.2.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit linux-info usr-ldscript verify-sig
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+
+if [[ ${PV} =~ ^[9]{4,}$ ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
+else
+	SRC_URI="
+		https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:=
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nftnl
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnftnl/libnftnl-9999.ebuild b/net-libs/libnftnl/libnftnl-9999.ebuild
index 49e48df43765..e2640d03be0d 100644
--- a/net-libs/libnftnl/libnftnl-9999.ebuild
+++ b/net-libs/libnftnl/libnftnl-9999.ebuild
@@ -13,8 +13,10 @@ if [[ ${PV} =~ ^[9]{4,}$ ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
 else
-	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
-		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
+	SRC_URI="
+		https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
+		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
+	"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
@@ -25,14 +27,14 @@ SLOT="0/11" # libnftnl.so version
 IUSE="examples static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=net-libs/libmnl-1.0.4:="
-BDEPEND+=" virtual/pkgconfig"
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:=
+"
+BDEPEND+="
+	virtual/pkgconfig
+"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-missing-export-set_elem.patch
-)
-
 pkg_setup() {
 	if kernel_is ge 3 13; then
 		CONFIG_CHECK="~NF_TABLES"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b20e5e6c6b6d..15a613c83aeb 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index f9978873d7a2..0a1c890dc559 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,7 @@
 DIST qbittorrent-4.3.9.tar.gz 8510414 BLAKE2B de98aff6d81f43c3ad87f6c5f800a4488e18173fb96713d0a2420cf4d4708c9b1f2f54c8d0aa566e7738b4f94d192aad9f0196a05d43724582ef81833901727f SHA512 ec33f67895fbf47acc2f79d9c9e16db8b96c756cf493b76eb24b90e13a790a709104ea9aa378ee111d8c38b605bed5192b366d1917bbf160b21aa2ae3aacd2d1
 DIST qbittorrent-4.4.3.1.tar.gz 7736308 BLAKE2B 9177f0c629418a5f9e7f117b7d1f990181ef910193fed9763f2137cbc91c9de07ad96884d57e96782b5a2f6089fe73d3fab0a2f2f54f72dd8c2cec00dd179e5f SHA512 e3d63c4090e27387f4a5524d0daab26eab70f70ef81ad607e9661e128ccccbf33f2d240cd219bbb1fb138d6e78493ce73055d5128bf888e0ad3949922774efba
 EBUILD qbittorrent-4.3.9.ebuild 1374 BLAKE2B 50f1b1faee3b77468c8ce4b256be7e1ee9e302a7df26e4fa35e3e4dbeb2c12bcd60e271ea1fd5d0dc81e62ca04f65da672e7a4db5ec4af06c56995611dcb554c SHA512 8cd9ff1452e4fd6122e559fea1b147d34cb8ac7b2337ebaf3fdd536fb1cadb88ee8feb29fb409c0312341e7a37491ace10611ad1dc28cab41eef279a61fe8e43
+EBUILD qbittorrent-4.4.3.1-r1.ebuild 2364 BLAKE2B e46f077837b36cf46aa2ace0c840a166aed5fb8fb93570e92488291c92d28dd83b9ae96667b915ae58e3bed0283a9100576e98bc1461c4f3a3c3db2465c8e825 SHA512 70523c78dab8f372d668822d9c63ae6ff94fa3c71530574bf1ef140bddb085f34b75906872b9eb646bbbe4e4c4650cabc07dfdb26f39b8fec58f4e2002ee0a83
 EBUILD qbittorrent-4.4.3.1.ebuild 2259 BLAKE2B be29b48ae631c7a3689f50dffdffdf189f334e1da8cd532d189f1b89a013fa198b7deb951ec2495b17bcc27512f0b1790bf75a9a1741d9f7b964ca55f4584abd SHA512 c3aa6ffe6a38671b87d6455421e30f0e6a4436ce9a30734f9b6007a1544c38119292824269792a7786daa6d330bb8625325f8dbdedaa30d08f82351c2abd47c8
-EBUILD qbittorrent-9999.ebuild 2260 BLAKE2B d92c164d05d5304d1dca09e860522ac89ce734d6acb9f80f404123445bd343ceb6b2fac631fed9990319f99fe66ef1f0e80ced31b37542703472db338cf6bcdd SHA512 bf9a9d9ddc273efa22dd1f5abc6683968f35d8bb7883af7233bbc444103c4d863e8d8c8424c32453ea9355d7b58c6eaec02c8aede50fb5e61499745ed87bd934
+EBUILD qbittorrent-9999.ebuild 2268 BLAKE2B a3077d1ee4d59683384b1056a302304aed59ab73a8d5d67a751f647b5216788fff65d8fc5eef44d54e0d523023f53ddd70370d6ba36c4a8cf7e76fb11d0b64ff SHA512 41605d8de4a1028faad64cdc9d40272099c4670c49f634c0d317da7848c966f6df974cbffc51e27f3f46214481406ad334b436e5d40154f962ebb56a65e00ed9
 MISC metadata.xml 453 BLAKE2B 0a68996aacf4ff1e56423417f8808bb66aa9563aaa3ef87c863539edd8173f32cc4a1b0061a5c9ecd63801c51ec52c54bd61ffcd869fc74dc24c2b042ec218d5 SHA512 90d52e221f153737c99b353a052683e0340f098f773b28e0d5b9d0c729b747beedadb4193c45a1f4c3df998436d194e089434aa621421bf127d049d90a14a434
diff --git a/net-p2p/qbittorrent/qbittorrent-4.4.3.1-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.4.3.1-r1.ebuild
new file mode 100644
index 000000000000..09d844dc745b
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.4.3.1-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake multibuild systemd xdg
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus +gui webui"
+REQUIRED_USE="dbus? ( gui )
+	|| ( gui webui )"
+
+RDEPEND="
+	>=dev-libs/boost-1.65.0-r1:=
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtxml:5
+	>=net-libs/libtorrent-rasterbar-1.2.14:=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	gui? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=( base )
+	use webui && MULTIBUILD_VARIANTS+=( webui )
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	multibuild_src_configure() {
+		local mycmakeargs=(
+			-DDBUS=$(usex dbus)
+
+			# musl lacks execinfo.h
+			-DSTACKTRACE=$(usex !elibc_musl)
+
+			# We always want to install unit files
+			-DSYSTEMD=ON
+			-DSYSTEMD_SERVICES_INSTALL_DIR=$(systemd_get_systemunitdir)
+
+			# More verbose build logs are preferable for bug reports
+			-DVERBOSE_CONFIGURE=ON
+
+			# Not yet in ::gentoo
+			-DQT6=OFF
+
+			# We do these in multibuild, see bug #839531 for why.
+			# Fedora has to do the same thing.
+			-DGUI=$(usex gui)
+		)
+
+		if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then
+			mycmakeargs+=(
+				# Need to specify GUI here to allow webui settings
+				# to appear in the GUI. bug #864731.
+				-DGUI=$(usex gui)
+				-DWEBUI=ON
+			)
+		else
+			mycmakeargs+=( -DWEBUI=OFF )
+		fi
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant multibuild_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+
+	if ! use webui ; then
+		# No || die deliberately as it doesn't always exist
+		rm "${D}/$(systemd_get_systemunitdir)"/qbittorrent-nox*.service
+	fi
+
+	einstalldocs
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index e66a7bbca615..2fb87e1afc1c 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -78,7 +78,7 @@ src_configure() {
 
 		if [[ ${MULTIBUILD_VARIANT} == webui ]] ; then
 			mycmakeargs+=(
-				-DGUI=OFF
+				-DGUI=$(usex gui)
 				-DWEBUI=ON
 			)
 		else
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4eed5f292396..94862b487679 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1fcd23c4ed56..db363c686ffc 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1543,7 +1543,6 @@ dev-haskell/parsec-numbers:parsec1 - use dev-haskell/parsec1 instead of dev-hask
 dev-haskell/parsers:attoparsec - Enable the use of the `attoparsec` package
 dev-haskell/parsers:binary - You can disable the use of the `binary` package using `-f-binary`.
 dev-haskell/parsers:parsec - Enable the use of the `parsec` package
-dev-haskell/path:dev - Turn on development settings.
 dev-haskell/persistent-sqlite:build-sanity-exe - Build a sanity check test executable.
 dev-haskell/pointed:comonad - You can disable the use of the `comonad` package using `-f-transformers`.
 dev-haskell/pointed:kan-extensions - You can disable the use of the `kan-extensions` package using `-f-kan-extensions`.
@@ -1567,12 +1566,6 @@ dev-haskell/quickcheck-classes-base:unary-laws - Include infrastructure for test
 dev-haskell/recaptcha:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/sandi:conduit - Build with conduit
 dev-haskell/semigroupoid-extras:profunctors - You can disable the use of the `profunctors` package using `-f-profunctors`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/semigroupoids:comonad - You can disable the use of the `comonad` package using `-f-comonad`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Comonad`
-dev-haskell/semigroupoids:containers - You can disable the use of the `containers` package using `-f-containers`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/semigroupoids:contravariant - You can disable the use of the `contravariant` package using `-f-contravariant`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Contravariant`
-dev-haskell/semigroupoids:distributive - You can disable the use of the `distributive` package using `-f-distributive`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Distributive`
-dev-haskell/semigroupoids:tagged - You can disable the use of the `tagged` package using `-f-tagged`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/semigroupoids:unordered-containers - Enable the use of the `unordered-containers` package (and also its dependency `hashable`). Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/sendfile:portable - Explicitly enable portable sendfile support (implemented in Haskell)
 dev-haskell/sha:exe - Build a sha1 and a sha384 executable similar to 'md5sum'.
 dev-haskell/shelly:lifted - run the tests against Shelly.Lifted
@@ -9092,6 +9085,7 @@ x11-wm/fvwm3:rplay - Enable rplay support
 x11-wm/fvwm3:stroke - Mouse Gesture support
 x11-wm/i3:doc - Build and install the HTML documentation and regenerate the man pages
 x11-wm/icewm:gdk-pixbuf - Enable gdk-pixbuf rendering
+x11-wm/jwm:pango - Bidirectional text layout support with pango using xft backend.
 x11-wm/lumina:desktop-utils - Build and install lumina's desktop-utils
 x11-wm/metacity:libcanberra - Enable sound event support using media-libs/libcanberra
 x11-wm/metacity:vulkan - Enable Vulkan based compositor support via META_COMPOSITOR=vulkan environment variable
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index eae17bc1c5d0..28208f86903b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index b9a8762b0f7e..6d97855febe9 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -1,4 +1,5 @@
 DIST crmsh-4.2.1.tar.gz 1058921 BLAKE2B 84d1f8685e792d9f453b2d185ccda4e8c2c9566becd85ed8308c014bd18e1479f601f3e89e4a1c3464c0d5bb797d7ddf9ddff479cd8c4c0d2998fd528f8ecbd2 SHA512 df0945f1b977993a0aca89af7c9030bc798aac4397a9d448d47bf68331e8aec83fa6155f2897f3c84573bcdb20fa384a1489b4f1d69fd1a831ece2fdb2b5b321
 EBUILD crmsh-4.2.1-r1.ebuild 915 BLAKE2B 491f31b3add8b294a447c8ef3c883f965f2b8a5d3ee1acf843a6f56d82695cc762c3d4181ebf52d277c388c43fcda9191aeacca22285a9da6361a1d5d706a735 SHA512 e420ce9d65ec0554fbbc59ea7facb5a6675e60fafb027fd144a07fb008775d01781c4c8a06133d47331408164f3d797cb435a76e99c31a9d809ebdd0d7e599cd
 EBUILD crmsh-4.2.1-r2.ebuild 878 BLAKE2B d9e4af1e084534f334e7cd730098c3ed187b469e5ade0598158d0baf49244760512c62146ade4aad15184fbca52398ea4f75ddb73ba6b1a066b83d415d76a173 SHA512 23a0945babed96f0a2123d65d23be03f4763b8eacbe067280758c888a5e2b5f036384878cffe6e4b20aaab5b1b5a3e270e0e43d1acea0f5b3b0d06286a5004e8
+EBUILD crmsh-4.2.1-r3.ebuild 940 BLAKE2B 3c9db7e828e31850cef8390bf81f212b14747885c35fef9534132ffdf09b3f91ffd4c59f1c3ae472d83956e8ec25a00185e6480e63bd266f69c866594dfb9631 SHA512 36fbffa21b284c44bbd1c9d8fc019dc1803167301e3aa7e15d662c3d006d8e0c895d42c7cf00070aba0ea7fb317bfc2f26bdc4a27f5ec96ffdda32719823f635
 MISC metadata.xml 344 BLAKE2B 3dd1aba1bed81c9993d1d9527e5695c4538c32014dc4da3303c602031182421f50629296c69f2f821455d29a0beb01a94b86541421d31462d37b05bbd57b41f0 SHA512 8fddf2b64d5dbdc79ccc206e36e33c2aee2c17ffc1c6012c80431d3d487734538c6efc3e3b6803407535783b1afa91901b929220874f8d20ce2616ad6cdb967d
diff --git a/sys-cluster/crmsh/crmsh-4.2.1-r3.ebuild b/sys-cluster/crmsh/crmsh-4.2.1-r3.ebuild
new file mode 100644
index 000000000000..88ea25ce1490
--- /dev/null
+++ b/sys-cluster/crmsh/crmsh-4.2.1-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/crmsh/crmsh"
+	inherit git-r3
+	S="${WORKDIR}/${PN}-${MY_TREE}"
+else
+	SRC_URI="https://github.com/crmsh/crmsh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~hppa ~x86"
+fi
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Pacemaker command line interface for management and configuration"
+HOMEPAGE="https://crmsh.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=sys-cluster/pacemaker-1.1.9"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/parallax[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+}
diff --git a/sys-cluster/rocm-k8s-device-plugin/Manifest b/sys-cluster/rocm-k8s-device-plugin/Manifest
new file mode 100644
index 000000000000..a0ea87d44b7a
--- /dev/null
+++ b/sys-cluster/rocm-k8s-device-plugin/Manifest
@@ -0,0 +1,3 @@
+DIST rocm-k8s-device-plugin-0.3.0.tar.gz 5188051 BLAKE2B cff5a5eefea521fc398a3b9199375f8a4ed875688fc06bc6a097cdef017d1ef102eea096a8e37aa2d962afc2fc0a8153c26e36b226a31a1913ae2de97d632650 SHA512 d5c9c590aeb5fb744917662c9bc8a88a95c7b4478c614808c86ecb6caaf4f20c81a0013e6352d701c29c9c10810231ab142859ee95923e31d9267206209e4948
+EBUILD rocm-k8s-device-plugin-0.3.0.ebuild 840 BLAKE2B 5892b27256156d6ac2fe102faebd708302c7706c1579921043583d241e9f4544c70855b4c08089708665f1a9c85bd82476a7eb4fc4915c8da23e58b2c81e1200 SHA512 305495b731682cfdacabe188914190c271a98d001f53c09dde724fdd2de354f17265f5a8a459a4e3530cb28de3ca99a276c8a676efe689cd2afc648a26154832
+MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/sys-cluster/rocm-k8s-device-plugin/metadata.xml b/sys-cluster/rocm-k8s-device-plugin/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/sys-cluster/rocm-k8s-device-plugin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-cluster/rocm-k8s-device-plugin/rocm-k8s-device-plugin-0.3.0.ebuild b/sys-cluster/rocm-k8s-device-plugin/rocm-k8s-device-plugin-0.3.0.ebuild
new file mode 100644
index 000000000000..d6426fa96bbe
--- /dev/null
+++ b/sys-cluster/rocm-k8s-device-plugin/rocm-k8s-device-plugin-0.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+# update these on every bump
+VERSION=v1.18.1-8-gabd271e
+TAG="amd-gpu-helm-${PV}"
+
+DESCRIPTION="AMD GPU device plugin for kubernetes"
+HOMEPAGE="https://github.com/RadeonOpenCompute/k8s-device-plugin"
+SRC_URI="https://github.com/RadeonOpenCompute/k8s-device-plugin/archive/${TAG}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="sys-apps/hwloc
+	x11-libs/libdrm[video_cards_amdgpu]"
+RDEPEND="${DEPEND}
+	sys-cluster/kubelet"
+
+S="${WORKDIR}/k8s-device-plugin-${TAG}"
+
+src_compile() {
+	GOBIN="${S}/bin" ego install -ldflags="-X main.gitDescribe=${VERSION}" \
+	./cmd/k8s-device-plugin
+}
+
+src_install() {
+	exeinto /var/lib/kubelet/device-plugins
+	doexe bin/k8s-device-plugin
+	einstalldocs
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2e0b479e83e6..a18c14ad2ae6 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 1846ef08e381..935d54509d50 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -5,6 +5,9 @@ AUX lxcfs-5.0.1-fix-reinitialization-with-fuse3.patch 2124 BLAKE2B b135dd04ba1af
 DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4
 DIST lxcfs-5.0.1.tar.gz 103221 BLAKE2B 49cd0be04d358db81046ac78e66e8acaa86ef66e51a869b884cb75e98c0501ee7db1b1e5604ca44f105f04378418e8077738a6d6abf85c48b35dfee2b93131e9 SHA512 edc685914e73b055161b8efe9109aca7bc2b1f1285e06a71b697f97d2e7f4cddf5256519325bf628318b64ae0203f594928d9e772e04988971151c4e46788818
 DIST lxcfs-5.0.1.tar.gz.asc 833 BLAKE2B a280e506f154497af3cc6a61bf458830939c67a6a065da1c0509f44ed07bd58bf80c10b5bfdbb18027ae2f200aaa2e9ca4b76cde070b860c34fb2cca7083e809 SHA512 90b982b61fcc56ac23fcef344014252faba280a8fb7539d28dbe2d36dc433c8de93d2c065d160cb98b42ab4b341d01ff2a379cad12827d8b70885c044e9e9ae8
+DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407
+DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676
 EBUILD lxcfs-5.0.0_p20220524.ebuild 1728 BLAKE2B 0b357a0906f9f7921d99948ce1721d4f6e3e076f3367ed2eae91078c4c71d20611cb49dad2c446675e200dd1e0060b06fbcadf304911145c1aae78f639b665b1 SHA512 67890b74409da3767b9169b727fc895fd4345abc62190414ee4ca3cb22fee4b24cdbe240b2c73162e99d0c0ce18a3eb340d91a6993c794ac6266f8fa898d4fe6
 EBUILD lxcfs-5.0.1-r1.ebuild 1925 BLAKE2B 6abcfb36b970d42daca81de4fc3505da269504e213868d1154746c48788e413c555e08cfe0f036c61c67da70897966f9b5b097e9311dc897d9d147cf683f4bfc SHA512 735b93a160f4ab25cfefacb9928737585fe7b0edd9a5ca198d2167230d1ad9480d7b2c7ee2105373fd92c309f4a87f5885d4d9469447eb49d32479b4d929fe29
+EBUILD lxcfs-5.0.2.ebuild 1848 BLAKE2B 4bcf1691ede06337d5ee98ec1d5978d46532ff31fa3182d1aa93850e4c5740d0c71977188461a18b5dbf5819c60c9baff16812c34d5171c5e7f53005cd154f4f SHA512 6be20bb6e6fbc1f19e3e56a93717ebb3ab370835e7855145f3b06d7c8c2522768ed0844c4a833956a7d99291da9b1f33ca4b76146654d46ed55ae9626a1eb179
 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab
diff --git a/sys-fs/lxcfs/lxcfs-5.0.2.ebuild b/sys-fs/lxcfs/lxcfs-5.0.2.ebuild
new file mode 100644
index 000000000000..9af4475e9807
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-5.0.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake meson python-any-r1 systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0 LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc test"
+
+DEPEND="sys-fs/fuse:3"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/jinja[${PYTHON_USEDEP}]
+	')
+	doc? ( sys-apps/help2man )
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Needs some black magic to work inside container/chroot.
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+python_check_deps() {
+	python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix python shebangs for python-exec[-native-symlinks], #851480
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc docs)
+		$(meson_use test tests)
+
+		-Dfuse-version=3
+		-Dinit-script=""
+		-Dwith-init-script=""
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
+	./main.sh || die
+}
+
+src_install() {
+	meson_src_install
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
+	# #728470
+	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index e3cc4d54af9b..5adb48aa32e4 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index a11294ebbe6a..590c19f11636 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,9 +1,7 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
-DIST mediawiki-1.37.3.tar.gz 51513011 BLAKE2B 5d30d582e1efbc93ea65ac9bfc7a338f04fcd568cf30e58d0eca1c601c2d45261ad75cdad9d9d726e2b2c63f5a2d7ef01e26cfbbf0c77a3d110c98d06312f991 SHA512 5c5e406a3ecf83136bb46606b4dd7288b99959a17b37c3b0b74426f47fee8b9b14f3b5106f99d41c07e4924b78bcc3cc61e0058ceb98a087d3ba5ab5a51402e3
 DIST mediawiki-1.37.4.tar.gz 51545350 BLAKE2B 67fa368fcdee1ca6b6a1d8bb565e392746516d76f6934c88540ea9dd7973296601fb922a0e00e7a0a6669078fd66c766ff7b9e3001f562e2a4082de2dc91d2ce SHA512 b92d954a3bc7d4b202ae8f43e95b8111a388fe8af4991fab468196bda035bccfd67700f873c081e922e19d17881a15d00ab44f06d60f4d78019b85c6761cab26
 DIST mediawiki-1.38.2.tar.gz 54983049 BLAKE2B d1b0c5fc1e63d94c1e6830ff128a7b781928fb0ebf3d0823cdb28672412750c168b37b73c9c5efd0dec248a96a25d97fd9fd211a71237dfef0985fbb54d89e1a SHA512 0b548f3eff5eff01a4a33ee18347861a81481d45fcaf3252f9a07fc4f5423a6c9c18a11d6f014d8afc59d0f13650940af81c95b4d9e094310944b5717b7a6072
-EBUILD mediawiki-1.37.3.ebuild 2567 BLAKE2B 2d6f901f541f1b864e90216a81b5ad1247690ff89853fdbcf8987e635d7db882e1e79326272800bd5ab014998466e0ded1fc4f17dbcd68b47f564761c00154db SHA512 e2b547f4998c4fcc448c7957c75b47089ddcf345d8d80160811351790354d8ea2857cecf549fb561e4c62f2a85aa90fe275fbedeb5690cbf885c920149fc1faf
 EBUILD mediawiki-1.37.4.ebuild 2567 BLAKE2B 2d6f901f541f1b864e90216a81b5ad1247690ff89853fdbcf8987e635d7db882e1e79326272800bd5ab014998466e0ded1fc4f17dbcd68b47f564761c00154db SHA512 e2b547f4998c4fcc448c7957c75b47089ddcf345d8d80160811351790354d8ea2857cecf549fb561e4c62f2a85aa90fe275fbedeb5690cbf885c920149fc1faf
 EBUILD mediawiki-1.38.2.ebuild 2576 BLAKE2B 9ee21af68bf0af942fb9b7948be718a20a7e8a5bdc3ea3419da30e8f2737f9c8b7464cf8d30d19e9294aaf50b91200b1177c81a7372770728bfb65fdf9017067 SHA512 27b1922549fc23af3fc7a3ff0a378a300b32b988225f8f78f3141c04c7d2629e0db354d7c322de7db44629e6474cd7fdbaf7c60622501b6544e55fcef2e0f091
 MISC metadata.xml 359 BLAKE2B 79703ba1428aafa7d5ab14386601405a4ec03015fe7920b9c8f9bc3e1fbaefce4345a77410acc429689f42610c7526fd501667230d4aa786c3d02b9241f3fd50 SHA512 6d35f7bd19d1af197137a66ac215e25e2e3b551f2b1be1b234fce56f09c3b62c3056810b154a332ce018597d759434c54148e93cc4d6013698bce8cf1d370561
diff --git a/www-apps/mediawiki/mediawiki-1.37.3.ebuild b/www-apps/mediawiki/mediawiki-1.37.3.ebuild
deleted file mode 100644
index 6d430cdf861e..000000000000
--- a/www-apps/mediawiki/mediawiki-1.37.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit webapp
-
-MY_BRANCH=$(ver_cut 1-2)
-
-DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
-HOMEPAGE="http://www.mediawiki.org"
-SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
-IUSE="imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
-	imagemagick? ( virtual/imagemagick-tools )
-	!imagemagick? ( dev-lang/php[gd] )
-	mysql? ( dev-lang/php[mysql,mysqli] )
-	sqlite? (
-		dev-db/sqlite[fts3(+)]
-		dev-lang/php[pdo,sqlite]
-	)
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-RESTRICT="test"
-
-src_unpack() {
-	default
-
-	# remove lua binaries (bug #631554)
-	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# First we install docs and then copy everything left into htdocs dir
-	# to avoid bugs like #236411.
-
-	# We ensure the directories are prepared for writing.  The post-
-	# install instructions guide the user to enable the feature.
-	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
-	dodoc ${DOCS} docs/*.txt
-	docinto databases
-	dodoc docs/databases/*
-	# Clean everything not used at the site...
-	rm -rf ${DOCS} COPYING tests docs || die
-	find . -name Makefile -delete || die
-	# and install
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# If imagemagick is enabled then setup for image upload.
-	# We ensure the directory is prepared for writing.
-	if use imagemagick ; then
-		webapp_serverowned "${MY_HTDOCSDIR}"/images
-	fi
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
-	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "=== Consult the release notes ==="
-		elog "Before doing anything, stop and consult the release notes"
-		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
-		echo
-		elog "These detail bug fixes, new features and functionality, and any"
-		elog "particular points that may need to be noted during the upgrade procedure."
-		echo
-		ewarn "Back up existing files and the database before upgrade."
-		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
-		ewarn "provides an overview of the backup process."
-		echo
-	fi
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index fb13c3815097..ef283eff6f96 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 8ac0e45c7186..d7017f6a9eab 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -6,5 +6,5 @@ DIST w3m-0.5.3+git20220429.tar.gz 2312378 BLAKE2B 1cf73c447c2e43491d206ece63bea5
 DIST w3m-0.5.3_p20220216.tar.gz 2306347 BLAKE2B d312aee587d76d077ddae27c97a20957083785a269080ec2a4896f2bd9b4c90cc356a3b6d6c9a435458cf4c16b749d0b1e1c403f7bc5028a0b463c352f75ad2a SHA512 2b661eca0f1e2ff0d7646ce062cc736a30950b41e3e056061d0d65feb869fbea8f6668255c403b460d6b2786a4fd24be6e98d9eb99b8948b3113f7d4ec866a12
 EBUILD w3m-0.5.3_p20210102.ebuild 3273 BLAKE2B 3a1224bc9807f749d8cc8136a73bd7cca2d654b48116786a1017269ccbede2c347ddeeac7f1d40a4ff93a501458454d83c8367d0efaee7f5a70b0196d88ae297 SHA512 1bd9d4ebf1f3f473010ca715abffa6b8dbb946366ca7e75cbb4c88c2da33b8488b11e26419c8d5810285e153ddf5a710077bc0015a66ad688549c91301670fa1
 EBUILD w3m-0.5.3_p20220216.ebuild 3153 BLAKE2B 0f7ff94d897ea0acffb228ba21f42970e10969a7f2b355fad52ca2c0c55efcc3911783ec1489da236767a43793308f4e9a65b9cf3fde613f582076097014af4b SHA512 57d30e4b312b43911e3fc2b13fdedd006aa6502bb5103ea3fd4a97fb5daa8e4cbab03dc2c08671557a25be7a698395124d6b6e0e4479b8f22a990f1abe502cb4
-EBUILD w3m-0.5.3_p20220429.ebuild 3146 BLAKE2B 57fc04a9af5d77b7e357fb7c30926f7bc233eb6cd21731a6c02437ceea9ae0706d81963d98f02947c7ec37bddb8c946e908880b2ff14cd0a4c549462de126bff SHA512 f0b852a30a0063d999855d4307b257efc108144689ee64df340aa9f7b0e73fd63e9c5a2e23708e696a52dca6958f3354304384084387ecfbe34c9acedabd9817
+EBUILD w3m-0.5.3_p20220429.ebuild 3165 BLAKE2B 23393125051855c629a59a69d32eeb54ab947f1f671b40a2e855efcd0d9c258306fd1952b6ad5f2e03f164b29127aed61d85d601b6483a9c4856c7bc7a26f402 SHA512 d7a5e5b51d17622f20eb18fafa182825230e9483827805dcf43a447fe1e1b3363fa4941bfacb62e5baa66c4260dffbe0f9e671e1df700f111a09443a7271d36d
 MISC metadata.xml 651 BLAKE2B b2262dc1caa00577c371a1ff78080e89f3d07652b836c9d7e4f6734ef7e530947e5b1109085364148a48d70a665e2818d3a1ee7d4ca595cfa141512eec567436 SHA512 154a8200e4d0325a81807f10782c8db29560bdd8c31ec388e34a9c76159e5e0b3dd5344e000edc34ca95bffa1ea92cacba103d24d8b745f729f4a32025a9e7a6
diff --git a/www-client/w3m/w3m-0.5.3_p20220429.ebuild b/www-client/w3m/w3m-0.5.3_p20220429.ebuild
index c1c3e63734a0..41a46157de64 100644
--- a/www-client/w3m/w3m-0.5.3_p20220429.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20220429.ebuild
@@ -45,6 +45,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f32f3eb8737a..ad4ce9477c60 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 7d04c02cc43d..9b51fa18c388 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,4 +1,6 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
+DIST jwm-2.4.2.tar.xz 316000 BLAKE2B 7a0a1c5f60cb3554c999ce3d00d94af4d58ac4bdfcbaaa13a7b675273b4c5d0058c7c85bec950fa91d33a46a89f0b83faf2ab2cda0430a741884e2fdfd8116a7 SHA512 2669c3e2ab2d9a5539d02559108a2bc601bb2209de03dc15057a65c14b5e1268cc58009f4102c4d90302c0705ada5578997a3644c736a46a7e8cf13766cc92fe
 EBUILD jwm-2.3.7.ebuild 1817 BLAKE2B afebe64049c60725c05a91f9a8c0113aaf1472914bd95553ce8ca0e330b9fc6f4dae9ea35617fae47c293b7911500a0f65337ad80fd02140b344b6af5397d39e SHA512 68a7c5e782bcd2e57235485ed57955fd5fddf97bb60dd74a1b15b4241d9e3ec2e7c07ac2d85381b80c90b562ad97d6ff6f133ab58fb77c8a2f6ad01f18d33a7c
-MISC metadata.xml 974 BLAKE2B c051bfac5e57c71c8d7b7f377ab70acc9f6072908e94b608aa28fee98f8930515f38e04d08041681af893213ef95b6f0058b9908e305b94b72eceedb622ab897 SHA512 f59fc3c677079a553e6b558cc73bd30ab81d760ac4b1e2e303364f716d682bb07c86667caf8cbcbc52820a900541860a1ef90995d577fa332646db47dd24a5dd
+EBUILD jwm-2.4.2.ebuild 1885 BLAKE2B 1e0fd200d212beb9d334605ff814dbaab9180f5b78d7124e0dc5097d239063d2c7cb3cc7df786338d94eb57d179108c7a380c50a01470234705bcb80ac186770 SHA512 5d00cd0519bca94f0bb2fc059c92a1b597675be7c9da00a0a15f73d246d6f1962aa208efbd4689a98219f5d84dcb115e8e365a2fb01f5e1a1217b48c180112b9
+MISC metadata.xml 1088 BLAKE2B 18d33c12e3a7fad7648b9bb7934657064dce1f495c47ca1a148bc707ad17f740916d4338c0ada79004fe2b29cd0dff289cfc825bfc0725d9ef648da746b3762c SHA512 dc8ce5c40502d8fcd678f104042e4e5a85cce926fca4ab6cbca8dab30d0d66fdbc061a3cc1a1d1426fb7267e4d680505240bc6c01f6a1c8eb528f4d85ec5c057
diff --git a/x11-wm/jwm/jwm-2.4.2.ebuild b/x11-wm/jwm/jwm-2.4.2.ebuild
new file mode 100644
index 000000000000..5c8dc48adc0f
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.4.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit wrapper
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/projects/jwm/"
+SRC_URI="https://github.com/joewing/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="svg debug iconv jpeg nls png pango truetype xinerama xpm"
+
+RDEPEND="dev-libs/expat
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrender
+	svg? (
+		x11-libs/cairo
+		gnome-base/librsvg
+	)
+	iconv? ( virtual/libiconv )
+	jpeg? ( media-libs/libjpeg-turbo )
+	nls? ( sys-devel/gettext
+		virtual/libintl )
+	pango? ( x11-libs/pango )
+	png? ( media-libs/libpng:0= )
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable svg cairo) \
+		$(use_enable svg rsvg) \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable nls) \
+		$(use_enable pango) \
+		$(use_enable png) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		$(use_enable xpm) \
+		$(use_with iconv libiconv-prefix /usr) \
+		$(use_with nls libintl-prefix /usr) \
+		--enable-shape \
+		--enable-xrender \
+		--disable-rpath
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/bin
+	dodir /usr/share/man
+
+	default
+
+	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+	insinto "/usr/share/xsessions"
+	doins "${FILESDIR}"/jwm.desktop
+
+	dodoc README.md README.upgrading example.jwmrc CONTRIBUTING.md
+}
+
+pkg_postinst() {
+	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+	einfo "or per-user by creating a configuration file in ~/.jwmrc"
+	einfo
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
index 4eaa4897b0b5..2af5f3016b49 100644
--- a/x11-wm/jwm/metadata.xml
+++ b/x11-wm/jwm/metadata.xml
@@ -19,4 +19,9 @@
 	such as Puppy Linux and Damn Small Linux, and it is available as a separate
 	package in many other distributions.
 	</longdescription>
+	<use>
+		<flag name="pango">
+			Bidirectional text layout support with pango using xft backend.
+		</flag>
+	</use>
 </pkgmetadata>