gentoo auto-resync : 30:07:2022 - 03:08:54

author: V3n3RiX <venerix@koprulu.sector> 2022-07-30 03:08:54 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-30 03:08:54 +0100
commit: cdb747b791914a30c287a3a8e33d1b635e431707 (patch)
tree: be22ab4ebfae7f170acb577486d0edc7e6d14279
parent: 496936ff0f7db69d1f7317341230acb866e3c330 (diff)
197 files changed, 829 insertions, 2132 deletions
diff --git a/Manifest b/Manifest
index 0ea8ea6cda95..4aa6f8c3c1d6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29622 BLAKE2B c64a5083ae95f1a4ddf9e86b17753ee569635689ea1aed613c4d7114148238e82790149c6a3799999972542e30e7f8d991d2521889832244a874ce46e35f635c SHA512 230f0d7901f98d90dd8927a549063d24f517fb9f80891ad3b722cfe3f53dff9c3ea80cbb46133f8c8031cd2abb87e109c961221a9c7288a21b86031d04b57ad9
-TIMESTAMP 2022-07-29T18:39:40Z
+MANIFEST Manifest.files.gz 29626 BLAKE2B c687e7ea067ec0859a84de2cfe7ade9e134a7f7b451f2cf4e7ae9894adb397531d9feeb1ebb82819277fdb34f9e922a45f48b429ed7ed4babdd4701ead6ab3e0 SHA512 1b8c070ba040915e3e11cf448bf72ced5974419c4a0421c68f405e5518f81c5ff4b820cc3db04998f271eeb58e6ee9c8c6ff3940a353123f227fbf74ff73056b
+TIMESTAMP 2022-07-30T00:39:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkKWxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkfchfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBa2Q//W6cQW36u1Gw4aTmvIiXqueKq/I2Dm1m73hJ3OY5w9MttiIvhBi3PjK0K
-NoHeda34bvs97VMpRFe1ZyybPqhw7lCy0O14Y5Yyfmj4gk/wF8BOHSpDysLEvSbN
-hPfsOsETKcbaWcONJH6BqdWHtMo3YGK+ib7vfCsFACCkOGEvuPN8o5qzyrNM7jFT
-vRS/uSxNkNRA6MWFuUQoazVNfydkMDLZFT1B3isGdESz1/N8FtsfGqh4edcSmW8q
-2Y77APltXKwhj0eLa8RSlfhoMuwtTlj4fJxrwpHqRr3Fi9gWqRk9pcld3Hpgp6e8
-h83Kv/FMERGmKYoeEwwOzAhwqUTNbICn0i8amoY9DROAs2dxdA6RbtK0UQpVUpes
-2YVLH5unJ9Na1tGMADUHa2JdGWen5zQ2RBwzie0BVZ0w3iPxN/g3dPyywXOJuQ4F
-oBjkKChIlvB3pibutzNFbBTvD7KGFzXuMnuvVaHwnWxUiFgSt/XIYucSzARW2tHz
-cFpZ8Iqvv/9mo2seuD0XntYr0SCBahTrQcy/yHU8MmOGXa7+Qo+RhVx7fqoQ2rLs
-zvrQCJP69ELNSO9iCHt/UNWHCpfjPn1jMUwROvmKkssxKyBvG0Ja0JvxGeep0XlD
-YEh4QB8taAu7n5dn9Gb5PSjxKu5u+73Qvd2C/tU5VwAUXNZ7KOo=
-=tGpV
+klDQsRAAjMGbfY6SI6C57yp1YR6da/lJynCPf2EC7unMxg34HjWC87siokLyZyEg
+IGa0kqQJcMYUQ1LwO7qfKizN+D2KBe1cG/vXLrrrUf3vBCGMpOxhQqvxKM5IpRSr
+4WxsWlURJeMGk/HOse340ty1YZvIgmKR7tHVa/pJYZYcDFKZ8zHdLM3to/wOLar0
+EZlLd33ikkjF8eEihqSd+btfRlaMuq9GFSdqwshb0SA3HRLIZJRv5QN/1rtjyVYL
+KaMRXTwNFpWdKpxf8zt1ioFWh6dHzJFVjV/a91l7a18ExTUA7M1EwjeY7EwUW/4X
+NpO4aCvMjOsn0VUNV5AFaI1fN+uKZqTg0UtNWv5jg06101kjkKSt3pgpvlFgZ6XG
+nGm9qhifpXQaZkGiWkKEqrz9nb+ZbYwgJCMbtik0niclLuYIMwhXSzO0n7mREN92
+ghWwptOLoIyTVEDcHjMypkBZniKomw5pCalFPxNClegCTKhXtqEzQESNw7u1k+6+
+C182ySpA7vFPjOfWviZwwcSFwLUFv2GRRtaLp0TzEnJJjzfK1vBoJa8TQ4FeBRB0
+yIaBRdgThrYyX7m4Y1RU8Rhoc0uzzdZxM4R7sZIj1s7vHmgfbAvWPJWYRxfQ6FVp
+IScFHL1JxNOFM0ZeYRz4JnvYPJCaqzMGLlyg5bnZBpL6DdVMWrk=
+=wzhq
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c149ac6baa4b..cfd849d1fe8d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f2ee2af4ae05..a4d89c374a3c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index 8251dabacca3..907a3b0d7886 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -6,4 +6,4 @@ DIST radmind-1.15.3.tar.gz 843033 BLAKE2B 3d4446e5ce9e668039277f63a16c014dbbecca
 DIST radmind-1.15.4.tar.gz 413132 BLAKE2B 1327b429e12b09d49866e393b344ec7e2c471313a9437e5cb979f25674c7871948a0a4374c05d4939a697702675df70279ac476b3ed6a437b99afe5c98918e25 SHA512 538165123dfebc5c3890ae0864bc32988170e5235093d291a18ea7cf86eb50e9cf90c8a0530ae4b72611e95b5faa9474561f411ad646374173ee7b14235b5a5b
 EBUILD radmind-1.15.3-r1.ebuild 642 BLAKE2B c410e25715c3836debb460709a2bc0d256316ceb8b39f1e9b4f22f9886fdd97ab3da3eb7c2f17c4290eda0d0966a400a55a39321cf83570973f0a35b9f9403f6 SHA512 15916229fea4a73545e3988bef5b6aadb918dc060b93ba7135ff5d3592adb5de0da15e9aea4afd08cdb3ac8010b62e11946d29c1e660ff4547f69bd6cc8d73b8
 EBUILD radmind-1.15.4-r1.ebuild 1191 BLAKE2B 189f6e186d3533b07a31606e517ddf80758283f6630b34b10df51fb2d6fff13fe3b613d8248da1875417a8f79282fef3b1d1af0a092f545a7596610ef7c14a8b SHA512 66f488b61db585b39b08091d4af9b564686f4d43fd52894114e7a4cfa61d8c44fa939071767b328d72cdd55ecf8d8c599c574bba8cef363955d111d256dfe965
-MISC metadata.xml 405 BLAKE2B 3c62cc46921ebb1aebaa62324329fe60b3e08a205fc02d3593176454a3e921ff8265e198652af41fc87fbaf76fc0f6d9e4ef80c59e012aadcd652fc3c10359b8 SHA512 10fe0e6baa295be7b4d9d78da0519f6203e0e7dfba750e4f181bcd2df29b9dd46eea03eef2c5794abefb054eb083cc4a2f8461317e78e2b282468c602d0164bf
+MISC metadata.xml 460 BLAKE2B aaf1b73647e24b19e28454b8584a49e144d7d201291056f5ebd5d624a5ffa0015cbf92a6320462fde926ef554cddf9ff9db5e8af729d443ac0bfa53b2ac40050 SHA512 5117fb2c14b96d8bbca062d9164e84448000b108fc450dfeb7a605c5080958f39b8dedef519652af3f6222ad5205eff2d1cb3b3f834b5de81aad2f005bc5056d
diff --git a/app-admin/radmind/metadata.xml b/app-admin/radmind/metadata.xml
index e980be75a6a5..4bf7c59e8555 100644
--- a/app-admin/radmind/metadata.xml
+++ b/app-admin/radmind/metadata.xml
@@ -5,6 +5,7 @@
 	<longdescription>A suite of Unix command-line tools and a server designed to remotely administer
 the file systems of multiple Unix machines.</longdescription>
 	<upstream>
+		<remote-id type="github">Radmind/radmind</remote-id>
 		<remote-id type="sourceforge">radmind</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 487067d85899..9772ed567080 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,19 +3,10 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.10.3-vendor.tar.gz 48109465 BLAKE2B 45985a6ae4445ec75b29f198113fdd1f1e3aa54896c2da0fdf817cf30603c36379405aa3a65e8d20c0380a06e9b335186e6228b176d3afc541a28bed749d6129 SHA512 3c9220fb42af1e6f1bafd7991b0026cafe313cfa53d4841d5d4a1a19f10ff369826dc07c3d2eaf21a3c7227dbcafc1c134814a970429b0842919664ee0ef8988
-DIST vault-1.10.3-webui.tar.xz 1258176 BLAKE2B 85fd1b804b880a3dcdbbd4e825b663f02a985259d0a74ab7cddf4a9a2393c60918b389d0e4e81574b93c8b0867647fc1d17f7ca3e719b36ab41d6825adfbdaae SHA512 9640a7e25de0761a310e234098a0dd31db9e04b30036045ff7edaaca8f7496466f1c0148855a5e1ef270638e90a8fb97aff2c5482b32512772021c99691a5aa5
-DIST vault-1.10.4-vendor.tar.gz 50089463 BLAKE2B 299e7619f158a2ea0683feaaff4a7c5019da02fa03daf25e0b4415f03b703ca11733c486165a21ffcd5b3c1d221db5b9e24e898f3cf3de014c09e29531841dcf SHA512 056a6056bac127083358f1811e8e587f0521b734219a6e03e019527fafcadfbd0d71a05314cb269e27b03423349b5a857d234d3949d0d15e7c7b1175bc573c57
-DIST vault-1.10.4-webui.tar.xz 1258340 BLAKE2B 556da0e566852e5c6a091bd9139a88a9099e5f6422e225b7a4068e1bef3d9fd5a2292bb2efbe12545c20f6c956fd6180500972d5248f05bbb96db50a90ae4741 SHA512 ec9cc568d8d56ba379d0fdee31e0edc8aa8110366b112790573794975a0b32324f517e5fead39fbf59ab99667837b0e08ebadfb6d41dcde85d474712b34b475a
 DIST vault-1.10.5-vendor.tar.gz 50096802 BLAKE2B 07f797666f97666a3dbdfb3cca7ba9fea1a45b26fd35d902200acdf3bad33ad365f4d547a1c3fe42f9e6a41258713b48673236d5f64547016ba08b43ede4eeda SHA512 87f56ff16a2a28690dd128ff0f1c480616ae7948eaff337e3d3e4eb3370d6d1322b2a488044bc237f9eafc60d42652f3a7decb7283d1596285762cf570fea8ca
 DIST vault-1.10.5-webui.tar.xz 1258192 BLAKE2B c546475dc9949c8854e702ff97267cde97472b47f209e7ed923e6caf9d0fe2b615c0087299148c0325669ae25b4ec111d7e8eff8454dfe5fe15a47bf4c969984 SHA512 fb44ad261cfa2e492b824fc8ec0ad44e54eaa417980bd9cd845e017fcad23670231a696df306332df5cfd5ce039cc1e3f744fe3ef35563b4902ebb15798a6b1d
-DIST vault-1.11.0-vendor.tar.gz 49927497 BLAKE2B d7a12c1c1710c2a487b9c08a871b1d7b011d90957cab6980eb2f7eaff4ff544509899ee07c326bba8310ff16ee3bf88586dba340249cf0f7804007963af7d692 SHA512 b3b9275d5ae41c21826ed0bf1eeaffffe10e5e95b085bf8cf6af6c9ff565848f4a3f83d9a8d6165867de11b0f877383cb972e7d4313a753b0dca391203ecb4c6
-DIST vault-1.11.0-webui.tar.xz 1335764 BLAKE2B 9733ae0c2fe04018dac73358a56a162e23877e68b3ce59ca569cea7e27f39c91727ab0810a737167b3f02d92a0d58e9a7195da892c677bece60fbe965dba7fdf SHA512 a5df9f0e854af8f30d6b5d15628a087c1c37361e2a0de4e412e7f78ac51affc774c1a6ed084dd849b68b147d527547593c1124d1170be38b918efd28081a6f0b
 DIST vault-1.11.1-vendor.tar.gz 52063513 BLAKE2B adb2fb6ab7991e94ce00aa298837f2fac21c24bb8ea8edd2265eed6664498b38567d81fcfe28749b4bf16c449c769448a75fa3c1403f5cdf33b18580d8a65936 SHA512 c1247308f390117c98e43dd82498a069c34d3e766298dd05d5ddb5f69b9a3db2e312b897f35c9f63225cffcac476ba1021a4a71100721848642b6c4412123251
 DIST vault-1.11.1-webui.tar.xz 1335740 BLAKE2B 6a6fdcb22563ad4c3f18bf3816fe8a016c11d19a014458594c2dade3dc8e908db252c34bad88be9e80c2a6408af28af6324158e1e69b40061af6d6fe1a66c655 SHA512 1c02e0ef645df946ffb9d967a9be230800e67597d0ed6cf8afb2688eed9ca863a1f29efeefbb51e0257d2be588da443864df9e1306956844645b0168c2d58d9b
-EBUILD vault-1.10.3.ebuild 2017 BLAKE2B ae390a3a48d018b3489ad6d51a0208825fd96e9cee81aa3dbfd3930b5e6ca7f0d3cd2c04c6f6b98a8ba5a80703c5ea580c2fe69f1acbe334ae2d91a4a3723e0c SHA512 95b049300934c56b508eb3a58d90bb59f94d04e730209ef8396657684425949d70314c00191e9187d034fd11d24df7668e5ab441df9ab66c7c3fb6877e3c6ccc
-EBUILD vault-1.10.4.ebuild 2025 BLAKE2B 22896d4af63db5001b43c3b83864bc2ea9107e2158ea68f6e5d65cbf3d4feb9fdc093013826e74b257daacdabc0392d23fb1ca08f8b46b2e92c6e724c074e8ae SHA512 cdc49b986a02d162ef71fbf7af728d238c0ffa34632d7a3f56af4c9482f259aa7df9cc85f8a9974c62ee24ec0026024a68015b63d796ec954b1a2796b5fd6402
-EBUILD vault-1.10.5.ebuild 2025 BLAKE2B 22896d4af63db5001b43c3b83864bc2ea9107e2158ea68f6e5d65cbf3d4feb9fdc093013826e74b257daacdabc0392d23fb1ca08f8b46b2e92c6e724c074e8ae SHA512 cdc49b986a02d162ef71fbf7af728d238c0ffa34632d7a3f56af4c9482f259aa7df9cc85f8a9974c62ee24ec0026024a68015b63d796ec954b1a2796b5fd6402
-EBUILD vault-1.11.0.ebuild 2091 BLAKE2B d0803a4206e29127e35b3c2c5b0d6c41d57f643bf89ab7a0b97e13225b6e5103676712204bbddf4603a1dc94de34d8b5751710cf1004a9b97f381e2f3d62a9c0 SHA512 060ae598f2372b2217659fca84a40bc83b2c16ad2b10230e5dc535d4dcf06547afe938e371166bfdb13c8be34dc2f77e9775a6629c82cc2e1ea707cd938a910d
+EBUILD vault-1.10.5.ebuild 2024 BLAKE2B a9c4d0a36f3dc15e96fdf85c26228e6bc33eab38da1ab0119396cbbab0722162f9c079cd804c8d4ddf5b953f1424fa3c77fb2d9909ed0a18171270166b1acd1c SHA512 e404fce90bb878d834ad156356a7c4b4b6585465ce1e242b580b99ec1da0a22510a975d410ce8c465635423916572670c4ec4c089908da0505905b853de44866
 EBUILD vault-1.11.1.ebuild 2091 BLAKE2B d0803a4206e29127e35b3c2c5b0d6c41d57f643bf89ab7a0b97e13225b6e5103676712204bbddf4603a1dc94de34d8b5751710cf1004a9b97f381e2f3d62a9c0 SHA512 060ae598f2372b2217659fca84a40bc83b2c16ad2b10230e5dc535d4dcf06547afe938e371166bfdb13c8be34dc2f77e9775a6629c82cc2e1ea707cd938a910d
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.10.3.ebuild b/app-admin/vault/vault-1.10.3.ebuild
deleted file mode 100644
index 227b57cf05c7..000000000000
--- a/app-admin/vault/vault-1.10.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="
-	app-arch/zip
-	dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
-		rm -rf "${S}/http/web_ui" || die
-		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
-			die "mv failed"
-	else
-		mkdir -p "${S}/http/web_ui" || die
-		touch "${S}/http/web_ui/no_web_ui" || die
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake bin
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.10.4.ebuild b/app-admin/vault/vault-1.10.4.ebuild
deleted file mode 100644
index 6024fed54e00..000000000000
--- a/app-admin/vault/vault-1.10.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+webui"
-
-BDEPEND="
-	app-arch/zip
-	dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
-		rm -rf "${S}/http/web_ui" || die
-		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
-			die "mv failed"
-	else
-		mkdir -p "${S}/http/web_ui" || die
-		touch "${S}/http/web_ui/no_web_ui" || die
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake bin
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-admin/vault/vault-1.10.5.ebuild b/app-admin/vault/vault-1.10.5.ebuild
index 6024fed54e00..1e115bc0fbe9 100644
--- a/app-admin/vault/vault-1.10.5.ebuild
+++ b/app-admin/vault/vault-1.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="+webui"
 
 BDEPEND="
diff --git a/app-admin/vault/vault-1.11.0.ebuild b/app-admin/vault/vault-1.11.0.ebuild
deleted file mode 100644
index 004b6dd49b57..000000000000
--- a/app-admin/vault/vault-1.11.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+webui"
-
-BDEPEND="
-	app-arch/zip
-	dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
-		rm -rf "${S}/http/web_ui" || die
-		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
-			die "mv failed"
-	else
-		mkdir -p "${S}/http/web_ui" || die
-		touch "${S}/http/web_ui/no_web_ui" || die
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake bin
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7ce2fdfea097..7c92de3e126c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 36da2548d702..df681c4d7cb5 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +1,8 @@
 DIST iwdevtools-0.11.3.tar.gz 84838 BLAKE2B a4f501c24cc70b13ded5ca88599a3c11b076ae3a3464d065fe3999c8cb9268cfd17fc116197c09ddc6b968d7527409b348c0c1bdb939f6ed1b7a2abdfc868774 SHA512 38a62654042b714689fcf813a533ad463b7bdc0a4b501dc37c498e528792104a3db601f82781d889407217c824a9f48233544fb56a012de19fd34fa92d1de06d
 DIST iwdevtools-0.11.4.tar.gz 85480 BLAKE2B 44b86ee22e23320aa1c25676c08638332cbf66882e2610d3bc19580e682e7623c53013534977299fdad1f697a1ca10447d5753f221e839039011bbdccf017f35 SHA512 907755307b5cd617b2e85aabe76558b9b0c1b42e08e0a7d71760250f1ae455ac24a6a676c0707c2a371a80d86d0b60c16d8fa45702ba0e779f7817866bfb3a26
+DIST iwdevtools-0.11.5.tar.gz 85698 BLAKE2B 0f5b0c81735017b82144c74b2396826b2e6ea97db70704977c7885bdb00442c83023f593aeb25ab2e51f3a35cd659be98440f51e4496418a92f1559212db5b5d SHA512 05e0169a465cd4956d663f54bdc66d3c17379229b23c26a94d9deff879ef9e53b1b28f59e7cf314d36127954cb75728f008d0b0728659436ad1e63de5fb11bbb
 EBUILD iwdevtools-0.11.3.ebuild 1890 BLAKE2B 4dc6fd1395f96dbd7f0fd6729894cd4666a9a42bf7ef21e06c769f671b30e5f30f0c08386c479a1efbdde7d2bdaf452facce8f11e036f0eb56bf5e725be9e467 SHA512 f70d833f6b63f381befa3097f82640f4b4ba9964404f9ebf0d36c07b25f33d7a0a9fcf9243ebad419f25d0f9f1cc02c437e67326eaa92f80ce6c852537c76bcb
 EBUILD iwdevtools-0.11.4.ebuild 1909 BLAKE2B 7e32358db8ec521ba8712fc31cec84398c3e4deb3743df510b1fbf232e219ff46adb293e1d732783da6ccc8eff16cca170a09cafec5ab521e86718432ae3ff39 SHA512 671c69bbfda922fc8efef5f5ad299f7ffe7ae8f21dbda4d568d6966c3e2066c3bfd661da9856160f1e8101c5b4a302fb236f5d3aca0096033f089e2544a90a25
+EBUILD iwdevtools-0.11.5.ebuild 1909 BLAKE2B 7e32358db8ec521ba8712fc31cec84398c3e4deb3743df510b1fbf232e219ff46adb293e1d732783da6ccc8eff16cca170a09cafec5ab521e86718432ae3ff39 SHA512 671c69bbfda922fc8efef5f5ad299f7ffe7ae8f21dbda4d568d6966c3e2066c3bfd661da9856160f1e8101c5b4a302fb236f5d3aca0096033f089e2544a90a25
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
new file mode 100644
index 000000000000..68858249d8a0
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1ce0a83e416d..729e9688b897 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index b257071d65f0..26fbcfa32db3 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,14 +1,10 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
-DIST intel-compute-runtime-22.23.23405.tar.gz 5515173 BLAKE2B eafb5a4ed8a221bc5290576a137f371f2f9d3cebbe1e689f3d1ce41f9430a5242d82ae78799f523f29685c3a731570e4a6766f804faa0f6bb7bae365cb5d6573 SHA512 38ffadd9130717acb0e8d6492b2bb4d8d5c962b151784a92c85d6249cbab1014dcd418bf5110eccc1640334c1ab0d171b7028d2f0d95d606733b42a319bf2f0b
-DIST intel-compute-runtime-22.24.23453.tar.gz 5521386 BLAKE2B c025539c0d2a0ac492ddc5893c0d077523bbc0c0e1dcdb3d086ff381b36f26d0a7b24aecb0ba04e915e443eafecbaf171ef54fc0c455e57b0ae622ef164f4056 SHA512 fb57348ef4cad48b7d09bf8db64a874a63bdbbd586323c25b7c9cf7461bfd62c1cd061c4b989c52466e5d364fde9dec2335bf7e244baadd573888ba904ba867c
 DIST intel-compute-runtime-22.25.23529.tar.gz 5542277 BLAKE2B da718987fd3f3239b6cfc60914f02cc67b7174cb92f3a12e5d8f78b39631892b1c69368eb89590c3a7dfc9e930eb8254ec33c43028073cffac06bd3f718164bb SHA512 5ad80357a27cba76b95099ce5a0edc5271d7328769d6e84039fa94f94be99f02cf4890ee05702db18e28beba6fadea46aa2f0eb236ed8c27cb95bee075f2f6d6
 DIST intel-compute-runtime-22.26.23599.tar.gz 5574368 BLAKE2B 6302ced3e75d7d31a55c20e0c08f915fc2d3df149a843115ce925c62b50e2c9b47fc61ea48ad45a52967703f3d9e31ff23cd4e61d1666e5cf072d7c84c0ef416 SHA512 1ce2b0e9d3886ab51636265c7e1a91bbe817e27995d8e2d96fc4b67633c89f11232005f18f81a462f76fa67d9298fce51a335b9c4545d8b461019cd9e487b4dc
 DIST intel-compute-runtime-22.27.23681.tar.gz 5593740 BLAKE2B 5d627623e7b0ec89aacb5dfee7442803254c233382a2b242f0f856d51256a60d614e6a3d88ec5c0d494ad25211adb5d75a13b5ff86739795e46aa50e7a9686e4 SHA512 1269126ff447f7c0e1ec9e33ef5245476afe44812a2b6ded86f6219ae61c74bf862a152a740684638b12cdcffce454af3a3be5b4b16c3b7f9c0e7b660b73701a
 DIST intel-compute-runtime-22.28.23726.tar.gz 5609087 BLAKE2B ec5b70090e58b08d63f006034d4326426f4caf42b681e32027da79876d019875540ed52cf048fe9919d54bcbac5911bac6ea8a228b8020b9e56d5a61bd1c3c2b SHA512 5e59c678a146eb995e6bcfcedb96c812e40d4561cd4725740742691fc79fd597f4c31659b08763376263ff6100a0f7960f4d5f05a35ff97bed2dc870df189c48
 DIST intel-compute-runtime-22.29.23750.tar.gz 5613298 BLAKE2B 7c662c85732d2053d64a68651484030a16aeae4bac3943c2891771c865c623912d4466dea8258caf7a150d34cc06e2f7e451fde831cc6023ebee4036d55207f0 SHA512 8f9b7f87a93585a0a71d2e5339ec64d01f150722051ca844c47db1803491b6c4d8a371e3332ce6c0e85c6e129711cdba210000176904e922577c3e6c42b791a2
-EBUILD intel-compute-runtime-22.23.23405.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18
-EBUILD intel-compute-runtime-22.24.23453.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
-EBUILD intel-compute-runtime-22.25.23529.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
+EBUILD intel-compute-runtime-22.25.23529.ebuild 1968 BLAKE2B 207354c84dea0666197c05c8b078918f13fc2fd609408243bed40caf12b173e7a2f584d7f27c84733d84281a00dfdb30bd7782f5e2fd7adeb1a6217ae1963199 SHA512 c2bc587640240a51fc478c6ea9a963d0d38fc90768fa7258e0109e49a22e318280e89dd50b0b52aff2585553f01190c9fb47d2d164f7b874b2a4807e4463c7b5
 EBUILD intel-compute-runtime-22.26.23599.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
 EBUILD intel-compute-runtime-22.27.23681.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
 EBUILD intel-compute-runtime-22.28.23726.ebuild 1986 BLAKE2B f99a1b2b31594f28fff663e9aea580cf4777e4b7058458d3a4dd175e949f3d4007493e60a7169c6b8d720e86d2148742bc061ee65bd5897e723351553370a923 SHA512 44e7fadbd8fbb8c3990912033957c8f081560a3828fc5792569c777889435680988e04ba045b3bfe15db2f525e7b50c3a945ae05612c4b9a19107bae6ecb7f57
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
deleted file mode 100644
index 0bbb025dbde7..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.0.2:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11061-r1
-	>=dev-util/intel-graphics-system-controller-0.2.4:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.7.15 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-src_prepare() {
-	default
-
-	# Remove '-Werror' from default
-	set -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
deleted file mode 100644
index 077189e165cf..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.0.2:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11061-r1
-	>=dev-util/intel-graphics-system-controller-0.2.4:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.7.15 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
-
-src_prepare() {
-	# Remove '-Werror' from default
-	sed -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
index 077189e165cf..81416e18f78f 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND=">=media-libs/gmmlib-22.0.2:="
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index e8cd4c58092b..74bcc6c75586 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,7 @@
 DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
 DIST libwacom-2.3.0.tar.xz 107872 BLAKE2B 5589067eabb0b0d5384015a0200950146d1c028ce8cd870b845de8ec22ca1710645755253952e49f9c1db585a945c6ea8da37318b900f16602a1a7081512ecd9 SHA512 ccbeddc55cc67d8102aa4536616f3c379877ba9154a72d7ad92941854c79b727a21efacf4282b9a8730ff181d094749bf84a9fe5850de6246d91a17e5029d888
+DIST libwacom-2.4.0.tar.xz 108812 BLAKE2B 18f41cd052b18c652c61062948355b4738afe57db344749055492cc6853bcbe3048c582a72318891727ec0fb01a7799f4c80c544b37b51c9246f98e5ae3fef1b SHA512 c67b8a81e9f4285a4e6f422b29e9b8b3677e3fc45e5190fd2b95ad361e5ef35e124b7d78bcf2bb9d7b7183525a6be9916b3038714c42c9ef405a1075750465f3
 EBUILD libwacom-1.12.ebuild 1425 BLAKE2B 06b18ad7c2f14ebb25e8115e4f7064f32b313176a05bbeb8aae16dca236d9fb8e16d229be20331bfee6aaed8804ac34fad608de033778a48313a22233daeb608 SHA512 47f61ed5b05b710385ba9c187fcfc600d1ad06d017cebbe8c6630f2f4771b9904173a6bfc1933a4026b8a3e838a971d08863591162ad28b8aedf79595d0ad1f9
 EBUILD libwacom-2.3.0.ebuild 1501 BLAKE2B 5c575736f3559516261d5dde4d4134a1ce07c383dc1c271733a806507e5b7222d0b19f99bf72c5c87f8a15649149e3a8e1a8f905acb4640f398dfe83b9c7fb9d SHA512 ac6ff77254301395a4c3c75b8a74c99cb9a0bdb39c63a61c02a113e957a6e7e67f003ba185421412fa7d5d0a5b7285f312fb9a515764be754ad97ecb8ff3f07f
+EBUILD libwacom-2.4.0.ebuild 1501 BLAKE2B 5c575736f3559516261d5dde4d4134a1ce07c383dc1c271733a806507e5b7222d0b19f99bf72c5c87f8a15649149e3a8e1a8f905acb4640f398dfe83b9c7fb9d SHA512 ac6ff77254301395a4c3c75b8a74c99cb9a0bdb39c63a61c02a113e957a6e7e67f003ba185421412fa7d5d0a5b7285f312fb9a515764be754ad97ecb8ff3f07f
 MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
diff --git a/dev-libs/libwacom/libwacom-2.4.0.ebuild b/dev-libs/libwacom/libwacom-2.4.0.ebuild
new file mode 100644
index 000000000000..450f5ceeff32
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-2.4.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/9" # libwacom SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Don't call systemd daemon-reload in the test suite
+	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3415596920c6..6c832aa8c96a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 732ff2319b69..eae3a657ad6a 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,10 +1,12 @@
 DIST snakeoil-0.9.10.tar.gz 264409 BLAKE2B ef4cff92b1110f3b0912a2899732a29de041ea0e1d5338bbee9b84cbd1e9b4231b66be8fbf98bb14e59360294de9652b816b1de904dc948a3ebcd3e429bd03ba SHA512 dfdf3c96a9e65d6353e9251bb4c9c761d9c6084185119f7e653efc27868e5dd41ece0c54307e306d14effd9c2fcfd3ec15407df3f15f2d4ecfe16ae00c6d7e00
+DIST snakeoil-0.9.11.tar.gz 266004 BLAKE2B c919f21737f91a26a77ed6ea5da490fe48ffe9b8077e8f144ea5d8feb268ab9ab62ca3c7b515d70a0eb270bd7cf1c7a5be827ddd34e97fb3e231f3caa2a32b65 SHA512 34fe8fd0a1215e5e1fe53bf002cbc262fb77e58df4a713d5413c91eeb16b93708f476f6cd08908102857901ffab7dd46349a721312671bc175b7d7991687d319
 DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 DIST snakeoil-0.9.7.tar.gz 261551 BLAKE2B 6739541d1e40b3ac5c4908e6bb92b5b40957f49119307d6046fd17327394ae0406c01dc10396cb568ceb3757ba3367b930441d08079e9be635eeb6f14bd02e3a SHA512 c2626d8050bf24b4ce3f6fed5c6b8993fa9a5ebb40dd664c7008caffe4b26237edeecd3de8fe90f3a1c5756de3d770c3b9e1ef2e95cc052a5f8fcf22058925f6
 DIST snakeoil-0.9.9.tar.gz 264344 BLAKE2B 160f45dad3a53371063c0c86c186a8baf6370751cf455d84f6e9b9334e6e6f0aa76962803daff031f050d5d8b05b85ebcb05a2b8b9e957babac6e01f127a722f SHA512 bada12556fd2c63fabc8340444f470e08c68ffe56612ae14f08f155c11bd1d4b9657a885cfdee7454faf758309f5287792adf2cf5bd7ab411c7fd6b4982f229e
 EBUILD snakeoil-0.9.10.ebuild 825 BLAKE2B c94cb5a6d09b99771c812c30890443764648314aa0d37a21337a8dce638fdd6fed533999dc0a02a9b48fe5d03650514cd312af0c24a1720844c58d09d6561838 SHA512 711bbe4c753a29073728f49bd8ae173f5410d157541874a09dd4fc7323cb05f22f668834e41db70bd62b498a3e3b3c448ae6a353131ca5fd63083c6502ff55b1
+EBUILD snakeoil-0.9.11.ebuild 815 BLAKE2B 029c7d54d247147b14fac1e470d9cb494755fb636375f308d4f7a83f78544fb2700e61e27f32717e41d887fe69812e53354d10003cdb5cd87cdcb167849f75d2 SHA512 160e4ae5fa7b90f45e471242712167ddfb2326475092b245148976aa07afdb530383ad021a05f4be3888708637b4b59d874c5954e57b7c117f4c2406c76ecc9f
 EBUILD snakeoil-0.9.5.ebuild 759 BLAKE2B 4b2243550b1524e10ac0aa8d29191332f1a8a348813f0a151ef6d305dcefc1f5b692acf288ace186e78d079145caa96bb2b384fb180616c37695d352ec36369f SHA512 d82ee34150f8871540f7a8a56ba592d33a6feb94368166267a85b9655d217bf015db279b7fb1a8b1b18678c8f758c015b050d53489a4b8e2f88f07809e0896f7
 EBUILD snakeoil-0.9.7.ebuild 818 BLAKE2B 9a277b1bf46db92b87bcb1cd0f1857e9d0251b030c68173160a09dcac89f369c95e3813848a71a95480882c245e7e5461f57170532212d40295ee4f6245a7150 SHA512 1cb6b88b93954674debfeccd737ca9c6c3bad94d41e968dd3cbe13f4962b3f066126c0b603b6e52cd0088014fa1efae107dbfac1e815690c8a3117a7e6b15049
 EBUILD snakeoil-0.9.9.ebuild 826 BLAKE2B d6d2a8e60ffea1e329b6b648599d3d4ed87728fc3a17f919a91fc8572d9714dff0a04a1472f180d303bb46d4738ca8c07a946580da27a8eea1a15c25d7f7851e SHA512 7838449d2de1e5fc36144850e77d981441e342ff850186e353154ce7d527a363623378af155c4267526fa7a4e58b5d49fb510e9e40988bbe24bd06fedd965e2d
-EBUILD snakeoil-9999.ebuild 826 BLAKE2B d6d2a8e60ffea1e329b6b648599d3d4ed87728fc3a17f919a91fc8572d9714dff0a04a1472f180d303bb46d4738ca8c07a946580da27a8eea1a15c25d7f7851e SHA512 7838449d2de1e5fc36144850e77d981441e342ff850186e353154ce7d527a363623378af155c4267526fa7a4e58b5d49fb510e9e40988bbe24bd06fedd965e2d
+EBUILD snakeoil-9999.ebuild 815 BLAKE2B 029c7d54d247147b14fac1e470d9cb494755fb636375f308d4f7a83f78544fb2700e61e27f32717e41d887fe69812e53354d10003cdb5cd87cdcb167849f75d2 SHA512 160e4ae5fa7b90f45e471242712167ddfb2326475092b245148976aa07afdb530383ad021a05f4be3888708637b4b59d874c5954e57b7c117f4c2406c76ecc9f
 MISC metadata.xml 476 BLAKE2B 12af3376bd65c98f013d125dc634369dac090751f422e01f59a9014cb7a71b8eadde9783741574757a81eba31e379d058041b3029b0934846f74442a4fcd4961 SHA512 4d818c5993192a8edf0784d7444104764ea1a3cd40e680d32a502fb2c0792efc8aeb8e5c07e5b08b1e4c83b44ab659800e93618c250b4dd87d7739a2fbacad61
diff --git a/dev-python/snakeoil/snakeoil-0.9.11.ebuild b/dev-python/snakeoil/snakeoil-0.9.11.ebuild
new file mode 100644
index 000000000000..428f2e82cc86
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.9.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 66ebcf075394..428f2e82cc86 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
@@ -22,9 +23,8 @@ LICENSE="BSD BSD-2 MIT"
 SLOT="0"
 
 RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( >=dev-python/pytest-6 )"
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+"
 
 [[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 602791bbad39..11fd3f8b671b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index eec128d74b92..0a288a6f8e4c 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,7 +1,9 @@
 AUX ccls-0.20210330-llvm-cmake.patch 528 BLAKE2B dc6846e48fb9c69947cba30ab5c5105656bc4519aebc13526f9af5bbee56046b1ccf980285e5e22a14ff4e4e2df8d533a264a9569eafe329d767795ce55b33b9 SHA512 27092844ac557d15d9ac822bdc7239a5206fcff43468b260b93448d30cde254dc8a3eb025975c6403671325ac1b90f6e0cb20a64abf01c6b73b907d6603cc980
 AUX ccls-0.20210330-llvm14.patch 5068 BLAKE2B 8477e86dcb22e976171636a39bb7e4f69c77dd6e47d4ddf0163dcffb618209b4435d7d92f1e383c14d07a749fd237e27590782907ba702ea39eca49ce2514678 SHA512 2b98b8ed38c6ab0ec1b5055437c913c59543656df1a708f25af270f90baa746e4b2d398400a8c9ec3b651fa6d1d57f4b7b6da9c5195a11117b12c9aad03ecdf5
 DIST ccls-0.20210330.tar.gz 160487 BLAKE2B f87539a5e726a8742552d811d741c379d62c146bed835c7fa8d32ab5eb1f609513f80051faf07bbb8e346f176c02ab3e54b3446d5e28dae744468f2209a9d037 SHA512 dd78c040c2a51d6b47f8dd2d8bdc0661111f26b9233ffeb41216254b1b0ad0f634190784e6b8c2d7b36475c13020356342d83a9f80047d7da75ce21ca8885b16
+DIST ccls-0.20220729.tar.gz 160861 BLAKE2B db096f0f1e1d56967086e2711af63f4882e77128236b3d1af3cc107a3b320aa29bcacd4b21769904727261b5608bb2c8409dbb0f3b0d9b0907a94f3bb7c966c8 SHA512 63cb4eace1700118f9c8c4d2f4be40aac948f9c658485c8e3f49dcc863ce7bdd8b6de810b95ec8f46c943b65c8aa5fa643b110a6b981a2e43f57569d897d36c1
 EBUILD ccls-0.20210330-r1.ebuild 999 BLAKE2B f9211984a17679c14bb19ac8a79809c50339c83f3a35cce83e7c5a7e458922740236dbe8538e65cb57604488b63833d1051c7326296df5c12d2f9507beff3625 SHA512 d091c15ad3803a067e35e6d598916cbb33a3ec9877fe2356eadca7238b6872f3ee19db1896f4c82b5fe2ec7f83399a40f417a3eb65d11f451a1f5c8b9f04398e
 EBUILD ccls-0.20210330.ebuild 805 BLAKE2B d34208298dbfc3e9b51599d22c733d062df7179c8b296ffb2ec964956eb112fa07ceabb7adb15775635f5e89b9f50f9b8719e6546956d6b9c785d35abfddfbf8 SHA512 c5059e01fc051f4890b095f838446d0c0e0573e6e6f58a7305b888ba610fd91ca1b437434e2e91a66fca91cbec9d4e5adce734ca51e5c86962ed4e254eaa64bd
+EBUILD ccls-0.20220729.ebuild 914 BLAKE2B 1b1ed4f47573f3520c60c7f97e8a53276bafa09ce6db4d4984d1945ea2f4d1d0ebb62738fa02dc199f35dd121a6e8c5c7c366090d39989a1c2283013820a5ba1 SHA512 dfc1298ea33a989347d44a342a8a54b33b908300c5e156266abce5370f8f2ff26af4a65e93042d8faa12f04e5aa90846bb05ac80e2384f3acbd814ecbcb434e2
 EBUILD ccls-9999.ebuild 914 BLAKE2B 1b1ed4f47573f3520c60c7f97e8a53276bafa09ce6db4d4984d1945ea2f4d1d0ebb62738fa02dc199f35dd121a6e8c5c7c366090d39989a1c2283013820a5ba1 SHA512 dfc1298ea33a989347d44a342a8a54b33b908300c5e156266abce5370f8f2ff26af4a65e93042d8faa12f04e5aa90846bb05ac80e2384f3acbd814ecbcb434e2
 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02
diff --git a/dev-util/ccls/ccls-0.20220729.ebuild b/dev-util/ccls/ccls-0.20220729.ebuild
new file mode 100644
index 000000000000..d99dd418d177
--- /dev/null
+++ b/dev-util/ccls/ccls-0.20220729.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	LLVM_MAX_SLOT=15
+else
+	LLVM_MAX_SLOT=14
+fi
+
+inherit cmake llvm ${GIT_ECLASS}
+
+DESCRIPTION="C/C++/ObjC language server"
+HOMEPAGE="https://github.com/MaskRay/ccls"
+
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+# We only depend on Clang because of a quirk in how dependencies work
+# See comment in llvm.eclass docs
+DEPEND="
+	dev-libs/rapidjson
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCLS_VERSION=${PV}
+		-DUSE_SYSTEM_RAPIDJSON=ON
+		-DCLANG_LINK_CLANG_DYLIB=1
+	)
+	cmake_src_configure
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 33404f6aa7db..af7f157c1b52 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
index 1bbbd8f1cde7..a253268bcc62 100644
--- a/media-sound/baudline/Manifest
+++ b/media-sound/baudline/Manifest
@@ -1,4 +1,4 @@
 DIST baudline_1.08_linux_i686.tar.gz 1945014 BLAKE2B 01dfd3c03a7d5dab3f3d65d660239ec51ec157f9711aaebfa6a155a46ec353c5d2c6676bc88f4f4642bbdabc5adf89ad174b5fb7d229933962065b0c44383055 SHA512 eb53b0508316f156b4d8ee86b9280657260039e41b7ab946796d9780af2b105c7839fd2d7bfcee032a96e27a8bc87acc7ce564b8eeccbaf348af96b2f5828e16
 DIST baudline_1.08_linux_x86_64.tar.gz 2270546 BLAKE2B 722318b4d3a1e244c8e6c57555a29b9b1305c26a3f7711cd13deef3e2f57ed78bdd624947a9db1c10cda2f807c0248e14cd1a0fc28da0a7a0511e41d75fb84cc SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4
-EBUILD baudline-1.08-r1.ebuild 1573 BLAKE2B 000d579ede1a6540db37830afe8c23d6dcda68d811bf1b2cf7a0dd5e78bfac08d0d812bc1b7ba54b79d46a02e8c3325c9c2324a994f495f036752c300ea01a9a SHA512 fb5f87b143eec8bfb5a94a748e30d0d98786b2a9db6566f114dc6edc0d86c51472e8b779ab3479b4dd13743c6af045f4e1ba203487696956835b2b356773cc7a
+EBUILD baudline-1.08-r2.ebuild 1593 BLAKE2B 0df5aa959c19eb232c4834786fb9edb6ecc326881ddb1389cc1dec322d75e4222044da6a28e2d068429f04d1a8e866ebe05d80e59cbd235482933ed4c52a2e3c SHA512 4178fceea5fe879813e1e5a58f563dc5523429affc52ceabe926c84c355b803c94998ee442f41dcc02cb8c3d6cea59429645beee32c2bc53e8d40753d87d92b6
 MISC metadata.xml 784 BLAKE2B 86498481988ca19326620eee3726c8b95c538337659a4f137c21c0a4603fa98864b4c03d342f33c009f7659ff1e8ea5ccaf776fde3f6f343f6d537ea140d273f SHA512 9d8bee3fa27b88fc243af752f7145ba0fa12673a30a0b59be11fa679fa1a912538e20c5d131beda9b75db93536e3b20aa97984a59dd3ffd471409f951169ec7e
diff --git a/media-sound/baudline/baudline-1.08-r1.ebuild b/media-sound/baudline/baudline-1.08-r2.ebuild
index 6c4a606f37ee..b1acd9cd0f9e 100644
--- a/media-sound/baudline/baudline-1.08-r1.ebuild
+++ b/media-sound/baudline/baudline-1.08-r2.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit desktop xdg
 
 DESCRIPTION="A time-frequency browser designed for visualization of spectral domains"
 HOMEPAGE="https://www.baudline.com/"
-SRC_URI="amd64? ( https://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz )
+SRC_URI="
+	amd64? ( https://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz )
 	x86? ( https://www.baudline.com/${PN}_${PV}_linux_i686.tar.gz )"
 
 LICENSE="baudline"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="jack"
-
 RESTRICT="mirror bindist"
-QA_PREBUILT="opt/baudline/baudline*"
 
-RDEPEND="media-fonts/font-adobe-75dpi
+RDEPEND="
+	media-fonts/font-adobe-75dpi
 	media-fonts/font-misc-misc
+	sys-libs/glibc
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
 
+QA_PREBUILT="opt/baudline/baudline*"
+
 src_unpack() {
 	default
 	# strip arch names from S
diff --git a/media-sound/combine_wave/Manifest b/media-sound/combine_wave/Manifest
index 3fa02af51e97..e102b93aa21e 100644
--- a/media-sound/combine_wave/Manifest
+++ b/media-sound/combine_wave/Manifest
@@ -1,4 +1,6 @@
+AUX combine_wave-0.3.1-makefile.patch 449 BLAKE2B 93a6bcc3429e9a239a438f11e4ca2fd136fcebfb93b4cbef0661d37c09e34b9d92cb4789f6a0f8863d7e60f6f97a211c2c24e376b5dd087080ac0e1974d54916 SHA512 de8aefea0b4866683a97bb81cb3456640a1dcc46c4f9a7268ea45addcdf2dc78e6cf05c3d6712840cfe6fae141285693a7b2c6e8e9c7f678b6cd5d19453884e7
+AUX combine_wave-0.3.1-missing-includes.patch 268 BLAKE2B ef9aa01211f675d5c3fc0bd9386668f6b3f278597076745e1b1c3b990409608c4065bc9e38fdbeafae07292c26cf18b4d471c7e29bdf00d5221ad90b8905200c SHA512 e8aa66b7cea2175aac68995f12f4dbd5edeb43484044133298a1a4aae0ad28712addfcfa53a66c5f2f5e95294785d55b463ebd0aaccddba71b8277626cc9565e
 AUX combine_wave-0.3.1-overflow.patch 765 BLAKE2B 3b4be839e5292b059345535a67ea4702c62aee72ac04e44bce52d8321f52e2b46efc7a8161b8fc5dc246f441dff3a6d6631246aac0ccfaf4dd6d2eb212fa7f22 SHA512 0c19f3f7344b586fa546b1c32fc7e4469ba84fd415e24ddbfdf5085739c1bc6f3b2e518e7715da52a647e30961219eda310cc6d5505f803486491996f3e71887
 DIST combine_wave-0.3.1.tgz 14875 BLAKE2B 8884cbb07bf2f713c9f308420e7c48c366575ca5fc390d0e067760eba3f6bdd197fe1b12bf5fe5b0100f376146b85d42fc6ac42ad01e48a2b9e30ffc85f136c0 SHA512 81c97074b86945d6dc7299a79e38483ce50693f25b450e9bbdfc60ea1812e9a767e726805f0cd638e27321146cd72a9ed4df77cae5522b1777d0980c3eaaa3a8
-EBUILD combine_wave-0.3.1-r1.ebuild 731 BLAKE2B 1636b0ad274c8bf049819ce1e6696f22e0da7da05fa30dcba8c9d0ceace00e6cdd9a8a6399f829197a1b617b905ab21b0d87e937ddc3915b4ddfd9704f7b0665 SHA512 d5a17daeb8193f544708a8259a1743d13b71577f6ab6847e49c1c3eaf211dcfffc051822ea1a0eb140c21daf44cb9b2061a2a1e0d95ffa97c73fc2b2bf4b78db
+EBUILD combine_wave-0.3.1-r2.ebuild 617 BLAKE2B 5c897d1b73237699b122fa66593c5e51d9f1c719d9544681a314d0a23f30096102aa9c5e1331c9b05234856a5005ddf40cdf4315fa71a6574d6e01c71b690548 SHA512 3ef8b8aebc810a332f13f0bd1f6bc565b6eedfeedf9b92f611c458ef97c2aafd40dceb141746465023a5be9eb9f5c2ef7b2ac46c6db7f6d85f78e03b1d981963
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
index 6974e43cf260..ff73a2b87cd2 100644
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,18 +12,12 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DOCS=( CHANGES README combine_wave.man )
-
-PATCHES=( "${FILESDIR}/${P}-overflow.patch" )
-
-src_prepare() {
-	default
-	# fix makefile
-	sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \
-		-e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile || die "sed Makefile failed"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+)
 
 src_configure() {
 	tc-export CC
@@ -31,5 +25,7 @@ src_configure() {
 
 src_install() {
 	dobin combine_wave
+
 	einstalldocs
+	dodoc combine_wave.man
 }
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
new file mode 100644
index 000000000000..591d56ad1867
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,16 +3,13 @@
+ #CC  = /usr/local/bin/g++
+ #CC  = /usr/bin/g++
+ 
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+-
+-.c.o:
+-	gcc $(CFLAGS) -c $<
++CFLAGS += -Wall
++CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ OBJECT =\
+ combine_wave.o
+ 
+-a.out : $(OBJECT)
+-	gcc -o combine_wave  $(OBJECT)
++all: combine_wave
+ 		
+ # DEPENDENCIES
+ combine_wave.o : combine_wave.c combine_wave.h wave_header.h
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
new file mode 100644
index 000000000000..3d6a3c938ba1
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
@@ -0,0 +1,14 @@
+--- a/combine_wave.h
++++ b/combine_wave.h
+@@ -12,9 +12,10 @@
+ #include <float.h>
+ #include <math.h>
+ #include <linux/soundcard.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include "stdint.h"
+ #include <sys/ioctl.h>
++#include <sys/select.h>
+ #include <string.h> 
+ 
+ 
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 0f24512aef6b..3d38d8288270 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r2.ebuild 1794 BLAKE2B 90edb37db9eeae374e6a471ee17ecad9ffef3dd4ee233f4c31a536e901ff754cd3c45fbf428793ba36774f287f7d86b8e02317d0f46d7f28149f1e20ac777394 SHA512 fcca520f2fece17cc8dc134f0cf9730812756c578a5c1f3ccf68d504fa8683167a7828b2adf12d6b41e20adbf17d82d58f8bd84430232b2d6c57f75e489a54c2
+EBUILD easytag-2.4.3-r3.ebuild 1780 BLAKE2B 67903f4f3eefb1747fd99e38d7789ae01c3a75ad41b40e942d8cba618d060f2811c45ddf6fb34846ea7ba8692be778ddf96adbb1fe518a8105f9f4681d28e52b SHA512 e1dadb2f8570265459799b0fce36db6d2d930e2af72ebf15ed2f8a2096fadf40e8734f2d8356b62015a03007906c0ec496c2947e1370e9fce94eb4a74edf69bc
 MISC metadata.xml 515 BLAKE2B 60cb9bf9c733779b208136aaabcbe19173ae5c0615d1d6b5266a5aabe7f90d21e0e7b1191eb1709c3350d312da6d5d1635f40c6b4e2572d5a57fb33d5144461d SHA512 0ff15896c4394587bff993f1a77d1b72b413bcc03f788d070b000097a7527cdb30fc8637513a457c32e592caa0bb1076043c099b2ae5172360274ca063cd5530
diff --git a/media-sound/easytag/easytag-2.4.3-r2.ebuild b/media-sound/easytag/easytag-2.4.3-r3.ebuild
index bfadc0488b19..98b5ca0d6565 100644
--- a/media-sound/easytag/easytag-2.4.3-r2.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-GNOME2_LA_PUNT="yes"
 inherit gnome2
 
 DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
@@ -12,13 +11,11 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	opus? ( vorbis )
-	speex? ( vorbis )
-"
+	speex? ( vorbis )"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
@@ -40,9 +37,9 @@ RDEPEND="
 		>=media-libs/libogg-1.3.1
 		>=media-libs/libvorbis-1.3.4
 	)
-	wavpack? ( >=media-sound/wavpack-4.70 )
-"
-DEPEND="${RDEPEND}
+	wavpack? ( >=media-sound/wavpack-4.70 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.4
 	app-text/yelp-tools
 	dev-util/glib-utils
@@ -54,10 +51,9 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-libs/appstream-glib
 		>=dev-util/desktop-file-utils-0.22
-	)
-"
+	)"
 
-PATCHES=( "${FILESDIR}/${P}-ogg-corruption.patch" )
+PATCHES=( "${FILESDIR}"/${P}-ogg-corruption.patch )
 
 src_configure() {
 	gnome2_src_configure \
diff --git a/media-sound/ezstream/Manifest b/media-sound/ezstream/Manifest
index 70e9048056dd..9081aa669c2d 100644
--- a/media-sound/ezstream/Manifest
+++ b/media-sound/ezstream/Manifest
@@ -1,5 +1,5 @@
 AUX ezstream.confd 60 BLAKE2B 2b2d8a1bbfd6fbd4a196dc8eecc07939b9c85b6a6ffa0f138a51e6cab1a29080aae7a91bcbf4b628c6786612ea87da20fac01f1c118e965ef672f845b19372b9 SHA512 09f178f665d8677e3c75055028f975b98310fb2017ac0d69ae40b6417134ecec40ac90493fb861e1c46a2473fdd87bc088955032e62ddfbb8e201b306066d9c3
 AUX ezstream.initd 633 BLAKE2B 32536c9fd48d9d1a77c8ba829b9aba135ca3339aed91f36f6bc90d2e89610a4d1eba0588d5dd90f7aa7b83f8f4737276178fc8cbae3b7db0cab4141e46106ea6 SHA512 684b56d3f828ce518d5fa1d5d9be64ef4b1d591fd0bed75d9842cc8d2ed79c8aab500d22465e02c60b8be5f1662462ff3a4b19a789ac807d290113cf29f6efd3
 DIST ezstream-0.6.0.tar.gz 250448 BLAKE2B 18449d90e51a6880c6acf3d99fd449f666de811dec5dc964102d87b7d1d08dab01e3d9d8d959f4a456ba695464693fec3d990115cc6b6513fcde02c937dab1c1 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d
-EBUILD ezstream-0.6.0-r1.ebuild 854 BLAKE2B 583e4e5b249feeee0d0611b78faeaef4df717161d9e56d561562ffb8303099dc8bc76b6280cc6c942970d0f41e51e2d4f3c529528575acf9951ec37fef2e61cd SHA512 87aa6d4ef146d50e660066a463e4569c07ab000f5d830b2de16ca0da36ceac63f5e07e2c11bb7a564f1a89011e8aea3d678283aaa37f3ecddfab1b85db5286a1
+EBUILD ezstream-0.6.0-r2.ebuild 844 BLAKE2B 110f6ba39753601b78b74ea487a340c13c197feeabeeed8eafbdd31e320dd2a802d9e92842fcf1cefa0a3d0d32becece7c761f094fdf3302314d8c9e33667056 SHA512 3ff1dc9f7465c1a172069aebec66581a5684bc72a95f3912eccad472e858ad168f5f24692c1f14eacebaf858b9410854605be895a91643a9c617e1cde3ce1fbd
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r2.ebuild
index 665c2a35883f..d9cb6fb09888 100644
--- a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
+++ b/media-sound/ezstream/ezstream-0.6.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A command line source client for Icecast media streaming servers"
 HOMEPAGE="https://www.icecast.org/ezstream/"
@@ -12,19 +12,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="taglib"
 
-COMMON_DEPEND="dev-libs/libxml2
+DEPEND="
+	dev-libs/libxml2
 	>=media-libs/libshout-2.2
 	!taglib? ( media-libs/libvorbis )
 	taglib? ( media-libs/taglib )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	net-misc/icecast"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
 		--enable-examplesdir='$(docdir)/examples' \
-		$(use_with taglib taglib "/usr")
+		$(use_with taglib taglib "${ESYSROOT}"/usr)
 }
 
 src_install() {
@@ -33,5 +34,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
-	rm -f "${D%/}"/usr/share/doc/${PF}/COPYING
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
index 0d15b8f94749..df6608086e79 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -3,5 +3,5 @@ AUX mp32ogg-0.11-r4-quality.patch 2676 BLAKE2B 7d3b5f6b3fe9e3f8f99031b0cc30a1fc3
 AUX mp32ogg-0.11-r5-german_umlaut.patch 1786 BLAKE2B b25e35b6a231f4138c137a413c60a9420e63bb453da7df5f53868124c0f581c9d1c4b4350dbad1322470c297d39e9cabdb2fa0372e7aa50417ebf62340ce94c1 SHA512 9e95d4de4bb4656dd9600282a169ed1c47e50dc4b47219375138e0e81d3b5e9ed14f2f8411422a7cb68a0bc458ce34af20bdf9d4f606200118a2a70451e33aeb
 AUX mp32ogg-0.11-r6-force-filename-stringification.patch 374 BLAKE2B 76a3c37e46a94cdf2712bc74bb1d981344ce6a47831d8c63b49137e66e0724df304f7fbe5696cb0a08605b56ef7c9c9b24e992e503e89687c7433acbd07fdb89 SHA512 0179d71462fb6d88f5378d5a82622544eed9869b1bd533c1fccc73337a8b3820030dfa4abe6e04f6a887da92696882d303a6e94f955166b95c7df31a437a9494
 DIST mp32ogg 9216 BLAKE2B b73b17b7005ae53487a78b5e4ae118b1c18b713609ec9d7fb83b9f1295ae21b0cf5a3178445042562cea992c078b432353a40c46cbfa5a5e49c45e8cbae95002 SHA512 342c3e0430d203fed8f793fb14fa532210cac616a0f48d243c9a14477d048bf9da3dbab5712cdf24cff2d98c6a5bc1edb43080f4ee05672fcf8f3e07fa667bd1
-EBUILD mp32ogg-0.11-r6.ebuild 784 BLAKE2B 8f70106f59b2427cfc3a968b18109383352c3ea06b61909f781c5922d7d301e3906a735ca45290de41a0c5c00807a50a702144c47194e0f64323bf41ab4667fa SHA512 ced29fa6a3e071c0016f83882893501034a7859f1f43c4840f815761f3c5d31a2de678333bc52604dd26a31bb469dac0882eaa03a03c0db1a099a82cc9824169
+EBUILD mp32ogg-0.11-r7.ebuild 765 BLAKE2B ef95accf421d2045af227e045d6c2c52154f37849678dbf287cb1d87ab923f88dfdea9dd07f8d9cc2fcd2a625a9dddbd44314cf2e2b9f26fd4417e9159041205 SHA512 e817d3ce29c38b5dcb970baf391a683d96555c8ff652785e0bdde595c2708bc82d31f552197e69c1ce727f82ba426ef4e821dbf963d1eaf805e41d5bf34ac6d4
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r7.ebuild
index 92d9ea2f2c79..c6a304b79373 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r7.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
 HOMEPAGE="http://faceprint.com/code/"
 SRC_URI="ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg"
+S="${WORKDIR}"
 
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="media-sound/mpg123
+RDEPEND="
 	dev-perl/MP3-Info
 	dev-perl/String-ShellQuote
+	media-sound/mpg123
 	media-sound/vorbis-tools"
-DEPEND=""
-
-S=${WORKDIR}
 
 PATCHES=(
-	"${FILESDIR}/${P}-r4-mpg321.patch"
-	"${FILESDIR}/${P}-r4-quality.patch"\
-	"${FILESDIR}/${P}-r5-german_umlaut.patch"
-	"${FILESDIR}/${P}-r6-force-filename-stringification.patch"
+	"${FILESDIR}"/${P}-r4-mpg321.patch
+	"${FILESDIR}"/${P}-r4-quality.patch
+	"${FILESDIR}"/${P}-r5-german_umlaut.patch
+	"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
 )
 
 src_unpack() {
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index ff8cad508c16..bf92616db48d 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,5 +1,5 @@
 AUX mp3blaster-3.2.5-fix-build-system.patch 2785 BLAKE2B 85f48a92691a538f01cf36c472d9d94e41a45bc0556e50b5f0375ef31c5aa2d2a44356ab2d732e11c135fac1a58b9e5c4e69a218f2d65663ea098319ad6964a8 SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f
 AUX mp3blaster-3.2.5-fix-c++14.patch 1206 BLAKE2B 2f007e1af876c70bab2202e628824a7b80ac1d1fddefb805849f7089d342690f4654e67829794bd17eea23c64a60b0a511dcc14d23987f577d69d57ce1d900bf SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4
 DIST mp3blaster-3.2.6.tar.gz 354019 BLAKE2B 7fcb9011c436015c2f81a1a28b19896dffdba578969edb8cc29ed20fef7f222be3c23a1409c5c0a4c2ecb5b10432178c5581837938ede23ee76fe3205eecbb51 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d
-EBUILD mp3blaster-3.2.6.ebuild 1559 BLAKE2B 2b85d26d26618c47e43d4897e420cba78b30ec3f80e2a12e94e6a7a16b98b48a71cd7d4a9e6d029bea55981b1efcef4d38fc01e9b5be548c4b5ab89272e3f98d SHA512 35e3d279d0a8c28ecbd64c5e741e37644f55bd6a009ba42d58b27ca1c682fa5bbd24e3be051742e416b068e244fc31c4449ea31826e299b66d65601a18ebcb3f
+EBUILD mp3blaster-3.2.6-r1.ebuild 1565 BLAKE2B ca920b6964b34fb1c37fb05ae497cbce9fe437a87a58c0e7f4464682758255528c80d46f9e1e5c957dcb23f7844d5dc1940d9b5201da5c34901973f9136b6a9d SHA512 ac10082ca77cb9f2f281e1bab6699d43354b6298f176ef4563cf45006d81217d450e7fa646742c2b099adfd2785534bf70d892950c00030cd90407457c8bd3b0
 MISC metadata.xml 433 BLAKE2B 4f113956ab8327011a21b00b5c05d1d1719ab58e9a39975e01cb4938bf95517614620c483f659e1ff83ed7ebf62d76c661cbff6f0e7a983159b2c91d72cd278b SHA512 a680b2e39fed703c6a78e2e043d57063a20e7beb17061f7220434ae6d04549ae2e4524be7e9056d24b141df45739856b8d74fd5169703b3252117ff7a74a073e
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6-r1.ebuild
index 396b57202668..7f2f19ec0182 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -13,18 +13,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ppc ppc64 ~riscv sparc x86"
 IUSE="lirc oss +sdl sid vorbis"
+REQUIRED_USE="|| ( oss sdl )"
 
 RDEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:=
 	lirc? ( app-misc/lirc )
 	sdl? ( media-libs/libsdl )
 	sid? ( media-libs/libsidplay:1 )
 	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	x11-misc/imake
+DEPEND="
+	${RDEPEND}
 	oss? ( virtual/os-headers )"
+BDEPEND="x11-misc/imake"
 
-REQUIRED_USE="|| ( oss sdl )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
 	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
@@ -57,8 +58,8 @@ src_install() {
 	default
 
 	# relocate everything except commands.txt because it's used by src/main.cc
-	mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
+	mv -vf "${ED}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
 
 	# file collision with media-sound/splay
-	mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
+	mv -vf "${ED}"/usr/bin/splay{,_mp3blaster} || die
 }
diff --git a/media-sound/mp3val/Manifest b/media-sound/mp3val/Manifest
index b1e7f2a73f42..7810f885bd04 100644
--- a/media-sound/mp3val/Manifest
+++ b/media-sound/mp3val/Manifest
@@ -1,4 +1,5 @@
-AUX mp3val-0.1.8-open.patch 477 BLAKE2B 8478e14f62b66b104de26e002a6f04271d96ee45c587ccb62ba808597531d8aa9878477443efeb62e2dcda534a9f213c11084634c9f0006301f330a0a420d29d SHA512 cbb11127ddecf808b41948220937078c96c87410b29676037ebb0187705f1c2f53d48c87924f9feb138ac33546d389f233940b6251d58bfc9975df7557a2aa22
+AUX mp3val-0.1.8-makefile.patch 264 BLAKE2B febbf9efb632ba000374214f12b3c2e255943d078e51b4994b1d0bf23e0c50979db3fc55072a30efed1df84d44e69e7e5a7553841aa8f1e7b2c2e44337ab0cf9 SHA512 795fcad6fe3f56df747f12555b6674735f646306c802eb510e562b844d6aa76741525cafcd055383620a983f7975cff3039797da3a7d57badf4729f353298d0e
+AUX mp3val-0.1.8-open.patch 378 BLAKE2B a6cb18e6ed85f8d0ff59582a7b4e18628573bc5dc32fa128ab78be0a8f968291e462a070ed5e5c59d36a665705f2c2a0f433d68192b3ace405fddb6adc87f163 SHA512 9b46911abc0d1e58c2eaf65e9e30a0152ca105eefb42f9ae1970b282bb48cd403da82fe6fd6b5f77aa961895cefa3f29e260faf45c42f93253a60b585662b268
 DIST mp3val-0.1.8-src.tar.gz 21406 BLAKE2B 5b2a3697db40fb9c450c6f3c23834e137b01b5a0e5787079e8b50a2b0c4e98e988077680e54541a3022601a81aee86950eded02e526c41ea0f11804613852de6 SHA512 62371453be53840fb0f0d87c9fcf9cbd6f5c8ae107e529f0cb6b8190ef9e7ebf564bb080c9d0a6adc3b5450673e70b5f4343dee82c1e6400750935cccebc2604
-EBUILD mp3val-0.1.8.ebuild 657 BLAKE2B 84279894c8a9164ab2c0685ce781175f2874e79d5c37adc947e3316e18a56e44cf41694bbb8365fc8901440e9b074a95a837a28c6195d83c8f3ee75408e5c41a SHA512 d22ab39517ba066e49d08ff30ec95e32150667756cda900a294926a58395880fbdf5dd726f2b3ccacd1e3186b29e1de7f539682a76a7e459c313ddb74f5222b9
+EBUILD mp3val-0.1.8-r1.ebuild 601 BLAKE2B 872c1f3714da1bb590ffa16e428237cf02ed3850333a826216a8a027b229495e0a8851440d8fb0746aa886b091735dc8d79a67f880fe889975131af7800a6184 SHA512 0f4d8520357cd79a610534772ba96b784488d051297ed68937c3a00f4ac5470922f427662c74930ef3e0b37f9815afcf3584ed570842aea88700450b75681008
 MISC metadata.xml 357 BLAKE2B d34e74d1f942d164d1ab4a5006994a7bba614d7769b90bc7f7d2b809dde6bb735a113709e7ee906dd3cdcd113ae53ec09880ce532cf7e8c0aef91fac49cc00c6 SHA512 9f8eee82387053eb90b05c02833c4567e9190ecc9c26e4ca5a4083aebbd46c3a389a2773e659cad6780b03b5ef1509116874e3ffa12dd50bfb5e7e59ad20c84b
diff --git a/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch
new file mode 100644
index 000000000000..8da20930602f
--- /dev/null
+++ b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -1,7 +1,7 @@
+-CXXFLAGS=-Wall -O2
++CXXFLAGS += -Wall
+ 
+ mp3val: main.o mpegparse.o out.o report.o crossapi.o crc.o
+-	$(CXX) $(CXXFLAGS) $^ -o $@
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $^ -o $@
+ 
+ clean:
+ 	rm -f mp3val
diff --git a/media-sound/mp3val/files/mp3val-0.1.8-open.patch b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
index 2b844c1fac1e..499e23272387 100644
--- a/media-sound/mp3val/files/mp3val-0.1.8-open.patch
+++ b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
@@ -1,11 +1,11 @@
---- mp3val-0.1.8-src/crossapi.cpp.orig	2010-05-03 10:45:53.000000000 -0700
-+++ mp3val-0.1.8-src/crossapi.cpp	2017-02-19 23:38:21.000000000 -0000
+--- a/crossapi.cpp
++++ b/crossapi.cpp
 @@ -241,7 +241,7 @@
- //Moving failed due to different logical drives of source and destination. Let's copy:
- 	id=open(szOldName,O_RDONLY);
- 	if(id==-1) return 0;
--	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);
-+	od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
- 	if(od==-1) {
- 		close(id);
- 		return 0;
+ //Moving failed due to different logical drives of source and destination. Let's copy:
+ 	id=open(szOldName,O_RDONLY);
+ 	if(id==-1) return 0;
+-	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);
++	od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+ 	if(od==-1) {
+ 		close(id);
+ 		return 0;
diff --git a/media-sound/mp3val/mp3val-0.1.8.ebuild b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild
index 3294d430344a..6a51bfd27fde 100644
--- a/media-sound/mp3val/mp3val-0.1.8.ebuild
+++ b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit edos2unix
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Validate and fix MPEG audio files"
 HOMEPAGE="http://mp3val.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mp3val/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
 
 PATCHES=(
-	"${FILESDIR}/${P}-open.patch"
+	"${FILESDIR}"/${P}-open.patch
+	"${FILESDIR}"/${P}-makefile.patch
 )
 
-src_prepare() {
-	edos2unix "${S}"/{*.{cpp,h},Makefile*}
-	chmod a-x "${S}"/*
-	sed -i -e '/^C.*FLAGS.*=/d' "${S}"/Makefile.linux
-	default
+src_configure() {
+	tc-export CXX
 }
 
 src_compile() {
@@ -32,6 +29,8 @@ src_compile() {
 
 src_install() {
 	dobin mp3val
-	dohtml manual.html
+
 	dodoc changelog.txt
+	docinto html
+	dodoc manual.html
 }
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 9e3f5f909ef4..739551fd40c3 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -3,9 +3,7 @@ AUX mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch 1407 BLAK
 AUX mpdscribble-0.23-gcc12-time.patch 1184 BLAKE2B efe572750084d7c625007280fbb3a7e5703aecc37e81a0a0f4b6d81bfa9d2b855e684c8da0d64d5c825306a1cd9ed7d23d2a62ba7c7eb9f9bd9f0f33c1491f7f SHA512 cafc2aaa95f4e9a184ae1724c1343991ee9f2b4937ae09ca41abdbf2e3d09263229c3d9070bf8b8ac37b0d2a583d8c6bb20dcb49ef55e5aaa9323851584302d8
 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43
 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
-DIST mpdscribble-0.23.tar.xz 46624 BLAKE2B 47c59a4b2936b7990bb2d8563422c553d1e08b39a09a873fae1ad0215bd1fcc0dbcaa69e62eab9332530717a200a52295018a578e3c615e83d68d84564060402 SHA512 f924076a8aa201f67ba81e72a44d3dd1c31618bd87e4f75f6b63f7b3814fa08f6ef4f7964b1d518c5f8b68a1f8ba88f867c08ed8b0387157eec8e9f97eb0b825
 DIST mpdscribble-0.24.tar.xz 69856 BLAKE2B 84143ed7f6978aff32fa759bbe90c934ba5c58df294d375921ffb1cd45de13ecd867fb832940088228fdad4c09948cd82c8dfe9b7fe77d6652743d522bfde8b7 SHA512 cca57f54f69ec1c870805cc58057e6325b6f5897370c315dcd6a64c5dd28ac07fdbddaa8b56f8c1fd88e71d27505f1a87decd68fbdff1f3fe1eaadec8ae80dae
 EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131
-EBUILD mpdscribble-0.23.ebuild 1006 BLAKE2B 07297a75cee5e1c3ab03420fa971c86360cba4a45cbcce3ba30f30085724593195560587b11e3f678bbb422045496c489a74de923e855c0c2a309ac03ebb74ae SHA512 831bc63481bdb6474d906c45b6af9a9720dfb394f6ec83f71fa680428f5a016fc5a4a86d157a8a7380a2c1cbd0af42bffcd38cde46808bfeed94a2652cb41518
 EBUILD mpdscribble-0.24.ebuild 1049 BLAKE2B 1db73a25ab89729df94c009fb55be4d11de546e3d52f96204d852c070d9c6c6868d6bf6a258d51b3acc666946af07e2e28412a998351077e3655b0046e035c70 SHA512 3e7ba1db5e0fdbe1957d84fef30c5137ee21136940f6ebf4cf650aa28294e46e9a9d9e3e116b8e4fe377a26b0422b5dc86b0dc77bb4c3d49b5358956b662bb51
 MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443
diff --git a/media-sound/mpdscribble/mpdscribble-0.23.ebuild b/media-sound/mpdscribble/mpdscribble-0.23.ebuild
deleted file mode 100644
index 31a25f8e4100..000000000000
--- a/media-sound/mpdscribble/mpdscribble-0.23.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd
-
-DESCRIPTION="An MPD client that submits information to Audioscrobbler"
-HOMEPAGE="
-	https://www.musicpd.org/clients/mpdscribble/
-	https://github.com/MusicPlayerDaemon/mpdscribble
-"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/libgcrypt:=
-	media-libs/libmpdclient
-	net-misc/curl
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS COPYING NEWS README.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.23-Unconditionally-generate-systemd-unit-files.patch
-	"${FILESDIR}"/${PN}-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
-)
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	keepdir /var/cache/mpdscribble
-
-	systemd_dounit "${BUILD_DIR}"/systemd/system/"${PN}".service
-	systemd_douserunit "${BUILD_DIR}"/systemd/user/"${PN}".service
-}
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 96362631e11b..7a2985288dd7 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,7 +1,4 @@
-AUX mup-6.6-makefile.patch 2563 BLAKE2B 32f32af677b83ef0889c073d0cde368c3119ef7b654531cf407a6d8796c374d78979e56095d7ce3f68ee037e0a3b3205147366b12909bac70a8d64a5c6b04ec8 SHA512 d6609bc8ee5d327bb1252d5d536b9bd5f67e58add6552fbc63456a9773eeff6c5fff2029ad754b48cc8539a001fdd6bffd74368e8e1e7085e83ea7247eb87251
 AUX mup-6.9-build-system.patch 6205 BLAKE2B f944b6dab3d206dc5fae2c5f08c36bc24310094c5cf9f7ab15098a2ace87d2bb5863eb08f254d0c2e34d0ec2e1c3eaf18f7e6e0161f6829b74fd56d1edbfd7bd SHA512 3a26e09748e89857a8f30c7b3d0fc567e46cb7494148467cac491cc0ccea4aaef25bc7364fe808931000321489a09101d357d996daa24b477c693b4e4b20a329
-DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
 DIST mup69src.tar.gz 3062560 BLAKE2B cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92 SHA512 b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95
-EBUILD mup-6.6.ebuild 905 BLAKE2B f3b807f60097085b05c04689fda392c2b1967ac604cd6884ead3a27356785f58ec78881191b02376af667b24f38cffeceb2e1a04036fdf2099dcf29d279bb68f SHA512 140c359ef8440ee3e88a25fb83f5004f3610abb4ee6bfbf5fcc2f9cca08e4ceb0fd3fdc27675571c34bf77789b0ea4c94d3a667dd09190130ccab7e579cdca02
 EBUILD mup-6.9.ebuild 950 BLAKE2B 8bef011a1927b72ab08c19bee523ed7367d7e85b5341ca81c4ab26750a46453825e6777ca791576bf6f03a9312745a87078e448224b9a1c167a8f6be65aa24fe SHA512 b884343f448468de498ac966e6e072e280534fa9bcb867ba4a1be00e00d1c14042a857cff6eeb82dbf06c1ce3e76b80c7756081db908337c1089b01aac633bac
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/mup/files/mup-6.6-makefile.patch b/media-sound/mup/files/mup-6.6-makefile.patch
deleted file mode 100644
index 0350a6e80447..000000000000
--- a/media-sound/mup/files/mup-6.6-makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Fix header/library locations for fltk, respect LDFLAGS, and allow the ebuild to
-handle docs install.
-
---- mup-6.6/makefile
-+++ mup-6.6/makefile
-@@ -80,12 +80,12 @@
- 
- # You can change this if your X libraries and headers are somewhere else
- # (like /usr/X11R6).
--X_LOCATION = /usr/X11
-+X_LOCATION = /usr
- 
- # If you installed fltk somewhere other than $(X_LOCATION)/lib
- # set this to find them, as in
- # FLTK_LIB_LOCATION = -L/usr/local/lib
--FLTK_LIB_LOCATION =
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk
- 
- # The X libraries to link with Mupmate.
- # Depending on how fltk was compiled, you may be able to omit
-@@ -99,7 +99,7 @@
- #FLTK_VERSION=FLTK_1_1
- 
- # The FLTK header files are under $(FLTK_INCLUDE)/FL
--FLTK_INCLUDE = $(X_LOCATION)/include
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk
- 
- # You can use fltk_jpeg or jpeg library, whichever you have
- # or depending on how fltk was compiled, you may not need it at all
-@@ -251,25 +251,25 @@
- 	flex -t extras/lex.l > mup/lex.c
- 
- mup/mup: $(MUP_HDRS) $(MUP_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
- 
- mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
--	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
- 	# For Linux console mode support, comment out the previous line
- 	# and uncomment the following line
- 	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
- 
- mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
- 
- mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
--	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
-+	$(CPPCOMPILER) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
- 	$(FLTK_VERSION) -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
- 	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
- 	$(JPEGLIB) $(PNGLIB) $(ZLIB) -lm
- 
- install:	all
--	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide $(ICONDIR) $(LIBDIR)
-+	mkdir -p $(BINDIR) $(MANDIR) $(ICONDIR) $(LIBDIR)
- 	cp mup/mup $(BINDIR)/mup
- 	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
- 	cp mupdisp/mupdisp $(BINDIR)/mupdisp
-@@ -278,8 +278,6 @@
- 	cp mupmate/mupmate $(BINDIR)/mupmate
- 	cp mupprnt $(BINDIR)/mupprnt
- 	cp docs/*.1 $(MANDIR)
--	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
--	cp docs/uguide/* $(DOCDIR)/uguide
- 	cp $(MUPMATE_OTHER_FILES) $(ICONDIR)
- 	cp $(MUP_LIB_FILES) $(LIBDIR)
- 
diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild
deleted file mode 100644
index 2647e954d2c2..000000000000
--- a/media-sound/mup/mup-6.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program for printing music scores"
-HOMEPAGE="http://www.arkkra.com/"
-SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
-
-LICENSE="Arkkra"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/fltk-1.3:1
-	x11-libs/libXpm
-	virtual/jpeg:0
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-	sed -i -e "s:/lib:/$(get_libdir):g" makefile || die
-}
-
-src_compile() {
-	emake CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc docs/{*.txt,README0}
-	docinto html
-	dodoc docs/{*.html,uguide/*}
-	docinto sample
-	dodoc docs/{*.mup,*.ps}
-}
diff --git a/media-sound/rexima/Manifest b/media-sound/rexima/Manifest
index f6d12246ce94..cc328adfbf63 100644
--- a/media-sound/rexima/Manifest
+++ b/media-sound/rexima/Manifest
@@ -1,3 +1,4 @@
+AUX rexima-1.4-makefile.patch 493 BLAKE2B e51d7cf175f7a355a4c33932a2607cdf22484e1e16c6f6522bb5ba8955bb4f09f35867313a71ddc48cbacac8d62ca04f0bac8cc21f672ec701e6e6072d6bcb0b SHA512 226ecbebd01740ada86b4f7f0b8d5e5626cdd6c3af4cdcbe7606effbc8d23d4f4459967a31e57f97b0f418d1dfe1c32a940d0883f2a5e6f8354b418c13e72200
 DIST rexima-1.4.tar.gz 15903 BLAKE2B 9852560036ef58a2e22974bca153d24ab07735fe5c679b3e4bd6a8a22c81a246fa28b0d52034736952faa599a0a8f4a73f34dcfa8cfb8df079148fa82bbf995b SHA512 6a4c70fd2f61446a2e79a3a22218d443f7ae4df9928b73c66f8d4d2f592d50c57f5fe53875bf975a8ffb6d9d8f99bc99d083ced2714b7623bef06229f8e37fd6
-EBUILD rexima-1.4-r1.ebuild 688 BLAKE2B a8c9f5b9bfedb05860b42597aac9a12a6dbdf9ff612b9aee25cddf8911b616664fcc65813bc012f4b44e9e228deb9136b60c0624b20ebdf47302c63805a68d6a SHA512 92b8944b62b761b78f28a428c70d733ae9695fa88d121a1d5c4b9f0c27bd28fea4bb17ecb4a6185950fd31d77062651f2180cfa1918d5a9a8c668066651b4868
+EBUILD rexima-1.4-r2.ebuild 644 BLAKE2B 7f26f1afccb706ffcd7c954974cd3b2f03aca9d91fdaa1d25122253185b6753070bd6a42c31e326fa80a40f25db0045818f437997851d1530bf5fe03f4e7d576 SHA512 ff3d11ab54868547974e7823ff493dbeb2e9f325408e615cfa0183f8fe6775d167e61769545f8654aaff14683a5f0ba35b6d86de2fe28b19c11a71458f47375f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/rexima/files/rexima-1.4-makefile.patch b/media-sound/rexima/files/rexima-1.4-makefile.patch
new file mode 100644
index 000000000000..9c70493b4cd5
--- /dev/null
+++ b/media-sound/rexima/files/rexima-1.4-makefile.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,9 @@
+ # Makefile - makefile for rexima
+ 
+-CC=gcc
+-CFLAGS=-O -Wall
++PKG_CONFIG ?= pkg-config
++CFLAGS += -Wall
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncurses)
++LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
+ 
+ # Set BINDIR to directory for binary,
+ # MANDIR to directory for man page.
+@@ -16,9 +18,6 @@
+ 
+ all: rexima
+ 
+-rexima: rexima.o
+-	$(CC) $(CFLAGS) -o rexima rexima.o -lncurses
+-
+ installdirs:
+ 	/bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR)
+ 
diff --git a/media-sound/rexima/rexima-1.4-r1.ebuild b/media-sound/rexima/rexima-1.4-r2.ebuild
index 60fcf194acd7..72dfeb4e8a71 100644
--- a/media-sound/rexima/rexima-1.4-r1.ebuild
+++ b/media-sound/rexima/rexima-1.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,19 +12,15 @@ SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	tc-export CC
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-	cat > Makefile <<- _EOF_ || die
-		LDLIBS=$($(tc-getPKG_CONFIG) --libs ncurses)
-		all: rexima
-	_EOF_
+src_configure() {
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 1ff122d85e36..4ef2bf231948 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,3 @@
-DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
 DIST soundconverter-4.0.3.gh.tar.gz 632495 BLAKE2B 9a2847b5ebb998b9122ff4020e47dc5b84635a6e1ae0de9061bab18e813ab3918278e940df80bc370b071de77a82a3637c376d9ebdd84d2f7b00865dda94935a SHA512 0674eb430bb3cf267ceabee8e7dbdeb2ee81e537ca093fcf6e1adab21112690ed9e3eb349a994805ddfc51b3a4f875b87a5819a1f2cf020752eb8e742665a998
-EBUILD soundconverter-3.0.2-r1.ebuild 1825 BLAKE2B dfad0e7f1e681fee074bcbf0503d6b9e36b5c219e591a24cb0e436ba34f2bf3eb391cbffccce51225d5eaa447e9c9ffc4d2bebb0587603f51c757fd4f071dcb5 SHA512 6e8c1754f91e7dfb132cefed59b508014658552aa68a15f3c4de6ef1ce287bcb2390e7549f920f19c3e8f4bf1101f4c5dc084b76cc4ea3053d1df896303c10c4
 EBUILD soundconverter-4.0.3.ebuild 2727 BLAKE2B 07d192af018bcabb475effbc8690f6f73fbb927e07b722283aee59b24bd9caf3c8e6395b7f6c8f938abe911c9af375f8653264ed0b10ca8837f2122e0656ac5b SHA512 5b9d6e578e82912b3f3d0d2778ebe191a79ffcf8087a6bfb27d1d77e90a743ad15f69d3ef0244ca06a70f10f6ef8490bdee38c2442edd3b4ed8a275c58c6f176
 MISC metadata.xml 413 BLAKE2B b72915536e7a83e087d9fbe87756b3a8ffa38265360d17bfacaadf75694a032bf55b024574813692ff91e0664ab0849584ab3027e277443260ff9a3afc31ffa4 SHA512 772a3ec6f12308dea14140a65e35c66066e7f9869e1518f92313f23f46f2a6f7b3f18f3b2650c7197c934d07219bca656c446aae7ef7532b57323f924222939e
diff --git a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
deleted file mode 100644
index dceecba8d9c3..000000000000
--- a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="https://soundconverter.org/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac libnotify mp3 ogg opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection:=
-	x11-libs/gtk+:3[introspection]
-	media-libs/gstreamer:1.0[introspection]
-"
-
-# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
-# List in soundconverter/gstreamer.py
-# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	')
-	libnotify? ( x11-libs/libnotify[introspection] )
-
-	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
-	media-plugins/gst-plugins-meta:1.0
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	media-libs/gst-plugins-good:1.0
-	mp3? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-lame:1.0
-	)
-	aac? ( media-plugins/gst-plugins-faac:1.0 )
-	opus? (	media-plugins/gst-plugins-opus:1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index cc22380e9360..1888b4f6f245 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -3,4 +3,4 @@ DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b
 DIST spotify-client_1.1.84.716.gc5f8b819_amd64.deb 119770140 BLAKE2B 071ee877e9c6c9a64cc3e06cdd72530e5da60087c56c29ad9511ed427df987d76258142120442ad78370f2d78c282016025ed43f7f7e94b4efb44e4a201bc839 SHA512 3cc25f28ae791ac26607117a5df668f803ed8e58f0ace085010a6242fdde97766bdc1c752560850795c9b4324f3e019937fe9af2788a1946ebb70ee781f50d99
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
 EBUILD spotify-1.1.84.ebuild 3484 BLAKE2B 96204b642b4b655fcc1c498f99552257b4c29b72a28d052ad62170665f1d81528969fa4af986cf03140a6a1aee6fef23648c909f52ea0c62e95f124745a0db14 SHA512 656e149989a990f2215c477be7e892c629193d08df6b94f83f0f24ee51e9cc75b2eb4bfc320406ba1f15aade79e3ce1b0a592651abfd3dcf6bb2715f31f2a636
-MISC metadata.xml 633 BLAKE2B acdcc4b02017e86b02be5f5e7fb56a292c5c0be9bceebf2a6d2caa4512ef240f5c1dc9d1ee6f48b1d8391556dccd81e94cda1e7233af5cd666536f5c6cb35a1e SHA512 c7b74768267009ac22c3ed90da61a60ea3ef6bb6a35c859f58ab2707af310f5201f35a526182402d669639b470ca47cd59f5a7b820b170122c4989b15f960fcc
+MISC metadata.xml 629 BLAKE2B 378a7cf4218c3c968ba0f84bb3eec0b46949131cc8db7e741d3c8ac14525527bff1269d46e41565e34d9c47e81d40caf2b5d80e433e7a47593085395a9f714f2 SHA512 42352511f0085a00f5ee07f06358110cfe1d5318eb2ea819c288ca37cf5885d14f74511037d672c4e71e8ff4a8d8d07ab4dbd522ebff4af5c9d19f4c751ebc0c
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index a8c59b0ec70a..64b7b60216ed 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <use>
-    <flag name="local-playback">Allows playing local files with the Spotify client</flag>
-    <flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
-    <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
-    <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
-  </use>
-<maintainer type="person">
-<email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="local-playback">Allows playing local files with the Spotify client</flag>
+		<flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
+		<flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
+		<flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/tagtool/Manifest b/media-sound/tagtool/Manifest
index 8eca902bf1ac..181642f5b1cd 100644
--- a/media-sound/tagtool/Manifest
+++ b/media-sound/tagtool/Manifest
@@ -1,4 +1,5 @@
-AUX tagtool-0.12.3-underlinking.patch 2714 BLAKE2B 5576cab572d24cfd30fd2ca20f057daa0aa08c82f889c0f9e2c1fad3e72527579ad24a608d80c6b6b66abb0ba26704ebb7778620bcd1159fbc80259dc6cc6707 SHA512 679754976a0bd4f8e64bce1363d74bb783265718ba7d76f5d4101df72214e740ca5e50af9bd0798230e57ec8647bb5c10f8a39b86bd57df4df52276cb59053f0
+AUX tagtool-0.12.3-QA-desktop.patch 242 BLAKE2B 1ed0f06a9508a57f88156f45897215bb4d5bc6a95f9d591f0952dde29c911ae4132d99f77ae457d5f35c3fb426045819f8aec46b892af043a4720dad866cbc1b SHA512 ea60592b98d31270897e855cfa5ea633988a9d8e4d155a421593ac08799a20efb402d574e2bd75d0dccf6e890b50224323354e7a5275119f7dadb2b0d91e237c
+AUX tagtool-0.12.3-autotools.patch 2870 BLAKE2B a1c03faef377af6a3d51a5c2ffd766a4857d71b12e8ec3727f2e3ab11975f88d7e683c91ed130bfc7d35d60f0de02fb3e12df2a5d81cfcb0f3e05ac4075dde62 SHA512 ded7531f36334487c1c05ac2516077ff5e3df539bcfc3faa7513ac1668d3c601db529e74676e351dee2c9785738d4791d44a6f15183760dbe534247e98c198e1
 DIST tagtool-0.12.3.tar.bz2 303743 BLAKE2B 58186540d9495d7a4d03bae2433822d20b9a578f279229ea267c17039a87f3dcc5fbbb105a6cd67e177ebd48ca2bf9af893013e4cf60b64b414de71633306697 SHA512 f32cf8ab072b9e8f52c5afd27e93f348a6d573085f71efedf81764a2d20941e580583c6536d420f25956eae84dcb6d1930229e60bc068ec7948247cfa64ff385
-EBUILD tagtool-0.12.3-r1.ebuild 1050 BLAKE2B d5b4cf9fd64da8443a5e51e3321c1d2ede479b5c9750587e7cfed433902322d88bf1e95854c217574330b4e25e45aded015d01e5dc313f9bca1d9afc8079e6fe SHA512 26c3af16b805fd21a7231bd943d8861cc3eb5053f144456a8f6859f0660a7cdea2256000e21dfe1526f2e2d474fb488666bbd5e6db6936b833c17416be565b78
+EBUILD tagtool-0.12.3-r2.ebuild 954 BLAKE2B a7a98d889735f9c790dd56106348303d3baf711f88a3a0659e7c6cfc43e7baa5850c290ba9bf071d1ed6427b4c464789a105801fecb6581eaa82c2f6442711fd SHA512 f2edc2128b211a8a75583c6a00b62339e214f8dcf643b36ec06e626d825f74eae3d53784c0fb45875af40d1973a035a9509cef9c31803d252bc97ead70ee0d5b
 MISC metadata.xml 331 BLAKE2B d6551557a943009e85384db344db0220d153b4a44e14d463d04da0c0e73beeceae83f4d0cca15b57e985d10fb542af494be8769137f73430f0f8105a96a8af52 SHA512 25559a24e503a70f044f7937731fb4e1003409fa9c1c0d05909388e4f630c0e0414bd94148b163130ca7bb2430c19343558b53867ee5b423532a69cb3f91f23f
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch
new file mode 100644
index 000000000000..50c290d0ee15
--- /dev/null
+++ b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch
@@ -0,0 +1,10 @@
+--- a/data/tagtool.desktop.in
++++ b/data/tagtool.desktop.in
+@@ -3,6 +3,6 @@
+ _Comment=MP3 and Ogg Vorbis tag editor
+ Exec=tagtool
+ Icon=TagTool
+-Terminal=False
++Terminal=false
+ Type=Application
+ Categories=Audio;AudioVideo;AudioVideoEditing;
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch
index 9569ad2fbaf5..40d1f5e80441 100644
--- a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch
+++ b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch
@@ -1,10 +1,11 @@
-Fix underlinking issues caused by missing libm and libogg linking
-Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012
+* Fix underlinking issues caused by missing libm and libogg linking
+  https://bugs.gentoo.org/513012
+* Fix spurious test failure caused by incomplete POTFILES.in
+  https://bugs.gentoo.org/631236
+* In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
 
-In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
-
---- tagtool-0.12.3/configure.ac
-+++ tagtool-0.12.3/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -13,20 +13,16 @@
  
  
@@ -57,8 +58,15 @@ In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
  
  AM_CONDITIONAL(ENABLE_MP3,    test "$enable_mp3" = "yes")
  AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes")
---- tagtool-0.12.3/src/Makefile.am
-+++ tagtool-0.12.3/src/Makefile.am
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -22,3 +22,4 @@
+ src/vorbis_edit.c
+ src/vorbis_edit_field.c
+ src/vorbis_file.c
++src/vcedit.c
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -28,7 +28,8 @@
  vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c 		\
  	vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c 	\
diff --git a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild
index be7039a613eb..bdd326c02eb6 100644
--- a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
+++ b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -15,21 +15,20 @@ KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="mp3 +vorbis"
 REQUIRED_USE="|| ( mp3 vorbis )"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	>=gnome-base/libglade-2.6
 	mp3? ( >=media-libs/id3lib-3.8.3-r6 )
 	vorbis? ( >=media-libs/libvorbis-1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-QA-desktop.patch
 )
 
 src_prepare() {
-	# QA fix for wrong boolean value
-	sed -i -e 's/Terminal=False/Terminal=false/' data/tagtool.desktop.in || die
-
 	default
 	eautoreconf
 }
@@ -43,9 +42,8 @@ src_configure() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		GNOME_SYSCONFDIR="${D}/etc" \
-		sysdir="${D}/usr/share/applets/Multimedia" \
+		GNOME_SYSCONFDIR="${ED}"/etc \
+		sysdir="${ED}"/usr/share/applets/Multimedia \
 		install
-
-	dodoc ChangeLog NEWS README TODO THANKS
+	einstalldocs
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 09b70035e799..dbc9ac1202e1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/Manifest.gz b/metadata/dtd/Manifest.gz
index d944721bcc37..833a9a941842 100644
--- a/metadata/dtd/Manifest.gz
+++ b/metadata/dtd/Manifest.gz
diff --git a/metadata/dtd/metadata.dtd b/metadata/dtd/metadata.dtd
index 581943e1c7ec..5f65033db5be 100644
--- a/metadata/dtd/metadata.dtd
+++ b/metadata/dtd/metadata.dtd
@@ -58,7 +58,7 @@
     <!ELEMENT bugs-to (#PCDATA)>
     <!-- specify a type of package identification tracker -->
     <!ELEMENT remote-id (#PCDATA)>
-      <!ATTLIST remote-id type (bitbucket|cpan|cpan-module|cpe|cran|ctan|gentoo|github|gitlab|google-code|heptapod|launchpad|osdn|pear|pecl|pypi|rubygems|sourceforge|vim) #REQUIRED>
+      <!ATTLIST remote-id type (bitbucket|cpan|cpan-module|cpe|cran|ctan|gentoo|github|gitlab|google-code|hackage|heptapod|launchpad|osdn|pear|pecl|pypi|rubygems|sourceforge|sourcehut|vim) #REQUIRED>
 
   <!-- category/package information for cross-linking in descriptions
     and useflag descriptions -->
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 44d032067205..eb8604da6a6f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 18:39:36 +0000
+Sat, 30 Jul 2022 00:39:31 +0000
diff --git a/metadata/dtd/timestamp.commit b/metadata/dtd/timestamp.commit
index 62bf5afd21c3..5ed841c64b3a 100644
--- a/metadata/dtd/timestamp.commit
+++ b/metadata/dtd/timestamp.commit
@@ -1 +1 @@
-25b13e88c4ed901d2d53a5ef318e24518207fa60 1653473404 2022-05-25T10:10:04+00:00
+12e699e8c570d1c71d2ece0404f59df82bdf630e 1659123245 2022-07-29T19:34:05+00:00
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0291914ae101..bbf87757f93a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-29T18:39:39Z
+TIMESTAMP 2022-07-30T00:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkKWtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkfcdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAgHRAAk5WTqyA32zLqViAwj2cnwAGW4ObISQgry0D92GN3vsxHFeHbJ/n2LZUn
-1Qczy5g44nrrG9yYY21xxlMTqYtuBHJXztkVfZMvBPrJsC/xPQtdycG2uWRhrb5I
-wt9GZ+8SRwLX1n3UxhxUhjTmhYh5MZqOqtegud9TpyFmxw1uETet2IzyZL9DxTto
-cYPytWfdsmSa4tazL67HtXL60GQz4sg6hsQIivZ6jW4scH6sL4U8F5JKdOYh9z8K
-rag3byjudwAZgaQ1vJ/mEXzR4xt8pKByLEqv4jCDpMlgIEvDLlFusaXTXJqkvCb2
-CcbE0OcBvWJ6A71QFjO6RbSH/Itj0bHgl1sA1waHeMhqUFvJkZPps1dkrOOYbTJD
-f/hFcFiYYkB96mjcbC1JvUJal3uqaq8Z/yN+EgCABHzLu1m50VMxfgqb8HWDH7jv
-4X/ajGBhL7hQfLAVteG9LJflr7/6VrAkPZ1ZQxUvZ7khFV/N40asO1b1HY2G5gl1
-UTbMifJIpbCi9XBnEQ6KgsgnBJWILSuzHQ8Tah070wIBm3faRO4fNiAxb6ZY5G8l
-b+sbc9kZRGWLyuWkVGxBoQC2qOnU48leGiyyiriXdsExqR7lAebF2a5xDU504JIs
-/DyvdYkyj2QvUWGKxIBukc0VFgp2Ip1N/b8oOtLz88sYO1Awpec=
-=jv4J
+klCkqQ//UYtZTTbEKYuhFds4IjlbnxYKszsWPfnLEJ8dCOIBixbcj+7qoryH4JMU
+ZZ9JMexnkiGZMDaQEqPmEPcggHGFmG+opvUkXhVxudOqc8/UHcpdTB7Hl/ka09JL
+qm7/mW6FBQAPY08RehN8B2tSZPWlQ1K4thaOSvLgWW4lHvVMPzM4sWNz38c5jOOv
+0EH3VDWqpHQ+r4RtQHgOhdsZmvR9NAOYjtACr4GB1VpNzeHj69/OInIlkJzAoANt
+qrCCbq6Oe0Nuq/r+G65ODuX2GHYSLQXjuTSiYLlZCIQx972qCf7K1IOxTgb0peIP
+KAla7w2AYK2fTwOyXbtCuMn2HzzaA8MaxCv2EWyVuGpkBtr7erkEFlUJ9ihvuiTc
+IRt0NnfZ+7Gmu/kmXu0Y+7GVCac8ReNZvqjgQqf7g1QQFhwaD6lmRXN9h7Su1OIC
+R03Qn8aZP0XHIQEVWFN89CLky7qE2crnWchO5/aUeBh0Lr3/cQs/uOUM4ZrOHxte
+zCkh142SvxBp5jk59Xh5LG8JUzDhbBkRZ0b4Lk3VAe3rvOaJ3CKaFPn9o0w8q37P
+huCziYYjC7gFc12LUaD4J4s52SPs4R8WWeyS/oY1EkoLr1XaI+l9H/ZK8urUsfkQ
+O8BKvr1FeRRsoH9+F0Z8j6xUAM75HrelXEx8lgpLOyqEWcItFIw=
+=y/e9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 44d032067205..eb8604da6a6f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 18:39:36 +0000
+Sat, 30 Jul 2022 00:39:31 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 19ba2c23cee3..7f68da250a06 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 5d8d2984ae3e..28994b409975 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/vault-1.10.3 b/metadata/md5-cache/app-admin/vault-1.10.3
deleted file mode 100644
index ea3d574974e0..000000000000
--- a/metadata/md5-cache/app-admin/vault-1.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=acct-group/vault acct-user/vault
-DESCRIPTION=A tool for managing secrets
-EAPI=7
-HOMEPAGE=https://vaultproject.io/
-INHERIT=fcaps go-module systemd
-IUSE=+webui +filecaps
-KEYWORDS=amd64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/zmedico/vault/archive/refs/tags/v1.10.3-vendor.tar.gz -> vault-1.10.3-vendor.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.10.3-webui.tar.xz )
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=605789cdf06b82718c1a3a00154f9673
diff --git a/metadata/md5-cache/app-admin/vault-1.10.4 b/metadata/md5-cache/app-admin/vault-1.10.4
deleted file mode 100644
index f5b868c0ee2b..000000000000
--- a/metadata/md5-cache/app-admin/vault-1.10.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=acct-group/vault acct-user/vault
-DESCRIPTION=A tool for managing secrets
-EAPI=7
-HOMEPAGE=https://vaultproject.io/
-INHERIT=fcaps go-module systemd
-IUSE=+webui +filecaps
-KEYWORDS=~amd64 ~arm64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/zmedico/vault/archive/refs/tags/v1.10.4-vendor.tar.gz -> vault-1.10.4-vendor.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.10.4-webui.tar.xz )
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8703b6b2cf563bfdefce833f1bae7916
diff --git a/metadata/md5-cache/app-admin/vault-1.10.5 b/metadata/md5-cache/app-admin/vault-1.10.5
index 2530799b06e1..233bfc1d1123 100644
--- a/metadata/md5-cache/app-admin/vault-1.10.5
+++ b/metadata/md5-cache/app-admin/vault-1.10.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://vaultproject.io/
 INHERIT=fcaps go-module systemd
 IUSE=+webui +filecaps
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
 RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/zmedico/vault/archive/refs/tags/v1.10.5-vendor.tar.gz -> vault-1.10.5-vendor.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.10.5-webui.tar.xz )
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8703b6b2cf563bfdefce833f1bae7916
+_md5_=6a09b04fa5de4252b438885e567a2125
diff --git a/metadata/md5-cache/app-admin/vault-1.11.0 b/metadata/md5-cache/app-admin/vault-1.11.0
deleted file mode 100644
index 5b05b60a779a..000000000000
--- a/metadata/md5-cache/app-admin/vault-1.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=acct-group/vault acct-user/vault
-DESCRIPTION=A tool for managing secrets
-EAPI=7
-HOMEPAGE=https://vaultproject.io/
-INHERIT=fcaps go-module systemd
-IUSE=+webui +filecaps
-KEYWORDS=~amd64 ~arm64
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/zmedico/vault/archive/refs/tags/v1.11.0-vendor.tar.gz -> vault-1.11.0-vendor.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.11.0-webui.tar.xz )
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=668064f193327672401ce5ffdb8b7054
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index c7170707eb15..2c03c1e298c8 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 b/metadata/md5-cache/app-portage/iwdevtools-0.11.5
new file mode 100644
index 000000000000..717fbb131cbe
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.11.5
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man || ( sys-apps/util-linux app-misc/getopt ) test? ( app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+INHERIT=meson optfeature
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.11.5.tar.gz -> iwdevtools-0.11.5.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d97c806050dcf3be85ebe63af3f67d82
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 308ea2e12cfe..9bbb4c7c168b 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.23.23405 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.23.23405
deleted file mode 100644
index 251e49f3a428..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.23.23405
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-INHERIT=cmake flag-o-matic
-IUSE=+l0 +vaapi
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.0.2:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.23.23405.tar.gz -> intel-compute-runtime-22.23.23405.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a4f8721cbcefd7ebad434ccb6f6b43b3
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453
deleted file mode 100644
index a478afeb5f50..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
-DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
-EAPI=8
-HOMEPAGE=https://github.com/intel/compute-runtime
-INHERIT=cmake flag-o-matic
-IUSE=+l0 +vaapi
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.0.2:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.24.23453.tar.gz -> intel-compute-runtime-22.24.23453.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aab5c12f80bcaeb0735a7058a1e9e176
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.25.23529 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.25.23529
index 36e829356803..bae2ff230820 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.25.23529
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.25.23529
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.0.2:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/22.25.23529.tar.gz -> intel-compute-runtime-22.25.23529.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aab5c12f80bcaeb0735a7058a1e9e176
+_md5_=37282a3122e8309c20947aba6dff2e05
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.4.0 b/metadata/md5-cache/dev-libs/libwacom-2.4.0
new file mode 100644
index 000000000000..5382dacdffe3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwacom-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/python-libevdev[python_targets_python3_11(-)] dev-python/pyudev[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/python-libevdev[python_targets_python3_9(-)] dev-python/pyudev[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/python-libevdev[python_targets_python3_8(-)] dev-python/pyudev[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
+EAPI=8
+HOMEPAGE=https://github.com/linuxwacom/libwacom
+INHERIT=meson python-any-r1 udev
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.4.0/libwacom-2.4.0.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=927a234ffcc96f656383d3361cc0cb6b
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e71a3e7f9103..f804ceb7c907 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.11 b/metadata/md5-cache/dev-python/snakeoil-0.9.11
new file mode 100644
index 000000000000..312774f3715a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD BSD-2 MIT
+RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.11.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0f068a6e1aa78e1e08dc2de69dfd6dd7
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index b0c5a7b19507..7572bf6503e0 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/pytest-6 ) dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=misc common functionality and useful optimizations
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1c44fdf76d8b3490a93aa2e5ae0b3e93
+_md5_=0f068a6e1aa78e1e08dc2de69dfd6dd7
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5be139b94149..32f60ebe2c82 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/ccls-0.20220729 b/metadata/md5-cache/dev-util/ccls-0.20220729
new file mode 100644
index 000000000000..37471af00eba
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccls-0.20220729
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/rapidjson <sys-devel/clang-15:= !!sys-devel/llvm:0
+DESCRIPTION=C/C++/ObjC language server
+EAPI=7
+HOMEPAGE=https://github.com/MaskRay/ccls
+INHERIT=cmake llvm
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/rapidjson <sys-devel/clang-15:=
+SLOT=0
+SRC_URI=https://github.com/MaskRay/ccls/archive/0.20220729.tar.gz -> ccls-0.20220729.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b119d193a6b0db8beff8e511a355c1a4
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8c2af686e1d3..9742cbc4dc9f 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/baudline-1.08-r1 b/metadata/md5-cache/media-sound/baudline-1.08-r2
index 294f89144b7b..448d34f4b4f8 100644
--- a/metadata/md5-cache/media-sound/baudline-1.08-r1
+++ b/metadata/md5-cache/media-sound/baudline-1.08-r2
@@ -1,15 +1,14 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=install postinst postrm preinst unpack
 DESCRIPTION=A time-frequency browser designed for visualization of spectral domains
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.baudline.com/
 INHERIT=desktop xdg
 IUSE=jack
 KEYWORDS=amd64 ~x86
 LICENSE=baudline
-RDEPEND=media-fonts/font-adobe-75dpi media-fonts/font-misc-misc x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
+RDEPEND=media-fonts/font-adobe-75dpi media-fonts/font-misc-misc sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://www.baudline.com/baudline_1.08_linux_x86_64.tar.gz ) x86? ( https://www.baudline.com/baudline_1.08_linux_i686.tar.gz )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8d96ce7d0000c05b2e3af48ddd724b1a
+_md5_=4f152868186cd56c5e7e7f5a64682c18
diff --git a/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1 b/metadata/md5-cache/media-sound/combine_wave-0.3.1-r2
index cd3879ed6c2a..d2a2a4cd6b32 100644
--- a/metadata/md5-cache/media-sound/combine_wave-0.3.1-r1
+++ b/metadata/md5-cache/media-sound/combine_wave-0.3.1-r2
@@ -1,6 +1,6 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch
-EAPI=6
+EAPI=8
 HOMEPAGE=http://panteltje.com/panteltje/dvd/
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://panteltje.com/panteltje/dvd/combine_wave-0.3.1.tgz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0d10177f44f4336861bd923518f259de
+_md5_=d70ac49ae429a88a7f5e25af25f35dd3
diff --git a/metadata/md5-cache/media-sound/easytag-2.4.3-r2 b/metadata/md5-cache/media-sound/easytag-2.4.3-r3
index 8a9bff191508..a47b81f2dc3e 100644
--- a/metadata/md5-cache/media-sound/easytag-2.4.3-r2
+++ b/metadata/md5-cache/media-sound/easytag-2.4.3-r3
@@ -1,7 +1,8 @@
+BDEPEND=app-text/docbook-xml-dtd:4.4 app-text/yelp-tools dev-util/glib-utils dev-libs/libxml2 dev-libs/libxslt >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18.3.2 virtual/pkgconfig test? ( dev-libs/appstream-glib >=dev-util/desktop-file-utils-0.22 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.10:3 flac? ( >=media-libs/flac-1.3 ) mp3? ( >=media-libs/id3lib-3.8.3-r8 >=media-libs/libid3tag-0.15.1b-r4:= ) mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] ) nautilus? ( gnome-base/nautilus ) opus? ( >=media-libs/opus-1.1 >=media-libs/opusfile-0.4 ) speex? ( >=media-libs/speex-1.2_rc1 ) vorbis? ( >=media-libs/libogg-1.3.1 >=media-libs/libvorbis-1.3.4 ) wavpack? ( >=media-sound/wavpack-4.70 ) app-text/docbook-xml-dtd:4.4 app-text/yelp-tools dev-util/glib-utils dev-libs/libxml2 dev-libs/libxslt >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18.3.2 virtual/pkgconfig test? ( dev-libs/appstream-glib >=dev-util/desktop-file-utils-0.22 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.10:3 flac? ( >=media-libs/flac-1.3 ) mp3? ( >=media-libs/id3lib-3.8.3-r8 >=media-libs/libid3tag-0.15.1b-r4:= ) mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] ) nautilus? ( gnome-base/nautilus ) opus? ( >=media-libs/opus-1.1 >=media-libs/opusfile-0.4 ) speex? ( >=media-libs/speex-1.2_rc1 ) vorbis? ( >=media-libs/libogg-1.3.1 >=media-libs/libvorbis-1.3.4 ) wavpack? ( >=media-sound/wavpack-4.70 )
 DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/EasyTAG
 INHERIT=gnome2
 IUSE=flac mp3 mp4 nautilus opus speex test vorbis wavpack
@@ -12,5 +13,5 @@ REQUIRED_USE=opus? ( vorbis ) speex? ( vorbis )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.4/easytag-2.4.3.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cce6128009e0cc8256f217af2ada173d
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bb8be64f826914f26bc2cd797c353d09
diff --git a/metadata/md5-cache/media-sound/ezstream-0.6.0-r1 b/metadata/md5-cache/media-sound/ezstream-0.6.0-r2
index 3e58c6c3b378..eabe870dba19 100644
--- a/metadata/md5-cache/media-sound/ezstream-0.6.0-r1
+++ b/metadata/md5-cache/media-sound/ezstream-0.6.0-r2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/libxml2 >=media-libs/libshout-2.2 !taglib? ( media-libs/libvorbis ) taglib? ( media-libs/taglib ) virtual/pkgconfig
+DEPEND=dev-libs/libxml2 >=media-libs/libshout-2.2 !taglib? ( media-libs/libvorbis ) taglib? ( media-libs/taglib )
 DESCRIPTION=A command line source client for Icecast media streaming servers
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.icecast.org/ezstream/
 IUSE=taglib
 KEYWORDS=~amd64 ~ppc ~x86
@@ -9,4 +10,4 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=media-libs/libshout-2.2 !taglib? ( media-libs/libvorbis ) taglib? ( media-libs/taglib ) net-misc/icecast
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ezstream/ezstream-0.6.0.tar.gz
-_md5_=78544b74d7a17b0e4d2de27a364a1d05
+_md5_=08c053952c4abe5fdbe123c0a2c70e6f
diff --git a/metadata/md5-cache/media-sound/mp32ogg-0.11-r6 b/metadata/md5-cache/media-sound/mp32ogg-0.11-r7
index 5abab26b1f98..9427b18cee57 100644
--- a/metadata/md5-cache/media-sound/mp32ogg-0.11-r6
+++ b/metadata/md5-cache/media-sound/mp32ogg-0.11-r7
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install unpack
 DESCRIPTION=A perl script to convert MP3 files to Ogg Vorbis files
-EAPI=6
+EAPI=8
 HOMEPAGE=http://faceprint.com/code/
 KEYWORDS=amd64 x86
 LICENSE=Artistic
-RDEPEND=media-sound/mpg123 dev-perl/MP3-Info dev-perl/String-ShellQuote media-sound/vorbis-tools
+RDEPEND=dev-perl/MP3-Info dev-perl/String-ShellQuote media-sound/mpg123 media-sound/vorbis-tools
 SLOT=0
 SRC_URI=ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg
-_md5_=6c273b20bb122af0140e24a6d66fec05
+_md5_=e971a9ea083032d5ce4ea6ebba6b5809
diff --git a/metadata/md5-cache/media-sound/mp3blaster-3.2.6 b/metadata/md5-cache/media-sound/mp3blaster-3.2.6
deleted file mode 100644
index e8a0aa9be4a2..000000000000
--- a/metadata/md5-cache/media-sound/mp3blaster-3.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis ) x11-misc/imake oss? ( virtual/os-headers ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Text console based program for playing audio files
-EAPI=6
-HOMEPAGE=http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster
-INHERIT=autotools
-IUSE=lirc oss +sdl sid vorbis
-KEYWORDS=~alpha amd64 arm ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis )
-REQUIRED_USE=|| ( oss sdl )
-SLOT=0
-SRC_URI=mirror://sourceforge/mp3blaster/mp3blaster-3.2.6.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=af33f7f5e95fd4d7398f85dbc33416c9
diff --git a/metadata/md5-cache/media-sound/mp3blaster-3.2.6-r1 b/metadata/md5-cache/media-sound/mp3blaster-3.2.6-r1
new file mode 100644
index 000000000000..61ab2109b6ed
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mp3blaster-3.2.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=x11-misc/imake sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis ) oss? ( virtual/os-headers )
+DESCRIPTION=Text console based program for playing audio files
+EAPI=8
+HOMEPAGE=http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster
+INHERIT=autotools
+IUSE=lirc oss +sdl sid vorbis
+KEYWORDS=~alpha amd64 arm ppc ppc64 ~riscv sparc x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( oss sdl )
+SLOT=0
+SRC_URI=mirror://sourceforge/mp3blaster/mp3blaster-3.2.6.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=cbcb8741cc41a99a125a63326eaff02e
diff --git a/metadata/md5-cache/media-sound/mp3val-0.1.8 b/metadata/md5-cache/media-sound/mp3val-0.1.8
deleted file mode 100644
index da600061fd33..000000000000
--- a/metadata/md5-cache/media-sound/mp3val-0.1.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Validate and fix MPEG audio files
-EAPI=6
-HOMEPAGE=http://mp3val.sourceforge.net/
-INHERIT=edos2unix
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/mp3val/mp3val-0.1.8-src.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773
-_md5_=e32418ad018ebeb071daf39c36f2570a
diff --git a/metadata/md5-cache/media-sound/mp3val-0.1.8-r1 b/metadata/md5-cache/media-sound/mp3val-0.1.8-r1
new file mode 100644
index 000000000000..820615a72a96
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mp3val-0.1.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Validate and fix MPEG audio files
+EAPI=8
+HOMEPAGE=http://mp3val.sourceforge.net/
+INHERIT=toolchain-funcs
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/mp3val/mp3val-0.1.8-src.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=07c397a3f4728653f65b969fc26a4437
diff --git a/metadata/md5-cache/media-sound/mpdscribble-0.23 b/metadata/md5-cache/media-sound/mpdscribble-0.23
deleted file mode 100644
index cb6a1aa8b5a1..000000000000
--- a/metadata/md5-cache/media-sound/mpdscribble-0.23
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/boost dev-libs/libgcrypt:= media-libs/libmpdclient net-misc/curl
-DESCRIPTION=An MPD client that submits information to Audioscrobbler
-EAPI=8
-HOMEPAGE=https://www.musicpd.org/clients/mpdscribble/ https://github.com/MusicPlayerDaemon/mpdscribble
-INHERIT=meson systemd
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost dev-libs/libgcrypt:= media-libs/libmpdclient net-misc/curl
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/mpdscribble/0.23/mpdscribble-0.23.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c2ef70afe17dc9e3be0c3b32ca8dd3a5
diff --git a/metadata/md5-cache/media-sound/mup-6.6 b/metadata/md5-cache/media-sound/mup-6.6
deleted file mode 100644
index 8581b2664e2f..000000000000
--- a/metadata/md5-cache/media-sound/mup-6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext >=x11-libs/fltk-1.3:1 x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= x11-base/xorg-proto
-DESCRIPTION=Program for printing music scores
-EAPI=6
-HOMEPAGE=http://www.arkkra.com/
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=Arkkra
-RDEPEND=x11-libs/libX11 x11-libs/libXext >=x11-libs/fltk-1.3:1 x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0=
-SLOT=0
-SRC_URI=ftp://ftp.arkkra.com/pub/unix/mup66src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8c9dca58afa5ab2e141d6977e27909ca
diff --git a/metadata/md5-cache/media-sound/rexima-1.4-r1 b/metadata/md5-cache/media-sound/rexima-1.4-r2
index a4e117cdb00a..1911812d5b4c 100644
--- a/metadata/md5-cache/media-sound/rexima-1.4-r1
+++ b/metadata/md5-cache/media-sound/rexima-1.4-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
+DEPEND=sys-libs/ncurses:=
 DESCRIPTION=A curses-based interactive mixer which can also be used from the command-line
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.svgalib.org/rus/rexima.html
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
+RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/rexima-1.4.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=61a5c171175ea6995581c07d2369ca7c
+_md5_=c989c29bf9047b5003a0628ae5505132
diff --git a/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1 b/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
deleted file mode 100644
index 82b505b90efe..000000000000
--- a/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-libs/gobject-introspection:= x11-libs/gtk+:3[introspection] media-libs/gstreamer:1.0[introspection] dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A simple audiofile converter application for the GNOME environment
-EAPI=6
-HOMEPAGE=https://soundconverter.org/
-INHERIT=gnome2 python-single-r1
-IUSE=aac flac libnotify mp3 ogg opus vorbis python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) dev-libs/gobject-introspection:= x11-libs/gtk+:3[introspection] media-libs/gstreamer:1.0[introspection] x11-libs/pango[introspection] python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) libnotify? ( x11-libs/libnotify[introspection] ) media-libs/gst-plugins-base:1.0[vorbis?,ogg?] media-plugins/gst-plugins-meta:1.0 flac? ( media-plugins/gst-plugins-flac:1.0 ) media-libs/gst-plugins-good:1.0 mp3? ( media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-lame:1.0 ) aac? ( media-plugins/gst-plugins-faac:1.0 ) opus? ( media-plugins/gst-plugins-opus:1.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/soundconverter/trunk/3.0.2/+download/soundconverter-3.0.2.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2070204df4e6dd8fab3d8fb07b386215
diff --git a/metadata/md5-cache/media-sound/tagtool-0.12.3-r1 b/metadata/md5-cache/media-sound/tagtool-0.12.3-r1
deleted file mode 100644
index 5523e10c76c6..000000000000
--- a/metadata/md5-cache/media-sound/tagtool-0.12.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2.6 mp3? ( >=media-libs/id3lib-3.8.3-r6 ) vorbis? ( >=media-libs/libvorbis-1 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Audio Tag Tool Ogg/Mp3 Tagger
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/tagtool/
-INHERIT=autotools
-IUSE=mp3 +vorbis
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2.6 mp3? ( >=media-libs/id3lib-3.8.3-r6 ) vorbis? ( >=media-libs/libvorbis-1 )
-REQUIRED_USE=|| ( mp3 vorbis )
-SLOT=0
-SRC_URI=https://sourceforge.net/projects/tagtool/files/tagtool/0.12.3/tagtool-0.12.3.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=88bc6d02b876a52982e7dcba204e72c9
diff --git a/metadata/md5-cache/media-sound/tagtool-0.12.3-r2 b/metadata/md5-cache/media-sound/tagtool-0.12.3-r2
new file mode 100644
index 000000000000..6c27b291d6bb
--- /dev/null
+++ b/metadata/md5-cache/media-sound/tagtool-0.12.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2.6 mp3? ( >=media-libs/id3lib-3.8.3-r6 ) vorbis? ( >=media-libs/libvorbis-1 )
+DESCRIPTION=Audio Tag Tool Ogg/Mp3 Tagger
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/tagtool/
+INHERIT=autotools
+IUSE=mp3 +vorbis
+KEYWORDS=amd64 ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 >=gnome-base/libglade-2.6 mp3? ( >=media-libs/id3lib-3.8.3-r6 ) vorbis? ( >=media-libs/libvorbis-1 )
+REQUIRED_USE=|| ( mp3 vorbis )
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/tagtool/files/tagtool/0.12.3/tagtool-0.12.3.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=07041b87f7bfda2a6ffa3d2398dd645b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 0ed8ece98936..a42366d97db7 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/dnstracer-1.9-r2 b/metadata/md5-cache/net-analyzer/dnstracer-1.9-r2
deleted file mode 100644
index c2e1782234a9..000000000000
--- a/metadata/md5-cache/net-analyzer/dnstracer-1.9-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Determines where a given nameserver gets its information from
-EAPI=6
-HOMEPAGE=http://www.mavetju.org/unix/general.php
-IUSE=ipv6
-KEYWORDS=amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://www.mavetju.org/download/dnstracer-1.9.tar.gz
-_md5_=5f6dcb0e04414fcb105212f6dda12cf0
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 53e6e7e82cd0..bb5c569ae563 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4 b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4
index 334dff98df28..2e5336416bf9 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo virtual/awk fax? ( !net-mi
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b1c62ff46e27b8ae668adddb5931de1
+_md5_=b9dacdf1714e99077c53e69c9c1fc522
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index f2760b0d5999..f722b4387f70 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/weechat-3.3 b/metadata/md5-cache/net-irc/weechat-3.3
deleted file mode 100644
index afbdc46c4adc..000000000000
--- a/metadata/md5-cache/net-irc/weechat-3.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=7
-HOMEPAGE=https://weechat.org/
-INHERIT=cmake lua-single python-single-r1 xdg-utils
-IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) test? ( nls )
-RESTRICT=!test? ( test )
-SLOT=0/3.3
-SRC_URI=https://weechat.org/files/src/weechat-3.3.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ac3f04663e313a8b2d92399b9033a6e3
diff --git a/metadata/md5-cache/net-irc/weechat-3.4 b/metadata/md5-cache/net-irc/weechat-3.4
deleted file mode 100644
index 86c70cb78bbb..000000000000
--- a/metadata/md5-cache/net-irc/weechat-3.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=7
-HOMEPAGE=https://weechat.org/
-INHERIT=cmake lua-single python-single-r1 xdg-utils
-IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( nls )
-RESTRICT=!test? ( test )
-SLOT=0/3.4
-SRC_URI=https://weechat.org/files/src/weechat-3.4.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ccc9fe7cea5b6bd47ffdf3499cd20b35
diff --git a/metadata/md5-cache/net-irc/weechat-3.4.1 b/metadata/md5-cache/net-irc/weechat-3.4.1
deleted file mode 100644
index c43dce63aa3f..000000000000
--- a/metadata/md5-cache/net-irc/weechat-3.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-weechat ) virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
-DESCRIPTION=Portable and multi-interface IRC client
-EAPI=7
-HOMEPAGE=https://weechat.org/
-INHERIT=cmake lua-single python-single-r1 xdg-utils verify-sig
-IUSE=doc man nls selinux test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( nls )
-RESTRICT=!test? ( test )
-SLOT=0/3.4.1
-SRC_URI=https://weechat.org/files/src/weechat-3.4.1.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-3.4.1.tar.xz.asc )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=37c4b5f41d97272efd11ac7088c80a63
diff --git a/metadata/md5-cache/net-irc/weechat-3.5-r1 b/metadata/md5-cache/net-irc/weechat-3.5-r1
index 947ca8f5f4b2..254bef95e670 100644
--- a/metadata/md5-cache/net-irc/weechat-3.5-r1
+++ b/metadata/md5-cache/net-irc/weechat-3.5-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://weechat.org/
 INHERIT=cmake lua-single python-single-r1 xdg-utils verify-sig
 IUSE=doc man nls selinux test guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer +irc lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=app-arch/zstd:= dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( 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 ) ) ruby? ( || ( dev-lang/ruby:3.1 dev-lang/ruby:3.0 dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) ) selinux? ( sec-policy/selinux-irc ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) test? ( nls )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3.5
 SRC_URI=https://weechat.org/files/src/weechat-3.5.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-3.5.tar.xz.asc )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=74775846adfb3aa116cc1d6c2582bfb2
+_md5_=1bef5d3576431d044b0f5780296b271c
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 39697dc0d13c..c41ea2211866 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_s
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=74775846adfb3aa116cc1d6c2582bfb2
+_md5_=cd6746073ec6ffa83fed68d0d9905ed4
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 050d094f5d49..c58206d2bf92 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/wget-1.21.2 b/metadata/md5-cache/net-misc/wget-1.21.2
index ff0c94983ab8..4e8658f95c9f 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.2
+++ b/metadata/md5-cache/net-misc/wget-1.21.2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL )
+BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-perl/HTTP-Daemon-6.60.0 dev-perl/HTTP-Message dev-perl/IO-Socket-SSL )
 DEFINED_PHASES=configure prepare setup
 DEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0=[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) )
 DESCRIPTION=Network utility to retrieve files from the WWW
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=82bcaa6300995c69afcac9cf467971cb
+_md5_=ba1c2b412dfd3f09e31166d7f6b789d7
diff --git a/metadata/md5-cache/net-misc/wget-1.21.3 b/metadata/md5-cache/net-misc/wget-1.21.3
index a2dbc270beff..1876496a16ae 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.3
+++ b/metadata/md5-cache/net-misc/wget-1.21.3
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) verify-sig? ( sec-keys/openpgp-keys-wget ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-perl/HTTP-Daemon-6.60.0 dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) verify-sig? ( sec-keys/openpgp-keys-wget ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure prepare setup unpack
 DEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:=[static-libs(+)] ) !gnutls? ( dev-libs/openssl:=[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) )
 DESCRIPTION=Network utility to retrieve files from the WWW
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.3.tar.gz verify-sig? ( mirror://gnu/wget/wget-1.21.3.tar.gz.sig )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=18efde65dc897dcf5492cf49abfd0406
+_md5_=ba315d0b7dbce4ee69e5cc1038b5a2ec
diff --git a/metadata/md5-cache/net-misc/wget-1.21.3-r1 b/metadata/md5-cache/net-misc/wget-1.21.3-r1
index b2b508ae0c1c..078b5335bbfe 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.3-r1
+++ b/metadata/md5-cache/net-misc/wget-1.21.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) verify-sig? ( sec-keys/openpgp-keys-wget ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-perl/HTTP-Daemon-6.60.0 dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) verify-sig? ( sec-keys/openpgp-keys-wget ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure prepare setup unpack
 DEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:=[static-libs(+)] ) !gnutls? ( dev-libs/openssl:=[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) )
 DESCRIPTION=Network utility to retrieve files from the WWW
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.3.tar.gz verify-sig? ( mirror://gnu/wget/wget-1.21.3.tar.gz.sig )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d7d66dc5cc815e8ca925fa09e409a2ec
+_md5_=3b6d35a851cae16f6fe1a0e01446295c
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index bf221f8761eb..05379f182470 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/smbldap-tools-0.9.11 b/metadata/md5-cache/net-nds/smbldap-tools-0.9.11-r1
index 9cc174abbd88..17f56ee6c0c2 100644
--- a/metadata/md5-cache/net-nds/smbldap-tools-0.9.11
+++ b/metadata/md5-cache/net-nds/smbldap-tools-0.9.11-r1
@@ -1,14 +1,13 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst prepare
-DEPEND=dev-perl/perl-ldap dev-perl/Crypt-SmbHash dev-perl/Digest-SHA1 dev-perl/Unicode-MapUTF8 dev-perl/IO-Socket-SSL net-nds/openldap net-fs/samba
 DESCRIPTION=Samba LDAP management tools
 EAPI=8
 HOMEPAGE=https://github.com/fumiyas/smbldap-tools
 INHERIT=autotools
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-perl/perl-ldap dev-perl/Crypt-SmbHash dev-perl/Digest-SHA1 dev-perl/Unicode-MapUTF8 dev-perl/IO-Socket-SSL net-nds/openldap net-fs/samba
+RDEPEND=dev-perl/perl-ldap dev-perl/Crypt-SmbHash dev-perl/Digest-SHA1 dev-perl/Unicode-MapUTF8 dev-perl/IO-Socket-SSL
 SLOT=0
 SRC_URI=https://github.com/fumiyas/smbldap-tools/archive/refs/tags/v0.9.11.tar.gz -> smbldap-tools-0.9.11.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=41ed5927a57547e7f7209d2587bc54f4
+_md5_=ac22b801b612c18684bf584cbc30e827
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index c4601a504dd7..94dd38a1e396 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/unifi-7.1.66 b/metadata/md5-cache/net-wireless/unifi-7.1.66
deleted file mode 100644
index 1a41a41f5d2f..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-7.1.66
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
-EAPI=8
-HOMEPAGE=https://www.ubnt.com
-INHERIT=java-pkg-2 readme.gentoo-r1 systemd
-IUSE=systemd system-mongodb
-KEYWORDS=-* amd64 ~arm64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0/7.1
-SRC_URI=https://dl.ui.com/unifi/7.1.66-c70daa41cf/UniFi.unix.zip -> unifi-7.1.66.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=90440b3a572027d8cc81eb304aa12c28
diff --git a/metadata/md5-cache/net-wireless/unifi-7.1.67 b/metadata/md5-cache/net-wireless/unifi-7.1.67
index cfff2859d44c..7ea2739fcc00 100644
--- a/metadata/md5-cache/net-wireless/unifi-7.1.67
+++ b/metadata/md5-cache/net-wireless/unifi-7.1.67
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.ubnt.com
 INHERIT=java-pkg-2 readme.gentoo-r1 systemd
 IUSE=systemd system-mongodb
-KEYWORDS=-* ~amd64 ~arm64
+KEYWORDS=-* amd64 ~arm64
 LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0/7.1
 SRC_URI=https://dl.ui.com/unifi/7.1.67-c58de44a45/UniFi.unix.zip -> unifi-7.1.67.zip
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=69a819ba12f1057d634e21c35ca74abc
+_md5_=26d280b7b31adc72f50ef32fa5c19ceb
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 2d5e07139935..f66cf5a8020b 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/cpuid-20220224 b/metadata/md5-cache/sys-apps/cpuid-20220224
deleted file mode 100644
index 9fada167dbdf..000000000000
--- a/metadata/md5-cache/sys-apps/cpuid-20220224
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/gzip dev-lang/perl
-DEFINED_PHASES=install prepare
-DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
-EAPI=8
-HOMEPAGE=http://www.etallen.com/cpuid.html
-INHERIT=toolchain-funcs
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://www.etallen.com/cpuid/cpuid-20220224.src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=19c240d72c592c13725d395268e5044b
diff --git a/metadata/md5-cache/sys-apps/cpuid-20220620 b/metadata/md5-cache/sys-apps/cpuid-20220620
index ff5be6ef4127..ca884f047709 100644
--- a/metadata/md5-cache/sys-apps/cpuid-20220620
+++ b/metadata/md5-cache/sys-apps/cpuid-20220620
@@ -4,9 +4,9 @@ DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
 EAPI=8
 HOMEPAGE=http://www.etallen.com/cpuid.html
 INHERIT=toolchain-funcs
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://www.etallen.com/cpuid/cpuid-20220620.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=82a4f090e6b1326092ee1eb773f9d6e9
+_md5_=aca7668a39aa7ee7e71677316c2dfec4
diff --git a/metadata/md5-cache/sys-apps/inxi-3.3.04.1 b/metadata/md5-cache/sys-apps/inxi-3.3.04.1
deleted file mode 100644
index 82c6ba71532a..000000000000
--- a/metadata/md5-cache/sys-apps/inxi-3.3.04.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=The CLI inxi collects and prints hardware and system information
-EAPI=7
-HOMEPAGE=https://github.com/smxi/inxi
-IUSE=bluetooth hddtemp opengl
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl sys-apps/pciutils sys-apps/usbutils bluetooth? ( net-wireless/bluez ) hddtemp? ( app-admin/hddtemp ) opengl? ( x11-apps/mesa-progs )
-SLOT=0
-SRC_URI=https://github.com/smxi/inxi/archive/3.3.04-1.tar.gz -> inxi-3.3.04.1.tar.gz
-_md5_=cc89ee5ad3f303d283fcda17f7038bf2
diff --git a/metadata/md5-cache/sys-apps/inxi-3.3.06.1 b/metadata/md5-cache/sys-apps/inxi-3.3.20.1
index a6cc06664c47..5f7cffaf60be 100644
--- a/metadata/md5-cache/sys-apps/inxi-3.3.06.1
+++ b/metadata/md5-cache/sys-apps/inxi-3.3.20.1
@@ -3,9 +3,9 @@ DESCRIPTION=The CLI inxi collects and prints hardware and system information
 EAPI=8
 HOMEPAGE=https://github.com/smxi/inxi
 IUSE=bluetooth hddtemp opengl
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl sys-apps/pciutils sys-apps/usbutils bluetooth? ( net-wireless/bluez ) hddtemp? ( app-admin/hddtemp ) opengl? ( x11-apps/mesa-progs )
 SLOT=0
-SRC_URI=https://github.com/smxi/inxi/archive/3.3.06-1.tar.gz -> inxi-3.3.06.1.tar.gz
-_md5_=4212c6c7ebae44961aa5193aaa98e53a
+SRC_URI=https://github.com/smxi/inxi/archive/3.3.20-1.tar.gz -> inxi-3.3.20.1.tar.gz
+_md5_=e26c7efaede26ba4213d9330fcf034c6
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 776923e33468..5499e4d1f563 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.3-r200 b/metadata/md5-cache/www-apps/cgit-1.2.3-r200
index ebc4a63e8a71..c0cf3593a602 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.3-r200
+++ b/metadata/md5-cache/www-apps/cgit-1.2.3-r200
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile install postinst prepare prerm setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi doc? ( app-text/docbook-xsl-stylesheets >=app-text/asciidoc-8.5.1 ) app-admin/webapp-config
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi doc? ( app-text/docbook-xsl-stylesheets >=app-text/asciidoc-8.5.1 ) app-admin/webapp-config
 DESCRIPTION=a fast web-interface for git repositories
 EAPI=7
 HOMEPAGE=https://git.zx2c4.com/cgit/about
 INHERIT=lua-single python-single-r1 toolchain-funcs webapp
-IUSE=doc +highlight +lua test lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 vhosts
+IUSE=doc +highlight +lua test lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 vhosts
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi app-admin/webapp-config
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi app-admin/webapp-config
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=99d24f8adf841ef550bb69088a8117ab
+_md5_=566fc8faba6f22341fa53dcdbc9f232b
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.3-r201 b/metadata/md5-cache/www-apps/cgit-1.2.3-r201
new file mode 100644
index 000000000000..1978ab7eb5eb
--- /dev/null
+++ b/metadata/md5-cache/www-apps/cgit-1.2.3-r201
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/docbook-xsl-stylesheets >=app-text/asciidoc-8.5.1 )
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygments[python_targets_python3_11(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi app-admin/webapp-config
+DESCRIPTION=a fast web-interface for git repositories
+EAPI=8
+HOMEPAGE=https://git.zx2c4.com/cgit/about
+INHERIT=lua-single python-single-r1 toolchain-funcs webapp
+IUSE=doc +highlight +lua test lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) acct-group/cgit acct-user/cgit dev-libs/openssl:0= dev-vcs/git highlight? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygments[python_targets_python3_11(-)] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi app-admin/webapp-config
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.3.tar.xz
+_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	webapp	d872f28d7595b70dd46545199ef35fb0
+_md5_=523fd823383a4abc503e297af86821e5
diff --git a/metadata/md5-cache/www-apps/cgit-9999 b/metadata/md5-cache/www-apps/cgit-9999
deleted file mode 100644
index 440da102aeef..000000000000
--- a/metadata/md5-cache/www-apps/cgit-9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst prepare prerm setup test unpack
-DEPEND=acct-group/cgit acct-user/cgit dev-vcs/git highlight? ( || ( dev-python/pygments app-text/highlight ) ) dev-libs/openssl:0= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi doc? ( app-text/docbook-xsl-stylesheets >=app-text/asciidoc-8.5.1 ) app-admin/webapp-config
-DESCRIPTION=a fast web-interface for git repositories
-EAPI=7
-HOMEPAGE=https://git.zx2c4.com/cgit/about
-INHERIT=git-r3 lua-single toolchain-funcs webapp
-IUSE=doc +highlight +lua test lua_single_target_luajit lua_single_target_lua5-1 vhosts
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=acct-group/cgit acct-user/cgit dev-vcs/git highlight? ( || ( dev-python/pygments app-text/highlight ) ) dev-libs/openssl:0= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-libs/zlib virtual/httpd-cgi app-admin/webapp-config
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=234dd0ad5e78bdbec722fddf77cebfee
diff --git a/metadata/md5-cache/www-apps/prowlarr-0.4.3.1921 b/metadata/md5-cache/www-apps/prowlarr-0.4.3.1921
new file mode 100644
index 000000000000..cd7c3c86f9c2
--- /dev/null
+++ b/metadata/md5-cache/www-apps/prowlarr-0.4.3.1921
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=An indexer manager/proxy to integrate with your various PVR apps
+EAPI=8
+HOMEPAGE=https://wiki.servarr.com/prowlarr
+INHERIT=systemd
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=GPL-3
+RDEPEND=acct-group/prowlarr acct-user/prowlarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.3.1921/Prowlarr.develop.0.4.3.1921.linux-core-x64.tar.gz ) arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.3.1921/Prowlarr.develop.0.4.3.1921.linux-core-arm.tar.gz ) arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.3.1921/Prowlarr.develop.0.4.3.1921.linux-core-arm64.tar.gz )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8933f7c94037bf162308769f9704f092
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index ef7ecfef629a..c22f9c8304f2 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/dunst-1.8.1 b/metadata/md5-cache/x11-misc/dunst-1.8.1
deleted file mode 100644
index 711c99ab7da3..000000000000
--- a/metadata/md5-cache/x11-misc/dunst-1.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig wayland? ( dev-libs/wayland-protocols ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
-DESCRIPTION=Lightweight replacement for common notification daemons
-EAPI=8
-HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
-INHERIT=systemd toolchain-funcs
-IUSE=wayland
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
-SLOT=0
-SRC_URI=https://github.com/dunst-project/dunst/archive/v1.8.1.tar.gz -> dunst-1.8.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4e811b5caad38531d2f4ad8af804aae5
diff --git a/metadata/md5-cache/x11-misc/dunst-1.9.0 b/metadata/md5-cache/x11-misc/dunst-1.9.0
index 690035c72c9c..c563be722765 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.9.0
+++ b/metadata/md5-cache/x11-misc/dunst-1.9.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
 INHERIT=systemd toolchain-funcs
 IUSE=wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
 SLOT=0
 SRC_URI=https://github.com/dunst-project/dunst/archive/v1.9.0.tar.gz -> dunst-1.9.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=21369fdaff807ff0ae72f3c81a814bb4
+_md5_=4e811b5caad38531d2f4ad8af804aae5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 79dfff2f735c..985a29bc4334 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14055 BLAKE2B cc8989d376b82bcdb8980643cfd55acab354a49641b1b95506a263a9406db16da70c2af5a10755e35d180167a8123cedb0da0411496add38143d06cd2295da30 SHA512 4c08ccde16f1dafbb970968ef0ea2bc4a0d1775c0b6a687dc12042e322b948a5c4a0b48efd1d01d039c0971c8836c30c44f1f4fad1679d7fa254072281c88eff
-TIMESTAMP 2022-07-29T18:39:39Z
+TIMESTAMP 2022-07-30T00:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkKWtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkfcdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA5+g/9HUxIVV0vuOCMUOwW11ppKlMzqHcuIUoebR4kiBKFOT+amDgMMMQDNhZx
-/Q5oNkrb8o/PkbCfWShnqydkPl7V3PLqBSoiS7fQPnq2OcJdnxSb1BLovIK3i+Hl
-7NdnsSqCjmt8BmPN8MuZVEVlHwFyGGi5IRN0scKlXUIIxMGaTo8x5CJR8aZ9MpGt
-VGZFyE2pFmkQTSMovlvKNzhzNxTSyRMe3tRRuI/sAckLa+Ey07Iv+GXsrF4qjBhz
-+XtBUo/MLiF/Qmqrklx7qTx2T19CRPJfmnpHwIP8JU/1KXGkLn1y6idU2v5To++h
-4F8Gk8gzwdbb73EKg9547AE36lg0mKOlPFkc0ysxwm1pK/Qy/gre1c6TJOBOqj6I
-6xPK2EBU6gFkVomzEp6EG41bHtmr0rrYIwTbBW7bNetXa+U3OFtteDz0gXMpEDZX
-gjogntAXKyvVdzAkWfwmR9avcPQzLXptCiuAcd1ZNwU3JlghssJR71Cck4WMqDaz
-d+UfpY8gNuWiUoM6M+1SZDbBPP1R3OpIePTxnzN03ZNVIk6h+6Qw5ZANP3pDrLRf
-yK3VqhAnHpFI+owl2fdIUttwkaY2FeO+D/R6jtTV+l9ziwTSe0+S7TO7bsnXUUQe
-i4DOVxauvnytnuOTwWNYDlybI/+v5ljKH7RG+A6oGyYKJWCXPJQ=
-=+hvs
+klB6aQ//aqdfHV+ChBx6roLy5zn6cXmKAKjWeA/MT7QPb887pKBLsVIv3nvH8o0n
+y1n0/mqePEu71PFUVWiic7yUz755Z6gw61HBjhFcpsLTpUfwPXLBw3T5RYH6iUV2
+RU50/4HZxOwK+v6/bSXeZbjlZ9saGiT9qkn8GFBMSUtM3vxHmZVsgTuaVURPDxYN
+vukP0l0n8T4YoHs8J7xedeM7IgKxiubhIkL+YRQUtW+hJfHZzbUPbZyw/04V/BA8
+onTcyL93+RbSuhfH1WUXfz1ZJjdnKIGvz7gQRo+eAIwSN1lIchcmp2f0L5WvxWzO
+iybMNIgzkXcNLk0yOY4NQZDlvZRlhuckzsSle89qWZhpcWrUe2S3WNS+s3FKOzZi
+VgG6gWEJjdGWWWZJg4CD8Rp42dLP8KWTc1iNd8ib6DYiuUjA7qsKLuvEGK+wLbAR
+nvY1LGaWAnMRbLDnro/UBvxBOWSkVyZmfp47tYRiyhuAMkEUy8/Cd+/lCVl4xD6E
+Jmw0j8jRvqhb8YLCIZvIldlARMnxzSf+M//ZriMuEcSgB/rxKHAUO6E2HYUz3iT0
+MIfrPYOb4TryKTTN0gwQWKg6DKLmZS5NTzhikM9WlR74ew0pInOtJnHVOtmuyCol
+GjWWQIIpB1ObDswnVsKqE2gLBwBbJpH9Xz0jusmS2pyv236SxJ8=
+=QAw6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 44d032067205..eb8604da6a6f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 18:39:36 +0000
+Sat, 30 Jul 2022 00:39:31 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 05f620ab0d83..a62e432972af 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -332,20 +332,6 @@
       <role>NFS</role>
     </member>
     <member>
-      <email>vapier@gentoo.org</email>
-      <name>Mike Frysinger</name>
-    </member>
-    <member>
-      <email>whissi@gentoo.org</email>
-      <name>Thomas Deutschmann</name>
-      <role>Version bumps and security stabilizations</role>
-    </member>
-    <member>
-      <email>williamh@gentoo.org</email>
-      <name>William Hubbs</name>
-      <role>Misc stuff that needs to get done</role>
-    </member>
-    <member>
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
       <role>Minor stuff doer (bumps/security/stabilization)</role>
diff --git a/metadata/timestamp b/metadata/timestamp
index 72b5f18c98e3..cfd51aecee48 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul 29 06:39:36 PM UTC 2022
+Sat Jul 30 12:39:31 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index dc3e8a910778..3e69bd66857f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 18:45:01 +0000
+Sat, 30 Jul 2022 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f942b4c1141c..962ffaf6f769 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-483b910e8dddc7d9f56309812ea9e8445b98e8d0 1659119679 2022-07-29T18:34:39+00:00
+786acf3688b2ca883ba0c4a9c2056c13c6c1ff96 1659139699 2022-07-30T00:08:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c55cabec129a..821e1d967af1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659120001 Fri 29 Jul 2022 06:40:01 PM UTC
+1659141601 Sat 30 Jul 2022 12:40:01 AM UTC
diff --git a/metadata/xml-schema/Manifest.gz b/metadata/xml-schema/Manifest.gz
index aa516c6d3ce5..7d54d8e41115 100644
--- a/metadata/xml-schema/Manifest.gz
+++ b/metadata/xml-schema/Manifest.gz
diff --git a/metadata/xml-schema/metadata.xsd b/metadata/xml-schema/metadata.xsd
index b125e57894be..87972cb1d2b4 100644
--- a/metadata/xml-schema/metadata.xsd
+++ b/metadata/xml-schema/metadata.xsd
@@ -280,6 +280,7 @@
 			<xs:enumeration value='github'/>
 			<xs:enumeration value='gitlab'/>
 			<xs:enumeration value='google-code'/>
+			<xs:enumeration value='hackage'/>
 			<xs:enumeration value='heptapod'/>
 			<xs:enumeration value='launchpad'/>
 			<xs:enumeration value='osdn'/>
@@ -288,6 +289,7 @@
 			<xs:enumeration value='pypi'/>
 			<xs:enumeration value='rubygems'/>
 			<xs:enumeration value='sourceforge'/>
+			<xs:enumeration value='sourcehut'/>
 			<xs:enumeration value='vim'/>
 		</xs:restriction>
 	</xs:simpleType>
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 44d032067205..eb8604da6a6f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 18:39:36 +0000
+Sat, 30 Jul 2022 00:39:31 +0000
diff --git a/metadata/xml-schema/timestamp.commit b/metadata/xml-schema/timestamp.commit
index ff67dbfb034a..ea573509b315 100644
--- a/metadata/xml-schema/timestamp.commit
+++ b/metadata/xml-schema/timestamp.commit
@@ -1 +1 @@
-d17aa632ab7f3b9373a15911d7d0c5da6e83ea95 1653473396 2022-05-25T10:09:56+00:00
+d07cde98cc4af6e85a518d86478ad193d7465771 1659125580 2022-07-29T20:13:00+00:00
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2877c2c12ccd..b070c160b02d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index c540b922d14e..452235f845ef 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -1,6 +1,4 @@
 AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2
 DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05
-DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473
 EBUILD dnstracer-1.10.ebuild 675 BLAKE2B c4e49a5bc538522d53c0c9fac97c4419c39233517a789f70e0a8b61dcf5e9f0a7a61cce69a14b444754b477d1b27324ae057d4d3e0291ae32b2de2705e326347 SHA512 d580c852362aa700653bd065fa5f794dd44c0986e231cb2cd4d6acce09ccacd646dfa62bde31598fea1f957d962a21c36a3ad205218d55dc4d770d967304f525
-EBUILD dnstracer-1.9-r2.ebuild 530 BLAKE2B c4008d5c48dbfe6bd0a7a6ecc23913fe4a21e6d0287ddd55c7d5f8fdd8b018e0d376457ee2d9349e2fa3d477d3d8b106fe3535b6b92a95904ec12d6678441f19 SHA512 b361a72cf4e5d04031799a0d7e7be1e2f138b71229800a93fdbf17ca205bf2f241f85f588ae439fc7a50bde2c3beaa02bf930b0f6aa96e0e1272a7d0c3e71301
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
deleted file mode 100644
index 4de46fa1b6a1..000000000000
--- a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Determines where a given nameserver gets its information from"
-HOMEPAGE="http://www.mavetju.org/unix/general.php"
-SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
-IUSE="ipv6"
-
-DOCS=( CHANGES README )
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-argv0.patch
-)
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index df1714927f47..e560608eeb6b 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index e71e26e63fff..1426318b4e83 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -8,5 +8,5 @@ AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069
 AUX mgetty-1.2.1-riscv64.patch 396 BLAKE2B 42403e6f59b247969845098671e57346adba31a96d7c781ba362d00c85a8ecfd251f457f0d205dc0163a01b5f4fe9768e52d47cbd20af320cd88069adbfa0b09 SHA512 a90b9b47f3718d8249dc37c49890c833f0789ca7fbb54e03ac5f506a4b98af7dd0dd2b8b1af2d361da6217e551d3b47f58c93df972f195a17825b7f789ca0ec2
 AUX mgetty.service 203 BLAKE2B d7bd55ab0f1acc02541cb19ed372faeb2ba1b88dae1d1114677ef955cc91006c7ff5e78f71d8ba3da1aecde111f9bbc4ae916c5c19df20061200731eaab038ac SHA512 c766385d101005980fd992d2e721ffb90a7b756afbd4ea24a55e828f39bd6106a0722461b581736816685c6d5dc3fbc4ebe5fca3faf1c1373d7e0c6658c80a8d
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
-EBUILD mgetty-1.2.1-r4.ebuild 4804 BLAKE2B 40e6a2b8e995ef676467e5c37a082aaba2a3a51d7a6857ab9471d8cc1a027e254531a00a019df5a6f3d064f534f52ebd6a8c09d66e912c49093077551d3501e1 SHA512 c87e0f6c1418e62eab4770fbae29db52c6741bbebd9bca3c7bd6d9c7ca2e3c1fcda36b2ecfce625dd2e1a20a18180e229bc43efa87e4ed3b9d4a28736f793a69
+EBUILD mgetty-1.2.1-r4.ebuild 4816 BLAKE2B d8b3985bd6ba40da04793046b97026221a7938ec28e223fb048f90dc4969df11defacd9b92b282cdb4e64a88c3fc9d18f3dfc50bf2efc45e00c8e5c9cc26c6a2 SHA512 809f81cc160c1a26b353f1b2c88bee10c62515194bc591f0dd4bad54d003002f0f72fc4c636a86c533f9bfee68520fddb4d93f62dce30f0074292024d6278d7b
 MISC metadata.xml 590 BLAKE2B 40b9f40755b60ca842ab1e9af8678f0aa209534f8ff333e12dd80877e9284a903f8e0fb0d385eaa998ae17a192dd878043bcf7c5db319a83bf4c9e180076056a SHA512 13d49a0f90003c64d70ef5c302dbe2f3a8488f5d3a9e3358d93568cfd9f07d2c3b2b223b9c71ea97c20b1cb662dd4f7e79a7169c25de73699faee41fabbdad2a
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild
index aa800a81c5a3..bc8dcaa55114 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild
@@ -71,6 +71,7 @@ src_configure() {
 	tc-export AR CC RANLIB
 	use fidonet && append-cppflags "-DFIDO"
 	append-cppflags "-DAUTO_PPP"
+	filter-lto
 
 	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
 		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index fa8f12f41b5b..2c34fb4882a3 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 1f2cf8cd3bd5..e40ac7b1e53f 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,14 +1,7 @@
 AUX weechat-3.3-cmake_lua_version.patch 292 BLAKE2B 1eb735429ece6431ad190e63beea3e036659ee7c2c1462601ed102f1f5e7df982807df741ee49eb1a3e9dc37de415ae927e59c8204d3735af8c593489ae3b13c SHA512 c8bced50df1119311d8db38f586d99d805a3f13d5bf8e4e3098c486906bb847a67446ec60f0819c410e7f57d33c5789ab8f948ba62d4caf0b25b8afe59d48821
-DIST weechat-3.3.tar.xz 2564280 BLAKE2B 9cb119c2506ff5f9b4844b8016790af34347e300a1217762afc1307191cd0831c2c23e019a024c8161ff2e46607eddf94f94b3db9bd351bc51b7f057ddb375eb SHA512 18bbaa93620185ead64f64833e4c5df6a1cbc49dc6f60362614e955947221b78baaa93a2748f153bbb6f7867c7760f7a8fa8d6d9ed30040ad5e12af127526e13
-DIST weechat-3.4.1.tar.xz 2617856 BLAKE2B a1e2e3e50da79041dc1500fb9c368cc3f3f2f799b867e5c6b2cb0742dac680bf3fd5449dcf19296845266f97cf6ee120c71d10cdb8cf4e20badb56fd4b55888c SHA512 3715975d0b8cb5ac1946ceb0fa87fcecffebccf1687cb3b8c3d91429f31e69000808994885bef580a0cfd9c5b1bcf6a51642bd653cf887be981188281901a04e
-DIST weechat-3.4.1.tar.xz.asc 833 BLAKE2B 4f4a38307f1f60dd03693761605cbab2a2e8249d11e95826ec6e610e38a0625cec66704d5b62d51e83633dc3c06a98be5487c8a535ae75fdc2d53ba91a71e70f SHA512 8e45ba6f8d96f2dbaa617ee9e5071a31e94cbea418881af6866eecc7402bdff558f221db63c2e708e40119d3c5294b49485823f4e62fbae5e89da7cc380d9d6d
-DIST weechat-3.4.tar.xz 2617640 BLAKE2B fb5df8ed7d2b219c60c15f444834017504aebffa0c02c7712f0109216153be97b93560dbbb060e9cb907634856dca2733848222b5f2eea095dcceec623a00397 SHA512 b5e36802bb8b8f0e518da590d675ca63b0fa0b88acd24c2803d4f8468e6bce775691d3994db5090570f1286ad38be31615921b0d3ead697ad51986cddca57330
 DIST weechat-3.5.tar.xz 2693072 BLAKE2B 4645d71a0f2742b0dbf0c905cfe085b6132ac4f1be6ec1056c432b2a1a7c7af2e62bf075a696732801be4fca3c45d7e3721a7fdaa9afac293623443793a27f26 SHA512 493be6219da4fa4b4862064de3d286d99d36018a61ba226f5abdc18c9ff43076d92f0b12fce96e04d31fed5c3931c7bf8615947cd19059dbf2c3aa75deead35f
 DIST weechat-3.5.tar.xz.asc 833 BLAKE2B 539ddb256ebeb4871b8e881358500fe8bda560ae9d2d6690d8184326d22b9bbadd874a3d6fbf1caab76baf509edf8308fbe9e5f13344757c39f421866a0cd8c8 SHA512 51d5d0681cb59cf2bd5c582e9eae475bd844e56157bae7e07102dbd83cde7a052ad53fcd6ce22f7ac13c728adbf3a3eb9e6c317a58d5cfb2b102b1e5c6b32365
-EBUILD weechat-3.3.ebuild 4279 BLAKE2B 1ada556de4c02ba23a4c4f7f98fecb0113d8be1ecffd4ae5e74117f14f4db0ae3ef0fcc211d1ea30185f8b1961dfad2c7e5ff3cdf15108bd9e22b4f4e309b997 SHA512 72476c71be9f141d00441affaccf61cc1670e1b66a1610f51a875e87e00f4dfb88cfb08ce3db9d6bf2378f62ce9d4e9b33f6b2a884ac36deac914020981f482b
-EBUILD weechat-3.4.1.ebuild 4532 BLAKE2B 25dfe4ca246a347f57d5d2f932cdebeb72434dcdf76a2e22c47d09f76e5b80d6ebcde986e2b48f29640c837c896a38af5886fd1485d555bfa17d879e19562bf7 SHA512 354aef7f602959032c43b5d49c6f90a230f325e7eeb49234a0667c9102bfbdab1611007db758fc7575503bf25f03f2fc8b4abd9a89f8cf6680f3483c844fab99
-EBUILD weechat-3.4.ebuild 4315 BLAKE2B 028b773aaa6dd0ea1ed8cff0cb36ed455dccfb98b33d4b45ac49c8fa0c3ce46a3a977af42469afd95c1c5728453c140fc10bf6d9818477ce7ea6be32d4d5cf07 SHA512 771254004d8b8362f1da777c60f3693ec94a60177a2ac56ec4ab251fcbf2ad9bd5aee7dc4306c93b70dc807f067118a70bdeda4536720c45d96908e4f2be554d
-EBUILD weechat-3.5-r1.ebuild 4601 BLAKE2B d098c92105827d96670ee431ff39aeb6d41b2811efee658c18000779ae009bc1edf36a9b85ae9674fe887f015034ba282ad76c4c3bda3c5638552a94b7685ebe SHA512 2df72d14e331536868cb1a77d3d2e3d6f48db99733348c39b72660c5ff9b40efcb6fc14e22e84db577d97fa41a728e33905465712071933c1b6ec074944f9e9c
+EBUILD weechat-3.5-r1.ebuild 4602 BLAKE2B 2187fbc2493e3b567ecc464c3b75437ae301b5c024dea75531caea6f9d9e1a09bf8ac4a5bde1219f5a4b4775a4924d02f12f70961789037b9d68667a7634bfe9 SHA512 a43a66228844f344c8e88c42934d50c3aa3c1160e9069625c7d45d127e2c4deae4109a2d93018d96df9df08e8e3c16bf71021f97504ff88133379be3d09ce54e
 EBUILD weechat-3.5.ebuild 4570 BLAKE2B f0986d8fdd0daa47e239feb9f1e9989d6f6405c10ecf96f61d05db0ebc0920737cb972a5a8b42c932092bbdab0759d3bf577620903839f1fc6060f365501f6fa SHA512 f7483bbb759ebfaa124fcfbcc4ffc437da303bc4e312dd053eaa26cc5ac94ad17fc76f65b106ac200324fb25db3344b64e365d4a9560c1cee69815d422fdc9fb
-EBUILD weechat-9999.ebuild 4601 BLAKE2B d098c92105827d96670ee431ff39aeb6d41b2811efee658c18000779ae009bc1edf36a9b85ae9674fe887f015034ba282ad76c4c3bda3c5638552a94b7685ebe SHA512 2df72d14e331536868cb1a77d3d2e3d6f48db99733348c39b72660c5ff9b40efcb6fc14e22e84db577d97fa41a728e33905465712071933c1b6ec074944f9e9c
+EBUILD weechat-9999.ebuild 4605 BLAKE2B c14f3b9b4d3602ba37079ed9fb4da19e8580b6af9883603857daed72f30a61527f4768619c99703e4df1101ebdb7b6067e44ee7d8134f6d70c235c5ad3563c9b SHA512 c116cd8ea7d010a6e82015b3af80fd743f4757eb24f2662e6c2e668d2216014f82b50cb7235cfbf0d3060d91229563309faa33ca2e6963dfc964dfb66c65f2e3
 MISC metadata.xml 1190 BLAKE2B 02cb2861181854b6d948010cc1e09797b29415445dadab9e5a4a6ada30101c24f98783a8d61dbd9d0718a53f866d4f7523d62a56ad1aa25def67fa9cd9fbde0d SHA512 55e96b86cbe0448a9e3bebfa987635b850f5e61b2471359b61726dede987368dfb5e6a4a9accc14665f5c291cdbc67e541bb2c1118356f752e9c5060d20a4674
diff --git a/net-irc/weechat/weechat-3.3.ebuild b/net-irc/weechat/weechat-3.3.ebuild
deleted file mode 100644
index 3500c292d9fb..000000000000
--- a/net-irc/weechat/weechat-3.3.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) )
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_TYPING=$(usex typing)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.4.1.ebuild b/net-irc/weechat/weechat-3.4.1.ebuild
deleted file mode 100644
index ea0796ebe23a..000000000000
--- a/net-irc/weechat/weechat-3.4.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	inherit verify-sig
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
-		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		|| (
-			dev-lang/ruby:3.0
-			dev-lang/ruby:2.7
-			dev-lang/ruby:2.6
-		)
-	)
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND+="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_TYPING=$(usex typing)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.4.ebuild b/net-irc/weechat/weechat-3.4.ebuild
deleted file mode 100644
index d1a572afb9da..000000000000
--- a/net-irc/weechat/weechat-3.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
-LANGS=" cs de es fr it ja pl ru"
-IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( nls )
-"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	net-misc/curl[ssl]
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	php? ( >=dev-lang/php-7.0:*[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		|| (
-			dev-lang/ruby:3.0
-			dev-lang/ruby:2.7
-			dev-lang/ruby:2.6
-		)
-	)
-	selinux? ( sec-policy/selinux-irc )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cpputest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
-)
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install only required translations
-	local i
-	for i in ${LANGS} ; do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	# install only required documentation ; en always
-	for i in $(grep add_subdirectory doc/CMakeLists.txt \
-			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! has ${i} ${LINGUAS-${i}} ; then
-			sed -i \
-				-e '/add_subdirectory('${i}')/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-
-	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# fix linking error on Darwin
-		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
-			cmake/FindPython.cmake || die
-		# allow to find the plugins by default
-		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
-			src/core/wee-config.c || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_SPELL=$(usex spell)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_TYPING=$(usex typing)
-		-DENABLE_XFER=$(usex xfer)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if $(locale -a | grep -iq "en_US\.utf.*8"); then
-		cmake_src_test -V
-	else
-		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
-		die "required locale missing"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-irc/weechat/weechat-3.5-r1.ebuild b/net-irc/weechat/weechat-3.5-r1.ebuild
index e06ceeeda127..792aaf4a2523 100644
--- a/net-irc/weechat/weechat-3.5-r1.ebuild
+++ b/net-irc/weechat/weechat-3.5-r1.ebuild
@@ -17,7 +17,7 @@ else
 		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
 	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -114,7 +114,7 @@ src_prepare() {
 	done
 
 	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/*/CMakeLists.txt || die
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# fix linking error on Darwin
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index e06ceeeda127..5efa5fa8df55 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -114,7 +114,7 @@ src_prepare() {
 	done
 
 	# install docs in correct directory
-	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/*/CMakeLists.txt || die
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# fix linking error on Darwin
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index cd1a7214abe0..515e2d30005c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index aec85c8ba43d..246fdfb77240 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -2,7 +2,7 @@ AUX wget-1.21.3-hsts-type.patch 8463 BLAKE2B ebee8872161ba4a0288ee973d1edb5d3874
 DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d
 DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718
 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f
-EBUILD wget-1.21.2.ebuild 2873 BLAKE2B b0ca4fa3105c73c9623e788863cd6c46b6da3d4d2f7f158538a7b5468560648d89bfef1900818ddf64343cc8e5d3675b1324835c30964767b51fab2c94e44e90 SHA512 4c2c0e9751fd37ce85be5c9abfa028f0813d17b7d0c902792406e4a94c30590781d00d243e936fd4a107090921d5ec4023c358e712c84aed44bb99d6982936b9
-EBUILD wget-1.21.3-r1.ebuild 3253 BLAKE2B 83f0d8dc49cee68db52eb1821fcc6987d32a0a099de32884c5aa79784bf2f767ace8be83971ecefbed68fcbdd285cbfa3113c19bc05fac7e4d0a454ea92967d7 SHA512 8e64fda096e666a54be9b89eedb876ebcab7282014e58ab25fd52a2a4d3fe086bbbbd3d89590e329adad0b32d50fb27a70d487e69f3a1fae3958b1e70da1dd05
-EBUILD wget-1.21.3.ebuild 3203 BLAKE2B fb43f5fdfe06d756846ed4eb98869777643b7c0cfd373d1ebd6b81bf5067ea74bbb967aaf3549c3544bfd462db81fc20df837b0388624aeacce261a8522d44c7 SHA512 a1008cb3d17be6f4cbf0e6aae87b8891b5d555a6d6967e227383881664e828865f8c8c2e87f8df8308d6d7e500cd1660085dfb16ad241b436bff8f13830b9c73
+EBUILD wget-1.21.2.ebuild 2882 BLAKE2B a7e3fad7bbdbee0eb9d1f55a429dd3aaa3f8119df71a477db28224ca9032e79b9d5f9aff6deac981fa648917720394b6c4479d538641b3f0b23654e0957f1e1b SHA512 8fd8804496ed7ed6f63d86e2da5e72827e3ca9d57436d05e880ae692854ad2052cecaf8ccb51534e3484a06e81b3fc8f07e481eddb12655610156d466fb30509
+EBUILD wget-1.21.3-r1.ebuild 3262 BLAKE2B 34706e3fa400632f2c70aadd568aa55ca2970f8022ac6458e01f3ebe955b5b072e8bc19af73af5d805223a009c01e7ad1fe45363dd52d8272f6d4a736c18efc0 SHA512 4db3d50c00ac3cedf242093ee872fdaba98197403b48461781aa68a1a31d2b5b713bec55637143016dc623f92e7f67aafaf1c9062ba2423c4bd499eac9c38ee1
+EBUILD wget-1.21.3.ebuild 3212 BLAKE2B bf2c263e84dc4bacbb031ca0edb395116b09b8e1fd3126caca92e67b5b47996934cb520c3f20eda631631b3b56de2dbc9f454060d63687b4eec39631ba8d3b5f SHA512 ba333505e9a095e47dd7430907e05f1ee4cf77c078fb46bcdce3b1b0a865d181259b1ef4ba0afef12110aa826e0ca5d6b046a6453a3bf578ffa8794fbff210b9
 MISC metadata.xml 803 BLAKE2B 9bdb761fa36afd7a03f4631ed314230776de4af2c3e153a3631ee8f9e801233e44abe68ba5ec874bcfaef53d2cb1100a671768169d58d6e2c96387be5210abc9 SHA512 4ddbdc883a155f4eddeb5cd6e031b4824f1f50586ceaedd1b72a8d2ce9d3dffe440a0554e4a9a07f1295f79a5958bcb533ae324919c64daf77caff577318dfc1
diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index ee17ffe2ccf4..b2f0d3e107cf 100644
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -44,7 +44,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	test? (
 		${PYTHON_DEPS}
-		dev-perl/HTTP-Daemon
+		>=dev-perl/HTTP-Daemon-6.60.0
 		dev-perl/HTTP-Message
 		dev-perl/IO-Socket-SSL
 	)
diff --git a/net-misc/wget/wget-1.21.3-r1.ebuild b/net-misc/wget/wget-1.21.3-r1.ebuild
index fbdf7019b149..f9868742047a 100644
--- a/net-misc/wget/wget-1.21.3-r1.ebuild
+++ b/net-misc/wget/wget-1.21.3-r1.ebuild
@@ -50,7 +50,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	test? (
 		${PYTHON_DEPS}
-		dev-perl/HTTP-Daemon
+		>=dev-perl/HTTP-Daemon-6.60.0
 		dev-perl/HTTP-Message
 		dev-perl/IO-Socket-SSL
 	)
diff --git a/net-misc/wget/wget-1.21.3.ebuild b/net-misc/wget/wget-1.21.3.ebuild
index 3b93ad5504e4..aa085bc64750 100644
--- a/net-misc/wget/wget-1.21.3.ebuild
+++ b/net-misc/wget/wget-1.21.3.ebuild
@@ -50,7 +50,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	test? (
 		${PYTHON_DEPS}
-		dev-perl/HTTP-Daemon
+		>=dev-perl/HTTP-Daemon-6.60.0
 		dev-perl/HTTP-Message
 		dev-perl/IO-Socket-SSL
 	)
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 612b77b4308f..3de385406454 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/smbldap-tools/Manifest b/net-nds/smbldap-tools/Manifest
index bd7f04115b65..29793b8ea364 100644
--- a/net-nds/smbldap-tools/Manifest
+++ b/net-nds/smbldap-tools/Manifest
@@ -2,5 +2,5 @@ AUX smbldap-tools-0.9.10-smbldap-config-pod.patch 974 BLAKE2B b8ab4c2a910dfa8794
 DIST smbldap-tools-0.9.10.tar.gz 336840 BLAKE2B 8df7cf34d1fedb54ece3f5c018b7bf03a1b0f0ca8813980eaa21d338113fe30535d7627c0d61b8d30c331e20ebb81449ae4a0ddcdfd4a93cb028f2c376a2ce76 SHA512 e1aef98d91ec722427b27f3aed25d8ef4cd4a6c845f98935e2f99075dea93275fc0335760d517398be8ca7898084bfee457ada0a718b66226e6ce3f38fdf2b2e
 DIST smbldap-tools-0.9.11.tar.gz 309879 BLAKE2B 8cec1ba808e146dd3ee8f087038ed50663b41b51b593a5b7857f88401c8aa6b83800d492e1805ce7755ca20595c73cd8c560bea75bb2a92331ddbd57878f9db5 SHA512 a41bd4c5b7b9d9ed09419b69a6124351cd92ea01d3b7142a97db8179120cd2de561ebb7fb7b1190966fb53339ce0df1d7bfedf3f3db871c32deeb1c621fe62fe
 EBUILD smbldap-tools-0.9.10-r1.ebuild 1551 BLAKE2B d80c7d8b764187cc09d1c3336f0b2b9ebb14fc3da799c0471065044de105577897c780a29a087a7dd2b827736f0bc6d20297e2f3aa78588147c9e512fd327faf SHA512 e14c61d5ccef77f1b245470313dbb29069449238584b971b25942a5bed9eb64cfdc0ee440f933bb2d83ddec7d3a2b84c7c2c03037f0badb8690f6ed7b9166d9c
-EBUILD smbldap-tools-0.9.11.ebuild 1609 BLAKE2B 25f68a127d70d00309116fbcfef71d6b53be867709ad63e513d1009ac8cd633b3d1b8f7cc40a16e2985a3b13273e916c6454cd82bd509bf60baa95d9ffe6ccb2 SHA512 822512cc7fb92945cd77f8e2693fbea2e3b441b5e729bbfe6d48f5e0dafe3be3c1fbc8b2463baefbd256277f580adaa94753b510af17b2e0389d44f133f2ad92
+EBUILD smbldap-tools-0.9.11-r1.ebuild 1557 BLAKE2B d814f16c8e80ba0afe75507ca47979e9262582895f304e208a29f7df863e4ef1b86cb639963ef27ee8568235641405c547a024413bf70bd72ea9f110d9055391 SHA512 04ec7835cc0aae42fda86c8b0c7fdf36c8350a7ef7ec7f4b962f0cff4174c896d15f999010208be8ffe249f73ab6df3432d62425bce8ffe7fbad0a98b6395960
 MISC metadata.xml 325 BLAKE2B 7a0afd90849cbd7fd1c77eee56eab3ce03fc1a83fca37e7f31c23a06a387cf96d1cd0af34003d5317eee7e6b05157549d6d68696b70213b659397c93b5a9c9a4 SHA512 facb4058a4249465f8c00bfc977513b43634938726de781dfd75eb9d9225d177bd00e6d34d9a17745b1f8dc93f38d4f932727cbe39ad97c76a8f7f6bb922c02b
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.11.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.11-r1.ebuild
index a69798a74c84..903e7e8eedd7 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.11.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.11-r1.ebuild
@@ -18,10 +18,7 @@ RDEPEND="
 	dev-perl/Crypt-SmbHash
 	dev-perl/Digest-SHA1
 	dev-perl/Unicode-MapUTF8
-	dev-perl/IO-Socket-SSL
-	net-nds/openldap
-	net-fs/samba"
-DEPEND="${RDEPEND}"
+	dev-perl/IO-Socket-SSL"
 
 src_prepare() {
 	default
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 258d7a24d53b..45eb80e54930 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/libxtrxll/Manifest b/net-wireless/libxtrxll/Manifest
index 7afcc9f79fa2..57cb724acd63 100644
--- a/net-wireless/libxtrxll/Manifest
+++ b/net-wireless/libxtrxll/Manifest
@@ -1,4 +1,4 @@
 DIST libxtrxll-0.0_p20201202.tar.gz 68732 BLAKE2B f1eeeb3cd9368224a512ade5389cd5f289613e47736f2577cf9a3a7266ee6a8159e60b1523414277fb8dbdcc206d2a8b53b6a72a591af54d40f3175f2192c139 SHA512 b9c32db32e7782db5831b73ea34d801f2b09cc42773db0ea3504f500717c11303083e1b9808ef9d0c6efd19ce0dab2f97f79ef20e9b892fa15a42c52cdeb4db1
 EBUILD libxtrxll-0.0_p20201202.ebuild 787 BLAKE2B 35408dba13b2a025e1c4aa0b12fd503ab872fe632b3ddcb410be7ae4b6a39fb7323416e99de34b0f325053f27df120f67593218bcba00132550fd175642a2c10 SHA512 7953c02abedba0618a29076c9dedd54860f71ed6b145a6c6d61d0d894a815bfd91fffdea5063b186a420b0a0769c43a4ff3d5cf06ca6eca5369766b8888474dc
 EBUILD libxtrxll-9999.ebuild 787 BLAKE2B 35408dba13b2a025e1c4aa0b12fd503ab872fe632b3ddcb410be7ae4b6a39fb7323416e99de34b0f325053f27df120f67593218bcba00132550fd175642a2c10 SHA512 7953c02abedba0618a29076c9dedd54860f71ed6b145a6c6d61d0d894a815bfd91fffdea5063b186a420b0a0769c43a4ff3d5cf06ca6eca5369766b8888474dc
-MISC metadata.xml 307 BLAKE2B f1b8dd72a286e014ab334ad5b80af049aef57a8a5bdfe0a2766aec4daf7d0d1890fd6ce37e6ff2d2bcf47fcc6d667fb7c24ec0c0e6a66620181b45d2ffa61b89 SHA512 a566ae623e41212024aea7cf647830a862c21ed756d534141eb37f92c8fe4ef62c2671747e66d3eaa7d9ffe1bbafb4176770c35e83255884aa929c1e1cf3ef88
+MISC metadata.xml 390 BLAKE2B b90bd1a5456a6ecb90f90268fd92be2df3b776baaa9928261933b1d8786eda57276a154c9455d4776c2621b57a020e4aaa3196755e958fb9ebaa4c8c7515cbcc SHA512 18e4abe0a55739b3a98b55b02686c7141787836b156021926341ca1c0f6d5cc97f842897b4989eb0b00db1980db378bf43df44580998d524c334bbfb47e16eb8
diff --git a/net-wireless/libxtrxll/metadata.xml b/net-wireless/libxtrxll/metadata.xml
index e9e20887c2df..11902b1c56c2 100644
--- a/net-wireless/libxtrxll/metadata.xml
+++ b/net-wireless/libxtrxll/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="usb3380">support xtrx usb model</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">xtrx-sdr/libxtrxll</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 4e8c7b3f4622..ed29a4381769 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,11 +5,9 @@ AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb857
 AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fafb4f5a5671edc522fb13872ec64c168173667cfc072cd0fde5fbaa236109a4c49947ddfd3fd429f SHA512 734aa8b93e057579470e59a287d68f219f510f73479add86d3bfc32d73ca495644d40d9323e2b00a448ee7b519f9a60d3150057c00398165108b572999e70b67
 AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60badef834d6f9ec250612ea5b32724c9df28c735e22183180c9c646729e375d3e38f6a26371661af93b SHA512 cafa67126e7416c736e1ab59e8b31cd2f9ce3f8933b84985f4ba983898b664bb892255855c2fc6cbdb4519732f63e58207209d7701f908d48828dfdd399f1550
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
-DIST unifi-7.1.66.zip 202065717 BLAKE2B afab055746e961b648405519f3ebd339e103e212e552843f453923237408a5e19f4d7041576eb0eb7ffa6fbdbd929975e54984f70bb037bca8c5ea4229c34677 SHA512 3e3cef3a2bde99f6172ae17499d2ce2ca69143ebaefc22d91129f2fb61a44d620485008763de3775a125dfb1244891e704b4b265bf7db36491700c0b5b47ba70
 DIST unifi-7.1.67.zip 202078626 BLAKE2B 3fb7c2fa877ea61e44d2a455494d47099282c91e9bb515a9995d526ea5624d893e09534f305c5c72e011a98075990fcf1323e6bf1fc1949ef0d663c94f019a59 SHA512 3926d0c56f6b5e16f8da98fc1b049e0382c0cc785158955ca2b5ffed0fd464985bbc551694dc2b037b3fccc2867f2e875842791e541daf51b9f52678594ff359
 DIST unifi-7.1.68.zip 202099045 BLAKE2B f84a579c01ec0494e0e8b67a126947cd7bb0625c60d5f5026232e563ee84a4c0fdef827e5f8044de4e5d7fd970a50846dc91d7467196fc2f53bb27655bbb5212 SHA512 b4e71dd28bb645d7fb085546fc29019aa6f33780e559ed284216b7f330eaf5f41f5177e839a5a277d4d41a2242ffe16a44b582c51e74e469bacf96502d187a55
 EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
-EBUILD unifi-7.1.66.ebuild 2769 BLAKE2B 7c2326a144174dc42118eeabc337c6f815608de4333e08fba6b2d66c6b7a5acbe5711e6e3fe06175c571961d23fed7ece194af9c97f31eebe9686b3750eed8ed SHA512 41f186f8dfaa426496e1ccfb2a7c7e8ccf0e11c56172e1806fe2ba503fd93470f37f092d0fa4c6f3cff5b8af072049d0c5d3c571f56a2bf1e418438bf7a4e50a
-EBUILD unifi-7.1.67.ebuild 2770 BLAKE2B f4caf4508d33257d3aade6c9e2865512c8de037f7e468b51979e521bc6280abb62f6ec9589c02549fff2738e9f0f976e572f1224607869f29b00823b152db0c2 SHA512 d896c1cdb8540ba6b018108f619c7b7e36a201fbcfcde52790e56d20ee858f1df8853e2916796447def7fa907219564828ac0a784a2a3128f2aaa3ea194531a3
+EBUILD unifi-7.1.67.ebuild 2769 BLAKE2B e3633533bdd5de014c2df2462dac6617afa6dc72f89d8325715344bb7d1d1161aaa742f3d01d3db7590038ef9e167df80f94da2aebb7dc807ee5a26356cd8756 SHA512 15ad7e3815726a97da7a6c50d33c6402ae1d01c0b82be3b4df0bd1c492bf7b3cff9737fdce9ad734c8eb810b30366d729d471c58bcb26f4818d57335aae6a4dc
 EBUILD unifi-7.1.68.ebuild 2770 BLAKE2B 6d5defba1894e892a6a2ab0ceaea1fdeefc34cfaee8b4568ee70c242982aa4d0bbe394db3d97493ff76a1747119fe4807572b9dfdc4116f2357e11217b653fe6 SHA512 1b1ed3eed3bbd594da1dca2739e4a99dcba332f810b30c27bbc4f1f3b4b060233daa1a41cd07b3a88681411375771ca8bc2cb56f56170d70cf3050931d0c8fb0
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-7.1.66.ebuild b/net-wireless/unifi/unifi-7.1.66.ebuild
deleted file mode 100644
index 73094f66635f..000000000000
--- a/net-wireless/unifi/unifi-7.1.66.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Set this var for any releases except stable
-RC_SUFFIX="-c70daa41cf"
-
-inherit java-pkg-2 readme.gentoo-r1 systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-S="${WORKDIR}/UniFi"
-
-KEYWORDS="-* amd64 ~arm64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="systemd system-mongodb"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Mac and Windows
-	rm -r lib/native/{Mac,Windows} || die
-
-	if [[ ${CHOST} != aarch64* ]]; then
-		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
-	fi
-	if [[ ${CHOST} != armv7* ]]; then
-		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
-	fi
-	if [[ ${CHOST} != x86_64* ]]; then
-		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
-	fi
-
-	if [[ ${CHOST} == aarch64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-	if [[ ${CHOST} == armv7* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-	if [[ ${CHOST} == x86_64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-
-	default
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-	! use system-mongodb && doins -r bin
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
-	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
-
-	if use system-mongodb; then
-		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
-		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
-	else
-		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
-		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
-	fi
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-wireless/unifi/unifi-7.1.67.ebuild b/net-wireless/unifi/unifi-7.1.67.ebuild
index ce8c0ede1d75..4069410023f2 100644
--- a/net-wireless/unifi/unifi-7.1.67.ebuild
+++ b/net-wireless/unifi/unifi-7.1.67.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 S="${WORKDIR}/UniFi"
 
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="systemd system-mongodb"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d5f638848665..96992adc48ec 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index a01b8aed5e6c..569e5edc8e42 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -27,6 +27,7 @@ app-cdr/brasero nautilus tracker
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-10-05)
 # media-libs/libffado is not stable yet, which itself has unstable and
 # unmaintained/broken dependencies. bug #746722
+media-sound/alsa-utils ieee1394
 media-sound/jack2 ieee1394
 
 # Sam James <sam@gentoo.org> (2020-07-30)
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 60195181698f..4660736a6297 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -3,6 +3,10 @@
 
 # David Seifert <soap@gentoo.org> (2022-07-29)
 # Binary package linked against glibc
+media-sound/baudline
+
+# David Seifert <soap@gentoo.org> (2022-07-29)
+# Binary package linked against glibc
 sys-block/megacli
 
 # Marek Szuba <marecki@gentoo.org> (2022-07-28)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 135a30380335..e1b9bf7bf6d0 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index df7167b96a52..8d18b7cffd97 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,7 +1,4 @@
-AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
-DIST cpuid-20220224.src.tar.gz 130706 BLAKE2B 78e0d8296ffafa6eb5a668561bb5c1834c8cffd020f0c052438381f72cddbfe8e85c3e4d662c6aff5224a0b147cd5e20cbce2240f791f2c857c4f584c87b4359 SHA512 7cf41d2429d442b4dfd5d369e394c11916352e16fc56852ea4af71945192903482bc45c38367ff5ae3f8d386ffc65cc61a9b0bec4594589a057557daf54d8562
 DIST cpuid-20220620.src.tar.gz 134487 BLAKE2B 37beeeef5bbeed47d762f093a568e18ac06b32b4c8c4d763656c5310c78b949c60aaf4e874b15485af15be1e31c389692a0ab277a95a0dcb0b66a7dbece50a52 SHA512 e06db43fb12efa1d112267993754965b8a2b07c914766a46a0fe6fdcf023606cfb132eac575726ad9ed7d0e6fc53d728a6d3d3d7abf2f484f002825c791da7b9
-EBUILD cpuid-20220224.ebuild 600 BLAKE2B 9aebdae2673da4c0d88f9178cac0366684a2ace93004c51d1868a48d0dd8c897acb4670a212df69a48b79de99d4536cbf6e488078573fe9a493a5af511e75a3f SHA512 1dde5b326b3f04775419cd24b970d0019baedd82ce2b2afa1a94afd52280ccb4233ecaf4b28a60f0810df66a113c63b1c7da08c324f583a00315c6eed4f7d9ea
-EBUILD cpuid-20220620.ebuild 602 BLAKE2B 0b44750e78eaccaa51fef6961672ee30daffe9d77ec413201a4779b94ecce53fa10539907cdd3d79d1f6dcdc5a3e542c8cfc0a10deaf6fac01d48b9bbffdf089 SHA512 7abdb0e2514f001cae3c99bd2f0e128a2d17e7ee2d38cbeb7d0043635b02747415ff3c3b3ac86fbd2313d2dc6351e1c0a0094c048fa4e4e0146e3fa5b0290d6d
+EBUILD cpuid-20220620.ebuild 600 BLAKE2B 1ebc72661435e3d658e51857de187ab6ebf663548f0431f18c5240350d70bf7bd3390503bb5b45d527f28697ff6eaf0ab093847bf812a109f405ba75f95760d8 SHA512 2a2860ba8cb11dcc186d3cfea20232055a184de370651887aacf9db71ffa6cb80594e057ff8f7a4a81f926f38ef1c148cb2a690f9c1ac371acf46dcb01a3e06a
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20220224.ebuild b/sys-apps/cpuid/cpuid-20220224.ebuild
deleted file mode 100644
index d215e1baa0cf..000000000000
--- a/sys-apps/cpuid/cpuid-20220224.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BDEPEND="
-	app-arch/gzip
-	dev-lang/perl
-"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20220620.ebuild b/sys-apps/cpuid/cpuid-20220620.ebuild
index 0f77190b474c..eddf220e872c 100644
--- a/sys-apps/cpuid/cpuid-20220620.ebuild
+++ b/sys-apps/cpuid/cpuid-20220620.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch b/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
deleted file mode 100644
index 9cfad5ef594d..000000000000
--- a/sys-apps/cpuid/files/cpuid-20200203-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,11 @@
--CFLAGS+=-g
-+CFLAGS+=
- CPPFLAGS?=
- LDFLAGS?=
- ifneq (,$(findstring arch=i386,$(CFLAGS)))
- CISA=-m32
- endif
- CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -W -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wimplicit-fallthrough -Wunused-parameter -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION)
--INSTALL_STRIP=-s
-+INSTALL_STRIP=
- 
- PACKAGE=cpuid
- VERSION=20200203
-@@ -40,7 +40,7 @@
- 
- BUILDROOT=
- 
--default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-+default: $(PROG) cpuinfo2cpuid
- 
- $(PROG): cpuid.c Makefile
- 	$(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
-@@ -56,9 +56,9 @@
- 
- install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
- 	install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG)
--	install -D -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-+	install -D -m 444 $(PROG).man       $(BUILDROOT)/usr/share/man/man1/$(PROG).1
- 	install -D -m 755 cpuinfo2cpuid        $(BUILDROOT)/usr/bin/cpuinfo2cpuid
--	install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-+	install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1
- 
- clean:
- 	rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 21b1f9083796..44142fcadce7 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,15 +1,13 @@
 DIST inxi-3.1.06.1.tar.gz 357819 BLAKE2B e6eb8a34807323d7f46ff029af797e3a13229813bf0cff4b8b874cd21ff1d38459e2181ddf3882b4ee0d29e8c788e2fce1c01f5c295911493292082192c56c2b SHA512 6621252048e95132cfec30e341f72f5942188f273488509614aab28e55ee9987b8f3820e1298c4d9a16b4f3464f1f270fb4c1d5e5a7bf0d2f616b4180193ab6b
-DIST inxi-3.3.04.1.tar.gz 450695 BLAKE2B 3bf2fc9296c9b1e2357e7df2edeb3df5069d48b401be793ab82bd630cfbf45fdc39d6403d851d46dfa9b8e7729da6dc07e96982941396e46493f4531bb29233c SHA512 0ffde2362c79a4269df0f4bbe439e50d24a13969a22f6e84f6caeb8cace2ee49fb075d6051211709efdc831c2f7ef37eaa38d70306bc8f1a86f8ed0dc7dea094
-DIST inxi-3.3.06.1.tar.gz 460416 BLAKE2B a7a5eeade861294c8c18cd9594ef6fd0c681d8ae66b6e1b112dbc968be46a617db666d863f5138883d7651fad8e3b27c4f27a2b518233ffa2aae7e453feab62b SHA512 0e9d7215339235914cfcd7292443199304d44e528545a0c1c3d65d597f57da5c2678c410d215e6c8668c22677f20d62c93bbd7fee02dc74f8c9aab75b1488d00
 DIST inxi-3.3.08.1.tar.gz 467132 BLAKE2B c0254174c0a48936e1f183c16f985838cf74302da706996c1baec0c67b9c4209da5b555805cb668d626eccaa69f95e3cab2605b06d2cc7361a6cd3ff5d88c29e SHA512 bcbb81dd022dbd525ed3811406997c6689f968de8a3b6e0988381d9d2a488617ef3bc966034f9baac8eebb412b8d2e612b7cece29d65bdcb20d8b8cdeca112e6
 DIST inxi-3.3.12.1.tar.gz 495524 BLAKE2B 76b8600ea5bb5430a30bf3876ca80c1dbc8033449c3526c945d7457f3d9176d6299acf6d1a0b3e92c2f84e4b01ba70acbb326cfc9cd5b906e9e5a28550efa670 SHA512 5772b77a35342b6dee7211f31a35552794fddcdb01012e604c501707f1e3756791376b92e5c8f3d8c85493b83f2394d2e6f90f6e473225388975de2e174a2997
 DIST inxi-3.3.13.1.tar.gz 524354 BLAKE2B de12d2145f61b385d636aa9aa1efa057cfa12b010789ec34602ee7567d4db34a960a85b47d17f7a4db8cdb68a44d1085ca2f3be11ca503e5172525d75901d244 SHA512 6eed08ed0efb3574d294127beaec1373df434554ad98debd25ac865b85ab98e81e11f0cee855da0213cbc25fee95ce8504c7eaee90d99b8ad7c63f2b301394f3
 DIST inxi-3.3.17.1.tar.gz 558476 BLAKE2B a53a90a9bbea44da7e2f4c77d2fbd6cf41fd4bcf95defe7c27379b62ccfbeee70e06865034082e4ffd24018312ca0f439d9ef7d746c979fbd4c5fff47b42f165 SHA512 2bf28e8c4bc3d93e309639e04dfafd6e7b2c82b33178c11e138828c8378e1636b1fb16dbae88838e69953020789637745ffa54818ed954624995c1daaf2387cb
+DIST inxi-3.3.20.1.tar.gz 565689 BLAKE2B 0b89e54e22d0c88b57fdc2dcb08fc3cbe6b79a724c12d8eafd2e6eb6639ee1346ef9ee34b09f446464bafa35df87489ff9b40ad9e8de67fbe82c1becdd5af8bf SHA512 bdc4de6d2978ff17bdd4a5366d66fb483a304c61448ef33be902080a75ae6e78eba6bcd31b9a799a1eff01f22cc8e72200f314209e36af4287d8e5256bca4d05
 EBUILD inxi-3.1.06.1.ebuild 807 BLAKE2B 448c656ce3d29ab6068ef103521cb60cec55d27e74294d98885230a1a3b437999187f9633af2b30e61ee8235067750152bd0a67394e4cd071adccc836ef9fa9e SHA512 6f48f6171bf6bfea9bafe1540d7f2a3ad809e3a422a9988420599620133dddccae19423e74998ff988b6e42e45317563884aa4a265b15e9137e635426c5e3004
-EBUILD inxi-3.3.04.1.ebuild 812 BLAKE2B a1889935dae2f8bb4e2b123f40092a2afe972638165475caab81518b1c07320179cd6f36d66193675f885ffaa1ca8b1bc4d1e7b66f3c62d22c51f3166a1d4b5f SHA512 44641459e267d3bf1a8ecf96cff0d54352bf8faf261e33fa751ac1d79f7a6b718ef958300b79858f17362562f2883cf7d0523dcee2d665ec55d2818aefd9dd53
-EBUILD inxi-3.3.06.1.ebuild 820 BLAKE2B 729a7050c2a4227dc0ce4b0c01d6c2a8c545682503312d552e8f5f9018aa04354abe2370ac6b97e97cafd4d6fb9a8af3caf62b79caa4bb71ccdd57fe95ec4f29 SHA512 2cb0591495315c2292549627f3c205613caa14d631f147f3890ee208cac8ff4afc07c3d6e9446f12aa403608b4b520110411c2a90d5ffe9d98e73bc5c5100cb2
 EBUILD inxi-3.3.08.1.ebuild 822 BLAKE2B e0809bcec63b7f57cd126baacc4f463d946d9bb9f7ef235f0e7d21f197fa6b7248da90714a5a8f654a01a1f07a7fe99805587876b35f62f1b7a53b8fcd6f22d4 SHA512 fec2182a7fc229765f9b6861fedaab05b64f97ee6fa0d6bd324c369c53d5d7d567e002b4bb02599430d8c9e155c8776ff54239d0e9fe484ae1ea1ae35fa113d3
 EBUILD inxi-3.3.12.1.ebuild 822 BLAKE2B e0809bcec63b7f57cd126baacc4f463d946d9bb9f7ef235f0e7d21f197fa6b7248da90714a5a8f654a01a1f07a7fe99805587876b35f62f1b7a53b8fcd6f22d4 SHA512 fec2182a7fc229765f9b6861fedaab05b64f97ee6fa0d6bd324c369c53d5d7d567e002b4bb02599430d8c9e155c8776ff54239d0e9fe484ae1ea1ae35fa113d3
 EBUILD inxi-3.3.13.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
 EBUILD inxi-3.3.17.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
+EBUILD inxi-3.3.20.1.ebuild 834 BLAKE2B e917d5256700f690ce449ebd1a6b4f0f517b5e446040086968aed594d8af91f5714304122ab484fbb78671ca93d51c8cf9cc8f2ae541d39cc1cf7bd3679d0537 SHA512 fb82b7d86ccf3ed2840ade49f6ebd0bf252ffdc0a9d4c8e0db29b64b80d926a479bdbb654cdef75de32d7fa05a9ed5e40f5af3bfb85de4eb4a3b85541fb49188
 MISC metadata.xml 613 BLAKE2B f444aa0759120064814cacf0fcba57059d87b1c014d78eea52304fb3afb9da9b905e30c1cf1399bfbc0d66442e3d892eb2657543014b905f2bf9a943dc8480d9 SHA512 cbe6e76cb003bb77134398aa1db5a24c47de826eb1f17b07e2cee647b9d58948596c2f4588c7c834332c096ce8b782799f07ed4f47a7b252e85e402324ba76bb
diff --git a/sys-apps/inxi/inxi-3.3.04.1.ebuild b/sys-apps/inxi/inxi-3.3.04.1.ebuild
deleted file mode 100644
index c608479bb8f9..000000000000
--- a/sys-apps/inxi/inxi-3.3.04.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=7
-
-MY_PV=$(ver_rs 3 '-')
-# 2.3.56 was the last version with no tagged release.
-# It was also the last Bash based release. Later versions are Perl based
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="bluetooth hddtemp opengl"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	sys-apps/pciutils
-	sys-apps/usbutils
-	bluetooth? ( net-wireless/bluez )
-	hddtemp? ( app-admin/hddtemp )
-	opengl? ( x11-apps/mesa-progs )
-	"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/sys-apps/inxi/inxi-3.3.06.1.ebuild b/sys-apps/inxi/inxi-3.3.20.1.ebuild
index 3c22d8270f60..49cc31d24326 100644
--- a/sys-apps/inxi/inxi-3.3.06.1.ebuild
+++ b/sys-apps/inxi/inxi-3.3.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="bluetooth hddtemp opengl"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9f1ad9210016..6f6d7630dcb9 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index c41ad1682ba8..9a616ba2b310 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,7 +1,7 @@
 AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
 AUX ldb-2.4.2-skip-32bit-time_t-tests.patch 1308 BLAKE2B 1ff687160b92c5395c7838ade8af32ba77637a2b18153d146b9e1496f96ec9c411cc5e5f9721a8dea1730118e6574a091ee7fd1edca1830cc54c5d4fddb007ab SHA512 27a35123cb9a1f6e39b88c91de8241ecfc0f0ed125a235ba26b95767dc3121d176b267ba97b1579e5b68cfb9e3879f40326f0163a31e311f01a1b2eb7751caf4
-AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
+AUX ldb-2.5.2-skip-waf-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
 DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e
 DIST ldb-2.3.3.tar.gz 1719542 BLAKE2B 2a5cfe3ddac2054d167c2857e0cd92e0f88d2c196f9285c029b2a525d781025a956a296bd6d793b65f848188cf7adf70f99542999061a85be473b3fc3b2856f1 SHA512 ffb50208fe971afd544a431b79905ec8fce67d78d20c3fcfb8345a56f3b278fb664bc48079d7239a8ca5b70aae8b32076b6007cb63e080cd536e9fe458efeccd
 DIST ldb-2.3.4.tar.gz 1721000 BLAKE2B be54c0bffdc910029b5e324578ed2f1e0350dfd19202749cb0c05dff20f3786d0cb612f18ef6f9534c7e34e94c0a283adb3dd935ca3c3252aba0290faca590ef SHA512 e0128a0e36411424fbb092ce24f503f530d0bc75dc98f31e0f457df34c3c2c01c23456d55722eca9965ff89f4dec5cde36c1dabbfaf3ddee536ff4d1dedb1c1d
diff --git a/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch b/sys-libs/ldb/files/ldb-2.5.2-skip-waf-tevent-check.patch
index 4578435064b0..4578435064b0 100644
--- a/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch
+++ b/sys-libs/ldb/files/ldb-2.5.2-skip-waf-tevent-check.patch
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6c3ce65cb06c..851ce346da54 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index b7a180494ecd..53d8e3660016 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -3,6 +3,6 @@ AUX postinstall-en.txt 1847 BLAKE2B 20dab86a97dc42b4b6c16db6d72a3bd74a2ad2d0948a
 DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380 SHA512 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
 EBUILD cgit-1.2.3-r100.ebuild 2383 BLAKE2B 900ad85af0923fb039dd32531370860a52717bb8ba77822e028ac8b664cd0673964425a7d086ad2eba28d873604147e6f0aa143ab729ce36ac5d8ce2de4f7590 SHA512 df5bdbdb0e7c27de5414685f836dab07df25c7723d57e827c874f482ce09ae0b9feb47cbb188eace40afdaaffec52730853df42a00bc3a5753904d63fbfe02da
-EBUILD cgit-1.2.3-r200.ebuild 2787 BLAKE2B dc80ff3dba679525445aced56eb0d50923dfe911c971a15ed36f1203eb3642663458c049fc66e8888316b2f6a753efc5f3ce96c752fb23b71edfcf1dc5944b4a SHA512 56657321a342d907733210fbec433682e41e67a337b7d21e8ec5f755a37c94c8fe7d726c81a0388f04c85b886c31cae29abf4970b410ba090c831c17d38430bc
-EBUILD cgit-9999.ebuild 2230 BLAKE2B 6afbc270e5f1eb4820acb92483e9f163042f0509bc3b150715cb6e7a728705b505eaa780d3c48c27022b203c869e439c77d4870d97c5dd131c7f78d88f954301 SHA512 3215784b5e1f576889d68d5f337bc45729dc23804e2c9856fc2ceb274dc02d6ad1b79eb4212b5e4c374eef148ea54683bbaea3ea04139815c797a06330195270
+EBUILD cgit-1.2.3-r200.ebuild 2788 BLAKE2B 4d8079bd3b492b05b0f8af6ccd462da17c262d5138626a7a4a11873587a179928b440be658c7e6620caddf6388e34cf2b26023b014e23e5176ef983d700cb4d7 SHA512 d5cd786ab3292f7605ef27993f9db40c19c3d1a89fef245314615c46f07f4dd9574eb8e410ba1133c75174b7c5a53c0ab8a25d934f168f097159b01143d47574
+EBUILD cgit-1.2.3-r201.ebuild 2791 BLAKE2B 47e23d820037599cf0c50c88ac18a9500e8db169ccff466d76f375768d1a425cd2ab20aefa7f6214fa59b0915ed2bc1c02e18b9b956d7126aa69b187f00c9e6c SHA512 f8c663e1cd97c20339c3c2bca59df19eb7c648d6cbc982eb737896abbf6870f0954b3b0c64eef1d87bb0bcaf73a0aaa8558ea7c48da01dc107d193c71e3faab9
 MISC metadata.xml 686 BLAKE2B e2a06875b848f1ae6a275fc8ef65a15cea8d93b9858d985bd96acc7e20bcf3e4fa9d402359fff08dc0bc98c28ddc385b605c0f10e30a309e0cedef9a338f87c3 SHA512 56235759deb83b598fb42b87dcc45e3c1d1730a06acfa791e2113659f9253b93fca5ab431326d4b2b3ecdefa94734e5fba2d1c540934680ece86b01eb77341f4
diff --git a/www-apps/cgit/cgit-1.2.3-r200.ebuild b/www-apps/cgit/cgit-1.2.3-r200.ebuild
index 3029f760db0f..2794730845ec 100644
--- a/www-apps/cgit/cgit-1.2.3-r200.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r200.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 WEBAPP_MANUAL_SLOT="yes"
 
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index 0efa5da905aa..f4b0c75060bc 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -1,62 +1,75 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} luajit )
+
+PYTHON_COMPAT=( python3_{8..11} )
+
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit git-r3 lua-single toolchain-funcs webapp
+inherit lua-single python-single-r1 toolchain-funcs webapp
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
+GIT_V="2.25.1"
+
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="https://git.zx2c4.com/cgit/about"
-SRC_URI=""
-EGIT_REPO_URI="https://git.zx2c4.com/cgit"
+SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz
+	https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc +highlight +lua test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	acct-group/cgit
 	acct-user/cgit
-	dev-vcs/git
-	highlight? ( || ( dev-python/pygments app-text/highlight ) )
 	dev-libs/openssl:0=
+	dev-vcs/git
+	highlight? (
+		$(python_gen_cond_dep 'dev-python/pygments[${PYTHON_USEDEP}]' )
+	)
 	lua? ( ${LUA_DEPS} )
 	sys-libs/zlib
 	virtual/httpd-cgi
 "
 # ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets
-		>=app-text/asciidoc-8.5.1 )
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		>=app-text/asciidoc-8.5.1
+	)
 "
 
 pkg_setup() {
+	python_setup
 	webapp_pkg_setup
 	use lua && lua-single_pkg_setup
 }
 
-src_prepare() {
-	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
-	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
-	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
-	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
-	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
-	echo "DESTDIR = ${D}" >> cgit.conf
+src_configure() {
+	rmdir git || die
+	mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+	echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed"
+	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed"
+	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed"
+	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf || die "echo CGIT_DATA_PATH failed"
+	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf || die "echo CACHE_ROOT failed"
+	echo "DESTDIR = ${D}" >> cgit.conf || die "echo DESTDIR failed"
 	if use lua; then
-		echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf
+		echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo LUA_PKGCONFIG failed"
 	else
-		echo "NO_LUA = 1" >> cgit.conf
+		echo "NO_LUA = 1" >> cgit.conf || die "echo NO_LUA failed"
 	fi
-
-	eapply_user
 }
 
 src_compile() {
@@ -81,6 +94,7 @@ src_install() {
 	keepdir "${CGIT_CACHEDIR}"
 	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
 	fperms 700 "${CGIT_CACHEDIR}"
+	python_fix_shebang .
 }
 
 src_test() {
diff --git a/www-apps/prowlarr/Manifest b/www-apps/prowlarr/Manifest
index 29aa01ad9de9..6ccd4c40e2e1 100644
--- a/www-apps/prowlarr/Manifest
+++ b/www-apps/prowlarr/Manifest
@@ -4,5 +4,9 @@ AUX prowlarr.service 558 BLAKE2B 8bb379f30a93ce537016133627e54cf5d71b666f31db50c
 DIST Prowlarr.develop.0.4.2.1879.linux-core-arm.tar.gz 85892990 BLAKE2B 5e0cb3dba04f2cf1824527e0274cb8f11a8636de12b2ced43eaa234352860ec18bd83d65dc6fdccae2fd127fe9fefbd09578a43446dd0bc43f21d9c32b160d6e SHA512 115bf5c62091c514867129046d662bae17b721c3d46376493be5caf44f09929d6b0b3844ef93747bf56b64e9f4fdc4b5c0824ee6842f170776b7a4536ec4bef7
 DIST Prowlarr.develop.0.4.2.1879.linux-core-arm64.tar.gz 85152796 BLAKE2B 033a426af2ce96eba38606216bb1f75689c8f16dec460395f432f57041cbd28b197f9eacf0ad0f8cb2558a7980ae1b9c4eec70601b2bdd5ac96f77e9aeb93ea9 SHA512 f652f40713d27cc9486444b4fd0185e343bcc869b4798d22446097bff962bd3a51cf0f54a66a7a1acf07a6d7db29e8cf828427f3c81cd637c30618a19de85da6
 DIST Prowlarr.develop.0.4.2.1879.linux-core-x64.tar.gz 90155053 BLAKE2B 3baca7360f9d8e1a6c02783288423f01591b70895bae5909748f56d9a8e830d51809ebb378a0010a72f28dec76cc6563100d969bf224acc6ef966cccb40fa60d SHA512 a9c0a52a3ee02ed38f501307c59bdc90dee8ddd686fbd132de8625892cba89b4267594f3c4df714e488aad14612238c6400ccb82d3d0438c078ed92f61cd49ce
+DIST Prowlarr.develop.0.4.3.1921.linux-core-arm.tar.gz 85882360 BLAKE2B f85fc83b82782a3f4fc1b35ddf42aebe837f9193c9f6689231b8b1c3d40204af22d966c9a1c04f1d1ae65d5f8925dd1446740baa0b699d825125b722d7a55b90 SHA512 bc3cf6d2f2704bd765b137d864630cc69d64081989e67c4314e7245866271a00b468c2eb41f094db195b5f548701e840e8d94374b2122914da278f385da52f43
+DIST Prowlarr.develop.0.4.3.1921.linux-core-arm64.tar.gz 85148479 BLAKE2B c4c05af3bc03b173e0897e717062b5432cdb12fed23022cb72a4bb9d9a3d8e1898d8ee021b7240ab3d3c2c0a5cff61cd2baf86c71e7776ce2b19c171188e157f SHA512 3a5dee3264aef4ff25952d832a9d1b90a52cdb2013838d9cae8a9bc2c28df1d96ed1c9e0647576bbb2a620637bf3c9f360b972fb2a1a9f143ce3575a1d65ef66
+DIST Prowlarr.develop.0.4.3.1921.linux-core-x64.tar.gz 90147463 BLAKE2B 43e78e7cd1c1b5bcf8cc7d2b964a6ec726b25da54a08fc59b9fef9f4b3386e6d499b24be55b51b0bcf8ffa9c4982eadc9e05f323e75e92fa643a47e9d654ef82 SHA512 b11c4603e3cb2c978cf37156dbfa442dbb295df88934313a67aed1e5b030c89daca5ba2091da4b58133a3fae798bbe9139a0e434e25ee2e90928fc72b658d6ed
 EBUILD prowlarr-0.4.2.1879-r1.ebuild 1446 BLAKE2B 90b49fb8d9af086bae87fc8c5a625d8d3b21450962ccad4096d0834b121b354b04dff29254b272d49c888701419ee78be6704faab24251c400905e8c48965d7d SHA512 6b8eab78b023e506862403cd072931daeab34b5c60fd116cd491dab7196b098176413c91d8c1c9398253222d0a950eabdf09889f6c65f1b8d2d554f461ae19fc
+EBUILD prowlarr-0.4.3.1921.ebuild 1446 BLAKE2B 90b49fb8d9af086bae87fc8c5a625d8d3b21450962ccad4096d0834b121b354b04dff29254b272d49c888701419ee78be6704faab24251c400905e8c48965d7d SHA512 6b8eab78b023e506862403cd072931daeab34b5c60fd116cd491dab7196b098176413c91d8c1c9398253222d0a950eabdf09889f6c65f1b8d2d554f461ae19fc
 MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
diff --git a/www-apps/prowlarr/prowlarr-0.4.3.1921.ebuild b/www-apps/prowlarr/prowlarr-0.4.3.1921.ebuild
new file mode 100644
index 000000000000..c80e40c7bec2
--- /dev/null
+++ b/www-apps/prowlarr/prowlarr-0.4.3.1921.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="
+	amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-x64.tar.gz )
+	arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm.tar.gz )
+	arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm64.tar.gz )
+"
+
+DESCRIPTION="An indexer manager/proxy to integrate with your various PVR apps"
+HOMEPAGE="https://wiki.servarr.com/prowlarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/prowlarr
+	acct-user/prowlarr
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Prowlarr"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Prowlarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/prowlarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/prowlarr.service"
+	systemd_newunit "${FILESDIR}/prowlarr.service" "${PN}@.service"
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 534ea7be2c93..8511585cf482 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index b69bd969cb03..026be59d5b50 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,6 +1,4 @@
-DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9
 DIST dunst-1.9.0.tar.gz 4609222 BLAKE2B 4879122e342c1e518bca079bacd4ae769fd7da41db681230613c61531e62df94223757372c428c06710afd843200dcb78883d352f4e25098f0672b5c89ab0d87 SHA512 e43c960561d1f804c1d8f73f9376b33f61bf1ba5c5d0579c9875ef96da6522e214d5b74166ca3375dff1b4b0291b611b2d9ac1fb41fa8722db04c21e898824d1
-EBUILD dunst-1.8.1.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
-EBUILD dunst-1.9.0.ebuild 1595 BLAKE2B 639d95fa131b6765873682fb4df0200ac07b6b96843470dd1f3924e7d8429ae33c70bbda3cfa5adaaa0776ab6d480af5306c4e2627ac31af5814c6be612d13ba SHA512 7572b08204d70de4128b1fda07bae60dfe1378f26e203527392e2ff1cb834aa5f1535eb6bc26dfc9600b0402c8106bcd8f69be8b7b6e9d889d35644211b8fb2c
+EBUILD dunst-1.9.0.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
 EBUILD dunst-9999.ebuild 1443 BLAKE2B e9ff7f69d40187ee07c60fcd8f5933e2b9e725f5976c08db922c7a91c2de6517e418786a89cdb70d342ec75c059d1865296905ed3eb01118740e3ccac8656593 SHA512 f4e7347f08df22c12aadbbf6288577627208905d3f58119fd3af31dc6e03e8d89bced59b0d2e893f972e96302601117142c02f542fe0a9ade529128474c0789d
 MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.8.1.ebuild b/x11-misc/dunst/dunst-1.8.1.ebuild
deleted file mode 100644
index 37336b25c793..000000000000
--- a/x11-misc/dunst/dunst-1.8.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Lightweight replacement for common notification daemons"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-DEPEND="
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libnotify
-	x11-libs/pango[X]
-	x11-misc/xdg-utils
-	wayland? ( dev-libs/wayland )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	wayland? ( dev-libs/wayland-protocols )
-"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os//' -i config.mk || die
-
-	# Use correct path for dbus and system unit
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	default
-}
-
-src_compile() {
-	local myemakeargs=(
-		SYSCONFDIR="${EPREFIX}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		PREFIX="${ED}/usr"
-		SYSCONFDIR="${ED}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	systemd_newuserunit dunst.systemd.service.in dunst.service
-}
diff --git a/x11-misc/dunst/dunst-1.9.0.ebuild b/x11-misc/dunst/dunst-1.9.0.ebuild
index e3f5d7b97fd2..37336b25c793 100644
--- a/x11-misc/dunst/dunst-1.9.0.ebuild
+++ b/x11-misc/dunst/dunst-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 DEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2022-07-30 03:08:54 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-30 03:08:54 +0100
commit	cdb747b791914a30c287a3a8e33d1b635e431707 (patch)
tree	be22ab4ebfae7f170acb577486d0edc7e6d14279
parent	496936ff0f7db69d1f7317341230acb866e3c330 (diff)