gentoo auto-resync : 16:08:2023 - 03:28:34

author: V3n3RiX <venerix@koprulu.sector> 2023-08-16 03:28:34 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-08-16 03:28:34 +0100
commit: 643a5121202a0a33fb4d77fbf1c4dde26de3224c (patch)
tree: e7e4742e588a0ee9769303f80c6cfcf273360f9a
parent: 3648761f2708fcf5662ea1b9585f594c36eefc30 (diff)
219 files changed, 3233 insertions, 1947 deletions
diff --git a/Manifest b/Manifest
index dff92b8b1523..41a16fd15730 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29293 BLAKE2B ef215c8e367ade70b4d54ebe1e45b3f887dad5119bbe2f54b399774ec4ee5a84a8fb364dd9bb48d87d6b0ace1c07a64ddbb8255aecd35dc7d339eb9cf1493ee6 SHA512 97e39ca06d4e1942180fa7e2f50c2367e430020076a368cbb93cf286fc346ba43250acc018d89f3a755a28d140a86198daa97f6344ed974dc46780c9968d25b5
-TIMESTAMP 2023-08-15T19:39:56Z
+MANIFEST Manifest.files.gz 29298 BLAKE2B b558307c9196a3bd61d954608e4d5e4c7da0f07b6f8ab3d2d6b305590508369684a1f6b475159e8b200e2a6691e0fa57412692b9450818ab9622dd0d8080a6a3 SHA512 8cbdc41ff48094b26db5128f1a213ff0f5498e35744c555c212b5036c121422cf39e0e0c76409aeac2972b176cb34923b22ea6bdf85f2324c31bea2670e244db
+TIMESTAMP 2023-08-16T01:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTb1IxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTcKOhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBaEw/9GBiCp+bklNla7IYg1SP+XicK8NPxq9V8elIEBcPxKfD7OrooQwo7gp/A
-Zx5TFu4SgIWtdZ12XiNlw3xawqmiS8vwgbcDmkaM4XVvHRqZUW4LX3YQHiNBITfm
-0vlmfklVwhDmblj+KecSWHOZEh/bjpJ55ieHlJzS8suF2psmc+DrzJk8u2cMdrhp
-5gubjBdvJT0KyFLTvtIP9XkonMx7uYWe1CsU1qmZ4PO9v3PmbKpLd7pJP5NNplxv
-ngcb6F8jFAGFx8l6WCWSNcZR0IzjR6uOQtL1Mp1hoLDuEu5YxamwrRC+drWgCsIL
-ZX50mbieZI6JrDQfn8dYuyzlr9d6rr4oYOu8/XCuov/FY+ISfwc25LwBecQXWV9t
-kAbaDNmBS6SFZ0t7VpSujmt4GCYo0efbpgyki+rtg3PJ7uMzlOljcCizniJNUKxk
-GDb20gnPBjketgP/ihpyMTIgBBRzT6O1WqVxE3OutStCtSdLAfH5fQbwUq3E161V
-LPzQ6F9Nf5OhKH42nNg3udzeL8ooVbySB/b1LCMR3Xt1ZnhaMTCEXa93aQzKaQBw
-k17HYdP9H6aAtpZ0/vsbrM8kN/CHKsj8EXU3wuxce3VygrGlUArf6k27crYldsei
-/QfkPAM95DCNjvKd+mmpFtdlcp0tYOKsg9YAVizRWvWl/wFEGRw=
-=gnDC
+klAgFRAArwQW7BtGJhznhVOIqi2SUM7JR5HXj2AyZLB4yEVMrqikJ7T4c+hBqZrr
+8msmKPf4OmDCBpc0IXPmc4IoNDXOjGELYH4n6FcgV11F40p43p4KT55BO/LGXZSH
+jfULbR9bQQ24B+k95KvrJCxa4NbFkUT/5bqCZCBLHP4EqhsxDwpgWObFe2fu1ihB
+8kz6u46WrtUzJu269pKoG/SU/pvgdLTMG+E4p0x+6lvVd95+DX0Lkx5nwbhFp3E8
+4fc1I58hSnTPm21ndfsL6h89h81LCU5JwJ1uyMGaOEQ2iKteM4u1veyEAuMy6Nr8
+asxbWdriBOLmEikn1lyk4Tj2HuWgyznNDxEnn2l1tcz5tugW7Y5Z4/Xn/50JhbSR
+396M5Q2L9L4qNd49qwT4NE8huN56VSqK/d4pHeR4fJC8Yt42t2eg5zd8Vev5hx2+
+SbDO/1yfw+KiewmFN3Gb4E30VmOZwOfjPF/P53M7HoNFTmyyKUZBFA1E5b9fJzHs
+o+4WSyPjfEH1/Es6PKksxOR73nLOOpxOQfvcsz5N2pONLeUO8FYpuhZ7vXkB45Yy
+kH2SRBRieDRWQgBl2l5+JUHtKdPK4lZAxxVJMbSavjAiPFEzEJnougIKPrTRJRKo
+FF5bhC/OUDSAVcufDlPWKDg8A5CMdLWh4gtc/PMbKiuPMcy79iQ=
+=/eEh
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a9352e946c6b..0658c9b3a78f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3e5ab0ceb357..bb029271cdb6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/fetchlog/Manifest b/app-admin/fetchlog/Manifest
index 393f0fea210e..57ee72ba24a6 100644
--- a/app-admin/fetchlog/Manifest
+++ b/app-admin/fetchlog/Manifest
@@ -1,5 +1,4 @@
 AUX fetchlog-1.4-fix-build-system.patch 631 BLAKE2B ebbc0d0e90c5183a2ac396ffc26356223b5b8072100a9a6dc2f7fd0c9c94287213f7f8f8749e3e54612f7c777848012f92fccfbb02295345d578dcbd974f3091 SHA512 480a30e040f56e3e1cf21172dc7f7f060fa81a8a0efb95e15a20b7762444b356547435f3eacc4cdb7a504f3049f6b05a7fab219f6cab9d3fe7901968a69c796e
 DIST fetchlog-1.4.tar.gz 32393 BLAKE2B 2741c536dfb17414ffaf90cebd9f8c7c1a1c80edb30bc726f15aa6acd610a07afb926c2566d27b30125e7f4733c1abde8eb81c68d81f609bc05328cf90755d44 SHA512 51590c0cdfa8f4a15fcb4a436375d960c25f35d84558ab46def58f83c97da30caee449eea7c62c539da786a613c2b1e51dbc223d70d56c21daad6e9faf8a51ad
-EBUILD fetchlog-1.4-r1.ebuild 900 BLAKE2B 48b41cf53fcde1a31406c75cecc7193aad803c2f8ed495e25bda0e937297a8100aa22fff11c649e8c35503a2922bd65318ac424be30aec8721e58a3a07d582d3 SHA512 66f07ba3529482e64bb3e71c9ae46ffac291aebf379c64fb988e62b89e5e4c859b2eee0988192536ce9535a45a4c676e2f22254b6a7111253c086ba597fe70a7
 EBUILD fetchlog-1.4-r2.ebuild 891 BLAKE2B fe79be0290f4fa6373a1d3051c833c84fe6b903f3658a2dc0b5cd1322463a03cde79f5b3112ba16e9190e1a3bc93db3764442d3fafcc41290f4cd1940712e714 SHA512 76823b5dd5bef171b24e2cddef141a82598e43aa3029258ff54cba79102e94bd92f2be5e877b036326f1dd556e76b9b8045d81b41861f5bc11c8c093dcb6ab39
 MISC metadata.xml 251 BLAKE2B c119f716a25eaf3897a61c2ffb6d3f03c9981141aade031b0f8878ae448b0c75f4dad96d6528db0dfcb39623eddc30cb5afeac072d316f47bf4ecfef2be95743 SHA512 8b8b0e3a412b4283748a5b0a25577fcd95c896b7bc54fa0125be1da0cd39e517ee25105516cc034e30efb421c559844579dd3c935fb7693061cdcce362a63da4
diff --git a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
deleted file mode 100644
index 05c06f7fa1d1..000000000000
--- a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Displays the last new messages of a logfile"
-HOMEPAGE="https://fetchlog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="snmp"
-
-RDEPEND="
-	snmp? (
-		>=dev-perl/Net-SNMP-4.0.1-r2
-		>=net-analyzer/net-snmp-5.0.6
-	)"
-DEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin fetchlog
-	einstalldocs
-	dodoc *cfg*
-	doman fetchlog.1
-}
-
-pkg_preinst() {
-	elog
-	elog "This utility can be used together with Nagios"
-	elog "To make use of these features you need to"
-	elog "install net-analyzer/nagios."
-	elog "This feature depends on SNMP, so make use you"
-	elog "have 'snmp' in your USE flags"
-	elog
-}
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
index 36ac5f28fb87..893f6e493c9a 100644
--- a/app-admin/mktwpol/Manifest
+++ b/app-admin/mktwpol/Manifest
@@ -1,4 +1,3 @@
 DIST mktwpol-1.0.1.tar.gz 60491 BLAKE2B 66d7db396bbf7e5b2c4dd537ac9bcd387298ae733348b63c6d5cb6df79e9440ea751c27eccec66978371fa81a17929d25fcfbeca6787abf8b49f087b54a6468d SHA512 aa44af97533f130b89b83c6f2a8878d290770b677f6fb9fe654b033f57fcfb3d063a6a6ddf29599aa066452d75911cf8053d65b21c37e322851a10f4381cb33d
 EBUILD mktwpol-1.0.1-r1.ebuild 1809 BLAKE2B ee15e4d5a3acf4454057c71ff2e02280ec7e59c46b3bb61aee92b8855383de5f3e4fc64d315f6d538c34ba1eb9c41f387961a2a38d9a769182a018cee868d83b SHA512 eeb543df7acb291cbf47a53c55d7e3020dea578c1d2fec69d7fa48baa1ae417973615d15feb9eb16b1ee83a43ba95eb3fbff1bd87039f56f6f465c60541cf00a
-EBUILD mktwpol-1.0.1.ebuild 2234 BLAKE2B 3001ec982eae364a451a4302315ab7a3d774edcfce9d2db38c78f472a5ebe48fd90a1ddcde4660bb8032d80f4176ea3ea80684cab278c54498209974062b0111 SHA512 293252ea909b2e62c0e72bab04493313a08c8de7a6348616752a2cdf9ed3170a60663c46981e7cca0e74de368dc320c1e62e6b85caf2366ba02ab6b85333cf52
 MISC metadata.xml 1737 BLAKE2B 7987f89f5a273694583540df9701e4b0d77b6e3b9af607bda1abcb5ffae723e8c423862a9c5c45d3776c7ff543951e4ee3039dcde1ec820c0da9baee55fde8a1 SHA512 40170b03ebf1abf0eaa2fe0bb98e7489c197aa0a3aade6f7d8ef7573d8833e173c38ae583e146fc0ee391c22da3363fb29faf3db442a0d894988fe9a1bc259d8
diff --git a/app-admin/mktwpol/mktwpol-1.0.1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
deleted file mode 100644
index d9a3ada6c1fe..000000000000
--- a/app-admin/mktwpol/mktwpol-1.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
-HOMEPAGE="https://sourceforge.net/projects/mktwpol"
-SRC_URI="mirror://sourceforge/mktwpol/${PF}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-admin/tripwire"
-
-S=${WORKDIR}/${PF}
-
-src_prepare() {
-	default
-	sed -i -e 's:/usr/local:/usr:' Makefile || die
-}
-
-pkg_preinst() {
-	# one elog message for new/first installation
-	# different elog message when updating
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "To facilitate a new installation and setup of tripwire:"
-		elog " - Run: \`twsetup.sh\`"
-		elog
-		elog "To update tripwire database as packages are added or deleted:"
-		elog " - Run: \`mktwpol.sh -u\`"
-		elog
-		elog "Mktwpol is packaged with multiple policy-generating rules files."
-		elog "A default \"rules file\" is installed in /etc/tripwire"
-		elog "Alternatives are available in /usr/share/doc/${PF}"
-		elog
-		elog "mktwpol.sh uses the policy-generating rules file with the"
-		elog "most recent date.  To use an alternative \"rules file\","
-		elog "copy it from /usr/share/doc/${PF} to /etc/tripwire,"
-		elog " uncompress it, and \`touch\` it."
-		elog
-		elog "Read /usr/share/doc/${PF}/README for more tips."
-		elog
-	else
-		elog
-		elog "Version bump: mktwpol policy-generating rules have changed."
-		elog "Run \`mktwpol.sh -u\` to update tripwire policy and database."
-		elog
-		elog "Alternative policy-generating rules are in /usr/share/doc/${PF}"
-		elog "To use an alternative policy-generating rules file,"
-		elog "copy it to /etc/tripwire, uncompress and \`touch\` it."
-		elog
-	  fi
-	# ewarn message if a version change from 0.x.x
-	if [[ "${REPLACING_VERSIONS:0:1}" == "0" ]] ; then
-		ewarn
-		ewarn "Mktwpol default policy-generating rules no longer sort by package."
-		ewarn
-		ewarn "   This change does not reduce the scope of system inspection!"
-		ewarn "          It only affects the tripwire report format."
-		ewarn
-		ewarn "  The previous default reporting format is still available, at"
-		ewarn "  /usr/share/doc/${PF}/mktwpol-gentoo-packages.rules*"
-		ewarn
-	fi
-}
diff --git a/app-admin/petrovich/Manifest b/app-admin/petrovich/Manifest
index d11f510252af..7209dad43d86 100644
--- a/app-admin/petrovich/Manifest
+++ b/app-admin/petrovich/Manifest
@@ -1,6 +1,5 @@
 AUX petrovich-1.0.0-gentoo.diff 1135 BLAKE2B cfb4a284f943e6e7dd97f63ff14641ef0c1c5a962926f3220640d8b76804bfb4e754a62c11988b7352b796b1646739a969690336316f657b98e831fde5804a53 SHA512 cccefe0f88bdc0c4665e38c7e9760e273c5a40dfbbff086839128f2f3556e1e9c1094c2d7380045899d02e5c56aa84280c578a91cef86776e06841a40581b3df
 AUX petrovich.conf 135 BLAKE2B 37e803f0a90805af7f2888d24ca64fb5eb25e2795ac8fb6bbd52e4cd0614b1005b5ebb8cb401054f7ff77703f957ccb41ccfa9e9fa0033e2dbddc2ee216c99b7 SHA512 eaede98ec4921e5b9dae0c79f685d71c1001eed313529ff5c20a55f956d4eb2682880aebb56717f40c090feb92eeba6060aa96ecf45b94fb764cf76993febce1
 DIST petrovich-1.0.0.tar.gz 17844 BLAKE2B 31815188d72656c0dcb4a49f7c1511213ebaf049c2f3961e6aa0ce8ba74f7705b38b414745a73b9c78f05b6e164940e6eea92a8f885b96ad1afbe0f811411734 SHA512 5f30cffffba670ee6c6b53b93427f380c389ba60ee5717cb6ac632aacbd81fba514c0843db4d8e093e164fd8cf275f280a9da5a184b27c077789f2e359b05b5d
-EBUILD petrovich-1.0.0-r1.ebuild 621 BLAKE2B 70ad5a70796983199e5fe5398abd6e7ec3589190d162b2b0d5f1c2f341dcd6a865238a3f879fe1c5bd07b26fa14c2f2531f6b1b27b6f0bfec4f3aa7aadad8940 SHA512 d5f5210399fc709679412554e9842a90846d3de8bac0abd212cdc87580fafc1f04670980709111795b067a2e48b0b96932052bbc18f29925b14360112b4c89cc
 EBUILD petrovich-1.0.0-r2.ebuild 617 BLAKE2B 32f79f08c7b3b05fbbfe3670c4a8a408c7f86f53df4558f67434b2a605c81830b4011e3dbb0d697fe6c8c4d130b7784dc4a1a7caff53c6df027a4fa438428631 SHA512 d075cf3cd671d425bb47f5be26282e35fc325903d10ed8078f12e60923d6adc261b40927637ba844fca71655de5f778257348a3813dcad9724caecf832464c91
 MISC metadata.xml 247 BLAKE2B 5e9860b832a8c0bf40fc3a0b21d9be80258b7a63f969b816aa5edb1ba3fd847759e098ae30450bff70a352c7b1f5a3472c073345bdea4aec1881699766b95e23 SHA512 f61c388c2cc592cb4c2ca6a3a9c45ccecb77b38fda1584f7cf5c0d0f30d486b9f2628f0b79d6e2dc7b3c0f52d0f6dde4ceafbc520f07a6a34ba4e06b1f366d50
diff --git a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
deleted file mode 100644
index f5ca36fa2d0a..000000000000
--- a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Filesystem Integrity Checker"
-SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/petrovich"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="virtual/perl-Digest-MD5"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
-HTML_DOCS=( CHANGES.HTML LICENSE.HTML README.HTML TODO.HTML USAGE.HTML )
-
-src_install() {
-	dosbin "${PN}.pl"
-
-	insinto /etc
-	doins "${FILESDIR}/${PN}.conf"
-
-	dodir "/var/db/${PN}"
-
-	einstalldocs
-}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index c6051a1e06fd..fc0de5fe8754 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -16,6 +16,7 @@ AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb
 AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67
 AUX salt-3006-skip-tests-that-oom-machine.patch 749 BLAKE2B 453e9db439bb87aa949cc150bafc7b39cc69a4e7189115e69bd7571d35c5eb34eba9d80d7ebb21c62bb454bf54217af7f5f8ef366dbeecc5250c1fee1d729420 SHA512 7d68020cc52ecc51e67861ed8465104b92b0c869823501d7966ab42df60f40049e5619453c1cd5238513c5e4afd1d46b1c5e3dd50830604555abd2a111a4601f
 AUX salt-3006-tests.patch 3196 BLAKE2B e364ce99d499acef5f337cf82ab670f9693b5bb5cb6db27e4253bcebed6645c189f17579858aca31d549c5386c460a93cfb75f60cbdc715939f90c9c039cad4c SHA512 cd35cef1def946f6354665867fd79c4c8457ea87813a710d9c1ff04bf3341903dc155542e4c2d062ccb7be96147f9892b66d12f573c831b7acb86176afba63c3
+AUX salt-3006.2-tests.patch 3598 BLAKE2B 5e8f8df73e905aa1807b6bdeed2f95bd5b12623beb368123091e5f9733dc81d7564b00b308232baa0603feb047ad693581648341e72ab2d263b438d12cc6c916 SHA512 c4dde9a456adfe70ebaf0ebdc8c1dd532e41c603a148ee15720f520f8366738d4fb4e0b6b27a6164ddf4d34d1e9d398c3299aaf3945fbba97c250b38e2dcacec
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -23,7 +24,9 @@ AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8
 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14
 DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
-DIST salt-3006.0.tar.gz 20377846 BLAKE2B d39a55676f6bc5f70a558684811dd6175b633ceb5b73f4e95bd0137e7a507456f2e77099c05aca082591b9bdff1948632adc9f141e2f8ad26c4bfedd98af3d15 SHA512 999e2eb362607e1a8a0636c3bfa305fb070a5df309b837975a03a0bf02d25e4678eae38e8a1a356ea857a6d81cbb68aeb9f903a55dd221c7485d2f22b309dd77
+DIST salt-3005.2.tar.gz 17935313 BLAKE2B 550853b8245351b251438ac87d775e8b39d71ddc1eee0375f4bb29c04e2aacf5905ef9ac5373d9e7ff47a1cc8d6b9ce1a2a4c3d75b5647d4047bc06a5e526664 SHA512 07e7afc732a97006557d4556d60aa1854934893d0566bf8c295d4b1c01515988a1bf2798ce228f6b37e657de8fdfff51153ad2ea8d54baa6a5c377e30794f317
+DIST salt-3006.2.tar.gz 20411634 BLAKE2B dff474017918ef3ee0031856a2739282077205d8c2589809a91e5f1c3741cb26d2bd2458734ea4d3533118c881851dfd853f4ba4f1c631e7db28e95bc1b6f7f8 SHA512 2626cb5beb1b30fc63f554f5804f0d9b7e36b7c569c5f9049e5f5ac5a413e9d99a98b3d91089683338e3d3890ec973dff80782b4e41acb291872e45084fd2546
 EBUILD salt-3005.1-r1.ebuild 7234 BLAKE2B af8c85ad4abcd00244b52a73cc67fc31505395dc11282841bec155a4ae5c24694214f9e3a173f8ae09c25de2ae06f5eefdc3fd0aa27608908a78f664e18cf408 SHA512 1d790f172358abbac38351e1b5be50fa1e646fc7cb51179af428249e8dccd6452f51f25710ab73c91e0942df8098a9b97d6f579b8934a1f0e4d194cd7ec6961d
-EBUILD salt-3006.0.ebuild 7312 BLAKE2B a665de511a32e711592c4aba15c93bcfcef831d948bd4c019deca130758288f9956495edad74d67490730657204c0705b4f389c1414ee520149b60c452511c80 SHA512 46efb3f2532e3741768cf88bdc9bdda132319f352fafbe61f6f65c7589d060f52c70860a250ac43bffa7085c9eb1c29bc6a8d56cb7a30b6a0bb9c261786dc219
+EBUILD salt-3005.2.ebuild 9382 BLAKE2B 068d7d5a8e15ebb387b9534616693c74dd89d2b8839c21a57c50bcbdf83427b44a49796805b84b45be823007c0c6ea3828a17ac47a20576286e340c4ccaf0775 SHA512 da78be3da31b32b079129bc05547890e17bb3c67d8e4ba33f84be796c83fbaf31aae838df0f8c51153bca51960dfdfa41ca6af92dc77ef32760b5dba3f901e81
+EBUILD salt-3006.2.ebuild 8539 BLAKE2B 335093f353da0d42abedf7b836c1516239390ec64fe4acf0f58d23f1d4b467446304aec086587fd9901b3007d50d86743aaf26157d7706b0b4b511f814d3e7ab SHA512 d8690757e65594d3bef93e852d61efb4c771fc3d2d441ef79dae0cd585cb93854a77ed641f9ba65bce13eaba7f46475c90dd03c591d2e0f580ef4a53bf7b1532
 MISC metadata.xml 2304 BLAKE2B 8fac51fe1b0c0dae5fe71d88f1bf84df1de8cc8b3d836b59c3b2e82bfa085f57352e3aafd999766ae69104a8bd9798f2fffdb64e1df1e0a1ca8561dba1ef7d5e SHA512 7d3706c40c27dd67509bd638cd0550bb4822f0895fef929ecad21c218cdaa0512da443c901cc2b3a8d4afd9f5e9bc461622ac3bab2a332ccd9c64c4cbf99bf74
diff --git a/app-admin/salt/files/salt-3006.2-tests.patch b/app-admin/salt/files/salt-3006.2-tests.patch
new file mode 100644
index 000000000000..abec5157df30
--- /dev/null
+++ b/app-admin/salt/files/salt-3006.2-tests.patch
@@ -0,0 +1,114 @@
+diff --git a/tests/pytests/unit/modules/dockermod/test_module.py b/tests/pytests/unit/modules/dockermod/test_module.py
+index 8fb7806497..584d416412 100644
+--- a/tests/pytests/unit/modules/dockermod/test_module.py
++++ b/tests/pytests/unit/modules/dockermod/test_module.py
+@@ -354,10 +354,6 @@ def test_update_mine():
+         mine_mock.assert_called_once()
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_list_networks():
+     """
+     test list networks.
+@@ -378,10 +374,6 @@ def test_list_networks():
+     client.networks.assert_called_once_with(names=["foo"], ids=["01234"])
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_create_network():
+     """
+     test create network.
+@@ -422,10 +414,6 @@ def test_create_network():
+     )
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_remove_network():
+     """
+     test remove network.
+@@ -444,10 +432,6 @@ def test_remove_network():
+     client.remove_network.assert_called_once_with("foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_inspect_network():
+     """
+     test inspect network.
+@@ -466,10 +450,6 @@ def test_inspect_network():
+     client.inspect_network.assert_called_once_with("foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_connect_container_to_network():
+     """
+     test connect_container_to_network
+@@ -491,10 +471,6 @@ def test_connect_container_to_network():
+     client.connect_container_to_network.assert_called_once_with("container", "foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_disconnect_container_from_network():
+     """
+     test disconnect_container_from_network
+@@ -513,10 +489,6 @@ def test_disconnect_container_from_network():
+     client.disconnect_container_from_network.assert_called_once_with("container", "foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_list_volumes():
+     """
+     test list volumes.
+@@ -539,10 +511,6 @@ def test_list_volumes():
+     )
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_create_volume():
+     """
+     test create volume.
+@@ -569,10 +537,6 @@ def test_create_volume():
+     )
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_remove_volume():
+     """
+     test remove volume.
+@@ -591,10 +555,6 @@ def test_remove_volume():
+     client.remove_volume.assert_called_once_with("foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_inspect_volume():
+     """
+     test inspect volume.
diff --git a/app-admin/salt/salt-3005.2.ebuild b/app-admin/salt/salt-3005.2.ebuild
new file mode 100644
index 000000000000..2d5c18e2ca63
--- /dev/null
+++ b/app-admin/salt/salt-3005.2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_10 )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="
+	cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax
+"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiosignal[${PYTHON_USEDEP}]
+		>=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+	)
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		>=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( >=dev-python/cheetah3-3.2.2[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+	)
+	neutron? (
+		>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/apache-libcloud[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+		dev-util/yamllint[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
+	)
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+	"${FILESDIR}/salt-3003.1-tests.patch"
+	"${FILESDIR}/salt-3005-tests.patch"
+	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
+	"${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
+	"${FILESDIR}/salt-3005.1-tests.patch"
+	"${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
+	"${FILESDIR}/salt-3006.2-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available, and
+	# tests that don't work in sandbox
+	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+	rm tests/pytests/functional/transport/server/test_req_channel.py || die
+	rm tests/pytests/functional/utils/test_async_event_publisher.py || die
+	rm tests/pytests/functional/runners/test_winrepo.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+	rm -r tests/integration/cloud || die
+	rm -r tests/kitchen/tests/wordpress/tests || die
+	rm tests/kitchen/test_kitchen.py || die
+	rm tests/unit/modules/test_network.py || die
+	rm tests/pytests/functional/modules/test_pip.py || die
+	rm tests/pytests/unit/client/ssh/test_ssh.py || die
+	rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
+
+	# tests require root access
+	rm tests/integration/pillar/test_git_pillar.py || die
+	rm tests/integration/states/test_supervisord.py || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
+	# pycryptodome rather than pycryptodomex
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		# doesn't like the distutils warning
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+		# hangs indefinitely
+		tests/pytests/unit/test_minion.py::test_master_type_disable
+		# needs root
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+		# don't like sandbox
+		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_has_ip
+		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_init
+		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_ready
+		tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_disable
+		tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_enable
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_is_set_before_events_return_then_no_data_should_be_returned
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_then_all_collected_data_should_be_returned
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_is_set_before_other_events_are_completed_then_result_should_be_empty_dictionary
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_then_all_collected_data_should_be_returned
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_min_wait_time_has_not_passed_then_disbatch_should_not_return_expected_data_until_time_has_passed
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_minions_all_return_then_all_collected_data_should_be_returned
+		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
+		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
+		tests/pytests/unit/utils/test_vt.py::test_log_sanitize
+		tests/pytests/unit/test_master.py::test_fileserver_duration
+		tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
+	)
+
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
+
+	# ${T} is too long a path for the tests to work
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)" || die
+	(
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			epytest
+	)
+}
diff --git a/app-admin/salt/salt-3006.0.ebuild b/app-admin/salt/salt-3006.2.ebuild
index 5e8c420c6cdc..031e12b522fb 100644
--- a/app-admin/salt/salt-3006.0.ebuild
+++ b/app-admin/salt/salt-3006.2.ebuild
@@ -30,6 +30,7 @@ IUSE="
 
 RDEPEND="
 	sys-apps/pciutils
+	>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
 	dev-python/jmespath[${PYTHON_USEDEP}]
@@ -39,9 +40,9 @@ RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 	dev-python/watchdog[${PYTHON_USEDEP}]
@@ -58,7 +59,7 @@ RDEPEND="
 	)
 	openssl? (
 		dev-libs/openssl:0=[-bindist(-)]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
 	)
 	raet? (
 		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
@@ -90,7 +91,7 @@ BDEPEND="
 		${RDEPEND}
 		dev-python/apache-libcloud[${PYTHON_USEDEP}]
 		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/certifi-2022.12.07[${PYTHON_USEDEP}]
+		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
 		dev-python/cherrypy[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
@@ -101,7 +102,7 @@ BDEPEND="
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-factories-1.0.0_rc21[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
 		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
 		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
 		dev-python/pytest-subtests[${PYTHON_USEDEP}]
@@ -128,6 +129,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
 	"${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
 	"${FILESDIR}/salt-3006-tests.patch"
+	"${FILESDIR}/salt-3006.2-tests.patch"
 )
 
 python_prepare_all() {
@@ -183,31 +185,35 @@ python_install_all() {
 }
 
 python_test() {
-	# testsuite likes lots of files
-	ulimit -n 4096 || die
-
-	local -a disable_tests=(
+	local -a EPYTEST_DESELECT=(
 		# doesn't like the distutils warning
-		batch_retcode
-		multiple_modules_in_batch
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
 		# hangs indefinitely
-		master_type_disable
+		tests/pytests/unit/test_minion.py::test_master_type_disable
 		# needs root
-		runas_env_sudo_group
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
 		# don't like sandbox
-		split_multibyte_characters_{shiftjis,unicode}
-		log_sanitize
-		run_with_pre_flight_args
-		compile_template_str_mkstemp_cleanup
-		sync_with_handlers
-		deferred_write_on_flush
-		call_apt_dpkg_lock
-		enforce_nice_config
-		config_validation
+		tests/pytests/functional/cli/test_salt.py::test_versions_report
+		tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
+		tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
+		tests/pytests/unit/utils/test_vt.py::test_log_sanitize
+		tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
+		tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
+		tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
+		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
+		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
+		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
 	)
 
-	local textexpr
-	testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
 
 	# ${T} is too long a path for the tests to work
 	local TMPDIR
@@ -221,6 +227,6 @@ python_test() {
 		addwrite "${TMPDIR}"
 
 		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
-			epytest  -k "${testexpr%and }" -x
+			epytest
 	)
 }
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 86a9ddd78b56..ecdc27c29a7d 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 52d457c4acad..dabfc24d8b98 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.16.02.tar.gz 3896753 BLAKE2B 6db57f629b01b80e5b89febf56f00cb94611833002484f6fbe9b9afce3f4a6fd3cb9ef0631312a9924b5d24f50b9f4b5bbe54a7dadb9e98eeca0c2f0cc03ec81 SHA512 08290ca83da9124667a9e0794d88735f0281fea39b8ad6ddd6bdab602edd4a268ce5aa838c60ae8e98f654bd89c94ddca784dc126e10857539db480d77619539
-EBUILD stress-ng-0.16.02.ebuild 1136 BLAKE2B c652d1d73074aa8d283a17b457770ed1bd27cb299726d8786fb735d6542c5092554684f2814e3e4d606fa6bf5aed26d0f20f80de6f051820f98a5d425a96af09 SHA512 c5649e1d1db6f66762602a5c0f7c494c3e27ad30ebf049cca9f1da168a7f19f834bc9c00b6b2bba6f35e5fbdc705a392eb3afa9218eb64511898af124eafa2f5
+DIST stress-ng-0.16.04.tar.gz 3918769 BLAKE2B 5e2b457be2e38c583dcfc72719c5abacfaca658f7861a4faee5b709568ff4dd646e595b88be9542cf2b977e0184678c4c15a2aabfd421df8d92f8c18040a4773 SHA512 9c0ebcef697cb1fcf6f0836a8d0d88da0be20ed0683c35304e540bf040beff4152e231ba98c8a3ebe3c22bbde66a22ff8929397c35f7e070b9498ad1275e7a8d
+EBUILD stress-ng-0.16.04.ebuild 1136 BLAKE2B c652d1d73074aa8d283a17b457770ed1bd27cb299726d8786fb735d6542c5092554684f2814e3e4d606fa6bf5aed26d0f20f80de6f051820f98a5d425a96af09 SHA512 c5649e1d1db6f66762602a5c0f7c494c3e27ad30ebf049cca9f1da168a7f19f834bc9c00b6b2bba6f35e5fbdc705a392eb3afa9218eb64511898af124eafa2f5
 MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99
diff --git a/app-benchmarks/stress-ng/stress-ng-0.16.02.ebuild b/app-benchmarks/stress-ng/stress-ng-0.16.04.ebuild
index 002dc1ebe61c..002dc1ebe61c 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.16.02.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.16.04.ebuild
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cbffde7a3609..2bc4cc723f68 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 5ad9574fec6b..f062d153bc5d 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,15 +1,12 @@
 AUX dxvk-1.10.3-gcc13.patch 398 BLAKE2B 48b1f18b8368a7dccdd479df8c37b6667fe918f4c47846e0c9e7bb5f04746fbb773decabd905a4877e1bea42ab9af88d042f667272969e0bda7d44f215d78938 SHA512 e3b84263641c3abb34c31721b29eaa314f02bbd15e1ee5b3e3cefd51f57f9123b2cbb32174ed1806dcb03994ee3db8df3282d5f4791d8f1188c09f7c55cbf113
+AUX dxvk-1.10.3-wow64-setup.patch 579 BLAKE2B bebc84f2cdcc32da5cd55db4041a26dd469175932536c02dc1049c95a259e6ab3a59dde507b04c8a29055ac0d8c2c96c2732efa81b5bf5b13c54300732e3d3a4 SHA512 1364feec383902e81a855929273126d519b0033064482a0662eda92569657b1a932bd8bd2584395a746bf14e443d9a9c2d75bf484bbb80654536a6c315ffa5dc
 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
-DIST dxvk-2.0.tar.gz 943397 BLAKE2B 7d59050e8ac3f9be311d11323cc0057d84c3b730360fe9e064ff4a5e2db5bffea5bae3214da366c60295ec5f1577ab08e2776274c9aaff7a7de1b9f2cefa836a SHA512 98537bdec2b5e4f2ead5b93ab49db717e0706fe771a82a6ef1e5b5792c1bdd3f417cd6b6b2deadb1397b8a0740445fa88b9fb6c1f73510cc5c0e7ae35d65bcac
-DIST dxvk-2.1.tar.gz 960078 BLAKE2B ad8ea7eb000237914d9116a8fbfde13fde3dc00d428ebfe41aacb9373c6509112545ef1942b4cbc96a18338c3d07c2c494d0454236721e220ee5f5731a5c27b9 SHA512 10d919ba2612f665a20f7c72605967adeea94d8414bee45878f9df42ad263fa5ebfc7a76319173dce054ffe9b9cdc919ff7a136042f3f4e64142844c943bdef7
 DIST dxvk-2.2.tar.gz 976671 BLAKE2B 537fb8d8adb69562f8e759c6f68e5ed38a62e6ebcf05d7ed1ea32fef518af30cd53d3ffec0e3dba175d449d80de980585f91bfcf8c3904a08385b17b55b9b63b SHA512 02d066093855c3ecae7123fcaeaa32212e03fcda9556c5b70ff23eadc07240199003b8e4673f5b492487fa6e240d70a36f5b4e60b0f389f422cf4474b7197e2f
 DIST dxvk-libdisplay-info-d39344f466.tar.bz2 81232 BLAKE2B af76ccd3c40bc953008bc30d222c72f90bdc77f47f767b6e7423efaa0ec89d746396a755160b5470e219a15a0aa392be6066aab12921b45a1adb35d88132cd97 SHA512 79b4bf325cefc39bc587233bd82ff64c927ca5f829b8172d213c3d47af725c8dc7fe33576a8e96a869075ee2a8f00d165f3aa9e6c472e862a47e5c800b2b3315
 DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
 DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
-EBUILD dxvk-1.10.3.ebuild 4749 BLAKE2B fd9cd430c1ba8a26c651d2f48b80bcf342f8f6e29b7e4ef482f040ca6b3e5dec929c5231f261ef19c7b834b4388f9d0ca04326f5a540aa36f9f5c919300739a9 SHA512 39c20df5745c0d900fa203e8c08b4e65843c01f981cbd05bce5526ac9495f97d146b44bebcf64893fd24d4f1305e0bdaf46d48606313ad460c6606dceea8e484
-EBUILD dxvk-2.0.ebuild 5626 BLAKE2B 6b5e635decab96c3f80e28a982d812fc709159cc606ad4c45b4a236e8839dd1bf55481fdf2e4ea38dd3d62e40d7cb627e298513690db86e713b1b04cfa63e05b SHA512 18437696864b04f5ce8869499123976152d7645c51e7a03dae7cb155452a957b90bdeddccaa13ce1cc995ec02052b74bb26dca9bb7eb7fc706561da4f942185a
-EBUILD dxvk-2.1.ebuild 6373 BLAKE2B 5fcc8d2d344c62095b6a0fc6378d0c156ffd116f59b9f6d3377c0efedeb4ee18dcaa8918cb992f9b046601f8db0d4cf56cecc6da0c1c5e0664d2d0d1fee471ac SHA512 53e8a705da21c70cef86053c02af443fac029ebc10c093ad23f2b0be6839c35f72f12fb3d13988049a851160debc0071b65d493a16c77c7748e294fd81100e91
-EBUILD dxvk-2.2.ebuild 6320 BLAKE2B 57a49436331be13f9c45299ebb923e95e4106738580ab80b30a288a91ad339b2d59b926d845cd6e2b249669e1d284407c81a446ee0e5ac708007e1143307ed5e SHA512 6426a28d8add392481d5c0d1f60711ecd075f2f10f57b6fd7ea993425471db45da0dd44c27fef6d547fe51fc8d7affc67ba7b3c1270131189de08efd6759c8e4
-EBUILD dxvk-9999.ebuild 6322 BLAKE2B 6982d08a5bc5bcb78dcfacc95c557218f530331fc1e0a78c4df71f55f41f1492049cff14be5298b08bcd13c3bdc327705a33415560f8ecf03e8d104bdd94ebdd SHA512 7c564b73df8d9a75fd09e4b010caebdbd81d5581712cbcb2e28927e6a2ddd253f7b8e210215da25e0e411d9557ae295276e54d10f65cdc0d914c49ed8073fc60
+EBUILD dxvk-1.10.3-r1.ebuild 4795 BLAKE2B 625a38411040ac49cb8545516e2296b92f6a4e78ea2390bd17d48bea9fd15cf0d7ef86fcb81d04fdc93e6df5f9e0eb7f787496db441cabee6607e7b1a93646fb SHA512 54399cf3cac6c57ea602a4a0d19ec9a6a146032a38a3c6402986bef38345557b44906c16637b1b5a94739a8b03cbafe1c8c49c58f1ab4b4ab5912e074720999f
+EBUILD dxvk-2.2-r1.ebuild 6395 BLAKE2B 415138de1fb0b958e08dad9fc749ada1aafc195954e46da660699445c8074740d108f45f110e62926b4dcaa8a12f2dc21a37598fa2528e70f5acd80dd95fc6ec SHA512 93831a0628b0bbb82ddfb80b93e1e04ade79bd3d38022ac99423435172c8acf55eead6a3dacc1b514fa9c65305a509d869692ae3933b8f85d320fcdc25298047
+EBUILD dxvk-9999.ebuild 6397 BLAKE2B 281f77caa2434051ccb7fe7b5cc3d55727ef55e04309cc0d3652fca6067bf5464528ab517c4943b84a181a508d857ff83dcf46afd4c948138f7522b19fb845a4 SHA512 19b196bbee397a221f2a9561c6a627cfccaa4b50e1125b478f4ca94665c1beb69d6f1633f5135e9ffd013934d87e08b327ded946e6c7a4408b77367531155eee
 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-1.10.3.ebuild b/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild
index 378c0c51c184..3a56e2fdd338 100644
--- a/app-emulation/dxvk/dxvk-1.10.3.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
 )
 
 pkg_pretend() {
diff --git a/app-emulation/dxvk/dxvk-2.0.ebuild b/app-emulation/dxvk/dxvk-2.0.ebuild
deleted file mode 100644
index 1790de09e942..000000000000
--- a/app-emulation/dxvk/dxvk-2.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit flag-o-matic meson-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
-	EGIT_SUBMODULES=(
-		# picky about headers and is cross-compiled making -I/usr/include troublesome
-		include/{spirv,vulkan}
-	)
-else
-	HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
-	HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849
-	SRC_URI="
-		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
-	KEYWORDS="-* amd64 x86"
-fi
-
-DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
-HOMEPAGE="https://github.com/doitsujin/dxvk/"
-
-LICENSE="ZLIB Apache-2.0 MIT"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi"
-REQUIRED_USE="
-	|| ( d3d9 d3d10 d3d11 dxgi )
-	d3d10? ( d3d11 )
-	d3d11? ( dxgi )
-	dxgi? ( d3d11 )"
-
-BDEPEND="
-	dev-util/glslang
-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local tool=-w64-mingw32-g++
-		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
-			if ! type -P ${tool} >/dev/null; then
-				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
-				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
-				use abi_x86_32 && use abi_x86_64 &&
-					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
-				die "USE=crossdev-mingw is set but ${tool} was not found"
-			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
-				eerror "${PN} requires GCC to be built with --enable-threads=posix"
-				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
-				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir include/{spirv,vulkan} || die
-		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
-		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
-	fi
-
-	default
-
-	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
-}
-
-src_configure() {
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# -mavx with mingw-gcc has a history of obscure issues and
-	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-	# crashes with -march=skylake >=wine-8.10, similar issues with
-	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-	append-flags -mno-avx
-
-	if [[ ${CHOST} != *-mingw* ]]; then
-		if [[ ! -v MINGW_BYPASS ]]; then
-			unset AR CC CXX RC STRIP
-			filter-flags '-fuse-ld=*'
-			filter-flags '-mfunction-return=thunk*' #878849
-			if has_version '<dev-util/mingw64-toolchain-11' ||
-				{ use crossdev-mingw &&
-					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
-			then
-				filter-flags '-fstack-protector*' #870136
-			fi
-		fi
-
-		CHOST_amd64=x86_64-w64-mingw32
-		CHOST_x86=i686-w64-mingw32
-		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
-
-		strip-unsupported-flags
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
-	# unset again so meson eclass will set ${CHOST}-gcc + others
-	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
-
-	local emesonargs=(
-		--prefix="${EPREFIX}"/usr/lib/${PN}
-		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
-		$(meson_use {,enable_}d3d9)
-		$(meson_use {,enable_}d3d10)
-		$(meson_use {,enable_}d3d11)
-		$(meson_use {,enable_}dxgi)
-		$(usev !debug --strip) # portage won't strip .dll, so allow it here
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	dobin setup_dxvk.sh
-	dodoc README.md dxvk.conf
-
-	find "${ED}" -type f -name '*.a' -delete || die
-}
-
-pkg_preinst() {
-	[[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To enable ${PN} on a wine prefix, you can run the following command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
-	elif [[ -v DXVK_HAD_OVERLAY ]]; then
-		# temporary warning until this version is more widely used
-		elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
-		elog "If you were using symbolic links in wine prefixes it may be necessary to"
-		elog "refresh them by re-running the command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
-		elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
-	fi
-
-	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.0
-	then
-		elog
-		elog ">=${PN}-2.0 requires drivers and Wine to support vulkan-1.3, meaning:"
-		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
-		elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support"
-	fi
-}
diff --git a/app-emulation/dxvk/dxvk-2.1.ebuild b/app-emulation/dxvk/dxvk-2.2-r1.ebuild
index b39f6fe9f3c9..21905a3981fb 100644
--- a/app-emulation/dxvk/dxvk-2.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.2-r1.ebuild
@@ -50,7 +50,7 @@ BDEPEND="
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
 )
 
 pkg_pretend() {
@@ -81,11 +81,11 @@ src_prepare() {
 		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
 		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
 	fi
+	cp -p -- "${DISTDIR}"/setup_dxvk.sh . || die
 
 	default
 
-	sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \
-		"${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die
+	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
 }
 
 src_configure() {
diff --git a/app-emulation/dxvk/dxvk-2.2.ebuild b/app-emulation/dxvk/dxvk-2.2.ebuild
deleted file mode 100644
index cc5675a641c1..000000000000
--- a/app-emulation/dxvk/dxvk-2.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit flag-o-matic meson-multilib python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
-	EGIT_SUBMODULES=(
-		# picky about headers and is cross-compiled making -I/usr/include troublesome
-		include/{spirv,vulkan}
-		subprojects/libdisplay-info
-	)
-else
-	HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
-	HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849
-	HASH_DISPLAYINFO=d39344f466caae0495ebac4d49b03a886d83ba3a
-	SRC_URI="
-		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.tar.bz2"
-	KEYWORDS="-* amd64 x86"
-fi
-# setup_dxvk.sh is no longer provided, fetch old until a better solution
-SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
-
-DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
-HOMEPAGE="https://github.com/doitsujin/dxvk/"
-
-LICENSE="ZLIB Apache-2.0 MIT"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi"
-REQUIRED_USE="
-	|| ( d3d9 d3d10 d3d11 dxgi )
-	d3d10? ( d3d11 )
-	d3d11? ( dxgi )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glslang
-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local tool=-w64-mingw32-g++
-		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
-			if ! type -P ${tool} >/dev/null; then
-				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
-				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
-				use abi_x86_32 && use abi_x86_64 &&
-					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
-				die "USE=crossdev-mingw is set but ${tool} was not found"
-			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
-				eerror "${PN} requires GCC to be built with --enable-threads=posix"
-				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
-				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
-		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
-		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
-		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
-	fi
-
-	default
-
-	sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \
-		"${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die
-}
-
-src_configure() {
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# -mavx with mingw-gcc has a history of obscure issues and
-	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-	# crashes with -march=skylake >=wine-8.10, similar issues with
-	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-	append-flags -mno-avx
-
-	if [[ ${CHOST} != *-mingw* ]]; then
-		if [[ ! -v MINGW_BYPASS ]]; then
-			unset AR CC CXX RC STRIP
-			filter-flags '-fuse-ld=*'
-			filter-flags '-mfunction-return=thunk*' #878849
-			if has_version '<dev-util/mingw64-toolchain-11' ||
-				{ use crossdev-mingw &&
-					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
-			then
-				filter-flags '-fstack-protector*' #870136
-			fi
-		fi
-
-		CHOST_amd64=x86_64-w64-mingw32
-		CHOST_x86=i686-w64-mingw32
-		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
-
-		strip-unsupported-flags
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
-	# unset again so meson eclass will set ${CHOST}-gcc + others
-	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
-
-	local emesonargs=(
-		--prefix="${EPREFIX}"/usr/lib/${PN}
-		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
-		$(meson_use {,enable_}d3d9)
-		$(meson_use {,enable_}d3d10)
-		$(meson_use {,enable_}d3d11)
-		$(meson_use {,enable_}dxgi)
-		$(usev !debug --strip) # portage won't strip .dll, so allow it here
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	dobin setup_dxvk.sh
-	dodoc README.md dxvk.conf
-
-	find "${ED}" -type f -name '*.a' -delete || die
-}
-
-pkg_preinst() {
-	[[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To enable ${PN} on a wine prefix, you can run the following command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
-		elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was"
-		elog "removed upstream, handling may change in the future."
-	elif [[ -v DXVK_HAD_OVERLAY ]]; then
-		# temporary warning until this version is more widely used
-		elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
-		elog "If you were using symbolic links in wine prefixes it may be necessary to"
-		elog "refresh them by re-running the command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
-		elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
-	fi
-
-	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.0
-	then
-		elog
-		elog ">=${PN}-2.0 requires drivers and Wine to support vulkan-1.3, meaning:"
-		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
-		elog "For details, see: https://github.com/doitsujin/dxvk/wiki/Driver-support"
-	fi
-}
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
index 062d70604759..b4b07947ffeb 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -49,6 +49,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
@@ -77,11 +81,11 @@ src_prepare() {
 		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
 		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
 	fi
+	cp -p -- "${DISTDIR}"/setup_dxvk.sh . || die
 
 	default
 
-	sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \
-		"${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die
+	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
 }
 
 src_configure() {
diff --git a/app-emulation/dxvk/files/dxvk-1.10.3-wow64-setup.patch b/app-emulation/dxvk/files/dxvk-1.10.3-wow64-setup.patch
new file mode 100644
index 000000000000..707eba19b24b
--- /dev/null
+++ b/app-emulation/dxvk/files/dxvk-1.10.3-wow64-setup.patch
@@ -0,0 +1,14 @@
+Dirty workaround to try syswow64 if paths are the same. This can happen
+with USE=wow64 on wine where wine64 is a symlink to wine.
+
+TODO: dxvk's and vkd3d-proton's setup script should be rewritten and packaged
+separately (shared) as upstream hardly support these (dxvk dropped altogether).
+--- a/setup_dxvk.sh
++++ b/setup_dxvk.sh
+@@ -89,2 +89,6 @@
+   win32_sys_path="${win32_sys_path/$'\r'/}"
++  if [ "$win32_sys_path" = "$win64_sys_path" ]; then
++    win32_sys_path=$($wine winepath -u 'C:\windows\syswow64' 2> /dev/null)
++    win32_sys_path="${win32_sys_path/$'\r'/}"
++  fi
+ fi
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest
index 337f7522b247..4b87d793daff 100644
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@@ -1,18 +1,14 @@
+AUX vkd3d-proton-2.6-wow64-setup.patch 595 BLAKE2B b476f6e9e278b78fc22a41807286ac39bb17bf31c8dc09556ecb2ad64d3bf79a93be6492f9437c10781d7a3302eda19f59bbc396520c52e75126df9c578a6b4f SHA512 e8e71f0da66944444b4ae0b8a9840542a11061cd4607e17debf33a233abb850eb4d4882c2821b8c72c4cbf80b37f0c0877953b3e68e05afd73e35edba31d8e1d
 DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1
-DIST vkd3d-proton-2.8.tar.gz 1435183 BLAKE2B 8b265e6dac1dd0ed6377ea6bc0ecffa7eccb8360f890bf2c996395b9db90e132ede9bddf6e889a9302466cccdcd2000f1e7ad9ece740b797c44f081b7ca1bb98 SHA512 d708fe62d64487b4430862b93913ba45f2889268c5efb9b1dc69fd48a665fcffc06a7bb91afc13b06a35fd82005a3115dc85f1de74d65f6958fd6f0c02a54007
 DIST vkd3d-proton-2.9.tar.gz 1534562 BLAKE2B c2fd0d7ede7eae9192c32d2756abb7601324a220391a85e6fad2b8c2786d2bf4870cefb5f1bdec5fe7197d941fd25296a283fad49ab7c95bad37a457118f9d47 SHA512 65cab81045d151a2ee8ff755d02138daf6581c491d273773d61847efa2520d4c456de0c564eb4fe4dfbdd1f7b5b2a0177766497815d04f03845dadd0857fb483
 DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3
-DIST vkd3d-proton-dxil-spirv-babf511d4c.tar.gz 695011 BLAKE2B 49e13065037edec80815b19907664d9681bc191303032db2e1678fbff5e144846c2ee267fdf5c1d4c31a1a30f2c14275f8e276a771253fabb8bbea8936be4eb4 SHA512 b310e4e856b4571ce13cce8539bd1640c7578b132558c009fcc04c24b4b10a86b620542891442dd81feaa8f6ad63d2d05021ca228d1c5f46eebe384fdb30f77e
 DIST vkd3d-proton-dxil-spirv-f20a0fb4e9.tar.gz 727867 BLAKE2B cad4db07fc8d92d2d33ff534483b809abe0a85b98184ceae850331b1287b5c4fa86a233a68faa55e6a05fbb05741ea0d9a20250d27312a2e83175b0c5dd76dad SHA512 76d181d7326902d5eceb21d0d971cac7fccf9541b367a00ad72c2e7645262aff3d5cc707994f6ed1c75b9dc8ace240d3c4861f9f08fa622851c6be0a4b144f93
 DIST vkd3d-proton-spirv-headers-1d31a10040.tar.gz 445679 BLAKE2B 3dac88269df92428fd93ca187eb417ec0156ff0b24200daf85526aaa92c30ba8743102764e20c47d783ed0704fa690c1bf60944ef81bbdd296890dde5fb9fcaa SHA512 2536619cd7854954892dbb5ab5cd97e4e95fe3f5c121c4b2022426ae734fc20c1ebadbae1da7689f5ca18397075c54e4f16ad525b8ee873c4b0ffdc07aaacc03
-DIST vkd3d-proton-spirv-headers-87d5b782be.tar.gz 439180 BLAKE2B 9c64a1b7aa408172bb57b38ca0e3d31221c7dfecfcd9afc77449c14e76f60f7436f1a54a794bf4959f4575f177e1024621c6ff696f7fb19b545877e0a527031c SHA512 d6ce02e53c259e508d1d72d81cc6aa6b3019e7ecd6a8878d81d8681d9734756f66c762ebd4b8b1d0f9fbb7a8f1f18d72aeb27c56822d810aca5a3e53c51c1ef6
 DIST vkd3d-proton-spirv-headers-aa331ab0ff.tar.gz 448200 BLAKE2B 435e3ce169f44a00181a664a6cb2f3e45e22b3d4ec033d27fb2b54564b4fcc4274ac170f373daddf9ba0bd421b3d50fc87442c15345dae24ec131f4257b33f30 SHA512 1cd6043974daa4cd71138be629544d10944064af8e5b1a5a64e746922edd0d583050ec3b036ef304dd67a689c65541b5cb375d80f26ab3c9314653169cc5aac8
 DIST vkd3d-proton-spirv-headers-ae217c1780.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b9c69757d7c2257ce2fe1bc6be308341f3189766f120994e4920bc738b737d9eefc299359dab568fb8809782e3663dd589c0e4d13aecb8873a SHA512 02cf1d63b29e48ef0efe489eb32237ba2f9f4bf58a182b00dc96aab18faba94de79283398e9e945cd81130f83fff228c59b04e496716ea9ccc148a5f4465282c
 DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
-DIST vkd3d-proton-vulkan-headers-b7a86d3b2b.tar.gz 1753074 BLAKE2B a2588e84edd09a04c3622a95310acc781432d6a962c69c1f5a709b65e2bfeb5196d9d217b0d261532c4b5c1424f13ff64d33728303c989fdbce3048741add486 SHA512 377ada7a9721c225067c6548475109cf4ad1f3d677b835fbe7a4bc7520621acd816cc59d4b75b23bc28f25891b556792cf853b98c0dfb915856774ff27eb6aba
 DIST vkd3d-proton-vulkan-headers-bd6443d28f.tar.gz 1827419 BLAKE2B 911ef9d8039c052742a26784f800826af3f3da0d24026198540eceebb798990089eddefb518bf92ae50b039fa04477dc3256367593ed77852d90a332f9c4d0d5 SHA512 20e722bc5918af6c5ebeb6599d0f7f09821a3045d014f1c178ba8e038bdb4ace11a6ae261c75b38a0098cffff9bbfe4a518a541699575fbf642f13a73ca0faca
-EBUILD vkd3d-proton-2.6.ebuild 6649 BLAKE2B a1c4fad8bc4dac02544610c116f25f74493a1e1f279f1440cb56606c97b8f99e96d729318e2b0712caa0bf81cade60c4a9ce1e8c974637df72a9de4b44c38e47 SHA512 3c20099e9539d9eff975507a309b633363dc802caeddd48f7379c8281fde131fc63608510d466ca6a9ec1b17d84d8ae52c8b22420a14db9b3983672c603d64df
-EBUILD vkd3d-proton-2.8.ebuild 7125 BLAKE2B deb01348dbd8f4bd3da0e49d64a14a7f642a5ef7331cf1e498d6c5d99ccf3cba7961c4febd8be539fe9a419ef8e841b5f8a68f80dcba54e75b2eb3143b588b3d SHA512 2592cffd0ce8d32cec26bc4ef549cc98db755f3155adc95656c562b0e69431ece4e342fc6b72c9c01e5f4ccf602b911d3f93dee02edb305e18b4af38d3304328
-EBUILD vkd3d-proton-2.9.ebuild 7711 BLAKE2B c520bd7ae16ba345c0c3c332efe3ae272482e90b32f787a8d1f8407b018ec50040e14d077d5d4a2e57fad742d88cbaa38af4d7204988697d3329af56dd3d9354 SHA512 c721e2160361557dc14647b1e1f2debeea8db33b88611fb6b4f420bab6409fec73945f4a5304efb95fe3b541a522d4da1755b2a157f630f5f3acb1d4419d7b38
-EBUILD vkd3d-proton-9999.ebuild 7719 BLAKE2B 252edb291a8c788e46b4bc025c395d9b5a80bc72ab5170046345d0d1a93a1d8d533a60edb5a2ea77eb6dbce8f4c470885c79bc1dd8ac62c094dc753c4e32ff3f SHA512 c91b8cd543be510e2b4ae8f927ef9fa0337915421b1a8471bb1ab8e207d9b6018c8835c5ee0c04abefd5375971bfd9da9187cd4a6b2f4b99886e178ce7caf4d5
+EBUILD vkd3d-proton-2.6-r1.ebuild 6705 BLAKE2B 7bc31d31014915550cccc86f56d516f984ee3651fc999e0e39d82cce8b6c975b7118458651e6e62df7d3f4369abd72700344c6d2f7f9a0f9499897097e5e855b SHA512 c854e28b36f89ab206e7fb2a6d5daaf8d4b2683ed6feab3398ebc5a75418dbc9fea9270171315ed8d4f2980ecc68f969a38826864405ced03c400ea7c201fd9f
+EBUILD vkd3d-proton-2.9-r1.ebuild 7767 BLAKE2B da1b0698573ff306c86dfb7cba001e36e3eb8ec0c38832fcf20cadaff1673f7c52e5b61620fe316d7a64d7c7e016089babadfd09ead348f211d173580d14de38 SHA512 3f865c2fafe78d90480456e58e06afb1ba77701287a5dd3ff6a654a9076796e935591ba79702f8ba85126a0e5d0785b2856ebc79c2609cb79e3c9731ffacbc9f
+EBUILD vkd3d-proton-9999.ebuild 7775 BLAKE2B 02fd6fe93a3928e1afedfc97d86f0e20c2da75581bf1fbce52924c0fc2cf099b2a21349188efb81acd779e7de08d7525eaf51c0477e6e7fe22859581e1f96701 SHA512 223f2b7d87811cadcad3b03b82cd75e09430e624e20453796e27cbd78604e9ddfe499da44db1be1e2789af6b9328934fb313e6dee50fe5e139d9ac3b71f96e95
 MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab
diff --git a/app-emulation/vkd3d-proton/files/vkd3d-proton-2.6-wow64-setup.patch b/app-emulation/vkd3d-proton/files/vkd3d-proton-2.6-wow64-setup.patch
new file mode 100644
index 000000000000..413852460d54
--- /dev/null
+++ b/app-emulation/vkd3d-proton/files/vkd3d-proton-2.6-wow64-setup.patch
@@ -0,0 +1,14 @@
+Dirty workaround to try syswow64 if paths are the same. This can happen
+with USE=wow64 on wine where wine64 is a symlink to wine.
+
+TODO: dxvk's and vkd3d-proton's setup script should be rewritten and packaged
+separately (shared) as upstream hardly support these (dxvk dropped altogether).
+--- a/setup_vkd3d_proton.sh
++++ b/setup_vkd3d_proton.sh
+@@ -81,2 +81,6 @@
+   win32_sys_path="${win32_sys_path/$'\r'/}"
++  if [ "$win32_sys_path" = "$win64_sys_path" ]; then
++    win32_sys_path=$($wine winepath -u 'C:\windows\syswow64' 2> /dev/null)
++    win32_sys_path="${win32_sys_path/$'\r'/}"
++  fi
+ fi
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild
index b2963d7ca105..b728f3d9a94f 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6-r1.ebuild
@@ -48,6 +48,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6-wow64-setup.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild
deleted file mode 100644
index d9c77a55fbc2..000000000000
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit flag-o-matic meson-multilib toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git"
-	EGIT_SUBMODULES=(
-		# uses hacks / recent features and easily breaks, keep bundled headers
-		# (also cross-compiled and -I/usr/include is troublesome)
-		subprojects/{SPIRV,Vulkan}-Headers
-		subprojects/dxil-spirv
-		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
-	)
-else
-	HASH_VKD3D=a0013b78db6271b5be3fa55ae0b30222d2fbf7c9 # match tag on bumps
-	HASH_DXIL=babf511d4cc7466b970dec82db35b5cacf6acfec
-	HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3
-	HASH_SPIRV_DXIL=87d5b782bec60822aa878941e6b13c0a9a954c9b
-	HASH_VULKAN=b7a86d3b2bf8fbe73fcd40df9ec62a5966e9db89
-	SRC_URI="
-		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz
-		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
-			-> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
-			-> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
-	KEYWORDS="-* amd64 x86"
-fi
-
-DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
-HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/"
-
-LICENSE="LGPL-2.1+ Apache-2.0 MIT"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw debug extras"
-
-BDEPEND="
-	dev-util/glslang
-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local tool=-w64-mingw32-g++
-		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
-			if ! type -P ${tool} >/dev/null; then
-				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
-				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
-				use abi_x86_32 && use abi_x86_64 &&
-					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
-				die "USE=crossdev-mingw is enabled, but ${tool} was not found"
-			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
-				eerror "${PN} requires GCC to be built with --enable-threads=posix"
-				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
-				die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
-			fi
-		done
-		tool=-w64-mingw32-widl
-		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
-			if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then
-				eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either"
-				eerror "building crossdev mingw64-runtime with USE=tools or installing wine."
-				die "USE=crossdev-mingw is set but neither widl nor ${tool} were found"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir subprojects/{{SPIRV,Vulkan}-Headers,dxil-spirv} || die
-		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
-		mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die
-		mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die
-
-		# dxil and vkd3d's spirv headers currently mismatch and incompatible
-		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
-		mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
-			subprojects/dxil-spirv/third_party/spirv-headers || die
-#		ln -s ../../../SPIRV-Headers/include \
-#			subprojects/dxil-spirv/third_party/spirv-headers || die
-	fi
-
-	default
-
-	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die
-
-	if [[ ${PV} != 9999 ]]; then
-		# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
-		sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
-		sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
-	fi
-}
-
-src_configure() {
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# -mavx with mingw-gcc has a history of obscure issues and
-	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-	# crashes with -march=skylake >=wine-8.10, similar issues with
-	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-	append-flags -mno-avx
-
-	if [[ ${CHOST} != *-mingw* ]]; then
-		if [[ ! -v MINGW_BYPASS ]]; then
-			unset AR CC CXX RC STRIP WIDL
-			filter-flags '-fuse-ld=*'
-			filter-flags '-mfunction-return=thunk*' #878849
-			if has_version '<dev-util/mingw64-toolchain-11' ||
-				{ use crossdev-mingw &&
-					has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
-			then
-				filter-flags '-fstack-protector*' #870136
-			fi
-		fi
-
-		CHOST_amd64=x86_64-w64-mingw32
-		CHOST_x86=i686-w64-mingw32
-		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
-
-		# preferring meson eclass' cross file over upstream's but, unlike
-		# dxvk, we lose static options in the process (from build-win*.txt)
-		append-ldflags -static -static-libgcc -static-libstdc++
-
-		strip-unsupported-flags
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
-	# unset again so meson eclass will set ${CHOST}-gcc + others
-	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL
-
-	# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if
-	# possible, but eclasses don't handle that so setup machine files
-	local widl=$(tc-getPROG WIDL widl)
-	use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32"
-	printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die
-
-	local emesonargs=(
-		--prefix="${EPREFIX}"/usr/lib/${PN}
-		--{bin,lib}dir=x${ABI: -2}
-		--{cross,native}-file="${T}"/widl.${ABI}.ini
-		$(meson_use {,enable_}extras)
-		$(meson_use debug enable_trace)
-		$(usev !debug --strip) # portage won't strip .dll, so allow it here
-		-Denable_tests=false # needs wine/vulkan and is intended for manual use
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	dobin setup_vkd3d_proton.sh
-	einstalldocs
-
-	find "${ED}" -type f -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To enable ${PN} on a wine prefix, you can run the following command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_vkd3d_proton.sh install --symlink"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
-	fi
-
-	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.7
-	then
-		elog
-		elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
-		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
-	fi
-}
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.9.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.9-r1.ebuild
index 025dbe03397b..cf5467c6fde5 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.9.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.9-r1.ebuild
@@ -48,6 +48,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6-wow64-setup.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
index 5c521dc6e224..490163e3132b 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -48,6 +48,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6-wow64-setup.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 1ba9914c6c00..3988040cba8c 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/galleta/Manifest b/app-forensics/galleta/Manifest
index b50d3827c152..1a499ef9202f 100644
--- a/app-forensics/galleta/Manifest
+++ b/app-forensics/galleta/Manifest
@@ -2,5 +2,4 @@ AUX galleta-20040505_p1-Wimplicit-function-declaration.patch 177 BLAKE2B bcd13ac
 AUX galleta-20040505_p1-fix-build-system.patch 262 BLAKE2B b9c1337dbbb72f68bf040e640855bfdd8b0f090923e1c5326d7040ddfd5e957d9f8007998c890ca3e9ddcdc7d426275ce3e18c16f4e51b84b7c4f4f8fa46e6f2 SHA512 d2f071c61ffa582ebaa554ecd51aae7fd4a73dbf6940d18ecb50024e186958f1e8124f008ec5fa73fbd75c383bc9ea5338c46d1f566d5104e17e0d783eba368d
 DIST galleta_20040505_1.tar.gz 2813 BLAKE2B bbdbd2e004986f51a48c254d3ebfb795e24bf9623dc9254060fb68ddc94e365decf083c38fb8f04818db5c0634fdfde5457d05b44b59c57d9da452c3261d4384 SHA512 7c420a413371cd9d7d818941026bc6981c8a749b8d3c97a9f0fc867116f9e642a06ad2832ded6de08780ed24885c2de7e8b655400569cb7ae56844161308dc3d
 EBUILD galleta-20040505_p1-r1.ebuild 588 BLAKE2B e951e9b36cc1a136054285c2736ffdd95f54f600043d159582ea398b9263195c17055b64cdf70c8d1bbd5dd7b2acc28ab0930aa8f4faee718d40a79bbe7f5c7c SHA512 77cf82b18b61e09eadaaf608829888ea86185d005aa84f85b44f84ebc34a6d932f934ecb48a28e33c44edbb6ade4b670c97b8680479e4da0d137ab82611cf28f
-EBUILD galleta-20040505_p1.ebuild 595 BLAKE2B 42f54d3e79e352944ac039385e7047e69bfa10a33f7cc82ca65f316dcc6a469370b09ee13f7da20fc39c0118bb54a2ea1dcb1e11c3e9f2267b699360d0b0579f SHA512 13fc7d78c92013168527461130becc24ebda17c962e23eed2d0097c96b335a4c50d39b901892614690e227bbda829d8dc12de51ec02d0b43b61ad488a6c98021
 MISC metadata.xml 244 BLAKE2B e26094ee60c6c17d1bae635ab792ec0eaeab12891109abc7678cb02258351658b43cf4036450e13e5045ec98f4b8eda60f3cf969b85a6e43218b01bf5c3484c9 SHA512 8e8d76d31af527ad88d3a96704ec3b9611d4b2e25c6e643065b27fbcc8388bacd7bca787c45c95278a7602198b8578de52c4a7233d592d29168f23fbcf147857
diff --git a/app-forensics/galleta/galleta-20040505_p1.ebuild b/app-forensics/galleta/galleta-20040505_p1.ebuild
deleted file mode 100644
index 9192b6bdb8cb..000000000000
--- a/app-forensics/galleta/galleta-20040505_p1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${PN}_${PV/_p/_}
-
-DESCRIPTION="IE Cookie Parser"
-HOMEPAGE="https://sourceforge.net/projects/odessa/"
-SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}/src
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-system.patch
-	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ../{CHANGES,Readme.txt}
-}
diff --git a/app-forensics/pasco/Manifest b/app-forensics/pasco/Manifest
index b1bde22cfe39..cb806bec74c9 100644
--- a/app-forensics/pasco/Manifest
+++ b/app-forensics/pasco/Manifest
@@ -1,6 +1,5 @@
 AUX pasco-20040505_p1-Wimplicit-function-declaration.patch 192 BLAKE2B a043c010122fd9f160b169c9757dd14e4e775a02521f881333dbd3e2904c16f73064c9a509969919288795a957489e8c9732cf273fe0ad41472483065ea9cc51 SHA512 fdd4ed41a5dfef7a111ec7573a556529ff93cce37932593ce005c3b935ca19f0f677fb9da67ee2b01ab7f3822ca7ff5731117f6201c95a0b3fcb7cf8182b271c
 AUX pasco-20040505_p1-fix-build-system.patch 243 BLAKE2B aa4b5383117fbcfb237f62b8e6e2e6e913becaf1a9722c613895c96e227a6153455dd589e8006b1ae56376f42319d68499a6defdc9ada2bd87e3ead0c5f7cacf SHA512 b83440d8e674d710e5dd3d8e75e197da3eb12e3c83e521223ffd573b9ebe9ea885638afa08aee3593f5b8b32dfd7f9f4628ee0a9e57823a3ee76217d7572ec6f
 DIST pasco_20040505_1.tar.gz 4032 BLAKE2B 2a6520f48fbe8410b73ab01e95d14c1ff7e1f872dd8b4ab0e02a70c5880abd99d1d0418f82ea65fb19bd941bd8104d3a8e96697652cefc18e01c16f873fa3c79 SHA512 fd3c1b31618a64ea9a381c68971800a511f8c826a26ca0f554bd6c69f4992312c0c34adf7067da97ff6d7c11b7ed8a64401435fa9ceb218e165cf83a3b6083db
-EBUILD pasco-20040505_p1-r1.ebuild 597 BLAKE2B 43fec951b72d08250da3baa45123644bd14dfda01471e901950e610a0049018e70c201dfa396a59be955cef8ddb1b4b84c30b36a9556a731ed02bf593b855267 SHA512 71214aa2f614b99883609ccd10b25131d0fee5abe55b1cb1096fd7f1fe80b585d55983b0b53d3c344887e5e6b42dab6e700872265caea3a384a6ffb27a5b7a19
 EBUILD pasco-20040505_p1-r2.ebuild 590 BLAKE2B 2bc60809027be6a2b2715cf906b9c9b2663203d213b9cb8e200520e6c828d3ce7dd359c41c4d72143c2fd3d01b66ffa45c257702faf7d4db91d531a9fa09c5c5 SHA512 a25aef932585e0210cd12104523f330cbd77ba43f35ada57f31817eac0371d75139202f427c8f25eda0e34d3401bf33bc8b0551b5a79b9e5364b0d48a1075400
 MISC metadata.xml 244 BLAKE2B e26094ee60c6c17d1bae635ab792ec0eaeab12891109abc7678cb02258351658b43cf4036450e13e5045ec98f4b8eda60f3cf969b85a6e43218b01bf5c3484c9 SHA512 8e8d76d31af527ad88d3a96704ec3b9611d4b2e25c6e643065b27fbcc8388bacd7bca787c45c95278a7602198b8578de52c4a7233d592d29168f23fbcf147857
diff --git a/app-forensics/pasco/pasco-20040505_p1-r1.ebuild b/app-forensics/pasco/pasco-20040505_p1-r1.ebuild
deleted file mode 100644
index 848aa78cff30..000000000000
--- a/app-forensics/pasco/pasco-20040505_p1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${PN}_${PV/_p/_}
-
-DESCRIPTION="IE Activity Parser"
-HOMEPAGE="https://sourceforge.net/projects/odessa/"
-SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}/src
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-system.patch
-	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ../{CHANGES,Readme.txt}
-}
diff --git a/app-forensics/rifiuti/Manifest b/app-forensics/rifiuti/Manifest
index 13598697d0f3..449fb3020c20 100644
--- a/app-forensics/rifiuti/Manifest
+++ b/app-forensics/rifiuti/Manifest
@@ -2,5 +2,4 @@ AUX rifiuti-20040505_p1-Wimplicit-function-declaration.patch 232 BLAKE2B f6ac442
 AUX rifiuti-20040505_p1-fix-build-system.patch 261 BLAKE2B 8c4c708f8ff9850fa7b6c65fd589b55a0a7368640907b8e32d8dec85082e0725e0c99481d054ce192bcf61c6f8eeb7f2700f1038bd92bba2e8f77fb67d0b8880 SHA512 f7e2fc8e4706c2d2262eeade52fa14478208a69807809954b4e03ada11afab49fa9939f491c11d07895c44829918e9d11c843db7f0385af5e98329596fcaf121
 DIST rifiuti_20040505_1.tar.gz 2823 BLAKE2B 786ad2b6b4f2744b960300cf7cd35e46782a3b6a56a23b6cf1157855d5df8237806cf35243409efdab6e41f6fb004f1954a9291e608152f961a4107a11c37f65 SHA512 9d7e77c3eb74b97fedd66c0cac9c1960d3de0f284fcdee81c1e523eb9898cc9758194d7913b1bd7e0bc82eae4eeed656b7b3c699bcdd536325604d17c41da6de
 EBUILD rifiuti-20040505_p1-r1.ebuild 592 BLAKE2B f352467c6bdd4bf03d1b1be3fa17a5cc18cca86234b734b61e311c4a12128ac5eefa307d1cd2ddd4158707703d501347bac37570ea35e13133c99c1730db252c SHA512 2ffd9581c8250bc846aeeea136703bc5f2e6ea5d6ae16c85593a61d00f15f9479d1bb81795e35378a2ede143ec18fc4663728b12771831769d0a9020215fbdd0
-EBUILD rifiuti-20040505_p1.ebuild 599 BLAKE2B 1408d1b8178989f4d31a97eb5d142e383a958b8e40ba86c6a371173b1e3ce10e3a56866f05378c75ddb1ae3af360c4b501748020592ee9a7c35a314b55437667 SHA512 b703849328a01014709161e616c6bae1ab221d2cb80227b5eb55fb1c532cf3dde98e09f068f20606738c2625958b91bbc34a5339c57af6217ee1abcd0948dfd5
 MISC metadata.xml 244 BLAKE2B e26094ee60c6c17d1bae635ab792ec0eaeab12891109abc7678cb02258351658b43cf4036450e13e5045ec98f4b8eda60f3cf969b85a6e43218b01bf5c3484c9 SHA512 8e8d76d31af527ad88d3a96704ec3b9611d4b2e25c6e643065b27fbcc8388bacd7bca787c45c95278a7602198b8578de52c4a7233d592d29168f23fbcf147857
diff --git a/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild b/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild
deleted file mode 100644
index bdb5212fbcc7..000000000000
--- a/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${PN}_${PV/_p/_}
-
-DESCRIPTION="Recycle Bin Analyzer"
-HOMEPAGE="https://sourceforge.net/projects/odessa/"
-SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}/src
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-system.patch
-	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ../{CHANGES,Readme.txt}
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 87a38e87be92..be72eea5d622 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 11a43d3d935d..41599a046fbe 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -14,6 +14,7 @@ DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ec
 DIST php-8.0.25.tar.xz 10802888 BLAKE2B c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb SHA512 43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
 DIST php-8.0.28.tar.xz 10801568 BLAKE2B de03f5ad262e830c70d24b9e2dd997897e5613d8bbc998ab7e59df703db89d587c6c8955e6f82f0cf6630eed82f33e21567ccf7a873ca07f4d0659f7bf4bd974 SHA512 d66e41cdccc332fccaf03bb24356652b17be5267cba5a47d80f1b74732b674f6a23c91e4a151ca442e629de8e8bcf6daecf0b34cbcbc9e33f53b8da9f06dc6b9
 DIST php-8.0.29.tar.xz 10803592 BLAKE2B 6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac SHA512 5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
+DIST php-8.0.30.tar.xz 10821076 BLAKE2B 9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925 SHA512 fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1 SHA512 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096 SHA512 d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
@@ -25,6 +26,7 @@ EBUILD php-7.4.33-r6.ebuild 21502 BLAKE2B e8e5f58105088783b8ed435f4705ecb3891ad8
 EBUILD php-8.0.25.ebuild 21880 BLAKE2B 966f8b33f46767a4456686cd788f0b3c1b8fd4049f2022b1136a8530ef3a5021efb393db45de6ce60aa77ba029c384858838e576a6d2799808246fbc2645730f SHA512 2ba7d167b4075b89e6aac2feb387103ae3fca4dc0be4d6791d23995f4eeb1ca65941664374c52e48b07a8815ccdc7bf1c79b9f2da910bbae8c7c3c373b856ab5
 EBUILD php-8.0.28.ebuild 21883 BLAKE2B b0c23c162b11e652a57ec6218a26b6792baf81190168a6ac6c279d682bfa4a7a36b02598d063f9fd69f503bf463a97660b7c6ccdcfe637dc8a24cf097909f459 SHA512 2c8326ec110c74729a8daad7cfcb1a3c58d86ef741d6164e9248d68519dde26739e5c2c1bef89819fa641ed4c07f7566dfced4361ece573789a5752a3b9d9136
 EBUILD php-8.0.29.ebuild 21850 BLAKE2B 30c89684d086d2562a7b6d16c6c72c9f18ebe4a2e0b96b922c4a86292e845f34ed8047568593c9a078eb3800eedfc90b56725fc13b8a8f9cb66683d98e9c8923 SHA512 342dc912db1e7117044faabf265853fd265178dee671a23e9fa00d3cf49a5350d15fa02156a19f964230a5b0e961c415173087e5bb161cf4606c1b01687d8c9a
+EBUILD php-8.0.30.ebuild 21855 BLAKE2B 5be60aaba2ad6a575bcdd20d93989e4ccce62f72b497a1aa6ae8b07734eea26415733197a137ca78f5572d4518ace9e7b97a4406ac422969d950128f78f2c25e SHA512 7547c776238889b671c5772ae15f0212c4e0aecdac49f375470479111550684d5e45a5a0652ec78ce7350114eac9b5634891d9da033437f52a6bd093e42f98f4
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
 EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
 EBUILD php-8.1.20-r1.ebuild 21912 BLAKE2B 09c455238617b57c66b9913e85226293f0d6714d5f0831ce352d6dde4b81eba3a48fc5b547aad2cff5638f1ac2c2ca36db2293e9943c77e3f2d029b0ff50a43a SHA512 d76af211f86309094ff21e5e98ff755de96b2eb9c6a1c14fd915385a81f823a1842dd25ef6bd11de094dd62eb8ba0a9d0d5a1960527542af8946fb01911dd749
diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
new file mode 100644
index 000000000000..b6ce4bcbf1b4
--- /dev/null
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -0,0 +1,757 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	virtual/libcrypt:=
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fc684603d02a..5fbc2f9e858b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index 358f6f0b199d..2172b26d6e08 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,7 +1,9 @@
 AUX gost-engine-3.0.1-fix-cmake-path.patch 1279 BLAKE2B 40896fe0942e3de64a32e6c46405390b206c5b3cbf88a6561eeef8f804eb8a300862fa1fbecbc6942c4688640c4d3af30ae22646510b7489135a3440309bf8b3 SHA512 0ee8fd3e8d322b6cb169215e1c7600caafc4c987c356499013855a712996ed7a11d03f1007bafac5548bce291535e5187d0afded0d991d17a0e9840d47ef4645
 DIST gost-engine-3.0.1.tar.gz 1645245 BLAKE2B 713a7343f9c11feec361dd2828b00dd7d47518f5a1b047a6e11f8d8eea206ce9058ace1bd70e12b4cb2200789eb8209de671cb5e2692e95391b4e7a82d0badc2 SHA512 eb9fb126393cfe23bcef0f45c05b38d39aadd8909419ebcf6dab4800bd7372b63891e9061f8e70686f8ba5cd58669681895b36320ed6a8cc0ca1ff037aa73b85
+DIST gost-engine-3.0.2.tar.gz 1654695 BLAKE2B 76a14b6a33e7457dc879f45e5f8c1a0db633561269ba156ea1cad9d00dd082196382fb952706ced736ca7da6cfd698533b3f5483ad09f3b93748acd03c4a15ac SHA512 f8e7709df806e5d0a715e3f4f97644f7db4612a868201e730ab2ec62a3099f5c9136af6e4cc4ed5c69fe4ed25ce72b50d29fcf8c961cb3a9e9fa2e1fa8242c9b
 DIST libprov-8a126e09547630ef900177625626b6156052f0ee.tar.gz 5693 BLAKE2B e2c9c1a6c31532ea830c94bca9a7e2f0c0d0688c628ba0851ff541a0d9fd9aa727c5ed9b78901032e928ea8cfb63483d3bfeadac40c61ddd990df00e2c7d3cd9 SHA512 4633ca9ad21585483dbaf28e416f0f3416c814bb41b0ccf036e438275d83393e70ed1c2cd0298fc87d8e928074a7afcf3971a0d790014cc0d200c92bb2defe4d
 EBUILD gost-engine-3.0.1-r1.ebuild 1191 BLAKE2B b0e57ec1b1107d9948f91af2b05a3ed79989363c18defb6ead0de8c42c8eb721ca0a26246b48f18887530201d92cd2c6a5446b322694873f5910d83ffcb5426e SHA512 6e5456c037870f9dedb12ac149b3a1db573792421b0c851ee46fd0502b498d75eac4bbe315a6ef26d504e66113456a902ed726ce0e7a2574e7336838bce0f4b5
 EBUILD gost-engine-3.0.1.ebuild 1137 BLAKE2B 1837b5c9851e8b3a642fa0f7dac180e93fe7e555f75c47647eb34ddedec43124ae48033462b7d2c3eec583a1e6bdf667d96562514189bff49c1230b9b583e2f8 SHA512 0760134d371252b94a0f28b677c56eaba590c01f08be73fc3e8881e56d315546756459c2d96132f4af6a4c76c439034d2ba80e4cd19850cf695e581d5e3bcc01
+EBUILD gost-engine-3.0.2.ebuild 1137 BLAKE2B 1837b5c9851e8b3a642fa0f7dac180e93fe7e555f75c47647eb34ddedec43124ae48033462b7d2c3eec583a1e6bdf667d96562514189bff49c1230b9b583e2f8 SHA512 0760134d371252b94a0f28b677c56eaba590c01f08be73fc3e8881e56d315546756459c2d96132f4af6a4c76c439034d2ba80e4cd19850cf695e581d5e3bcc01
 EBUILD gost-engine-9999.ebuild 1137 BLAKE2B 1837b5c9851e8b3a642fa0f7dac180e93fe7e555f75c47647eb34ddedec43124ae48033462b7d2c3eec583a1e6bdf667d96562514189bff49c1230b9b583e2f8 SHA512 0760134d371252b94a0f28b677c56eaba590c01f08be73fc3e8881e56d315546756459c2d96132f4af6a4c76c439034d2ba80e4cd19850cf695e581d5e3bcc01
 MISC metadata.xml 342 BLAKE2B 3f19b05411fb2960f8218ebcce89e66eba7baabeac9a4a78ab2b7bea1657a082387ccd6fc50dd4a25f5d21d54be6e0c1cfe51cc9eff91cf426660be1041ef0a4 SHA512 4a73c89be75bf257bada6ff299eb6cb48b53b2b92dc9b9647d7345b699118ad4a2e5cfcbe61fc74dc624f6ab019bb21bffc5e1fa0005f761b6435b2badfcf4c4
diff --git a/dev-libs/gost-engine/gost-engine-3.0.2.ebuild b/dev-libs/gost-engine/gost-engine-3.0.2.ebuild
new file mode 100644
index 000000000000..a66a0b40c861
--- /dev/null
+++ b/dev-libs/gost-engine/gost-engine-3.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
+HOMEPAGE="https://github.com/gost-engine/engine"
+IUSE="test"
+RESTRICT="!test? ( test )"
+SLOT="0/${PV}"
+
+COMMON_DEPEND=">=dev-libs/openssl-3.0.0:0="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+LICENSE="openssl"
+
+DOCS=( INSTALL.md README.gost README.md )
+
+LIBPROV_COMMIT="8a126e09547630ef900177625626b6156052f0ee"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa"
+	SRC_URI="https://github.com/gost-engine/engine/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/provider-corner/libprov/archive/${LIBPROV_COMMIT}.tar.gz -> libprov-${LIBPROV_COMMIT}.tar.gz"
+	S="${WORKDIR}/engine-${PV}"
+fi
+
+src_prepare() {
+	cp -R "${WORKDIR}/libprov-${LIBPROV_COMMIT}/." "${S}/libprov" || die
+	cmake_src_prepare
+	sed 's:Werror:Wno-error:g' -i "${S}/CMakeLists.txt" || die
+}
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 0e7c3df11ae5..9416260446b3 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,6 +1,4 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
-DIST intel-compute-runtime-23.17.26241.24.tar.gz 6562120 BLAKE2B a75299259f1a41daeff14b75b87140953baa79e75390f48ce64d614b0837341505c331178aa86e59e4bd678fb4409f51ca494d14b6d112b4b9219506ad5c75b3 SHA512 e82798cf4c0e8511bb64f6e5543e7b49232cc9c1027ec374ec5c2cbfac8848263a5cc72072fadfe1e19920f5bdf65ceaed465ea88d4b2baec3acac433d383978
 DIST intel-compute-runtime-23.22.26516.18.tar.gz 6695812 BLAKE2B c413d0ee70564292122d3eb125669ffc0a0dd7491ec208688055a71173b4112db6da96934cd16c91c4ff1a932cf8fdea490c5d849d98c7171bc916d6d77dc837 SHA512 5949866da0c3e48582636b9260e9ee6321c06db543a30e8567310add1b93a7b37ee3e4f35dcd5d9a6f611ed701daa52fac98ae2c11e26809f3fe7da84d289fc3
-EBUILD intel-compute-runtime-23.17.26241.24.ebuild 1992 BLAKE2B 710c91a1b51d4a0f246ec4295986d924f864e4daa7b651600923a2e8e6b93339b26b93e33a99f7e349d9aa56d0760c271f5d1b3e2958831f46fa359a7d109629 SHA512 6c074a2a11fbc6af08d267fcdcfb418ccdd1a8e1e481bda18ac6f7342882cbcb21cd98f5e0fbfa264a553d9482e15918464a0e8b590cfe42b781f02d5dd81ec4
-EBUILD intel-compute-runtime-23.22.26516.18.ebuild 1994 BLAKE2B fb7fd94563b9f746b545891d2c087725e690ddc55c950d9a2e2fdd00f75307ced89edb99bc71918a2459d5b4bed75a45c7e939f3bb66010532c5dac69d93cbf4 SHA512 b7ca09c9a9d32e7130acfdf7d79f163eb91b5c992efcfd9500a743e5c6a10080569f92e3f23794f58c2c1444e8c62fe1a50897693d7c482a01e33ce698e9c139
+EBUILD intel-compute-runtime-23.22.26516.18.ebuild 1993 BLAKE2B 71b0d7c3df355513df78e0598d0d2b61ccd87c4cd0cc4cb5c3ed0a3ac8b7daf259e43fef04c8a47b5e3b95e37d520f25adf80ca7d788d7e05bbf9f33f2fd614f SHA512 b6537c1a27c4b92189fc8cca677c4f3156d6c9efbc720e2a848107aa1d3f4ab5b2e472b18009a2f40303341c76d4c829e4984e0ac44ec15d41b20dca1a8e87f5
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.24.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.24.ebuild
deleted file mode 100644
index 893db4b58b43..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.17.26241.24.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.3.5:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-discovery:=
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.13860.4
-	>=dev-util/intel-graphics-system-controller-0.8.7:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.11.0:= )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		media-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch"
-)
-
-src_prepare() {
-	# Remove '-Werror' from default
-	sed -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-lto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.22.26516.18.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.22.26516.18.ebuild
index c96a104f573b..a0b4e09c7ece 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.22.26516.18.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.22.26516.18.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND=">=media-libs/gmmlib-22.3.5:="
diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest
index 46dbafc1cb20..a5db24aaccdc 100644
--- a/dev-libs/intel-metrics-discovery/Manifest
+++ b/dev-libs/intel-metrics-discovery/Manifest
@@ -1,5 +1,3 @@
-DIST metrics-discovery-1.12.164.tar.gz 4235286 BLAKE2B f2a707fd2b43e096ad1c02032558c141add286d9f8cef20a317f5109245328ae7d22dd1acec64df99ef17dd652e67e5cba8db0e3271dd2259138924218ef893a SHA512 8e8e00d75ba14abecd9c650c0f5a33dd8f46396e8ed4f2a4eefb1b76b87cfc38ad47740dddd00698c09055a79e12ac2a4b23187c0b6146b4ef0745b21f0bf975
 DIST metrics-discovery-1.12.165.tar.gz 4907749 BLAKE2B 74c59f45580649b950fca6eb2a0c31243211ea45e79dd43a3a333cc0efabece9846e8f9c944a7bcd01cbacda18b4390f436aac7b6a7f4c0ffbbb1a97d325a62c SHA512 504a0dd55e9a4582f0515006130df6af9c086936593cb4ac14e6fdcbe8ba746a4425b1ee8f576b604842b5aaf72051e8e84c4a192198a556553114f21df5b63a
-EBUILD intel-metrics-discovery-1.12.164.ebuild 669 BLAKE2B 261b23c4818ce76ccfb61e7b11ce7dac20f3e3ff2b024153b60ebb78fc473f88a91500dcd01cc8d4b72ca2f132805e6179da20c68f81b322d740662709dfe922 SHA512 e8725c11cd63d6966a84250e85b1f388133b75b1a2fc5452ab1bf7abb50e2816da7721afd88b00ea2346889b567066eca6800cc0be52b7b35942de3c2f3eb62d
-EBUILD intel-metrics-discovery-1.12.165.ebuild 672 BLAKE2B 32de7996a7b19e9a321659fe1439b1d88ce9c081d54fbae048e6f85d1432fd65b2a9db521a503884d6a8c286ef80dff9b4dca9f5d1c41e712d887dbfc14146a7 SHA512 730800940dfcb97b4a8a790465c3954a33afbe6b81c0dc9e9c147b2d9db07c846981cd8c8f372606588e7244265b149c06648d94cb9fd94f9d3e215ff59ec9d3
+EBUILD intel-metrics-discovery-1.12.165.ebuild 671 BLAKE2B 5ab398d4947eba21be186c8c1419192631d71c5599fa010d1aa509ccb391a8a98e1d6100d0a802d034dbbde3d72f2d344ac6f5578c9660f2b01558a4cbbbbf8b SHA512 62fb60cd2af2cbdede2640436f155504b7985f3f1ae2a5ca27baff3ee393934a5b5ef56c252b8c240bd7daff305d6dbea15d43111c6dd9082d9b34a4c53006df
 MISC metadata.xml 815 BLAKE2B 017d27f513969fab6dd984946f3105d8bf0f2c0f29251976016f3b4aff779a22d66ad876bf00553376314681c2ee33beb53c0537a37a80824692001710164c8f SHA512 76548770278fa9004b250a5e8e6b273e49a0aff112e3e1508653c8b4119ed7ec486191ab39f6d22c425b0b07d77b29fc299d36d8faa7167b8af564bb1418aa6c
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild
deleted file mode 100644
index 457d080c331c..000000000000
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake
-
-DESCRIPTION="A user mode library that provides access to GPU performance data"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-
-DEPEND="x11-libs/libdrm"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DLINUX_DISTRO="Gentoo" )
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.165.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.165.ebuild
index fcc32bedadce..e9827e7a4117 100644
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.165.ebuild
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.165.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index b558f9f5c217..d5b78ddc7f10 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,5 +1,3 @@
-DIST intel-metrics-library-0_pre20230417.tar.gz 248881 BLAKE2B 83b3fb48fcb01668bda98c3a5fff1829d89686dd2731163f24a43614ac6b21c2f618be9d2f80115e2ceeffc4df0880e2dfea72a9255d3430f60a88ecd66a8893 SHA512 1b5878528e2146c9811b43b74ddb94f14b1127dc0e6231cc4ff0993d528c8ccea4d9ba52a8e50b409eb9f0e9776cbe04df7c0d1e94a8cf7020b97b822b430c13
 DIST metrics-library-1.0.133.tar.gz 248109 BLAKE2B c7d4444710e0f55bb930497891822f11ffb90ed115a9b7f8eac6128c2914b59a0628173f0b8d644418793a82bd5ae87753eaaf9efb0363a18717c811505c3fa6 SHA512 7b16cad2ddae7e9a2c38e408df378e0263e30e04365cec0554a8351b47455b63308564f65c37b8504f4f1bbd50ebd18e4e81470a010076c6f1805f4908389b25
-EBUILD intel-metrics-library-0_pre20230417.ebuild 705 BLAKE2B 479b98452c0b7af004ea6fc2ea8f0756b7664db5a6f525d8d13715c377d3261b9cb63f1074488fb4b71757c3529509cc4978bb0170b28faf5d84bf06a6b0e70a SHA512 548db44235406dfcb60ea804835d8ead2faad053b9df05ad210505adc3fc127645973992d5a018aff02d4c2c5f59fd509aa6e9e5fadeb8867f282523e82dd6cf
-EBUILD intel-metrics-library-1.0.133.ebuild 634 BLAKE2B 1698413771279ea62b9baacdcc020e3428300c908dc0463e7a0331f45ccacb42139395a2955347b79b9bda28005d38428acfa348d9c8923095621a631295f346 SHA512 ccdbab276a72a7f1a39bcce26a6c790b08a347c6ed712efd3db69ec95e445165962f3ee4d9273029d69e6271bc8062762ed718a4e6f75afe15f57fc25c4f0e1a
+EBUILD intel-metrics-library-1.0.133.ebuild 633 BLAKE2B d4a076358eca22d10c7dc5ba0ecaa66a658d1eb30cd4d6cc06e3825b1b8b25c204855d90138ccd91bababa67f730bfff391b10d2d0cbba5592c0e01bb8117ce5 SHA512 5bb80db17379ec63122d4e4aa79c8f4969baae4a13f1275caa58c524aa23bab76ecc128f2c589709165aa2888a0316cadc7bd4dfd53eed70abf8db5efa04536b
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild
deleted file mode 100644
index 9940af2c6e7c..000000000000
--- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-EGIT_COMMIT="5524ef74cf0423006992a52571590cb8bc2d7468"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake
-
-DESCRIPTION="User mode driver helper library that provides access to GPU performance counters"
-HOMEPAGE="https://github.com/intel/metrics-library"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0/133"
-KEYWORDS="amd64"
-
-DEPEND="x11-libs/libdrm"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e '/-Werror/d' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.133.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.133.ebuild
index da9c0440f61e..3a47e9b8afd5 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-1.0.133.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-1.0.133.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index ffee45f40c15..a99714653f08 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,3 @@
-DIST level-zero-1.12.0.tar.gz 847748 BLAKE2B d25ea5a2fbd3c3d1492c0f4d5e237c718287172785760b9acdf6c466c7c544758ab1664a2b295545f04eab1827e01ae44ba306dbcc0b103e455b2b13995639ce SHA512 8c41cb49c5098f4f8c7b88353e3d239f69b315d1e73ee8b4952059612523bf1758f693bc2869dab46cd833a7b37b66fbb639796a42af00a3939f6ee38d26373b
 DIST level-zero-1.13.1.tar.gz 886141 BLAKE2B 721d8c6265b168b793d6072ff2f679dbecef31005315d369a740bc1877f3645b5f8bc56caccd425ccd5e54b86344b42da949d3454df2779158f4671accb0d1c5 SHA512 1da12b0a4b60c674760cae80099c9c0422002a157a877b044fff5e8c1c214ab9c4877a2a5087cc1609a723685dbce09c94d7643279d5b4f3b2a8db8bb8e10c1c
-EBUILD level-zero-1.12.0.ebuild 633 BLAKE2B cc086dea7cfc67032a123e83e1bfd4ad1edd394418e080469a428e06b8f20f12d97d0c23ece9b7117f0b34f60b7a130588028396eda5f482281f8418d360a466 SHA512 ddb0dd1061a98c8713976e148e700d333c7a35f492dcde7c6241bc21597322d8a498c63097a7493a081ba7b6c400a85fee6a0aaacffef83e9a71ffb8c0ab3e56
-EBUILD level-zero-1.13.1.ebuild 634 BLAKE2B 8780849488c71843451d7db0b9193ece1764b33c0c225de726dac941bae1cfc0180f0be3362f9fead6a9b079f0eb6200be8fa3b3b807ed3f8d9489e7b534bf16 SHA512 89bee1d949d0f73f5d3a1b71f1f07ab2e952a5b325795a9b77b783af34c4a85daa45ff48aa0ae836b0cdb9f43fcf06954b7ad90eb69b97894952947e4a23ffb5
+EBUILD level-zero-1.13.1.ebuild 633 BLAKE2B cc086dea7cfc67032a123e83e1bfd4ad1edd394418e080469a428e06b8f20f12d97d0c23ece9b7117f0b34f60b7a130588028396eda5f482281f8418d360a466 SHA512 ddb0dd1061a98c8713976e148e700d333c7a35f492dcde7c6241bc21597322d8a498c63097a7493a081ba7b6c400a85fee6a0aaacffef83e9a71ffb8c0ab3e56
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.12.0.ebuild b/dev-libs/level-zero/level-zero-1.12.0.ebuild
deleted file mode 100644
index 44fda91ff929..000000000000
--- a/dev-libs/level-zero/level-zero-1.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
-HOMEPAGE="https://github.com/oneapi-src/level-zero"
-SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# According to upstream, release tarballs should contain this file but at least
-	# some of them do not. Fortunately it is trivial to make one ourselves.
-	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
-}
diff --git a/dev-libs/level-zero/level-zero-1.13.1.ebuild b/dev-libs/level-zero/level-zero-1.13.1.ebuild
index f019194f4f68..44fda91ff929 100644
--- a/dev-libs/level-zero/level-zero-1.13.1.ebuild
+++ b/dev-libs/level-zero/level-zero-1.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 54afd016bae2..53111a0dfadb 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,8 +1,10 @@
 AUX libfmt-8.1.1-fix-static-assert.patch 2670 BLAKE2B 781ccf10647dede937f38f2743dd3ab381c307774d136aeb974997ba6f004bb0e30ba02fa5e69952f76fb142133c9e5c9867194352d54ec6d9f4bacf9a13fa09 SHA512 c03186a3d4d1857f5063e94a5bdbc764535c042d98dc20d577c88ad3d93a60d75e7bf6a95c547df8fc7b037c021b464b9e47b6fcb6aba4ee9716e1727f181cd9
 DIST libfmt-10.0.0.tar.gz 851582 BLAKE2B 4e778fd352ed084b9790b59b4875fc6ed04b7a58a40b3673854dd00763f492cc838970e8faef77b5f9db5e912a2fc77943aedb4ca4afb64a3736129cc4611809 SHA512 6188508d74ca1ed75bf6441b152c07ca83971d3104b37f33784a7b55dfcc614d6243e77e0a14220018586fdb86207cc033eece834e7acd5e0907ed4c97403f3b
+DIST libfmt-10.1.0.tar.gz 849294 BLAKE2B 9e90bdb91ac9f34bf75bcb0c0f45a90ce9d5c27c0a47c2e5c2d09972ab03e6da32e29ddd33761b8347eaa0db0ec79af4f8aac93d3f38c9d9f29b49bb24779467 SHA512 69a7b8584f828528e3bb4b87153449e96df29bd740adcd42a2e3d50ae4a270c80a5eb2c3057337048be5b978094d8bb73bec3378e3b6370748de2b063dd0aa4b
 DIST libfmt-8.1.1.tar.gz 826254 BLAKE2B 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
 EBUILD libfmt-10.0.0.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
+EBUILD libfmt-10.1.0.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
 EBUILD libfmt-8.1.1-r1.ebuild 816 BLAKE2B f2012a5435e3d0f901b4a50ec64b20658120dec8193d9f9d1543df6574a0d1f066f0982d4cde2d47b1c3617563922336116bec97d25e91eaa5334b92b2ae0416 SHA512 0fd7f2f39dc951b623836eb8eb82609840d13112a210aad66f689ec9b1e8a79a281cbdb440662a53c4d30807a3faa0248b9f5f7a5d70579ce7a0486d4eac14fe
 EBUILD libfmt-9.1.0-r1.ebuild 738 BLAKE2B ffef28608b617ffb72ba0688360441cdf4e3a8a0a5ddf322c6c86b0d9f9a506088a8bf176c68d700f8fc5d8e9ec8dbfc5722402956694ccd16622f54dcd8fa43 SHA512 03b54d76ddc705d0ac1f88de9be26ecc1c7f9c27945955964687df66a597bb92471825a5c5e0c309dd13ce18d8a3e27e23bc7d6ee0bf98934959c33b2303c9e5
 EBUILD libfmt-9999.ebuild 738 BLAKE2B 274dabcc16a5f6ed496a7226399caebcc3fa9e207ed5c399c30756d95ccdebafaf924a4581a8c01690fa2ed46c376187ecee0ea012a7e99898df700bd51883ce SHA512 cf21e16c913a42825651e0a3cffe7a77185be3c6c8ed59f92ec3d2e3d97fefe36b486f3b20ae861690e31f4c60c572a51dc95c9b62e4bef9d2f40ef2f91808ec
diff --git a/dev-libs/libfmt/libfmt-10.1.0.ebuild b/dev-libs/libfmt/libfmt-10.1.0.ebuild
new file mode 100644
index 000000000000..90083087d20e
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-10.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index 4fa1261471fe..8a0f8ca418eb 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,5 +1,3 @@
-DIST metee-3.1.5.tar.gz 73077 BLAKE2B f8cdf6d07b8458f0b8e66c5c9e93e9fcb4ff3881512c6f0d429522fb38f48dee6f751f87cbe07f16edd98f24b1477adbb076f2fad3894a52838523828ff7c72c SHA512 3c42bba3e47a38c08747acb4f760c046bd5ff9aa74c96f70cdfa9905f027f04eb691ad1d7dd5f2bccfa2c7a749e5e7c153a3c6f1ecaaa813be4ddc152180fe0f
 DIST metee-3.2.3.tar.gz 77077 BLAKE2B 25bec9184dd6080f3705ad6ecff0050e7bb22fad76bfe3e218fd143519d9ecb801d46fd7d31044f9c3f2931217b167275b78456ccb7115edcea1a487ea8fc4ae SHA512 eea6b606cd1b8973531088a3a36612b5ad087c4d184ebc4c8d511151af553c33ee842efd826014ec11e49d223b2594bc4c6b605b4dcd8f1546bdbdf902c1c3c0
-EBUILD metee-3.1.5.ebuild 772 BLAKE2B d8f10e59fcc3724e2a0c88c8017d839fc67e54e344508ad911bd22d125da00ece61b60be136a5aea5d66db3ef036389a3bd87574f058566b6dad0c305be4de51 SHA512 491490597246a250668c127c1cfd9aa51efb2829234045a8c1c10f4923f110eea600cce85bbd89403d13ef6839441972562e4e0f27b1e470fbf054bf1b48ecb7
-EBUILD metee-3.2.3.ebuild 773 BLAKE2B 0296a1aa2315043ebf8987f24478ec7f1ba454e60085314b1814b530c561f57f80571ec6c627a5aca67be6d44b25ef0f65b9cad7a62bf97cf39d086eed7ba354 SHA512 83f56b4d9c165e0303c077d0d5d5218b9b21ed98b2724b226436835ef6e63ca73f8c492affc40bd1f65c32e89360d35a837ab0b9f8d90ce615d458fec91d8cc0
+EBUILD metee-3.2.3.ebuild 772 BLAKE2B d8f10e59fcc3724e2a0c88c8017d839fc67e54e344508ad911bd22d125da00ece61b60be136a5aea5d66db3ef036389a3bd87574f058566b6dad0c305be4de51 SHA512 491490597246a250668c127c1cfd9aa51efb2829234045a8c1c10f4923f110eea600cce85bbd89403d13ef6839441972562e4e0f27b1e470fbf054bf1b48ecb7
 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1
diff --git a/dev-libs/metee/metee-3.1.5.ebuild b/dev-libs/metee/metee-3.1.5.ebuild
deleted file mode 100644
index 08c70f405d1f..000000000000
--- a/dev-libs/metee/metee-3.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
-HOMEPAGE="https://github.com/intel/metee"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-	cmake_src_prepare
-
-	# Respect users CFLAGS
-	sed -e 's/-D_FORTIFY_SOURCE=2 -O2//' -e 's/-Werror//' -i linux.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS="$(usex doc)"
-		-DBUILD_SAMPLES="NO"
-		-DBUILD_SHARED_LIBS="YES"
-		-DBUILD_TEST="NO"
-		-DCONSOLE_OUTPUT="NO"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/metee/metee-3.2.3.ebuild b/dev-libs/metee/metee-3.2.3.ebuild
index e6ad43ce8784..08c70f405d1f 100644
--- a/dev-libs/metee/metee-3.2.3.ebuild
+++ b/dev-libs/metee/metee-3.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4276ed0d8fa5..bf8b3d5d3b44 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index 4a91326a2e95..083326b1d2a5 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,6 +1,8 @@
 AUX pytest-salt-factories-1.0.0_rc20-tests.patch 17428 BLAKE2B e52c44dc43f08f7933fbcea60e4ba39351cdaae79dc4037a490ae222cd41286feb308c66abe90116417f72ac0aa3c968dc30afd914545f3c08ce5f4c75d43a85 SHA512 6ac3af11d518834125fd41e9e3b49a383079cdd48888044b3009eea4f0a066fe2b8b8d20a8fc7cf6331cd8269c98140d5203dcf0f5a64504c952d8a5bd652ef2
 DIST pytest-salt-factories-1.0.0_rc20.gh.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
 DIST pytest-salt-factories-1.0.0_rc23.gh.tar.gz 162711 BLAKE2B 28610679d7717d7a6f97a2f14a1ac838aec5101171ae65f2328d9b902d04b272c5e37f08d8ff3414af52ff7af954da24c083dfdc4afd1a9342b09cce0bf5aec3 SHA512 22d8f4a1c48a144437b9ff7d064760b59bb2a1003838e07f446a6150a77c162bffa7f21c570f796d8214d870d5b029e92abf7b0410ce19726085b607628364f0
+DIST pytest-salt-factories-1.0.0_rc25.gh.tar.gz 166148 BLAKE2B 11935c0164727968b9f2bd6f77498ea9ed4dbafd48bd6bb2730716fbcb1bb69b1ab09ef9ea2e2519368f4b6408bbb03f41fb0e52fc3cf75695f2b9c2b8d37294 SHA512 dd18688731b6bd2384abff9d739154b1ca7786bc3843d9fa8c293d1950925fff6c5820680a8095d4d5f3b75bcaeb07d8b3c7703ecab64a5f3a28bad11da18397
 EBUILD pytest-salt-factories-1.0.0_rc20-r1.ebuild 2098 BLAKE2B f8100dc074e78206ce1da4f5a964de6f18be4c7fe1ad181c1101db5666d68532d4a65882bc62dd03e7e0e72ac6227337ce9e1467d3d348abbe8b4f684a5fca36 SHA512 be97b9ff2e501e8e9cc252482446aa00fbf253a9ee6e12c691fb9e14685c39eac710c96242d0f7c18f1ce4e068d7b61a3cc8e7f466a95512aad4c0b55fe43c8d
 EBUILD pytest-salt-factories-1.0.0_rc23.ebuild 2157 BLAKE2B 484a02515c9efed4370738cba944730210f3ef19d8bca02352cafa8c907d9472188e00946292a75de82c36fc0578167766797f8a840ab9967990b0a7ed9ac371 SHA512 1c9931e7c35dc07325b9359728237c99792ebb87e330ddaf811ed9475243726bcb541e364aed82a214f0a22f6e37e9034c72510f921cbf67e66845df63be6aa0
+EBUILD pytest-salt-factories-1.0.0_rc25.ebuild 2884 BLAKE2B 432dfa2a75ca1281008fd66b8afc9c53f479e257eb4d1a7954fec7f27e9c1281f3a40366ba0ff12c5635c93efadbbaef65cac410f05e126e02d0563d8533e3b5 SHA512 0021ecad65d2b37fb77ac910a90feb0aa27e88b5aac4815702a6a110a8260830cfa0e45c60c75c3f807cf77d554ae804c6174c179c6add51585e7e108f6d03df
 MISC metadata.xml 429 BLAKE2B 84a4af391d2a8bee687c8499a7642117ee99483439c044695d5d68a546fad02f1e6e96d88a56c2eaaac0bfcb8f7df97313723fe562885c72c952f052334fe825 SHA512 f561d42e196c7d9bcfe656149ba40e94a52c84f3fe518b6039dc9c7c1d213c22bba8817bc35563049526efb59cfc6eeb1ca9c1021f635a099e81e72fbb5d3c52
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild
new file mode 100644
index 000000000000..96e8da584d36
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc25.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="The new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${PV//_/}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/docker[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+	>=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=app-admin/salt-3005.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
+	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
+
+	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
+	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -a EPYTEST_DESELECT=(
+		tests/functional/factories/cli/test_call.py::test_version_info
+		tests/functional/factories/cli/test_cloud.py::test_version_info
+		tests/functional/factories/cli/test_cp.py::test_version_info
+		tests/functional/factories/cli/test_key.py::test_version_info
+		tests/functional/factories/cli/test_run.py::test_version_info
+		tests/functional/factories/cli/test_salt.py::test_version_info
+		tests/functional/factories/cli/test_spm.py::test_version_info
+		tests/functional/factories/cli/test_ssh.py::test_version_info
+		tests/integration/factories/daemons/ssh/test_salt_ssh.py::test_salt_ssh
+		tests/integration/factories/daemons/sshd/test_sshd.py::test_connect
+		tests/scenarios/examples/test_echoext.py::test_echoext
+		tests/functional/factories/daemons/test_container_factory.py::test_skip_on_pull_failure
+		tests/functional/factories/daemons/test_container_factory.py::test_skip_if_docker_client_not_connectable
+	)
+
+	local tempdir
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" || die
+	addwrite "${tempdir}"
+
+	(
+		cleanup() { rm -rf "${tempdir}" || die; }
+
+		trap cleanup EXIT
+		export SHELL="/bin/bash" TMPDIR="${tempdir}"
+		epytest --no-sys-stats
+	)
+}
diff --git a/dev-python/pytest-system-statistics/Manifest b/dev-python/pytest-system-statistics/Manifest
index 9eb20476b0a2..6e273548fdea 100644
--- a/dev-python/pytest-system-statistics/Manifest
+++ b/dev-python/pytest-system-statistics/Manifest
@@ -1,3 +1,5 @@
+AUX pytest-system-statistics-1.0.2-loader.patch 1940 BLAKE2B 1e7e9738d928c72881b7e67715eefe898ced9d1031bc93a9fe899199143dd29d51361a24187fda9e41bc4ee892d7bfdd2ffbb290baf915ba287a546f56c9a34d SHA512 bfbd78c791123fdabd6e2c2c7a8d8ca71488c61a8767d450b8a72fc81a42ec2db9e9c079938f847fb3b5aa33a0ac4bb872c957c1c98e1b6fcd41e403aee4b5c0
 DIST pytest-system-statistics-1.0.2.gh.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
 EBUILD pytest-system-statistics-1.0.2-r1.ebuild 1295 BLAKE2B eae32641beda48982e02f0ed8dd4dd1f1341673c2ce9e56e529e09055becce15e0f5d8001dd8678fe08309c0bbf2f005e1d66e82b4ddd4c69b00fccfe7311097 SHA512 b5e64186a94d5a10e78af2c2b0ebf2e4eba616d8fc0ad0d8d2fa2669d96412f32db4d944f221ce830253902daa947c07e4f61b7cb0a54cabf11607b974ae85d9
+EBUILD pytest-system-statistics-1.0.2-r2.ebuild 1502 BLAKE2B 9376e69e79f2679bbf4e9daa19c22c5b57423b49a9fb1934797bab629a13d3dfcdc30d98614ccd6044aff7e981bdca3e990959a82d0ed9a9b663c11315ef54ab SHA512 289a8dbe549d6b72a15248e791576ff9b005a1f276bd3a799a096b659321f3a84701f814b8bafef294f007a75a1c3f50d8b86f0624a59c317f6626fa1b0738b9
 MISC metadata.xml 337 BLAKE2B 00bcf31ed6a7b0b94fe3bc0f3031d64bdd682be4797a4f2878ac0d66012d8c026a7295c923f9081f9e7b1b2dc1fd7c6dc7a4e33dfcd97f80785a737815979313 SHA512 a28c702734f0907afdb667a42e8d2672ab938bb4802f4e55e69de872694176b5424cd7073a9b2caee7dbe856fa511e41447ed30e49cc64d053a14b9ad830766a
diff --git a/dev-python/pytest-system-statistics/files/pytest-system-statistics-1.0.2-loader.patch b/dev-python/pytest-system-statistics/files/pytest-system-statistics-1.0.2-loader.patch
new file mode 100644
index 000000000000..6d4751759617
--- /dev/null
+++ b/dev-python/pytest-system-statistics/files/pytest-system-statistics-1.0.2-loader.patch
@@ -0,0 +1,43 @@
+diff --git a/src/pytestsysstats/plugin.py b/src/pytestsysstats/plugin.py
+index 4009858..3067f73 100644
+--- a/src/pytestsysstats/plugin.py
++++ b/src/pytestsysstats/plugin.py
+@@ -231,20 +231,17 @@ def pytest_sessionstart(session: "Session") -> None:
+     ):
+         stats_processes_instance = StatsProcesses()
+         stats_processes_instance.add("Test Suite Run", os.getpid())
+-    else:
+-        stats_processes_instance = None
++        session.config.pluginmanager.register(stats_processes_instance, "sysstats-processes")
+ 
+-    session.config.pluginmanager.register(stats_processes_instance, "sysstats-processes")
+-
+-    terminalreporter = session.config.pluginmanager.getplugin(
+-        "terminalreporter"
+-    )  # type: "TerminalReporter"
+-    sys_stats_reporter = SystemStatsReporter(
+-        config=session.config,
+-        stats_processes=stats_processes_instance,
+-        terminalreporter=terminalreporter,
+-    )
+-    session.config.pluginmanager.register(sys_stats_reporter, "sysstats-reporter")
++        terminalreporter = session.config.pluginmanager.getplugin(
++            "terminalreporter"
++        )  # type: "TerminalReporter"
++        sys_stats_reporter = SystemStatsReporter(
++            config=session.config,
++            stats_processes=stats_processes_instance,
++            terminalreporter=terminalreporter,
++        )
++        session.config.pluginmanager.register(sys_stats_reporter, "sysstats-reporter")
+ 
+ 
+ @pytest.fixture(scope="session")  # type: ignore[misc]
+@@ -252,5 +249,5 @@ def stats_processes(request: "SubRequest") -> StatsProcesses:
+     """
+     Session scoped process statistics tracker.
+     """
+-    plugin = request.config.pluginmanager.get_plugin("sysstats-processes")  # type: StatsProcesses
+-    return plugin
++    if request.config.pluginmanager.has_plugin("sysstats-processes"):
++        return request.config.pluginmanager.get_plugin("sysstats-processes")  # type: StatsProcesses
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..1b51073f1fb6
--- /dev/null
+++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Pytest Plugin Which Reports System Usage Statistics"
+HOMEPAGE="
+	https://pypi.org/project/pytest-system-statistics/
+	https://github.com/saltstack/pytest-system-statistics
+"
+SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pytest-system-statistics-1.0.2-loader.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e "/setuptools_scm/ d" -i setup.cfg || die
+	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
+
+	printf '__version__ = "${PV}"\n' > src/pytestsysstats/version.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/functional/test_syststats.py::test_proc_sys_stats
+		tests/functional/test_syststats.py::test_proc_sys_stats_no_children
+	)
+	epytest
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 425b449dfb16..ac4de572e2c3 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 3a5eac0afcf0..4319735bc70e 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,12 +1,11 @@
 AUX qtwayland-5.15.10-Destroy-frame-queue-before-display.patch 1607 BLAKE2B 4a408f62d1b330b9f3c404d17b7771c24015bdba3dd02386446652d30e6038db6e0b77aeeaeb32537a0afe10b2e7a2a2a69a9a8e7efe3b1ff03c72eb6fd85427 SHA512 39bbdf0b9e501e8b101af5f29783eb4432e7dcad97362efce1b97b95bd70334bbc5e4fb707a4fe350a4e04d8dbb520faba77a283eaf8ccf331af40c8f65ba7e9
 AUX qtwayland-5.15.10-QTBUG-95434-convert-cursor-bitmap.patch 2406 BLAKE2B 523c1a932b46c0dccef224a4ecb11e147e32bc6655373d09fa7c3f7d0ca76fbb69284ce764462d8c4261d13acdf6ef65e5a05fac6cf75c23e264ed66ac42d9e1 SHA512 18366b5ede089581a2c1b1a87dd4d5ce3eb5a29606cb36cd9eefe7a4ee2861dfe87fcb75c44d6237b35e87a3c8106f6e78a34244230e0e20f9a808509daa6e86
-AUX qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch 2364 BLAKE2B 5c623371a016a4e2fa30fe9f9579e3a6ee754330c1528d43b154de08ef0a49888b49347eac449b73e916c670dc1b54bf07693697f123bacc6441cf21f59fa4c9 SHA512 57caa645cffffe559c9ea61320e88929b9697817edae34b91331f68fb69ce51d98e05f5787fc5f29dd568213b0c374dcea1af8a1911be57265679590be21bdbc
 AUX qtwayland-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch 1451 BLAKE2B 63b053f96f4added309a96d33caea1f361087511cb82249864b4a9971794739903e4df1c240c0a42f71295bb0b4f0f48338e6fcadfe9549372d2b581cb2464b6 SHA512 9be539b99cba04e3009a4a61eb5890708f8cafb09161e2d11868bb3a687591d6d4758a13c469ca22b89380cf1a1950d844c25212ead7b64f45ac275db464a051
 DIST qtwayland-5.15.10-gentoo-kde-1.tar.xz 42480 BLAKE2B 3902ecb713b8f35922b0d19bef0b2ec340ca52feb4b61de629dfa6b344d7f550de3e509e265f4476eb907f78b55d5c50c21d9dfeeb7e2e8f680a43fffc911ed4 SHA512 6a131ca2db008a2d224ee6733f47d05a455a8487d38b45cf63882e98e2c29d8163ac5d2f2c2e043f03103bada6e212b5d33cbf11677f8ca2b86fdbf02fc2b239
 DIST qtwayland-5.15.10-gentoo-kde-2.tar.xz 43076 BLAKE2B 735ac875c0957de47f90d08931eaaaf8d53b1db0012c7d0a592c78ae78da56ffc8a1ba9bbac0577a78d4c05a92a22acef51a6afc95db54bea2d1a2a9658b67c4 SHA512 e0131bb1f2a09597a85d1d8a402bcb1d529cbc44f62e9be8dd8eba9c10007ca4f83572ca48052529b2325cdd8d886abed1f96ba4e00768e4b1c2febe1eb5ef91
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de SHA512 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48 SHA512 520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
-EBUILD qtwayland-5.15.10-r1.ebuild 1414 BLAKE2B 90162d26eccdf63926cfd4bfce884e4cf43a10c8e3464e3f2d89bf50f831e77269508a7e33205a28337c230d2f9db611d587b9d2e88c0d49e954ad8eb814a965 SHA512 ef9ff3968554384e4f5d4a8ec92dd8efa0ff1464007fa308d2b34b8a3987e70383b56acf3e4cba659727045abf0fb8bfe1461b6dec4f15a1b53b592c25c2bedf
-EBUILD qtwayland-5.15.10-r2.ebuild 1426 BLAKE2B 99f1a590bb16a016785c3798f57fa95fa9db5f6a66907503fec7b413d0c20154ee93121c8e205b04e41532739a9ca70fef6eea10e4ead42dc3252ecca5c86291 SHA512 5c5e00d8a0c741ce2ac46ac377e7b6c8c40c29b4951036c5df987db2729b90e0c52948a693f3e5f0c07f88ed0cb1014ab5142aad2c2e67168593eb5904c80bf6
+EBUILD qtwayland-5.15.10-r3.ebuild 1345 BLAKE2B 16a6cfcd0d43cce18ceeb1b8dfb161e553136dc38712bcd94068dad50acb7ad2f5e2f710e0f0b39f5a44e47df67bf854d8cae26f41442e4f68d80fa0ed0ffbfb SHA512 5b3f5fc391892466f324bc16d1a617abc4b8e60ff26fe0b4316f72a61b747541953944b9e1fc5193b7693148bf55d73a132d893b3ce21828e3e3c6fddaa6a171
+EBUILD qtwayland-5.15.10-r4.ebuild 1357 BLAKE2B bed6276bda779f0155f9f01879ab26357de44410b8c276f40100750c106eaa77d417ab6af3f8a7fc17df644d6e4c9f3c87cd9ecadc9c3ad44586919ad20ef4f9 SHA512 77845fe0b2f430016314e90309d5e3cfd1c3f1469152146f31b632b47c1a366e4cc7caa2dd193ff01668505a0083765db4b7db78fb428e1f367f3211fc2faf2a
 EBUILD qtwayland-6.5.2.ebuild 442 BLAKE2B 844f06e4063c17dd8b3e0a8835aeda220a0ade9d07213a42abbc38d37b3e1b6fa71423e07e2ef66d0628a9bb4afa9656c68dd9d7fb73b3e3a597e6d573f84587 SHA512 9f6235b34e56466eea51dd3513f53d0387d4a068a9f429ecb84f90f32f257967e2940e6d48a6029c6a2118915fd5592d14e73a6ef5aeac8e4429a6b2fc4ef8bf
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch b/dev-qt/qtwayland/files/qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch
deleted file mode 100644
index 1e949fc32355..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.10-send-release-button-event-on-pointer-leave.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 90995b07d2d4dbd12b7e527a881bf9d6158e277b Mon Sep 17 00:00:00 2001
-From: Ilya Fedin <fedin-ilja2010@ya.ru>
-Date: Sun, 19 Mar 2023 10:24:59 +0400
-Subject: [PATCH] Client: Send release button event on pointer leave
-
-Fixes: QTBUG-97037
-Pick-to: 6.6 6.5 6.2 5.15
-Change-Id: I151239b276ab5aefe166f5615baf43dab428ce0c
-Reviewed-by: David Edmundson <davidedmundson@kde.org>
-(cherry picked from commit 8235fa65fe033a94e7a44322d3502f25940092ec)
----
- src/client/qwaylandinputdevice.cpp | 9 +++++++--
- src/client/qwaylandinputdevice_p.h | 1 +
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
-index bc05583a..e562c7a7 100644
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -688,8 +688,8 @@ public:
- 
- void QWaylandInputDevice::Pointer::pointer_leave(uint32_t time, struct wl_surface *surface)
- {
-+    releaseButtons();
-     invalidateFocus();
--    mButtons = Qt::NoButton;
- 
-     mParent->mTime = time;
- 
-@@ -804,6 +804,8 @@ void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time
-     default: return; // invalid button number (as far as Qt is concerned)
-     }
- 
-+    mLastButton = qt_button;
-+
-     if (state)
-         mButtons |= qt_button;
-     else
-@@ -842,10 +844,13 @@ void QWaylandInputDevice::Pointer::invalidateFocus()
- 
- void QWaylandInputDevice::Pointer::releaseButtons()
- {
-+    if (mButtons == Qt::NoButton)
-+        return;
-+
-     mButtons = Qt::NoButton;
- 
-     if (auto *window = focusWindow()) {
--        ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers());
-+        ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mLastButton, mParent->modifiers());
-         window->handleMouse(mParent, e);
-     }
- }
-diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
-index 5795f138..bafe3db2 100644
---- a/src/client/qwaylandinputdevice_p.h
-+++ b/src/client/qwaylandinputdevice_p.h
-@@ -346,6 +346,7 @@ public:
-     QPointF mSurfacePos;
-     QPointF mGlobalPos;
-     Qt::MouseButtons mButtons = Qt::NoButton;
-+    Qt::MouseButton mLastButton = Qt::NoButton;
- #if QT_CONFIG(cursor)
-     wl_buffer *mCursorBuffer = nullptr;
-     Qt::CursorShape mCursorShape = Qt::BitmapCursor;
--- 
-2.41.0
-
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r3.ebuild
index d724c80f99ba..cab77b1950fc 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.10-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r3.ebuild
@@ -35,7 +35,6 @@ PATCHES=(
 	# QTBUG-97037, pending upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/71
 	"${FILESDIR}/${PN}-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch"
-	"${FILESDIR}/${P}-send-release-button-event-on-pointer-leave.patch"
 	# bug #910315, pending upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/73
 	"${FILESDIR}/${P}-Destroy-frame-queue-before-display.patch"
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r2.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
index 7e7e512c763a..42e95c1c6c20 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.10-r2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild
@@ -35,7 +35,6 @@ PATCHES=(
 	# QTBUG-97037, pending upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/71
 	"${FILESDIR}/${PN}-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch"
-	"${FILESDIR}/${P}-send-release-button-event-on-pointer-leave.patch"
 	# QTBUG-95434, pending/approved upstream:
 	# https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/79
 	"${FILESDIR}/${P}-QTBUG-95434-convert-cursor-bitmap.patch"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 254ed6dafe0f..28bb0c25f84d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index 304bba4959d4..4ce142c92568 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,3 +1,3 @@
 DIST moneta-1.6.0.tar.gz 136501 BLAKE2B 5682cfc265ac1c132f53d91c0cb6c2a99a08130d144d2eb8fb544952c29a77556066b36e9ea727df941b1768dec28e99bb3e3f4017ddf5e3cb38e690bcadbe0a SHA512 8f372bfd769205b88cd6f497266074784588ff04b99e3383641b4171cf586210a6655f003bb9e11fe5a2e9dfe5ebbb5fe372b415e2927ab50ee9c8f28bed6b5d
-EBUILD moneta-1.6.0.ebuild 802 BLAKE2B 98fba4ca2f7062391f65918b1afdc8cc319ad8508733cb48b85da4c35735ce9e557e2857d36ef172603ec8445e9734336cd1777b78f09b1f27caf39709de5740 SHA512 2caa8be03c1d7caa091523769030a25cff21da45c161cdbb607bed8d524b27f69a7d3e90cedef21350f050dd7c7515e3dbc679389383cec5e140e71d26af7e9d
+EBUILD moneta-1.6.0.ebuild 809 BLAKE2B 23ed52bb47406b4a95ce4a7e6bf6fc69e7b0b727aa1abe22b3d0b9ab4e789d8fcb89b94dd4642cf5be1f0095943e4c1196152a7ab54f768c80ec50dcfd79abb4 SHA512 16c3f5f536ef47ecc6c054efe39098a0679cb5cc3a44ee4155495b3ac6a94fb111c9c0b5db579ec8567cb76c5d7b289e27dfde7a10e8e73867242ba2b7e875ab
 MISC metadata.xml 343 BLAKE2B 81bb447c53e50cc401fd1b4135f4145f9195799772f6a5941246c9b34e550d3f6338d4458232f02855abd4f5a96028b2b8c75db5b3d2bd48d037a8397fd0ada9 SHA512 1933fe9ec57ed4871b0571ab1ae6d17dc0a79c534eb02d515ebc6829f640dab16162558f7cd1b321b6063389ffb95847ba7ec04aa5e9101814338bc0855de91c
diff --git a/dev-ruby/moneta/moneta-1.6.0.ebuild b/dev-ruby/moneta/moneta-1.6.0.ebuild
index fc4f1c4800b1..7baef16d4107 100644
--- a/dev-ruby/moneta/moneta-1.6.0.ebuild
+++ b/dev-ruby/moneta/moneta-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c56157ded240..e952adc70327 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index f1a069078bbb..635e72f2abbc 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,8 +1,6 @@
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.13860.4.tar.gz 8369568 BLAKE2B cb36943d83dfa0b69e8dc0840de527773262e15f617a67f231071e56bfef67a27783914e947681c6d64f68fcc2caed9a45893cbe1b206a98a311f5699f3769ae SHA512 365221df9178d45cd2f80cacf1f72a61208ce5cb7103e6298ec560675b1c1bf4caf9b8ae4cf8b332179118d1aacc735bd7341a126f6149ef49ae91d37ce98fef
 DIST intel-graphics-compiler-1.0.14062.11.tar.gz 8415633 BLAKE2B 1dd65e37a6d2aa7539aa9d5700921ad9c75c3a5cb6a66870adbe9fac888eb16cc772574666f05ce02d165f8954c7b4ebbfbc2ed2008fdd86c5bbb472b95959ae SHA512 0fd2790997268b102ded0af47d4133cf251791c7ecd15758b378a0cdf6d6640d78cc68b2de0b003710a36da4d4750c7fa90eb2ac5aa1702164e46109fafd980d
-EBUILD intel-graphics-compiler-1.0.13860.4.ebuild 2655 BLAKE2B 21e4017d9ab311ba6ced194ccbb9c77f1586f8835f824a83a0e845609f9f6b2afeca47e987bc31e2823cc044cf8724f9be4b87709ec0b34928c06ddd2d0f5fee SHA512 a3578a375448f4dc84ff6401b84a27e5c626611e6aadcea14bda2c8dfdda713edbc7fc46443ed03db1a1098d8fd39954122d267ae8fe436601ce515a186d78c4
-EBUILD intel-graphics-compiler-1.0.14062.11.ebuild 2656 BLAKE2B d04b7d39582b235de0243ae5e32aff30e4ba23940c3af8b11a7990264b9a6a2801fb9f5e9e20246e4fb3f7fa8a4c8eda5b471c2d027566578775bff172cb18d9 SHA512 d454459105cf00e91300df5c4b6be0430df4ada2399c0ac3249210258b15892ebd14ab9a7c163f108c2e10903cf0812aefe8ad1f90c8bf9186434c7e87d4fe86
+EBUILD intel-graphics-compiler-1.0.14062.11.ebuild 2655 BLAKE2B 4c078439167bfbd637aa2ae058e3fbe0b7a274217a2f8af9778e0e75bbb727a4f15427aaf849446a50ef30bba4e82e587072e97e2c9369588f6ec91b4dfc3d3e SHA512 0d0f40c58e1751e0e15c2337c3b7f71f6c40afca1e31b93a1fbb13efd8c14666d80ae46a2fc9007cb02b7cdaed085a37e6ebbbab9daa71ef12d643927a8845f9
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13860.4.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13860.4.ebuild
deleted file mode 100644
index 6da373584514..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13860.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="15"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug vc"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	dev-util/spirv-tools
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=
-	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.12.1-r1
-		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't hardcode FORTIFY_SOURCE
-	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Get LLVM version
-	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-	local llvm_version="${llvm_version%%-r*}"
-
-	# See https://github.com/intel/intel-graphics-compiler/issues/212
-	append-ldflags -Wl,-z,undefs
-
-	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
-	append-flags -U_GLIBCXX_ASSERTIONS
-
-	# See https://bugs.gentoo.org/718824
-	! use debug && append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
-		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
-		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
-		-DIGC_OPTION__CLANG_MODE="Prebuilds"
-		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
-		-DIGC_OPTION__LLD_MODE="Prebuilds"
-		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
-		-DIGC_OPTION__LLVM_MODE="Prebuilds"
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
-		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
-		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
-		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.14062.11.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.14062.11.ebuild
index 1d957af7dd89..dd6800bb2dd1 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.14062.11.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.14062.11.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug vc"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index 397ec0ddeb06..018d3c8938d5 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,5 +1,3 @@
-DIST intel-graphics-system-controller-0.8.7.tar.gz 181536 BLAKE2B 663ec335acdf96edd0c084d2c703687925233caa602e30ac1b189342d1e2a2d370975933fc34171703d3161b4c0f1637bb735fdc89bcd7ed6e5a41b49f946271 SHA512 cc0eabb67fed0c40ab1b0f9501bba87b56c1e97e66242df360036256a18d26912525e78e339c6d09c8d9cf557d00aac60cfb354961304ca41e746f4964705900
 DIST intel-graphics-system-controller-0.8.9.tar.gz 187575 BLAKE2B d4b1a95355e4effe09750cf21133641bd711ac8cdd72c4aba7cde8500ef5221012e20d0dbd7f6ac80e84efea58fe36c72a3c7bf967a9fb21504de9e5bad1752d SHA512 649764594f5043ae148949d2804308884bd93bbac83b3a2066339a0bfed64d4f7bca6a84d480fed0d98677d9fd0746520c8dfbcf03d0714bec2628c7b511bbf7
-EBUILD intel-graphics-system-controller-0.8.7.ebuild 1082 BLAKE2B cfdc214379c9382625e5fb1d99184289ee97619d5f5feff1e19743d6b4677e31641318f6abffb9aae80881da8e43fe37f428dfad4efe8b649e8434de028614bf SHA512 d209cb49e46a5a0abc65cf8ed222bed624476e1dd7c846300f2843167357cee989e3bcdc8746944b22d7eb665c1a98930ba30eb3bc54e7ac45439e6059be23d5
-EBUILD intel-graphics-system-controller-0.8.9.ebuild 1083 BLAKE2B c94314ffe0feb833b7de7931b4a073e61c57426c21c6017717ea2be91ef1fe3a0b7f36434d7f080eb82506d726f8bdbb474ead29c2c8ea661554cbee9a9ba8dc SHA512 136fb109fc8e5a19101c1002325fa052dfdcf8b3178354b980e923fa9f77cda161ffe651eddc29c8b97a43f8a3ba4e166f030b3e83a5e95a93dd4ff427c96cac
+EBUILD intel-graphics-system-controller-0.8.9.ebuild 1082 BLAKE2B 83b9768bc3ddc68683a433c330d6fe4a59cf5c0dfb9e696fcf3c1911878d38bfc8a8aab637783a308ef4b11fb2f94016e3ac785ad2f79784ea469baccfd94ac1 SHA512 3b489ab94d6d9f863f754f1f721e4c04301079963b749a6064dc71d3b5de4a75a82837a7f8314912f7faa6e35f613d49b08f09bc569211a489498b66b6620d76
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.7.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.7.ebuild
deleted file mode 100644
index 689dbdd96db5..000000000000
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="igsc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Intel graphics system controller firmware update library"
-HOMEPAGE="https://github.com/intel/igsc"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE="+cli doc"
-
-RDEPEND="dev-libs/metee:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-"
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CLI="$(usex cli)"
-		-DENABLE_DOCS="$(usex doc)"
-		-DENABLE_PERF="OFF"
-		-DENABLE_WERROR="OFF"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DENABLE_TESTS="OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.9.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.9.ebuild
index ff1f3dca0bbb..6544138a65e4 100644
--- a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.9.ebuild
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.9.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+cli doc"
 
 RDEPEND="dev-libs/metee:="
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 8e3af352e3aa..ea2651036149 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 32fcc54b01d2..da91f434524b 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -3,6 +3,8 @@ AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea7
 AUX bedrock-server.service 1045 BLAKE2B 3db6cd6ac572a1f1ae47d6d4f38ce9a9a206f1a6aafe7fc329861b9037cfdb05f903f3458cc8244d5b9539d74d3cd12accd391c99fc3bf08afa3a0122a1ed14e SHA512 575a621e69a297ee02d9b5d846320f598363fd48f9d58dceafd24f21e5c31dd5609dc4af110f36954787bb537907e9b36d43bce8c8f0f4025528f58685d5438d
 DIST bedrock-server-1.20.11.01.zip 88510688 BLAKE2B 556afdb0c0b20502864c04bad027c3f58350ed8b5467fe2cd4cad8cdcd7fbd9c728c8f06d0c91c9efc9a590fd6245fc63aaa4d8c32eb9e65b22af9ec3d2ca083 SHA512 cb567ebdedcb2b08091f8644444dedc702ae90cec23a66e70133de7107573a748294269ab847ca604680ae33e66db381793960d4925daa0e9ee1667eff032d3f
 DIST bedrock-server-1.20.13.01.zip 88509565 BLAKE2B 0b4d1a14a080270abc5d84ea4aefd6795a1b5bb2b897795b6ad87a861d47fc042cc328eae7df82624aa3f3087ecac197a620698bb6afa9f2bc43acd3e756965f SHA512 a72d1dc738704c18f5d9425f45f58fd4a2a48a243c538d6d1612b322259cc7cb81d524bd0fd777359dfb1a06f3173e60bba82a8c8d7873536b801b1805411d70
+DIST bedrock-server-1.20.14.01.zip 88509893 BLAKE2B b4e9b6734f8224a0199b8ed2ad0ad62591c81fed63642bc70f56093f988ec0cf7cd970bb0fa53b60381bdb4b4b1a7196a8b90e1090d2e9ef3d37a924bec8388b SHA512 badf8d63a8b09b47933efb1dc682a5ceca06f9c568e98bc49ac908e2018857bf9bb00ce520529dcd8a0a3097ec3e5dbe2131b87acc722373eff1610ba89c91f1
 EBUILD bedrock-server-1.20.11.01.ebuild 1170 BLAKE2B ecc26f7903174011fc5a83fa04bc641c6438e48fe3a4fccfb2426e1be395d0ecbfa0817a7372c367b008c0f6ae844e5b779e4719248944354fe7b065e128e12b SHA512 8aa13c6ab4995a16b2f30021a46c1a7a4f1bc03b765a6fbb288f0893e6711507307f6237d5b3ea5193bcad70eaae10c6662819ba20758adefc54c7b13051bc16
 EBUILD bedrock-server-1.20.13.01-r1.ebuild 1147 BLAKE2B 8ca578ce4fc508ab037aa553ebc2427751c1263ec70bdeda4538d06d953ee688893a7f9a326e52f1044dadb2df2a88b0fac64335d2cefa72097b472b71987c81 SHA512 30a3919147c813a1b625f02643497b5833c354d5e440d1d6f16716844cd1c74759e788de6d7e449767eabf3ec26e9b9f66de8f1e3562087a23626a7337246b51
+EBUILD bedrock-server-1.20.14.01.ebuild 1147 BLAKE2B 8ca578ce4fc508ab037aa553ebc2427751c1263ec70bdeda4538d06d953ee688893a7f9a326e52f1044dadb2df2a88b0fac64335d2cefa72097b472b71987c81 SHA512 30a3919147c813a1b625f02643497b5833c354d5e440d1d6f16716844cd1c74759e788de6d7e449767eabf3ec26e9b9f66de8f1e3562087a23626a7337246b51
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.20.14.01.ebuild b/games-server/bedrock-server/bedrock-server-1.20.14.01.ebuild
new file mode 100644
index 000000000000..0cc382d47f66
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.20.14.01.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	acct-group/bedrock
+	acct-user/bedrock
+	app-misc/dtach
+	net-misc/curl
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+DOCS=(
+	"bedrock_server_how_to.html"
+	"release-notes.txt"
+)
+
+QA_PREBUILT="opt/bedrock-server/bedrock_server"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	exeinto /opt/bedrock-server
+	doexe bedrock_server
+
+	insinto /opt/bedrock-server
+	doins {allowlist,permissions}.json server.properties
+	doins -r {behavior,resource}_packs definitions
+
+	dodir /opt/bin
+	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
+
+	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
+	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
+	systemd_newunit "${FILESDIR}"/bedrock-server.service bedrock-server@.service
+
+	einstalldocs
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e49b6fd2c93f..738efa5b0795 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index 7531a8b9482e..7100c95e063d 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,4 +1,3 @@
 DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
 EBUILD icon-slicer-0.3-r1.ebuild 517 BLAKE2B 4045deaea03f00d32f36b0ef206e140a6a94b15abf1db8e4043d31f37675678a071d70f9eb4c5449ed2571b57ab1703036c48211b247ca6844c2fa634f8f6ea7 SHA512 fcb46942e409beb7b3f0ce2dc38a219db56223d4ba5c17fbf6b5ab3d286c5ed4424e839f5ffd938014505836fd1add691fee18ce5faa95a31db6705279e0dac2
-EBUILD icon-slicer-0.3.ebuild 508 BLAKE2B 73ebb8592f4b43fed4155da91229bbedeefa99ec82996175ba68a084af33f86a471094349e5f97b0ff4241d92ad185e4feb9f37106379559634bcb2da543258d SHA512 9790598fa528bab1c178cd9aff927a1d1c02cafe04ae173fba8d16f6891755fc6cde2d4ef584449106cd6304650939ce60e93f53e4abe4392f6e4ecc7b21ecd0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
deleted file mode 100644
index 72b4dfca04b3..000000000000
--- a/media-gfx/icon-slicer/icon-slicer-0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="utility for generating icon themes and libXcursor cursor themes"
-HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/"
-SRC_URI="https://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="x11-apps/xcursorgen
-	x11-libs/gtk+:2
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 835628133b6d..7b4f265dd41d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 4fcd51ae9546..2c47244de76f 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,3 +1,4 @@
 DIST hamlib-4.5.5.tar.gz 2603846 BLAKE2B ad4a286a7aa1e972707cb9ed15a4268909a7d252a64b98b01d35c9d9e42c605cd600e819e195e49d501c1e135191fda585581e27801fa217c9141236a81ad770 SHA512 2cdff2630e89fa95c7ac40e998492e8a04e000fcca18b9491ddcb967927ffaa771ed2e6ac3232a060947883533a6ae7405042a2f8fdb1de157d71f74381f5899
-EBUILD hamlib-4.5.5.ebuild 2145 BLAKE2B 5d5d3932673d5a10d002fe1c6d8b1af5aac6417eb0b71742b4e25b4685d4559150a3f628fdc6f0fa38e77dd077be523fd935a6085855cc5a8586b2dbe9ff2fd5 SHA512 6056f08cb4156e5465642f7397d1eede36ac0f8343581b5f98f598a74b0c0b4fb2b8c1ad736397425584a061015936744000d74f44b3f9859239e3f6d73ef3c4
-MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
+EBUILD hamlib-4.5.5-r1.ebuild 2165 BLAKE2B 20aef44ec1565610e5b47847d01d379f42d40efbe7fc1aab555ad915ac7a966d816306abf8be03ec10510d7c6caf220673ed6c967e990c0f1b43b6b9f45de916 SHA512 023fc990fc20ad812917ce51735af851ecd92e41172ac37d3b1e2bf4e3148dbbb66c303128be701aaf6c3abe94a6e6700cc46b33839d1a4935b99658be095e35
+EBUILD hamlib-4.5.5.ebuild 2152 BLAKE2B b9eba3284b4d8ff5ebf47fe606713d1348d1cc6fbcbe640566d001b03a8eebde91700ea78603e73624a8ac74fc9744b56345558d95c5f557ae4251b087ebe86a SHA512 33cfc6ce3a0a09b75967f67bd486f33adedf637890e6d4c3e8896722e88248c2f157e49a7c4d4f10c696b829f9ff0b7b41b08e514bff9fec5659b332430bb71b
+MISC metadata.xml 379 BLAKE2B 17bfaa1ae7f031e14bef4bad4d552e3d4b644b9578bd996a9e8454b6b55f4029c3395e8a1cfc5a2b27a5372cd1aea140e0aebe637f7eb7889008fb434897b681 SHA512 c8c7a37088c0da4952a557776db8b6b701df23c07c4b17c50b77a199a6e7740369e27254eabae4e504ecb07871d33aec008e54bc7a787030828616ab36dfcb93
diff --git a/media-libs/hamlib/hamlib-4.5.5-r1.ebuild b/media-libs/hamlib/hamlib-4.5.5-r1.ebuild
new file mode 100644
index 000000000000..f6aa86f75387
--- /dev/null
+++ b/media-libs/hamlib/hamlib-4.5.5-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+MY_P=${P/_rc2/~rc2}
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="https://www.hamlib.github.io"
+SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/4.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	sys-libs/readline:0=
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-lang/swig
+	>=sys-devel/libtool-2.2
+	doc? ( app-doc/doxygen
+		dev-util/source-highlight )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# fix hardcoded libdir paths
+	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+		-e "s#fix}/include#fix}/include/hamlib#" \
+		hamlib.pc.in || die "sed failed"
+
+	# Correct install target to whatever INSTALLDIRS says and use vendor
+	# installdirs everywhere (bug #611550)
+	sed -i -e "s#install_site#install#"	\
+	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
+	bindings/Makefile.am || die "sed failed patching for perl"
+
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-xml-support \
+		$(use_with perl perl-binding) \
+		$(use_with python python-binding) \
+		$(use_with tcl tcl-binding)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	use doc && HTML_DOCS=( doc/html/ )
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/hamlib/hamlib-4.5.5.ebuild b/media-libs/hamlib/hamlib-4.5.5.ebuild
index 96af68a967fc..0a7003a9cb26 100644
--- a/media-libs/hamlib/hamlib-4.5.5.ebuild
+++ b/media-libs/hamlib/hamlib-4.5.5.ebuild
@@ -9,10 +9,11 @@ MY_P=${P/_rc2/~rc2}
 inherit autotools python-single-r1
 
 DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
+HOMEPAGE="https://www.hamlib.github.io"
 SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-LICENSE="LGPL-2 GPL-2"
+LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/4.2"
 KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="doc perl python tcl"
@@ -27,7 +28,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	tcl? ( dev-lang/tcl:0= )"
 
-DEPEND=" ${RDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-lang/swig
 	>=sys-devel/libtool-2.2
@@ -38,8 +39,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-libs/hamlib/metadata.xml b/media-libs/hamlib/metadata.xml
index 18a56ea21ff4..1cb8e6ea9822 100644
--- a/media-libs/hamlib/metadata.xml
+++ b/media-libs/hamlib/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hamlib</remote-id>
+		<remote-id type="github">Hamlib/Hamlib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index b75a157fb29a..ac6dfc133ade 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flmsg/Manifest b/media-radio/flmsg/Manifest
index aa04d6df1107..6d16ae94bce7 100644
--- a/media-radio/flmsg/Manifest
+++ b/media-radio/flmsg/Manifest
@@ -1,5 +1,5 @@
-DIST flmsg-4.0.19.tar.gz 879020 BLAKE2B 49246a34a637868ee04ec229e8e787eaf774c2291b0216c98f250683746820243b3fc00d7dc7a7e6a72baa7e94c22b9a9ad3084c9576defe6c9d14f8906a3d5b SHA512 5a15753df8f491d952b6a1c17b5ae2432974672a6f164ec3c3ecf3893fb7daa4bd2e76f3a613728640f0d800f8f401bcb3a598f3b70af797f4996fe30498f3cb
 DIST flmsg-4.0.20.tar.gz 885141 BLAKE2B 28b5e033b145149af8c6a6b2645a20484cb4a76628bc4a15d9721ce95d0cea3938b0e9aa9c5c6c5542affa6b5b3283ec6618d2574e472d35bee3728cc497adce SHA512 4cf1f11d910601c219268fa1dfd5f89a2530476f829eb1e016eb46101352c255d7d3f43d5fd0692307bc30df2a443952ccb1a99499be46efa737555be32d2e0b
-EBUILD flmsg-4.0.19-r1.ebuild 571 BLAKE2B 5c3c8dfa09f3a56f596dce6a67e2fe64fe5cbbcbda412d83442ee442b859ca5e56dbf158545af7f07a2be35f65f381cf2d6719f6871e30444101dfced2274707 SHA512 42a1c1eb8a0a565dcf9f24463d8316cdbf9036a32cf25bdc1558053f799923fbd28b8055ef6ed595719bebae542987290ffa159f2c1ecfa9ec231d60f545bf86
+DIST flmsg-4.0.22.tar.gz 838644 BLAKE2B d81fe3438f7f47ae77061dcd390b742ba74694b5f5039c9fef305be4fddfc3a5b2139a802cf85e2301a9cc48929e3290ba273207beae1c8efcb530d50e6bbfb3 SHA512 1baaa7260dbf5fe68875a23bc206b910b6cd62f1fe6e73fa8ed8833433a3bacb8f801e06c3f8fc1e6b2acc1701dce97cd6d74f2b465a608a538ffc4286546bf2
 EBUILD flmsg-4.0.20.ebuild 454 BLAKE2B 6f30a8ee3de4ad81912f5aaa79e96a7271d3bb30226f88d7efadaf2b337cafc1cfaa7b13cd28df32fe0fc7522a4eb34be8009dcab1cb4e0a10d3f3b617f22015 SHA512 e534b7786e26082cecd551cf2efe02715929e65ef7ac144532e14eeb81518f5c5b694c9ccbd03ecad483f551f8079433bfc5068688b3f14b01842d2f850ca5da
+EBUILD flmsg-4.0.22.ebuild 454 BLAKE2B 3d170d9b9be3d3e34965b8680b66b2140a3f8e1b63556d1dba3ddc038f95d329d7a6a20c2f296f5c42ac8e3252c1eeea6682f4be6a403a02f08668b1aa1871c2 SHA512 eefe2397ea54358dde71590bd781e65e019a98b51bb8a28aa11cc8310ee67c9cde437dcf96994b85a129b5086d4ba1a1cd1f915808815c801a05346bf88cbb9e
 MISC metadata.xml 391 BLAKE2B f3f074665f35891a5e0718da6e69cafeaae7ca3dba9d972014691d204be3b63c72d8fe0a2e71be31ee7f655942f7d04114df8413d9b648e56ee5376d605ed535 SHA512 ce962cdf53ab62807957f76d8a8db60e640252be66961ad6d897f3c482fd2658c6e5263b0ad503ebe22084d3736ff5ba4977d8538049db0f5e6b351614d24721
diff --git a/media-radio/flmsg/flmsg-4.0.19-r1.ebuild b/media-radio/flmsg/flmsg-4.0.22.ebuild
index 1ad101c09302..fa10c104dcc2 100644
--- a/media-radio/flmsg/flmsg-4.0.19-r1.ebuild
+++ b/media-radio/flmsg/flmsg-4.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,8 +19,3 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog INSTALL README )
-
-src_configure() {
-	# temporary fix until upstream fixes building against system library
-	econf --without-flxmlrpc
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9fcaa4390bbb..89946055047c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 1cdb0781f76a..2b65dae55464 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,4 +1,3 @@
-AUX qsampler-0.9.1-cmake-no-git.patch 468 BLAKE2B b8b53ea84160b7baf0f89a848ae5fad9ef3a51f95b6baf856e17639add1f773c510569a7a659d2db482110de945cb86ee73583ba53c53818482209c157e18f79 SHA512 7a500986365218898f70b2f0f88ed04da1f63156571d05c5ba83ffd4c6bef59436c4e0f0ed6152cd8a919368e84270b3704d615e368d880d8757c277fee5f8eb
 DIST qsampler-0.9.10.tar.gz 222310 BLAKE2B 1fc9c4d063dcce9f3cd69e74e0205b4585e2609eb09fea409fccb87560f4eb767ce322b9dc6d18c3e7ae79c5eff7d06a3bc4c408f6880c161f34d9d93f7ca0fd SHA512 599db13d35a0cf25e5d5fcd02a8fe7995500552c2f2b298883395af9876ecd7fd5aca4528fa8aa5dcd678038ea8704b69131df95c7d9de8061a2c0d163ccbde9
 EBUILD qsampler-0.9.10-r2.ebuild 1109 BLAKE2B 887064b1a556c1e4d65cbc8ead0f8be4a95a18e106b2df85d4e87b399a971cddfb9f18a150d23f3b2e8a2a426622f086b63a083c90c2dddf88e62e10fc19baef SHA512 569015697e1a1d49669a8d5f783cf131762392e078ed10e2578f01820d93547ca9d6f4e4dc116b305b54ade7d190bf5a9a5324160790c93a53b377fcffa0d95a
 EBUILD qsampler-9999.ebuild 1127 BLAKE2B fe6481616d6378b2e1ee4c93c85067679456c077dd27ffc7f648bca82afb7dfd0a0577bd8c907749b0479623695872237e012b7ac69b689d3be8e2a929226bf1 SHA512 5993759e56318b590a8ec7eef5346729ecf7a547c8f5f6ec9130b00125a92b39a6bffe5f00fbe80565072eef9b240521b43bd5bb1a0e4bf948af66243e137d47
diff --git a/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch b/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch
deleted file mode 100644
index 95f280edd9a7..000000000000
--- a/media-sound/qsampler/files/qsampler-0.9.1-cmake-no-git.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@ project(qsampler
-   LANGUAGES C CXX)
- 
- set (CONFIG_VERSION ${PROJECT_VERSION})
-+#[[
- execute_process (
-   COMMAND git describe --tags --dirty --abbrev=6
-   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
-@@ -27,6 +28,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
- else ()
-   set (VERSION "${PROJECT_VERSION}")
- endif ()
-+]]
-+set (VERSION "${PROJECT_VERSION}")
- 
- set (PACKAGE_NAME "Qsampler")
- set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 2c388461eaad..35a4acd4ddd1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 7071e5802f06..c4de8fd129f4 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -5,12 +5,8 @@ AUX 0.3.77/0001-gst-prevent-crash-stopping-device-provider.patch 1310 BLAKE2B 57
 AUX 0.3.77/0002-pulse-prevent-duplicates.patch 846 BLAKE2B ea2994854be1e235685e26cda9747c7866b394a154593e2c5108daaeea19512e98d52a8acd89d1113b6048843c93626402d375e72315c3eb09c8f2d1967164ab SHA512 d85485d3f94536d6446687cd4d0b3592b0f4411b0ee91cc2b4719beeb99272e26f611b24a70b251d58a1e3c6c163d2204ae54db328b342d6c9ee9486650b06d9
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.1 1400 BLAKE2B a469d6eb75e5362d44c2cad66169f89fdb93cdf511e3019f669531812b9fce007032388ef2b3927dce8977ab69bfdb51af357b0648c661c079175d5f62cc2ea9 SHA512 de1b4621b59f6505950324746090de21d5fdaced7cb45cae5b9bd6f312aba031590fd71e1c54ca4b8558649556fbab304c9b88ee1e3831ce29530ddb040d3abe
-AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
-AUX gentoo-pipewire-launcher.in-r1 1729 BLAKE2B 0deaf286b480e8153994d78a4b53b8d51c0d8b5aaf7f5db282e90923844512b1e060a346940551a8c498339361d5343071d57537a80a0c612c21813245e82be7 SHA512 f02cf0842cd4470c0be6607ad17ac2e5622ae9b90d8d04aa0590fabce5cdef9b6d749692829b40b8a11814357474009552f64ffa9dd90a4082cd35f2ec75e61d
 AUX gentoo-pipewire-launcher.in-r2 2613 BLAKE2B cfedf49fcdf117c0792314eb3db531354f9437c175c00bb536a14913dcaa110ec98ff8b05cf32058e1581bb38fff26b74f260fdded9ba619a734b09905423ee8 SHA512 af9a99c288e522e8ac5c7bf0362cbe3a81ac3ad5791855a5114b99089f67ac2fecb20d5eabc428f50284f11fb9365e9a967e0b3843075444a789c6c27c41e111
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
-AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
-AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7
 DIST pipewire-0.3.75.tar.bz2 1629466 BLAKE2B e69dbb93ebe50f037bc602aa86733c8ba9ccbe57db520cd34ea025c9bf153dbd848882dbb4c2a4e830785a302a7cb7d4b7c1856c9a4be6f1c5ada92f70d1729b SHA512 19bf292f951f68de19cdfd3c76ee0e538a2ad3022e2669a4a19b40d26c2b16938799470b85def4b74b27b8c8137d03a05780d6bab0f38fb0835b528f2cd34f5d
 DIST pipewire-0.3.77.tar.bz2 1643767 BLAKE2B 3a2df9cdedf77d5b4927e115ddd7da0d1eecc85322ce7995a49945d41cc83b9a543c1382ad304bdb549f67ac444f7bca6871248654fb4d2e21b25eb55411940c SHA512 422c8504f608d6845b94351a336ab528f51195551418d0d245064972ed784817cacafc6afaad74eb0e0ea80474a9da33ef6917c1f60d3f8f45d70c54971f0760
diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in b/media-video/pipewire/files/gentoo-pipewire-launcher.in
deleted file mode 100644
index 495c47f6c7e1..000000000000
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# PipeWire launcher script for XDG compliant desktops on OpenRC.
-#
-# systemd users are very _STRONGLY_ advised to use the much
-# more reliable and predictable user units instead.
-
-# WARNING: This script assumes being run inside XDG compliant session,
-# which means D-Bus session instance is expected to be correctly set up
-# prior to this script starting. If that is not true, things may break!
-
-# Best to reap any existing daemons and only then try to start a new set.
-pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-
-# The core daemon which by itself does probably nothing.
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
-
-# The so called pipewire-pulse daemon used for PulseAudio compatibility.
-# Commenting this out will stop the PA proxying daemon from starting,
-# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
-# clients will still have access to audio and may end up clashing with
-# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
-
-# Hack for bug #822498
-sleep 1
-
-# Finally a session manager is required for PipeWire to do anything.
-exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber
diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1 b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1
deleted file mode 100644
index 51f70293c383..000000000000
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r1
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# PipeWire launcher script for XDG compliant desktops on OpenRC.
-#
-# systemd users are very _STRONGLY_ advised to use the much
-# more reliable and predictable user units instead.
-
-# WARNING: This script assumes being run inside XDG compliant session,
-# which means D-Bus session instance is expected to be correctly set up
-# prior to this script starting. If that is not true, things may break!
-
-restart () {
-    echo "Terminating PipeWire processes ..."
-    pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-    pwait -u "${USER}" -x pipewire\|wireplumber
-    echo "PipeWire terminated."
-}
-
-if [ "${#}" -gt 0 ]
-then
-    if [ "${1}" = 'restart' ]
-    then
-	restart
-    else
-        echo "Unrecognised argument." >&2
-        echo "Usage: gentoo-pipewire-launcher [restart]" >&2
-	exit 1
-    fi
-fi
-
-if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-then
-    echo "PipeWire already running, exiting." >&2
-    echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" >&2
-    exit 1
-fi
-
-# The core daemon which by itself does probably nothing.
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire &
-
-# The so called pipewire-pulse daemon used for PulseAudio compatibility.
-# Commenting this out will stop the PA proxying daemon from starting,
-# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
-# clients will still have access to audio and may end up clashing with
-# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf &
-
-# Hack for bug #822498
-sleep 1
-
-# Finally a session manager is required for PipeWire to do anything.
-exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber
diff --git a/media-video/pipewire/files/pipewire.desktop b/media-video/pipewire/files/pipewire.desktop
deleted file mode 100644
index d3786e74f82b..000000000000
--- a/media-video/pipewire/files/pipewire.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name[de]=PipeWire Mediensystem
-Name=PipeWire Media System
-Comment[de]=Das PipeWire Mediensystem starten
-Comment=Start the PipeWire Media System
-Exec=/usr/libexec/pipewire-launcher
-Terminal=false
-Type=Application
-X-GNOME-HiddenUnderSystemd=true
-X-KDE-HiddenUnderSystemd=true
-X-systemd-skip=true
diff --git a/media-video/pipewire/files/pipewire.desktop-r1 b/media-video/pipewire/files/pipewire.desktop-r1
deleted file mode 100644
index d950312930f6..000000000000
--- a/media-video/pipewire/files/pipewire.desktop-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name[de]=PipeWire Mediensystem
-Name=PipeWire Media System
-Comment[de]=Das PipeWire Mediensystem starten
-Comment=Start the PipeWire Media System
-Exec=/usr/bin/gentoo-pipewire-launcher
-Terminal=false
-Type=Application
-X-GNOME-HiddenUnderSystemd=true
-X-KDE-HiddenUnderSystemd=true
-X-systemd-skip=true
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 32aeab13936d..32cfcb5dc1ee 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 050ad8f5994b..b13f014c410a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Aug 2023 19:39:53 +0000
+Wed, 16 Aug 2023 01:39:48 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7767fa3cdfc9..dc108a710b1e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-15T19:39:56Z
+TIMESTAMP 2023-08-16T01:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTb1IxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTcKOhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAOuA/+IhSEHnyb+BZ2xDVeGVrRZEynP1aSGODzc4tBlpb0+igE+adrWKvQRLJp
-YzY3GsUywayl771ASSgZcMJxDmIA67xUs9BSc0oVu04iJw/2KlmwmrNReNXEPsWU
-6wBlL/yiaO7a+tYUFqI0EmeSV8Xws9ON1oVsV2HX8JkOlTeGzGMDhzz6KWkvHcBV
-RMwuT9SV1wyyzMRgZx8rfgD1ViwdzAJccQOfkxhz4k1VpIkqWeSlrk73qYp0/MrQ
-CHAp66lZeJL3APE9R4FcQySpTKsZ9aYF3FkEZexcOp6kww1lxp6y7IRG5BVcO2tE
-nvKWBIsw+ptrfakgK5reoIbyVtSyZLJIveF7iAaN8EUaa5365pOQFTtDvo6zz06L
-sL3xR/GFTlF07eq9ISr62mBkmDodBpuzlUCJdXr/9rZE/meT8UxHTNXZ4agF6nM/
-71OOpOvNd1CgRfJIQjuA2W/RaMzkOqiwVVWiGgBEcMmaF3CDB4VKr7ZwtOcSamTV
-jn2OVhc+qHoTshmJ6GjBPQC+wuJ24jkMOEfZ5Us1p9rYRJCnHyEp7riBvaefr5Z2
-yO5Bz8s5GV1Jwr/Fh2KooIoQzcXQdIRjP5XBrNKSxKyar8IANHaN3ZhNkSZ3gz44
-0N1lThDpLyqbQj/+FsDwl6kMx0qUGUljp7Jdd9zHn8QYs9KFGx4=
-=X35d
+klCD0Q/7BP3HNlYHqgRG5qbjBfp3toA/151fFwDYKRhrhtCUL/PJqLgl8ltMeDPM
+M3XkjYkt1+puZFoza1EZAj+Buckv7k/gUuol3TAS7YgWd+ubcmQjDm3/j3kzNGQB
+BMe6WEbNfMHplcIPEllZe6XiQfTxyvMjW2DBqGWloUeuRfzU+AMglWPAHqIy6OTv
+kKuQR25zc01eVAmIuPUdgYh4hU4s/+DwHWsj5PXBfGzxvBJE/7vFyxkt8fNhuEfz
++xPkhp7/fzIBwyCRgYRK1ZN4SsappGJB99muMVZrYBwRq3OPsr7ryz4l/OUJuR7X
+eMQ4L3RmA+N65/YBRZdXfwe+7HGhKEA/V4/XOXd5WSuqMLi7g54qJAqjMTE2i2qc
+XPf88N58yg/IA5KH6syx8z280c13gxDt5UXbypZ79pqh0huO0PMcGk639bqox5SE
+VevHsN6sCpEf7unZ6qY+2XI5LmMNSIdAJz+Xr+jvpiGfmOcAqeukwAPhdB4xz6ZW
+gC7kNCgBknvgC+yWiNMd+vwJ+eV5uhq4yl2JVKl0WQIcyKqVhjNc0NLCjxub16SK
+FwdJnBBve4ZacgJMx9WvkAoeZvQCKLNbKOuIMNA7ak4tfrlAvNr27r7FujcbwCM7
++LoWTPXV58f76wAHHOD5qoiIcuhJvwulN2bVkqX6w25SUrn9VN8=
+=dXeu
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 050ad8f5994b..b13f014c410a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Aug 2023 19:39:53 +0000
+Wed, 16 Aug 2023 01:39:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fe7c5077649b..ae4583faba54 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 16ba7cb854da..ca49e94d60f4 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/fetchlog-1.4-r1 b/metadata/md5-cache/app-admin/fetchlog-1.4-r1
deleted file mode 100644
index eb18b5107087..000000000000
--- a/metadata/md5-cache/app-admin/fetchlog-1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DESCRIPTION=Displays the last new messages of a logfile
-EAPI=6
-HOMEPAGE=https://fetchlog.sourceforge.net/
-INHERIT=toolchain-funcs
-IUSE=snmp
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=snmp? ( >=dev-perl/Net-SNMP-4.0.1-r2 >=net-analyzer/net-snmp-5.0.6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/fetchlog/fetchlog-1.4.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=7ce300da03d469fb50b50e2a901757be
diff --git a/metadata/md5-cache/app-admin/mktwpol-1.0.1 b/metadata/md5-cache/app-admin/mktwpol-1.0.1
deleted file mode 100644
index 3c5d7ab4969d..000000000000
--- a/metadata/md5-cache/app-admin/mktwpol-1.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=preinst prepare
-DESCRIPTION=Bash scripts to install tripwire and generate tripwire policy files
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/mktwpol
-KEYWORDS=amd64 ppc x86
-LICENSE=CC-BY-SA-3.0
-RDEPEND=app-admin/tripwire
-SLOT=0
-SRC_URI=mirror://sourceforge/mktwpol/mktwpol-1.0.1.tar.gz
-_md5_=48c6eb8dddd8f8672e325f509f021988
diff --git a/metadata/md5-cache/app-admin/petrovich-1.0.0-r1 b/metadata/md5-cache/app-admin/petrovich-1.0.0-r1
deleted file mode 100644
index 1d563cadf4c7..000000000000
--- a/metadata/md5-cache/app-admin/petrovich-1.0.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Filesystem Integrity Checker
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/petrovich
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/perl-Digest-MD5
-SLOT=0
-SRC_URI=mirror://sourceforge/petrovich/petrovich-1.0.0.tar.gz
-_md5_=0c6d651cdb17f6219bc3a58339b5901d
diff --git a/metadata/md5-cache/app-admin/salt-3005.2 b/metadata/md5-cache/app-admin/salt-3005.2
new file mode 100644
index 000000000000..235c22d79b52
--- /dev/null
+++ b/metadata/md5-cache/app-admin/salt-3005.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_10(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_10(-)?] dev-python/libnacl[python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_10(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_10(-)?] libcloud? ( dev-python/aiohttp[python_targets_python3_10(-)?] dev-python/aiosignal[python_targets_python3_10(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?] dev-python/async-timeout[python_targets_python3_10(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?] ) openssl? ( dev-libs/openssl:0=[-bindist(-)] >=dev-python/pyopenssl-23.2.0[python_targets_python3_10(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_10(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?] ) dev-python/apache-libcloud[python_targets_python3_10(-)?] >=dev-python/boto-2.32.1[python_targets_python3_10(-)?] >=dev-python/certifi-2023.07.22[python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_10(-)?] >=dev-python/moto-2.0.0[python_targets_python3_10(-)?] dev-python/passlib[python_targets_python3_10(-)?] dev-python/pip[python_targets_python3_10(-)?] >=dev-python/pyopenssl-23.0.0[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.0[python_targets_python3_10(-)?] >=dev-python/pytest-salt-factories-1.0.0_rc17[python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] dev-python/flaky[python_targets_python3_10(-)?] net-dns/bind-tools >=dev-python/virtualenv-20.3.0[python_targets_python3_10(-)?] dev-util/yamllint[python_targets_python3_10(-)?] !x86? ( >=dev-python/boto3-1.17.67[python_targets_python3_10(-)?] ) ) virtual/pkgconfig python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Salt is a remote execution and configuration manager
+EAPI=8
+HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
+INHERIT=systemd distutils-r1 pypi
+IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_10(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_10(-)?] dev-python/libnacl[python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_10(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_10(-)?] libcloud? ( dev-python/aiohttp[python_targets_python3_10(-)?] dev-python/aiosignal[python_targets_python3_10(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?] dev-python/async-timeout[python_targets_python3_10(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?] ) openssl? ( dev-libs/openssl:0=[-bindist(-)] >=dev-python/pyopenssl-23.2.0[python_targets_python3_10(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_10(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 )
+REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_10 )
+RESTRICT=!test? ( test ) x86? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/salt/salt-3005.2.tar.gz
+_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	1f435bc389faf790af695df46b8dcb73	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=df74f08f3e68f9222051622e97d3042b
diff --git a/metadata/md5-cache/app-admin/salt-3006.0 b/metadata/md5-cache/app-admin/salt-3006.0
deleted file mode 100644
index 118d18c5a05f..000000000000
--- a/metadata/md5-cache/app-admin/salt-3006.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/build[python_targets_python3_10(-)?] test? ( sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_10(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_10(-)?] dev-python/libnacl[python_targets_python3_10(-)?] dev-python/looseversion[python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?] >=dev-python/requests-1.0.0[python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_10(-)?] libcloud? ( dev-python/aiohttp[python_targets_python3_10(-)?] dev-python/aiosignal[python_targets_python3_10(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?] dev-python/async-timeout[python_targets_python3_10(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?] ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_10(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_10(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?] ) dev-python/apache-libcloud[python_targets_python3_10(-)?] >=dev-python/boto-2.32.1[python_targets_python3_10(-)?] >=dev-python/certifi-2022.12.07[python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_10(-)?] >=dev-python/moto-2.0.0[python_targets_python3_10(-)?] dev-python/passlib[python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_10(-)?] dev-python/pip[python_targets_python3_10(-)?] >=dev-python/pyopenssl-23.0.0[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.0[python_targets_python3_10(-)?] >=dev-python/pytest-salt-factories-1.0.0_rc21[python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] dev-python/pytest-custom-exit-code[python_targets_python3_10(-)?] dev-python/flaky[python_targets_python3_10(-)?] net-dns/bind-tools >=dev-python/virtualenv-20.3.0[python_targets_python3_10(-)?] dev-util/yamllint[python_targets_python3_10(-)?] !x86? ( >=dev-python/boto3-1.21.46[python_targets_python3_10(-)?] ) ) virtual/pkgconfig python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=8
-HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
-INHERIT=systemd distutils-r1 pypi
-IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils >=dev-python/distro-1.5[python_targets_python3_10(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_10(-)?] dev-python/libnacl[python_targets_python3_10(-)?] dev-python/looseversion[python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_10(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?] >=dev-python/requests-1.0.0[python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_10(-)?] libcloud? ( dev-python/aiohttp[python_targets_python3_10(-)?] dev-python/aiosignal[python_targets_python3_10(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?] dev-python/async-timeout[python_targets_python3_10(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?] ) openssl? ( dev-libs/openssl:0=[-bindist(-)] dev-python/pyopenssl[python_targets_python3_10(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_10(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 )
-REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_10 )
-RESTRICT=!test? ( test ) x86? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/salt/salt-3006.0.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	1f435bc389faf790af695df46b8dcb73	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=0ef35051a7c1f652115bf23329842863
diff --git a/metadata/md5-cache/app-admin/salt-3006.2 b/metadata/md5-cache/app-admin/salt-3006.2
new file mode 100644
index 000000000000..b918d234e511
--- /dev/null
+++ b/metadata/md5-cache/app-admin/salt-3006.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/build[python_targets_python3_10(-)?] test? ( sys-apps/pciutils >=dev-python/cryptography-41.0.3[python_targets_python3_10(-)?] >=dev-python/distro-1.5[python_targets_python3_10(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_10(-)?] dev-python/libnacl[python_targets_python3_10(-)?] dev-python/looseversion[python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_10(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_10(-)?] libcloud? ( dev-python/aiohttp[python_targets_python3_10(-)?] dev-python/aiosignal[python_targets_python3_10(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?] dev-python/async-timeout[python_targets_python3_10(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?] ) openssl? ( dev-libs/openssl:0=[-bindist(-)] >=dev-python/pyopenssl-23.2.0[python_targets_python3_10(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_10(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?] ) dev-python/apache-libcloud[python_targets_python3_10(-)?] >=dev-python/boto-2.32.1[python_targets_python3_10(-)?] >=dev-python/certifi-2023.07.22[python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?] dev-python/mako[python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_10(-)?] >=dev-python/moto-2.0.0[python_targets_python3_10(-)?] dev-python/passlib[python_targets_python3_10(-)?] dev-python/bcrypt[python_targets_python3_10(-)?] dev-python/pip[python_targets_python3_10(-)?] >=dev-python/pyopenssl-23.0.0[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.0[python_targets_python3_10(-)?] >=dev-python/pytest-salt-factories-1.0.0_rc25[python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] dev-python/pytest-custom-exit-code[python_targets_python3_10(-)?] dev-python/flaky[python_targets_python3_10(-)?] net-dns/bind-tools >=dev-python/virtualenv-20.3.0[python_targets_python3_10(-)?] dev-util/yamllint[python_targets_python3_10(-)?] !x86? ( >=dev-python/boto3-1.21.46[python_targets_python3_10(-)?] ) ) virtual/pkgconfig python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Salt is a remote execution and configuration manager
+EAPI=8
+HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
+INHERIT=systemd distutils-r1 pypi
+IUSE=cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako mongodb neutron nova openssl portage profile redis selinux test raet +zeromq vim-syntax python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/pciutils >=dev-python/cryptography-41.0.3[python_targets_python3_10(-)?] >=dev-python/distro-1.5[python_targets_python3_10(-)?] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_10(-)?] dev-python/libnacl[python_targets_python3_10(-)?] dev-python/looseversion[python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_10(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?] >=dev-python/psutil-5.0.0[python_targets_python3_10(-)?] >=dev-python/pycryptodome-3.9.8[python_targets_python3_10(-)?] >=dev-python/pyyaml-6.0.1[python_targets_python3_10(-)?] >=dev-python/markupsafe-2.1.2[python_targets_python3_10(-)?] >=dev-python/requests-2.31.0[python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_10(-)?] dev-python/tomli[python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_10(-)?] libcloud? ( dev-python/aiohttp[python_targets_python3_10(-)?] dev-python/aiosignal[python_targets_python3_10(-)?] >=dev-python/apache-libcloud-2.5.0[python_targets_python3_10(-)?] dev-python/async-timeout[python_targets_python3_10(-)?] ) mako? ( dev-python/mako[python_targets_python3_10(-)?] ) ldap? ( dev-python/python-ldap[python_targets_python3_10(-)?] ) libvirt? ( dev-python/libvirt-python[python_targets_python3_10(-)?] ) openssl? ( dev-libs/openssl:0=[-bindist(-)] >=dev-python/pyopenssl-23.2.0[python_targets_python3_10(-)?] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python3_10(-)?] >=dev-python/ioflo-1.1.7[python_targets_python3_10(-)?] >=dev-python/raet-0.6.0[python_targets_python3_10(-)?] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python3_10(-)?] ) cheetah? ( >=dev-python/cheetah3-3.2.2[python_targets_python3_10(-)?] ) genshi? ( dev-python/genshi[python_targets_python3_10(-)?] ) mongodb? ( dev-python/pymongo[python_targets_python3_10(-)?] ) portage? ( sys-apps/portage[python_targets_python3_10(-)?] ) keyring? ( dev-python/keyring[python_targets_python3_10(-)?] ) redis? ( dev-python/redis[python_targets_python3_10(-)?] ) selinux? ( sec-policy/selinux-salt ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python3_10(-)?] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python3_10(-)?] ) gnupg? ( dev-python/python-gnupg[python_targets_python3_10(-)?] ) profile? ( dev-python/yappi[python_targets_python3_10(-)?] ) vim-syntax? ( app-vim/salt-vim ) zeromq? ( >=dev-python/pyzmq-19.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 )
+REQUIRED_USE=|| ( raet zeromq ) test? ( cheetah genshi ) || ( python_targets_python3_10 )
+RESTRICT=!test? ( test ) x86? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/salt/salt-3006.2.tar.gz
+_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	1f435bc389faf790af695df46b8dcb73	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=90755ec1426878d0554242ac7b89c3c6
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 187cb14aca5e..10281f824c2c 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.16.02 b/metadata/md5-cache/app-benchmarks/stress-ng-0.16.04
index dd8e553a0f63..d0702c0fd876 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.16.02
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.16.04
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) sctp? ( net-misc/lksctp-tools )
 SLOT=0
-SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.16.02.tar.gz -> stress-ng-0.16.02.tar.gz
+SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.16.04.tar.gz -> stress-ng-0.16.04.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
 _md5_=7a903f549c927bcc2e600946e12da504
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 02adbca85c6f..987620c3650d 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/dxvk-1.10.3 b/metadata/md5-cache/app-emulation/dxvk-1.10.3-r1
index 85c130e9e699..4dcdf3beac5a 100644
--- a/metadata/md5-cache/app-emulation/dxvk-1.10.3
+++ b/metadata/md5-cache/app-emulation/dxvk-1.10.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) dxgi? ( d3d11 ) || (
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v1.10.3.tar.gz -> dxvk-1.10.3.tar.gz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=5dda7c44ada0111fe886fe7d7428116c
+_md5_=597a7cb026f66b1485e40a54150689a1
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.0 b/metadata/md5-cache/app-emulation/dxvk-2.0
deleted file mode 100644
index 9d6fd7f0e39d..000000000000
--- a/metadata/md5-cache/app-emulation/dxvk-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glslang !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend test
-DESCRIPTION=Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine
-EAPI=8
-HOMEPAGE=https://github.com/doitsujin/dxvk/
-INHERIT=flag-o-matic meson-multilib
-IUSE=+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi abi_x86_32 abi_x86_64
-KEYWORDS=-* amd64 x86
-LICENSE=ZLIB Apache-2.0 MIT
-REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) dxgi? ( d3d11 ) || ( abi_x86_32 abi_x86_64 )
-SLOT=0
-SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v2.0.tar.gz -> dxvk-2.0.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/98f440ce6868c94f5ec6e198cc1adda4760e8849.tar.gz -> dxvk-vulkan-headers-98f440ce68.tar.gz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=9d622166c7bec26114b144bcfec85209
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.1 b/metadata/md5-cache/app-emulation/dxvk-2.1
deleted file mode 100644
index 53fd06dfaebb..000000000000
--- a/metadata/md5-cache/app-emulation/dxvk-2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) dev-util/glslang !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test
-DESCRIPTION=Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine
-EAPI=8
-HOMEPAGE=https://github.com/doitsujin/dxvk/
-INHERIT=flag-o-matic meson-multilib python-any-r1
-IUSE=+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi abi_x86_32 abi_x86_64
-KEYWORDS=-* amd64 x86
-LICENSE=ZLIB Apache-2.0 MIT
-REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) || ( abi_x86_32 abi_x86_64 )
-SLOT=0
-SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v2.1.tar.gz -> dxvk-2.1.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/98f440ce6868c94f5ec6e198cc1adda4760e8849.tar.gz -> dxvk-vulkan-headers-98f440ce68.tar.gz https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/d39344f466caae0495ebac4d49b03a886d83ba3a/dxvk-libdisplay-info-d39344f466.tar.bz2 https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=45b5856072e531c4583399fa1ad42e3b
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.2 b/metadata/md5-cache/app-emulation/dxvk-2.2-r1
index f0f88ab7215e..1cd99e5b1abf 100644
--- a/metadata/md5-cache/app-emulation/dxvk-2.2
+++ b/metadata/md5-cache/app-emulation/dxvk-2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) || (
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v2.2.tar.gz -> dxvk-2.2.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/98f440ce6868c94f5ec6e198cc1adda4760e8849.tar.gz -> dxvk-vulkan-headers-98f440ce68.tar.gz https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/d39344f466caae0495ebac4d49b03a886d83ba3a/dxvk-libdisplay-info-d39344f466.tar.bz2 https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=668706f9d869c7abe7a17375bf8b307a
+_md5_=8927032e3c96dbee8d209ebc86c58a79
diff --git a/metadata/md5-cache/app-emulation/dxvk-9999 b/metadata/md5-cache/app-emulation/dxvk-9999
index b1f3e88cc813..072855365299 100644
--- a/metadata/md5-cache/app-emulation/dxvk-9999
+++ b/metadata/md5-cache/app-emulation/dxvk-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) || (
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	2358a7b20091609e24bd3a83b3ac5991	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=67221b12cb3f9c5a81119a31323e4bd8
+_md5_=5dd3ef7564deaa21fd9e1e306f2d683f
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-2.6 b/metadata/md5-cache/app-emulation/vkd3d-proton-2.6-r1
index 244c97640a1e..86c67397e630 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-2.6
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-2.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.6.tar.gz -> vkd3d-proton-2.6.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/b537bbb91bccdbc695cb7e5211d608f8d1c205bd.tar.gz -> vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/ae217c17809fadb232ec94b29304b4afcd417bb4.tar.gz -> vkd3d-proton-spirv-headers-ae217c1780.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/83e1a9ed8ce289cebb1c02c8167d663dc1befb24.tar.gz -> vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=f5134c0e5842f56fb5320f8aace2d4fe
+_md5_=8ec0981e1eb051274da9560535f6e0a8
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-2.8 b/metadata/md5-cache/app-emulation/vkd3d-proton-2.8
deleted file mode 100644
index a1561609834e..000000000000
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/glslang !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare pretend test
-DESCRIPTION=Fork of VKD3D, development branches for Proton's Direct3D 12 implementation
-EAPI=8
-HOMEPAGE=https://github.com/HansKristian-Work/vkd3d-proton/
-INHERIT=flag-o-matic meson-multilib toolchain-funcs
-IUSE=+abi_x86_32 crossdev-mingw debug extras abi_x86_32 abi_x86_64
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-2.1+ Apache-2.0 MIT
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-SLOT=0
-SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.8.tar.gz -> vkd3d-proton-2.8.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/babf511d4cc7466b970dec82db35b5cacf6acfec.tar.gz -> vkd3d-proton-dxil-spirv-babf511d4c.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/1d31a100405cf8783ca7a31e31cdd727c9fc54c3.tar.gz -> vkd3d-proton-spirv-headers-1d31a10040.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/87d5b782bec60822aa878941e6b13c0a9a954c9b.tar.gz -> vkd3d-proton-spirv-headers-87d5b782be.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/b7a86d3b2bf8fbe73fcd40df9ec62a5966e9db89.tar.gz -> vkd3d-proton-vulkan-headers-b7a86d3b2b.tar.gz
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=3803f34d2afdfff91de73ee132e247b2
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-2.9 b/metadata/md5-cache/app-emulation/vkd3d-proton-2.9-r1
index 62766d5dea60..eca677f5b9dc 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-2.9
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-2.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.9.tar.gz -> vkd3d-proton-2.9.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/f20a0fb4e984a83743baa9d863eb7b26228bcca3.tar.gz -> vkd3d-proton-dxil-spirv-f20a0fb4e9.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/1d31a100405cf8783ca7a31e31cdd727c9fc54c3.tar.gz -> vkd3d-proton-spirv-headers-1d31a10040.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/aa331ab0ffcb3a67021caa1a0c1c9017712f2f31.tar.gz -> vkd3d-proton-spirv-headers-aa331ab0ff.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/bd6443d28f2ebecedfb839b52d612011ba623d14.tar.gz -> vkd3d-proton-vulkan-headers-bd6443d28f.tar.gz
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=b33e56156636aca591c15f3ed9f9820f
+_md5_=a69e0227ec010f4c0f25c91c07810782
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-9999 b/metadata/md5-cache/app-emulation/vkd3d-proton-9999
index 1cfb4bc929ca..fb7f47641f89 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-9999
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 _eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	2358a7b20091609e24bd3a83b3ac5991	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=bb639c90f675c2ab4ca41f6d7506568f
+_md5_=3c5e1dd1febe22f7c236a9a28675e381
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index e79302520fff..37040ce3d004 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/galleta-20040505_p1 b/metadata/md5-cache/app-forensics/galleta-20040505_p1
deleted file mode 100644
index 0b31e748da97..000000000000
--- a/metadata/md5-cache/app-forensics/galleta-20040505_p1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=IE Cookie Parser
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/odessa/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/odessa/galleta_20040505_1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=a59cfcc213142c63d43bd86f4c6214fa
diff --git a/metadata/md5-cache/app-forensics/pasco-20040505_p1-r1 b/metadata/md5-cache/app-forensics/pasco-20040505_p1-r1
deleted file mode 100644
index e96a0ce220eb..000000000000
--- a/metadata/md5-cache/app-forensics/pasco-20040505_p1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=IE Activity Parser
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/odessa/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/odessa/pasco_20040505_1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=f1cc4eb83a553a5b79c9db818c7c9dec
diff --git a/metadata/md5-cache/app-forensics/rifiuti-20040505_p1 b/metadata/md5-cache/app-forensics/rifiuti-20040505_p1
deleted file mode 100644
index 43e39fb3b5f0..000000000000
--- a/metadata/md5-cache/app-forensics/rifiuti-20040505_p1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Recycle Bin Analyzer
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/odessa/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/odessa/rifiuti_20040505_1.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=3b8036332bef4f39719eac92ad146835
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c0e5327952ed..e675286713b3 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/php-8.0.30 b/metadata/md5-cache/dev-lang/php-8.0.30
new file mode 100644
index 000000000000..c67e83290013
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.0.30
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+INHERIT=flag-o-matic systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.php.net/distributions/php-8.0.30.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=9b2622d31dc7006594dbe386e8c816cc
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 53e6ab3da2bb..f0555afba326 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/gost-engine-3.0.2 b/metadata/md5-cache/dev-libs/gost-engine-3.0.2
new file mode 100644
index 000000000000..fb9898a56caf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gost-engine-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/openssl-3.0.0:0= virtual/pkgconfig test? ( dev-lang/perl )
+DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
+EAPI=8
+HOMEPAGE=https://github.com/gost-engine/engine
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~hppa
+LICENSE=openssl
+RDEPEND=>=dev-libs/openssl-3.0.0:0=
+RESTRICT=!test? ( test )
+SLOT=0/3.0.2
+SRC_URI=https://github.com/gost-engine/engine/archive/v3.0.2.tar.gz -> gost-engine-3.0.2.tar.gz https://github.com/provider-corner/libprov/archive/8a126e09547630ef900177625626b6156052f0ee.tar.gz -> libprov-8a126e09547630ef900177625626b6156052f0ee.tar.gz
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=57ba94f908216412cbc82339a5cc96e4
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.17.26241.24 b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.17.26241.24
deleted file mode 100644
index f409fd198e54..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.17.26241.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-discovery:= dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.13860.4 >=dev-util/intel-graphics-system-controller-0.8.7:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.11.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva )
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-INHERIT=cmake flag-o-matic
-IUSE=+l0 +vaapi
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.3.5:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/23.17.26241.24.tar.gz -> intel-compute-runtime-23.17.26241.24.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d4536d50ad4b8b0a6862745c903506e8
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.22.26516.18 b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.22.26516.18
index b98850e6f25c..7973b36d266b 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.22.26516.18
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.22.26516.18
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.3.5:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/23.22.26516.18.tar.gz -> intel-compute-runtime-23.22.26516.18.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=804f4622dcc309e44f331c3c20cd96a0
+_md5_=7490e7c27bcdca0211367e89899f7412
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164 b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164
deleted file mode 100644
index abf34fd31f51..000000000000
--- a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libdrm
-DESCRIPTION=A user mode library that provides access to GPU performance data
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-INHERIT=cmake
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=x11-libs/libdrm
-SLOT=0/1.12.164
-SRC_URI=https://github.com/intel/metrics-discovery/archive/refs/tags/metrics-discovery-1.12.164.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2e8291497611771371fcf50fcaaa0ad9
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165 b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165
index e98273787112..c98b9b9275bd 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165
+++ b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.165
@@ -5,10 +5,10 @@ DESCRIPTION=A user mode library that provides access to GPU performance data
 EAPI=8
 HOMEPAGE=https://github.com/intel/metrics-discovery
 INHERIT=cmake
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0/1.12.165
 SRC_URI=https://github.com/intel/metrics-discovery/archive/refs/tags/metrics-discovery-1.12.165.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ee6fddf0960bdd20d54b42fc481c7a9f
+_md5_=206b6b01ff5284d4fccd3ed2532cc4bc
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20230417 b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20230417
deleted file mode 100644
index ca5e23946787..000000000000
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20230417
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libdrm
-DESCRIPTION=User mode driver helper library that provides access to GPU performance counters
-EAPI=8
-HOMEPAGE=https://github.com/intel/metrics-library
-INHERIT=cmake
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=x11-libs/libdrm
-SLOT=0/133
-SRC_URI=https://github.com/intel/metrics-library/archive/5524ef74cf0423006992a52571590cb8bc2d7468.tar.gz -> intel-metrics-library-0_pre20230417.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a7b2d5d05386e87148827193d541ab5e
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133 b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133
index ba1d3af52e36..69e044906db2 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-1.0.133
@@ -5,10 +5,10 @@ DESCRIPTION=User mode driver helper library that provides access to GPU performa
 EAPI=8
 HOMEPAGE=https://github.com/intel/metrics-library
 INHERIT=cmake
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0/1.0.133
 SRC_URI=https://github.com/intel/metrics-library/archive/refs/tags/metrics-library-1.0.133.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6773ffcc7dba88c24e4daa44851d2f46
+_md5_=aefa05874ac4043a7ff41462f55997e8
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.13.1 b/metadata/md5-cache/dev-libs/level-zero-1.13.1
index bf1d56b4490f..a8fad7aa0664 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.13.1
+++ b/metadata/md5-cache/dev-libs/level-zero-1.13.1
@@ -4,9 +4,9 @@ DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=8
 HOMEPAGE=https://github.com/oneapi-src/level-zero
 INHERIT=cmake
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 SLOT=0/1.13.1
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.13.1.tar.gz -> level-zero-1.13.1.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=54f1792f555889f751811cd522b19d5d
+_md5_=06d86f15d8d57049d7d2fb0ce8b2e530
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.12.0 b/metadata/md5-cache/dev-libs/libfmt-10.1.0
index e4fd9e2caa1a..91a661308360 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.12.0
+++ b/metadata/md5-cache/dev-libs/libfmt-10.1.0
@@ -1,12 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
+DESCRIPTION=Small, safe and fast formatting library
 EAPI=8
-HOMEPAGE=https://github.com/oneapi-src/level-zero
+HOMEPAGE=https://github.com/fmtlib/fmt
 INHERIT=cmake
-KEYWORDS=amd64
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-SLOT=0/1.12.0
-SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.12.0.tar.gz -> level-zero-1.12.0.tar.gz
+RESTRICT=!test? ( test )
+SLOT=0/10.1.0
+SRC_URI=https://github.com/fmtlib/fmt/archive/10.1.0.tar.gz -> libfmt-10.1.0.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=06d86f15d8d57049d7d2fb0ce8b2e530
+_md5_=350f2b6fcadd5b8f23ef9016ac8e383b
diff --git a/metadata/md5-cache/dev-libs/metee-3.1.5 b/metadata/md5-cache/dev-libs/metee-3.1.5
deleted file mode 100644
index 7a7b6a682595..000000000000
--- a/metadata/md5-cache/dev-libs/metee-3.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cross-platform access library for Intel CSME HECI interface
-EAPI=8
-HOMEPAGE=https://github.com/intel/metee
-INHERIT=cmake
-IUSE=doc
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0/3.1.5
-SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.1.5.tar.gz -> metee-3.1.5.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=226656a4977fa7b52729b6cc3aea103f
diff --git a/metadata/md5-cache/dev-libs/metee-3.2.3 b/metadata/md5-cache/dev-libs/metee-3.2.3
index bc123ea6588d..84a138877227 100644
--- a/metadata/md5-cache/dev-libs/metee-3.2.3
+++ b/metadata/md5-cache/dev-libs/metee-3.2.3
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/metee
 INHERIT=cmake
 IUSE=doc
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0/3.2.3
 SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.2.3.tar.gz -> metee-3.2.3.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=95cf466f6653ebe6400f0711b107e6b2
+_md5_=226656a4977fa7b52729b6cc3aea103f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 32b2f43f7723..a947312c860c 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc25 b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc25
new file mode 100644
index 000000000000..1547e63d8058
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc25
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/attrs[python_targets_python3_10(-)?] dev-python/docker[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] >=dev-python/pytest-7.0.0[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_10(-)?] >=app-admin/salt-3005.1[python_targets_python3_10(-)?] test? ( dev-python/importlib-metadata[python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_10(-)?] dev-python/docker[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] >=dev-python/pytest-7.0.0[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_10(-)?] >=app-admin/salt-3005.1[python_targets_python3_10(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The new generation of the pytest-salt Plugin
+EAPI=8
+HOMEPAGE=https://github.com/saltstack/pytest-salt-factories
+INHERIT=distutils-r1
+IUSE=test test python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/attrs[python_targets_python3_10(-)?] dev-python/docker[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] >=dev-python/pytest-7.0.0[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_10(-)?] >=app-admin/salt-3005.1[python_targets_python3_10(-)?] python_targets_python3_10? ( dev-lang/python:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/saltstack/pytest-salt-factories/archive/1.0.0rc25.tar.gz -> pytest-salt-factories-1.0.0_rc25.gh.tar.gz
+_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=f71ef8315062b5edfa61cd65f827a878
diff --git a/metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2-r2 b/metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2-r2
new file mode 100644
index 000000000000..69fa811aafc1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-subtests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pytest Plugin Which Reports System Usage Statistics
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-system-statistics/ https://github.com/saltstack/pytest-system-statistics
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/saltstack/pytest-system-statistics/archive/refs/tags/1.0.2.tar.gz -> pytest-system-statistics-1.0.2.gh.tar.gz
+_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=618062761d2ca92e7efdafd7d9b70fd2
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 46c185d180b9..59c12a007a72 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r3
index 139ea68af9c3..db43f95964e8 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.10-gentoo-kde-1.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	virtualx	817571665ee28575da44ee08135089e5
-_md5_=5de5c673a5c8acaa38d9249237ce9094
+_md5_=97b9feeb38857bfb53a023ecdf1e9ffc
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r2 b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r4
index 525d63dc2b0d..008d87e1bb1b 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r2
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.10-r4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.15.10
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtwayland-everywhere-opensource-src-5.15.10.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.10-gentoo-kde-2.tar.xz
 _eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qt5-build	e6315b433ff1f5a5778a08518785ba91	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	virtualx	817571665ee28575da44ee08135089e5
-_md5_=42af08be29444e2c8e1a8a07f45a0f76
+_md5_=974e0204d1a4debf0a29b8b868b835b9
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 9b5671f4c5a0..f58f99d5d736 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/moneta-1.6.0 b/metadata/md5-cache/dev-ruby/moneta-1.6.0
index 7231bc53acdb..7b42e5f4c164 100644
--- a/metadata/md5-cache/dev-ruby/moneta-1.6.0
+++ b/metadata/md5-cache/dev-ruby/moneta-1.6.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A unified interface to key/value stores
 EAPI=8
 HOMEPAGE=https://github.com/moneta-rb/moneta
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby30 ruby_targets_ruby31 test
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/moneta-rb/moneta/archive/v1.6.0.tar.gz -> moneta-1.6.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5f7dd7ffeaf00a781713582bd507f80b	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	69e7140043885477733c347fee4a981a	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=5f205d15994c7bf9d211b84905bca9ba
+_md5_=000952721f16d52de421316ccf84f6f5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9b941f3c9122..b1edf23c89f9 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/intel-graphics-compiler-1.0.13860.4 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.13860.4
deleted file mode 100644
index 105e6c9fae55..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.13860.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==sys-devel/lld-15* || ( dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.12.1-r1 dev-util/spirv-llvm-translator:15= ) !!sys-devel/llvm:0
-DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
-EAPI=8
-HOMEPAGE=https://github.com/intel/intel-graphics-compiler
-INHERIT=cmake flag-o-matic llvm python-any-r1
-IUSE=debug vc
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.12.1-r1 dev-util/spirv-llvm-translator:15= )
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.13860.4.tar.gz -> intel-graphics-compiler-1.0.13860.4.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=949e8d1d42bd98d1ba0325d8d7ee6407
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.14062.11 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.14062.11
index bf8669eb1644..f3c851311542 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.14062.11
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.14062.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/intel-graphics-compiler
 INHERIT=cmake flag-o-matic llvm python-any-r1
 IUSE=debug vc
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.12.1-r1 dev-util/spirv-llvm-translator:15= )
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.14062.11.tar.gz -> intel-graphics-compiler-1.0.14062.11.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=62d49fa5f2f471148a15a0226394f262
+_md5_=8c9ecf5767170bfaa3d1af4dfd868a99
diff --git a/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.8.7 b/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.8.7
deleted file mode 100644
index e85b085ed21c..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.11 dev-lang/python:3.10 ) app-doc/doxygen || ( ( dev-lang/python:3.11 dev-python/sphinx[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/metee:=
-DESCRIPTION=Intel graphics system controller firmware update library
-EAPI=8
-HOMEPAGE=https://github.com/intel/igsc
-INHERIT=cmake python-any-r1
-IUSE=+cli doc
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/metee:=
-SLOT=0/0.8.7
-SRC_URI=https://github.com/intel/igsc/archive/refs/tags/V0.8.7.tar.gz -> intel-graphics-system-controller-0.8.7.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=25138f3ca28568e68a8b748a3a087b9d
diff --git a/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.8.9 b/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.8.9
index a80e159ac324..203a67c3a0c6 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.8.9
+++ b/metadata/md5-cache/dev-util/intel-graphics-system-controller-0.8.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/igsc
 INHERIT=cmake python-any-r1
 IUSE=+cli doc
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/metee:=
 SLOT=0/0.8.9
 SRC_URI=https://github.com/intel/igsc/archive/refs/tags/V0.8.9.tar.gz -> intel-graphics-system-controller-0.8.9.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a8434b5193518a46419e71dddf79819d
+_md5_=8190840310681f589e4b3be31eb1aa88
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index c0d89732a80b..ba1cc791c9a0 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.20.14.01 b/metadata/md5-cache/games-server/bedrock-server-1.20.14.01
new file mode 100644
index 000000000000..09287ead4eba
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.20.14.01
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=8
+HOMEPAGE=https://www.minecraft.net/
+INHERIT=systemd
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach net-misc/curl
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.20.14.01.zip
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=bf1d85b33156fc6ed6e79e2f74fd3654
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 1908beb64a5c..b3416044e8a0 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/icon-slicer-0.3 b/metadata/md5-cache/media-gfx/icon-slicer-0.3
deleted file mode 100644
index 280f1e93b53f..000000000000
--- a/metadata/md5-cache/media-gfx/icon-slicer-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-apps/xcursorgen x11-libs/gtk+:2 dev-libs/popt virtual/pkgconfig
-DESCRIPTION=utility for generating icon themes and libXcursor cursor themes
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/icon-slicer/
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
-LICENSE=MIT
-RDEPEND=x11-apps/xcursorgen x11-libs/gtk+:2 dev-libs/popt
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/icon-slicer/releases/icon-slicer-0.3.tar.gz
-_md5_=0823266fb3f8184a2ae0ecfffc8a0980
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 338d20eb5736..bf0e1d6e673c 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/hamlib-4.5.5 b/metadata/md5-cache/media-libs/hamlib-4.5.5
index 28ac702ce22a..1c895c1b7aa8 100644
--- a/metadata/md5-cache/media-libs/hamlib-4.5.5
+++ b/metadata/md5-cache/media-libs/hamlib-4.5.5
@@ -3,15 +3,15 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
 DESCRIPTION=Ham radio backend rig control libraries
 EAPI=8
-HOMEPAGE=http://www.hamlib.org
+HOMEPAGE=https://www.hamlib.github.io
 INHERIT=autotools python-single-r1
 IUSE=doc perl python tcl python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=LGPL-2 GPL-2
+LICENSE=LGPL-2+ GPL-2+
 RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0/4.2
 SRC_URI=mirror://sourceforge/hamlib/hamlib-4.5.5.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=9d31d0741c80732d8f5b858f7adc3620
+_md5_=15326197d50e59c592dca21e24171c15
diff --git a/metadata/md5-cache/media-libs/hamlib-4.5.5-r1 b/metadata/md5-cache/media-libs/hamlib-4.5.5-r1
new file mode 100644
index 000000000000..e24a25042e8c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/hamlib-4.5.5-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) tcl? ( dev-lang/tcl:0= )
+DESCRIPTION=Ham radio backend rig control libraries
+EAPI=8
+HOMEPAGE=https://www.hamlib.github.io
+INHERIT=autotools python-single-r1
+IUSE=doc perl python tcl python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0/4.2
+SRC_URI=mirror://sourceforge/hamlib/hamlib-4.5.5.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1f435bc389faf790af695df46b8dcb73	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=f571e23699d2799755ff0880cc33f8c8
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 4198151b880d..b2961cd62d5d 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/flmsg-4.0.19-r1 b/metadata/md5-cache/media-radio/flmsg-4.0.22
index 784b6feb6007..7e774b758f3a 100644
--- a/metadata/md5-cache/media-radio/flmsg-4.0.19-r1
+++ b/metadata/md5-cache/media-radio/flmsg-4.0.22
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure
+DEFINED_PHASES=-
 DEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:= virtual/pkgconfig
 DESCRIPTION=Fldigi helper for creating radiograms
 EAPI=8
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
 SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flmsg-4.0.19.tar.gz
-_md5_=8aa49634d6fecaec8cce835b5ca31814
+SRC_URI=mirror://sourceforge/fldigi/flmsg-4.0.22.tar.gz
+_md5_=f0a2a45841b7cb8387dd57b461d2a924
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index dfbcbd9b3980..61cc48eb3632 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/netdata-1.42.0 b/metadata/md5-cache/net-analyzer/netdata-1.42.0
new file mode 100644
index 000000000000..9835d2b515ed
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.42.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= dev-libs/libyaml cloud? ( dev-libs/protobuf:= ) sys-libs/zlib ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) mysql? ( python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mysqlclient[python_targets_python3_11(-)] ) ) postgres? ( python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) tor? ( python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-libs/stem[python_targets_python3_11(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=8
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= dev-libs/libyaml cloud? ( dev-libs/protobuf:= ) sys-libs/zlib ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) mysql? ( python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mysqlclient[python_targets_python3_11(-)] ) ) postgres? ( python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) tor? ( python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-libs/stem[python_targets_python3_11(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/releases/download/v1.42.0/netdata-v1.42.0.tar.gz -> netdata-1.42.0.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1f435bc389faf790af695df46b8dcb73	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=61224e0838f43b9921fab287f29ad3a2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 380dcb9409d6..278f53c28d52 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.50 b/metadata/md5-cache/sys-apps/portage-3.0.50
index 18e8d2e83042..042303f7907c 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.50
+++ b/metadata/md5-cache/sys-apps/portage-3.0.50
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.50.tar.bz2
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	08b7183c3f4811568ee93eb0f79a89fe	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	1f435bc389faf790af695df46b8dcb73	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=646c70773cff6aa2109f185674e233df
+_md5_=5c011a47eafd30f6591853b173689546
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 676b308c57a6..46bf7870e5be 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	git-r3	2358a7b20091609e24bd3a83b3ac5991	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	meson	08b7183c3f4811568ee93eb0f79a89fe	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	1f435bc389faf790af695df46b8dcb73	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=646c70773cff6aa2109f185674e233df
+_md5_=5c011a47eafd30f6591853b173689546
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 60ceedcfb6b6..c4ca008fad4f 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/jackett-0.21.584 b/metadata/md5-cache/www-apps/jackett-0.21.584
deleted file mode 100644
index fdd42b487928..000000000000
--- a/metadata/md5-cache/www-apps/jackett-0.21.584
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DESCRIPTION=API Support for your favorite torrent trackers
-EAPI=8
-HOMEPAGE=https://github.com/Jackett/Jackett
-INHERIT=systemd
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=acct-group/jackett acct-user/jackett media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
-RESTRICT=bindist strip test
-SLOT=0
-SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Jackett/Jackett/releases/download/v0.21.584/Jackett.Binaries.LinuxAMDx64.tar.gz -> jackett-0.21.584-x64.tar.gz ) elibc_musl? ( https://github.com/Jackett/Jackett/releases/download/v0.21.584/Jackett.Binaries.LinuxMuslAMDx64.tar.gz -> jackett-0.21.584-musl-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Jackett/Jackett/releases/download/v0.21.584/Jackett.Binaries.LinuxARM32.tar.gz -> jackett-0.21.584-arm.tar.gz ) elibc_musl? ( https://github.com/Jackett/Jackett/releases/download/v0.21.584/Jackett.Binaries.LinuxMuslARM32.tar.gz -> jackett-0.21.584-musl-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Jackett/Jackett/releases/download/v0.21.584/Jackett.Binaries.LinuxARM64.tar.gz -> jackett-0.21.584-arm64.tar.gz ) elibc_musl? ( https://github.com/Jackett/Jackett/releases/download/v0.21.584/Jackett.Binaries.LinuxMuslARM64.tar.gz -> jackett-0.21.584-musl-arm64.tar.gz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=aea574dbfb9f93e0b71976bb7c923f8e
diff --git a/metadata/md5-cache/www-apps/jackett-0.21.648 b/metadata/md5-cache/www-apps/jackett-0.21.648
new file mode 100644
index 000000000000..93b9143f5915
--- /dev/null
+++ b/metadata/md5-cache/www-apps/jackett-0.21.648
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=API Support for your favorite torrent trackers
+EAPI=8
+HOMEPAGE=https://github.com/Jackett/Jackett
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=acct-group/jackett acct-user/jackett media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Jackett/Jackett/releases/download/v0.21.648/Jackett.Binaries.LinuxAMDx64.tar.gz -> jackett-0.21.648-x64.tar.gz ) elibc_musl? ( https://github.com/Jackett/Jackett/releases/download/v0.21.648/Jackett.Binaries.LinuxMuslAMDx64.tar.gz -> jackett-0.21.648-musl-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Jackett/Jackett/releases/download/v0.21.648/Jackett.Binaries.LinuxARM32.tar.gz -> jackett-0.21.648-arm.tar.gz ) elibc_musl? ( https://github.com/Jackett/Jackett/releases/download/v0.21.648/Jackett.Binaries.LinuxMuslARM32.tar.gz -> jackett-0.21.648-musl-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Jackett/Jackett/releases/download/v0.21.648/Jackett.Binaries.LinuxARM64.tar.gz -> jackett-0.21.648-arm64.tar.gz ) elibc_musl? ( https://github.com/Jackett/Jackett/releases/download/v0.21.648/Jackett.Binaries.LinuxMuslARM64.tar.gz -> jackett-0.21.648-musl-arm64.tar.gz ) )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=aea574dbfb9f93e0b71976bb7c923f8e
diff --git a/metadata/md5-cache/www-apps/lidarr-1.3.3.3432 b/metadata/md5-cache/www-apps/lidarr-1.3.4.3458
index 057a3b51fd60..63b363fa0651 100644
--- a/metadata/md5-cache/www-apps/lidarr-1.3.3.3432
+++ b/metadata/md5-cache/www-apps/lidarr-1.3.4.3458
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=acct-group/lidarr acct-user/lidarr media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
 RESTRICT=bindist strip test
 SLOT=0
-SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.3.3432/Lidarr.develop.1.3.3.3432.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.3.3432/Lidarr.develop.1.3.3.3432.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.3.3432/Lidarr.develop.1.3.3.3432.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.3.3432/Lidarr.develop.1.3.3.3432.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.3.3432/Lidarr.develop.1.3.3.3432.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.3.3432/Lidarr.develop.1.3.3.3432.linux-musl-core-arm64.tar.gz ) )
+SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.4.3458/Lidarr.develop.1.3.4.3458.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.4.3458/Lidarr.develop.1.3.4.3458.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.4.3458/Lidarr.develop.1.3.4.3458.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.4.3458/Lidarr.develop.1.3.4.3458.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.4.3458/Lidarr.develop.1.3.4.3458.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Lidarr/Lidarr/releases/download/v1.3.4.3458/Lidarr.develop.1.3.4.3458.linux-musl-core-arm64.tar.gz ) )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
 _md5_=00d8dee3b0c2be9e874cfc57c764575d
diff --git a/metadata/md5-cache/www-apps/prowlarr-1.8.0.3805 b/metadata/md5-cache/www-apps/prowlarr-1.8.2.3860
index 76d5c8d02b31..3c5c61bb7893 100644
--- a/metadata/md5-cache/www-apps/prowlarr-1.8.0.3805
+++ b/metadata/md5-cache/www-apps/prowlarr-1.8.2.3860
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=acct-group/prowlarr acct-user/prowlarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
 RESTRICT=bindist strip test
 SLOT=0
-SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.0.3805/Prowlarr.develop.1.8.0.3805.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.0.3805/Prowlarr.develop.1.8.0.3805.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.0.3805/Prowlarr.develop.1.8.0.3805.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.0.3805/Prowlarr.develop.1.8.0.3805.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.0.3805/Prowlarr.develop.1.8.0.3805.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.0.3805/Prowlarr.develop.1.8.0.3805.linux-musl-core-arm64.tar.gz ) )
+SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.2.3860/Prowlarr.develop.1.8.2.3860.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.2.3860/Prowlarr.develop.1.8.2.3860.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.2.3860/Prowlarr.develop.1.8.2.3860.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.2.3860/Prowlarr.develop.1.8.2.3860.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.2.3860/Prowlarr.develop.1.8.2.3860.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.8.2.3860/Prowlarr.develop.1.8.2.3860.linux-musl-core-arm64.tar.gz ) )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
 _md5_=6f4113864356d865f4a5371657f43b4e
diff --git a/metadata/md5-cache/www-apps/radarr-4.7.3.7731 b/metadata/md5-cache/www-apps/radarr-4.7.3.7731
deleted file mode 100644
index a7594ee5d344..000000000000
--- a/metadata/md5-cache/www-apps/radarr-4.7.3.7731
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare
-DESCRIPTION=A fork of Sonarr to work with movies a la Couchpotato
-EAPI=8
-HOMEPAGE=https://www.radarr.video
-INHERIT=systemd
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=acct-group/radarr acct-user/radarr media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
-RESTRICT=bindist strip test
-SLOT=0
-SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v4.7.3.7731/Radarr.develop.4.7.3.7731.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v4.7.3.7731/Radarr.develop.4.7.3.7731.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v4.7.3.7731/Radarr.develop.4.7.3.7731.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v4.7.3.7731/Radarr.develop.4.7.3.7731.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v4.7.3.7731/Radarr.develop.4.7.3.7731.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v4.7.3.7731/Radarr.develop.4.7.3.7731.linux-musl-core-arm64.tar.gz ) )
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=4c6a060380445d40b13a914bde7c5925
diff --git a/metadata/md5-cache/www-apps/radarr-4.7.5.7809 b/metadata/md5-cache/www-apps/radarr-4.7.5.7809
new file mode 100644
index 000000000000..fb091239f176
--- /dev/null
+++ b/metadata/md5-cache/www-apps/radarr-4.7.5.7809
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=A fork of Sonarr to work with movies a la Couchpotato
+EAPI=8
+HOMEPAGE=https://www.radarr.video
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/radarr acct-user/radarr media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v4.7.5.7809/Radarr.master.4.7.5.7809.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v4.7.5.7809/Radarr.master.4.7.5.7809.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v4.7.5.7809/Radarr.master.4.7.5.7809.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v4.7.5.7809/Radarr.master.4.7.5.7809.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v4.7.5.7809/Radarr.master.4.7.5.7809.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v4.7.5.7809/Radarr.master.4.7.5.7809.linux-musl-core-arm64.tar.gz ) )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=f15f1054277954dc6d53b829a18aa59a
diff --git a/metadata/md5-cache/www-apps/readarr-0.3.0.2091 b/metadata/md5-cache/www-apps/readarr-0.3.1.2096
index 1ea2230d9b44..a8e504518cb1 100644
--- a/metadata/md5-cache/www-apps/readarr-0.3.0.2091
+++ b/metadata/md5-cache/www-apps/readarr-0.3.1.2096
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=acct-group/readarr acct-user/readarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
 RESTRICT=bindist strip test
 SLOT=0
-SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Readarr/Readarr/releases/download/v0.3.0.2091/Readarr.develop.0.3.0.2091.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Readarr/Readarr/releases/download/v0.3.0.2091/Readarr.develop.0.3.0.2091.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Readarr/Readarr/releases/download/v0.3.0.2091/Readarr.develop.0.3.0.2091.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Readarr/Readarr/releases/download/v0.3.0.2091/Readarr.develop.0.3.0.2091.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Readarr/Readarr/releases/download/v0.3.0.2091/Readarr.develop.0.3.0.2091.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Readarr/Readarr/releases/download/v0.3.0.2091/Readarr.develop.0.3.0.2091.linux-musl-core-arm64.tar.gz ) )
+SRC_URI=amd64? ( elibc_glibc? ( https://github.com/Readarr/Readarr/releases/download/v0.3.1.2096/Readarr.develop.0.3.1.2096.linux-core-x64.tar.gz ) elibc_musl? ( https://github.com/Readarr/Readarr/releases/download/v0.3.1.2096/Readarr.develop.0.3.1.2096.linux-musl-core-x64.tar.gz ) ) arm? ( elibc_glibc? ( https://github.com/Readarr/Readarr/releases/download/v0.3.1.2096/Readarr.develop.0.3.1.2096.linux-core-arm.tar.gz ) elibc_musl? ( https://github.com/Readarr/Readarr/releases/download/v0.3.1.2096/Readarr.develop.0.3.1.2096.linux-musl-core-arm.tar.gz ) ) arm64? ( elibc_glibc? ( https://github.com/Readarr/Readarr/releases/download/v0.3.1.2096/Readarr.develop.0.3.1.2096.linux-core-arm64.tar.gz ) elibc_musl? ( https://github.com/Readarr/Readarr/releases/download/v0.3.1.2096/Readarr.develop.0.3.1.2096.linux-musl-core-arm64.tar.gz ) )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
 _md5_=68d29bf17fa47269a57f90b0df1a505d
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 936a6df90604..a8b85a99e57a 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/nginx-1.25.2 b/metadata/md5-cache/www-servers/nginx-1.25.2
new file mode 100644
index 000000000000..52d405809d31
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.25.2
@@ -0,0 +1,18 @@
+BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) ktls? ( >=dev-libs/openssl-3:0=[ktls] ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=8
+HOMEPAGE=https://nginx.org
+INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
+IUSE=aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) ktls? ( >=dev-libs/openssl-3:0=[ktls] ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) ktls? ( ssl ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite pcre !pcre2 ) nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.25.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.63.tar.gz -> ngx_http_echo-0.63.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/v0.34.tar.gz -> ngx_http_headers_more-0.34.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.8.0.tar.gz -> njs-0.8.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.25.tar.gz -> ngx_http_lua-0.10.25.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/wargio/naxsi/archive/4140b2ded624eb36f04c783c460379b9403012d0.tar.gz -> ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz https://github.com/libinjection/libinjection/archive/49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz -> ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.2.1.tar.gz -> ngx_http_vhost_traffic_status-0.2.1.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.8.0.tar.gz -> njs-0.8.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.2.tar.gz -> ngx_rtmp-1.2.2.tar.gz )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	dd4003d3308d7cad2b2d4e2b8298ffb2	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=708081ff03423984805797a2c2d2a330
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 7e538c1ac69b..39dbeacea229 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1 b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
deleted file mode 100644
index 416481377f48..000000000000
--- a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/glib-utils gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DESCRIPTION=Canonical's on-screen-display notification agent
-EAPI=6
-HOMEPAGE=https://launchpad.net/notify-osd
-INHERIT=autotools gnome2-utils savedconfig
-IUSE=minimal savedconfig
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon gnome-base/gsettings-desktop-schemas !minimal? ( x11-themes/notify-osd-icons )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/notify-osd/precise/0.9.34/+download/notify-osd-0.9.34.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	eqawarn	c9847c43b3253a276ae2eabddedab3d7	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	portability	a74d533f258f1f435be71312558c12f9	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b17ef88a244b891828e15874f1569c92
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 138fbec57472..eada18ba7759 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-08-15T19:39:56Z
+TIMESTAMP 2023-08-16T01:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTb1IxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTcKOhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDCGRAAlvyei5kj5ROPRd9OF4goaW8acWYMX7wRKUpy6nPhKV+3p+/kcyPVdMkm
-GiJ4uPceuM+69iyT9VN8zJaEH4uq0dY3WqhyRn91zog4rakTBEvhXKlIsiZX0dKC
-dwfFRJXGu3LOqa6kB1r7R+dy7TFGkKIIqR0LbWZJvczPgADB8mKB/leuEvCEhRkP
-fv+mLWZNWR+ySFp2Cff6kGBM10H4ZWDUeRJVvfFa72AQUFU5HmOWMAn8XDcOovjv
-2wVCMCtOKuC4OxDeNVmZcaGmlQOlatpzCJt5HK0b36CQUkihpzM//tcIue9sIEu1
-DBDa0mMYKR7L7ndXRQrHNokPaw8dBGchuizGG+ThW7lmO7kWf0N4XdmJfl97NV4d
-S3RPmEGvx8umrJfuyDiqQQkWpjF/yWr3t2e3tBTVZYWFJ5I7cr3kuhB4UEXDI/TY
-oXHXNcRIiQ//VdN0yjXcW6jV0ruyhoCPMnGikNAVDlc/oNxJ9oR9ePLX+29uYFFC
-PlD0sd00oKlq53SdLsQ9DUkIb/Rd6PQRmZc9tW+aw6LJs+FhagYGkI8s5lm4JFfw
-H1LNB9+t0UyY4NaRkcUaC1lsM4STw2qL/xMcv7YYRVzMgRwHdFt8ouIucy1n8NdG
-3FlyvrBIIX3A1AYmqKtOxBWgZEHzTP5PHNxj7Y3T5LUiG5SoM24=
-=QYyY
+klAk6hAAtvonblWmbhQFGErQcwJYN2JvyYQ2KFLmH+bdMXzjGt/VR2JQqDXysEFT
+dsnm4t8feEbRhm6BhgViDFG9seNF/oeqmo4pmAD/PKuANCBc5CdXEt6H6rQ2cZuw
+5gPHWPMbSjhPKFzclmxTr44boYYT2uF7XMtSrk6Y7aCxK9/Q0hBdGG5ZI4enKgo5
+TRTqgp/1BZBxxjJ1cDyBKLu/iQsU1a66ErhoLw4+mBypW6jONCXwgsfcZeSmofYY
+rIyCVtvHQ2bHY5c2wOusb4B63exzfN7+hHaiB3MBBTqZT/Vbpi4Sv7MlXmvdFTs9
+w8BH7nK7FsR98e2oWUy/0mkPTDka0w10uzqelcWsG7SIpIlgZZOPWM8KZBtMyp3z
+3y0+Ge7XOREsQCwA89Is0lDoOC2vhhhBQroXm3le71SiQnQM/BBecjrt5RRwpMNQ
+dkQRB7QckYnIsIUw7IZSkrYH6VddZUW/vt3uid5rY9lE/mR7Ds0mMwD6k2G9pIyx
+Myw72RXBdd6/1clmj9HYbHxMMwdXCIf1cDygN3X0FChynxS7zkNe8SytflJIR/ZJ
+Rx+8pPQQX7rIQhDoHaxuxNtZ0XrXvsibr2rCkvWVTz7UhHm1GSJV629hW6HO6ZIf
+hLHVXelcA+Se/P/BX0m1vneDNJ4rkj87x1jw+X02LCFMnjEerY0=
+=w/WD
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 050ad8f5994b..b13f014c410a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Aug 2023 19:39:53 +0000
+Wed, 16 Aug 2023 01:39:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7ca5d5ae25ce..1cd1dc3983f7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Aug 15 07:39:53 PM UTC 2023
+Wed Aug 16 01:39:48 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1df60e9917f0..12b671d6a47f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Aug 2023 19:45:01 +0000
+Wed, 16 Aug 2023 01:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ffae259a4b12..90e90013b6bd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-fecae5e524e943f1e135f6e80e3d2f275fea5d86 1692126930 2023-08-15T19:15:30+00:00
+e3d8d37d2b0ac12fdb4ecf2873811b20cd9c3e1a 1692148645 2023-08-16T01:17:25+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 97c4bbefa51b..90c6cb978626 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1692128401 Tue 15 Aug 2023 07:40:01 PM UTC
+1692150001 Wed 16 Aug 2023 01:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 050ad8f5994b..b13f014c410a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Aug 2023 19:39:53 +0000
+Wed, 16 Aug 2023 01:39:48 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index df4a2615a915..8da4fcf4c904 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 44cf98ea1a54..4f22e0b217b5 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,9 +1,11 @@
 DIST netdata-1.40.0.tar.gz 43343645 BLAKE2B effcf309e3c2fd65269bc2ee2e3b6300048f7ebd1c09b7b640c3ab9d3eab66010e1886d685695753212e4af3f4a834c8b31d68db6fba9c2de1dd77c5f60b0326 SHA512 0fb103d6b5f37cba68a553d9934fbc7a6fb1f4dd59f1aae0cc755076b8fc2c6889405fd2875eff703036fa811334c29ffcfda080d93453f5882f8e230d05a8da
 DIST netdata-1.40.1.tar.gz 43354949 BLAKE2B 70aabebb9544d17faf8adbcbac0f37be674ce1e5adc2bbd3f9b2201941337f4464fa950ae8cddff021c772ad903d90e65fda4cd5b8b05f92bee8248e4665ce2a SHA512 e2769c65036422371c4cca7757d813a35202a7f3bb905e03e40247be96e48d5ce71431ae43f3b8ab03a72b690e5fe370b0079c82e00e00ef5454d9a0a8d42132
 DIST netdata-1.41.0.tar.gz 45631424 BLAKE2B 6f1557bcdba3f8215139970c5130246fa6f4e0da8fce5205989aff18165d14b8ab586ff2eda82304b5691a64cdd63deb458a8eaf25130b5c5684cb8ec4c0d822 SHA512 73e56d428e2d5d88cc72cdb51a89d50b98a1fbb02c50acc2fec74896bccabbcf26528419587574745ee01e4d94f39a2248b604d38c17912aeb5b8e995cbb82ab
+DIST netdata-1.42.0.tar.gz 46038314 BLAKE2B 661c457f5ae395dc81b3066ae87a71038bc1a20d47cf904b0b0e950c7405e49764e3e5b304a432b58697173cc688e32dca61406ddd4ab4bbd7ff00b4f143b5b6 SHA512 14fbb6ba863fe9e71751ab02ab53ff02ee0114753cc9c4060e28e6ff003953acb1398a2b17cc9c150b2c61e7eb9df2d8e5916e990144e33cb1ff915f21b7611a
 EBUILD netdata-1.40.0-r1.ebuild 4012 BLAKE2B deef173f8777b907c1d2d4dcd0db0655bc460b0be2f0563bfe6bba31b0be7e1e5c80c48b3be7a0e807adaca7615d7594a4771b7bee3e5fbae2809747a905448a SHA512 e6ec89b4b0264ec7719f17c5f5a043731f784fbafa1264026df13f826e1f802fe0f6838442154c468b468e7e4caf6f12878aa92efdf100180559269c8b73becf
 EBUILD netdata-1.40.0.ebuild 3994 BLAKE2B 3365a068017ec07c1e3e7e139e3cb1069f2e4e54c19c6e998926c53bd54ee8d92c5a4dca8025abb7f0878abf217b0fff9f8211a0ae5f63f33e727b577a5464e9 SHA512 b54ebb6fefcaac86b195127b51438f3de8942bcd7fb1032f6d7eaab9f76253b4066d16f51a01f92222a69923711e2cca05200cec5eb342e0fb4d258526b05f77
 EBUILD netdata-1.40.1.ebuild 4012 BLAKE2B deef173f8777b907c1d2d4dcd0db0655bc460b0be2f0563bfe6bba31b0be7e1e5c80c48b3be7a0e807adaca7615d7594a4771b7bee3e5fbae2809747a905448a SHA512 e6ec89b4b0264ec7719f17c5f5a043731f784fbafa1264026df13f826e1f802fe0f6838442154c468b468e7e4caf6f12878aa92efdf100180559269c8b73becf
 EBUILD netdata-1.41.0.ebuild 4012 BLAKE2B deef173f8777b907c1d2d4dcd0db0655bc460b0be2f0563bfe6bba31b0be7e1e5c80c48b3be7a0e807adaca7615d7594a4771b7bee3e5fbae2809747a905448a SHA512 e6ec89b4b0264ec7719f17c5f5a043731f784fbafa1264026df13f826e1f802fe0f6838442154c468b468e7e4caf6f12878aa92efdf100180559269c8b73becf
+EBUILD netdata-1.42.0.ebuild 4012 BLAKE2B deef173f8777b907c1d2d4dcd0db0655bc460b0be2f0563bfe6bba31b0be7e1e5c80c48b3be7a0e807adaca7615d7594a4771b7bee3e5fbae2809747a905448a SHA512 e6ec89b4b0264ec7719f17c5f5a043731f784fbafa1264026df13f826e1f802fe0f6838442154c468b468e7e4caf6f12878aa92efdf100180559269c8b73becf
 EBUILD netdata-9999.ebuild 4012 BLAKE2B deef173f8777b907c1d2d4dcd0db0655bc460b0be2f0563bfe6bba31b0be7e1e5c80c48b3be7a0e807adaca7615d7594a4771b7bee3e5fbae2809747a905448a SHA512 e6ec89b4b0264ec7719f17c5f5a043731f784fbafa1264026df13f826e1f802fe0f6838442154c468b468e7e4caf6f12878aa92efdf100180559269c8b73becf
 MISC metadata.xml 1210 BLAKE2B ac344469cba5d26dea18c43f9387c4e8de92d39dae04d70e80de49584bcfad11f01287ed6634fafb85d73acc08942a4bd250105fe0abe11ddb45da826f4f21db SHA512 ecb8c9976479a31a90789b2f6d336b533d7fe16b0995634fa3eb015e3bfbc57eeeafa91dc13c943a1cde41fd73679c55f16bd3ce749bf0f82d23899531544f3e
diff --git a/net-analyzer/netdata/netdata-1.42.0.ebuild b/net-analyzer/netdata/netdata-1.42.0.ebuild
new file mode 100644
index 000000000000..90d183c63811
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.42.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
+
+inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	acct-group/netdata
+	acct-user/netdata
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-libs/libwebsockets
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	app-alternatives/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		app-arch/lz4:=
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	dev-libs/libuv:=
+	dev-libs/libyaml
+	cloud? ( dev-libs/protobuf:= )
+	sys-libs/zlib
+	ipmi? ( sys-libs/freeipmi )
+	jsonc? ( dev-libs/json-c:= )
+	mongodb? ( dev-libs/mongo-c-driver )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl:=
+	)
+	nodejs? ( net-libs/nodejs )
+	prometheus? (
+		app-arch/snappy:=
+		dev-libs/protobuf:=
+	)
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
+		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
+		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc64; then
+		# bundled dlib does not support vsx on big-endian
+		# https://github.com/davisking/dlib/issues/397
+		[[ $(tc-endian) == big ]] && append-flags -mno-vsx
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=netdata \
+		--without-bundled-protobuf \
+		$(use_enable cloud) \
+		$(use_enable jsonc) \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		--disable-exporting-kinesis \
+		$(use_enable lto lto) \
+		$(use_enable mongodb exporting-mongodb) \
+		$(use_enable prometheus exporting-prometheus-remote-write) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse)
+}
+
+src_compile() {
+	emake clean
+	default
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	keepdir /var/log/netdata
+	fowners -Rc netdata:netdata /var/log/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+	fowners -Rc netdata:netdata /var/lib/netdata
+
+	fowners -Rc root:netdata /usr/share/${PN}
+
+	newinitd system/openrc/init.d/netdata ${PN}
+	newconfd system/openrc/conf.d/netdata ${PN}
+	systemd_dounit system/systemd/netdata.service
+	systemd_dounit system/systemd/netdata-updater.service
+	systemd_dounit system/systemd/netdata-updater.timer
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use nfacct ; then
+		fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
+	fi
+
+	if use xen ; then
+		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
+	fi
+
+	if use ipmi ; then
+	    fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
+	fi
+}
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 341e9fd25fd3..9f478892ff0c 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index 8ab42c9abf02..ed1887196d91 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -1,5 +1,4 @@
 AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
-AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
 AUX murmur.initd-r2 511 BLAKE2B 2ff09ffdb62c5131f97f52960ac71360eb4959bb974c8cbc7f0fb0a27da91f34826a3065840be5a5ef9c24e243185cee0106c85285aa2aefbb534934cff9621d SHA512 3153254ec2c31e1b19e4991cce65ae9df7a609ad61c13ff569bbe822fc728dcf562c63c0a0d3198de3bd1599524db3f0e122004d1491b6bceafdbb28066a56cc
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
diff --git a/net-voip/murmur/files/murmur.initd-r1 b/net-voip/murmur/files/murmur.initd-r1
deleted file mode 100644
index fe49b32f1410..000000000000
--- a/net-voip/murmur/files/murmur.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-
-pidfile="/run/murmur/murmur.pid"
-command="/usr/bin/murmurd"
-command_args="-ini \"${MURMUR_CONF}\""
-start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20"
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	use dbus logger
-	after bootmisc mysql
-}
-
-start_pre() {
-	checkpath -q -d -o ${MURMUR_USER} ${pidfile%/*}
-}
-
-reload() {
-	ebegin "Reloading Murmur"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}" \
-		--exec ${command}
-	eend $?
-}
-
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e7692172f917..bd2bb2e65b6c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3354cbba8a96..6719ce69b4b1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -17,6 +17,6 @@ EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e
 EBUILD portage-3.0.48.1-r2.ebuild 9403 BLAKE2B a4df81d1c9e37bab4233bc81950311e2a6a63d128c01b7bf31ad67e26540e5511cd24ecd10694abd7f66a3f5d25a55f14f831237aee8d3386645af36ced1cf5f SHA512 7585547ae3b2c15b65e9a728305775fd5f1dd5109c1a4cd906128c4c74c863aae57e6fefe6363374778c68d380dbae7cb67ac843bf21083fb0c11ade0f78a878
 EBUILD portage-3.0.49-r1.ebuild 9399 BLAKE2B a1a18644449ef46cb0f5acd4fa73fdc20da4f9dc5f21e57051286c9c7c7696cfdd7b11955a86f51564fd671a2e89b8f5f28bb87a573b56a89a1b1648e059dada SHA512 f2cee72b1c4774780082a646233668f04bf1a9431158a1747158f43ffb8f6ddbd48ff1736af940f61420ae4b3cc93a00e976354785b986e571cf8269c84ef14f
 EBUILD portage-3.0.49-r2.ebuild 9527 BLAKE2B 7be78ac1979d89e8ad41d6d1dab8ee3f89b8edaeaac34286f4dceeb044fa613db4dd1f0cb4b091b6fd1813f58abbea71f483ff41d2ac4eadc6e76ea05218482c SHA512 67f55f308c4b0014ada740d5ea06645e6de47ddd40db0998fd99afcb0d78a9a1640639a3e516a9a5b369726fc6b9902750f9c7738f7f0b6daf6373c3de2f14cd
-EBUILD portage-3.0.50.ebuild 6438 BLAKE2B 3c82373457ed541a20c55b1a59a66c231463270b36870c1195969ca74ac0f6416c97e22e186eefb740be74f245c6296d3b282c720053b2853a5f75c15a653705 SHA512 5cdbc7acfb4868e65e2e9daf35024e7d89338c0ece8c3414b453355b3bb0e3e6d129ceb9803f472ea0bb6b3b52a2b43ae123e6cdff71c9e8d78c4c756e7d447a
-EBUILD portage-9999.ebuild 6438 BLAKE2B 3c82373457ed541a20c55b1a59a66c231463270b36870c1195969ca74ac0f6416c97e22e186eefb740be74f245c6296d3b282c720053b2853a5f75c15a653705 SHA512 5cdbc7acfb4868e65e2e9daf35024e7d89338c0ece8c3414b453355b3bb0e3e6d129ceb9803f472ea0bb6b3b52a2b43ae123e6cdff71c9e8d78c4c756e7d447a
+EBUILD portage-3.0.50.ebuild 6458 BLAKE2B d20d218abc6b9fa0637d0e98f49e1b6b79987427c151ff50741a0695f3227205225beb502479b64bca53e4563f0dd2394f526c3ae147a5ad348927abe42da28e SHA512 7b6edb9424bcbfe37861b8e0116953cc9f7bb9dec72dd794fc35118dab512c4472eb91497e0efd85e8692c17119d7185dd3fe601f2d78ad4bc785bb8d5293f19
+EBUILD portage-9999.ebuild 6458 BLAKE2B d20d218abc6b9fa0637d0e98f49e1b6b79987427c151ff50741a0695f3227205225beb502479b64bca53e4563f0dd2394f526c3ae147a5ad348927abe42da28e SHA512 7b6edb9424bcbfe37861b8e0116953cc9f7bb9dec72dd794fc35118dab512c4472eb91497e0efd85e8692c17119d7185dd3fe601f2d78ad4bc785bb8d5293f19
 MISC metadata.xml 1539 BLAKE2B 0efa1ae365449d6593909046c32158a9f6755aa9252c34ae00eb866dd29a0b6a5c2e7a4af9293d0f87c4dd9231132fc5361acb0818fb6beff6dd6fbbdc6f409b SHA512 675f5baa1b3079592e3930b11ca18f324e27c42b5515f9ae815a26e53a465640fa6e9c4069df0e2121932b9f1cc73f2c9469c1529728f3c5ed5c3e687743ac0d
diff --git a/sys-apps/portage/portage-3.0.50.ebuild b/sys-apps/portage/portage-3.0.50.ebuild
index 91d945df8187..08cbf145abb2 100644
--- a/sys-apps/portage/portage-3.0.50.ebuild
+++ b/sys-apps/portage/portage-3.0.50.ebuild
@@ -177,7 +177,7 @@ src_test() {
 }
 
 pkg_preinst() {
-	if ! use build; then
+	if ! use build && [[ -z ${ROOT} ]]; then
 		python_setup
 		local sitedir=$(python_get_sitedir)
 		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 91d945df8187..08cbf145abb2 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -177,7 +177,7 @@ src_test() {
 }
 
 pkg_preinst() {
-	if ! use build; then
+	if ! use build && [[ -z ${ROOT} ]]; then
 		python_setup
 		local sitedir=$(python_get_sitedir)
 		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 5f0603e4657a..524c0ec90263 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/jackett/Manifest b/www-apps/jackett/Manifest
index 9ca88de4713f..c5c14cf03997 100644
--- a/www-apps/jackett/Manifest
+++ b/www-apps/jackett/Manifest
@@ -1,11 +1,11 @@
 AUX jackett.init 133 BLAKE2B d2f03dbed251bfe5fd2d7d7751fee9997880a422fbb0f6e32f91939855019ccde23807d8300437643cb0770fc9e00c83f1ddf1ad5f06f5e2cd5c8c01dcc05513 SHA512 ea342cd3af5c85f73ffd732ee27af164f847c721c0b796e85c0af8b37d5215fa089a37d4c3c92226ed8befe9de05199903ce0a8327fd8fafcd3d25e54d0aa770
 AUX jackett.logrotate 81 BLAKE2B 2ce4e141b68c9e7eeac5d141e3e839b6a0615f512d8a1f805e9c4b6c8d42c63348878abff799a809ffc07920e2dc0304de9e82dc20a1e624ef17c41daca1ca9d SHA512 c2ac5827be8b8ef6bb2109ccbd01754b086827311a6f41bb1d09e5c406787060aa236841bb40f83913a04702274454d86c63f1e9a968b11e1ac3181cdc166e93
 AUX jackett.service 535 BLAKE2B 4bb328e433a1b0ecfc3e3d823ac9a27839c49d5a8b3e955f1605c7d38ea9bf1eabe3edde0a4a7a3115fd8b6ad823d6c97911d9299dd384094f5139401187017f SHA512 502c3b6cb4c2f6069762549cc83db29d5a0e0d447070e7a73c92f0ad8e7c73bd4c588df6b00b55b7abfde98f0dcc52169e16b5a9f37bceaf475b4920971dcc87
-DIST jackett-0.21.584-arm.tar.gz 43887598 BLAKE2B 5b0e6329311f3b9553f8c446d993e1342645be79196e714d6897bad0a69f70e055bf900b73b1683dd6cd8995a8b9a47fe5a9018a84fe56e0f04d8ac1608e5194 SHA512 55d0198a89a8a72591507cc83cbea372513629113f1e26bf679b501dc132e753eba09997f525129105795c873d5048cc68c4f5c5054217a8a72016b4efd95f17
-DIST jackett-0.21.584-arm64.tar.gz 43384590 BLAKE2B 6551d9a28c8120b48603e6663dbd9868cc80bb26c39ce9ea44fdbcdedfbe64f3780dd06ba818289f1399831b25db315d81de108bc7e9773d74e4e4744c4af53d SHA512 9c895efd2d6b669b3324b874e853f41a5d59119a3463ab0e4935df4667adcfa66cd1861ad34a5b60a8297c4850c1cf61bda7f915e57fec471e2ac7bd73267370
-DIST jackett-0.21.584-musl-arm.tar.gz 43914196 BLAKE2B b20d874aae1cd86fb01abcaf3070d0c0799cc2801668cc833bb583405313aa24739a8ccba151430cf5e37e19b49b411e5a230af9b53b91b8fa6d357f091be459 SHA512 387d1d64b597e617ac868c74e9a08bf36340381bd8285bb45b81b7a8170281ac5e7dfe7494c1f7e5b347e5c516130fce05f3207b1ad91d9d3adf5b566a5029a4
-DIST jackett-0.21.584-musl-arm64.tar.gz 43403879 BLAKE2B d0f1e3c7ff5e741f11320ad9e9929f6ed191816803ef015e8e4bbc9ef366db70bccfd373c59a1dfddd2bd70f071f4b93f28fe617b5eee75d4cc55859d339c7a3 SHA512 05b6aa32db2e938871657f57febaa0a10dce58a30ee416c91ff289e0f854eda713a62da0fb572657a6ae50131cb9bfb47773cd0cf5cd226b10b4fb15c5e3ddf7
-DIST jackett-0.21.584-musl-x64.tar.gz 45591951 BLAKE2B 76e32dc4b44e787f9c62aa2b6bdf194e590f2ce1ce61d272859b2c2f9fb3f919c7cade66994224c8378272391c7110a54bc34f007cc5863c3d083308c4a11d25 SHA512 7ea144dd5eea5643d6a5849f20d0b611e8a48e9e583d67fa582210a2805330e8acaa6eda84ac6225b7ff761f545e110fd7a3f69201b58c68a5edd77a5f731d81
-DIST jackett-0.21.584-x64.tar.gz 46057639 BLAKE2B a367f4ce9b1721328292891da948b229abbf0d4ac143efa85f7f43e58fe12dcd7923c64078f28835f8e58680c41099d798b3f504166ec64e48adc9cd5ee16ded SHA512 90439a386809407a33db7b442f82026f62c538f008adb5e2df792e009ccdcb86bf53785aa97528875c60c164f4fd278226d99b718dfd7a7d0a8d752a7c75772d
-EBUILD jackett-0.21.584.ebuild 1911 BLAKE2B e4742963a7faf4803c29d58eb4556684102e650a7b7c21d2379ea9257b873f1a4c10a2177fc3431cee9c2e571d0a8ad754290da2424a12d9ca6c487d4aab7d39 SHA512 a65355c9eed4cb654c8e48c28bcc125b4194701e50b4091b974eb0f7475b5954b5611e2c15f1306ea0f1c37e5c8fabc027b81da0dc4d311dc416504f43f2d0fd
+DIST jackett-0.21.648-arm.tar.gz 43934858 BLAKE2B 36cd9a6fa75bc232f96fab9818280069896fa08054aecef2810c1794c7c7f9cffaa606e05574683160eda82de4ac2a646c0c82dcc2d7f2f0d1ea76137c777c2b SHA512 2cb4c96cdfb38bf106f3ad6bcb9f3f4d59c7fd149ef47f27114aafc6b0ea066cb5f34052ce41c481170947b5a65f3852a76b4dee608f606f54f5a4bd73ea1865
+DIST jackett-0.21.648-arm64.tar.gz 43432901 BLAKE2B 97e7046976c49ee8f4f00576c9d679f89c2e1cf90fe5e68d338a90870349c6843669ea5d4e6a0820e41e4a52d7273c9a6a3e0ac546bcd646b1d219cd76e3571e SHA512 94f8a920f74f1e4fa8530714ac0c2948cacef3c1d8e1e1cc3bafbfab1e53579a71897e97bfe12188fe4dc02a3642ed047f40291660cf97024d735ad44bf1bfb2
+DIST jackett-0.21.648-musl-arm.tar.gz 43962757 BLAKE2B 60bdcbb7aca512ba5583d40aff82311564f1abf88a0109ce1172a932619a27398107ca55077ad55f9f8e9e3e1e4a3fc2f4d1db37c166dedfb7e1b0441e374ba8 SHA512 5da09e1380954117a554f301689b71ba74ed14095e22335b5b231e0989ce759ae345a33cb4ddcd265d0cde6e63d81b54de2d81776e91d4bb1b2fd959ee108538
+DIST jackett-0.21.648-musl-arm64.tar.gz 43446945 BLAKE2B 784da965627a8a31b435216162aa121691060345836a5fcbfba067bde6ad6caf42238162223e35010a826d9582e4727579489dce740a204322ea1539365791d3 SHA512 c65f8a6c70f5f2c3fded4900445caba5e770f54b8196cd965535730ef52bab4e3472be45ae05b94b1c5560153ad10c96ce9456c96721632ab8227c59063797ff
+DIST jackett-0.21.648-musl-x64.tar.gz 45620844 BLAKE2B 860ef64a964c2eb2cee89cc45a7e51930b295658ec0d8ee59d06fd17b818309f323c9c62469fe0096e77b1432e5741f26d5da5f19de487ca5d7b24e7dea0dc16 SHA512 0fcc9fcae772c6d5886a849ad5fe7a83572b21b7861e1642aad3075664b24e21e100b7a8feb6e241079899a47d306b7d7d989a8537c49698c7e28c2717d859c8
+DIST jackett-0.21.648-x64.tar.gz 46086340 BLAKE2B 53e629eb846ceab22010ed1aebd12cda6d426645e5a464e892e54f2109ccc748dc314f07f2a7e1a5f4995304d84d7451ef85d06b5e31094b5d0e078719d5c42f SHA512 33325805954e9c0604e4f6e5e37ac77934933d72829d003af67c82d8f59cbb2f682df544e81f443ec10306c7f6cea1c6a26e5147ba52dfec150ed2806b632dda
+EBUILD jackett-0.21.648.ebuild 1911 BLAKE2B e4742963a7faf4803c29d58eb4556684102e650a7b7c21d2379ea9257b873f1a4c10a2177fc3431cee9c2e571d0a8ad754290da2424a12d9ca6c487d4aab7d39 SHA512 a65355c9eed4cb654c8e48c28bcc125b4194701e50b4091b974eb0f7475b5954b5611e2c15f1306ea0f1c37e5c8fabc027b81da0dc4d311dc416504f43f2d0fd
 MISC metadata.xml 642 BLAKE2B 42f5b5594835f9d0253e4baac0bb4c9c426fb7f5e812227bdbee4d24a3f826a341e3cab5d353e18881f3fe5ff32406283402bea4e36ed70ec77dca511ab68040 SHA512 0acf30d6c7cb994b837a6b90e26acf9a38fd0fa40ffab67c88fa1e4d201ad14f1b35073b5cbb658d2c423dc919ad2f7c863e49f6649b25264f0b5e068b5e26b5
diff --git a/www-apps/jackett/jackett-0.21.584.ebuild b/www-apps/jackett/jackett-0.21.648.ebuild
index 19736493e549..19736493e549 100644
--- a/www-apps/jackett/jackett-0.21.584.ebuild
+++ b/www-apps/jackett/jackett-0.21.648.ebuild
diff --git a/www-apps/lidarr/Manifest b/www-apps/lidarr/Manifest
index 017457f51fed..6a64b7ef0ac9 100644
--- a/www-apps/lidarr/Manifest
+++ b/www-apps/lidarr/Manifest
@@ -1,11 +1,11 @@
 AUX lidarr.init 129 BLAKE2B 184bcf713f89ce555496954c50797277eb7eb7f22ad7925b789b7639106dc2e9b17dd0af081be8f9066dea72d3a85b03f443985eadfa0b7340c1a3dfe0fbe34b SHA512 306e217aaae80b466691bbd9a27b7a947856f1ef2409ed4d30bca6614a831b9ce56d2cc21f2bf86ebd7d0be1a8878584e08507e6014c136598e23b7184353118
 AUX lidarr.logrotate 80 BLAKE2B 47466ff328696d766cef2645160f8d9f993c83f2f153ecbff69adcbf86957d9acb3480b771408a8b11120cd73c84b0be70b4c66e2a9d859835cdb3d7ac86e3ea SHA512 31ae434dde9c33d84d5275434d3d35371598b2334412cd10b207618096c141e4d0daadd857c4c760e75537789cdbd13a3e36e38d404b3ff8c103ff85bf0824aa
 AUX lidarr.service 533 BLAKE2B 04c475eedb34076dcae2ca1d5c7aaabcbb3375c2d57e476917d095820af1657301ff99709eea7ed5e49b573e7915648e9ba005641271968fbe4c4ddb0cf695dd SHA512 f1be2d0d8e3a522da115a9bef37b6cde587e34be58433bee2b89bc67040cf01fcb1af072e94cd7ec60c89574c6414231e47c5d134c946d32e27858e477d2fce9
-DIST Lidarr.develop.1.3.3.3432.linux-core-arm.tar.gz 91245885 BLAKE2B 6930b4a74c66849324bb6a41b6e4d887ce672b47dc68616f47fa525345a268ba7d29a5b47d6e64a697221ef1a5f862609d16087b2082682209c18b214fb8bea4 SHA512 68a772ce089d43a892f35c42a53df860ce1e993377922b2e8cc4ecd0a9b282d9fc6174154637fa33960adb4c74ef08d4586f76716cc1d23a21bcdbf5e0e460e2
-DIST Lidarr.develop.1.3.3.3432.linux-core-arm64.tar.gz 90833820 BLAKE2B 1a083bbd1833ac92057969e2e99bb959eb600677183bd99beb7d723dc75e72c3d466fed4f1985489a6b1443a430d7a99225dab511f05ad9089695576b9dd4749 SHA512 d4fa8c8f4aef5b91a2e536e6d4209b6e43c0479d885909d072cd76b83ab68f2a6af58ff762b114e06da9ab3806cbbefb29e8177f77dafe8b3849351688841171
-DIST Lidarr.develop.1.3.3.3432.linux-core-x64.tar.gz 97371628 BLAKE2B 80de4e44ce2fdd356b50f46b69927b2f167b043fa4da28ad6620ef3b18645c431ee49e284545dc6f6ed68b6a864c9a6fa254265e220496a974b69c38a50cd7fd SHA512 766c66e31a9119333b34327491dbf6b3c72c5033bab15d32003a839125904e2f0518e8881a5275dc6f8aaae8fc35f52f1dc1d53fbf510b54b29535627d510890
-DIST Lidarr.develop.1.3.3.3432.linux-musl-core-arm.tar.gz 91304972 BLAKE2B 7b4460939f1293516c5031f9530a6432435521d1a7b5e0d377f55c2943d4b1fffbc4e4c7d8424b63f83b2fdff8998b0213899135034f88f7945309feb5bc19a9 SHA512 338c1647f1db0c4d5699dd54be9b4096c800a5b98a6422b8f01a50b43a53d58ba1ad76ba0b83196e1c49157b1327ef319b496be3c5594793938f123e35e0ee30
-DIST Lidarr.develop.1.3.3.3432.linux-musl-core-arm64.tar.gz 90904065 BLAKE2B 4ea863cad8718c5f8c73bc47a47274c84404a0d2c181bc20fca290a23aed899eb4855e80d5a1a5e56ec8976ef0512ff4e9d407f1aa2fff21227bd9ee030e1682 SHA512 4ba4b23badd75276b6eeb48465fae3ad8e5439578cf6e8691b46c18a237226fb34aa7bcf2dc00e11abe789f50b19e2b15046a8b0820a8ebc6021773162dc2046
-DIST Lidarr.develop.1.3.3.3432.linux-musl-core-x64.tar.gz 96438843 BLAKE2B f2bd7810a5e0908e3295a346b0f800927f8ffed7216c5115e61317e1289d12526b5b3869a03fd23e8e6e900b6d235cae661da433de1e81ee76192d3316eeb6b8 SHA512 5cd96921e4c6b7e395b16c45d63ebd4c9213f16920a0decf4613ca2bdfc77ea72fe094a0deeb9cce9839d3353353238eeddfd1ba47820913d8b576b2499646e2
-EBUILD lidarr-1.3.3.3432.ebuild 1843 BLAKE2B 3cd6136b243bb4c0c5abc5a2ce9afb03df3bc0a036291aa5b9b2ac1e9c483d5bd9af8090d9b70b57f83f88e1164493b12063ec5734c7675143bfc8d79af30ad3 SHA512 4d6c55980116f116ba95d02c06ca0b08b4b7d484887afdb7324ef20e36c546ef742f4d3d28b238d00a79479ce5d872182eb0aeb6b3f1bfeffcff5db396bd6be5
+DIST Lidarr.develop.1.3.4.3458.linux-core-arm.tar.gz 91224910 BLAKE2B 0ef46911a3f2509c30aae5a67a2b4a067e13db961cf3a0659cd8852f8d51017a7bffc19cffbdc2fa758f0264cdaf6b66e4982d9e2fcdae1eedd5626bddfe0d31 SHA512 76e56beab42fb6b04312ec681266f7fe5ec847486aaa76ca78ca38d687e512a8c57006778d54ce887e5854f3c7b06afefcbf1f7220c844f24461ff07b927a56f
+DIST Lidarr.develop.1.3.4.3458.linux-core-arm64.tar.gz 90814749 BLAKE2B 3d0d46668306e4039ff65d30dfece2bab482491e75d6a5447e9942752173b3f4eda1f6ed9cfd46f7960b7ab6c9b5d14ba81f6808938bb4db667207d7257855e4 SHA512 8217a3924b636d77da7ba62c9a60084ee24d280a0dc7ca2d13645c51760a74cb84a5f4724597ad7116a64d0ec5587d8f37c95c96e4b92e8c4c2cfde5f4fe1a33
+DIST Lidarr.develop.1.3.4.3458.linux-core-x64.tar.gz 97350085 BLAKE2B 189a8043f0724080715ef4d3cc74a51a87489c937d7010670dd0fb88c2df3dce97eb234227c482ab0c427e23493902f8f1cbf9a43d78d4920e90dad67d5d47fc SHA512 964bc03d3cc4c5cd2f1f0db6c15a2393200ef2e296de452bf748a207a7b1a80a2661631c4768fb2e23f3f1b045bdde29fa2e7140a787ab44b2c4f319b987ac44
+DIST Lidarr.develop.1.3.4.3458.linux-musl-core-arm.tar.gz 91291053 BLAKE2B 4f65e8a50320ecf35fe644378e8574823190c0400a1b07e9d3f1595a8a9a096f967c67154e65207f224d106fdce5fb3d810651090c2f452442d799459e56c556 SHA512 54eb1fcd73e02dd8621395916a690e0e72506e17ca95de6d2b0e7a64214f3e0654372dccd50039b88213301b93fd36261fe49f0f90e4e8d208aa02fdc5298fa8
+DIST Lidarr.develop.1.3.4.3458.linux-musl-core-arm64.tar.gz 90882942 BLAKE2B 787e62e9a5560e58e0472399b00ee48dfeec33c1dcfafd2da0582c313b27379601abcecb9324b22647dfff300ee259ae8cdedccf64d7b18fec498fd860f88ba7 SHA512 18a88f15881cd338b64e4b4d5f34f492a1443e0f29f87f166844841c2c0ac954d10db4323db55decd20ba1583f6d673437b6c38bddb1ebb2d84c2dca2135ca4b
+DIST Lidarr.develop.1.3.4.3458.linux-musl-core-x64.tar.gz 96405487 BLAKE2B 25faee40c2334b185bc75afa2ce16825167c86396625426fe63b0711efe94e7e6b8198bf50390ad4eb7032db5d552ed8d34c19af932d706d22728e8cdc445684 SHA512 1cb63734c4d3730a9a6acb7fb26aaee3388b033bf74f531250ddf4746417c010afd2ec3f966b319080c6e504fdd90624d6131b0eb81911fe227934165f943a5c
+EBUILD lidarr-1.3.4.3458.ebuild 1843 BLAKE2B 3cd6136b243bb4c0c5abc5a2ce9afb03df3bc0a036291aa5b9b2ac1e9c483d5bd9af8090d9b70b57f83f88e1164493b12063ec5734c7675143bfc8d79af30ad3 SHA512 4d6c55980116f116ba95d02c06ca0b08b4b7d484887afdb7324ef20e36c546ef742f4d3d28b238d00a79479ce5d872182eb0aeb6b3f1bfeffcff5db396bd6be5
 MISC metadata.xml 638 BLAKE2B 3cb5b7bd776d89f17db85b78afd7751e80e1fc9817ffe924ca2663903000665cc190b3d89c8bf7d40972adfc2b6f968fc5b652717afb7632cdd0e358be4d5560 SHA512 d69e87820e038797a5f25305ccd6e0124f119716ff5d3d1287dc9d2e7dd911ca28373fd1dc01ecc179360be31dfe150bd415422b44eff97d2c2638be3822a32d
diff --git a/www-apps/lidarr/lidarr-1.3.3.3432.ebuild b/www-apps/lidarr/lidarr-1.3.4.3458.ebuild
index ecfb5b24dcdf..ecfb5b24dcdf 100644
--- a/www-apps/lidarr/lidarr-1.3.3.3432.ebuild
+++ b/www-apps/lidarr/lidarr-1.3.4.3458.ebuild
diff --git a/www-apps/prowlarr/Manifest b/www-apps/prowlarr/Manifest
index 086a0ed1de77..c9c1bc9aa666 100644
--- a/www-apps/prowlarr/Manifest
+++ b/www-apps/prowlarr/Manifest
@@ -1,11 +1,11 @@
 AUX prowlarr.init 139 BLAKE2B 5d2e870b142fd95c42459d5fbce0370a222c64385eb30d7642a1b9b42e76ba8ee3b6d4577e4fad1d6c27ac0018e966f8846fe3dd5451e67c2d42ed65e6ba551f SHA512 b32cadf3ee9ce142cb48c01cbc576dc8a56a03b55fe9e371cd4205a9c927001a988621827dad02618b1bd95cb44ace3fb90974340e8ce5d9f553c4be1ac8ba5e
 AUX prowlarr.logrotate 88 BLAKE2B 3997169f347e1d3091eaafba2571825cc631b41833bc9989eb241ddc96f4a7c75796c82878b7d1417967e669dd412474f145844ac1fad02cd13b0739eb65c854 SHA512 738ffac857f7146960ed39d8ec5e40b0a0273ed2cb44cd8c3a440c1d34aa02b0af9e748df7eef746f17f8e45167f8462a8cefbab3aa4f819de89f797ac622af9
 AUX prowlarr.service 558 BLAKE2B 8bb379f30a93ce537016133627e54cf5d71b666f31db50c29659d0e44fc0df54374fce23cf1e2d20f59e19b9cfaab66253c79df718e86b402c0572ac781e1f58 SHA512 0cb3461a5160da1a617691040c7d6378e5d89f5809a12faa8cb182c8180bceb7a459d3d881cd3a96eee4928eac410533876b90c90d3d62dcde12ba2f0b9f328b
-DIST Prowlarr.develop.1.8.0.3805.linux-core-arm.tar.gz 86762005 BLAKE2B 582f64fb9f24d2221363cc3b96cd4886fe894c4c94c10e28022e20f0c46c0948f317e748d8ef9cfd12e9ea7dd179fd2c62a10fc7d1006f3d665c0814b3cb0b6a SHA512 9a9aa5e28818514d29a80853ad8e037f0bd55e876c831431d675823c76371319ae233ee71fb85e47d41461f0fdb466443c5d0e4cf11224f4f629f89680a987c6
-DIST Prowlarr.develop.1.8.0.3805.linux-core-arm64.tar.gz 86013622 BLAKE2B e8d91b0a9e1c97d8cb0395e0e898274e5f667d588926f7322d57abf327733e99dce81ed211d0d468855fa789f488518eaa24a1222e180e2a2edd4968124673f4 SHA512 9fc0a68aaa38e739be76a7abcc20b1e59016b2ba2a1916b5c71664a2f48936a2a9f4115cea32406984224e6a916418cb7df3116fdb422f446d49344e2b8a9fcd
-DIST Prowlarr.develop.1.8.0.3805.linux-core-x64.tar.gz 91046959 BLAKE2B d80c52eab99d032b1ee9cb2d3396c09e29a64614d272448402571c6dfda8de3c39a727742c8fbfd01c2a5a7725ba7eb4945f1864b79ed6df676ef7bcd93828a0 SHA512 a9fc8cb3668401b3f7392373e3576b819efaaf3f759cb388987fc8802398763c0eef5aa2869bfb2fc49c33a5a83dbd4301de03bcd49be2c8c7c28e74740caf4b
-DIST Prowlarr.develop.1.8.0.3805.linux-musl-core-arm.tar.gz 86818180 BLAKE2B ac1f2d3184f2789beb4ecd2ba6567160e7592d54a5fb1adc0ac3de709eaee2795016b1f71da40d73c2ac65df8443bbf0fff3dbac6c310369f58c44e1051a15d8 SHA512 c3a87410f465769b684baf88a3247004271e1071be38983c2613e3043e8fda292666c8c21b223bee14f2ca85a88b8f4b06a3494486b30ad7e39402301bf16ea6
-DIST Prowlarr.develop.1.8.0.3805.linux-musl-core-arm64.tar.gz 86073396 BLAKE2B 232108c5397ae2aec0bca57227ecc1f5e308ed343792023bd359f3e510bae673a494a0489e54ace1e6e00ba190f667f69b31db8b998bd95b7ea889e3be8e1085 SHA512 5fe07d5d8b76c35deb1a4b1c144a3af5b7d4935469bb7bc3be3d2dd5f5747d100965d5426587b8245c10917b898b71ff1c68f3b4b0755a7af731985f90517ddd
-DIST Prowlarr.develop.1.8.0.3805.linux-musl-core-x64.tar.gz 90109077 BLAKE2B cf26a5bee0b27051f074d4a20509c380a11e04aa21e80a4f3c4d2eb7603350988a086573102cf9343014fe6b9012993a37410759c4ce50bc588bb0ca19d858a9 SHA512 2625ee5ce118f297970396e10e86ae4ae9b81b1a0473aa49a9ae115990ccc02c91970425433a5aab35f9adbbff5979fc889c095f9d0fa3da1b6b81a277e11a28
-EBUILD prowlarr-1.8.0.3805.ebuild 1915 BLAKE2B 92194313f7059a1011b99308ddc39c5a8b0262b5da70dcbe820beecff54b08dd33fe9705062d7dcac07011c4365ec4f2f6fea7073eb2ec958f7c9a6388147a61 SHA512 db8acd84512c74c62f3dd8399d919b96afb01df7ddbb5d701d89f4574e44bd46560042a2b048eb484fc6d3f1eb02bb1d4269e5b70fb2e86463ddffea9b18b0d5
+DIST Prowlarr.develop.1.8.2.3860.linux-core-arm.tar.gz 86865077 BLAKE2B afde56139b9ba81706c620470e4703f84b6627947b679dce2e9d1dd8e3e820bc665534e1abd6f231602e0debd75dda7f2081e1c720d1d6f17734ec11fd1b338e SHA512 9bb3ec8cb971801411dbf34cbb4abd7344a6bbe3703bd729043407d40a7b8281ba7129955c4d449d2046d460e7ca13e1f02e809242c2d668585ee09078d9267e
+DIST Prowlarr.develop.1.8.2.3860.linux-core-arm64.tar.gz 86113283 BLAKE2B cac9f528a8ee8878dfe30d9abc888c9a3dbee6b112970acec1418166916144fa2ace10bdf5e7186516acf47a8493818e2d69cff8156965aa2d33e951d1304d7b SHA512 8e7d8c92b30a260aab85013f87afdf71e5e3098a8a0cb214b91dda72fcde86cf6cd5b9be2f85a0c9430fa962dfc1250de4bd36d56870b927737b9190e695de47
+DIST Prowlarr.develop.1.8.2.3860.linux-core-x64.tar.gz 91135376 BLAKE2B db43bbc19a978fe6051e2c624ae858e4be3bbf566441e91d0e85bb8228885fbd0e956e17517f6574d5eb5ab2dc0f2a843d2299b4a6c11f78f3058531c12436e4 SHA512 05e91ac833800b419ed44626019dd82d3c9be3a58df0c416d1cf48a37e7e330b39ab66f19b9fe08eee54189cab9320e44c6e9d26839b4919b0f651780a6edc2e
+DIST Prowlarr.develop.1.8.2.3860.linux-musl-core-arm.tar.gz 86922001 BLAKE2B 3dea0de9a28639f677cf0eba212d740c98891a3a3e3d13829dc5f79172c78c243c6129ca48aa0ef2448a4b03c09c192bf8e7708edc6a4760b49e5a5e73f52c5f SHA512 b5ce0caa34c1b69fc3549204a265a8c955314fc09cd6c4cd7fe3fd29b59a5182d21e04dde4bb88294944412f0891553b072f992efc52f7d70c366304676701c7
+DIST Prowlarr.develop.1.8.2.3860.linux-musl-core-arm64.tar.gz 86171366 BLAKE2B 7fb2508c2035575180436900550f4e9c52fc3e70883866e1c9bbf2eadca366db9fa229b0885fd77b1f8430d3ee5d93c9e7663fc5127203e068836fe2fe219c64 SHA512 91d3527e65c1da1974f349fb6e335952a6fc372bbabb3fb095c46aff6d43e76af88d36ef4e2b8f229c0c113c4fabc754bf30bc968f594aa9f513d0f0f1558ed2
+DIST Prowlarr.develop.1.8.2.3860.linux-musl-core-x64.tar.gz 90205773 BLAKE2B 9c6575adfc1cf2d4ca3d65d8a1ae564023c34ac1bc63f43ae445a0127b3c8f1a092d926e1690b13c153b447469a332086ef13612676cdf62378081020867d4f4 SHA512 3ae94673c9dc71ded14e1b55b7a2d2fb22c9386d1e80e8b36cc1fa623f5253902426677e9fffa9f3d6b23210e8568bbffc87571bc4aa11a0d4664f72ddfc8508
+EBUILD prowlarr-1.8.2.3860.ebuild 1915 BLAKE2B 92194313f7059a1011b99308ddc39c5a8b0262b5da70dcbe820beecff54b08dd33fe9705062d7dcac07011c4365ec4f2f6fea7073eb2ec958f7c9a6388147a61 SHA512 db8acd84512c74c62f3dd8399d919b96afb01df7ddbb5d701d89f4574e44bd46560042a2b048eb484fc6d3f1eb02bb1d4269e5b70fb2e86463ddffea9b18b0d5
 MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
diff --git a/www-apps/prowlarr/prowlarr-1.8.0.3805.ebuild b/www-apps/prowlarr/prowlarr-1.8.2.3860.ebuild
index 40ad30af1b3a..40ad30af1b3a 100644
--- a/www-apps/prowlarr/prowlarr-1.8.0.3805.ebuild
+++ b/www-apps/prowlarr/prowlarr-1.8.2.3860.ebuild
diff --git a/www-apps/radarr/Manifest b/www-apps/radarr/Manifest
index a962be9ab83f..088fd015b1d8 100644
--- a/www-apps/radarr/Manifest
+++ b/www-apps/radarr/Manifest
@@ -1,11 +1,11 @@
 AUX radarr.init 129 BLAKE2B f3f8ebe12146d302019c2301ca5b7db3b3e3678447df36cb218b0c5f0f882e1a8f6e003f4e69536fa4ebbf31f4035bd167f4d98be961db41607635e3e49daca6 SHA512 b8e8baeab9f0efee8115d0a1230bf85796ddbb2653754efffc9ffa23ef61906e05ae83d5d4b1b2719b1292d1d5d67fb0f7efd19c0af9b474a15d34bcbd6ae40e
 AUX radarr.logrotate 80 BLAKE2B ff6b44b539a627bab411ee95c184f4bd21592ceda8f387db2ce2d64fe89681f278b91cb248adcbfa466b2994337eb2882696e9c289efde25762c50e5f4190464 SHA512 89d474378374fc0076fa5c1f06aaf6941b4f098f59b5a4b950786c736b965acc3975964dd5188c157e6e80aec48f312790468d999a29397cb7811e12459a49c7
 AUX radarr.service 540 BLAKE2B ef6e69463aa577c9da67efc8f11c943531bde1e8ee4b56ae15f77e39c2900a1b11d5cd9e2c568d293b6852d80cbf6d3b6f15b9226ac3defc2e8b6be231eaa5ca SHA512 38af47dc6ddc5df3be1e6323147f0bec20b18994195eff3e6e6a61691f6c8beb9a058aa361f9b9c6a11c362f12bf86fb8f3f311a70ceceb78e18d909910a2840
-DIST Radarr.develop.4.7.3.7731.linux-core-arm.tar.gz 94358496 BLAKE2B e466eff30e6615b31808deee870c9c6b2412878da201088840126a24c1cf83d19eb8105b4c38dba49398c2da998a57a3c3b6d26cd099c963c0ba220d66c3b779 SHA512 9862150cde538bacdd61a393a557d653445246532d5344ad0d8828461e62b697fbbdb75f670d8686b1d2d3f135ff98c8c6aa5d1f6d367c707896bc78d7f69ecf
-DIST Radarr.develop.4.7.3.7731.linux-core-arm64.tar.gz 93990417 BLAKE2B e6d4db18ba1b043c1cc45c7cfcf0a424ad98827da7170e1b06e07f41e321ca0e311f6d02b51846b6c977ab44e548ffcb886909c33dbeb3d074f7a2e644c61206 SHA512 59def1c691b27bd1a0c90beb706dc6c2ed8f77ec8c0efc22162364dd85f3baa3cc8e0e448802087ae77724598c112e7472428263f38b71744129861a3bae254f
-DIST Radarr.develop.4.7.3.7731.linux-core-x64.tar.gz 100029598 BLAKE2B ec97536db3955b2d5f1cf28acc87c7c2e498c30206c325f8693094a27787535569431fdf827f7c1a627837985bf9cc1a95611582f0bf889af7fb5446c0234835 SHA512 4540dee43984eed0513229832be1d681ed2dbdb5b379b6a480cf4eb3e013a8841f46cb6b948bacee219958411727aa84c7938447c47f9f116d0720290972f9c1
-DIST Radarr.develop.4.7.3.7731.linux-musl-core-arm.tar.gz 94420324 BLAKE2B 5a52362d6b90984ca556f6cef576f73152e2122fafd6718661df8d3d8d8128593a4608021187df082a031ccb60c5de25bdd58ab8426f8ac13eba8b69fb241be9 SHA512 51af99ac3a623c77b71dd60507bef3c7afcf7d9d568cdb8b3b4bec4dd6d9310ec86745bb9ec7cdb69719df7ded5a5e3449801e0ddea60bfb0dc2b498f50fbff7
-DIST Radarr.develop.4.7.3.7731.linux-musl-core-arm64.tar.gz 94061590 BLAKE2B 0cdd097f1b877e80924e4b8201fdd0312f54b48ffe81fcf0d7b89f3f5bef4308cd5826d0a68d5f4ca644594ebbe9435b5c96381c0c594591aa939068c452342b SHA512 46fbbdd528f3a5aa3629b25231dafd049026546423ee8578e3857617eee5d9c93ee10913a676716e5a528dca483635975ebe71386be0bda5f011afd9b9b51582
-DIST Radarr.develop.4.7.3.7731.linux-musl-core-x64.tar.gz 99103132 BLAKE2B edc15170d263b97affa252fa9677d50da74b5799a59801334bd639b10438313d7720232d88cc9dfaeaf9ef4f32531f8eaa2db9ad26388e0d46705fc47f0e6236 SHA512 d3f2875f5660541ea5054f73b24a8903f215cef6dc29b1fa4725b93bd237ae44b0848dc292477d6e16ebcdb5af4aa76e7b35bad440d943b28ad2383b6a5cdf6b
-EBUILD radarr-4.7.3.7731.ebuild 1853 BLAKE2B e188ace169ad126ce5577019386710beda94b09f8cc91bdaa2769e9258a3e4c0cb2cc1af9b5148615d0ab1992d9d2678ab1052e066a84cdafa96e7edf0200fd4 SHA512 7d46b0c396c6640c7d68ead681ee42b9019bddadcb1cb7e23208f2cc20861bb49150cb4bc7105a5429e1c82cfe417da2e88e904bbdf38104e647a8632d75ae81
+DIST Radarr.master.4.7.5.7809.linux-core-arm.tar.gz 94515334 BLAKE2B cc7ae8db89ec7bb2863b0c5c0c73f2420af5a48430473bf655e8f569fec0813761688e78c888464945e4531f54880505ee9bd8e107a4263033aac966321e4843 SHA512 ddd074f7e49db8d4a87917af592ff4efd7558a1fba61f52213a6c3b6848f5746f22ab0cb6d8a939554bbbb7b0c1538114d129258f83669be7320a40253cb8d76
+DIST Radarr.master.4.7.5.7809.linux-core-arm64.tar.gz 94145222 BLAKE2B 0d3cbe18914ea6ead6975c1d454caa21802590ae5f98c69896b7f345886480077aa342fc36c3d185b1612fe38cdf8cb67a8a996df9e1aa0d474246431417dc41 SHA512 caac9ab677929aea176daecb32b55ad30b9ece7c45085d156dc62d0383a7c25864af8d98808c1bc2ab916c9e3b3320fc59acc8204d1ce70473540e92c50d659d
+DIST Radarr.master.4.7.5.7809.linux-core-x64.tar.gz 100154406 BLAKE2B 227f363315e49ba94fbddb24a96c15121fd68abc8cd18a3afa6c5416ba0563d2f2e8f8f4dc22ffccf9e43b2b7962a610be5fdec7038899941fcc3df86ebc2e1a SHA512 d9d582761c59de1ecf449d86a340875600d4e7e3bc46143ebbe44b50b1193f62f6fc1b5548fcbb8ad089c4a6bd6e654e6f9a658d2b07e9f25e23629fc937438a
+DIST Radarr.master.4.7.5.7809.linux-musl-core-arm.tar.gz 94569624 BLAKE2B 68f0fcf411088d4734656f10ca095a2d1de48b7fc6a996a48750a202b4ce47b069908509cc081abd0ea7df8372a23a0d90349ac8827f34367d38a4e2d6933498 SHA512 bca2573bf17f0d87308e45f37210d3e8784868cb416e24253f449065be9926603311e1cbc1f0181f0fcfd5e66fb44ade32cdedb3d72402387f01901c5137b1cd
+DIST Radarr.master.4.7.5.7809.linux-musl-core-arm64.tar.gz 94183010 BLAKE2B 3361f5be0fc6ec9f32c341ca0923e7fdc35a82addd3b5a26e326cc800392a216f3555854a5c6b4fa6e97089c45c769748a1a6f0bc771b592245517c63dd7434f SHA512 664b613f597bc619554b3cabb9646c8c513c4b064c2708935f27361b7ec5cbb127b69c9f5dbc2da654c364d98536ff9d96bd3900b18e76fa4f614740eca5b1ad
+DIST Radarr.master.4.7.5.7809.linux-musl-core-x64.tar.gz 99228348 BLAKE2B e7dd5e699c7b8800ac381b79a129297f9fdb52cf726778b7c28d34f4350501f811b92808f715ea33a2086a5d5f07ee00a30af17e51770793b97eb7456149d999 SHA512 553c2290f1d907f09e8277dbaee040cc495e53dcb1724307a29cdbda361add020e081ec3eec04284ab1af1c8626eaaf347d70f1e49bec21ffc5689296b463798
+EBUILD radarr-4.7.5.7809.ebuild 1847 BLAKE2B 77e84e5a3b17a40a5c006dacbaac6567ca4ef344900de593ed9fae13264ac3c59abc8b2a659f17358efb9db10ff3ff23be0e76708fa2f2ee58dbf4cb1a619b3b SHA512 2fac5c3906cd4c4b020215d39a450e88997b87ddf0fa1a5e5eff7cb690ab854dd8f714089bda84eac8170260733740d0150649e98c26ad58974f6facfb4a451a
 MISC metadata.xml 688 BLAKE2B d528c66cb7915d661b673524d559fdd7309551f0b473a454e3372bc7f8d06d81e9760fe6c0273e2cfb6b8974f3d516fbc9349f986ca5a986c843db42fa01096b SHA512 006139a3c40bf1f18b8323bd80908ed0de9fa9782fa2b295339b843de5b204fb2595a325a95f2227d27c88abf37dc916d83389a8251f6c684c51b1c256f3a8b7
diff --git a/www-apps/radarr/radarr-4.7.3.7731.ebuild b/www-apps/radarr/radarr-4.7.5.7809.ebuild
index a7041c9c66cd..28305fdb097f 100644
--- a/www-apps/radarr/radarr-4.7.3.7731.ebuild
+++ b/www-apps/radarr/radarr-4.7.5.7809.ebuild
@@ -7,16 +7,16 @@ inherit systemd
 
 SRC_URI="
 	amd64? (
-		elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-x64.tar.gz )
-		elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-x64.tar.gz )
+		elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.master.${PV}.linux-core-x64.tar.gz )
+		elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.master.${PV}.linux-musl-core-x64.tar.gz )
 	)
 	arm? (
-		elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm.tar.gz )
-		elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-arm.tar.gz )
+		elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.master.${PV}.linux-core-arm.tar.gz )
+		elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.master.${PV}.linux-musl-core-arm.tar.gz )
 	)
 	arm64? (
-		elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm64.tar.gz )
-		elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-musl-core-arm64.tar.gz )
+		elibc_glibc? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.master.${PV}.linux-core-arm64.tar.gz )
+		elibc_musl? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.master.${PV}.linux-musl-core-arm64.tar.gz )
 	)
 "
 
diff --git a/www-apps/readarr/Manifest b/www-apps/readarr/Manifest
index 465337799274..a23e85561f75 100644
--- a/www-apps/readarr/Manifest
+++ b/www-apps/readarr/Manifest
@@ -1,11 +1,11 @@
 AUX readarr.init 133 BLAKE2B 9b5ce96077ce37eb30636eceb9d7969bbece3cbf31f5dc7b433728b6d8810f87097f1b878c82f521fc5c0b79aa89b116deb0ea67e518fa2376935a3ec321d574 SHA512 d22884d967ab6a7cec8733fd21354f089295bc54d66ec08cec05e9bd6f2d20d5581e8bcb91a5c1f4832d3865f8eda58cdc0823d3d06f79f9c587e93e34b274ed
 AUX readarr.logrotate 84 BLAKE2B 6a54e269054b8a86cf6f569b6096105267cd897ff9099527ea7b831a968c58fb42aa31dfb91afb55cb4f250242c8829eaf905aa5ec8a1083a8bfb0c47189b14f SHA512 b25c568c4dba0221f33461277c3dd2dbf0a11536523483d4e2e6dd053ec54d5df188256962ec5eb5813f45b0ad5cb3b80fe35ceea45c8a93ca1eb959ece25370
 AUX readarr.service 562 BLAKE2B 1e19fb54d0557d166088b4df9e5a6fc4940db68121cc62a31d00678961c7490e597d6981fc89350bc3d8ad5bf179f7b95ccf1791697f3cfc653216a7234f7598 SHA512 251336794f4c14f3cfe761584964896a9bd6ebe07868356e5ebfdc1ae6f6e8bf661d7c2f04ea7950f03c3d355da67e365bfbb7ad463d8a07eb709e4076ea6878
-DIST Readarr.develop.0.3.0.2091.linux-core-arm.tar.gz 88101842 BLAKE2B be67d59a11016ed72296569b3fa389b1d8f27d208b648ea37998a63194a93ff47cd02bc586a32f40df2435fc896028142af223ebd7acf0b1ebb6d155a4136d00 SHA512 71a3fd9e51cb7696bee5f42ccc93f022c7ec24dd7da3f79dab515a406ab0dddd2bf9e676f774d2634af6e1907fa1ad01d1c95574067729d3d48954f5bfb1c365
-DIST Readarr.develop.0.3.0.2091.linux-core-arm64.tar.gz 87359794 BLAKE2B bd1178bf24c0a5e8fb87cc5a3d3758fd99686fb9c61d5be716498d2eddf956bec4746730003dfca12c26bfa28b825962852a9279d785b8b72060970d9841e310 SHA512 7e4874923ceefa401799dbc99e1ca3be8cfb57bae4cefd97f8a1e8da0910114c09a94d1b09943b1ebd6a6ea13f5c3629ad8439b9a4df77f6bcc65a0d240d2091
-DIST Readarr.develop.0.3.0.2091.linux-core-x64.tar.gz 92389141 BLAKE2B 0b873ec25f2f417dbdb2b3d80b15a5df2bf7ec7b49d1ea70b8b6fc5df3dc1ccdebc02e5ce28cf17a3c3687c91454d48a6a34edce6304129c677e123f06674595 SHA512 23b9754419981c05b829d6b2a33c6085d06e805c2554df794951c44a5ec3adb245ed4dfde9d4fc1828d16f874631eed3fb3bdebae8bca02d1c4fd605c5e3c800
-DIST Readarr.develop.0.3.0.2091.linux-musl-core-arm.tar.gz 88155138 BLAKE2B be31b09057a138d8ba4356a54cd2a27f0f504f1203d24676cbfc0ed11e86b4923920de4216eac17b6685d2c5e81d2de1f4574726fa72cd7c9178593059aed33d SHA512 a6e876e3b631e7f304c4dcf993c4fcd261d191a7087219db7ec1fa7b947544f91884f7d48a135b29db38f302878cae2199edf446b4e6fab6b05dea822543d4d7
-DIST Readarr.develop.0.3.0.2091.linux-musl-core-arm64.tar.gz 87421700 BLAKE2B 6d32b89346df63d1a9b4b71e7ddb93a5f9639a93cdb7341e38446e4af7d371d96bd70bab00958391accd3cec5a42e27feca4e6f37e8330970ed586ce9e3a12cc SHA512 e3daeded13b212948d8b8f541b24d854667d8fbdcb11ebb11ad517d44ae9c6dc04babdd0fde6b2d978e518c257a089b31fcb95361f81b82358b231b909a5460d
-DIST Readarr.develop.0.3.0.2091.linux-musl-core-x64.tar.gz 91452857 BLAKE2B ff04f89fe608bdb8f67860ce5fcdfe7c2961fe4e1a8ecd2b1359fafd68302a44aae7ce68f046906f348e41ce6656f047fbe33ed1e578f9af545fe06a1966c7bd SHA512 e3a5e680ce32c5bf59cb4128232ddc3b5129253ea9f926bcf36bde13a45d636c267a4699cea5f8c93fb2294595456c3168273ef6cdc0a1281b9f6e239581d2cc
-EBUILD readarr-0.3.0.2091.ebuild 1871 BLAKE2B 2b6507478733246abf4ca6e984e6af33ab9b7fa988f84cce71860993118bc8c6f0460489ff95921fbce04d3a890dd4fd63936bc7794a2ba0c51dd9e2a78d7abe SHA512 f770b8ebc66b2159bd88bd7f38f238541343177895da6081e928539e0199b4945fa0c3961e551d1230e17b9b417ad5397190a4bb7b63c23d095dc0b3983ba031
+DIST Readarr.develop.0.3.1.2096.linux-core-arm.tar.gz 88076251 BLAKE2B ced2657ee36ea824069b920dcccd276ce14c854ac92d307bc2fb7f3f2288d5a8fdab2a2ce9bc12dab9728d4c757e81c68b7581cc44e3c771eb05e822e24b07c6 SHA512 1f895deba343113eb773b3e99081b8d6c338d75474207a448fc61643c23c61ae40a25be527e34e0efeffac618d7004d123b99b98087432aca8a442f0352b89fd
+DIST Readarr.develop.0.3.1.2096.linux-core-arm64.tar.gz 87309553 BLAKE2B 4e1141170a7cb723bbe9c73d6d9eebd541adbfe85688a5132b86d10016e54b5c86dd1443336d5761cb0ef686dbbb5e840b7d02ce17bcf8ec77e7b485ede4959e SHA512 05dfb5bb38ccf216273e931d4120fbf6e82c8ac344ab786d14d24b7eb089a21ce6f58599e1b2f353f16094d860531edafa95c43ae58c83b405f2adbe7443efb0
+DIST Readarr.develop.0.3.1.2096.linux-core-x64.tar.gz 92345755 BLAKE2B bfe16e7e6ad350585e4bc2d550eba2d6c55e6bdb825164daa59cc4f810dbc5a9df0c47a07f40f1668e91014b28babb3f24fd0ca759976aefe55796725f26b744 SHA512 13155ed3f512577ae5bbbc6e963942f5b61fe04a0bc1bc18441655803fa566914bc2ffd9f16e08385f009d99396a86a015605ed8e099f0d4cdc2657cfc3d93fa
+DIST Readarr.develop.0.3.1.2096.linux-musl-core-arm.tar.gz 88117574 BLAKE2B 78f9375d12a46cbbdd6d3ce63207c7c52f4e703971dfd3cf62fb840505da41475acc6a9f15177d953cbaceb4c972950d81e538944ab83dcf167d5ed994c5f42a SHA512 e81aeefe8705b32009a2157bc503967d5c22cb01aba0fe3c6394b9923b48431f43a5697b8bb4d7880434fd24bd922c422273e8fe95a5d8cbdd282f5727eed95b
+DIST Readarr.develop.0.3.1.2096.linux-musl-core-arm64.tar.gz 87373343 BLAKE2B cbe300244456c2795c15157944ee5794ceeae59cdb8a18c49235fbdafd63129156fe090bf17e2a461d798143ede10c7b1f900039717d0045141e0733db5f59cd SHA512 629dcfc7a3235310f2b7759c0d1b791841a2b6d7cedeae9d794a44209c700f0b2175c09f61980c83d2b0c571b8278a72010f79c2f1e83fd33ad68bad42d33d19
+DIST Readarr.develop.0.3.1.2096.linux-musl-core-x64.tar.gz 91399006 BLAKE2B 8ae227b892d1e4a1cd0dca3438a139f9c2eea21a2aae039b224055eb5178bca460e9d332de928f8bbab9e8568e2c547b6501406f038c8aabd83dbda49eb343d2 SHA512 682f3e0dd1993591be262a3abd53d94a0c7bf66ea887fcb8d1e5192ba6846cfeee30c0c8eaebfc613f53e3740c54305073e014ff70b1289af58cb0c517dcc62a
+EBUILD readarr-0.3.1.2096.ebuild 1871 BLAKE2B 2b6507478733246abf4ca6e984e6af33ab9b7fa988f84cce71860993118bc8c6f0460489ff95921fbce04d3a890dd4fd63936bc7794a2ba0c51dd9e2a78d7abe SHA512 f770b8ebc66b2159bd88bd7f38f238541343177895da6081e928539e0199b4945fa0c3961e551d1230e17b9b417ad5397190a4bb7b63c23d095dc0b3983ba031
 MISC metadata.xml 688 BLAKE2B d528c66cb7915d661b673524d559fdd7309551f0b473a454e3372bc7f8d06d81e9760fe6c0273e2cfb6b8974f3d516fbc9349f986ca5a986c843db42fa01096b SHA512 006139a3c40bf1f18b8323bd80908ed0de9fa9782fa2b295339b843de5b204fb2595a325a95f2227d27c88abf37dc916d83389a8251f6c684c51b1c256f3a8b7
diff --git a/www-apps/readarr/readarr-0.3.0.2091.ebuild b/www-apps/readarr/readarr-0.3.1.2096.ebuild
index e70817d4d7f7..e70817d4d7f7 100644
--- a/www-apps/readarr/readarr-0.3.0.2091.ebuild
+++ b/www-apps/readarr/readarr-0.3.1.2096.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index be28b2ea86d3..f1b6fec249cb 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 98399ff2a947..416e455cab4c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -14,6 +14,7 @@ AUX nginx.service-r1 356 BLAKE2B 05d89efcc73b70a26655f306f1e074e61c81063cb4e9491
 DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d0debbe37c205bb7c6e79594d8b1a6a0d93988880d35f607ef05ef6d73c9aa887baebfd2c54aca894969beeed4bfe576f37 SHA512 20495884c6b3594edf879a19fd7445f2e74a1628789decd146b3c712764b0507e440a84a64aab619461b044f98b8d641913cfad57a6d0002e7061716bdfe84fc
 DIST nginx-1.24.0.tar.gz 1112471 BLAKE2B 7f671c57666dec822bff72fcf0e4eec35ecf981b8f1e489827f9bbbf9179036f61c9fdc7e497c076ccaeb35b9ba3dfe7684e4fc91ee9cae52601f68859bb034d SHA512 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
 DIST nginx-1.25.1.tar.gz 1213919 BLAKE2B 70716deb2b1982c77bc5e710039c4207bf4d95d719d943d5efe817aa1993b937c110d09e22cdf225ced39d53a15de5c888df28cf71792ecb785f7bfa348fe0c1 SHA512 608db15b3b741881a5e67bb847e550eda5e4c45d2991344eb1ba9c835d24c9d839fdba12b9a97df669bbc933463ac6d940ed31389a5ca38e6c75fc9de0c8d55b
+DIST nginx-1.25.2.tar.gz 1214903 BLAKE2B 546a74c633400e51f6afded396fc36013574dd9ddc6b5f321bd5379c3a27613954de93957268213bc9724943515cab3d23b3965a384c4f71dfb4c759bba49912 SHA512 47da46d823f336432aca6c4cd54c76660af60620518d5c518504033a9fd6b411fd6d41e4aac2c8200311a53f96159aa3da8920145e8ed85596c9c2c14e20cb27
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-1.0.0rc.tar.gz 16207 BLAKE2B 450d0ea693bd98d4a1b615f2cdcaad41ccd28266f6d80beec7fe77fe750ab8c5d1bb55aabe15161b9b6d819d2b4d99a7774f2706f2f6fd084b52a7c7dddbc00c SHA512 05a880d5e48ac83be84498ed41fb4750211b827a9d7541acfd6ef494e5205a6e853d5594bfec3ab4ae668ea3f803e4f4b0ba550c76811971c8e266e42663c56d
@@ -42,4 +43,5 @@ DIST njs-0.7.12.tar.gz 662554 BLAKE2B 3e925dbbd5e664fc083b3147b6fa353744ab45b50c
 DIST njs-0.8.0.tar.gz 715391 BLAKE2B ecba652e8045c93b3eab19e0765c8bc907b55debb0cfce0491d2824f6f60a80321d710b85a694c06d5249f5809f50532d30a6a401b9919b1dda64e50c876410e SHA512 5e5fd3b0aba9d1a0b47207081e59d577cbd3db41e141cfa529526a778bbcd4fec1cd4dacaa1dc63ee07868ccf35f4d4cc465abff831bb03d128b0b1f1b04bb28
 EBUILD nginx-1.24.0-r1.ebuild 40462 BLAKE2B f652eb173d1d7415f50e255ff40a90d542599eebc45d24a159ffffc2ad5b2c3963f786d0fa6d6993f68ab14638e5b66daf9c52798da5b708d0c7703393f0cfaa SHA512 9d4f609ce33a234eebeae3077f51dec90fe143b2e8671bd6ce70b33042ffe96f1faf0ad1d4eb8750c761679f44b7fe99283d1bd697f87522a49b8f20b24f4f6e
 EBUILD nginx-1.25.1-r3.ebuild 40770 BLAKE2B a752ce49ac7e5eb0137b9d55e6cb10eb892bfe78e945b03e1fdb14dcf715203c0bea9131ee2bc0db176ab454ddf105d382d0888b447638d2ac1ecf10a4a3dcaa SHA512 e99e588ec79c0a9cd660646065cb359612d3bcd26dac91993e075e3b9f57de34ee04a3fa903f62f5c239dfe940264e7d19d5269cf7be60644c4a097233962887
+EBUILD nginx-1.25.2.ebuild 40770 BLAKE2B a752ce49ac7e5eb0137b9d55e6cb10eb892bfe78e945b03e1fdb14dcf715203c0bea9131ee2bc0db176ab454ddf105d382d0888b447638d2ac1ecf10a4a3dcaa SHA512 e99e588ec79c0a9cd660646065cb359612d3bcd26dac91993e075e3b9f57de34ee04a3fa903f62f5c239dfe940264e7d19d5269cf7be60644c4a097233962887
 MISC metadata.xml 1132 BLAKE2B f3f3c97a0897c79c616503a1195b850019c5263c7323dc60630f031349b4fcdbfd48e68ccad149fdc4db050df1e10b7574cf73340480a7b8cb720604b46a9d5c SHA512 5de3e4d28d03400a652f585ca0f6a14c3d6e5c7bde8e380967ecbf3a1f87201b6a05495de6268793beebf587eee87587e4f9a81350f301e02c0fd204e00c8f5f
diff --git a/www-servers/nginx/nginx-1.25.2.ebuild b/www-servers/nginx/nginx-1.25.2.ebuild
new file mode 100644
index 000000000000..ca4b8d5aa204
--- /dev/null
+++ b/www-servers/nginx/nginx-1.25.2.ebuild
@@ -0,0 +1,1078 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.34"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.25"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+LUA_COMPAT=( luajit )
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
+HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
+HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
+HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.2"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.63"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
+HTTP_SECURITY_MODULE_PV="1.0.3"
+HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.4"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.8.0"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? (
+		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
+		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
+	)
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 http3 +http-cache ktls libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	acct-group/nginx
+	acct-user/nginx
+	virtual/libcrypt:=
+	pcre? ( dev-libs/libpcre:= )
+	pcre2? ( dev-libs/libpcre2:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	http2? (
+		>=dev-libs/openssl-1.0.1c:0=
+	)
+	http-cache? (
+		dev-libs/openssl:0=
+	)
+	ktls? (
+		>=dev-libs/openssl-3:0=[ktls]
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( ${LUA_DEPS} )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? ( dev-libs/modsecurity )
+	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types[nginx]
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	ktls? ( ssl )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		${LUA_REQUIRED_USE}
+		nginx_modules_http_rewrite
+		pcre
+		!pcre2
+	)
+	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+
+	use nginx_modules_http_lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_auth_ldap; then
+		cd "${HTTP_LDAP_MODULE_WD}" || die
+		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_javascript; then
+		cd "${NJS_MODULE_WD}" || die
+		sed -e 's/-Werror//g' -i auto/cc || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_sticky; then
+		cd "${HTTP_STICKY_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		cd "${HTTP_NAXSI_MODULE_WD}" || die
+		rm -r libinjection || die
+		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use http3     && myconf+=( --with-http_v3_module )
+	use ktls      && myconf+=( --with-openssl-opt=enable-ktls )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre --without-pcre2 )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
+		export LUAJIT_INC=$(lua_get_include_dir)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use http3 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${ESYSROOT}/usr/include" \
+		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED}"/run || die
+
+	if use lua_single_target_luajit; then
+		pax-mark m "${ED}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx/naxsi
+		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ver_test ${_replacing_version_branch} -lt 1.10; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3511f5c04745..c347d3d920b7 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
index e702ff1a86bf..783c07443cc8 100644
--- a/x11-misc/notify-osd/Manifest
+++ b/x11-misc/notify-osd/Manifest
@@ -1,5 +1,4 @@
 AUX notify-osd-0.9.34-fix-integer-conversion.patch 782 BLAKE2B a0af1547a98444ca7a8cc5fb1078c3c9a72a238c1e44d7ad232b7d17adbc8106d3ac375425e5bc34a55f35df3a67eb61dc20ee7fb2bdb2730dff5d42b9439fba SHA512 f31fc04921ff7dbefe77cd93fcc3819f17d44c7235934cb9ef57340e83e3d332449edcf7bcb6923a4956b5b32cec00df1ee5760261ea2579975a3d333def77bc
 DIST notify-osd-0.9.34.tar.gz 635387 BLAKE2B 469369f9fde562c605c131608b56eb54ea2a5f3d16f530e5b383d04fd8de2fbd531b58ed43caceeaeef65840cb00917484c02f8af0d7a0fc464ab131c1193853 SHA512 60ca63c2041f129d5139537242c2260908cedef633df977a608e19dcb01b75b2280ec80abe2b6da5eff76621107ee9d294742abfae301bc24eaa3aa855c56ce1
-EBUILD notify-osd-0.9.34-r1.ebuild 1503 BLAKE2B b59b0bd60fcb8c299121cbd5feaff737bc7c610082c5ad6fea5e883bb1160a18f265b11282d611bc244aab61644bb06691df4200944b9a649e3b53e63a09360c SHA512 cd212fdeef62bf4c45a24bc895d5512437a13649aa92930fc16746d71acd0961a30b02017c16e58d491d427c62d7fd33b20277b5216113ec9b0ecc9a30160795
 EBUILD notify-osd-0.9.34-r2.ebuild 1600 BLAKE2B 2a5a6061320eba92aa3b3452b31d564de32a9c1d9b30c8a005c4ef1e28fc69026f29c354b707b574c6646a44e0258cff1c4e38d58cede654a2c38266b146497c SHA512 37dcfc6b18f40687894b4c3b332406e46e2b2d964b69df2a7b3499acf330c46d36e9b955dc01f217b156a57d2b94d2c7026fe06087f2c10675a1f0ff8b3235a7
 MISC metadata.xml 251 BLAKE2B 7d2eba6fb2a179ee3d8de8ba1d8397cca76a8ddd87831b352e113013175917395d8509d08718420dd59827f593f5befd91e14291ec213baf9b8fd5816c08f358 SHA512 2d5b955fb57b228912a83143faf54bd2be9dc93cdfaa20955777e8cb28da6cd2acb36c9b69f60132b4f229d213b600e76285768e895b1b20098fc1bbc52eade8
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
deleted file mode 100644
index 6a1096cc8f5b..000000000000
--- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2-utils savedconfig
-
-DESCRIPTION="Canonical's on-screen-display notification agent"
-HOMEPAGE="https://launchpad.net/notify-osd"
-SRC_URI="https://launchpad.net/${PN}/precise/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-3.2:3
-	>=x11-libs/libnotify-0.7
-	>=x11-libs/libwnck-3:3
-	x11-libs/libX11
-	x11-libs/pixman
-	!x11-misc/notification-daemon
-	!x11-misc/qtnotifydaemon
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	!minimal? ( x11-themes/notify-osd-icons )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	gnome-base/gnome-common
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
-
-src_prepare() {
-	default
-	sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
-	restore_config src/{bubble,defaults,dnd}.c #428134
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --libexecdir="/usr/$(get_libdir)/${PN}"
-}
-
-src_install() {
-	default
-	save_config src/{bubble,defaults,dnd}.c
-	rm -f "${ED}"/usr/share/${PN}/icons/*/*/*/README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-08-16 03:28:34 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-08-16 03:28:34 +0100
commit	643a5121202a0a33fb4d77fbf1c4dde26de3224c (patch)
tree	e7e4742e588a0ee9769303f80c6cfcf273360f9a
parent	3648761f2708fcf5662ea1b9585f594c36eefc30 (diff)