gentoo auto-resync : 01:08:2022 - 09:15:08

author: V3n3RiX <venerix@koprulu.sector> 2022-08-01 09:15:09 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-01 09:15:09 +0100
commit: a9b37934d0877c4249ea35c9e9c5b8cf3b836c9e (patch)
tree: ff0becf8e678416d9170f38891942c5df6c2557c
parent: 0c764edfecb7e9e124d4669acd98bed09e23b6c0 (diff)
123 files changed, 636 insertions, 909 deletions
diff --git a/Manifest b/Manifest
index 710c60390ad8..5026a2d96f8a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29659 BLAKE2B 3791009adddc0b1ef08c5d06bfefed203e1bbc4ac8228802b83986db84ef56f2d1a40c070f90dd7695551e70e7fbd816450adad9cb8eb4612bb5172647aaa6f8 SHA512 25f487b03cd49540177866d81cc03f53fc1683b6f91ef49c1b226972578e37f0bf111a2dad973804fc58e6c7455ecaa5ff9ce20b40cb2adaf59c7625218732bc
-TIMESTAMP 2022-08-01T01:39:46Z
+MANIFEST Manifest.files.gz 29642 BLAKE2B 4d8470940d923ec8709374e4d099bc4be8ad751a8fd05d8c3f208aa37f056019f2e96973de029ff3660dc2a20612c2442bc79f5b4a230b3dc0bb0d35a969b4fd SHA512 73a5738b372b62c0c18ad41925f4c831c42b0fa918b24dd0cbcb1b59d230dda091924719f771da1a03d1f6f9e0aab60c3237e5436d17a151f70dc7dd69a803fa
+TIMESTAMP 2022-08-01T07:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLnLuJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLng0BfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA7cw/+M+7N5tIwIcuQLAPE+zWtDc5myLpiOwIyyq4wphyvyUQBhttXYSlbTN0j
-gaMq4/FdphX0zF6tRAMZf0WnxKU1nHHfuSmyOZU9Owc8uDxF03gNmlq6AliKiuGP
-kKxc4zmzLBzFS98sD7v/Qo4lNG/uGobUE02NoZIgjSVfVb4IKNcuNfXX2QM0q47b
-cvK52e/yHeclEGokYZDW8gKdA2U4odfUlFDBOci5oL+r4Iq20S5mrJ8fAA5vPynD
-swk6LQ8qcKhhHmLIwpUPGj9NoEVt1cb1i3FmlYMkSAQRYyG/dvHtnmbZUxqoMkUV
-+T66xSWsMpJ0DFxEzqw7LATCWWHraUIHEnWFrdMFXrMsMAW6pBpI3ZvyebOIN9lI
-7xFlcR334KY8TuRlZvHuIqGlE8ACCjsHRR/vWAflmD6kCpU2rD6MoyzKxo2Ek5xh
-LJe1tFdI1lKbpxBIY/YnaVnNQ83NX6qEaYunmtVO8ZjFiDMe5/yTT74eaLC11mmo
-CEf4/5tXwsuzbpTgeAPrK3ILbnOBvU+Fzn8rDrVWLL9fSaGregJ4QdYb3Edu3Fcs
-D6wh72mM1FMFIytxtup04/yhdUbz4CUeuEW5W4dR862VaF5OZtBTTif+30WJIn6Y
-2HqxgOP8JnesKz5yA5lXuWAofJuJ8l5g0/uD94+KIRAZKw+nCRo=
-=USJQ
+klCnCBAAiDVWX/T/7/Io/kFY164zayzcXxfE2jzpzXC1op+K2owmr1k85vSFeJjX
+Bqaz8B4/nnRc1FxCOp/QAfMHjSaQcH7PX2UYDbS7ChMrhtx0t9pKslX+TqtZ1jHJ
+w4E9iTtHWX0KQECehNJUijfLFBR0FtCQWYv+7l7hPLq31YjXxOYT89+B6bv42fMf
+ASm9VRtWO3WZRcqZkOwuodG6JeIgKN3O5ArKN2q+5cL0QzwaOOVkyGSJxEIZmHgt
+svGNs9AEjUAJwgv4lXMYbA8xnB3cjiOM5WvDvHCHvqR/ibmAGaexITTYm3L/gbFx
+pEz4q9xqSy2JsrrLPYEUo9rnB2iOYiucMgGKiGhIwGOqae+D1jqhj77DQmr7XZ2D
+YKAl4Mpiv5ZbZILYPMQgtHvEFFvFjUXKqb/ik4yatlfaEb1o8ridDyWSGIHeZsSF
+17qGodgMnd+PHhhRyy0Nj2Ka823AZBxnYoQA3jWJxduYGybVnMz5HKDqw2FbYYe/
+50OAPUMH6UI7olw0DVwPKtATNb8xZ6M/DD13//9xN7Igr9MYzh6LSJy1BL3GSKQc
+kJHBxx9bmCwlA54/MaEPxizrd5iS36FwHcb+UHL66hJNB7KHN14yRSO0gTyvlL5k
+3y3CykjnorTYjI8h24Y++SspMA1OeoYlzx12yxONAeTPJPhYro0=
+=ZrfH
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7f4e55297748..86149a029115 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c6366591a265..a1e20583a7ec 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/tc-play/Manifest b/app-crypt/tc-play/Manifest
index 62e9c892bfed..0fb176a289d3 100644
--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@@ -1,4 +1,7 @@
 AUX tc-play-2.0-build.patch 677 BLAKE2B 1b0f8372a6e94a7ff2cc3c1236855d6d1973172b78586e6ee72f29723841aa700ece23be1c985b00c37196da20ea18c1b30f13d0e00fa8de6bf603cfce769110 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b
+AUX tc-play-3.3-ldflags.patch 480 BLAKE2B 3d2309cc506eea800c7cc2333d746f96d7e8c25d3a74cf2f2c669536e1e7fc6a3f6632d7720e41f9a39bef57fc8628b74034c0dd45113a4909728cef41afee9f SHA512 d878cef17e2a7ce417f33d19f6d54c00b2c4c6994f77a747686b69ffc3a378c951c215a17b7cb30d5fe026877358359141a276b93d6abbabf950b4894d31d491
 DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
-EBUILD tc-play-2.0-r1.ebuild 1091 BLAKE2B fa20c56eb48cd82e71023fc434fd4fd6d77578a5ea40d521cdecb209a5f16cd867749bdd4e0f8376e4ffe8a9928b146b0d202c2d92e3ea7a95634bd8564e6781 SHA512 198c3a2b0d0c0c91d1ff69eacd36f27a5e68ee3cffdb567226aa17a577cc5cf9ee52b55c0696c290153eeef702a9144cb9d85928a86b9b52ef2169c8f2625c95
+DIST tc-play-3.3.tar.gz 2591752 BLAKE2B c02489d6e291dfc1425745af86506e72fda7f67dba0668b9250a85604ba301761b5bbbad6927238042a0f89da1035d9e3275006e34e895835a53cdc24974f419 SHA512 78cc84b1ca333e6760b87dfd22035a027bea8d562201c028247e9cfc4377260490cdc42236ef1eeb1c263a49ca1654d8ae637abdf1b4e507f958bc780fc85d94
+EBUILD tc-play-2.0-r2.ebuild 1073 BLAKE2B 048fa78747be7f9565216cb957ebc8d24d1732ef5d8b1663935c1d84bd00a56485ef5b3119d4cc98ca70dc4b9282a66ee68985c8921b66076424d1d628f14971 SHA512 d6c300ccc813cec15b1803144e92d53980db531ba962e771cb7abd1ea143e05b226cffe5d7d7426bbf86b67150acb1ee3e53fc0866c0e0ea7d389a4e2048e5cc
+EBUILD tc-play-3.3.ebuild 1084 BLAKE2B bb097cc904f223029ea6ea4209c207659fab1ea95b6db35f6a20605701eebb61c31b6f2a9f5b4f35ac98bbe255cfd9456843394732b923d07a0ab1f0cf46154d SHA512 281031b618f0a8a0f72c7df8a626264f07122aa061e77a1c0ba0862c79c5fc30d2e4477817741e9ecdacabf8e4d0c839c0326578b97eca5ce8d917d7d27ce15d
 MISC metadata.xml 252 BLAKE2B 555780b1a53410dc9c4d9157d8995e674e5306af2df14855c098124f3eb3a705007fc9d6122108f6ca8f842b968335e8a2c1866fde46d73801a9fb5eaabcd057 SHA512 1c6cddedeba42c9c2c82d30e312f953f0cee04bce36a70fbd1586dceb92407324b274de60d55f58251065d61ee186769e55b7a0d2cfc8cbff6c7e816015742f1
diff --git a/app-crypt/tc-play/files/tc-play-3.3-ldflags.patch b/app-crypt/tc-play/files/tc-play-3.3-ldflags.patch
new file mode 100644
index 000000000000..5976ecdd4d81
--- /dev/null
+++ b/app-crypt/tc-play/files/tc-play-3.3-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.classic
++++ b/Makefile.classic
+@@ -84,7 +84,7 @@ all: tcplay libtcplay.so libtcplay.a
+ 	$(CC) $(COMMON_CFLAGS) $(CFLAGS)   -c -o $@ $<
+ 
+ tcplay: $(OBJS_PROG)
+-	$(CC) $(COMMON_CFLAGS) $(CFLAGS)   -o tcplay $(OBJS_PROG) $(LIBS)
++	$(CC) $(COMMON_CFLAGS) $(CFLAGS)   -o tcplay $(LDFLAGS) $(OBJS_PROG) $(LIBS)
+ 
+ libtcplay.so.$(MAJ_VER).$(MIN_VER): $(OBJS_LIB)
+ 	$(CC) -shared -Wl,-version-script=tcplay.map -Wl,-soname=libtcplay.so.$(MAJ_VER).$(MIN_VER)  $(LDFLAGS) \
diff --git a/app-crypt/tc-play/tc-play-2.0-r1.ebuild b/app-crypt/tc-play/tc-play-2.0-r2.ebuild
index 401465c26b69..244696e5f144 100644
--- a/app-crypt/tc-play/tc-play-2.0-r1.ebuild
+++ b/app-crypt/tc-play/tc-play-2.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs multilib-minimal
+inherit toolchain-funcs
 
-DESCRIPTION="a free, pretty much fully featured and stable TrueCrypt implementation"
+DESCRIPTION="A free, pretty much fully featured and stable TrueCrypt implementation"
 HOMEPAGE="https://github.com/bwalex/tc-play"
 SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -15,19 +15,18 @@ KEYWORDS="~amd64"
 IUSE="gnutls"
 
 DEPEND="
+	dev-libs/libgcrypt:=
 	dev-libs/libgpg-error
-	sys-fs/lvm2
 	sys-apps/util-linux
-	dev-libs/libgcrypt:0
+	sys-fs/lvm2
 	gnutls? ( net-libs/gnutls )
 	!gnutls? (
-		dev-libs/openssl:0=
-	)"
+		dev-libs/openssl:=
+	)
+"
 RDEPEND="${DEPEND}"
 
-DOCS=(
-	README.md
-)
+DOCS=( README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
diff --git a/app-crypt/tc-play/tc-play-3.3.ebuild b/app-crypt/tc-play/tc-play-3.3.ebuild
new file mode 100644
index 000000000000..bb69d8e37d7b
--- /dev/null
+++ b/app-crypt/tc-play/tc-play-3.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A free, pretty much fully featured and stable TrueCrypt implementation"
+HOMEPAGE="https://github.com/bwalex/tc-play"
+SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnutls"
+
+DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	sys-apps/util-linux
+	sys-fs/lvm2
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		dev-libs/openssl:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-ldflags.patch
+)
+
+src_configure() {
+	local backend="openssl"
+	use gnutls && local backend="gcrypt"
+
+	EXTRA_MAKE_FLAGS=(
+		PBKDF_BACKEND="${backend}"
+		WARNFLAGS=""
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR)"
+		PREFIX=/usr
+		LIBDIR=/usr/$(get_libdir)
+	)
+}
+
+src_compile() {
+	emake -f Makefile.classic \
+		tcplay \
+		"${EXTRA_MAKE_FLAGS[@]}"
+}
+
+src_install() {
+	emake -f Makefile.classic \
+		"${EXTRA_MAKE_FLAGS[@]}" \
+		install_program \
+		DESTDIR="${ED}"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b668a9789332..73bed4160d86 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cadubi/Manifest b/app-misc/cadubi/Manifest
index a43edf49cc1b..b57eb0ec8c49 100644
--- a/app-misc/cadubi/Manifest
+++ b/app-misc/cadubi/Manifest
@@ -1,6 +1,3 @@
-AUX cadubi-1.3-helpfile.patch 351 BLAKE2B 1dae10ad3b58bfc21b0c1ffcccbaec6c41de3433fad5657ed02273fb0f91e3e0ad3c15292c8bc5cca5850cbd0ad41d3fed8705f50f22431908565f5f66e27da6 SHA512 36c2af2d77a58d5091b7171495a8d788e219e65a664fe0bfd55800a2aacaac04db5e2d249c6bc8737336c43e2852687f7fee7da4510597d64b40abe4843cdac3
 DIST cadubi-1.3.4.tar.gz 65661 BLAKE2B 239cedfe50fba79bcfe250a2b646f851ef06bdae18260aeab2d10b8889dcc0d9d086f3edc8b594b3199aaa23f85ab3bd3393d63428ea545893f41a723063c9a0 SHA512 02a8e6d49f4892294d0c8fdffa7b6032ed7529bf0869681e9b760ed5c227905cca829d1f4e049400789d69c1251f4df714bf36d5c42dc778ac37e89cf753b45a
-DIST cadubi-1.3.tar.gz 12559 BLAKE2B d1a32d602c00d76717e8e6cdf8d376dca12f9f55f9375bb0b8ea781cf923cfb90789cc011a3ab33960339ced3c05c668f6c6ec6e5b33ca89f7eda27c47789639 SHA512 e3b5190850bd4d579934bd5825db2b8bde5a46158862ec66b8604999344138477c0fb3fad34dc186ed9dd67dfbdcacf12763f76adbdfbd0cc4dbf6b51ad53bc7
-EBUILD cadubi-1.3.4.ebuild 644 BLAKE2B 53b769e0ec44fb4af4b7f62a5b099966ad01fbefe0cc6b51a0734abee7fe84224a8a81a6d7d033e5419cb23c7059438329921e8013db050c11f5084cea3874a6 SHA512 8b0f1c0ff9672dab4b9302bdc362d7bdadf9762efb110a586887d8f892635ef51f2de274ea2d9e6270071fffea66256bfd4b5136f35c8e078ee018b93c621332
-EBUILD cadubi-1.3.ebuild 574 BLAKE2B 690a332da44371b7fab741801b9cc0465962db1d5a6b2e51e53688a06f3a3c4ebfd70a4282921aa174839de0de3c05cbc81864b91d6f59fbd6d82dbb3a4342ba SHA512 804928407e3d0e042b1b1395720f373992a21c2037066771d1480b3cc3079c38e22ecad4101b55124f2c2a277e16e9f24bf741bb0df32f146d509b78bb303be0
+EBUILD cadubi-1.3.4.ebuild 643 BLAKE2B 93d766d2dd2bb645c6dc39f458fcf0d62448bd871e4399e272407e8f05a51ba388156114e622a577885d718c32526361f805abc7176685c51b3c32a2b11ac564 SHA512 8608a34dc778a18dd9b4e330a39d602444b93931077b5657ea5f1afc8f39022c3e719ed05d22fc1301b0babdb811b7dd7fed0cf79a961504f0ec62ee2bae61aa
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-misc/cadubi/cadubi-1.3.4.ebuild b/app-misc/cadubi/cadubi-1.3.4.ebuild
index 18411e59d8d4..5252c05491e2 100644
--- a/app-misc/cadubi/cadubi-1.3.4.ebuild
+++ b/app-misc/cadubi/cadubi-1.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/statico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 
 RDEPEND="dev-lang/perl
 	>=dev-perl/TermReadKey-2.21"
diff --git a/app-misc/cadubi/cadubi-1.3.ebuild b/app-misc/cadubi/cadubi-1.3.ebuild
deleted file mode 100644
index 9e51a1ee8b47..000000000000
--- a/app-misc/cadubi/cadubi-1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An application that allows you to draw ASCII-Art images"
-HOMEPAGE="http://langworth.com/CadubiProject"
-SRC_URI="http://langworth.com/downloads/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	>=dev-perl/TermReadKey-2.21"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-helpfile.patch
-}
-
-src_install() {
-	dobin cadubi
-	insinto /usr/$(get_libdir)/${PN}
-	doins help.txt
-	dodoc README
-}
diff --git a/app-misc/cadubi/files/cadubi-1.3-helpfile.patch b/app-misc/cadubi/files/cadubi-1.3-helpfile.patch
deleted file mode 100644
index fd54d5c8bfb1..000000000000
--- a/app-misc/cadubi/files/cadubi-1.3-helpfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cadubi.orig	2004-03-29 22:36:24.280138064 +0200
-+++ b/cadubi	2004-03-29 22:39:34.473224320 +0200
-@@ -18,7 +18,7 @@
- # (sorry guys, i wrote this years before i had the remotest clue as to
- #  what the hell i was doing)
- use FindBin qw($Bin);
--$HELPFILE = "$Bin/help.txt";
-+$HELPFILE = "$Bin/../lib/cadubi/help.txt";
- 
- # other stuff
- $DEBUG = 0;
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b14f517e4a61..70496d5a24fc 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 664bdfc5df86..478aea6debaa 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,3 +1,3 @@
 DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
-EBUILD cb2bib-2.0.0-r1.ebuild 1722 BLAKE2B 303e4032f56190f35d682423fdfeb0dd56014dcbbfd6ed7ce1e238c4035ac791a61d7d9157df1cb173a30e850a2ab9441c5e2612af4719f941cc93529d4ac52d SHA512 bbf29ab8a1cadddbf313196b86ff777c8abedc709d44a152e04d3c2523f05e895b2d0edc5e12af24ce8402405c000870467021573bc1dcb2f0c987ae17c4218a
+EBUILD cb2bib-2.0.0-r1.ebuild 1703 BLAKE2B a956403c519d57c739efbb860f2ab401a627872489600168ef2ff1d663189660cd3468e7db7e8b1effb7f771656d338ccbd09e6d863c63a8ff55661fc6ece278 SHA512 1bc1392d3067e65495eb7aec1155a1ea4a60ded72458bf7aecefff4506e9b85133d8b03730d994abc1041a669afbdeb684290cfa8c9cb4f3739135e9ee7fa537
 MISC metadata.xml 325 BLAKE2B 8850ff77c21aac4fbdb46f2fc250c1dc30c6b10c44b372d1f6f6066a38e347f5d16299401a68229e3b146c60f3b5e037b71e177d362dd48fdc8b11bc1318159a SHA512 b52e56621a395b99a021255f20505298d02e5a4e420cf7d60d23d1c76b842a799bb14c4639aff5da9d070c68d9642adfbf5c1aa26158ee11a2f7d59191cb2479
diff --git a/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
index 746edabdcd52..a46e68c271d4 100644
--- a/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
+++ b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,6 +51,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_desktop_database_update
+
 	elog "For best functionality, emerge the following packages:"
 	elog "    app-text/poppler[utils] - for data import from PDF files"
 	elog "    app-text/dvipdfm        - for data import from DVI files"
@@ -62,10 +64,6 @@ pkg_postinst() {
 	elog "                              nice printing through the shell script bib2pdf"
 }
 
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
 pkg_postrm() {
 	xdg_desktop_database_update
 }
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 2d1a792e6ad3..4d13cdc62b93 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,5 +1,6 @@
 DIST html-xml-utils-7.7.tar.gz 403664 BLAKE2B cdb97003bb6fb0138910f8f00b9612db3eb8ed4fa0ee81f27260e8907c088e14ac010f2862839355a4a6c0eca49508ad47c4e26f1c1c62e178c3b0e880ed124d SHA512 72b71982717de11b3b5f601a157a04bb6ecc235db6810a0dd830ad7682ed16cd6a928730013cfc918f722e1e5f03c357cd2545806288986797230f9d04175460
 DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930
 EBUILD html-xml-utils-7.7.ebuild 706 BLAKE2B b6eb99787e84991903117b2b40bc75aea37751b36fae817bcc13c60aec820ff607097860ba1c0088922344755dc483cd9d9ea48eceb18022e04d6a5b99ea9fc7 SHA512 07fe7f249953e71fb1a2481dc5f69b518ff74bc02760101dc508087f9d45bf1be9c267d07a9f53d72e2784675222d721b5b493ff3273786ad2550171309689f4
+EBUILD html-xml-utils-7.8-r1.ebuild 640 BLAKE2B b2b7f16a5be3954c8b0e34a1424bd4ef3b6228da753fa5e0dec887fba9e4178d7d26f2f0bc05831440ec40dd3239bdaf2319881794ab8547c53d9aa34934972d SHA512 328a06a4459d779fa73cde26dbc447c6bd2a485efd82d9376719e631435ebcd5730ae757921e3e72f35643196f8a57d5374ea6ce0792902ef59ec57c64cb5ab4
 EBUILD html-xml-utils-7.8.ebuild 710 BLAKE2B 80933c3811d0657e262d6d35f7a18e98059a6af02ccd36dcc0ad7b85c69a08f9fc0a1e37651c5886b817cf83ca389f940b0ab71405033f3a3d94eef7527b8fc2 SHA512 8cbce0f907935e8dd9a396631cbd43b803834cfd43d02aad04af2892cd820c40f4d77b3283985be7e91204d456857e9a1e9f9fde91d8b9a7bd98a195b379b857
 MISC metadata.xml 221 BLAKE2B b43b26fbdad8e1ac12cf97bc9bfbf06f5633feefed4f3e7c9623dcf4c45b97a3b753f8c8787d267f6cf6412878f4f5893a5201279401571ca7e53bc255296324 SHA512 5b5336bc7e4015c10967f6a0f8525f2235a438789cfbaa08b8261eea6fa2019191de60e3ec310660e0e5eb931835004b9db604dd18278822cf9d0254469a0bad
diff --git a/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
new file mode 100644
index 000000000000..28ec0c74a63f
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+HOMEPAGE="https://www.w3.org/Tools/HTML-XML-utils/"
+SRC_URI="https://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	net-dns/libidn2:=
+	net-misc/curl
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+src_test() {
+	# Lots of tests lack a shebang and use bashisms
+	emake check SHELL="${BROOT}"/bin/bash
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4a5c31333d52..c9511a36208b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index eca3e8da886a..799158251d77 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -4,6 +4,6 @@ DIST i18n-1.8.11.tar.gz 67964 BLAKE2B e603077c6eb02f6fd89bafd6c06f85c72528d5eb43
 DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
 EBUILD i18n-1.11.0.ebuild 1601 BLAKE2B 44db7ccc33bc7f9cbc4f30c3ad4885433f67f182203d2a1bd3d23a529c08b29dcc07e70f7fc69830bb99128a2f36af5a88ac91248fadbd04eaf31361dcc64b66 SHA512 822a94f5d4c750ecf01e8e6d54757b9a349c78d5aed7eb7feb0a456ee19ad8540745e23089630f8f3a0bc7bb799770dcf7cab95e4d05d1d53fde36be0ec09d93
 EBUILD i18n-1.12.0.ebuild 1602 BLAKE2B 262896e601d62888eab4499838bd66295f16c9ff23e950e8b7ee7f03f09ec1321f502e35835d578728a7537b8708ece64cf0a81e640c9ba76f21536eb74290d5 SHA512 b7e645b57f597c2270375c4e30d016b034674854cc436d60584d01ebf662cd462a9bb09e994a793b1c27dc14802fe30eab12e3051fe99687d68e0ee1db441228
-EBUILD i18n-1.8.11.ebuild 1505 BLAKE2B 4eabe14818127f8d172fe27f4e1252ac600e9f28cd57cca7407b5d2394a1cd930293b6b13c1270943492b97848e27154e3b50b821c5a309f8e1b797ee220d012 SHA512 7220fa5307976cf6bf4bf15ff9fcc92137e93499bfeb92b57a0788c555afac137a71520ae31ba6bd91ff3361b5fda143ed10ec68a5c2ccf7df3b8d980560061a
-EBUILD i18n-1.8.9.ebuild 1571 BLAKE2B a12efebaa78afc758b65b6bd82dd0a3a9909ae9f7f11bee834f5a22bb4691ce69f671b597a9abbfc439e785a89d966be38b6f4c901d3f98c5f89af8085f5b161 SHA512 a4ae786b0b6b2bda3585285f4209044a2a8584b9ee55279fb36cb5f108988f172c81de57bb066ddf8d497e7ef489b51cf6166cc190b427bd5a7856cd3a5da4f7
+EBUILD i18n-1.8.11.ebuild 1533 BLAKE2B f93b8c879fc26ae371c30783401cccd2aeab071d2863d63ddf81357195f951583f674733a7db51332548638a80e4b6d81e3ad09a333c2ba0c7631876653c2e4f SHA512 61da58c4bcbbb3335bb365d9c9215132a8950e9e62210402abd2703556e157100760315a652483c4884d5928c41b99eb46114f2c7ef027aaa6f5bd0b21144860
+EBUILD i18n-1.8.9.ebuild 1599 BLAKE2B a0eaa41f76701c995f05daf74474b11be99f6d8a391a1688071c7881cc5c1e4e45dc1b56d387644a852a7ec2a47c432eebb1a20b6bd38b6d7a58dd53f753ce43 SHA512 1ca99f590342e8e87b4d3c407f82c577067bacffd80f6877f0dd4b72efd50bb15bb4496d1207b5f742bb9838b8a816c2efad26adf4ab1742be930e3f67cfc975
 MISC metadata.xml 341 BLAKE2B 88504d4f80239252fd3d4d82c5636bd4656f1063e337fbdf37baf23bd109abe7aa74090b07f90e27d9350c8eee2c342b4d1bdd38feb438ce2236c9c9b094d606 SHA512 86b7231bcadd93247b82ef706ad9ba12f77306d7c6f08065ed3f95bc46c2662a8e1535364fa25419612359d11cd84d26da818e2d9be5e931fa6203b6e63f2f73
diff --git a/dev-ruby/i18n/i18n-1.8.11.ebuild b/dev-ruby/i18n/i18n-1.8.11.ebuild
index 5df517227b9e..8737c1e0cb24 100644
--- a/dev-ruby/i18n/i18n-1.8.11.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.11.ebuild
@@ -26,6 +26,7 @@ ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
 ruby_add_bdepend "test? (
 	>=dev-ruby/activesupport-5.1
 	dev-ruby/bundler
+	>=dev-ruby/minitest-5.14:5
 	>=dev-ruby/mocha-1.7.0
 	dev-ruby/test_declarative )"
 
diff --git a/dev-ruby/i18n/i18n-1.8.9.ebuild b/dev-ruby/i18n/i18n-1.8.9.ebuild
index 31067be5e225..2e76f10e4bb3 100644
--- a/dev-ruby/i18n/i18n-1.8.9.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
 ruby_add_bdepend "test? (
 	>=dev-ruby/activesupport-5.1
 	dev-ruby/bundler
+	>=dev-ruby/minitest-5.14:5
 	>=dev-ruby/mocha-1.7.0
 	dev-ruby/test_declarative )"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ab1988a4c1a0..0f7a7f7511a0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2bce04844794..a76a7b33d3b1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -10,6 +10,7 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.22.2.tar.gz 9779456 BLAKE2B 5f1c76344fe2d6fba012b0d745dc990ec1ed4bf32c99beac1e538f4b83c1d695aee757d2780e635b67c0a185935a6a70b344a733259e3a91d01c4b83e94e2730 SHA512 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f
 DIST cmake-3.22.4.tar.gz 9781548 BLAKE2B d07172091c8ff695f9af398321e4bf7b64643e9186c4e882c5fb15ae1026a306bce61b6f410a858ab580c5d8ea7b9d03c901e2c3ac1e6cf841b6ad969261b96f SHA512 4fc04ec3077b261fe252d26d18e81271975db0bb237686c0e0e774d180e6c7fdfb0275092c21569674ad0ca53218a8c6c5638a5fe5c46a988362b0083e3d40c4
+DIST cmake-3.22.6.tar.gz 9785574 BLAKE2B 7098bd32e6e5297ad27822a5e8358e0af2d916047af2e6e6bdb0b1c8e8b461c3588b8d174d6f7722a51748d47a761893108cfada9b7c19667f3143cdc5618cd3 SHA512 097e04c6f106c6020b8f145c822727a4cc79aaa234c77a9550208b5fe7787b68488dc18e5fcae0f111e20f8492294766ff396933bee687ee8ddb7bb94b71dcf8
 DIST cmake-3.23.1-SHA-256.txt 1452 BLAKE2B 8cce350435aeffdb7b903d87be611ed0362f601f7cfcff96f444859e40227b46e03baac6427587cafec79e9e1c8ab7ac4ee3dc915131c13badf2bcac99e1e8b7 SHA512 fd2dec42f51344a15d1a8e6afd35e96399765c5283925c4708aed5fa84117d0415ef014652cc740600bf75265baadac0559b6b8b1a0e60342a6e88eb61cbb4e5
 DIST cmake-3.23.1-SHA-256.txt.asc 833 BLAKE2B 28ce9f5c99b263895ad19f9df43050156ad399846daf03be96b9c4439c41d57e9c26244ab872692e98db321ba919639881d68b81237a9f443316cfa0aea1b8af SHA512 55b1808668b17a3bee0055e3736b6312e3260297ee02137e6bd90ba7a75d2a3e094e06fbe16cd299325f0c191a5f5924fadd075e5edbe3275933356df7b11b12
 DIST cmake-3.23.1.tar.gz 9982020 BLAKE2B a51eedeb78657caf86409ea8bdf4e61b09c66c6a0f3102c9b9ed42976a239f9c4561d7168b4bb24152b80cd773505166ca87e241dad3b36919b5e26573fb149e SHA512 94893f888c0cbfc58e54a0bd65d6c0697fe4a0e95c678b7cb35e7dc8854d57eb360bfc952750f97983348817f847f6df85903f21a5857b1a3880b2a7eb6cc029
@@ -21,6 +22,7 @@ DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7a
 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
 EBUILD cmake-3.22.2.ebuild 7052 BLAKE2B b0c8b15546a0216be79e66918de373cf6eb45eb080fb2871aa543f7518f71876bc79df21e894cfdfbe921718bf30d2915c9242a03cbcc4f19b955a2f2b9d8d85 SHA512 d2627f09f761e83363ef1a0a960dc4660d71160a47329f141cca9c9d0404d784719b258123db1716aec885d091f55206cc85f732b4235f0d19bee4e4e5c28d33
 EBUILD cmake-3.22.4.ebuild 6820 BLAKE2B 4e924937ebf2892082c9f8ac216a47376a6aad3a72872dcb8698bcd558acbc0f28e9cbb2a8653543db8fd8c75795c335835c77239e5139e66f8c196df20e4998 SHA512 b9cf3defba50e16668e2c9d04e67d2d8e7f287a68805ff0388cee0c497d592d5d6a76a7653d3a09133224b89a5b670faf54cacdb203c37d1bc567818cb4beb4c
+EBUILD cmake-3.22.6.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d
 EBUILD cmake-3.23.1.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
 EBUILD cmake-3.23.2.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
 EBUILD cmake-3.23.3.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
diff --git a/dev-util/cmake/cmake-3.22.6.ebuild b/dev-util/cmake/cmake-3.22.6.ebuild
new file mode 100644
index 000000000000..0d8e28da59fd
--- /dev/null
+++ b/dev-util/cmake/cmake-3.22.6.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 101434fd9ec0..5b9cc1c3270c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 7724ec7ae148..e77679267d0a 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -3,6 +3,6 @@ AUX rcs-5.10.0-test-t632.patch 976 BLAKE2B 95837ba618cf67ffb46c58b9389933615874e
 AUX rcs-5.10.0-test-t808.patch 895 BLAKE2B 77f406a10101aac745b5ce8eef14514eb4b7722a0b8091f3e39b2ad5db8fc5e569aa51abcccbf90c7278a3dfd3a84b1e95c4c949c8140b1f84a9fe9c37cfe686 SHA512 15e81e6eb3520101237bbfd6d45fcf80155084f13f892d1ac38dc216e7f5aac1e2a469a9546dea8711dcbfba37b8079a6a9c93f50b0387bd936323aa456605e7
 DIST rcs-5.10.0.tar.xz 890872 BLAKE2B 32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba SHA512 d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
 DIST rcs-5.10.1.tar.lz 917331 BLAKE2B bf439b2bbb6d5d427f28b13d739f2a5902aa3113e958528028ff553007ad124a8c386141e10ff2d0157468d893e1da4a19240acb373a3f375aa21d97c187a4dd SHA512 4d3755d704a05da8582acb78a83845885f34b3144af6d19c568e6707831563b077ec5603a12f5d4de6ec583d0886d3a8ccc7ee0e1f10070f9e6de142198cd530
-EBUILD rcs-5.10.0.ebuild 1180 BLAKE2B 98558347c366a83d9facbf21c586d6e1b16cc33618c5a565e251e4708d9d2737b3ebaefb2fc747e99aa668ad3cff699bf481b342e1ab53a44edce19efe368a7c SHA512 1ffe48b9104d994e1df676adc57adb76e19da0b41bd9b192cd42c57ec63e1d6e4717ba0fa41140fd771383d1c4b558b1f585ee6e2fcb893861062f8123fdb4e3
-EBUILD rcs-5.10.1.ebuild 1103 BLAKE2B 0f095db9a0610d7bd44ee09a525a6e745349f8b55a7f940b05694d3420c91cb74a6caa5791deb416d17fe5a8b2fab028f8735d465ac181ea1b36f445bc67b8da SHA512 c27b292d770642695e2fc82d5a4ba9e8211459ea895235b9f39f61a89ba0dd4beb5b0236e3b33fb056e616a6ba9090deef992e70d21174241c508c4e77313b1f
+EBUILD rcs-5.10.0.ebuild 1151 BLAKE2B 9e977bf0f3c1a2c9d96dd313f276e4870f0f064156f0bbcc569e875dde96cf478f24a023543208f7d5ec81fae9181845da8f17d083fba611ede2b9423a1b46d3 SHA512 ec5f4d46c0f17e5701ee22839e04f838938af79b22fe3df9500f2a0ab04a356dcf784ca9103ed7c38d067b21147bfefa00bb2c34e7d5a928285086704178120a
+EBUILD rcs-5.10.1.ebuild 1061 BLAKE2B 5358a1196858557e1c102a636ae75af5cbb9da46a2536a3e0b09f9dabf2b70e9890589c80722bdf66de5fb7cbb7a190f186339cf5cddf71b365065ea7c553992 SHA512 c1d892eec7f2d0e253754b55fdb854ec191b57cab7ccefcb3ebc8f8ad8f6f07b942e01b8ac8fa8b4b709ca393d127459615df13085aa56ea273af6745e0f4444
 MISC metadata.xml 615 BLAKE2B 4e00cd56075f6ac650d317e09a31bf40b3d64c098ff472f032bbeed9e30188e98e81fc0175cbf9d0a565cdc4bcdac6e6da6d551d48e6cb9fb82e45de0c840f42 SHA512 c51c417b5440c81d4517879495ba0f8b941d8201089bb09499045ba7b16a4de1c29938e9124d43e244639cbd2177cfaa3b8432686a7ce23421e7386471fa4032
diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
index 5bd7347fc901..7a3d453f1e0d 100644
--- a/dev-vcs/rcs/rcs-5.10.0.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.0.ebuild
@@ -38,10 +38,6 @@ src_configure() {
 }
 
 src_test() {
-	emake check
-}
-
-src_test() {
 	# Tests attempt to call rcs commands on /dev/null and /tmp.
 	# https://bugs.gentoo.org/840173
 	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
diff --git a/dev-vcs/rcs/rcs-5.10.1.ebuild b/dev-vcs/rcs/rcs-5.10.1.ebuild
index d004ccb4c1a6..414c74be6d61 100644
--- a/dev-vcs/rcs/rcs-5.10.1.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/rcs/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="sys-apps/diffutils
@@ -47,7 +47,6 @@ src_install() {
 
 	if use doc; then
 		emake -C doc html
-		rm -R "${ED}"/usr/share/doc/rcs || die
 		mv doc/rcs.html doc/html || die
 		dodoc -r doc/html/
 	fi
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 49fea52d0a4b..d4be6b73e229 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 5b63f15b20b6..46230054ead5 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-characters-42.0.tar.xz 561308 BLAKE2B 454d2bbdc5e8486f50b3f21bba4a65aa0920654c2cc3376cdda62070011c1a296f240632ddcd412add7953fccb2780ba37ac3196aef138e9771cdf5a81061441 SHA512 ba6fa07ff90ede1cba0e541f0c4bda63f1d6122c18af44dafa3bfb0fa6f9580a3cd8580d0a12510e2eb95afedb4b0f350accc37eee85c3aa4422a66732dff404
-EBUILD gnome-characters-42.0.ebuild 886 BLAKE2B 8b8dca7593698dc38ede5d17edbed25f9214c77ea9d93782a81ba30240d03cfc43f3dd468945016b2e85ec15375da4f279efa7572571e1664dc55700c3274671 SHA512 683a6a69912d74edac3951c1885f8aac9c46c6cd7c385003553882c66530ec1fb6dd35b5db84f57dd1dc960e786531344591de7087f0fd32c39a5776c95fa80e
+EBUILD gnome-characters-42.0-r1.ebuild 884 BLAKE2B 76ceec92de38d58d52dc48ea3797bd8896d84b0d24f819ed9628ef03956914b03eb61ed08a66c0323a221eb401fa65a86431918476e409b306a81a639b4ccd8e SHA512 fea6c0e581ca05cb9e062b6a848e31a35d4d6f1e14e9c33019a6d19a9640a0d23e2993bfb796e2cd29a30cf2a3b6e36f53511e75b2ecb6578195fa5c7bab43e7
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-42.0-r1.ebuild
index 7faa01532845..fa1867e3367f 100644
--- a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-42.0-r1.ebuild
@@ -36,7 +36,7 @@ pkg_postinst() {
 	gnome2_schemas_update
 }
 
-pkg_postinst() {
+pkg_postrm() {
 	xdg_pkg_postrm
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/Manifest b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
index d6bee4ed70ed..9e9196b70b38 100644
--- a/gnome-extra/gnome-shell-extension-pop-shell/Manifest
+++ b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz 1018667 BLAKE2B d09becddcab7f24b8efcdb8a6c3b9a121de1654d54c792865e28a08412feeb58d3bbd7698811b840eb7873d3ca7854469f96d1b43bc806b2b3e680b2493beffe SHA512 72cb8a71560d97c92a44d988e8eb0293012565d4eea7b49d6d83be6b844f182db22c7c9d41e68ea3fd272ef7f8b88d97afbce3f867e899e162032507be082a40
 DIST gnome-shell-extension-pop-shell-1.2.0_p20210727.tar.gz 1025387 BLAKE2B b25c3af33c6549d08e68de2971090dc74f4bdd719889bcd7397b38a9b275792fb6bdfed9e3baaa7a2c45074baf9c64c31d365809332f689f31c23b2e755793df SHA512 8a3ec6999a2b4ab9ffb67ec87e05482c489acc82ce0bd1a76e17e2ed2e4b8acc2ea22974c9363e1af7a9ec03409fe933109b2451c9be21a541f9dede32d48753
-EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild 1361 BLAKE2B 7d04ee00310ec3ebd1883e10ca1692ac6fad08a31f99d06524e706c356c3f6ffee318ad670a986a91c37d8377221f1bd8801cce4a69a248a4d90ef9ff2bf72f8 SHA512 2be8e6a86aa47dc721ba0b18e134219a7f6b5d2bcb04b31a67bd83d6c521b5aea7ebdca1d43e083f7a0a018b95599f7425bed4604a3f2595c86b747803058a0e
-EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild 1369 BLAKE2B b38069b6f437624fae1f2e5696fd12e57bac7d79eeb1dc37ec4e9facf866f1653e6feb3bf0f346d5e3cec5b5bf7d263418713bf98394e47f1e141fe78c0e441f SHA512 b1aef522d97ee80b7137b00ad24a858f511a89ed7afaa78224a6965513a10a04af779807b9ed719ebfd9b392991a31e8e94df527ac28afc6292e5fd3dca894c3
+EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210603-r1.ebuild 1364 BLAKE2B 863c685ba9945da08b4f276d47be70304a340148fe8fe275a11654c1cfd3ee4c7bb9487855df05709096ede30877fd746c2a0dec086cfa43507d032d4495a5e8 SHA512 411ef70763cd1283bb19b418d6811e521d648facfeaf339eac4053499bdd99a9ab4f204bfab81f827d802d3b3326e943ddaa43638fe487a5beaa4058b24220fe
+EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210727-r1.ebuild 1372 BLAKE2B ca135481e6c64119cf34f721d4490ee55171189f466cc9cb155a84b4da2b722c122fd72e25386cae74b465f06cd9ea635b17d63be31f388e69f9f2e8018e06be SHA512 0ff60352274067da0188e8edfefa02a2743e7578a3b2bd3b1fcdcf6b1e350cd3ea9375e67755073e0d582ac5137a6fac27510cdf8e3abbb24a7b7281d7d7fd17
 MISC metadata.xml 353 BLAKE2B 14624f84ae637882e3da8efbfe936fbdeb47a6c0421a40d134060b7edfe284c5f875a58ec4d855d59ac6139bd476ec06b77e6e2fcd7feb660cadc9ac8a2571c8 SHA512 65f21654736f6d2a04d9ba021931945858d61a0e1a9253fc8117b772ab605f4daaac092b16bb49c11cd71e940279902aed1956f91aa7b4cbd5588cec315d7955
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603-r1.ebuild
index 24e32f5e37a1..9d93e0234ede 100644
--- a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
+++ b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,7 +53,7 @@ pkg_postinst() {
 	optfeature gnome-extra/gnome-shell-extensions "better tiling via native-window-placement"
 }
 
-pkg_postinst() {
+pkg_postrm() {
 	ebegin "Updating list of installed extensions"
 	eselect gnome-shell-extensions update
 	eend $?
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727-r1.ebuild
index 5d7561746a4b..f31ee1c0fd0e 100644
--- a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild
+++ b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,7 +53,7 @@ pkg_postinst() {
 	optfeature gnome-extra/gnome-shell-extensions "better tiling via native-window-placement"
 }
 
-pkg_postinst() {
+pkg_postrm() {
 	ebegin "Updating list of installed extensions"
 	eselect gnome-shell-extensions update
 	eend $?
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0f3c5a35ba2d..f1748cc74e62 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 89d3065dab7a..0da35e3cc51e 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
 DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900 SHA512 bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.0.1.tar.gz 29291175 BLAKE2B a30512dbceba7eb339164cfe77685e6ccd8338c297a080341236e90bbcf7451eb27d5227422e040d92ff4267f4d97c377a66cdcaff45ea2b1e69de0602047ae0 SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c
+DIST harfbuzz-5.1.0.tar.gz 29358116 BLAKE2B 006e66e9c76b505214b948c7c8756af38171b85cc865923e4665a4dd3eb14d89d20456ad4490b11208d57d056b087da78e1742141e41f8a22e644f20d3ea4851 SHA512 bdd7c2ca0b6f2a3a3fffbf0324d3c8bfd64a1753314048f6f67f901d4098e90054eeda9155d134f03c5d3ddefb15e087f872d2d87b2ace07bac6625fb43c7f3e
 EBUILD harfbuzz-4.3.0.ebuild 2568 BLAKE2B cd0fd13772b43e47a8c90a5912ed5839c09599766e865e5fd7633a0694b9f379ad4c19c7c4b28af4aebaa839e5eefe45138254b075954427a9b105fa0247a52c SHA512 6d4ab2b384c575df4da788cb4042ce3ea88010d1513d1a84a340881e26efeefec5eb46179758eb06b377bedeba5ad999f69ef9a5e33c0779c4d25394b9d1aaf7
 EBUILD harfbuzz-4.4.1.ebuild 2570 BLAKE2B 771a4e5fbbbac3dbd3748cb1e3b33572da5acf9b75dcdfc7f16f77d5b0379a4c94ffde5e2f3019d9fba85a30b87a688ae79b78e1cdddd92e7f343796f859e22b SHA512 5583bef9bd707c760f69e975164a9a643a6f1b173f0a64428bad9562d4e75c8f4d43ce5d0dbd1ad9893a960515000190a7b820642160c9f47ab52b8c859c7029
 EBUILD harfbuzz-5.0.1.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
+EBUILD harfbuzz-5.1.0.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 EBUILD harfbuzz-9999.ebuild 2582 BLAKE2B a1bf615e3b0e26a5e44504f9b65795e6431df96e35a8dc1cfc1f03f97538b2297aa1fba6a2a137cda94b3b41d2b29683d15447fa69fc9f55e9bc27a85424a91c SHA512 b50293b623a32972a5ba1c3dfa2a0aa44ec076bdb2f44cea30131309ab238cf816bf87c3740dd567e042c8a053514e49d02f3eec5ed14ff5bd47f4f426a58325
 MISC metadata.xml 763 BLAKE2B cb8679b8a67d692c73f1dc48facf6a98a442d34b51a90b2236070919b737d22e38a15babe5847cf4d30d4630c66d803f9d6e684c5e8b8b87a199d5d471a9e35c SHA512 0d87926c3e7a475bc84859d630cc8ed1b62e5766856e15b9aa74c87b5fd22345a9c05951508ccecadbea3513afdfd2244b1dbfbec8b41022d413a1401701e55e
diff --git a/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
new file mode 100644
index 000000000000..c3af9764765b
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/4.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# bug #726120
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die
+
+	# bug #618772
+	append-cxxflags -std=c++14
+
+	# bug #790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug #762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-Dchafa="disabled"
+
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature cairo)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+	)
+
+	meson_src_configure
+}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 0417ee4a5a27..91b0e7604b69 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -5,5 +5,5 @@ DIST imlib2-1.9.1.tar.xz 813104 BLAKE2B ef7369d2285bd5b207f646ebb12492323203306c
 EBUILD imlib2-1.7.1-r2.ebuild 2284 BLAKE2B 2a28255e74bda9cc886d9d48d92da8bcdc9902d3a19c18278ed04985020a07c70f1ab766e2fecbeae2f229cb81ad87f05ac074d3d802d9f3f832fc0731135664 SHA512 6a2e1b5fdeb0a18c82232c576030b50856d7ff17a7176db10a9897e38f0a9da8c6c14177362e30c2c21c4c0d93792c8b91014ab366f1124b818fb260151c1d06
 EBUILD imlib2-1.7.5.ebuild 2318 BLAKE2B f3f1dc9bf3219b184b000f6238c9a18d9a62c66e2849ef5785547e0fd6e80b41f5a8f2cc21dbe66197b0ea8132c1dfd43170c845ae1a384dbb2286764091f5b2 SHA512 e1bc42489625c97160f896596704d89c89bf98165bd3c43aa2e42ab7c632ba577bd58f3ce9cfaca4c447b912ecdb120b10579e7c7c4726a5acd97ad942f32d52
 EBUILD imlib2-1.9.0.ebuild 2741 BLAKE2B 9dbc2077cef7239bf52159a8a463fedfb24f31f2bc9293099b5887d83a29c292a90c8f09f112b38b26f6d2de88a8b683e299459ffa96411a69c1862b2b18cad6 SHA512 9b3530db07cb4a0bff96c0f872238191020e374ba93549f9ec8efe210aa330ec24375b1c8587ad4876ef427c016094e967162d944a45fcb1724c7a07875846ea
-EBUILD imlib2-1.9.1.ebuild 2934 BLAKE2B bf166874672905bd40eb9bdcb205a395f51906d1f0b32385e74eef041be95924e9584c571d26f37b5c7b8a931d212c6c4c8504080050ed36df054e50fd2bf601 SHA512 5f7fce911e1505d3e1e839cded5ac42f7c03f92f5b11f0102fbe5b24c00ceb0eee27f067bc9792408b395b1728f647a71bf622c252cc2373f34bc937ceb95395
+EBUILD imlib2-1.9.1.ebuild 2987 BLAKE2B 27f77e2d4f86034fb991d781b8a5546dc6d551a12a460bb0104bd832762b3fe0d2771465d66e020f0559c8151d5cce6b5fde5b33cc317aeb7074ae21c95c9562 SHA512 e9e2b19dd8fe3cf9c862c569945392d525014e671cfe839f9ba05defca68d3ee07b202f32e1326b8b17efe41faadd0141526cf28d0e6d0169ad1fa5575842cf3
 MISC metadata.xml 3239 BLAKE2B c9f5fc4da42d70d17c90ebb4752029dfb25347c1efa3383a123bccbb3b0340d4ae5840d8a5e6f430c3320e902e4de02aa4078e49a0466145697f319b2ab218fb SHA512 e66ee16c627990f3b60408103e536bc9a458ed052df39107bd4db13ab203df9e4d45b91603e9c11ac202f40b00f7fb7d693c130ed7e1ebc415142deaf4d81d26
diff --git a/media-libs/imlib2/imlib2-1.9.1.ebuild b/media-libs/imlib2/imlib2-1.9.1.ebuild
index ed5bfb90c18c..ece031d80baa 100644
--- a/media-libs/imlib2/imlib2-1.9.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.9.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Must be bumped with media-plugins/imlib2_loaders!
+
 inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5e78aa9ae0f5..7d59b5af59cf 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 6374eb82b9bb..31b73f7ef66a 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -1,6 +1,4 @@
 AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41ca8685b4292aac804af52f2f4754b557b69663d4240e6690fe4ab19a15b72459cea321944afacf2a179f3 SHA512 2a028d57fbd76290bc300d0546b52571b6c7c29cf8d2f53cb859b5250c55ae631fe15c8589a1b11c5fef5dacff2ad8535dbfae6c8b2b72dc8a4dc795dfc658b6
-DIST mpc-0.33.tar.xz 45044 BLAKE2B 220848e088964297fbaddeedf61d5ddc90386df360a6af81b2d3753517f7ee36ff3d9462242f38b17c991996927a7d1fc253e1006253f2f875023ddb75a800c2 SHA512 d3247dfb54ac3c95caf5666088968a952b33eb7e8f941bca4f3715603839cf5a1bc5300488c78fdce6e38f612b243f2252ea682b8d0fec9f230acd760bf3560c
 DIST mpc-0.34.tar.xz 47940 BLAKE2B 709f54ceebd66f703e5b1bf6ff8deb890e484fdc29c0b2198922763e347caac89d6eec5f74101f9fa860436e7493e2b02cc6b1b26e800e783546fe5a0c6e0d8f SHA512 d43d5547134ffb24f2a2972882f6e264c1011a94d1033369d329487f59414d32d9842835afdd05da96fd8ed28f823d2ae2f46d8d8d24b68f3695badca2a9bbb2
-EBUILD mpc-0.33.ebuild 1243 BLAKE2B 8a90bbeda815f0eebede83fdf9b88771e71b8ed8aea90f8d5449721ed295ed1eb3e47c03dff1029f283e73bb213d163fca68a3513beb3fa189c33d4f72355b58 SHA512 d7aadcb92132c4d961c294c6dcd41ac8e86c33762508c76c4b5e4f55e42cb9596213390b2cea47b11e4479853f4cedae4a6fd49cd2dea79da3e2d3fed81ccc83
 EBUILD mpc-0.34.ebuild 1243 BLAKE2B 88afd89d0ea34b0dacb2c2d6e12bdb283c9b303d427cc0d05ee446cf8407ab3d7edc76a5ef85b1224e96f1fa04546482185756a95f420473cb9296099883465d SHA512 0ba644440527692c718f35acb2976347e6ac40b14415c2b46e834b52386ec0b98b99d553cb0663e40f7cfc4e17896412a439d6ae4966cdb4da0e774989564b21
 MISC metadata.xml 253 BLAKE2B 28ffabdefb9bd43e6269d7a64025a2fa69e2c2fe578b98092c970a155f685ef5aa7865f4984bc8001a4c3f5b35cfd8137c9a94ec461c40a3e5d14a8349720a3b SHA512 cf54ea17afbfc9172877f6c715973917f70e34e4f7dfe613efb0e0c937d34e8c4211964b52c138d19005ed54fc12c6047da15b6a82c12e94ae939284289a4dc5
diff --git a/media-sound/mpc/mpc-0.33.ebuild b/media-sound/mpc/mpc-0.33.ebuild
deleted file mode 100644
index e3d7fa17a19f..000000000000
--- a/media-sound/mpc/mpc-0.33.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 meson
-
-DESCRIPTION="Commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc iconv test"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	iconv? ( virtual/libiconv )
-	test? ( dev-libs/check )
-"
-DEPEND="media-libs/libmpdclient"
-RDEPEND="${DEPEND}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.31-nodoc.patch" )
-
-src_prepare() {
-	default
-
-	# use correct docdir
-	sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
-		-i meson.build || die
-
-	# use correct (html) docdir
-	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
-		-i doc/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc enabled disabled)
-		-Diconv=$(usex iconv enabled disabled)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newbashcomp contrib/mpc-completion.bash mpc
-}
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 39c7d7a78d86..b667d21439b4 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -2,8 +2,6 @@ AUX mpdscribble-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch 682 BLA
 AUX mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch 1407 BLAKE2B 9c70170c57f1eb1c43e22e824f1c208bc4c72ad751e10f68195e42fd331342bca4bc3066af671382258102bc63dd75386ead151e0ca8218e8df945373293db7a SHA512 d6c5582a7f4fc2059679ac8bba7dadd63133166522d63efce0c4adb77162fcedc8bee9d03cf4d192d9c6f97e827225b1993d0831e752f5c54f4badbab278a269
 AUX mpdscribble-0.23-gcc12-time.patch 1184 BLAKE2B efe572750084d7c625007280fbb3a7e5703aecc37e81a0a0f4b6d81bfa9d2b855e684c8da0d64d5c825306a1cd9ed7d23d2a62ba7c7eb9f9bd9f0f33c1491f7f SHA512 cafc2aaa95f4e9a184ae1724c1343991ee9f2b4937ae09ca41abdbf2e3d09263229c3d9070bf8b8ac37b0d2a583d8c6bb20dcb49ef55e5aaa9323851584302d8
 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43
-DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
 DIST mpdscribble-0.24.tar.xz 69856 BLAKE2B 84143ed7f6978aff32fa759bbe90c934ba5c58df294d375921ffb1cd45de13ecd867fb832940088228fdad4c09948cd82c8dfe9b7fe77d6652743d522bfde8b7 SHA512 cca57f54f69ec1c870805cc58057e6325b6f5897370c315dcd6a64c5dd28ac07fdbddaa8b56f8c1fd88e71d27505f1a87decd68fbdff1f3fe1eaadec8ae80dae
-EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131
 EBUILD mpdscribble-0.24.ebuild 1047 BLAKE2B 8c3a92af3ab1e334441400af0d444541643a77afc6f0f67a63fbcf06e3093baf08d9358d999cee5e3282007e06ac4577dceea2be6241936e3d36bb1f81ef9b22 SHA512 02c44d3f3f384a00c7d002f4d9340b0dadcd37a40cba38688aa81164be0743af29df19941ead65052821f04335ea39792e7ca5564d61b788bb870a4cd45d034a
 MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443
diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
deleted file mode 100644
index 29b2c66fd7d6..000000000000
--- a/media-sound/mpdscribble/mpdscribble-0.22.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An MPD client that submits information to Audioscrobbler"
-HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+curl"
-
-RDEPEND="dev-libs/glib:2
-	media-libs/libmpdclient
-	curl? ( net-misc/curl )
-	!curl? ( net-libs/libsoup:2.4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-http-client=$(usex curl curl soup)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	keepdir /var/cache/mpdscribble
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 4377653a62fd..9c9286f87701 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index faca9c8fecb4..ced2bdda1d3a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 01:39:42 +0000
+Mon, 01 Aug 2022 07:39:39 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3bf951e177ff..088b3cbb765f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-08-01T01:39:45Z
+TIMESTAMP 2022-08-01T07:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLnLuFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLngz9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCtwg/+JbFqFtYgHR3qqjxeHhBHge5qR/gtEyPxztKFsk8M/aQ5YGUHdmjgzrdf
-5mMAexK3ayVKbpv3UsNmYZf/6ZrgzfkV4i5Awlf4ANPNtmjTsMlOiCduMphC29SC
-fEzHrMxK+h8IHdahb8I/L4/wxDu80Jm5XluZKQ4j4OK+0+ZYJLJnEvKq20KmWARZ
-QAS9MVsz30+Q3O9bJvh+4g54Gpmcmis1LDf4VUf95E+XsPF001HMbENsEaeC/GEm
-3qk5mZyK+3rG3vXoGZ6elijUL8ogUEAUPsRhZH9y8T5EIt5i2o3nCtSENd7WwCwg
-88aeMEa4YFtFkQg+05wkvbmhCQzIEDEHVZbPSTp7RkVXXbF0D2zc27aCMPasP34k
-GoMHN7nJRylVNwrzrvQWRMh9SpNAkMU8+1ewXPtUBjx16ig3lIWrk9wPJShlGcFd
-EqGl+BMW6MtYW6v/E58QFGhsU9qTIVeBvO2EAIjdB9fiNUdCLFSyyjC8DLpCD/S1
-FaqM93GDRjZ0ZyfmKW8ch0vOfqRZvF+ZlzJAeIu2iRnRt894Nr0IWg+Op0ssLlpk
-3sRNNC6R8t5h2b796Qrynk9ym8UJI6VqRYZ2G25rwZmtuB3gEuLJvXHpvVzLuBwA
-TLvGNIQzspFogMxS7Gb5xSpZZQKSxrQt+zhKfwy2C8XFceTVGwA=
-=3+Mg
+klBgSA/+IRV3D4QDOTtnsOhVYORZ3xUsp5mkTmh9mP8yEML3a8YStlx1X7aXqqCm
+WpkhcLykqnUYxiKVvH6K1DswqxrDxfTokxb4zrpIxSYcD3csb8o+crWEpnunZh1/
+gYY7uo/asnkHaNENA5tAntupoipOtWJkEoqAD85YKdXl878150riU5XeyOhiah6h
+1+33osHSNfJrlFi1Err9JfbnYwJ/qK/kaoSxeoqHlW0ONi6H2dem5asSlTfLWueM
+dCFT7uzE/YiGtboUHWKWvzooqqPzqsfhE+9HJK6ZlsmNT4br+fQnVcZ5m/qWKHUH
+mE2xAice9k1IOVK11VAuOA2stwpOSweTY5DAWhE1ZFoYC+boHy9oXoV0YnhiJpIw
+kccDUCA3F27HMGbNsl5T33EIgYdPa3cQ8df0RlQGonO26Re6Qhyoru/AT7S6LPHs
+WGKcYzEpQuHDNqOMKKCdJ7qGqocf7234+lgrT7G5wiDaGUNjzTYQDw2hNd97qvxL
+b7fPB9LKN8SOkRm6Y0knLiEY+tecyVOaXWWCsTptQmRDnPhJYEoD9obl/uevOz4Q
+TDzen5bdb+H1lVJhM74pnmBXMYIaI85AGcMjLwOXVYy/32x+3nsPjz/h2rtRNIRc
+43RgfkxJdrPiBAz8HLIsvG4Akrg4F2iUuTUOW7c1eCzjNS/sOYI=
+=qR2/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index faca9c8fecb4..702e5740af7c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 01:39:42 +0000
+Mon, 01 Aug 2022 07:39:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8abb42fdb322..d75c0d423d01 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0e157a23b2b0..203ce803f51a 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/tc-play-2.0-r1 b/metadata/md5-cache/app-crypt/tc-play-2.0-r1
deleted file mode 100644
index 6887e2cd53a4..000000000000
--- a/metadata/md5-cache/app-crypt/tc-play-2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/libgpg-error sys-fs/lvm2 sys-apps/util-linux dev-libs/libgcrypt:0 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= )
-DESCRIPTION=a free, pretty much fully featured and stable TrueCrypt implementation
-EAPI=7
-HOMEPAGE=https://github.com/bwalex/tc-play
-INHERIT=toolchain-funcs multilib-minimal
-IUSE=gnutls abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/libgpg-error sys-fs/lvm2 sys-apps/util-linux dev-libs/libgcrypt:0 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://github.com/bwalex/tc-play/archive/v2.0.tar.gz -> tc-play-2.0.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c6d14df347dc0b7ad22da315767b6310
diff --git a/metadata/md5-cache/app-crypt/tc-play-2.0-r2 b/metadata/md5-cache/app-crypt/tc-play-2.0-r2
new file mode 100644
index 000000000000..567e8894e86a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tc-play-2.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=dev-libs/libgcrypt:= dev-libs/libgpg-error sys-apps/util-linux sys-fs/lvm2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:= )
+DESCRIPTION=A free, pretty much fully featured and stable TrueCrypt implementation
+EAPI=8
+HOMEPAGE=https://github.com/bwalex/tc-play
+INHERIT=toolchain-funcs
+IUSE=gnutls
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/libgcrypt:= dev-libs/libgpg-error sys-apps/util-linux sys-fs/lvm2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/bwalex/tc-play/archive/v2.0.tar.gz -> tc-play-2.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3ef0689dfbf1d6bd1f37b7cb2631cd67
diff --git a/metadata/md5-cache/app-crypt/tc-play-3.3 b/metadata/md5-cache/app-crypt/tc-play-3.3
new file mode 100644
index 000000000000..4601186b0c76
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tc-play-3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-libs/libgcrypt:= dev-libs/libgpg-error sys-apps/util-linux sys-fs/lvm2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:= )
+DESCRIPTION=A free, pretty much fully featured and stable TrueCrypt implementation
+EAPI=8
+HOMEPAGE=https://github.com/bwalex/tc-play
+INHERIT=toolchain-funcs
+IUSE=gnutls
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/libgcrypt:= dev-libs/libgpg-error sys-apps/util-linux sys-fs/lvm2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/bwalex/tc-play/archive/v3.3.tar.gz -> tc-play-3.3.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=65ff232e01fdbe241f960dc5a57e81d0
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 7f4484e9904f..153bb549a7b5 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/cadubi-1.3 b/metadata/md5-cache/app-misc/cadubi-1.3
deleted file mode 100644
index 63ccb6e3b30c..000000000000
--- a/metadata/md5-cache/app-misc/cadubi-1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl >=dev-perl/TermReadKey-2.21
-DESCRIPTION=An application that allows you to draw ASCII-Art images
-EAPI=6
-HOMEPAGE=http://langworth.com/CadubiProject
-KEYWORDS=~amd64 ppc ppc64 x86
-LICENSE=Artistic
-SLOT=0
-SRC_URI=http://langworth.com/downloads/cadubi-1.3.tar.gz
-_md5_=c116b211ef577c6ed28bdcedb8c9bb39
diff --git a/metadata/md5-cache/app-misc/cadubi-1.3.4 b/metadata/md5-cache/app-misc/cadubi-1.3.4
index d30255ccc155..f0d2b093ff86 100644
--- a/metadata/md5-cache/app-misc/cadubi-1.3.4
+++ b/metadata/md5-cache/app-misc/cadubi-1.3.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=An application that allows you to draw ASCII-Art images
 EAPI=8
 HOMEPAGE=https://github.com/statico/cadubi
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=Artistic
 RDEPEND=dev-lang/perl >=dev-perl/TermReadKey-2.21
 SLOT=0
 SRC_URI=https://github.com/statico/cadubi/archive/v1.3.4.tar.gz -> cadubi-1.3.4.tar.gz
-_md5_=b8071f79c78a947b86ef16e1e0d6773a
+_md5_=e222499f6d0cac8e8f08a894db20f574
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 4f81941f493a..71f7fc720775 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/cb2bib-2.0.0-r1 b/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
index 7ee153d98459..452ff2f9a046 100644
--- a/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
+++ b/metadata/md5-cache/app-text/cb2bib-2.0.0-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebengine:5[w
 SLOT=0
 SRC_URI=https://www.molspaces.com/dl/progs/cb2bib-2.0.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=125610adec86b95b3cc45533848beb31
+_md5_=5d08d5ad7e574a3c2c83fb18765a893b
diff --git a/metadata/md5-cache/app-text/html-xml-utils-7.8-r1 b/metadata/md5-cache/app-text/html-xml-utils-7.8-r1
new file mode 100644
index 000000000000..ac273d5b1bfd
--- /dev/null
+++ b/metadata/md5-cache/app-text/html-xml-utils-7.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare test
+DEPEND=net-dns/libidn2:= net-misc/curl
+DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
+EAPI=8
+HOMEPAGE=https://www.w3.org/Tools/HTML-XML-utils/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos
+LICENSE=W3C
+RDEPEND=net-dns/libidn2:= net-misc/curl
+SLOT=0
+SRC_URI=https://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.8.tar.gz
+_md5_=ea25f8fbfba230d382c122205d14a2cd
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 477727aa7c69..5c1b434ca293 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.11 b/metadata/md5-cache/dev-ruby/i18n-1.8.11
index 848688a9080c..b9db6e48a31a 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.11
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.11
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby26(-)] dev-ruby/test_declarative[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby27(-)] dev-ruby/test_declarative[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.14:5[ruby_targets_ruby26(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby26(-)] dev-ruby/test_declarative[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.14:5[ruby_targets_ruby27(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby27(-)] dev-ruby/test_declarative[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Add Internationalization support to your Ruby application
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.11.tar.gz -> i18n-1.8.11.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=26a9cb7cb3f441bd8a159875eca33dd7
+_md5_=b95e45d34392d73b53d35e8a1780beef
diff --git a/metadata/md5-cache/dev-ruby/i18n-1.8.9 b/metadata/md5-cache/dev-ruby/i18n-1.8.9
index 47c8b526ce9d..329082b6b68b 100644
--- a/metadata/md5-cache/dev-ruby/i18n-1.8.9
+++ b/metadata/md5-cache/dev-ruby/i18n-1.8.9
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby26(-)] dev-ruby/test_declarative[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby27(-)] dev-ruby/test_declarative[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.14:5[ruby_targets_ruby26(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby26(-)] dev-ruby/test_declarative[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/activesupport-5.1[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.14:5[ruby_targets_ruby27(-)] >=dev-ruby/mocha-1.7.0[ruby_targets_ruby27(-)] dev-ruby/test_declarative[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Add Internationalization support to your Ruby application
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v1.8.9.tar.gz -> i18n-1.8.9.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dd0c9ab7783dfa69f2f8d9b3774d9f67
+_md5_=a06b5e1e82e2ef1cdccc3b42a397785e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index bd97ea0da349..500969339f95 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cmake-3.22.6 b/metadata/md5-cache/dev-util/cmake-3.22.6
new file mode 100644
index 000000000000..24f151a1eae5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.22.6
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Cross platform Make
+EAPI=8
+HOMEPAGE=https://cmake.org/
+INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
+IUSE=doc emacs ncurses qt5 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.22/cmake-3.22.6.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f4a02749824230a2f648f7bba3fe9a00
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 175cc58081fd..9cb64ca5032c 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/rcs-5.10.0 b/metadata/md5-cache/dev-vcs/rcs-5.10.0
index 7b07592c73b7..84162b0137de 100644
--- a/metadata/md5-cache/dev-vcs/rcs-5.10.0
+++ b/metadata/md5-cache/dev-vcs/rcs-5.10.0
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/diffutils sys-apps/ed
 SLOT=0
 SRC_URI=mirror://gnu/rcs/rcs-5.10.0.tar.xz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f1117f7766ba6756845dad2dc751b43e
+_md5_=dfce50c16b98b993f8b34bdc83344374
diff --git a/metadata/md5-cache/dev-vcs/rcs-5.10.1 b/metadata/md5-cache/dev-vcs/rcs-5.10.1
index 7a1244543ca9..b4a85202b1d9 100644
--- a/metadata/md5-cache/dev-vcs/rcs-5.10.1
+++ b/metadata/md5-cache/dev-vcs/rcs-5.10.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/rcs/
 INHERIT=flag-o-matic unpacker
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=sys-apps/diffutils sys-apps/ed
 SLOT=0
 SRC_URI=mirror://gnu/rcs/rcs-5.10.1.tar.lz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
-_md5_=148e7f0663b5360552bf32eea42924b3
+_md5_=2f2f620528f327dc7e1a5ab83ede5e55
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index c143dd9139d7..8fbcdd2d9a5e 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-42.0 b/metadata/md5-cache/gnome-extra/gnome-characters-42.0-r1
index 751a52fe175b..548c5981a502 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-42.0-r1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspect
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/42/gnome-characters-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9636fdf5e99a2056211494c0695ce89c
+_md5_=edaca0449375198f836c00574f4e225b
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603-r1
index e6e147df108c..d227f53251d7 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603-r1
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/typescript
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Keyboard-driven layer for GNOME Shell with tiling support
 EAPI=7
 HOMEPAGE=https://github.com/pop-os/shell
@@ -10,4 +10,4 @@ RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40.1
 SLOT=0
 SRC_URI=https://github.com/pop-os/shell/archive/f7cbe060e8d293bfe3b0b759032a85773b542645.tar.gz -> gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0e0e0929d28647bde0668bfa1181af37
+_md5_=457b5780a986fe734c5c0cf1031557c7
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727-r1
index afffe3ce69c1..4380e0ba1a9d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727-r1
@@ -1,5 +1,5 @@
 BDEPEND=dev-lang/typescript
-DEFINED_PHASES=install postinst
+DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Keyboard-driven layer for GNOME Shell with tiling support
 EAPI=7
 HOMEPAGE=https://github.com/pop-os/shell
@@ -10,4 +10,4 @@ RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40.1
 SLOT=0
 SRC_URI=https://github.com/pop-os/shell/archive/475b49dc02386e26fbe6b91a559c77515d96caaf.tar.gz -> gnome-shell-extension-pop-shell-1.2.0_p20210727.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4240fedb8f4dc07f19e12985c69c0729
+_md5_=05bc6283650c75a2569035693570cffb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c40b4b1f6c0e..52c958e168be 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/harfbuzz-5.1.0 b/metadata/md5-cache/media-libs/harfbuzz-5.1.0
new file mode 100644
index 000000000000..af4c5584728f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-5.1.0
@@ -0,0 +1,17 @@
+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 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
+IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/4.0.0
+SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/5.1.0.tar.gz -> harfbuzz-5.1.0.tar.gz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7a30536d3eb3018d86f590f5db4e011a
diff --git a/metadata/md5-cache/media-libs/imlib2-1.9.1 b/metadata/md5-cache/media-libs/imlib2-1.9.1
index 377100c3ab9f..96ec0ad39b1e 100644
--- a/metadata/md5-cache/media-libs/imlib2-1.9.1
+++ b/metadata/md5-cache/media-libs/imlib2-1.9.1
@@ -13,4 +13,4 @@ REQUIRED_USE=shm? ( X )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/enlightenment/imlib2-1.9.1.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=233fd946888511ba59c752f65137338e
+_md5_=7146c268690144475f76a6c3fb5e4da7
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a0b71b9fbed5..e0cea89d27f7 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/mpc-0.33 b/metadata/md5-cache/media-sound/mpc-0.33
deleted file mode 100644
index 5ba3dabff883..000000000000
--- a/metadata/md5-cache/media-sound/mpc-0.33
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) iconv? ( virtual/libiconv ) test? ( dev-libs/check ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libmpdclient
-DESCRIPTION=Commandline client for Music Player Daemon (media-sound/mpd)
-EAPI=7
-HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc
-INHERIT=bash-completion-r1 meson
-IUSE=doc iconv test
-KEYWORDS=amd64 arm ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libmpdclient
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.33.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ea9782b60724e6416937768c8cc49722
diff --git a/metadata/md5-cache/media-sound/mpdscribble-0.22 b/metadata/md5-cache/media-sound/mpdscribble-0.22
deleted file mode 100644
index 51839bc646cd..000000000000
--- a/metadata/md5-cache/media-sound/mpdscribble-0.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 media-libs/libmpdclient curl? ( net-misc/curl ) !curl? ( net-libs/libsoup:2.4 ) virtual/pkgconfig
-DESCRIPTION=An MPD client that submits information to Audioscrobbler
-EAPI=6
-HOMEPAGE=https://www.musicpd.org/clients/mpdscribble/
-IUSE=+curl
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 media-libs/libmpdclient curl? ( net-misc/curl ) !curl? ( net-libs/libsoup:2.4 )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/mpdscribble/0.22/mpdscribble-0.22.tar.bz2
-_md5_=0d5766c96234bb169a1cfc6132275379
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 1ba05e94c53a..796678f56feb 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.13.4 b/metadata/md5-cache/net-analyzer/icinga2-2.13.4
index 6c68ca0c79f9..756369253c53 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.13.4
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.13.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://icinga.com/
 INHERIT=cmake systemd
 IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.66.0:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.13.4.tar.gz -> icinga2-2.13.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=45787f0ca30c48d11795e18c63fe2043
+_md5_=f470acb0bde9881132c25df90aa2a2e1
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 4700743700d5..71327a0cecb4 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/libsignon-glib-2.1 b/metadata/md5-cache/net-libs/libsignon-glib-2.1-r1
index 9f53628ddab6..19922f21b39e 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-2.1
+++ b/metadata/md5-cache/net-libs/libsignon-glib-2.1-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/-/archive/VERSION_2.1/libsignon-glib-VERSION_2.1.tar.gz -> libsignon-glib-2.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	1c07e7167d9ef851ad187f5f3f02d34d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=84a2f2a006ad44c502471196f7caf1e9
+_md5_=3054c8d4a3870d3b77e75cfff30749b3
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 8c3d6b6442ea..3dc67c2c3caf 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-42.2 b/metadata/md5-cache/sci-geosciences/gnome-maps-42.2-r1
index 97db908a0699..645a9617f863 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-42.2
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-42.2-r1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/42/gnome-maps-42.2.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	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=96752b8350a28359ac8e953e61fe7c29
+_md5_=1dc15ee7b7eb61c955b29e06e59330ce
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-42.3 b/metadata/md5-cache/sci-geosciences/gnome-maps-42.3-r1
index b6e1e05c9a05..5ecb3443e3ba 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-42.3
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-42.3-r1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/42/gnome-maps-42.3.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	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d783209e87dd57c29adde3a10890a305
+_md5_=c4f5344c14f8c76bc57839b2a278766a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b83d08322de8..e4e0035df672 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.32 b/metadata/md5-cache/sys-apps/portage-3.0.32
deleted file mode 100644
index 05039b16b9a9..000000000000
--- a/metadata/md5-cache/sys-apps/portage-3.0.32
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=The package management and distribution system for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/file-5.41 >=sys-apps/coreutils-6.4 )
-RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.32.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0318ef287fd876abaf14ed3550a2f4ef
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.33 b/metadata/md5-cache/sys-apps/portage-3.0.33
deleted file mode 100644
index 03f20e6c1cc2..000000000000
--- a/metadata/md5-cache/sys-apps/portage-3.0.33
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=The package management and distribution system for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/file-5.41 >=sys-apps/coreutils-6.4 )
-RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.33.tar.bz2
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c07f27909150a45e897f0a73f535fd7
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 1a7c4bc587fe..11b6da51efb3 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
index 95602bca6346..92d718e8a012 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.0.9999
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=545db828f9f41f473353b1695188029a
+_md5_=f3d6152a7366b1f6b7211ffa83e3f9a9
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 1ee2b83d9ee8..c04c75f05702 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/runit-2.1.2-r1 b/metadata/md5-cache/sys-process/runit-2.1.2-r1
index 704aa4089502..bc626e7c50ad 100644
--- a/metadata/md5-cache/sys-process/runit-2.1.2-r1
+++ b/metadata/md5-cache/sys-process/runit-2.1.2-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-apps/openrc
 SLOT=0
 SRC_URI=http://smarden.org/runit/runit-2.1.2.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f9ef3c1106368a9cf58613fb5d0b8d8b
+_md5_=6a1254c830486a636e8479aae1d4fc24
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 27c0163b13f4..53d7a4a7718f 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/icingaweb2-2.11.0 b/metadata/md5-cache/www-apps/icingaweb2-2.11.0
index d1f2e779879e..372a06fee5cc 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.11.0
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.11.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://www.icinga.org/
 INHERIT=depend.apache multilib
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) dev-libs/icinga-php-library dev-libs/icinga-php-thirdparty acct-group/icingacmd acct-group/icingaweb2 apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.11.0 -> icingaweb2-2.11.0.tar.gz
 _eclasses_=depend.apache	416d1c5005c5f4594e79812fb7323f0d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3d49a82cfd2c8bff9305a7c92d51f7f3
+_md5_=c800c276d1057bd101658f392d0c225b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index cf9aaf67dd76..a536f20a26fa 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14056 BLAKE2B 384ab1fa4a7f7fa60fa28f388fbf17530d39a6a06420e8f2936adf788e39eff3c93c062d5abaeeace41227318964140accd449e95c6b1abd99c33790b571a5b3 SHA512 8d70434ca6fc690e5e14608a138b2f6fb2a9f2975dd32475ff2d0054cfb0c075931ec146e77d9d54dd1c6888e2f888a3336c54a7e220c35ae2be9f9ad9b47b52
-TIMESTAMP 2022-08-01T01:39:45Z
+TIMESTAMP 2022-08-01T07:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLnLuFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLngz9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBqxRAAkSkh7hzquNh4nOvVu5vmvzfumwgOmidIh52oQAKml88CqeUsnSxqPVMt
-CJctVFVa9ajE9dOUMVwdAIw8IajGvcmVwCMFlmla/fbmm1857o5yi4RKzQCd2+V+
-Yi4VXdRu5dRmP3ABuYTWQ8cPA4vrtYV9dC5LsQkRByZ5etSR7GiMZDwsutCN7Bct
-XBI/uld5u/GuWeiiPjstWMMcIjAl+alHqzga6SeHc+dfH02lg86iZAptu7BdrWI/
-8mMYFziM3nJ1yVIPJnvkvl5FcPp4q3PVIaizSrt9CHpKzBb2iP+nwRoxgaOsB95P
-Ql7EySgzsRIlswNuWhdT5fdie7WpZAI0dRXPAK/L7IwZ79KLl7PkML5EkV7Lh8x7
-fI9JsGby9OoGylXKSEX03XRVJ3C4V815nwBXUQszL2bbML98Tqn7/2r8MsiK2DJo
-hKODP4fu2wfi28OzWIauKv5tRJ971WFzxEQMX8KxdtIHQj1lNsHRtsojP7bjkgY4
-9YSJQ3DDdLR/+DcGDCWTim7IkHLNV7QgA6lDNo7m89tP24G46bDQsRY/eI3MierM
-bmVZrDB71/5EfWPMieEi+IlGVmWefxjIbKKP/1A/mC6ZsbfroYi7PDTPs1sh/kZC
-PZU1W+ALuKTBPR0qfBwoeIYZGnCrVg98VME+jSamZASDnJ1NG9k=
-=NMbV
+klDN1A//eqtEDFtTVsAxGu+25IR0aKsk79+2zh5Uf4okxBkxfn5UZJKqgiu90La1
+6CpKlFCDQ8BdkTfZJI39Ro3lm2zGulridyIFKHh3DlV2VGJqiV9rgjGSo5ugcFVP
+c/geC9lxt9vbLtUE246mnd2jCws5dLIQRWUBbiwH+SVqWEiHvXFfNCV4NB2rYGqf
+XFZzFOiRjlOPQfI7DOaR4iKdDF2yqr+TTS0FMroSoseINsU4xZyexH0DM+c1JAFU
+6eQixD4ZfkXXuxi0cTMVIn2SnwDODTWYoz9LfETfHSa/yA5d1ZRmUXrL4u3JwYo9
+Mpn5CgH5v+O8MLFrNdi282jzLOJ/08nTmV9UX7biTn2+CSdvmEygMxOkOcx1JBaz
+lLd4jPmaguTtonBOVnVB/f+XWWgTkkAkqOQ5ugkfsMje5I+SMBmaJ48o23wAyAyJ
+b0tEmelDgvOqq+FyLjEUq2pHtntOYb7ylFTyOrXHZ0r3/d1DCQNTCLipmvJ1LVp7
+WXCEiHA2jIKJYSl8ZPQpo38/gd5cbVtcTvGgBg2+gB4HJCzCFM97Ip8Fh3oajweE
+WrBY+YsNTHaV3YvivjWMBDR5hBgYXIS9GoWayhZJhDBybspIxkCzjwg3HBuTa2if
+nV+ziBYM99ntyNtf5efIKtaM3PAJlQtAKMETnM8V93gEnm9LdBc=
+=91dc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index faca9c8fecb4..702e5740af7c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 01:39:42 +0000
+Mon, 01 Aug 2022 07:39:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3a26c1bd4954..931a41d5b82c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Aug  1 01:39:42 AM UTC 2022
+Mon Aug  1 07:39:39 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a3cc30df16ef..df385d04de50 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 01:45:01 +0000
+Mon, 01 Aug 2022 07:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 452f55b104d6..5345eebb6f60 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7a47e7342782b6fb15d60d17b9355b7fe486b013 1659309959 2022-07-31T23:25:59+00:00
+354a33d62f6d2ac03901d76c77a27fc75b88a340 1659337548 2022-08-01T07:05:48+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6763b963e6c0..f92a32840393 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659318001 Mon 01 Aug 2022 01:40:01 AM UTC
+1659339601 Mon 01 Aug 2022 07:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index faca9c8fecb4..ced2bdda1d3a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Aug 2022 01:39:42 +0000
+Mon, 01 Aug 2022 07:39:39 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 09e9ca1c3c2d..f4c0b9f06cc7 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 055b6df26c11..c7d243b22789 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,6 +3,6 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc
 DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72 SHA512 818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
 DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec SHA512 454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb
 EBUILD icinga2-2.13.3.ebuild 3992 BLAKE2B bd30da34efda8d4462a26c9341143d1448041dcf3bd478e9e40197ac5de8e75584bec8dac41a2c0eafd1e52243cf4a60c266052c715470ccbf640e13e823aa3b SHA512 fcff3842f02f39e902b1fa16a8fc5603fca0d021f9d17a137248c85b72cb3648df0869936e838b549889cfa61fa397e7dcf2db9ad502f854185e09a8c702ceb3
-EBUILD icinga2-2.13.4.ebuild 3994 BLAKE2B 1f6c3f53948145032d5f40342ddc0a48b39dcaf646f56b6d5ba38ff3b1ea8a1fc6f627a6e529ea2af5d157187491b0245ded84bc023463bc3f7866abbdf8c8e7 SHA512 d5f1bd8198b1ff7336a5ec23c77b5538e155769c4f901b1be333899090f869e51f7d3d451ed654cf78bb42790f300f07242241eec624d0173e24b26f30638655
+EBUILD icinga2-2.13.4.ebuild 3992 BLAKE2B bd30da34efda8d4462a26c9341143d1448041dcf3bd478e9e40197ac5de8e75584bec8dac41a2c0eafd1e52243cf4a60c266052c715470ccbf640e13e823aa3b SHA512 fcff3842f02f39e902b1fa16a8fc5603fca0d021f9d17a137248c85b72cb3648df0869936e838b549889cfa61fa397e7dcf2db9ad502f854185e09a8c702ceb3
 EBUILD icinga2-9999.ebuild 3994 BLAKE2B 1ab39f8060c4d052b299d79c4481edba30662e69754cc7595d267e3a68c743115341ca3ec0cfbc0e3f3d4122f27de9bf58b02ffc7942b5df2c6e18fde7f404ea SHA512 b0189c1ea6d4eaffdd0a9f749fb323f31810f51e5e7e71d951df7ef3b0aea9ec5e07f508177655692f853385c50c01a869a3608c590d15140edd82ac7d2364f2
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
index d9cef157f92b..39584c5c24c3 100644
--- a/net-analyzer/icinga2/icinga2-2.13.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7233ec75b79b..bf652812360a 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index fa18e98274ef..e97e5c082670 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
-EBUILD libsignon-glib-2.1.ebuild 1999 BLAKE2B d34bc22f220da08c2b3a361c248c15916f074627dc9b40aa8568dd2367fdc19cf410443233a434fc586f3c6bd0b5c38d069d766d13ac49cc8a9fc5f573f17d5e SHA512 cb4080eb511eea9545f479815fc39edea55db931bf54d002f4dbcdd6c1392ed0261105af91312f345a53c8c3940c84a4f721d8cc04d3a8bc77e6d46a9b395319
+EBUILD libsignon-glib-2.1-r1.ebuild 1996 BLAKE2B 7e4918b0af07a95c45afd7c9f0cb91dd778f226268c9a96bf206d1d45ea998d3af8805a463eaf8bb7f28abd57c71f623ce0ba70079e9155f1a49945b62944f4a SHA512 ea640bb3aa3378052cc5c57e2acc2ea35212da62adf1bf523a36aa5d547325c3244e86f033a8c1df48d3c3d33f7d8be4a57de34a1044e253398d75a0a0867196
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
index 67df5bba992c..1fee6ac93428 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -80,7 +80,7 @@ src_compile() {
 	fi
 }
 
-src_compile() {
+src_test() {
 	if use python; then
 		python_foreach_impl run_in_build_dir meson_src_test
 	else
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ebdef973f7f8..f30151cb1215 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 3f77959de322..b7c5e8b69690 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-maps-42.2.tar.xz 2317216 BLAKE2B 2a485c15ad203fb4518541a60231a0ed756ca3cf7abc524911a2294b3503077d0974ecc8690073e3967241a8769687a1524506a42bea8c473192128cd2ae9bb7 SHA512 87da3b6850d1a7ca4d90781089800f082026406555773ea1a9bac376b41e480eb4b5a10ec3f0a2f85de521e847489f4e761117a08e7125447aab7acf05720c1f
 DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
-EBUILD gnome-maps-42.2.ebuild 1511 BLAKE2B b5d321ede1447825f64ebb490007eb3d5f9dd85e406919c7c59ca2a56ba468a3088e4dee0917328a6116314a76bdb93ba2cc34ba456250765d767a3e47d85af7 SHA512 395b27a856ec65874c4058ca77da0cb97f671c5d36bf4dbb7d373cde9a69b0b02435f0663c47516bb2ad62d0b3328c7b181285276f34a9d5c7f28fd95b62d902
-EBUILD gnome-maps-42.3.ebuild 1513 BLAKE2B 0cae9b16d9347a46f0c532e674ae8f4fdf1ae749bbd0c3d0cca2b3fe7d8101255d1fbc18b9e130f2bdfdfae6c57db251bcb3f80545eaff58bf52c46561fe13c4 SHA512 215014a6ef523fe778a1e7a49401b8b23d51f61e0e2378577bfe732c5945b7ddb4d97be3b823dd0f7cede2a350ee19898a7b7111cfef89fddffb5b0606c1a011
+EBUILD gnome-maps-42.2-r1.ebuild 1509 BLAKE2B 7e6a1b9841f7cbe267f500d756bcf6899b29b00832ab1cb9c6cf3fd2c6770b244e880cfb554f0968184b3abdbb59d9e9b4114499a071fad2c81fdfda7d8d4b5e SHA512 936257f63b0c6643767b87f1954c7236310e6e0b4cc033a80a17ffe56ec39062e3f7a1037303c701d4ad5cdfd3cb5015dcdd66fe6c2e0d2488c5827bdb657c1f
+EBUILD gnome-maps-42.3-r1.ebuild 1511 BLAKE2B 5be70bbc6a86b2dd5a6961e2cd5b46f6dfdf20673100989571fb0b05039c0b4517449a49f8c45efa09aaec35bad6f454201fbe746aed505e9c319ddea653335a SHA512 5acd0600cc0488da70b1520a4957954ebb23aa63fa02c16c4c0d09bbbc8df1089acc07a210f55c301e36bfe38af3aa4ab96d6f16839d9c6eede55aa67a85f1bf
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.2-r1.ebuild
index 405947257539..d420eae7634f 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.2-r1.ebuild
@@ -50,7 +50,7 @@ pkg_postinst() {
 	gnome2_schemas_update
 }
 
-pkg_postinst() {
+pkg_postrm() {
 	xdg_pkg_postrm
 	gnome2_schemas_update
 }
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.3-r1.ebuild
index a8c7b50184bb..e7ed2d941f73 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-42.3.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.3-r1.ebuild
@@ -50,7 +50,7 @@ pkg_postinst() {
 	gnome2_schemas_update
 }
 
-pkg_postinst() {
+pkg_postrm() {
 	xdg_pkg_postrm
 	gnome2_schemas_update
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c085c13cd48f..b8ec06744387 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b34b9f6dc83e..842326f1f385 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,13 +5,9 @@ AUX 3.0.30-revert-run-warn.patch 2228 BLAKE2B 9845ed36d9d0e8ca966a711e08bf24d9f3
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 56939618f4915f77dca6bb85d4a7cf98e50133b524f68a0b192c0a928ca209a0cb944c174dda78f1b5a071c02c190857ea8a7ecd514301c45e897b302542f52e SHA512 accec770f63180b6d5d4cd08ef50f0cd01aa5701104156523f1a735d8ec3313a3b513629a33d8863285736515b6a3d56fc21498404da3a0f89b196655a98db7d
-DIST portage-3.0.32.tar.gz 1452442 BLAKE2B 9f46ba0651c742b447e04b6573ba5e9527399d80d3aede1cc47a7c08405befd3ce586f7f523111df9145ca19ffce89a1a563ee9329b093dfd6387f273e49290d SHA512 09e9bfc38a5fffb8ead2d67136c4aef006cd9b0922faf7f63fa8ee326e56389ec65199dc22c53e8bfcd6251e8e8309f8cef7045feab842b4bc8ddd3e0bc79fa0
-DIST portage-3.0.33.tar.bz2 1110583 BLAKE2B 9d8db052a7091f7b5c4ab77221fbfc98b4cfb738988597bf38d4e8311b57b5f8f5d99c9a285db934e1d46b03b4c8a39e3e0347c965d7c3fbbf568357588db2ff SHA512 28358fb1b1bb8634c9267ad84762549b499cf59e15a1e59f3db7d27a04b3325083457d3fc4af0fa4cf9574f8cd0349baaf0fccd49e8aa72963ebe61370f5c34b
 DIST portage-3.0.34.tar.bz2 1110794 BLAKE2B 32239a8319448e63fa249296b492c88504039cf5aabe3e1ffcb2423c95fd26a048d9717c8f673d670acf0f9fa290d12dbf194df08a5a0f11311db856e41ba714 SHA512 c3566a6bed5a87b7dc6882eeafe77b2511e5be3e4919159309303477ca97e1b5c1eb134fe5fc0d8a5f5c2880f1eb5c72592b8104a726bad5ed83b4ed2eed5193
 EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
 EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 0b3396401ef95f21383bc0c9792db80c491d9ea50ffa65985b34289171a20d738b4972fb599d5e1939fef4c60c14a3fec134161381b40ef105f99ba67f7afe7c SHA512 cfa11f597b58d814b8ed6efef30dd2b19935785d61595a2dfbb1220fa5c2417cb724af08cf390bc3896ccf2c68d2834e92cf9ec98e8e7fa3c2ee0a43c8cfad05
-EBUILD portage-3.0.32.ebuild 8817 BLAKE2B 816f4a039106f10e46cd588ade700518fc2de14d0c857f5177546aec055d36033779aa971b1b677ece6f677514262378bdf1d31d87a9bb22e0a9bb8c3d14986e SHA512 68f02f0a5a8b1b8a4ad6d1c077bd281d3c50b85d860fb953addb9e49db4e08348ab7b4ab11c69d0151a449a793bed5c6d537a96cad66f25278b36ec8e7fc4693
-EBUILD portage-3.0.33.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
 EBUILD portage-3.0.34.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
 EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.32.ebuild b/sys-apps/portage/portage-3.0.32.ebuild
deleted file mode 100644
index d5a59b7698c0..000000000000
--- a/sys-apps/portage/portage-3.0.32.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-# Switch back to bzip2 for next release
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	if ! use build; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.33.ebuild b/sys-apps/portage/portage-3.0.33.ebuild
deleted file mode 100644
index 26815216586a..000000000000
--- a/sys-apps/portage/portage-3.0.33.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
-
-DESCRIPTION="The package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		>=app-shells/bash-5.0:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=sec-keys/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		>=sys-apps/file-5.41
-		>=sys-apps/coreutils-6.4
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	if use native-extensions && tc-is-cross-compiler; then
-		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
-	fi
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	local PATCHES=(
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions && ! tc-is-cross-compiler; then
-		printf "[build_ext]\nportage_ext_modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	if ! use build; then
-		python_setup
-		local sitedir=$(python_get_sitedir)
-		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-		env -u DISTDIR \
-			-u PORTAGE_OVERRIDE_EPREFIX \
-			-u PORTAGE_REPOSITORIES \
-			-u PORTDIR \
-			-u PORTDIR_OVERLAY \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-		env -u FEATURES -u PORTAGE_REPOSITORIES \
-			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-	fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index f4db73f7a607..bb75dcf5f5f5 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index c80a2f98d5e0..a963d60f1a0c 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -9,5 +9,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD compiler-rt-13.0.1.ebuild 3868 BLAKE2B b2b643b850023513b69076bc791b22b74aa54445250cba334a2d3dfdc26a1ea11d30d1ce9df6cb2d1c813b66eaa59a130821470b3a3076237f9ef93d2919a124 SHA512 334a2609ae6882dbbb9caca5bb3bc7ba0a668f9a8f337570d54bde926d7ebfaa87fe4e53dddc73ea602b2d52e7537b9490f8936736480f1ddac6c9caf7b6832d
 EBUILD compiler-rt-14.0.4.ebuild 4017 BLAKE2B 9bb27fe3965eb71a40c3a9060e878e6cbefb5f3395b691a70ad6fc9ceeb352ae0d8275ce7165250c9857b8865367c9062c99dcef771e852830a171c0b0331d05 SHA512 3af70c7d10b15c324870b10368f66938402dd020ca9dfbe2aa82469442a76feeac9a09606e92a984fda7139a0779091ec0b96170a63abe95c014d90780788f8c
 EBUILD compiler-rt-14.0.6.ebuild 4019 BLAKE2B f97793688c6e2dd3f2874217813ee9759bb896e192e146a2bc17e97daa0d9f8d8708938c68ab1270ef9dc49eb52bb7c29b4edd94382993e8de0a73f006238d23 SHA512 73a150cb917587e1e9a0adc499ae6cb1d473e455400b1b19777b30dea72846f01114bc52018dda7ff7090ea43b365793ad5a3515e4601dbd9ba4226c62322c77
-EBUILD compiler-rt-15.0.0.9999.ebuild 3958 BLAKE2B 8ce1194a4434fbfefe9edca0ed102a920afa85bc56d2cb0ed89ea7e525f11bd559a963de68504be03cad930b2611a2424b5511f1c92f924d684ea6a98d2851f6 SHA512 90bc2a25edc6d8aad2b21172651d2d220109ecc18166820e9bcfec68dc2a8541bc249a017d855d466cd148ee3f6f970191ed92f714ed68670e763bdfd7c06e27
+EBUILD compiler-rt-15.0.0.9999.ebuild 3725 BLAKE2B e599809889557255e7f9f5017ef685d85e3894477db00681f35ef285af9f97043160b08dc99f4f972519109366ebfd1fed34bfe8b452d3ca96a12d57aaf5e948 SHA512 881f8d4a464e19425a265cdb18d99ce85357d4aa206f3e9cfdf26536a05537146e1232199ae35da7f9f95382a175ca89fe48a59351ca3706a82f537159284d29
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
index 8af221eaa8ad..8ef4aebf481d 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 	)
 "
 
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_COMPONENTS=( runtimes compiler-rt cmake llvm/cmake )
 LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
@@ -70,7 +70,6 @@ src_configure() {
 	# pre-set since we need to pass it to cmake
 	BUILD_DIR=${WORKDIR}/${P}_build
 
-	local nolib_flags=( -nodefaultlibs -nostartfiles -lc )
 	if use clang; then
 		# Only do this conditionally to allow overriding with
 		# e.g. CC=clang-13 in case of breakage
@@ -79,18 +78,14 @@ src_configure() {
 			local -x CXX=${CHOST}-clang++
 		fi
 		strip-unsupported-flags
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
 	fi
 
 	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		-DLLVM_ENABLE_RUNTIMES=compiler-rt
+		# this only adds unnecessary req on llvm-lit directory
+		-DLLVM_INCLUDE_TESTS=OFF
 
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
 		-DCOMPILER_RT_BUILD_MEMPROF=OFF
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index dfe0087ab72b..6d2e2af291ea 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index f51690c353c0..64ec68d6c0f6 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -5,5 +5,5 @@ AUX ctrlaltdel 189 BLAKE2B 07b6936a7ae54a69227f794068cf41dfc2e54ba6ba032a7c1a58c
 AUX finish.getty 30 BLAKE2B 97dec53a513713c68febd68177227e165ed3bdee28d3db4f57b671e93dbf3e9cf233e92dd2c0a47fe4e0bec0fd13d994893f95914f19cb5f9dfa78b915857bc4 SHA512 122a4ab21dbd5e6b77e0225bda48f813ec680c85767fdc917933bd1a88d854b6714809ebd63d0fa6b81c25c5e0a9de224aa920565e8d197556e7d99c5836681d
 AUX run.getty-2.1.2 44 BLAKE2B 38b80fc06bb53a06a6dd2ebeb6f5c320c73c9d3e928c5dbfeaad2fa0a19e1bdeaa28cf6fe61fcdd46406c0f1f4a05113b8b2cdb652bcac3d6560e0af0f5d521c SHA512 c23aa0ba79043a5717e5567f39bb714154f68c1e417538013943a65de5584b775c265423dd5d47c52027a1be1621f8fb017b115d75d127a31b2ef7cae3ed9eea
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
-EBUILD runit-2.1.2-r1.ebuild 4057 BLAKE2B 276de27f929a78ea2c0768076b05c5a57bd2935cb12d70d2a6a6166ac2524a68d4502b5402db59f4b683282b4a1a6416c9617c0b6410b5ed5f2ca2ef83557426 SHA512 46b7ea77a3c382e87727e9318345599250c15fcc548d7f9a12a1593e2d9cfdb2d4f8bdc23a1a21ca340454b65b5f8b67d85854fc15936beb47bef6b78413e530
+EBUILD runit-2.1.2-r1.ebuild 4058 BLAKE2B 576827357519057cc66388e5ce3ffbcbf3268b588d10b0f07c0d66f3ad8042931a756cfaf451b546816182ef2c2867f879e9abcba5025e86e98c038b2eeed196 SHA512 d040bf3a3dc698d0da7870873cf8dfc18325ea928070125e154fc5cbcd3d9a07239515b6f60b3a3cbb9680c7ae038d305d2cf588b2b20f8683ee86f445176f8a
 MISC metadata.xml 331 BLAKE2B bdd00a86fff3c8a1d5d1bbe0c02c3b8ff3744cbaa2418005f2874a8996993a9adb114827bbd2f508f7df43ce8746c4528366d12e02c429cd5515c3b27de07972 SHA512 31b1e624cd18692713a25780237cb492a9541b61f18fae9522c39c5e0e6f292acf4534ce63135c20ea4f8bf9f29e15533ff5692e012732c1ab9d839277677b94
diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
index 607ed990d6e5..3dcf174b65dc 100644
--- a/sys-process/runit/runit-2.1.2-r1.ebuild
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -49,7 +49,7 @@ src_install() {
 	einstalldocs
 	doman ../man/*.[18]
 
-dodir /etc/runit
+	dodir /etc/runit
 	exeinto /etc/runit
 	doexe "${FILESDIR}"/ctrlaltdel
 	newexe "${FILESDIR}"/1-${PV} 1
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index b11ac219fad3..8cd91f58e40f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 345c99ab6596..f6671b0bb567 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -4,7 +4,7 @@ DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B f7b550a73bd0ff9770700a3a8cab1b02c
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67 SHA512 3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997
 EBUILD icingaweb2-2.10.1.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
 EBUILD icingaweb2-2.10.3.ebuild 2529 BLAKE2B 0bff09ed4258d2674a3e1ec780e6b7aa0d87cbcba5771af2ea2aae5fc10381f73f9b9434f09e3730c07d3ddcfdd2809f5b33273dd169f0c7ce808694d772c2ad SHA512 b9a0b279ac1606370ce0b238638c9a328990ffa977a50a21c61ad25b46d800e689b18c5eb8989e83a94a75a0d5afff3548989565a62bb3b6ab1551a8b17c2171
-EBUILD icingaweb2-2.11.0.ebuild 2630 BLAKE2B eeca16f7d11d494af283842afad010e87c589e1fe8724c93176c70463db396815a73fa99496c557dc5fe25cf3da55739bbe805d9ecc1776a291126a066f7bfbd SHA512 32878a4e15cd689e8c5b890db2c41242992cbaf230f6080d7bc2e88715bbb6587f226f74bd19744dcec6cf23e81573bfda46bdc0c0e3eb3f255d0da6e2a4ef67
+EBUILD icingaweb2-2.11.0.ebuild 2628 BLAKE2B b38041e236796eb47d685b601a0008f3943e46ad33a42e8e76fdcbce557907aadec63cf96c073e4bf08da6137e2c45792afd9607086e8fe904a5394dfdcbd768 SHA512 cfa728da3f9fa851190d357742e4e1b6e20be1ae813d4351f33c6878f85214e5d8088c03113581190d1dc44d3a919fe87300dd241c61484bb515e0fba77eed1f
 EBUILD icingaweb2-2.11.1.ebuild 2630 BLAKE2B eeca16f7d11d494af283842afad010e87c589e1fe8724c93176c70463db396815a73fa99496c557dc5fe25cf3da55739bbe805d9ecc1776a291126a066f7bfbd SHA512 32878a4e15cd689e8c5b890db2c41242992cbaf230f6080d7bc2e88715bbb6587f226f74bd19744dcec6cf23e81573bfda46bdc0c0e3eb3f255d0da6e2a4ef67
 EBUILD icingaweb2-9999.ebuild 2630 BLAKE2B eeca16f7d11d494af283842afad010e87c589e1fe8724c93176c70463db396815a73fa99496c557dc5fe25cf3da55739bbe805d9ecc1776a291126a066f7bfbd SHA512 32878a4e15cd689e8c5b890db2c41242992cbaf230f6080d7bc2e88715bbb6587f226f74bd19744dcec6cf23e81573bfda46bdc0c0e3eb3f255d0da6e2a4ef67
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
index 078757090855..859522be43f0 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
author	V3n3RiX <venerix@koprulu.sector>	2022-08-01 09:15:09 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-01 09:15:09 +0100
commit	a9b37934d0877c4249ea35c9e9c5b8cf3b836c9e (patch)
tree	ff0becf8e678416d9170f38891942c5df6c2557c
parent	0c764edfecb7e9e124d4669acd98bed09e23b6c0 (diff)