gentoo auto-resync : 13:08:2022 - 08:23:34

author: V3n3RiX <venerix@koprulu.sector> 2022-08-13 08:23:34 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-13 08:23:34 +0100
commit: cd40bc9ab405aca4e72f869db79d9d1ff77d8313 (patch)
tree: 2918fb07c5f60a7f93f6fd8ced1ed74061a49318
parent: 4d4b75287f879f15ebdc56b3edd19737b6f936e8 (diff)
120 files changed, 432 insertions, 2974 deletions
diff --git a/Manifest b/Manifest
index ea016e6ea749..bbe772ad9afd 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29644 BLAKE2B 20a5ca5ed4e449bd1e4c4d129fdcd3688966be03c1af7d3c4ad39f97c3732c4dd5c5f30733be765517922d571a43ffa920cfff0517fb8cef065b0fb623dab540 SHA512 b368417b60a249332b41a7bc6c357b287b9029f916266e199ce44ef7558a34d2a8c97070d0335a6b4c31e1a551d0b49724233cfade9c68dd41dfd39686645498
-TIMESTAMP 2022-08-13T00:39:40Z
+MANIFEST Manifest.files.gz 29632 BLAKE2B 79ff8856c9275070c6fe221ce9a9ff81af94cbc89670c66ebf4acde307c7c1a8fc38d746651cbaa45b654bab367d57c27d5660436c8eac05ec94efe93fdc45a0 SHA512 f5d3dcbbe958fd015edfe01c77282c4c567277cb649cf9ae4e1fbf18cc0d15735b109d1d9bf87f4c94b521f43228624c103341dd03fa4c7ab65cdb8de8ad79c9
+TIMESTAMP 2022-08-13T06:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL28sxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL3RyxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB8Dw/+JMZ3i94R/8yPpwCiJPXzj762r/1sGZP0LZCEXC3BeEOaSKeOAZN/FXQi
-76iZqkDKjAVGZxiBbYRHfASjOXgz0Qnj9pk8iAYkLLAogLfoM+1L3AZoVmPQwXkj
-kcLEQTtc/tWqt8v2znr1Tw2hrrt7brUJ+M4r9ZaBi6biuEqIfMgUuIdnDczrXB9V
-Cp8slN1R3UqL71fL2+O9ZuAT1hYWEIw9FyxMamCFsWVXWzQAyG1qKKVBKPkf7Up0
-0SOauPMLWLankur4XTBKwSbNWLyywZzH891GLLWQUNFt7pBYpAylGIJenDa0LfyY
-Pi4NPz/OsvtWh2KXGMVUBidLxVsRQ54BzpsGssEVpxU06UEZMYL3oSfBPX5K6jCH
-qozS0uhkPbqs5cYwty8+qa9EaitJc0HudvyER9qSWVXNqXgPYQ6gatSpPWSbBNk2
-tzlya7DXFgzLzGJ0khc2SFlc0JeXejNmJsO3D+GNIc9xl+2+xvm52MG1SacV9sKI
-czxqvuceRGwQbEAaNy7/jvVaRv/ohSl0Nhf9ploE6YXtDHqgaWe6bYw0Ja+x+ikz
-mC6OVXm1mwD2XEQqKIFSlrq4a3H4cvm/Vfv6f69Uv7Z080uDDmldWP+uQ9yS3UqO
-KLj24jJiNPfY9PTH89mjuVu5rw+jNWNDd8xD6u70wbACPeFc2tM=
-=ZnuZ
+klCj7g/+JnIysKoufTFLOCJoakUE4AJnG2Mnc5W1rLH2pj+1P4MAh5gsanQKykRA
+a9hO2fD4mP17FNhzG9R3THJZE/6TFgWhE8Ct5vxCFakMKpILK3aeRCdytHXhRfhs
+7QepWzhyQIppgbMhQNz4WTvIYW3LPLmedc1P+0mSzO1Rfc2c7ctwpmJftmKzdRRu
+Bg1Wtit/OkGs1C7jICusZcqP7gSi4R3Ze3jJkwnBXViggq2pQB0x7haZNwyQrmPH
+Ai/egVELotDAdZINnjP56ThHMBgG+wvReOy4rdBhacBMx2jKiNuHn2AdAbJk5EWD
+rNLIIr2T6JBPz6biJuvkh6nLnxYV0mWyyBg4yPUtnA4Qqnh+m+VoROcuDvs5MYsp
+sq/7rwkpU33SwDqNYr8uxeueXTd3hkh1+aufbp95tcuuXDEVygeTOla+I4VDFXwY
+LYrvuOxnhtJGfmuN7Beq+4CglWpjxjg1e0saQK9QzWGwDl75Mf+sHVJ/tPLcetG8
+EKZkT5OCoDbC8WZF5PdE6Ff+U7e8D8VH0sV3P7WSuHBDctTa3dksWSpPNPrKd+EG
+fdPNbOdG6+JU0Paz1Qof6uD7N9WY63e31waU7cBSI/flyPUMw1RoyLPo6xrOgXrL
+E+dVbrrFZzwZQFXOJrMgDulIOUOKc+DtANO0U3eACaKK4yCyqi4=
+=akvV
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index b6bc881c4450..ac939296281e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 4ee059d98369..f9f3523d7d97 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 30fed8eb9f2a..e5d2f3f70320 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,7 +1,4 @@
-AUX iwdevtools-0.11.5-rcd-plain-name.patch 667 BLAKE2B 6f775ac87e50327e7240e204be7cfda9e1acf0455486c18e7d50522746ece2c90d97c27ce9b5d927fa87b4d71935941f3298bd8c22be7bfebc1c94593cceb8ca SHA512 cbb915f4a463e8c3dd68c043f73323ca624a36f178dab53ca3eee61dd74ec485d33b47ab8c6bd4a4db900e1516f84cfdd0a11c9365773f7fc438659246ab426c
-DIST iwdevtools-0.11.5.tar.gz 85698 BLAKE2B 0f5b0c81735017b82144c74b2396826b2e6ea97db70704977c7885bdb00442c83023f593aeb25ab2e51f3a35cd659be98440f51e4496418a92f1559212db5b5d SHA512 05e0169a465cd4956d663f54bdc66d3c17379229b23c26a94d9deff879ef9e53b1b28f59e7cf314d36127954cb75728f008d0b0728659436ad1e63de5fb11bbb
 DIST iwdevtools-0.11.6.tar.gz 85945 BLAKE2B 61c18ae0ed1c0f7e90d41af485f18f891cdd9ffbaff5437cb9f9ca88622efa0f5acd89ac8596e7d41c25a083a970143f3b226284f4566b0b8ee3718071cd6cbb SHA512 21ffda72945947658bf6867bf83d9b9ad4f6b930d4c2cee3dea551581030668ab286a4c4a07edeae937fd91f4aba08fe8e7c6506459808c4ada38502226b5b26
-EBUILD iwdevtools-0.11.5-r1.ebuild 1955 BLAKE2B 6d126fd53e92bdf29cb93ef168fddabf88e61d1a8fdd86ad6268ceeb76e47dcd391c7d4f7e8d66b13b6d85959ce32046e1a284636b322763d7278c2ff0526d70 SHA512 bfffcc7aa2ba0da26bf1d30576f02289d9e95cd2e2c3389456c6f1c2bee36eb669e3d15c46433b5fe145fd86fbad78205f13e81b1c8871d73d2a05cbaa4f3842
-EBUILD iwdevtools-0.11.6.ebuild 1909 BLAKE2B 7e32358db8ec521ba8712fc31cec84398c3e4deb3743df510b1fbf232e219ff46adb293e1d732783da6ccc8eff16cca170a09cafec5ab521e86718432ae3ff39 SHA512 671c69bbfda922fc8efef5f5ad299f7ffe7ae8f21dbda4d568d6966c3e2066c3bfd661da9856160f1e8101c5b4a302fb236f5d3aca0096033f089e2544a90a25
+EBUILD iwdevtools-0.11.6.ebuild 1901 BLAKE2B eba3b07b717b1d05d61fed1eb064816d83dc981953428eb099afedfa74cd2ec3318c8de57f3d2706d391809f182c5276e0baa12d6701e3b49edef8cbd7714a65 SHA512 081af3ffdc6f2b083d30c33b5635aa9dae2f327a0adf590e5362c1278d5e9e85dedbb3b2d3e630c22187238dfc883c941266057a70159923a799e138fa7c0580
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.11.5-rcd-plain-name.patch b/app-portage/iwdevtools/files/iwdevtools-0.11.5-rcd-plain-name.patch
deleted file mode 100644
index dbb2ca17f887..000000000000
--- a/app-portage/iwdevtools/files/iwdevtools-0.11.5-rcd-plain-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/ionenwks/iwdevtools/commit/408fba9
-From: Ionen Wolkens <ionen@gentoo.org>
-Date: Mon, 1 Aug 2022 04:28:49 -0400
-Subject: [PATCH] repo-cd: use plain name for error display
-
-Given doesn't look so nice with the [_-] addition:
- ! no non-excluded match found for '*some[_-]name*'
---- a/scripts/repo-cd
-+++ b/scripts/repo-cd
-@@ -307,7 +307,7 @@ rcd-cd() {
- 		done | mapfile -td '' choice
- 
- 		if (( ! ${#choice[@]} )); then
--			rcd-msg '!:r' "no non-excluded match found for '${C[m]}${search}${C[n]}'${userepo:+ in ::${userepo}}"
-+			rcd-msg '!:r' "no non-excluded match found for '${C[m]}${name}${C[n]}'${userepo:+ in ::${userepo}}"
- 			exit 104
- 		fi
- 
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
deleted file mode 100644
index 4cb0eb5fc207..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/pax-utils
-	app-portage/portage-utils
-	>=app-shells/bash-5.1
-	dev-libs/libxml2:2
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	|| ( sys-apps/util-linux app-misc/getopt )"
-BDEPEND="
-	sys-apps/help2man
-	|| ( sys-apps/util-linux app-misc/getopt )
-	test? ( ${RDEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-rcd-plain-name.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir=${PF}
-		-Deprefix="${EPREFIX}"
-		-Dshellcheck=false
-		$(meson_use test)
-	)
-
-	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Optional portage integration relies on using /etc/portage/bashrc."
-		elog "The example bashrc can be used as-is if not already using one:"
-		elog
-		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
-		elog
-		elog "Otherwise, inspect the tools' --help output and the example to integrate"
-		elog "(if not defining the same phase functions, the example can be sourced)."
-		elog
-		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
-		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
-		elog
-		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
-	fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.6.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.6.ebuild
index 68858249d8a0..4c53d2af1ea3 100644
--- a/app-portage/iwdevtools/iwdevtools-0.11.6.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.11.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d6c64a342b58..83f00424477a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cucumber-ci-environment/Manifest b/dev-util/cucumber-ci-environment/Manifest
index f793801cf68c..05ddc0e8d6b2 100644
--- a/dev-util/cucumber-ci-environment/Manifest
+++ b/dev-util/cucumber-ci-environment/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-ci-environment-9.0.4.gem 9216 BLAKE2B f7758051d9e990b7b25b4dbbe4448c083630855619d11a4262740ca2bb2c85d659aeff95c889d179b22a8cb2831659b4cb86bf04d253a451749565e263244eae SHA512 be130abb5227a17308bdd2792e84d509a2ad64e1b19030bde254ceac607ebea5374f94dde80d9cce01be125a01356f12bc70b1884df149d6e1a7bc43651710df
+DIST cucumber-ci-environment-9.1.0.gem 9216 BLAKE2B 79287ac684faf3584ad18ddea54a6eb6bff6bf9ed76fb0c9126c4a0516aaebfebb09f9d5f5ecec44e84e7f1604bde6c53ae06e4ab339a0a2c79448dd9358f08a SHA512 3386783e70ed80f0465453708f14e5415d64feb4a995d05dbf04d8af9d38a25b089cd1a51b6d830d4aabf2b5499956d53d90f8e1e77d445ba00f8bb5e83685b0
 EBUILD cucumber-ci-environment-9.0.4.ebuild 431 BLAKE2B 7efac6078abc9aef51165a0bb23f69d8aa0679d7362e0684456fe8544fc6bb668e1b5ddda5b28dc79b3cf30a25cd3605f37798957ab7cd0e7945e6361e0ab871 SHA512 1eb52d42d2555735a50cc63eb15ad45868cb58cecafd653fd2913f38d4536fb89a75f3aa3bc4904dea51b84efe58b4717733f37ac1383e8a003ef26ef9e1659a
+EBUILD cucumber-ci-environment-9.1.0.ebuild 424 BLAKE2B 94ee10b53169a1855791473381ca46dfba86457304ca93bef51899c4ca33553b1b318ceb08aae8393fbe00422b6f31fd31a8cbd35dbb654970c54dc481c8f6ec SHA512 3946942554b3001e44791a780e4cbc1f6e0c381d47747322dd08c8ad03456157c0906216365ea171ab2c7e49ff3f490a7c6bb642227ed46b199437f73ba7eb4b
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.1.0.ebuild b/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.1.0.ebuild
new file mode 100644
index 000000000000..295f917453b3
--- /dev/null
+++ b/dev-util/cucumber-ci-environment/cucumber-ci-environment-9.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Detect CI Environment from environment variables"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="test"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 028d94c4ada8..2f7a8e91528e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 6c98c6f4eaf5..06dea669e918 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -2,6 +2,6 @@ AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
 EBUILD libmtp-1.1.19-r2.ebuild 1705 BLAKE2B b8a2231e68ecc3afd4bd66894b9940f099ad151bdcf9c5bd777d62c239badaf18089607fa7db935ad12fe97f797c44f72ffac41a8b8536e7afdef2aa69ac5d75 SHA512 692dbba0b3a8b629dee534f1dd3ac36b2f813a5b4d5c6e8c1b8116844078e794b6a57d15492d634d2bc89d5b16fa424b72caae933f4ba48a7bba193c81155507
-EBUILD libmtp-1.1.20.ebuild 1917 BLAKE2B bf554526e729ba781513545d5aaf2de97a5fdf66bc8fdfbc7805998de09d4bd6913c3f74439a179a92f73b773f1ce9d13b8c37138fc73d304b9e48cf4839c510 SHA512 c5491c946f3cfb5cfba7eea99ef4d9b007af034163fb91812075d9ed2e9581d7e78dd4357ba3fcec9c83e4e8384b252823948541b0d2c055c9b02043ae738fa5
+EBUILD libmtp-1.1.20.ebuild 1914 BLAKE2B 1dbd45263f6bb2e24c9e2d08a1da000c45cbadc4c4993205fbdfc5dc06f0e37eff00d26971417c67047847061b3c8db54731770c1de881b00a0c74c0939b9a37 SHA512 cd98b6cf7110e1034c1118feb4dbc19e1078827293701d51b42a9817da55717a608640498c00e9ce2c01da13747b17b3fc56b47998a4f79e92b74b6b83588a6e
 EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild
index 1d3b612f5449..ca891973bc8b 100644
--- a/media-libs/libmtp/libmtp-1.1.20.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.20.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	inherit libtool
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 490657434333..48c80af683e8 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,7 +1,4 @@
-AUX rubberband-2.0.1-build.patch 6021 BLAKE2B f9e745c1eda3dc8d4f603df144a41143f3f7ee3691a09f97f069f469378d9541a057aefd1e23c7c00dbc276e13eb510dce63579f2334d2384433ce60b41231f6 SHA512 4e20aa9722f2995ad2959cfabd3eca24b6d72eb1d1e59bf2f4b283e4cbc60025ae0ee754bacfac3042214f96900f4bac100c3c1918da1a256ea7f42f0befe912
 AUX rubberband-3.0.0-build.patch 6150 BLAKE2B 2548de747697e04988e55483f08afd1c8e748080ff81f2db997cdd34ac64ad7031fa6ce5852bfeac0c5f96a04ba906f10d61ce395383ba509da7ed46823fcfc1 SHA512 b1be06cd1ec660db0f023268796850833e0813480acb9c0ba15a62ffca5174b2c5e4897eedc94606033bc51b865da607a549c1bca1bc56a3cd9268cae0566488
-DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0
 DIST rubberband-3.0.0.tar.bz2 213089 BLAKE2B 74afdf1f7c3360b711b365d73e12fe84afa5abc8ddb6a10a3d31392a621e9fca67e8b4c0292238b0e5726c56242438e1b2ef1d7d6ea6979a360cc7ecab45de75 SHA512 d8ce300a2cca7e35c548f9cd9f2f77f9b730b0e9427214d4a825b32ea9c90769e229f91db5846b90ff11a1513e8f68447fb598aa2684f67f10b4b9414b9ad748
-EBUILD rubberband-2.0.2.ebuild 1580 BLAKE2B 63d0645884bbbf9b033c42c257477c57b794f95a6dad529e707db3c4319b6ff9be4b62a42f17f2fd8528ffcf3998653bae2b3eaa72a2448d1fcbbda30b3b2438 SHA512 708a74df246ca65f6ea0f384ada9870b88c4db42d92d03758daf232d7f2bb6d35de6c50b3291ac4a5bbfb1aac82ecce38d33c0785d6a5df5e107479cd39093a6
 EBUILD rubberband-3.0.0.ebuild 1573 BLAKE2B 65f28fa2d3d9b09903da0f2d8fe55108ab4dc32345a4d91dd069a5c39c7cbe6267bbce78d82f2dfd8c8622ece1b069fa5fda15162894fa8209b0cab0c2672264 SHA512 08b2a01e072f341562f7eea435c110002ef9aed1e876c3d54598fc674102ab67886f747cd26236f53507af9defe45f79ba44de0d863f61d511b1887f4279bc27
 MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/files/rubberband-2.0.1-build.patch b/media-libs/rubberband/files/rubberband-2.0.1-build.patch
deleted file mode 100644
index 5e7e023b4d8e..000000000000
--- a/media-libs/rubberband/files/rubberband-2.0.1-build.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 753d1df..005e638 100644
---- a/meson.build
-+++ b/meson.build
-@@ -99,18 +99,26 @@ endforeach
- 
- fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false)
- samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
--sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
--vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+if get_option('programs')
-+  sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
-+endif
-+if get_option('vamp')
-+  vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+endif
- thread_dep = dependency('threads')
--have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+if get_option('ladspa')
-+  have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+endif
- have_lv2 = cpp.has_header('lv2.h', args: extra_include_args)
- have_sincos = cpp.has_function('sincos',
-                                prefix: '#define _GNU_SOURCE\n#include <math.h>',
-                                args: '-lm')
--have_jni = cpp.has_header('jni.h', args: extra_include_args)
-+if get_option('jni')
-+  have_jni = cpp.has_header('jni.h', args: extra_include_args)
- 
--javac = find_program('javac', required: false)
--jar = find_program('jar', required: false)
-+  javac = find_program('javac', required: false)
-+  jar = find_program('jar', required: false)
-+endif
- 
- 
- # Check FFT and resampler options and set up dependencies and paths
-@@ -281,37 +289,41 @@ if ipp_needed
-   endif
- endif # ipp_needed
- 
--if not vamp_dep.found()
--  vamp_dep = cpp.find_library('VampPluginSDK',
--                              dirs: get_option('extra_lib_dirs'),
--                              has_headers: ['vamp-sdk.h'],
--                              header_args: extra_include_args,
--                              required: false)
-+if get_option('vamp')
-   if not vamp_dep.found()
--    vamp_dep = cpp.find_library('vamp-sdk',
-+    vamp_dep = cpp.find_library('VampPluginSDK',
-                                 dirs: get_option('extra_lib_dirs'),
-                                 has_headers: ['vamp-sdk.h'],
-                                 header_args: extra_include_args,
-                                 required: false)
-+    if not vamp_dep.found()
-+      vamp_dep = cpp.find_library('vamp-sdk',
-+                                  dirs: get_option('extra_lib_dirs'),
-+                                  has_headers: ['vamp-sdk.h'],
-+                                  header_args: extra_include_args,
-+                                  required: false)
-+    endif
-   endif
-+  have_vamp = true
- endif
--have_vamp = vamp_dep.found()
--
--if not sndfile_dep.found()
--  sndfile_dep = cpp.find_library('sndfile',
--                                 dirs: get_option('extra_lib_dirs'),
--                                 has_headers: ['sndfile.h'],
--                                 header_args: extra_include_args,
--                                 required: false)
-+
-+if get_option('programs')
-   if not sndfile_dep.found()
--    sndfile_dep = cpp.find_library('sndfile-1',
-+    sndfile_dep = cpp.find_library('sndfile',
-                                    dirs: get_option('extra_lib_dirs'),
-                                    has_headers: ['sndfile.h'],
-                                    header_args: extra_include_args,
-                                    required: false)
-+    if not sndfile_dep.found()
-+      sndfile_dep = cpp.find_library('sndfile-1',
-+                                     dirs: get_option('extra_lib_dirs'),
-+                                     has_headers: ['sndfile.h'],
-+                                     header_args: extra_include_args,
-+                                     required: false)
-+    endif
-   endif
-+  have_sndfile = true
- endif
--have_sndfile = sndfile_dep.found()
- 
- 
- # General platform and compiler expectations
-@@ -514,7 +526,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li
-   )
- endif
- 
--if have_jni and javac.found() and jar.found()
-+if get_option('jni')
-   target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
-   message('Will build Java Native Interface')
-   rubberband_jni = shared_library(
-@@ -549,7 +561,7 @@ if have_jni and javac.found() and jar.found()
-   )
- else
-   target_summary += { 'JNI library': false }
--  if not have_jni
-+  if not get_option('jni')
-     message('Not building Java Native Interface: jni.h header not found')
-   else 
-     message('Not building Java Native Interface: Java compiler not found')
-@@ -563,7 +575,7 @@ install_headers(
-   subdir: 'rubberband'
- )
- 
--if have_ladspa
-+if get_option('ladspa')
-   target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
-   message('Will build LADSPA plugin')
-   rubberband_ladspa = shared_library(
-@@ -630,7 +642,7 @@ else
-   message('Not building LV2 plugin: lv2.h header not found')
- endif
- 
--if have_vamp
-+if get_option('vamp')
-   target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
-   message('Will build Vamp plugin')
-   rubberband_vamp = shared_library(
-@@ -662,7 +674,7 @@ else
-   message('Not building Vamp plugin: Vamp dependency not found')
- endif
- 
--if have_sndfile
-+if get_option('programs')
-   target_summary += { 'Command-line utility': [ true, 'Name: ' + rubberband_program_name ] }
-   message('Will build command-line utility')
-   rubberband_program = executable(
-diff --git a/meson_options.txt b/meson_options.txt
-index c820c20..81710de 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -26,3 +26,18 @@ option('extra_lib_dirs',
-        value: [],
-        description: 'Additional local library directories to search for dependencies.')
- 
-+option('jni',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('ladspa',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('programs',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('vamp',
-+       type: 'boolean',
-+       value: 'false')
diff --git a/media-libs/rubberband/rubberband-2.0.2.ebuild b/media-libs/rubberband/rubberband-2.0.2.ebuild
deleted file mode 100644
index 42b4ec3e69e4..000000000000
--- a/media-libs/rubberband/rubberband-2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib flag-o-matic
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://www.breakfastquay.com/rubberband/"
-SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="ladspa jni static-libs +programs vamp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	jni? ( >=virtual/jdk-1.8:* )
-	ladspa? ( media-libs/ladspa-sdk )
-	programs? ( media-libs/libsndfile )
-	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.1-build.patch"
-)
-
-multilib_src_configure() {
-	if use ppc ; then
-		# bug #827203
-		# meson doesn't respect/use LIBS but mangles LDFLAGS with libs
-		# correctly. Use this until we get a Meson test for libatomic.
-		append-ldflags -latomic
-	fi
-
-	local emesonargs=(
-		--buildtype=release
-		-Dfft=fftw
-		-Dresampler=libsamplerate
-		-Ddefault_library=$(use static-libs && echo "both" || echo "shared")
-		$(meson_use ladspa)
-		$(meson_use jni)
-		$(meson_use programs)
-		$(meson_use vamp)
-	)
-	use jni && emesonargs+=(
-		-Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	! use jni && find "${ED}" -name "*.a" -delete
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 4f8eb223bd10..fb3a48e26c83 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index f6af041a92cb..eaa1e1cc6807 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,7 +1,3 @@
-DIST audacious-plugins-4.0.5.tar.bz2 1759133 BLAKE2B b806ac110875f94f6e0f1db757d2ec0c7a0391f83efeb068f3e79c7e994fa33d0045095669b5e7ec771714419aaa98b0d0125a5dd18a00f4ee23fc899142858f SHA512 90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
-DIST audacious-plugins-4.1.tar.bz2 1802825 BLAKE2B 253fddf82408708d8094836088bec1b9b7c932e75c959443579e4bbdc3a4b850757328d90b1ab7a6a0bdd85120d4b0a901f9fa22638f90938f19fd0fa35012ba SHA512 4adad3b4e9c264d52c6523fe84db56b9a87476a4ad5a86f85456a7e0276758d61675022e9e3da07e061dac45f604e54f83f9db85a37f0aaf0b75b3356a63932f
 DIST audacious-plugins-4.2.tar.bz2 1947472 BLAKE2B 405fe7d30f190590955e66540595059869aed920b5cbaffa84439a336b20e6016c704dd3d3775521bde5c3bef0954aae96d72587d6c383966d63dd955b7a6b4a SHA512 632f1ac90c3a079bb92120e4bc6ef6b13f3f809f150809a64569fae49c908dafeb30e16a34d18bb081e099fe2a252a7ed8b76da129ffa0d51b16216f0b6d1282
-EBUILD audacious-plugins-4.0.5.ebuild 4075 BLAKE2B 811e4373236b03297e42858b455edc1a988eef64fa8b810f566c26842bf457a93246ed3ada021b61640d4079263f8a21deeb3ff1b4b61549cf34582a980464d3 SHA512 88b73fd0db0cd40d173d05f55b57de860a6138595a435d042c210d92bb01126537ff1ab53bd01fe3d435008e1080aa4e119a626f72258dceb5e16b16eb3b7ecb
-EBUILD audacious-plugins-4.1.ebuild 3972 BLAKE2B 1f4af0959b24558f686e92cbc73a7ea15866ed916949c54fc56333e7e2f222c7a297bb24aa48cf87fc4f83ac59b4e63166bcd0b417401ea5c5736ed162310b30 SHA512 65078be2b4be239c585908c9a838628e5fa64f8d1dfb429ed04999111ceab2731c8e413458103df94778339a8b676554a4cb15e69ce538a356ef40a53fd421f4
 EBUILD audacious-plugins-4.2.ebuild 3968 BLAKE2B 09aabfacc3ebbe103b48df5436dd9d323121db1e8e6a7d85bb24f95dc76e11a8f339439c2b3dddd15e4185ea7d41d41516d2f2750c9188be09281d9d45609f1f SHA512 ff998a1877ec4c8d439294a7da1699ada547e6fe5f6e8237a25fba93db162873f76e40e921d3b5179b3aeb3731da571b7baf5f91860c51ed61d40b970bb4bbf3
 MISC metadata.xml 1091 BLAKE2B 6f429835737323f98f771d55ae9ccea937341dba297e559500461c3c3746b27410eb1d9a50a68651563eaeacc9cf22f99a7b4894753d15e202341680f1f4ee91 SHA512 fc8e02d56582e98e2f754531ac52c0d0257290b8b6c3b3663b1baa5f55799ff7934094c1c6e2384b13ee45438f9f59dcf4186b8a0c69f59e3821265d0a6cdb25
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild
deleted file mode 100644
index 942a78367d96..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 ~riscv x86"
-fi
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
-	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack"
-REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-#   alarm
-#   albumart
-#   delete-files
-#   ladspa
-#   playlist-manager
-#   search-tool
-#   skins
-#   vtx
-# Plugins with a configure option:
-#   glspectrum
-#   gtkui
-#   hotkey
-#   notify
-#   statusicon
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	app-arch/unzip
-	dev-libs/dbus-glib
-	dev-libs/glib
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtwidgets:5
-	~media-sound/audacious-${PV}
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( =media-libs/ampache_browser-1* )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia:=
-		>=media-libs/libcddb-1.2.1
-	)
-	cue? ( media-libs/libcue:= )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
-	flac? (
-		>=media-libs/flac-1.2.1-r1
-		>=media-libs/libvorbis-1.0
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	http? ( >=net-libs/neon-0.26.4 )
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	opengl? ( dev-qt/qtopengl:5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	streamtuner? ( dev-qt/qtnetwork:5 )
-	vorbis? (
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.0
-	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-mpris2
-		--enable-qt
-		--enable-qtaudio
-		--enable-songchange
-		--disable-adplug # not packaged
-		--disable-gtk
-		--disable-openmpt # not packaged
-		--disable-oss4
-		--disable-coreaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(use_enable ampache)
-		$(use_enable bs2b)
-		$(use_enable cdda cdaudio)
-		$(use_enable cue)
-		$(use_enable flac)
-		$(use_enable flac filewriter)
-		$(use_enable fluidsynth amidiplug)
-		$(use_enable gme console)
-		$(use_enable http neon)
-		$(use_enable jack)
-		$(use_enable lame filewriter_mp3)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate resample)
-		$(use_enable lirc)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable mp3 mpg123)
-		$(use_enable nls)
-		$(use_enable opengl qtglspectrum)
-		$(use_enable pulseaudio pulse)
-		$(use_enable scrobbler scrobbler2)
-		$(use_enable sdl sdlout)
-		$(use_enable sid)
-		$(use_enable sndfile)
-		$(use_enable soxr)
-		$(use_enable speedpitch)
-		$(use_enable streamtuner)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg ffmpeg)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
deleted file mode 100644
index 05e9ac774297..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	openmpt lame libnotify libsamplerate lirc mms modplug mp3 nls opengl
-	pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis
-	wavpack
-"
-
-REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-#   alarm
-#   albumart
-#   delete-files
-#   ladspa
-#   playlist-manager
-#   search-tool
-#   skins
-#   vtx
-# Plugins with a configure option:
-#   glspectrum
-#   gtkui
-#   hotkey
-#   notify
-#   statusicon
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	app-arch/unzip
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtwidgets:5
-	~media-sound/audacious-${PV}
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( =media-libs/ampache_browser-1* )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia:=
-		>=media-libs/libcddb-1.2.1
-	)
-	cue? ( media-libs/libcue:= )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
-	flac? (
-		>=media-libs/flac-1.2.1-r1
-		>=media-libs/libvorbis-1.0
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	http? ( >=net-libs/neon-0.26.4 )
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	openmpt? ( media-libs/libopenmpt )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	opengl? ( dev-qt/qtopengl:5 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	streamtuner? ( dev-qt/qtnetwork:5 )
-	vorbis? (
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.0
-	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "Failed to sed" # bug #512698
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-mpris2
-		--enable-qt
-		--enable-qtaudio
-		--enable-songchange
-		--disable-adplug # not packaged
-		--disable-gtk
-		--disable-oss4
-		--disable-coreaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(use_enable ampache)
-		$(use_enable bs2b)
-		$(use_enable cdda cdaudio)
-		$(use_enable cue)
-		$(use_enable flac)
-		$(use_enable flac filewriter)
-		$(use_enable fluidsynth amidiplug)
-		$(use_enable gme console)
-		$(use_enable http neon)
-		$(use_enable jack)
-		$(use_enable lame filewriter_mp3)
-		$(use_enable libnotify notify)
-		$(use_enable openmpt openmpt)
-		$(use_enable libsamplerate resample)
-		$(use_enable lirc)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable mp3 mpg123)
-		$(use_enable nls)
-		$(use_enable opengl qtglspectrum)
-		$(use_enable pulseaudio pulse)
-		$(use_enable scrobbler scrobbler2)
-		$(use_enable sdl sdlout)
-		$(use_enable sid)
-		$(use_enable sndfile)
-		$(use_enable soxr)
-		$(use_enable speedpitch)
-		$(use_enable streamtuner)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg ffmpeg)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-plugins/rev-plugins/Manifest b/media-plugins/rev-plugins/Manifest
index a0eb9b91c406..03e878701caa 100644
--- a/media-plugins/rev-plugins/Manifest
+++ b/media-plugins/rev-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST REV-plugins-0.7.1.tar.bz2 20501 BLAKE2B cd7e93672eac5cd2be1776be5f7ac88e5d3f631b13507ea32a4d387f3f10d91dacf217dcbc772fae5b398949593b2210cecb9978013edd8f30141f15c980a9af SHA512 00f984b47347a4f75d809587c654e3e078cb37a6c324bcec09382d1181bd8665a58044505054de75c9ba58972af7e1d3f964c3a5bd925fed4af5cccd1233bd19
 DIST REV-plugins-0.8.1.tar.bz2 15084 BLAKE2B 01bad9b663fa3b4f49209a174486758c03945b8e97e455e01269213be885167fbec33e6ada251c6c18e03d78573494bd67ec3ad6d2860f7f159e73bb72bc4635 SHA512 1c5732099f1f7b345f0ba509aebc4820bdd93e7a5a8bf54c010da34b89f95a1a5d1aff1447020c0f52c5de05f11b1c8381adcf034d68a17b90235229ad6bcad6
-EBUILD rev-plugins-0.7.1.ebuild 730 BLAKE2B d68f1d8cabe272385c1718a6b4799e89be16b54240982a9f90610f2034c5b5f52e0f5cf55d7b121242d34b134538726d0b94c3a4814e99521fc07e8c6f354262 SHA512 c6e686a32b7b6bb35b8dfc464cc8bbd836e7c569cf8a73e9998b2ec0dde11b5cb53dd43d928f7c5a588b7d4d930ce11a9afd4c64ae353c065f4de583783ca9c7
 EBUILD rev-plugins-0.8.1.ebuild 746 BLAKE2B 2d35e4053b5ddbd85403bb6f4045b95e51bbe011a24fa73b78b46cd904c1330bd895a944e6414b9abf0187747dba6c5d33b82d707115e7ab55917389626b8511 SHA512 0eac975f80b23ddad03a1150fffac894e2ed2a404e1b3e874ea6d16cacf5d8d08067ce521921a9bb14615d4a4e56831854be053f71d0bac4fc3231a1be814613
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-plugins/rev-plugins/rev-plugins-0.7.1.ebuild b/media-plugins/rev-plugins/rev-plugins-0.7.1.ebuild
deleted file mode 100644
index f493117eec64..000000000000
--- a/media-plugins/rev-plugins/rev-plugins-0.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="${P/rev/REV}"
-
-DESCRIPTION="REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CXX
-	sed -i Makefile -e 's/-O2//' -e 's/g++/$(CXX) $(LDFLAGS)/' || die
-}
-
-src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 91f3c80e2eeb..137da5d64a3e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 63a3d97f2c31..7a58c8c64ddf 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,8 +1,4 @@
-DIST audacious-4.0.5.tar.bz2 577422 BLAKE2B a65810baf0f733327a3e37e6efd2af3d35245b1e99936a4cd39d8068e0df06779ab3c08e839e4b3586f70bec2d16a605c62328f863f747247181851ac7c151c2 SHA512 4be7ebeee937f9b29931a28e1d80782b9df8beec70eab3917f5adccd0bf02aa6003a5b8361359b792edac2d2f31a257b853db43d59dd0674e5a3fbec7e7c1e46
-DIST audacious-4.1.tar.bz2 586472 BLAKE2B baed9f47ddca9b6a4668da542483e8ead049126383e8d1b090b29153b698cc83042ce0620bc5c3e78e59c599cb9f1be72b9c8d2e8c3c87f36fae45554a743b24 SHA512 6e603108c245a146c3bb360e99d85e949b25a50a4d97eca6a0519cb457a93e8d73131504ae10f86c34c0e9d98fb5fdf6660accc0bb3bb480332cb674ac27ac9f
 DIST audacious-4.2.tar.bz2 612155 BLAKE2B 04a910288278fa27cb4848663ab74f9e523f3cbea7851e28f5e197035c4ad17281e9b0d5756602efb531a65aeb8e6b7abd7b11274af3353f6ac1d21a0bd4c47c SHA512 814bd865e87cf9bc39df07c9f9898eca1dd94d8b8299b2709f77046669ce12e9c31067d55084371f6797724e79872f7571b575cc766093ee2124b38b0409a853
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-4.0.5.ebuild 1773 BLAKE2B 0debd08f37dd9d9e1bbe5cf313afc2d5769f75a12bab7b6df82ca73d3fbb92946aa2ba98a27395a1b2fcf8b1f5a9cedac67ffc9f2e212e395362e27f69022602 SHA512 effed1ada2d153a2734607ea4e0c3b0990d70dddd9eafe8b703ca1fc8683d85cba863d5ee5e49babf643919ecdbe68aa563a4df9e8135f862de827c55e443203
-EBUILD audacious-4.1.ebuild 1463 BLAKE2B 49b69528a5e0085bf9908c7a9700c92ee9383f70c98b8738619d9d721b47f089b692ff54f34b92fc7821f20dc297e6803d355266b065bfde178cd5d062a87db4 SHA512 3e4415b7997fc2ec68cfc5723f71307fc27a69c2b6159cb970ada878fe52f0f1dfda3148cb2e629742a7068d962c8fc1d945e551091b28563740a2d2b368c3da
 EBUILD audacious-4.2.ebuild 1463 BLAKE2B 9a0962f8b9ddb0d23a7d583cdb958eb019c3454d4161d6e46259c6bd5ccf8353278ff6728e47ff831f87e989ffb11e0c1f1fe2e2c02d4a8e8fc51d08ad5a14c6 SHA512 f84422d0bdaf4908b803e3a86f8a9b800b3db7188f9ade4c68e23c19b1c5f23caac4ab8876f889dccd39442c003f16485f9934ea242897ee207f3b91d3b18e73
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/audacious/audacious-4.0.5.ebuild b/media-sound/audacious/audacious-4.0.5.ebuild
deleted file mode 100644
index 560b050d80ca..000000000000
--- a/media-sound/audacious/audacious-4.0.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 ~riscv x86"
-fi
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	local myeconfargs=(
-		--disable-valgrind
-		--disable-gtk
-		--enable-dbus
-		--enable-qt
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-4.1.ebuild b/media-sound/audacious/audacious-4.1.ebuild
deleted file mode 100644
index b2ca1ac2f2db..000000000000
--- a/media-sound/audacious/audacious-4.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
-	fi
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	local myeconfargs=(
-		--disable-valgrind
-		--disable-gtk
-		--enable-dbus
-		--enable-qt
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 31a697f7d0f3..59c179742eef 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,7 +1,5 @@
 AUX cmus-2.9.1-atomic.patch 554 BLAKE2B 1a5e2b4497ed3ccc95bf5345607a8f4efedbff6852cb0abc40d0665180e0e74a25e17ba8bb121e1343f1964cf7523abdf987595c1eefc1486fd459bfb0b6a696 SHA512 9e64c6ff6184862e02c248b9a26cbde785740d622370bf761df949824ed8759825ad9bb208180f0d5d1aacd3c506994561c98690902b25cc34cbb87929e3c886
 DIST cmus-2.10.0.tar.gz 324121 BLAKE2B 7a9b17b04f9461b5375f51584f1dce35dcb6863d57eb9b28391cbfb6abb4eae1f541ee6f10cbbf4c7048c08fd77307647700fd08e41eb56bbad89b67657dd876 SHA512 c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
-DIST cmus-2.9.1.tar.gz 321004 BLAKE2B 1531d9ca8c1fd54ca487eb2b9ce8602f2d448dd80567a04bfc18449d60fbcd5286cd9f0d19983a885b2a532793c44d7dab8c1993ac8d7f5ada4f01ce670404d9 SHA512 b417e58a68c54e97db92b8760a49a3071e81f1594f2144911eed3ccceb68499dedf0699ae313babcb822d71b37add8880dfb2018686cb572e89f8627446d5e05
 EBUILD cmus-2.10.0.ebuild 3689 BLAKE2B bc5aa81ab50903eb407c21e81d0ca9f4dd583d78ddfbe52a4267b8dbb1a5cc14e2291352a6474bb942dc5d870324c81ad425c59bef4c1fea2814032562db7a31 SHA512 bd6683483ed97d0e5e2c50476103ef62ccd95801b50879576a6f55ebdf535dfd7a3975de049272abca8c610f378c5391fa3b2ef67291fc3186bf5dba43eeb864
-EBUILD cmus-2.9.1-r1.ebuild 3722 BLAKE2B fc54675860b8a3835fcec0f2d09c80f060365e21095bf87f4df8cd7d9eb3258329f7e87dfd9db9c17f55cac2069c39bc26ae945fb964434aa84fe3019b979a67 SHA512 6812d75688aa21e548679f788b16310ab95d7732304cc619915e4cf42cba924a0061846110c464113986b787ceb302525ddc0053d25729710df1d1a0e3c56add
 EBUILD cmus-9999.ebuild 3694 BLAKE2B 98129cb9b83de7e13b9a99df381dc075e35db72ae2227315da4fa3f8a4fd8953318b03e1fe9fb1c4ec643d9a03a01cedcbd9e45e95407e768ad8f356ed15526b SHA512 435470c60676204e8ebe1801993487b204f3cb8a247284de6cb988ae37a59883cecabf8af9ee120750b6b186e185669e6384d2ebd548db4f3f5929da5e51ef72
 MISC metadata.xml 885 BLAKE2B 567dfdb0b27aa4de21f2f0e1c26450d335365328623280881c04b8ebf43a4e56582bf9bc121375b11d1d80a8054f5606dd81e1afd7a71f429148ecbeb97ad168 SHA512 5731cffcef8ce3c0b9a04c71426b18909a8d0f1872ac97a3746f1c25eccb02263eb9cff9037a253d5db7dda7599a18b10f1c6d1f819ed1d769cf470e94aeed9b
diff --git a/media-sound/cmus/cmus-2.9.1-r1.ebuild b/media-sound/cmus/cmus-2.9.1-r1.ebuild
deleted file mode 100644
index a95bb0bdf06b..000000000000
--- a/media-sound/cmus/cmus-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Ncurses based music player with plugin support for many formats"
-HOMEPAGE="https://cmus.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
-	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
-	+vorbis wavpack"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	ao? ( media-libs/libao )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia )
-	discid? ( media-libs/libdiscid )
-	elogind? ( sys-auth/elogind )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp4? ( >=media-libs/libmp4v2-1.9:0 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd )
-	tremor? ( media-libs/tremor )
-	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
-	wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
-	pidgin? (
-		dev-python/dbus-python
-		net-im/pidgin
-	)
-"
-
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
-DOCS=( AUTHORS README.md )
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-atomic.patch"
-)
-
-src_configure() {
-	my_config() {
-		local value
-		use ${1} && value=a || value=n
-		myconf+=( ${2}=${value} )
-	}
-
-	local debuglevel=1
-	use debug && debuglevel=2
-	local myconf=(
-		CONFIG_CUE=y
-		CONFIG_ARTS=n
-		CONFIG_SUN=n
-		CONFIG_SNDIO=n
-		CONFIG_WAVEOUT=n
-		CONFIG_VTX=n
-		CONFIG_ROAR=n
-	)
-
-	my_config cddb CONFIG_CDDB
-	my_config cdio CONFIG_CDIO
-	my_config discid CONFIG_DISCID
-	my_config flac CONFIG_FLAC
-	my_config mad CONFIG_MAD
-	my_config modplug CONFIG_MODPLUG
-	my_config mikmod CONFIG_MIKMOD
-	my_config musepack CONFIG_MPC
-	my_config vorbis CONFIG_VORBIS
-	my_config tremor CONFIG_TREMOR
-	my_config opus CONFIG_OPUS
-	my_config wavpack CONFIG_WAVPACK
-	my_config mp4 CONFIG_MP4
-	my_config aac CONFIG_AAC
-	my_config ffmpeg CONFIG_FFMPEG
-	my_config pulseaudio CONFIG_PULSE
-	my_config alsa CONFIG_ALSA
-	my_config jack CONFIG_JACK
-	my_config libsamplerate CONFIG_SAMPLERATE
-	my_config ao CONFIG_AO
-	my_config oss CONFIG_OSS
-
-	if use elogind || use systemd; then
-		myconf+=( CONFIG_MPRIS=a )
-	else
-		myconf+=( CONFIG_MPRIS=n )
-	fi
-
-	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
-		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_compile() {
-	tc-export_build_env BUILD_CC
-	emake V=2 \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
-		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
-}
-
-src_install() {
-	default
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/_cmus
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use pidgin; then
-		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-	fi
-}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 821c56c4d27d..0001dd96285c 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.2.7.tar.gz 1748897 BLAKE2B fd53603947ddf5a76676cfc3d77b1d904146ec7c30ab6e54a2c32cae0e76ec4b66397506072cac277febdd1b799801d5b13c7b37cc0ea4a545fae26077a1d881 SHA512 62709f96fa07bbafb9b907438da7376abdf1a4e679cd2b105c5bca257f1ff62c18bd4c646ef2ccba64ca5273604da996fb2caaf61eeee44686bf45fef1ed83a7
 DIST fluidsynth-2.2.8.tar.gz 1751615 BLAKE2B 7eaee4cc1c2f49e464cda2852890ec8e96bd86c258a39246ec5c84ea3e57c9869d1e88963daecc3fa8957df1d55ff6c6633a4900de3d6fc0a1adf830865adda0 SHA512 8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535
-EBUILD fluidsynth-2.2.7.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
 EBUILD fluidsynth-2.2.8.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
deleted file mode 100644
index 387ff481a6d0..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd toolchain-funcs
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 3f294af04f87..9a5ee16fefeb 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -2,6 +2,6 @@ DIST mpg123-1.30.0.tar.bz2 1091578 BLAKE2B 6acdbfcc1119507c63d9da95afc747c43698e
 DIST mpg123-1.30.1.tar.bz2 1092735 BLAKE2B 8ce6b964acf307ce4358b33468b7560e53024df2551a17602032260ac799d6c1ff0512cfb5fa6a59e3983c054fa82b1520f8329502fa4c351b94f66f9ccdee13 SHA512 098fcecc6a570e32ccd164b62428417186265905d148d009ea592c948a02027d67fc43e015ece21cf900008f31bbe35b3ec770faba5ae0b914db0022cb6b37fd
 DIST mpg123-1.30.2.tar.bz2 1093138 BLAKE2B 03247431bf58886c7a942fb00f11d7e82cc12f95cb30c95fc01bb986e32d8245349dba6fd2a0ada33918542ce8944037f9899512cc6ffa013b884a009dbe8cef SHA512 e2e9279799f3917c9ecbcb2ccdc2c246bda50317dbfdd7ba3d56281b7b4f5b1928442fc8e712fbf90543159afc703d1ab8ceb7e3c1c038e1547b82d1616bdc82
 EBUILD mpg123-1.30.0.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
-EBUILD mpg123-1.30.1.ebuild 3006 BLAKE2B 0c587a897a607c29f7192156e54618441667478361f2ea3a59b48944ab8c1a58d73ffc89b0910f227beeeb13388d3e48a4e14db2efd72f79d5e329eede813cb9 SHA512 a100bc2beb52f75de60726554a6409bb7064bb7c647103dd7061f9dd78c3095b7ba8b02a344d09225cc1ccb74569b07ba399c90f09e07b9b4e641f3009730e8e
+EBUILD mpg123-1.30.1.ebuild 3003 BLAKE2B 06d34e5ff6fe975db0f2646858db06a052420cc6966e732764d25053832365569391c83f6228a941295d028a8290a7c1d4fb44d5530ab5a752909ae3fb8b789f SHA512 0612e1dd418a6f6860d0f018ee3dfdcf72390bbb38f5c674877c66032b5b43fb5e91fec88070ceac131fad6fb4954e2840ee2a033edd5509c65b526667741a9e
 EBUILD mpg123-1.30.2.ebuild 3001 BLAKE2B ecd6bcd7b8a6b49a2bf100c3b2985e85a27341f1de33039bf68161f4b4bdf3207dc57281488b41391e2f1ba1da072c0bd4ab2eedd635717f60e5cd092d3ecb4e SHA512 70f37a15e1c35b5a5f28b2b370f8e1d4c50f9412b5be8bbe84a209432defc78a66467112a016766066c8e2f6d07b09210e541d95bcee7de94f887c17a7f0adff
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.30.1.ebuild b/media-sound/mpg123/mpg123-1.30.1.ebuild
index ccb28a07fd63..1a2a5ea5fe30 100644
--- a/media-sound/mpg123/mpg123-1.30.1.ebuild
+++ b/media-sound/mpg123/mpg123-1.30.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index d8d79958cdf6..5a9d74687b03 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-DIST picard-2.8.1.tar.gz 5060681 BLAKE2B e649407e12fe0a5f627feaa4e1ac347b27bcb22960f6b1adac67444ebb1f0ad4bcc5732cb218cb3ba67147fdd3bc9f4a5fe3eb3836c6bd1a43ea29bb2add1d9a SHA512 0f15dccacb1d95232235b7c8251b59f02d9cd7836fc10e624951a04f889d12206301aea77d9503fd0f4fed2ae400a150ac159ce6cefd9e8a914a62f8257c7ffb
 DIST picard-2.8.2.tar.gz 5095347 BLAKE2B ddaab9e7d09bd7848d55ac385cd901b5f7b3e2044811cd63b16027159586e01028f2885202c4d2bbfa20926305e110e075778f0b907ff8812c937fe0905a8fef SHA512 18b4ebc6e898f4e2910d4d022a12c0516030133318467c38a77325ce088a9dd632d3d8105944570f75b918d3f4dc32b1a501e93bc92a7315ec9ff35ed3e56699
-EBUILD picard-2.8.1.ebuild 1448 BLAKE2B 694d79f9a133a075eeaa985e500600e2310e45e7671285303f96c02a5a78d7a7c44df9e99b9851842f338f1dea5dccf8e2c1a193d09f8960f3c9ad41275b891f SHA512 aaa97fddb14ab0500dce3533314c8ebe3892b7a8a0a4741e29bb83e99e7be5e7c32c77a14bcb5130888d1a9170ba5155086fe148d046e8dfb0c9b0eb6a78332b
 EBUILD picard-2.8.2.ebuild 1448 BLAKE2B 694d79f9a133a075eeaa985e500600e2310e45e7671285303f96c02a5a78d7a7c44df9e99b9851842f338f1dea5dccf8e2c1a193d09f8960f3c9ad41275b891f SHA512 aaa97fddb14ab0500dce3533314c8ebe3892b7a8a0a4741e29bb83e99e7be5e7c32c77a14bcb5130888d1a9170ba5155086fe148d046e8dfb0c9b0eb6a78332b
 EBUILD picard-9999.ebuild 1450 BLAKE2B ef2f46ea8d3fcc2d59ba7de0265d8780c1c1fc02cc7c3a03456cf89ef710604372c21c39c85742c328ac6fad55fab55a6a37649f6e6416998abc1047596b1479 SHA512 4173a90be211aa96379eb0121cd2bd04ebbafe619146b1525f362c98eac979d71ba37db9022245378c2c8ec9b3491cab6a292c8bfe42e403745afed12dc3685c
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.8.1.ebuild b/media-sound/picard/picard-2.8.1.ebuild
deleted file mode 100644
index e651b436e570..000000000000
--- a/media-sound/picard/picard-2.8.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-release-${PV}"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		discid? ( dev-python/python-discid[${PYTHON_USEDEP}] )
-	')
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1b304ba0c845..1e4fd5936d48 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7a357675b3e4..17cc9e3fcd0e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Aug 2022 00:39:35 +0000
+Sat, 13 Aug 2022 06:39:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c2658fe77d31..5f35ba5c963c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 521770 BLAKE2B c2acb8c863b2efce05519b69900dc397016a5ee5af4af18fda8ac25353a157eb4632e81d3a44a9e724b472ac3f520214dc9c6708619ea63041d0b272f7a9be10 SHA512 6eb592a988ac90c24adf99f6fcb0f9a848c75aa47fdc37e5dbf4ebafea5daf193d2bf7928130322630437e54a2d9a93d5dd6a6ed7658bde2da05b340db2721c7
-TIMESTAMP 2022-08-13T00:39:39Z
+MANIFEST Manifest.files.gz 521769 BLAKE2B 618daa6e096a9572df836818b2ac30268d7e21c0c6e15ec9fca6adc164cc56ecf8a0b4741c28cd5db0b47317206a50ecf907cbfc5b1be89e895d3ba8ad9df239 SHA512 7ec72296681ddb7127210ebc1591e4b9fd86180622dc64d93283209387c6216549314667c68513c3998bbaf1219b2c97dbd134baee2107a96baca5b5fa956456
+TIMESTAMP 2022-08-13T06:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL28stfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL3RytfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBzlQ/+IvtMCeygzRyq/BvqjAQ4qEo07EKrclQhzcCTqOlxdmOhdFbYkDIUbODA
-x7vhbUJdYw26bW9pr8jrsdhzEJTaoaKEmlcvAfhzwJPKXLl9B3lsfjZBM46Xh59W
-3artfE3WYY2ZLh5G9z38DCvwcBo1xLHYtr9RaKgbd+KI+qo09FzgRSePhejAh9cf
-oUnov6rYQii0POdlSESNw5HcaqDKkP/t7w5yif5ycfWqD2RNeFP3i/lMu761eoz5
-F9WVA3g6tPH4ix+YeW+j1nW7u52BG3vC5fofBS/PzIF/ox8ehoDXTlTsgDkkbHNu
-GFCBrxzu4TeRbg7zqQiQthLvbFHhD1DlzVNWFo/DBcjjruHW0Cd8HnxxXueywMMJ
-C9o/hyMcIcE3V6FCRAGqP+z7KkimohCKTysAV2bCGcougva4bnLIw+54VcmqyZar
-fUhfIpC3ziwVeP5AIYAB0EA1/weW0znOBMtU96cuCLOfN+sSv/gTfbsIT2TlDLlY
-oMDOI498VLNPhGDgoC6GzKgps7SC8AXBxOBqEYNHgany2ZWlGtvsDdVKleCuV33r
-kPqnfNmE1xtNeuk9nn6nkHyU4tRWqAJMH/+pFRKLpBcEoXDywt7juoIBtSx6AlcZ
-tCFUNqNe0AaGl9hAtzhKt35mBoaVEWlqz8HDZ5wvv6nh1tpzVhA=
-=DCCi
+klAV9Q/9Ebipp3hHWI+B8p+krRel7U9eohRk2eBz7rdBY9tsH5bABc8gyQf8n7SV
+F3113gnupZsYuGKGQYVFHtuZa62s7Fc4XnplMNtrIzrt1ohskrRzHaSylTi/AMp9
+LKUenL4v7LOks0OK41w+zLAI8S0jC1pea4l6SEU3mrGRgy2/KliQ4iHns/7DUfdS
+7OKAfSEzfHRNEy/wwoSLYyP6bytW0iJORkXfaIKXTOrpC6C2u7T3IzFpCzR1xCfV
+jnSDgrtV3L7OmjSNx95tg4h/qhy2qrhVQpCzxMiTVoy3XJt6qvPToX/a4WGMyw/k
+B47lY0bcWoHHjZx6Lvga6QBvLMLbc1f1405V9Kp2smFdZ3fQvQWR49v0UZumBTg0
+/lIJIvIsIW88hOr2UgTbf51v11p6nc8IhrokJPp1su7EaEYXHd5aCHPhTN5IccsM
+/+qK7r9Sq9+kJ01grIpEfS8vhGu/XXS0yNgEWLA5J4XUn9atrvg16Jbeh51/ClGw
+mDCaEQb9v6Fy0vWsCAmjPvkQlDCEJ8+ELifnUKZFjWu7+sRPLOJe/ylSodk5JKHE
+bQwiXFZRhUEMXtYPeM2gldujTUn2RZDKGSNa8aUDYeMy04rrOVPd+nHtnfr9/hMr
+pI0GHQhPIPnJI+Sk0PYNJ8GCaEi+pui0tpWXkUIyi5+/K87SC/8=
+=eOOe
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 9bf88c2b1bab..0f12c71d137c 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202208-02.xml b/metadata/glsa/glsa-202208-02.xml
index f8dd813ed94a..a23a1a342073 100644
--- a/metadata/glsa/glsa-202208-02.xml
+++ b/metadata/glsa/glsa-202208-02.xml
@@ -44,7 +44,7 @@
         <p>There is no known workaround at this time.</p>
     </workaround>
     <resolution>
-        <p>All Go users shoud upgrade to the latest version:</p>
+        <p>All Go users should upgrade to the latest version:</p>
         
         <code>
           # emerge --sync
@@ -98,4 +98,4 @@
     </references>
     <metadata tag="requester" timestamp="2022-08-04T13:53:02.198118Z">ajak</metadata>
     <metadata tag="submitter" timestamp="2022-08-04T13:53:02.201567Z">ajak</metadata>
-</glsa>
-\ No newline at end of file
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7a357675b3e4..17cc9e3fcd0e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Aug 2022 00:39:35 +0000
+Sat, 13 Aug 2022 06:39:36 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index dd66ec0994e1..25017bbcaa81 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-39083bb85acf1f7a1d43ba6502dcfae335e3bf80 1660170801 2022-08-10T22:33:21+00:00
+58da0854b008b45c9a0063959668eb2fa9fc0b96 1660357610 2022-08-13T02:26:50+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9b1a231a8746..f95eb7c04252 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 8fd5026eed7a..f80d154a8d67 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.11.5-r1 b/metadata/md5-cache/app-portage/iwdevtools-0.11.5-r1
deleted file mode 100644
index 32f9e9d2fc5a..000000000000
--- a/metadata/md5-cache/app-portage/iwdevtools-0.11.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/help2man || ( sys-apps/util-linux app-misc/getopt ) test? ( app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst test
-DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
-EAPI=8
-HOMEPAGE=https://github.com/ionenwks/iwdevtools
-INHERIT=meson optfeature
-IUSE=test
-KEYWORDS=amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.11.5.tar.gz -> iwdevtools-0.11.5.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2a5056d261967ece5b46a52977265251
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.11.6 b/metadata/md5-cache/app-portage/iwdevtools-0.11.6
index 78879c71f5c5..bbc2157e5e7c 100644
--- a/metadata/md5-cache/app-portage/iwdevtools-0.11.6
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.11.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ionenwks/iwdevtools
 INHERIT=meson optfeature
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.11.6.tar.gz -> iwdevtools-0.11.6.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d97c806050dcf3be85ebe63af3f67d82
+_md5_=05cf83a59d7141fb044db40659ef4952
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9ed3e17880e4..8c7323e759c3 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/cucumber-ci-environment-9.1.0 b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.1.0
new file mode 100644
index 000000000000..efacb7decca0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-ci-environment-9.1.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Detect CI Environment from environment variables
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=9
+SRC_URI=https://rubygems.org/gems/cucumber-ci-environment-9.1.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	55326c3bb01904e05d55c73c84c85d07	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c3ef56837f7bebfbc9318fdb87893e34
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 3e81483b0338..31befe422f4e 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/libmtp-1.1.20 b/metadata/md5-cache/media-libs/libmtp-1.1.20
index 961a0d88ec56..efe11f33abf3 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.20
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.20
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://libmtp.sourceforge.net/
 INHERIT=udev libtool
 IUSE=+crypt doc examples static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( dev-libs/libgcrypt:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.20.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=f6f2324e27c66ab4a7b530455e0f8869
+_md5_=d3c9e3bb0789e6c552877450f165621c
diff --git a/metadata/md5-cache/media-libs/rubberband-2.0.2 b/metadata/md5-cache/media-libs/rubberband-2.0.2
deleted file mode 100644
index 5912fe41b867..000000000000
--- a/metadata/md5-cache/media-libs/rubberband-2.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
-EAPI=8
-HOMEPAGE=https://www.breakfastquay.com/rubberband/
-INHERIT=meson-multilib flag-o-matic
-IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://breakfastquay.com/files/releases/rubberband-2.0.2.tar.bz2
-_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c9e4884938724ffc167e700208bb3b4
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 87b262d6d776..84cd9d8f70da 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-4.0.5 b/metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
deleted file mode 100644
index 7ab5a78044cc..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig nls? ( dev-util/intltool )
-DEFINED_PHASES=configure prepare setup
-DEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.0.5 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-DESCRIPTION=Lightweight and versatile audio player
-EAPI=7
-HOMEPAGE=https://audacious-media-player.org/
-IUSE=aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.0.5 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-REQUIRED_USE=ampache? ( http ) streamtuner? ( http )
-SLOT=0
-SRC_URI=https://distfiles.audacious-media-player.org/audacious-plugins-4.0.5.tar.bz2
-_md5_=6a5204ebbbcab4608ee4c709883d6aab
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-4.1 b/metadata/md5-cache/media-plugins/audacious-plugins-4.1
deleted file mode 100644
index 597b2680cd64..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-plugins-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen virtual/pkgconfig nls? ( dev-util/intltool )
-DEFINED_PHASES=configure prepare setup
-DEPEND=app-arch/unzip dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.1 sys-libs/zlib x11-libs/gdk-pixbuf:2 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) openmpt? ( media-libs/libopenmpt ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-DESCRIPTION=Lightweight and versatile audio player
-EAPI=8
-HOMEPAGE=https://audacious-media-player.org/
-IUSE=aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack openmpt lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 ~media-sound/audacious-4.1 sys-libs/zlib x11-libs/gdk-pixbuf:2 aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia:= >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue:= ) ffmpeg? ( >=media-video/ffmpeg-0.7.3 ) flac? ( >=media-libs/flac-1.2.1-r1 >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) openmpt? ( media-libs/libopenmpt ) libsamplerate? ( media-libs/libsamplerate:= ) lirc? ( app-misc/lirc ) mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) streamtuner? ( dev-qt/qtnetwork:5 ) vorbis? ( >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.0 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-REQUIRED_USE=ampache? ( http ) streamtuner? ( http )
-SLOT=0
-SRC_URI=https://distfiles.audacious-media-player.org/audacious-plugins-4.1.tar.bz2
-_md5_=b8ccd1c916ae3a85f6b491a9ea0c3099
diff --git a/metadata/md5-cache/media-plugins/rev-plugins-0.7.1 b/metadata/md5-cache/media-plugins/rev-plugins-0.7.1
deleted file mode 100644
index bfa0f283705f..000000000000
--- a/metadata/md5-cache/media-plugins/rev-plugins-0.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/ladspa-sdk
-DESCRIPTION=REV LADSPA plugins package. A stereo reverb plugin based on the well-known greverb
-EAPI=8
-HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/ladspa-sdk
-SLOT=0
-SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/REV-plugins-0.7.1.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3f90f5c2a9916cc1fa7855df502cab92
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 88510709ab7e..f6a0c4be7f13 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/audacious-4.0.5 b/metadata/md5-cache/media-sound/audacious-4.0.5
deleted file mode 100644
index 53fa579f6c4a..000000000000
--- a/metadata/md5-cache/media-sound/audacious-4.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool )
-DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight and versatile audio player
-EAPI=7
-HOMEPAGE=https://audacious-media-player.org/
-IUSE=nls
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD-2
-PDEPEND=~media-plugins/audacious-plugins-4.0.5
-RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.28 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://distfiles.audacious-media-player.org/audacious-4.0.5.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=606ed3cc32aa73874964b385de0cff7b
diff --git a/metadata/md5-cache/media-sound/audacious-4.1 b/metadata/md5-cache/media-sound/audacious-4.1
deleted file mode 100644
index b1188317dd07..000000000000
--- a/metadata/md5-cache/media-sound/audacious-4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool )
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
-DESCRIPTION=Lightweight and versatile audio player
-EAPI=8
-HOMEPAGE=https://audacious-media-player.org/
-IUSE=nls
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD-2
-PDEPEND=~media-plugins/audacious-plugins-4.1
-RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
-SLOT=0
-SRC_URI=https://distfiles.audacious-media-player.org/audacious-4.1.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=69267bef07af79e943609cb6770fc695
diff --git a/metadata/md5-cache/media-sound/cmus-2.9.1-r1 b/metadata/md5-cache/media-sound/cmus-2.9.1-r1
deleted file mode 100644
index af0908532bb3..000000000000
--- a/metadata/md5-cache/media-sound/cmus-2.9.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack )
-DESCRIPTION=Ncurses based music player with plugin support for many formats
-EAPI=7
-HOMEPAGE=https://cmus.github.io/
-INHERIT=bash-completion-r1 toolchain-funcs
-IUSE=aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
-KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:=[unicode(+)?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) pidgin? ( dev-python/dbus-python net-im/pidgin )
-REQUIRED_USE=tremor? ( vorbis ) mp4? ( aac )
-SLOT=0
-SRC_URI=https://github.com/cmus/cmus/archive/v2.9.1.tar.gz -> cmus-2.9.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e43b2d3f9d4da8e3a21f06d1bfb4f543
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.7 b/metadata/md5-cache/media-sound/fluidsynth-2.2.7
deleted file mode 100644
index 500c6026c53f..000000000000
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specifications
-EAPI=8
-HOMEPAGE=https://www.fluidsynth.org
-INHERIT=cmake-multilib systemd toolchain-funcs
-IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/3
-SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.7.tar.gz -> fluidsynth-2.2.7.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=81bbb0455e8a4c9bc1b7c1c42ff27744
diff --git a/metadata/md5-cache/media-sound/mpg123-1.30.1 b/metadata/md5-cache/media-sound/mpg123-1.30.1
index 0aa3923dfaba..f880b5bcf05e 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.30.1
+++ b/metadata/md5-cache/media-sound/mpg123-1.30.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.30.1.tar.bz2
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c399a29d61ff4ea1533b0296fd9c8ba
+_md5_=0ad937463ea4492c5e8e62a77a3e88e6
diff --git a/metadata/md5-cache/media-sound/picard-2.8.1 b/metadata/md5-cache/media-sound/picard-2.8.1
deleted file mode 100644
index 8e6831b7849b..000000000000
--- a/metadata/md5-cache/media-sound/picard-2.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( dev-qt/linguist-tools:5 ) test? ( python_single_target_python3_8? ( dev-python/fasteners[python_targets_python3_8(-)] dev-python/pyjwt[python_targets_python3_8(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] media-libs/mutagen[python_targets_python3_8(-)] discid? ( dev-python/python-discid[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/fasteners[python_targets_python3_9(-)] dev-python/pyjwt[python_targets_python3_9(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] media-libs/mutagen[python_targets_python3_9(-)] discid? ( dev-python/python-discid[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/fasteners[python_targets_python3_10(-)] dev-python/pyjwt[python_targets_python3_10(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] discid? ( dev-python/python-discid[python_targets_python3_10(-)] ) ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DESCRIPTION=Cross-platform music tagger
-EAPI=8
-HOMEPAGE=https://picard.musicbrainz.org
-INHERIT=distutils-r1 xdg
-IUSE=discid fingerprints nls test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( dev-python/fasteners[python_targets_python3_8(-)] dev-python/pyjwt[python_targets_python3_8(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] media-libs/mutagen[python_targets_python3_8(-)] discid? ( dev-python/python-discid[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/fasteners[python_targets_python3_9(-)] dev-python/pyjwt[python_targets_python3_9(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] media-libs/mutagen[python_targets_python3_9(-)] discid? ( dev-python/python-discid[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/fasteners[python_targets_python3_10(-)] dev-python/pyjwt[python_targets_python3_10(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] discid? ( dev-python/python-discid[python_targets_python3_10(-)] ) ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.8.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fe1541f38e0d6d82a4098da2767501ac
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b30b64cc26f7..0a03402a8e52 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/zabbix-4.0.41 b/metadata/md5-cache/net-analyzer/zabbix-4.0.41
deleted file mode 100644
index d18abd7090cf..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.41
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mbedtls? ( net-libs/mbedtls:0= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
-IUSE=+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mbedtls? ( net-libs/mbedtls:0= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-SLOT=0/4.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.41.tar.gz
-_eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=e7e73b54365e9288b2c98859a6ee4b4f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.24 b/metadata/md5-cache/net-analyzer/zabbix-5.0.24
deleted file mode 100644
index 671993b0e33d..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.24
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/5.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.24.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.24-go-deps.tar.xz )
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=956ef8bb3ec53a40bc7b1f67973718cb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.5-r1 b/metadata/md5-cache/net-analyzer/zabbix-6.0.5-r1
deleted file mode 100644
index 6773c3ae06c8..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=8
-HOMEPAGE=https://www.zabbix.com/
-INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
-RESTRICT=test strip
-SLOT=0/6.0
-SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.5.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.5-go-deps.tar.xz )
-_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=cb48f916e3859b09c67240213b520a16
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index cf2decaf2d55..4a3cd177ae4f 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/octave-7.2.0 b/metadata/md5-cache/sci-mathematics/octave-7.2.0
index cc5b968bfb98..704290f0c70c 100644
--- a/metadata/md5-cache/sci-mathematics/octave-7.2.0
+++ b/metadata/md5-cache/sci-mathematics/octave-7.2.0
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-
 SLOT=0/7.2.0
 SRC_URI=mirror://gnu/octave/octave-7.2.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=57576aca6dd24d6f777faac4ff4d201b
+_md5_=17877dc1db57dc7434c8c8861c8eaa5c
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 672d6b5faed7..e63d471ec13c 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.14 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.14
index 6d3bfe6b1db3..133d31eca28b 100644
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.14
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.14
@@ -4,11 +4,11 @@ EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
 INHERIT=toolchain-funcs
 IUSE=abi_x86_32 abi_x86_64 custom-cflags
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86
+KEYWORDS=-* ~amd64 ~arm arm64 ~ia64 ~riscv ~x86
 LICENSE=GPL-2+ BSD BSD-2
 REQUIRED_USE=amd64? ( || ( abi_x86_32 abi_x86_64 ) ) x86? ( || ( abi_x86_32 abi_x86_64 ) )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.14.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3329ddf719d553ac3ec9dd63905a994a
+_md5_=995a98b00df4798a77124adfdc127367
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d8266177b8a0..73491e16251c 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728
deleted file mode 100644
index 74988feba528..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220728
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220728/gcc-10-20220728.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f9494e9ea2250da4afa1087c0a916a9f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220721 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220811
index c3316fe1dbf8..2e603ba7c905 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220721
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220811
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220721/gcc-10-20220721.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220811/gcc-10-20220811.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=f9494e9ea2250da4afa1087c0a916a9f
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220722 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220722
deleted file mode 100644
index e04c24bca445..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220722
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220722/gcc-11-20220722.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=06647a8d13e5a26b05ccceb62d37a26d
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220729 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220812
index e44e10447ca5..ff46e71925d0 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220729
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220812
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220729/gcc-11-20220729.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220812/gcc-11-20220812.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=06647a8d13e5a26b05ccceb62d37a26d
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220723 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220723
deleted file mode 100644
index 63fb0244a98b..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220723
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-KEYWORDS=~loong
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220723/gcc-12-20220723.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-6.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0d7a92302649bc2c9b79b7eef60af7b2
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220730 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220812
index 35d8a29a44db..f982318714b0 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220730
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220812
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220730/gcc-12-20220730.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-6.tar.xz
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12.2.0-RC-20220812/gcc-12.2.0-RC-20220812.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-6.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c1e9c94494ab4cc4b37d34cbb27b2bdf
+_md5_=3fd5717ce00aff4dfc5002aae706828f
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.9999 b/metadata/md5-cache/sys-devel/gcc-12.2.9999
index 34110a4a92fa..62cb416626af 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.9999
@@ -13,4 +13,4 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ab5f14afca3a4b0335f166d80d8f305f
+_md5_=643414b4abe5b2689f197b816e297dbf
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220710 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220710
deleted file mode 100644
index 90d735e40604..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220710
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-PROPERTIES=live
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=13
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20220710/gcc-13-20220710.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dec02a828d26074fc5bbab4076f1f284
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220724 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220724
deleted file mode 100644
index 07ffe8eb230b..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220724
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-PROPERTIES=live
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=13
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20220724/gcc-13-20220724.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dec02a828d26074fc5bbab4076f1f284
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 3b99f7cffb5f..4000367d6444 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2022b b/metadata/md5-cache/sys-libs/timezone-data-2022b
new file mode 100644
index 000000000000..c98f6ef09f21
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/timezone-data-2022b
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare test unpack
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=8
+HOMEPAGE=https://www.iana.org/time-zones
+INHERIT=toolchain-funcs flag-o-matic
+IUSE=nls leaps-timezone zic-slim
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD public-domain
+RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2022b.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2022b.tar.gz
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5457ce0b6cde23f3f1eea638bc82bf8d
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 5c8c9e5e123d..f958b1eed0e1 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-1.0.0 b/metadata/md5-cache/xfce-extra/xfdashboard-1.0.0
new file mode 100644
index 000000000000..afb8a26ae224
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-1.0.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
+INHERIT=xdg-utils
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/1.0/xfdashboard-1.0.0.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=23343154aa450ecc7e74ca17a8b14a5a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0bb58299e951..209a88d71464 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-13T00:39:39Z
+TIMESTAMP 2022-08-13T06:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL28stfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL3RytfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCBnQ//S56lNFUOdDliPaPgh415/xNj3umWkdAbDdtQp8mWzI4yLJezi0kjEwg1
-1oWI0ieuBirpzltr3du1V0WZY2NDkOr5o+tcNlbXgd1JNxJdAUa8rmmTwytoZfM8
-SAVJrLZ3+sTKIPJ0eYaTs3ZvKCdnWZcChcd1jUDkY2FJ7AhDhD4g2hOLfzSxtp38
-KuRzTgKqJxN/aRXRP4TqqN0C9WDWHPLb2VAjxOrV9d7CKdBFFE23rtn4H16OtyIO
-H3WG8h6dHl/2xCB5JJEjkp/6r7smWFplczUZHOw1CEjVceOCoA5ZSO9KoPdENTuN
-3jpcK2zlTorK5t79eda9nvJgZbDy+92Lc5fHqVdcqrpGwOLMAufvUDh5ntYqKBhx
-rwyZ9/9b8uwiCyPEjMFMYsobyV2IOmNXR38X1yaWxhQObXW4xogArqo5MiCYVPlT
-/5eUKDETW+TO6Pgx84J3qv0uMVal48H7WJ+yn41y5KDEwhJpz5MStxXYFcfuEeY3
-spvtSHfHW27kVdKehiJD0/guV8CT1LEPM+yTc6QCTCD8VLqiZGyBtfiAnVLrsIV8
-Tql0jvjPJyoKI392I03vEEGMamR1sUcWmj2n23c1jCeUdajEiAvQbGCt9+6Qk5bc
-hhDLWpPhdVtqd4Sda4tYmHYTR5HgbFKvis3A0sA+qo4txNAyw10=
-=mG7i
+klBNixAAjpVNQ3DbwN/C8oMTDpiR4s/ekZhiZVwTUXAsoqac/cU+27dKwzY8Xn3a
+I2HAzLXieMN34KLDr3JSwzybYJ7Zi6ZxfaKr/AjK6vyWe8+mXidJs6tIXZCYBZq2
+Wz5WzeINhdkLWo4uecCYaYuMkQZfOITQOOv/u2CAWEzyGPTxwAMPoMaz7f5t9M+3
+y2y1v7NXmQNK+dtChZ1ZzST1dqFuRHqkDFCKdkQh84jA7JglSXtAWI/CKPY+Gr71
+628z7u7uEm3tkBfv5x5tvMnTv+BxC1iAdPHpwiGnuZoNqRMWIzZ48irFu5eL/0dG
+vW9w4QSpkM3VqEXhkTGGl0psVU1d3Ui49Ql3huq9kIQuKAvToZJU9t8+xFW1vhHg
+32wHZl2+oj6Y7ig5F9e7J7d22514AzB+oim4m3KWMELc7v6jiNJGKGfmBJIKDw/s
+PpefCArMm9364g4Na0nbsbRnribV7wUs4u2KQ+h7Oj1s6pn411zD5Hl080n6YLGx
+O2gEWWYWbolZ9EC5r+rRwhjm2DLvuPqPd7OJroxt7C4+VRgxGVDY6AgHqVv41zSH
+w8/h0z+rJIUqyrYcSQWtVMaHNkjoKE7bhDmnzGI85rnPC6JQXCy/Dumu5VTaNQPA
+PAENxpZ3ICdkWUX30jT1/Giyk+8QiQ6nI3sDouQH4cHvb8IJYtI=
+=8QHB
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7a357675b3e4..17cc9e3fcd0e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Aug 2022 00:39:35 +0000
+Sat, 13 Aug 2022 06:39:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9928a325eac1..21cb11d292c0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Aug 13 12:39:35 AM UTC 2022
+Sat Aug 13 06:39:36 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 61785411f2fc..c4b305f0d42a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Aug 2022 00:45:01 +0000
+Sat, 13 Aug 2022 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e372c6ea84f6..ef95c69a6d24 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-372ba908ebe1304afb21b4197ab621f57c9d59d7 1660342408 2022-08-12T22:13:28+00:00
+429a31da893b5f60201d77308f4e32eb75c271a4 1660371437 2022-08-13T06:17:17+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index aef71e59fc0e..56c48634fa0d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660351201 Sat 13 Aug 2022 12:40:01 AM UTC
+1660372801 Sat 13 Aug 2022 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7a357675b3e4..17cc9e3fcd0e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Aug 2022 00:39:35 +0000
+Sat, 13 Aug 2022 06:39:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index df87f5c985b9..e649a7b807b0 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 4792ce6ce56f..3bcab997ad3b 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -16,17 +16,12 @@ AUX zabbix-proxy.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5ce
 AUX zabbix-server-r1.init 598 BLAKE2B 53026be133378595e83de14f939eda655d871f8caa524bf3c6496da77dcf4582a287e4365737317d710e8488ad93164eaffc5e5eca4d78f05cde820cc519d8c7 SHA512 c18e454b8944572af737052156c5985ebfa35504be43aad0465b4fa48108e9e60cf3a1326480762b89263df0d495fc793a45faea24de62f337ad2bcf57eb75a4
 AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2ef61de4715c25b0e0c97a627e6735a67c4114484950f0334fffa344d94f9192ada63887a21b617122eaf0d SHA512 d20fa4aa3a545d2f36388d7cac78c70c5610f5e7529348447e6fa6bacc33f42dd6e1c37c50b1c2711900a3f29bbbbb0ebc7c54f04d3de717aadad48e18c46e28
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
-DIST zabbix-4.0.41.tar.gz 17641873 BLAKE2B f3bb40e78662c68f0752233a72ad71d2a7ffae03a0e334736c0b9037fe3566d1b3c4c09fd3183456ae3266ac84f2cbc57c73d5e0e1853f86ebd8eafc42e0b4bb SHA512 7df356c6e99a94876abd05e708eb350448593018017eb2e3434403505a48651ddd6b40b69d84bb49b8eed5cb945c2b974fd44b85dc27fc5c3141d1cdad1b371f
 DIST zabbix-4.0.42.tar.gz 17644927 BLAKE2B 1cc80aafa2a8a556c14e5675a550307b532c01433eb3892889964b9de90e1bd05456c20da6854f149e297c88ffc7f8e165ff593652759e00836418482458f014 SHA512 80993c0cc2b0235407f3b11089a1700e90db892a732194297d893caf951f360cd4777a7e2146fed8e314b71f170c49ed2c4c271e3c3e888e55998bbf7308f0c7
 DIST zabbix-4.0.43.tar.gz 17648025 BLAKE2B 1dbe0c8691d990278bcc540dcd57d7640a3d832021a9ec416dd67857a3e6e0724659ca13c6c59482e45e772cdb3c22f66810d0111e59d0371ed37f3d8b61275b SHA512 5d7f81a2e7dd8d060ab46c37622b4b73702d208e065bd99022f6c7e9598f2230b89347e73864238861eed7747d5439221ed1e4cc7ac99bf1e990d9550612dd7f
-DIST zabbix-5.0.24-go-deps.tar.xz 34371892 BLAKE2B 273978d3a4dd46e4d41d892f3217ae2ee0d2bfe9bed753283b5fdf3a13e6cb8f912a4726b92cc2637cb8103c63141f24d3c49c884f54598a9c4d99bed3830552 SHA512 bfafb96c6d69ad2c775add9392117c384a633b334ad447e1ec61cf6f01bd72ded0870d778650ff18a912f6ca3bc98f581052464353b22350eaf724bddc29f8d8
-DIST zabbix-5.0.24.tar.gz 21296805 BLAKE2B 16c3fe6ef0732d627c70555b80961308ba9049978efc51c44162e5ceb940369ce36f87f33e6725de789c97d29edb2d0b4c2b2e58ac56a95e1b644cff13d2f64b SHA512 5ad70fdd189ce2630c019df6edad70fbfa7d2b0f72b42ae1950fb844f3edadf87c3108eefa7f3d343d4c3464d8aa58036dfbcab4109682d40b455788019dd62b
 DIST zabbix-5.0.25-go-deps.tar.xz 34381664 BLAKE2B 2da35cac59efe069587ad8217385cd276be340e9f0c37483c1a3aa500b03e0139122ca75437a1646fdb3d26ff7a824160d663cff758cf0a91fb08252606640ac SHA512 625f0cdde87cff17bfb2e348a03ffab5374a5d7657c1510abeda5e0a313658625eda946474bc7b7bf7a778d8cf0b498215f9e26ee2c72c6456e87065071ec0ac
 DIST zabbix-5.0.25.tar.gz 21300141 BLAKE2B 271d10a051b08d5d172d312b48a077e600856cef954201b0c11b1b4e96c70681ebe82e382893689199f6567922ed2e08b3bb534b77ccf1eed099049ccf45002e SHA512 b66776f2ceaaef7c3b74cb47b99d96dcdb614cdae2f54d096046c2aeeb82c8c9c65ca17c95773551bfa867113ca36b29acb72a9102f0ccef930c16f0a4997774
 DIST zabbix-5.0.26-go-deps.tar.xz 34385532 BLAKE2B a52924f8bee464deb6f6812242c0d7d987e7b46d097f0a118e2cb429d6d3d26f8e116d66e594a26e22bc5bf81997d21fb66ef97151538a814f63fe2c55a7f729 SHA512 49727ccd5e26d28e577fe9ee1d7eaa2de3d5054e831ea82e5dc9d8177c63063cf957b575072c5dc68b294763d519fff9041700e2dc267394e6ec143d272b1dd7
 DIST zabbix-5.0.26.tar.gz 21248951 BLAKE2B 9119e66acc71f5ed8baf07b6bc90a69152188e1e74058146a9c7eef7d36fc9f0363a5635518bdb696b76fb93c9777878b8d4411853c641dec809e86cba4cfa74 SHA512 b10b3eb849ea3646aeaf3d2a1dbf639e6effbd21a23c06e4f2686a177d2ae186537607ed0a76c3f520cb84f3bba3079f5d9f7e840077cf5e1a3eac4b46f0558b
-DIST zabbix-6.0.5-go-deps.tar.xz 36045828 BLAKE2B 71827dfb5313b986ed23c5c1d7a99a020feabe81b6ee8c7c13d7fda40ce8f5f6d7de26a05daba5fa2e589fc2577f2bcc0961d4f8f0881faaaa986f13e4ae0a16 SHA512 6c8f6731cc29df4d5870cfab71c809e5c844ebc88649b9d25fb6ef7c3671e2a247aad1a24dcaa4cbb35039cce57cfabfa7ac56473bd5b9317bb5ecaa0cbd2d53
-DIST zabbix-6.0.5.tar.gz 33778804 BLAKE2B 5bc2c370895c4744b6deb9d7c0501d890ffb2c343992ca2cee25872e29f0465e808905bf1a9c86749a2bfe56fa05aac521c1cff0549686426e7bd412dbd9ce58 SHA512 c4a431ba9c22ccb59c6eaac4147e40390e5e9a1f7a13638f2daa3dab3a75145104e711585b374eed0e663a3dc495d4b3b74c78b7676baafbfcca983f645054e8
 DIST zabbix-6.0.6-go-deps.tar.xz 35349508 BLAKE2B 14aa70142d19d1ad146d5fab6208b1133a35796a67c6dd709df2fa7a00b013229ff852e58384ca01ed3c5feeb7f697da91d7096839e2434f3b5fe89b6f315cbb SHA512 5864e268e7432cd04f389c4e6be6c871f0de402ccc0c846900daa1d77389e2839bbe1d225fcf2ac50d6052014e1efe3c8da8b02d83f46a411210edde39ed372c
 DIST zabbix-6.0.6.tar.gz 34013189 BLAKE2B f9d07ca8938ae4e5e47048c32872644caeda0ecdef17513c63c63d1ce2aaa4ac0c92e6c70932bc598ff908419dae05bab32924f5973a5528b5668f7c7c2c5a17 SHA512 4fc21f54cdfc09b5627a8e8dbe77ac645be7f3d3a0f18fc940cf136d05410ade755c3b4869254a47e9e316dba2b5da6b709a20a023b9cd765ad16094efcded43
 DIST zabbix-6.0.7-go-deps.tar.xz 35327308 BLAKE2B eb95964650a58bd300218888e9207f3feb25e9e0c87ed459446d6494bc2388d21d501e73ea8e0a99e4feabbd6d6c12d18c11b096cc6dc1fb534acbe8b3b353ac SHA512 eff9ec6c170279aa228b05a83c5f1bb8d793216189575180d05255faf6a6062c2ab6366ff4aa4e2cd092636a984e6658be47c404628d24dbee209111d28a516e
@@ -35,13 +30,10 @@ DIST zabbix-6.2.0-go-deps.tar.xz 35398044 BLAKE2B 8f7a7ec5b806a22f2f1a6b652c7cb2
 DIST zabbix-6.2.0.tar.gz 34472773 BLAKE2B 2b90937f453825ba240d776a279d9bb4958c15da6cbef68c4c62bf4312c7967d8b7e0b3561d022c663ba8b42545bfd5757241c4ef13cc53b78c8135306e71e70 SHA512 4492dbd7c7acb55827ee17e7eee579d1cfdcf5fd499505c6e24f50ea361641a0813672149a87f076b2287896d56d8d0215d8c5e78b32b684386414024624d322
 DIST zabbix-6.2.1-go-deps.tar.xz 35335980 BLAKE2B 07af6563a9349aa70bf5c258c949ebea520e191088e41e546e0f0cf139fd8f3d47d1d64c6135ed36851269fd0e5cd7b7e52d0d25ccd6fd1ed0108f60daf7cde0 SHA512 146a3a4dc2d49b4d1f48f2f3e38f1d123860d4854c5b4a696c07649141cf6de4b076751cb99582688518b060100a0b740357921177b5340ea4b9426480051360
 DIST zabbix-6.2.1.tar.gz 34776549 BLAKE2B 4952f81936e999c03b8aa71cc370ddc7fcea7f3951bc403501c3617748ecd81a10c5bfe9f80ff55a2521e6b874c50463aa61151ea30ddd6a7b46b20b5e24b645 SHA512 cfdca2a34fecd31ff6f58257abc695e9aba3eaeefebd66f8653b5999e3b650e5ba94d036fc5b9d8e03a1cf532d5f76b1d36a3a9759831707d88ebbe37dc20fc5
-EBUILD zabbix-4.0.41.ebuild 9414 BLAKE2B b0abe7853c37cd78b5c2176eaafb891407b2a0cd9e7dea933d313a6f0f71188f59d1c86951bed73c445c954215bdec48fce47373d842d5e1cc6268e0e1b678c5 SHA512 509a7802245e0605ebc5424806594fa8ff9d73af492761f65a70985a86236f367358d40c67f1ca644647d5c4930b48f3351b4daae53cc2a39b89a79decac925e
 EBUILD zabbix-4.0.42.ebuild 9414 BLAKE2B b0abe7853c37cd78b5c2176eaafb891407b2a0cd9e7dea933d313a6f0f71188f59d1c86951bed73c445c954215bdec48fce47373d842d5e1cc6268e0e1b678c5 SHA512 509a7802245e0605ebc5424806594fa8ff9d73af492761f65a70985a86236f367358d40c67f1ca644647d5c4930b48f3351b4daae53cc2a39b89a79decac925e
 EBUILD zabbix-4.0.43.ebuild 9416 BLAKE2B c594ca9fb069ef5dc5ef2dfa4f5136e0a66257dd171b056a9073391451b4742e04d4bb38da379f0c0998a30d3a1c0ca8138f62909bba57ba06cb4130521f9b0b SHA512 a650f9c0496c8e2ffd76bd2e1b37071c097aba69f6bb71612570fca5c71049b8f51e3865152205e73c1889a2b1fbdaca192c36109ab1ebd111698f0f90b1eebd
-EBUILD zabbix-5.0.24.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
 EBUILD zabbix-5.0.25.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
 EBUILD zabbix-5.0.26.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
-EBUILD zabbix-6.0.5-r1.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
 EBUILD zabbix-6.0.6-r1.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
 EBUILD zabbix-6.0.7.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
 EBUILD zabbix-6.2.0-r1.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
diff --git a/net-analyzer/zabbix/zabbix-4.0.41.ebuild b/net-analyzer/zabbix/zabbix-4.0.41.ebuild
deleted file mode 100644
index b6f830af64d9..000000000000
--- a/net-analyzer/zabbix/zabbix-4.0.41.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	?? ( gnutls mbedtls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mbedtls? ( net-libs/mbedtls:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with gnutls) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mbedtls) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with openssl) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2) \
-		$(use_with xmpp jabber)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-5.0.24.ebuild b/net-analyzer/zabbix/zabbix-5.0.24.ebuild
deleted file mode 100644
index 901c486faa9c..000000000000
--- a/net-analyzer/zabbix/zabbix-5.0.24.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		dev-libs/libpcre
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable agent) \
-		$(use_enable agent2) \
-		$(use_enable ipv6) \
-		$(use_enable java) \
-		$(use_enable proxy) \
-		$(use_enable server) \
-		$(use_enable static) \
-		$(use_with curl libcurl) \
-		$(use_with gnutls) \
-		$(use_with ldap) \
-		$(use_with libxml2) \
-		$(use_with mysql) \
-		$(use_with odbc unixodbc) \
-		$(use_with openipmi openipmi) \
-		$(use_with openssl) \
-		$(use_with oracle) \
-		$(use_with postgres postgresql) \
-		$(use_with snmp net-snmp) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssh ssh2)
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		dodir "${dir}"
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-6.0.5-r1.ebuild b/net-analyzer/zabbix/zabbix-6.0.5-r1.ebuild
deleted file mode 100644
index 0a0d755be321..000000000000
--- a/net-analyzer/zabbix/zabbix-6.0.5-r1.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-#   cd src/go
-#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
-	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
-	?? ( gnutls openssl )
-	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
-	server? ( ^^ ( mysql oracle postgres ) !sqlite )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	gnutls? ( net-libs/gnutls:0= )
-	java? ( >=virtual/jdk-1.8:* )
-	ldap? (
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls:=
-		net-nds/openldap:=
-	)
-	libxml2? ( dev-libs/libxml2 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	odbc? ( dev-db/unixODBC )
-	openipmi? ( sys-libs/openipmi )
-	openssl? ( dev-libs/openssl:=[-bindist(-)] )
-	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
-	postgres? ( dev-db/postgresql:* )
-	proxy?  (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	server? (
-		dev-libs/libevent:=
-		sys-libs/zlib
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	sqlite? ( dev-db/sqlite )
-	ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/zabbix
-	acct-user/zabbix
-	java? ( >=virtual/jre-1.8:* )
-	mysql? ( virtual/mysql )
-	proxy? (
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	server? (
-		app-admin/webapp-config
-		!pcre2? ( dev-libs/libpcre )
-		pcre2? ( dev-libs/libpcre2:= )
-		net-analyzer/fping[suid]
-	)
-	frontend? (
-		app-admin/webapp-config
-		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		media-libs/gd[png]
-		virtual/httpd-php:*
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		curl? ( net-misc/curl[static-libs] )
-		ldap? (
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-			net-nds/openldap[static-libs]
-		)
-		libxml2? ( dev-libs/libxml2[static-libs] )
-		mysql? ( dev-db/mysql-connector-c[static-libs] )
-		odbc? ( dev-db/unixODBC[static-libs] )
-		postgres? ( dev-db/postgresql:*[static-libs] )
-		sqlite? ( dev-db/sqlite[static-libs] )
-		ssh? ( net-libs/libssh2 )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	agent2? (
-		>=dev-lang/go-1.12
-		app-arch/unzip
-	)
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
-	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
-	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_configure() {
-	local econf_args=(
-		"$(use_enable agent)"
-		"$(use_enable agent2)"
-		"$(use_enable ipv6)"
-		"$(use_enable java)"
-		"$(use_enable proxy)"
-		"$(use_enable server)"
-		"$(use_enable static)"
-		"$(use_with curl libcurl)"
-		"$(use_with gnutls)"
-		"$(use_with ldap)"
-		"$(use_with libxml2)"
-		"$(use_with mysql)"
-		"$(use_with odbc unixodbc)"
-		"$(use_with openipmi openipmi)"
-		"$(use_with openssl)"
-		"$(use_with oracle)"
-		"$(use_with postgres postgresql)"
-		"$(use_with snmp net-snmp)"
-		"$(use_with sqlite sqlite3)"
-		"$(use_with ssh ssh2)"
-	)
-
-	if use pcre2; then
-		econf_args+=( --with-libpcre2 )
-	else
-		# If pcre2 is not enabled, then use the old pcre library.
-		econf_args+=( --with-libpcre )
-	fi
-
-	econf ${econf_args[@]}
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-	fi
-}
-
-src_install() {
-	local dirs=(
-		/etc/zabbix
-		/var/lib/zabbix
-		/var/lib/zabbix/home
-		/var/lib/zabbix/scripts
-		/var/lib/zabbix/alertscripts
-		/var/lib/zabbix/externalscripts
-		/var/log/zabbix
-	)
-
-	for dir in "${dirs[@]}"; do
-		keepdir "${dir}"
-	done
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
-		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
-		dosbin src/zabbix_server/zabbix_server
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-server.service
-		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
-	fi
-
-	if use proxy; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_proxy.conf
-		fperms 0640 /etc/zabbix/zabbix_proxy.conf
-		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
-		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
-		dosbin src/zabbix_proxy/zabbix_proxy
-
-		insinto /usr/share/zabbix
-		doins -r "${S}"/database/
-
-		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
-		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${S}"/conf/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
-		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-
-		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
-		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
-	fi
-	if use agent2; then
-		insinto /etc/zabbix
-		doins "${S}"/src/go/conf/zabbix_agent2.conf
-		fperms 0640 /etc/zabbix/zabbix_agent2.conf
-		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
-		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
-		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
-		dosbin src/go/bin/zabbix_agent2
-
-		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
-		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
-	fi
-
-	fowners root:zabbix /etc/zabbix
-	fowners zabbix:zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-1.2.9.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-1.2.9.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.7.32.jar
-		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
-		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix"
-		elog "if you have not already done so."
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		tmpfiles_process zabbix-server.conf
-
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-
-		if ! use pcre2; then
-			ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
-			ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
-			ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
-		fi
-	fi
-
-	if use proxy; then
-		tmpfiles_process zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		tmpfiles_process zabbix-agentd.conf
-	fi
-
-	if use agent2; then
-		tmpfiles_process zabbix-agent2.conf
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
-
-pkg_prerm() {
-	(use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 06cfe574f496..26bd3b74becc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/loong/package.use.force b/profiles/arch/loong/package.use.force
index 1b1948517b25..6314c2c732c0 100644
--- a/profiles/arch/loong/package.use.force
+++ b/profiles/arch/loong/package.use.force
@@ -1,13 +1,20 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-08-13)
+# Force the host target
+#
+# Some packages are not fully ported yet, but preemptively added so we won't
+# have to revisit later.
+dev-lang/rust llvm_targets_AArch64
+dev-libs/keystone llvm_targets_AArch64
+dev-ml/llvm-ocaml llvm_targets_AArch64
+sys-devel/clang llvm_targets_AArch64
+sys-devel/llvm llvm_targets_AArch64
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-04-24)
 # Force-enable experimental-loong on packages; we're loong.
 dev-libs/libffi experimental-loong
 sys-kernel/linux-headers experimental-loong
 sys-libs/glibc experimental-loong
 sys-libs/libseccomp experimental-loong
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
-# gcc-12 is live ebuild for now, hence requiring this
-dev-vcs/git curl
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index bde5ee432ab3..eb422a546581 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index d292fa6e3ca9..771b3b540cc7 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -9,5 +9,5 @@ DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.4.0-r3.ebuild 6044 BLAKE2B a5e0e0acda2c545beb02b59ba6b11356de65bf9384c736db3b1d44d4961a2272184e451fbb37b8530a0b7bce73d07db821b5519b776a43f600cde3564ae2887d SHA512 bd08da458ea2a6a3eb5aa745b25b3c47b3eb5ff34332fd0387863e480805ff984f9872b970b0e0770edbd8adb233b8a4ac2b541218cd87eb9dbba4e8c8fedc0e
-EBUILD octave-7.2.0.ebuild 5863 BLAKE2B 9403f9d11353ebb2e7e0b8c644e94822c9ba332a6d0b8a54c213591241fa31d5d0dfc123aeb0ea9f205a2f268a95fe9a5b2dff956ca81f8d2bd56b42bed647f7 SHA512 8f6206155e8cfeee388237a2920c8102e954c22d2bfb8a86c9926d5c719d4bfb3546987149a5a6f2e5e0aa068b391c13711f3f17a766208e7c027a85b7f5eb85
+EBUILD octave-7.2.0.ebuild 5809 BLAKE2B 50dc96ae6f873f74e8cc00eb5e432c300b81e8e78ee89a9b54b6e0d8b7a68a1ca0591e1697aca7bc2f1d55687f419a86c3839f25f29e302058ca839cfab8bd6a SHA512 e8487115235d4a31ae44c342b52ef0e1be75771fb69e8811ee4531c3f4201f9a040b4f095beca6dec1813e6f091fb907c2fedd575268e7dabfe631940274b899
 MISC metadata.xml 1262 BLAKE2B 39736c6913fb3241bed38c5dd9218190d570a3e914a01d1d06fff2cdd68c3c07296a19e2a35305a67aa776a12636445e523b3e349daeffbf67ab60b074a25fed SHA512 177539fd369e2eee0db21ef46d64f8e9f30b39eb4648c5224ff221465c55cd554ac142940f32171ec36b9561b68243761f4e3cbcfb6b06896d45986cbb568c82
diff --git a/sci-mathematics/octave/octave-7.2.0.ebuild b/sci-mathematics/octave/octave-7.2.0.ebuild
index 5ae855cdd7e0..f6b2f628e13d 100644
--- a/sci-mathematics/octave/octave-7.2.0.ebuild
+++ b/sci-mathematics/octave/octave-7.2.0.ebuild
@@ -203,8 +203,6 @@ src_install() {
 		doins doc/interpreter/macros.texi
 	fi
 
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-
 	use java && \
 		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
 
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 73d99e7b3a5c..5ab1d4e3abf7 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 9addcf737161..886c1287bacc 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -3,6 +3,6 @@ DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56
 DIST gnu-efi-3.0.14.tar.bz2 159295 BLAKE2B c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2 SHA512 37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c
 DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f
 EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
-EBUILD gnu-efi-3.0.14.ebuild 1914 BLAKE2B a56a217406b98741e472504df0e7e5ad33d6b3ba40cd1ea7f78378b6151e9134083d9b43635fd8b76855a717742a3553ddf94bbf89b648e65cebfa8b7d2fb3cf SHA512 a08046a2f8a309d692d3ec5b65f84cd35633ac2ba40b51024c69aa2e583bf2f99790566b92ccad993a289970384c814e536e505ae21cdfeaf31764802e1127c4
+EBUILD gnu-efi-3.0.14.ebuild 1913 BLAKE2B c36d7ac25e4824cd817f2ce3fdc33f5d66fc1019fc601a993a440f6be0566a7be3ee84ad700429d34a501ff16c3c6c6392d1f59d18bb009aa316def1917d366f SHA512 f836a99bc8776f02208b39adc17f397f0338131a03fe13d604e0a215185962ff057607f41f90fb027bae065794dc198aabbbdae24c1477ae1c42e604723ecfb3
 EBUILD gnu-efi-3.0.15.ebuild 1914 BLAKE2B 93733f6975a473250018f18a819e499bc4310bd377cd2f3ced29e5e7c774c78dfdb7895ba145db163d80f4bc06667fcc04d2b3a39de24f9c2742c11265d668b1 SHA512 91120cc3b186b57332e75742441c242244849f1182fbcab2467318f71641647ac599bf047af5108723045de7ef739ae2db8163cf3b58888a4ba8cbf4150b7434
 MISC metadata.xml 324 BLAKE2B 7eff39b7405a7a2e574ca870890052a58dfcf612d2a5057dffda9aa7d674ead8884acac2bda143586d8d20000cb4e9e35f044fd2618386c7f4577d8014b899a2 SHA512 9ee2a23d2c9ac583a55b2e2d92652121f4ff11f8f40a0caa13d5a52fa61259814044ec106b46be0cc741cbdf68414c55c4da96b46328a96f5a1ec1d0e1fa11d6
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
index e3a8a8bf07f7..8b94c109e0b8 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
+KEYWORDS="-* ~amd64 ~arm arm64 ~ia64 ~riscv ~x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 REQUIRED_USE="
 	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9b69c78847a7..0e13b27ec26f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index b9c0cbd034cf..3a7c911ce667 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,9 +2,8 @@ AUX gcc-11.2.0-cross-compile-include.patch 875 BLAKE2B 92ed84f2b75dd88c73ca115a9
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20211126.tar.xz 71674848 BLAKE2B 81f4a572e973db7a3701601e66ea58c8e535a55d4d4ac164de00bdb06f7f265585f45d46171cf40d42ebcd3fb02ac81b643398c560912698eb6c008ac6e09518 SHA512 db887184c649ebeede5a1b9f13c00fe425012434cb93ec960c3ca50c0bcdeab04a1cc13b20de21b940e5d6a09c3b1c7fc415110a0e990ec1d938627bf97b9342
-DIST gcc-10-20220721.tar.xz 71754392 BLAKE2B 389d1510a2d4b95a93da0a1ce0ee8e90d0fcec31f49cc13423a4091467eee07939a45e5e23afc1025fdcd02e2f19c509fd610e5d80b91fa124ef54a3fd8baf8c SHA512 9edc37823b556b1fb4d8e205e118a661cf0fcd06d08b78590b5fd694daac9bf5678ed1279d013e544085682c5426b8e1353d95627389df7f00d7008e3075774b
-DIST gcc-10-20220728.tar.xz 71758948 BLAKE2B 520d5234bf896749e66f36e6aa7a953d179ce8b407503f22f7dbe12f260df2a447a005f33d9277a800cc731c0b3261e77efdc1322aa42d451613ff7be237282a SHA512 95951e9a2738568578e8c80a4d806652f8cc90570d2b394fed1b748186af9ac3b79a1911007734f16d879861eccc12a47d852b7ae7b10e6c5cf483eb86792004
 DIST gcc-10-20220804.tar.xz 71755240 BLAKE2B e8c4cecc2aa5e2770718222a01c0b99ce03640871719838507a04acaad438a5d1482fdcfb0ba694dd683fe6f1a03dce1024870db727c4d7a118ecba0f1c8c44f SHA512 51c97a3b7b71e565a2e248e348f5c995779053d65cfab2bb32fecc130a50a2aec077653c5cc5a5d966a9af9b4b741909a4649a9fc6d2f17f6bb9eabb23dd65c8
+DIST gcc-10-20220811.tar.xz 71753800 BLAKE2B 3aa402b185da2e0ea9d262c561a72acc7dd801ea62ca4a8d7a3b053adc5a94dc9b7ecb657b782961505e907cded25bb28a3495d0b975f68fab5385bcc5d9dccc SHA512 cd6fa0673c3bdea1fe857529ec4c847f9306a4380def895b361e70202984bc5bac820b8a9f0d7fdcf9a39258c804fe556b567258aa7ee19b84849eef8a61801d
 DIST gcc-10.3.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
@@ -13,9 +12,8 @@ DIST gcc-10.4.0-patches-0.tar.bz2 15231 BLAKE2B f64a2e7f317acf9416da69c129ea8691
 DIST gcc-10.4.0-patches-2.tar.xz 15000 BLAKE2B 59a61f7de4b6d2338a8b4fbc88a8e55838d5fdce1bd906b798540839a7efca9b97024779b515df6a7673ee6908540834bc1f58188ed9ef311c51e1f351ed003e SHA512 e1c8f0bf9d64db3f84a6eab0f41ee848643a67ba6ab57df7a8267139928f6e292d95c5b4ed865ff8d9a80028bb07cec714d56438b97004cd2a27f111f1f336da
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
-DIST gcc-11-20220722.tar.xz 75784756 BLAKE2B 1bb107418b7479626e659ff462f31fa1f16fba784d586a672370cddc8912563ca62c0ccdae357f13e2225419b3d6cf1d998b83094619fe7a5e31964bda7b8a62 SHA512 a131deee631de6cab70285263450f35bd32452a4bea0952d96dfd92df65a5c1c7654a06c10ef181fa97dc1ab28c528cb0827ba8948b6eaef41daeb4a7cd5eacb
-DIST gcc-11-20220729.tar.xz 75779788 BLAKE2B f907d56813d651a05d0e24ecfe91eb5c68c90e588765488a3add20d06cc2988619f2259a1503224fa8385dfd54dfd0a5cf665cc6205671eaafe17be615d647de SHA512 c2d72b56bf8e9329260f7500b78fb089f039476c60434e3962b2a0605284943bb105651bc8cbc3588a3c400f857be85d6baef9e86b6334eba72230360082fe55
 DIST gcc-11-20220805.tar.xz 75780952 BLAKE2B bfd58ed253cccd932a34513a1d8e13f5c6a357dec8a0aaa4e8a9384f358f228ce49ae4e92b96b72f4f427732c5168bbb087f49a27633c0948d0c713d74ffde87 SHA512 7dd738ed4d6e3691682f7225ea7e115d9a217bd87808c212c58886d646c47c531376f24f0dc2d036bc62f7ad562ad090cbdc53fdf8becd976fb392063b9d5a7e
+DIST gcc-11-20220812.tar.xz 75781320 BLAKE2B f7776dcc0168cd0b624760deab9185b36e2f5718cdacb7cff911813791ed31321b34b5f14ee6e3264c61a95c5cd8cf80c93e6e80f6fdac5f49818e0f5c242486 SHA512 d2fbc18dcac84951c541d90a78719254429b133de05e4f6f37e3d3c160695ea5e2e6563cd78b90bdce29cb2e465aabe4215ec1262bb74c23eba2be57be074070
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
@@ -26,8 +24,6 @@ DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-patches-1.tar.xz 13956 BLAKE2B ff6ee1b81ad214e74a49c00b15767086c6b12b1566b42c4fb88778bfae3a8e319e42ffbcd8aa7f717b6f32bd966dc0da08be3a57a27992d9b90368622e7e2ff0 SHA512 3b9b641bb00b85fa88c87d8923ebcfb844125ff6149b998c565006173f4d68b0ccf8c1fec2c7bac0684584c61176346cee7373b165587a092bcd92ccb96c61db
 DIST gcc-12-20220625.tar.xz 79092788 BLAKE2B 491da523abc0a63bbceaa6c76b251a5b6c224e1684b5db4e6155fdcab4b0d8d505376d30a13e1b0331f37558aac311477bbb3179b63da850acae436b642c9ee1 SHA512 0527c6d69cd53e8aba3464746b7989e3128af74818864a2e5b4be66313203d32a84201440a254da8de72842b0ebbbccf1ec14c6a121cb09f9454358b0a37b8f9
-DIST gcc-12-20220723.tar.xz 79109408 BLAKE2B a15a800bcf664b7d113d4d6d56408458f288687f5441c808aa39ee96d3bb6cd09da24df985bfa9feb82afe32594dc0e072a32f04ea6fc8de6daf0a5ee1e7996c SHA512 314db1168c611cd978f41f292bd1a66892a7f1e07046746da764dc221c44100f4cd8e361325626539d8381b60b20b30f9eace193796cb169b6c1d7d108295233
-DIST gcc-12-20220730.tar.xz 79117832 BLAKE2B be7c1f579311ae56600ccd91f01fb878c2253d1edae455eee2ea39207cafdf3943d7f0aba8ac84e2458ffa2cfb763b46a9f1200b59874fcc518f633b26db2911 SHA512 8b33e49b1fe222738b9ddb715a4cd227ad11f854b104d85d5e9e500daef845d899c66281ed83c36886e7879e7662f199225f14291417d332fb6f144cb4a666cb
 DIST gcc-12-20220806.tar.xz 79120340 BLAKE2B bbc9e22b62a92231a9808267c51969da1014dda9a7afaf4077201570c115c0fae4d57d915f29b3f8888973b20736bb0977b9b5cae9e3f8718459e5102be5b024 SHA512 c36ed47a2c697b5d4f786a523091a64d4cf41e57acf337971640f536588811efbb2e23645b9c1e763f98e0c72923c8571ed151d12106326f41f0385732e5ff37
 DIST gcc-12.0.0-musl-patches-4.tar.xz 4456 BLAKE2B 80ae755b52c31d57eb737b3ec5e70d96e7e20f6720664cd94573b1c6cd079a0e29f73277c27b2f2570706da5239006dabd44f834824c515f6615ed5dc39c273f SHA512 cf917f40133d2b8090e98880e6c87d38129f44bcb454f4d707ef57967635a6fb571d7b85b7cb854421bc9aa88e48767a47aad99c767f9415899f97922d61c497
 DIST gcc-12.0.0-patches-5.tar.xz 9820 BLAKE2B cdebb6fa59e594f95cc4b028d329c0fed3ffa1731a4ca1a2954b7760f4a674e773cfe5888fb2c63a619d5d80ec464d98a94870bfe2e3ea34370afce7f67526bb SHA512 a9c27b0188fd842e88d6a831cdf1f9c6d0cada4ec260b5f7e67f3d8fe0f439fb0d2c82469de9fecebd657043babf3e63a24ee53776be2617bb90e1d3dd3f521e
@@ -36,8 +32,7 @@ DIST gcc-12.1.0-musl-patches-6.tar.xz 3840 BLAKE2B 5d8ce4dcebd081fae485d3e1367c0
 DIST gcc-12.1.0-patches-8.tar.xz 12020 BLAKE2B 6138ef4d76a682ecfd05ba7c80d8f5db791ea24420d944b7f55b8aa55e7a42d02c0d20d0c25ebba92cdf85fdeb3dad7c7e2676d4a39197862bb90cfc9151ce48 SHA512 d2784967ca580bdc9308bc4b2449eb23601aab46bfcca10f4e7db2267e04950e4d9ffe4d0091fb916149a4982786c80959a069e0da07638bfdcf9d5b8926627b
 DIST gcc-12.1.0-patches-9.tar.xz 12536 BLAKE2B ceb045b2a5c5a2a3047d73296fa1057421ef58c7f793d1f031f43dbd1a6faf49bdf1956e96a4f8e34c4d3fde2c26fcc9b146c223d8b1b3e1f944c2ec8574b786 SHA512 b899ec2d6da65df0f32838be3c89dbb1dc6b423133aa5121635547a1aa18b5d52b920e62522143682c0818baf185ebacb75ab84383ef0ad9768ba567807da5f4
 DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d SHA512 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
-DIST gcc-13-20220710.tar.xz 79382072 BLAKE2B 783b7c70c4ad0df6cd429adcc77a070c099c0e825205397d730316a9ec1d5dd2662f49e31a2a5b68854de4b1e8ce22a12a4098e333cf733ede26e9621fca8dee SHA512 2ce33eb1c9f92f1fded3b38e4756a399956b29c45b49f792d03852aef506f06d923bcdd06a8e2a13329b950886d82914d218a578be623a8082175a28fb215b09
-DIST gcc-13-20220724.tar.xz 79427588 BLAKE2B 7b18d146241044becbf20fb621feb3f816371417818b156cfbfa430371fce8be23246f035305fb419a0261c86503700761fb7c70bc485f28fea47866a95b5b07 SHA512 c7f6881c2b1573689b754f046d9aa00d3436535d7dc46846b321705d20e47243e2eb26d578c6f26aae3afd3bc0d5514750f871c1ec6af095cc4315c1c484aa82
+DIST gcc-12.2.0-RC-20220812.tar.xz 84732336 BLAKE2B de38eab480965e44d64ccda40070aadb0e892732b6fd4cd80feb5636aff2b14ee0ca2fb0ed38fb1ba46d83c6173a60069a9335cc0f321451edaac387c832056d SHA512 74d6f7c9cb1070920ae85533b6db986c3a784f74a3f5eac113c483230b78737c33bc6f10a2221ace7f9c8af0e3824390241da73d367dd77e5832205a47a47940
 DIST gcc-13-20220731.tar.xz 79440792 BLAKE2B c7b6e8113c5c858b0e348ce930ca71c3386b91d62f4a3355df38e899dff26f9e02d44673ad1d57a93a5edb3f8633b9f8fc74b779059b9fdb54ebc0f73c95ef36 SHA512 58e320f19cebe4d7364a64a2ded60ef6fb8f68d6abcd3a3c13b0a23ab016d4f40cd9e0e12f665b713314c34b46a65c263a4f04bfac01a7f476755987365aa4e0
 DIST gcc-13-20220807.tar.xz 79472584 BLAKE2B d23ad0d06414c0e7dfc11473641abb63585c95a07b1da50f3c9d6ae6ba3f365b7bd17297914670468e8b26e4146c8de2dc35c0b96ddc752a07c1dca3a0227dce SHA512 03aed1aa6a73b4aaa5318e456334132576036ee859a26eba3d49826a03da554cec22739cc4fae441f72eb5ea53449e75b73e8f3a41192e09a6e00d4fc227a4ee
 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
@@ -48,25 +43,20 @@ DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f7
 EBUILD gcc-10.3.0-r2.ebuild 502 BLAKE2B 2fefeb929c4dd64837a4d27549624bc5c11a10f89ea29e73873f60506a332c220aa70dde76ce29a17ef023fea82ea6a7b3548f14b1a38f22adc028a09bd98d31 SHA512 7cfd3be4e22142ff7abb2a63c0eedfa42994a25753f45e47ad74a6bc266a467b25f072600a3578c12fbaae17110d957161e164623d31f5a3496447187e6e46ff
 EBUILD gcc-10.3.1_p20211126.ebuild 542 BLAKE2B 43170f8b81699ab102c389f42313ab6d448ee8097cbaa940cfd10eec884c3223b1569635169e6285b5810f07bde4d9d40d78003ebf6dbe07e32e60a80469cc97 SHA512 dfc4cd1ab39af930d37ff7d14bee89a92a575624e159223be56d2c695ee384afdc6ea84797d468c3b736992db8befe379c5cee04833772fe259d16d6965d58a1
 EBUILD gcc-10.4.0.ebuild 1453 BLAKE2B ea3baac2dc8a51dfb959ad222a708268b860149fe932ef9774f828a678cf329d0c32f8059957645d453f32569ea099488df631bbcf063b298f7f40966129f049 SHA512 7f05c517cee21a55187d8f19a4ab5886201a2999d830011a97e7443bed4619e96c12bf877bc6bc30b783e2eefb0e94706c387030d676a61ecc2d5e49fc0c5471
-EBUILD gcc-10.4.1_p20220721.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
-EBUILD gcc-10.4.1_p20220728.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.4.1_p20220804.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
+EBUILD gcc-10.4.1_p20220811.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B af5f165e046455efaaaca747c1deb018b0f43dad720129f72821879fe61790b9d2c233ae9ac0e8d11911b92d390c7a8b082b5dba5a771716f7d9b0aeeb1c6a3b SHA512 905b1f6108ac0608c077e940570829bf9c1e5bde5d852cdbae2b5fddaa304df76dd5bd4499dfb5d26667ced09b3a772567dd850169cec8799731d1cc0abb125c
 EBUILD gcc-11.2.0.ebuild 495 BLAKE2B 122998d820667dbf776aaa7f48a79b3c127f1558f8ec811543e83d3f8534be368749e388254ff14139076baabdcc7ead4be8c5d8f23b3c764ad721cf0478265d SHA512 65a1c11c97d4bde439abad6cd68ee97dd04e8750f4728c3588e923f32eb56b61afa0243570b8c66599e6fe9f6d122113c00c5c1cdf9b7869f01c1564a6c21707
 EBUILD gcc-11.2.1_p20220115.ebuild 688 BLAKE2B c85314316bd63ceae85eaf1ae501932be00c2f5b80092ec4a894aa221e015daceb6687dbf962089b39195ae6470665e7faf09fe9600ae0c74e4d94fcd903e789 SHA512 59d147c88bf9e2a3779320ee89145f01f2acd1110efffc9f967a0c7fee3d910218424b48bf2166c06662a0b1b545b996869f5060ee23da54e8a10f1a0afc3477
 EBUILD gcc-11.3.0.ebuild 687 BLAKE2B 0fb753c50afc9734b65abcb5fff76b029fcf4b2e2a969540a849b4700fe80a95f889fec4e327600e49bb77d1c0297dd02423e41c89f5c8669023463922244cab SHA512 4cf43f6f5ac8b0c386faaad247596bc7b551490c2402b20fc2aadf20ad355fb6a847212d11089c737fac3e230cd4785dc8b03737a2b0e3cd92e91ebef5707ae8
-EBUILD gcc-11.3.1_p20220722.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
-EBUILD gcc-11.3.1_p20220729.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
 EBUILD gcc-11.3.1_p20220805.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
+EBUILD gcc-11.3.1_p20220812.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.1.0.ebuild 819 BLAKE2B edb479f30802d9ac62555dc535d388f7630572f44d462d249758f4de5ce62f43c7664cdfe304e48e2009442ff5e8f687ae729947d5e16f8b8dc78d459b74b1b4 SHA512 fa31a6780c63b1ca4f63fb547059528da4f0180c4be307281e54ea06bc0fd8d23599000c166fbdbfc5f618d0ffaf007ac37152efb857f5cb0d2b794a2dd4e9c1
 EBUILD gcc-12.1.1_p20220625.ebuild 799 BLAKE2B 82f30877d60dd0c8b9313c46e1b790748e920ea1e05ce6b9e76d33b6d9539f09ed37687265aa752fc496e61890ce5acba7765b16c793708a7564bea6df144d23 SHA512 818bea94f67785be1f2a390afcaf1550167c508cc4546047c4823189ce1b58111314c78cb13c91cdcd18463cfaec2aa882d738bd32367e43840d3c1bffdcbd8f
-EBUILD gcc-12.1.1_p20220723.ebuild 819 BLAKE2B 8f40ffd8a2c9215c7de90cf40c5b4b0a2afcd66b7648699ab440bcbcdf20013395d4d03ce12c00021309aaba0978d3bdf7b42efe4f5189e4e6169dc84a044a46 SHA512 c3b4ca416d0d65ff8eafbe95b8ba2e894312003be0da5660af1904960504027ad76c8f1c6af4d212cb30116d2f1ca3c261f361f96770eacaee2d4ebfc173fe64
-EBUILD gcc-12.1.1_p20220730.ebuild 802 BLAKE2B f78bd580d137107e9a6fed22e3e4183c4d5867b0627ec70df7fa96094b44b4ec3a6c4af18f2801cc5f01bd6f1dc9ed6d2241bcc683b9e61b80dd99a7f49f6f60 SHA512 9673c3167e071e94d8cf4953d1fe63cc5af88c55deb69a7b5fc45bc8b6452ec79205637cc24e5dd15520a7f9f6c5a548cdbd4ab86973c06fe0c9a59b1e275ec8
 EBUILD gcc-12.1.1_p20220806.ebuild 802 BLAKE2B f78bd580d137107e9a6fed22e3e4183c4d5867b0627ec70df7fa96094b44b4ec3a6c4af18f2801cc5f01bd6f1dc9ed6d2241bcc683b9e61b80dd99a7f49f6f60 SHA512 9673c3167e071e94d8cf4953d1fe63cc5af88c55deb69a7b5fc45bc8b6452ec79205637cc24e5dd15520a7f9f6c5a548cdbd4ab86973c06fe0c9a59b1e275ec8
-EBUILD gcc-12.2.9999.ebuild 1246 BLAKE2B a88a884f288177dc3e3264000a67bf29efd2913e1b92cc845604695035e2a6524802320549b281d62f7aa47d1e18f5a9a6b9af24551ddcc6d2489c8a03674074 SHA512 65110d465341c4d1ef7ca020b51ec90a17430b73c435a7310863a3c9ba1e6a01ea2902273d02eb6d008c334dfa954f92f2474293850a2615498f4d8023d4b52b
-EBUILD gcc-13.0.0_pre20220710.ebuild 1282 BLAKE2B 7f715b88b5cc957b71daf625d6cbdc23fe50ee9ea28e149f2aae381d09f35aa732458eb118b632f7ebf1903d0c8784f8aa339a9ed525a40a4fa06a879d32cfe8 SHA512 ee4d2134d47b67e40db2a3a4daa78d5fa8d8e9fa4eb3f04555e726b0a8174935bb14d7f147bf9bd81d2ffe9a1ac7ad1b693d4c5dc6d08855fb08897d22c525e2
-EBUILD gcc-13.0.0_pre20220724.ebuild 1282 BLAKE2B 7f715b88b5cc957b71daf625d6cbdc23fe50ee9ea28e149f2aae381d09f35aa732458eb118b632f7ebf1903d0c8784f8aa339a9ed525a40a4fa06a879d32cfe8 SHA512 ee4d2134d47b67e40db2a3a4daa78d5fa8d8e9fa4eb3f04555e726b0a8174935bb14d7f147bf9bd81d2ffe9a1ac7ad1b693d4c5dc6d08855fb08897d22c525e2
+EBUILD gcc-12.1.1_p20220812.ebuild 1456 BLAKE2B b982de0e09a698616c42c4a4d72356dfc189a72d99b3a41a6fb864bb71383cda2a7099c41c88f0463020ae7cc29339bc5cf8d3e15eb6f6a55e6a74fb2c4ed6e6 SHA512 40cfe8d732b9a62b55e3a2bdec56188f4e70edb72ab981ba3a4ba3ca35862bd92d948ed48201f91e8188e52c87778da8bf334bafff2e00cbccb7c98c2614fdca
+EBUILD gcc-12.2.9999.ebuild 1545 BLAKE2B 86594191729256f3c5541b09461feaf6a5e3afa7ed2f0fa43739ca3225eb6974f996f4702c8eb51ba7e64215a2fce313ef4e010556bf9389aa3543fe34e27d44 SHA512 0f7d29dab9c8b376b2d5abdf5f0a2c889a2fb28bd37f6c897609b9c222215215a18c0a1e858b1688e3a601acb0c8f896b8a89783aafa05eb0f022e42c657a9ed
 EBUILD gcc-13.0.0_pre20220731.ebuild 1282 BLAKE2B 03e7f5b4c1434905797713910db534e33e9ccd97e7b931a3980222412b48d3daeae62f259a6f4445fccb4fcb510f92ef39c30e0c91930ec333f0af544b38ab84 SHA512 6cc09fc3d0736469630089056c8c79ec3a4751311201f832826be7c6782598b8efa110b23c45fd187006a5911eb7c0d132d478ccbd1c5817ebc123d10c807aa3
 EBUILD gcc-13.0.0_pre20220807.ebuild 1288 BLAKE2B a2281da17b96d44850dccf6a6420d66cf163a8f53ea755f1414911fcffd71b504273f3010b6a6c3cb796bf763d8da5b8fa64efb7e107b3e5a8bb1ab767704d05 SHA512 8108432caffabab640a472344adf5660a005436790d31f287f1e72109dd69b5831ea0f3e956a822439862da6a24b78daa7c4253fe51ce9b47457de3b83d80b5d
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220728.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220728.ebuild
deleted file mode 100644
index b2fac30d2ffc..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20220728.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.4.0"
-PATCH_VER="2"
-MUSL_VER="1"
-MUSL_GCC_VER="10.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220721.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220811.ebuild
index b2fac30d2ffc..b2fac30d2ffc 100644
--- a/sys-devel/gcc/gcc-10.4.1_p20220721.ebuild
+++ b/sys-devel/gcc/gcc-10.4.1_p20220811.ebuild
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220722.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220812.ebuild
index fec8a9f96524..fec8a9f96524 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20220722.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20220812.ebuild
diff --git a/sys-devel/gcc/gcc-12.1.1_p20220723.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220723.ebuild
deleted file mode 100644
index 4ce888a6319a..000000000000
--- a/sys-devel/gcc/gcc-12.1.1_p20220723.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="9"
-PATCH_GCC_VER="12.1.0"
-MUSL_VER="6"
-MUSL_GCC_VER="12.1.0"
-
-inherit toolchain
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	KEYWORDS="~loong"
-fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.1.1_p20220730.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220730.ebuild
deleted file mode 100644
index e6861078d44c..000000000000
--- a/sys-devel/gcc/gcc-12.1.1_p20220730.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="9"
-PATCH_GCC_VER="12.1.0"
-MUSL_VER="6"
-MUSL_GCC_VER="12.1.0"
-
-inherit toolchain
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220729.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220812.ebuild
index fec8a9f96524..9be0f30fd1e6 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20220729.ebuild
+++ b/sys-devel/gcc/gcc-12.1.1_p20220812.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_GCC_RC=1
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.0"
+PATCH_VER="9"
+PATCH_GCC_VER="12.1.0"
+MUSL_VER="6"
+MUSL_GCC_VER="12.1.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
@@ -20,15 +20,23 @@ if [[ $(ver_cut 3) == 9999 ]] ; then
 
 	# e.g. 12.2.9999 -> 12.1.1
 	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
 fi
 
 inherit toolchain
+
 # Needs to be after inherit (for now?), bug #830908
 EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 #if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 #fi
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
@@ -39,13 +47,6 @@ DEPEND="${RDEPEND}"
 BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
 	toolchain_src_prepare
 
 	eapply_user
diff --git a/sys-devel/gcc/gcc-12.2.9999.ebuild b/sys-devel/gcc/gcc-12.2.9999.ebuild
index d1a72887e795..cf4fddcdf19e 100644
--- a/sys-devel/gcc/gcc-12.2.9999.ebuild
+++ b/sys-devel/gcc/gcc-12.2.9999.ebuild
@@ -17,9 +17,17 @@ if [[ $(ver_cut 3) == 9999 ]] ; then
 
 	# e.g. 12.2.9999 -> 12.1.1
 	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
 fi
 
 inherit toolchain
+
 # Needs to be after inherit (for now?), bug #830908
 EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
diff --git a/sys-devel/gcc/gcc-13.0.0_pre20220710.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20220710.ebuild
deleted file mode 100644
index 0c0625463882..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20220710.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.1.0"
-MUSL_GCC_VER="13.1.0"
-TOOLCHAIN_USE_GIT_PATCHES=yes
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.0.0_pre20220724.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20220724.ebuild
deleted file mode 100644
index 0c0625463882..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20220724.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_GCC_VER="13.1.0"
-MUSL_GCC_VER="13.1.0"
-TOOLCHAIN_USE_GIT_PATCHES=yes
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1bcbede47771..b59138969556 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 35b06ecf862f..31921be6b1d1 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,10 +1,13 @@
 DIST tzcode2021a.tar.gz 262204 BLAKE2B 4072685f2344602ffcfe32a7bf92d3b0d93e38ffca842f1c07a60db5e26f1f18ab32fc7b5f155b0bdab49f8d0bfcd5b58f4a192b4d06d7d9639893e5cb596328 SHA512 bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
 DIST tzcode2021e.tar.gz 273644 BLAKE2B 3331477d8107fb30b2c37d3a3afb212dda7ecf53aa553ea5070537bd1a4a01bf62e70adb2fb14c025e22d272d96ee51e9e5089c5c9790682d3c43cda0ded8680 SHA512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
 DIST tzcode2022a.tar.gz 275632 BLAKE2B f9b3bb5eedc51896c2a1dd77fe8118518c8a1f35152325fa6c4163e11dd34aeb0c88b16b17a27ad022feb2f6818996ec0e40e06a7e1edd454187f586c3739070 SHA512 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
+DIST tzcode2022b.tar.gz 279432 BLAKE2B f4fdb5ded5186e536849b1da9768dcdb389a2b9f6530070388cea9eca17d9db02198a25f1310d9a50ba5f8a53270d3336f9b2cf803666edb2dac20333d57ed8f SHA512 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79
 DIST tzdata2021a.tar.gz 411892 BLAKE2B b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87 SHA512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
 DIST tzdata2021e.tar.gz 422509 BLAKE2B e0e1189a1bbfb2ee641b9c4c8d00775372638d46d7aea72ff0c4bcb02b38a65eedaf89e6b272e054245c940369a50c2573e6fc720414e4ab3d45adeda8ed9c75 SHA512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
 DIST tzdata2022a.tar.gz 425833 BLAKE2B 0af5b785a6f5d871b017237ad58d3d9bedd0de38cf18ac51b32cd8df9811215af7af913d8cd3966de695ce65df3f49f52e239196e93b953094763814cc56ecd0 SHA512 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
+DIST tzdata2022b.tar.gz 432594 BLAKE2B 23732f1c753efeca97bb9d6ed8d487a56c735943cb1062a77a1a76faf0109f86238ef9b0ec9ec92b8bdf1da10435f2c39e1465a7fefe74eab8de730214920249 SHA512 a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1
 EBUILD timezone-data-2021a-r1.ebuild 5675 BLAKE2B ebb7b82895a58585f688b164655c2d52dbc54d5c2f7234167fa8bcbe87d1189b88e9449cfec7b80aa46edd8e7d2a29047409b81fbd6c8114546668914e49c362 SHA512 1cee878422e1f7939066b439a987883cfb3a3148ab7aa2218cf4c6b83ba5b7fc12301709862339be283dd2e0e4726ac295aaa19eb526c9fdaf0fc32eadf62434
 EBUILD timezone-data-2021e.ebuild 5675 BLAKE2B ebb7b82895a58585f688b164655c2d52dbc54d5c2f7234167fa8bcbe87d1189b88e9449cfec7b80aa46edd8e7d2a29047409b81fbd6c8114546668914e49c362 SHA512 1cee878422e1f7939066b439a987883cfb3a3148ab7aa2218cf4c6b83ba5b7fc12301709862339be283dd2e0e4726ac295aaa19eb526c9fdaf0fc32eadf62434
 EBUILD timezone-data-2022a.ebuild 5690 BLAKE2B 802c5353b34a12920ba3a5b0e6a337a6cf7aae917f0535d41a6744c7800b0bb5ed7d2788240a631b6b6510d8d824600d0be901a93671cb8fe3cb7042ed69b53a SHA512 a2ee84a9dfa04aa74de2cff15778ee7629c1f3e76e2944ef69434ca426a50a18a8ad9f940f52b0e9be3342a5a5be04351260d42dc5f45d41dbc1858781c91f16
+EBUILD timezone-data-2022b.ebuild 5688 BLAKE2B b5c11113d302e575013c624ee7c9e9d85cec8d4c912722022e8d925cbfaa75bd8f8152d5e32e3942eeaa7c969a953e2051e56a4ec8465c8f43a11278f78f631e SHA512 3360a5df8a1a118c47b5b7036af5dc8f9bbd21699a9500af8383a43223ff39195ee34c6904a2c84d9428018681899aca20466f3bf78fc3a5aba6a9bcc7aa6c3f
 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2
diff --git a/sys-libs/timezone-data/timezone-data-2022b.ebuild b/sys-libs/timezone-data/timezone-data-2022b.ebuild
new file mode 100644
index 000000000000..f727bbfe8931
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2022b.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones"
+SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls leaps-timezone zic-slim"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!sys-libs/glibc[vanilla(+)]"
+
+src_unpack() {
+	mkdir -p "${S}" && cd "${S}" || die
+	default
+}
+
+src_prepare() {
+	default
+
+	# check_web contacts validator.w3.org
+	sed -i -e 's/check_tables check_web/check_tables/g' \
+		Makefile || die "Failed to disable check_web"
+
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_configure() {
+	tc-export CC
+
+	append-lfs-flags #471102
+
+	if use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+
+	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+
+	# Upstream default is 'slim', but it breaks quite a few programs
+	# that parse /etc/localtime directly: bug# 747538.
+	append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
+
+	LDLIBS=""
+	if use nls ; then
+		# See if an external libintl is available. #154181 #578424
+		local c="${T}/test"
+		echo 'main(){}' > "${c}.c"
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
+			LDLIBS+=" -lintl"
+		fi
+	fi
+}
+
+_emake() {
+	emake \
+		REDO=$(usex leaps-timezone posix_right posix_only) \
+		TOPDIR="${EPREFIX}" \
+		ZICDIR='$(TOPDIR)/usr/bin' \
+		"$@"
+}
+
+src_compile() {
+	_emake \
+		AR="$(tc-getAR)" \
+		cc="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			AR="$(tc-getBUILD_AR)" \
+			cc="$(tc-getBUILD_CC)" \
+			RANLIB="$(tc-getBUILD_RANLIB)" \
+			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_test() {
+	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
+	emake check VALIDATE_ENV=true
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
+	rm -rf "${D}/nukeit" "${ED}/etc" || die
+
+	insinto /usr/share/zoneinfo
+	doins "${S}"/leap-seconds.list
+
+	# Delete man pages installed by man-pages package.
+	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
+	dodoc CONTRIBUTING README NEWS *.html
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}/etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
+		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
+		eerror "be using right/xxx for the system timezone as it breaks programs."
+		die "Please fix your timezone setting"
+	fi
+
+	# Trim the symlink by hand to avoid portage's automatic protection checks.
+	rm -f "${EROOT}"/usr/share/zoneinfo/posix
+
+	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
+		elog "Support for accessing posix/ and right/ directly has been dropped to match"
+		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
+		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
+		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
+	fi
+}
+
+configure_tz_data() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
+
+	# If it's a symlink, assume the user knows what they're doing and
+	# they're managing it themselves. #511474
+	if [[ -L "${etc_lt}" ]] ; then
+		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+		return 0
+	fi
+
+	if ! tz=$(get_TIMEZONE) ; then
+		einfo "Assuming your empty ${src} file is what you want; skipping update."
+		return 0
+	fi
+
+	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
+		einfo "You do not have a timezone set in ${src}; skipping update."
+		return 0
+	fi
+
+	local tzpath="${EROOT}/usr/share/zoneinfo/${tz}"
+
+	if [[ ! -e ${tzpath} ]]; then
+		ewarn "The timezone specified in ${src} is not valid."
+		return 1
+	fi
+
+	if [[ -f ${etc_lt} ]]; then
+		# If a regular file already exists, copy over it.
+		ewarn "Found a regular file at ${etc_lt}."
+		ewarn "Some software may expect a symlink instead."
+		ewarn "You may convert it to a symlink by removing the file and running:"
+		ewarn "  emerge --config sys-libs/timezone-data"
+		einfo "Copying ${tzpath} to ${etc_lt}."
+		cp -f "${tzpath}" "${etc_lt}"
+	else
+		# Otherwise, create a symlink and remove the timezone file.
+		tzpath="../usr/share/zoneinfo/${tz}"
+		einfo "Linking ${tzpath} at ${etc_lt}."
+		if ln -snf "${tzpath}" "${etc_lt}"; then
+			einfo "Removing ${src}."
+			rm -f "${src}"
+		fi
+	fi
+}
+
+pkg_config() {
+	configure_tz_data
+}
+
+pkg_postinst() {
+	configure_tz_data
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index fd2d7cecfe8d..58b0854d8778 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index 2d13e698230b..1a761e6c90c7 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,5 +1,7 @@
 DIST xfdashboard-0.9.5.tar.bz2 3397335 BLAKE2B 5e65206c73f85ce9d4305e459ca837c287c43f95bbb16df632109eee998524d5858c5de8a6c390713d118ed3f7bb7f184d88650cec78e7bc03a6859fe7e44a39 SHA512 9929bdcef6a9766799b900b61e009b43ef901f1aebd6dbe9291c3342edebfa1d599340222da25bbac17810f4ef7b001743b4daec0c25f585203f0b69f2bc17d6
 DIST xfdashboard-0.9.91.tar.bz2 3421906 BLAKE2B 10b5bb09fa4d4bbbe242d1d36ad073e08384845e67331994c9ae622d70de27e873ce2f476d8baebde4bd4ae55db77cb35336a1a1725b4e40b1c814066ab4e72c SHA512 56e18c70a1282ff8f45df8304993fdd5e9097429f7edd6b9c7fc5c20681d1043b57251b5ce327346e612bc1069823ba4c76a5665529eeb2807e106c8fa747ba6
+DIST xfdashboard-1.0.0.tar.bz2 3423708 BLAKE2B b6ac90de137d85f9503372648444100561368498ac93173e60b3d0938cd5c1a95a4c0a668b4b2078821b234ca8e074e0fbc9a0c6b5785de23561465a3cfafe62 SHA512 7c7da3d544de4eabe9f31c2744d7b862ed71a7e7bcadd40b61d64ce7d480e627c86992979718110d65d1534f50fd87d8241f509b26e0603b93443b4cca873d1c
 EBUILD xfdashboard-0.9.5.ebuild 969 BLAKE2B c89d968e6269f0baf97e63580a5326aaa3265701877fea85955299c1875f1ffa8c9412037f2910a8e337d0849820eeacc0aff76632360da6dea031e5030bf147 SHA512 3ea9960a40752ef6ac736784808c3551dc974cd000bb4e50a295c4cd28c79db297e59191870f444976e295703b0263c18bbd305fb2badc6bc7b8426c05d45bfb
 EBUILD xfdashboard-0.9.91.ebuild 978 BLAKE2B 1e8d9416c321d0db5f0f6baac34a1bbed6f5e29514a7b18dbff5997f277b84bdce7911a916c11bf4154564b36bc2d2eb557a3edede80c685b160519de3c8ef5e SHA512 ce197e49b70d8b4273bf9e0f02b7dd7bad549755f463d60d57be061435347ed80b54d3321d5ff685b6d0246365c5267fa708056bbe27e022404b9ec954c05190
+EBUILD xfdashboard-1.0.0.ebuild 978 BLAKE2B 1e8d9416c321d0db5f0f6baac34a1bbed6f5e29514a7b18dbff5997f277b84bdce7911a916c11bf4154564b36bc2d2eb557a3edede80c685b160519de3c8ef5e SHA512 ce197e49b70d8b4273bf9e0f02b7dd7bad549755f463d60d57be061435347ed80b54d3321d5ff685b6d0246365c5267fa708056bbe27e022404b9ec954c05190
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfdashboard/xfdashboard-1.0.0.ebuild b/xfce-extra/xfdashboard/xfdashboard-1.0.0.ebuild
new file mode 100644
index 000000000000..f725a7560151
--- /dev/null
+++ b/xfce-extra/xfdashboard/xfdashboard-1.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.2:3
+	>=media-libs/clutter-1.12:1.0=[gtk]
+	>=x11-libs/libwnck-3:3=
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXdamage:=
+	x11-libs/libXinerama:=
+	>=xfce-base/garcon-0.2.0:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfconf-4.14:=
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-08-13 08:23:34 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-13 08:23:34 +0100
commit	cd40bc9ab405aca4e72f869db79d9d1ff77d8313 (patch)
tree	2918fb07c5f60a7f93f6fd8ced1ed74061a49318
parent	4d4b75287f879f15ebdc56b3edd19737b6f936e8 (diff)