gentoo auto-resync : 14:06:2024 - 00:09:04

18 files changed, 337 insertions, 15 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d4d43fef5503..a41a60036b1f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index e2bc3e682493..d1fc11a73f89 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,7 @@
 DIST conan-2.0.16.gh.tar.gz 1000880 BLAKE2B 0ebc7df66e97a8f29ade9d1ffbde5b0f6ed4ac5dd98bab29e9a88d1ae9c864237a396b5c0588f3efb1186f6f22fa1fd0205215b3459fb87fa012febc49ad786a SHA512 bb8d5c1b2df085bc2e1645dd8b14be167b7ed01a47485bbe39994a150ca905de6a194927cb3cecd81d4d7bab613d13ca3779d9aabddf1a2df731bd62ec5bbe39
 DIST conan-2.3.1.gh.tar.gz 1078426 BLAKE2B a3a92342a2cfabc9dd4c22d1665d092dd2a33be8fdd4c3e7243557b845fda8910d713bc34b59d1e4c2b2ead957ef0ff8ad0d23fa80804c9d842b5f9c944323c1 SHA512 405d9979bc79b684509aa756c2aa50decd1b9194e5c7b847b6a9755daed9941c7b9615cf518aedf920eeea0de6dfc194e36b90c2919060a3f276f53692a3fe5c
+DIST conan-2.4.1.gh.tar.gz 1092566 BLAKE2B 7b97f9a274075bf3e9396eba9e3dc4d155c171685fb204c885877ad10dba3f751cab5a28e220d3df3b803aa8f80d080c63c37801ada4b1691724bb8988f34c97 SHA512 b51d491be8202eb7fd60e5d2aef63bd9f43311da73f36edd615210222c32160f35af81ec47351e7762b6583a6d3f6230020130866e0450320d87047439de2767
 EBUILD conan-2.0.16.ebuild 1607 BLAKE2B f48a0c2670d21944a56e7b0027fb58cdb52a0fb278cb2ba73f328bfc4290d72968cbae2baaa38dc9d782dfd499694894fe97e181b7da5f387cbeda51782464c2 SHA512 3cc9a804afb6ef2f4666d781b2f8fc983dbce1219fec4b97f0be408e27894954caa78373c3fc86c5e5c1405fca76df7b0c16285b2b840dae8cb927c07564516e
 EBUILD conan-2.3.1.ebuild 1279 BLAKE2B 3d9760ef60261ee50e5ca4a7f7a05b95d47a43f609ac8c72080c523eb1a17dfca7845412fec409dd5a63fe9ab810a663c4742d97f40ff739979aab601dc817ee SHA512 0a880e35e07b38d04dba7c2f5a943703c58213cbd8be58207ebb6fe6a27d41685fac17f258e5e8ba92a1077439f8b129d4e08dec1ce3ca2b0c3fa0f84769648f
+EBUILD conan-2.4.1.ebuild 1414 BLAKE2B 96b85c18d157692034513d4eff1a8527ed40022f1ebda293ad2209bad0cd470d309a349c72ad872ac314769d2300cfe2e2b6a6e8f95dd04eb5f15792ae7c37ff SHA512 dd89909c5431bd38bec2c499ae6758904a93af0a3f596eb208ba9349b979a3615127ca43a32e1b3d03814b63624dd4465d33948476a23ae87102e8c1a74a7b44
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-2.4.1.ebuild b/dev-util/conan/conan-2.4.1.ebuild
new file mode 100644
index 000000000000..81aeecdcf691
--- /dev/null
+++ b/dev-util/conan/conan-2.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
+"
+
+# Try to fix it if you're brave enough
+# Conan requires noumerous external toolchain dependencies with restricted
+# versions and cannot be managable outside of a pure CI environment.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
+		-e 's:==:>=:g' \
+		conans/requirements{,_server}.txt || die
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index c8711b5b6517..3f53fa2147fa 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,8 +4,10 @@ AUX jenkins-bin-r3.logrotate 188 BLAKE2B 0dc1f24b3f6f709060dcc4d758c4aa7b1555309
 AUX jenkins-bin-r5.service 509 BLAKE2B 570167d1949e072aadb03f570166a5c35de71260e3707da2c7258f9d39667be71bb9ede116fccd8d54f02f1769facb076e83ae0102fb65c1f376c37fc4b0d38a SHA512 5f9075977c8df0788cde4fbdfa9e84c4ca23c8927d5b88ab82109fab1326465ddea18b8f99831155a9c5b0fd902d204bd083c0bdf811b83c73eac8ab3ebd9ad9
 DIST jenkins-bin-2.440.3.war 93489042 BLAKE2B 23f7471b8ce5813b7a7018c033b96874e7e040ea900e810dfa6879ee96c6b98bc6b87aa9f09b4874cede44bf40f07bf8a4a57a909530aaa8d12a9ce3f0ab73fb SHA512 e44f0dcbdef443fed38962966e1e6a231e3ab2c070f7f3c197d5c18971ffb7886fca6b684e34608f26d71500662546ec53ea1edd24b3fe15cb624d644fd7dd7e
 DIST jenkins-bin-2.452.1.war 93468275 BLAKE2B b45991767976e2de81809be58a19e039c74db9d053619d2d5b3b416a3fc9b86614e570cdcdab85de5dcebf3b20a0da708cf871828941188f95b0191333ad0138 SHA512 b826231374783cdfeead0394b3c818d9c58af2d8cc244449f04e23257fce668f7f26a26a930139c949621f5d6978435bd14cd461b101259ff0ede48e2de59069
+DIST jenkins-bin-2.452.2.war 93404074 BLAKE2B 13e2e2763fd55a26bd3a094ed5becfc8121678e4ec5a880dcfbe4eb2e3250cea2015499f53160487765239d336eb6d2e7eb78091d15eb865b781e52575af3ad5 SHA512 aefa1e8bf8d5296d2c058a1184b450bf94a1970a2d1abcf2b4712fc86d35a8034c17f28eee146553d45dd323e0ffd41fe7cc467d9f350a544d8bd99b4dca6a6d
 DIST jenkins-bin-2.454.war 93687808 BLAKE2B 9f52eedaf53d671997bc40816c8d63e1cd8b464c5bb240e0ea01271cdb7a9734899ce3c8c909c3e431220e2a23a4a78a1012e1487bf35639c7b394893a9e4cb2 SHA512 52ed14e3e8edcafd8a192d7ea06bf68d16e6eee9b0da35f5fe2ba258c28701b9ceaff233737f2bdbe525638d1dc1bf613aa5d8b5c6c880e98946ae908a26c777
 EBUILD jenkins-bin-2.440.3.ebuild 1112 BLAKE2B b628bb0d28d7eeda4a34ced43413d4a179fb09e27b980f6c9111facf952096e4412c23dd9e0c69826f116d3a89718520a1ba94adaf71d90ff56da33ef6fd0bd3 SHA512 9df68d08f50d712bdee5ec75ac3729a3ad7674f610c50964bf6b814dd3b65c180f3ca51e77087165ff3454ca338ae9af7299f59970fbd843fb5e20ace8b0f849
 EBUILD jenkins-bin-2.452.1.ebuild 1112 BLAKE2B ec957d6c4818a97662e1639b62de36bf0491f936e95111d9a2f7599e4a98eae13fca57467c6f37009cad68312bb75005e4d5daa165ce53fc2960fb222b964ce1 SHA512 6ea5708d64cdcad2dfbe5c36ae2c587d606752ff385b32578fd6a9dfab6ecc1a81fce8dcf57eb56c301ba13bd3189ee3ca4c4b570791f04e7254fc2915e41fd6
+EBUILD jenkins-bin-2.452.2.ebuild 1112 BLAKE2B 0cb9d0c2add436d67e64f2a8da5f76a7d464e35eb8d6ac8b092e05caa391a4301ee856dae84cd531d75b0130aae98a0006750ce6fd9c6ac802d317c05197ae4e SHA512 293c3c8f57fc2ff7352edd0483e7ab448f8d330f4c9b27310af28673f7babbbc502344b45be28be087c6c8a9a20f82ecf18b18291f8836f933ab27e59a281436
 EBUILD jenkins-bin-2.454.ebuild 1105 BLAKE2B 54b6c37d361b48403144b1c6bc4685b08cae8d7998c3dad138b7476a904fa69d7cf8aa073545ec25aee71f0da324800b9335ecff047a81caf3e6d0157dc21967 SHA512 539382470b34a88d6fe17b6837c0bf97189278ea52e8ce4057ce8dc6661c66dbf93df47fdf87f49fad89c855f7f5afc8b46d6d7fa67dc71166e1847334aa3dea
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.452.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.452.2.ebuild
new file mode 100644
index 000000000000..66eac1f03a8e
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.452.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="The leading open source automation server"
+HOMEPAGE="https://jenkins.io/"
+SRC_URI="https://get.jenkins.io/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+LICENSE="MIT"
+SLOT="lts"
+S="${WORKDIR}"
+
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r3.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r3.init jenkins
+	newconfd "${FILESDIR}"/${PN}-r1.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r5.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index b24cb10d27fc..4bb9a4c5c6a5 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-24.02.2.tar.xz 1090444 BLAKE2B 45b4eee5ea0465719b8d14ccc3bbae2021e911b5e5d0ca44ea32397f05a7c0967a0366ba1bf5f3a089e72917b576c4749119bc96ab3e7bc7bc063e4947d572a8 SHA512 f28eb7cbf0a057e0f8eea6112820d0659fd61ef611e03d8850cf8b0782acd9048d5a434d3a3fd26e6e9c0fff094a9f09cc1e4f8bea5e775dd4e2be442f878680
-DIST kdev-php-24.05.0.tar.xz 1090236 BLAKE2B e8d3ba8ca698f3c46689444c1df78ba81fd7f557cacfccd1603914c108503db2f7b836ab6148170c188c6228d68f4aa6efc45f23c7c6bcc81c226e07905ee148 SHA512 8988e1cc219cde791a342a43031b8d9246e17c0103fd6a63650b73b1001c4ea7dd85306f37a91b2f8b26dd0395533b651298318d6947783b85a2218da07508ca
+DIST kdev-php-24.05.1.tar.xz 1090160 BLAKE2B 1a7b65c59609cf31f3a2152296e4452a1f0ccde31e718ddd19920e979efe35f4c7ba5764525f6d44a333bc32fe09b4032d27b3091d5aec92ed09667adee5b1d0 SHA512 5fd9b489927648ea87abe60dfb231da62609335e580bde38190d21addde87a95bcf094dd205966e7855d1ab6425ca76d57f087378ead55ce1ee9e58ef9436cbd
 EBUILD kdevelop-php-24.02.2.ebuild 1204 BLAKE2B 509cb0478627bc393c54b6e8732b867f7a01a160238567e5daa4cbae02c49e7ed10621477873e027863520d619aef7a7a8075e67ddc48437751577af675f2d0c SHA512 daeebae5053ba338aeed3983b2ed67f53622bb313a7b7de1597a434fd90d6a34fce96a027e3cf29468476b3dcb767215190a20c9176131f633136d0419889a19
-EBUILD kdevelop-php-24.05.0.ebuild 1206 BLAKE2B a8caff79e6de11e6ab10d3eded5bd7046604aace7ea9562ae2f8c94e39cb9c0b65ec1b67c654f3f27c4b9743ad259dbd5fd4f3f163d5affa0d698bb4e4da4976 SHA512 748cb50839f0f5264dae13ff560cafdad57fba4ccd804c820e9ab0299edbd2878c3b06dce28ba92754284ae9c5a36a24ad115f76e405ff6b9290a1117ce1a4ed
+EBUILD kdevelop-php-24.05.1.ebuild 1206 BLAKE2B a8caff79e6de11e6ab10d3eded5bd7046604aace7ea9562ae2f8c94e39cb9c0b65ec1b67c654f3f27c4b9743ad259dbd5fd4f3f163d5affa0d698bb4e4da4976 SHA512 748cb50839f0f5264dae13ff560cafdad57fba4ccd804c820e9ab0299edbd2878c3b06dce28ba92754284ae9c5a36a24ad115f76e405ff6b9290a1117ce1a4ed
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-24.05.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-24.05.1.ebuild
index b0dc65911f90..b0dc65911f90 100644
--- a/dev-util/kdevelop-php/kdevelop-php-24.05.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-24.05.1.ebuild
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 92d5edf7435c..837ec5e7a5b5 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,6 @@
+AUX kdevelop-python-24.05.1-python3.12.patch 6101 BLAKE2B decbd9f26f3c44bb2f6b81ff511f737a217fa7946cd3b72b2c13c6c5b06fee3e7a9ad14edc9dff858f04eed17de57d8297172c55ffee5fc826189c3e0b320051 SHA512 311966d24e3d5a73c79372abd30a261ba8a78dedec3cb4c9990264bdd6cce7bb8737f2ec687e683534317315137f5a1fe0df29fcf9f75c38a5d86971295d56ae
 DIST kdev-python-24.02.2.tar.xz 1098808 BLAKE2B 3019ef98788699eb9c5b3168656f73cfcd29c54134ca6d23831d70dd318e4b0dee89e7f0e6d4e81b9f446ee5ff92a84f660e117724a7a8b7f1ee3190f4674cfb SHA512 d5b86ce08f7a8ca79bd7f0b65ac1832677b4f0dbb8f2abe3ec7fbcca5a73334a5119c66ab94a22747802312cf717dd99b622243c1c18c55dcbafadba2e33e420
-DIST kdev-python-24.05.0.tar.xz 1098444 BLAKE2B 9941154df5cd5222a3a56d00f249f9fb0c233a5ef10dc280860670e315d4456246bf63e00bb1238c897c8db4a482caffbaabe4b421cd0572691dee635869f911 SHA512 9cf131c0c385882db9177dc3ed4800f3332e8071276cc18c057a4ff0f03128f112765a824bac19b4ca74ccdb40a84676c7c12924096cfd1dab16e0e80ce949ad
+DIST kdev-python-24.05.1.tar.xz 1098416 BLAKE2B c43c92f0606661d2fe2bd05a43f155a90ce40bb42d494cfd3c9ae3a0ff5a4d636440645f88fd5798b7b96454089ef9611dfa22851bd43ad1d85986ce46f077fd SHA512 e35ee5618e746fabe14e62185eb3d19fa7cb54e9cbe8fc8ec9fb1fa0fd938c984a9573408e0bc9993bd04b66ba5bd3274ddbb722835dff760d4626e42c30612e
 EBUILD kdevelop-python-24.02.2.ebuild 1234 BLAKE2B e43185c4c349afde189d93ebd7214e4fd0b4e7fcfa30060f117e081d74e9d682b599e72ae347ac489a9c3673aff5eeaa121fc1ba59d281f70751c9935b35f188 SHA512 4e304b7a8fd00ffd9e714cd27707427a3ca3ceaf605ac649104c725da17dc686e22aaf55663bafca20be9b9d917d0600d41ba7e6216ab583127213cc09606de5
-EBUILD kdevelop-python-24.05.0.ebuild 1236 BLAKE2B 62b7504b3219861f88df8c198d670d001ecc15cae0c01b09ea9c3f0cf42920b53b5e32730d2877e097cfec17c44f0431e65d19bd9748ab38e6cb452070101635 SHA512 b242a40c2fa3401b4eed0bde3c099e650f25f6f7aec85dbb16f892449a58b2ca95a5c5b95513b74896e9ca5de72be851657fa69435ee203a45190d128fdfdb9b
+EBUILD kdevelop-python-24.05.1.ebuild 1298 BLAKE2B 5224fa364cb67d9fa752a9b2786d46ddbfb6e8cbb8300ad9b6616d3a22ec2d3674c00c0ede95e1de2eec772ecbad495d9575a91cb889e206aa202509553da5a0 SHA512 1e092e9d377aca2989b6a1e96ef3d81bfd501a288eda02eb08d578529b6826434f3119e74cc15a795ea1138e8f946412b91f577bc94df7192d6221da3282a500
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch b/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
new file mode 100644
index 000000000000..00507fc0de7e
--- /dev/null
+++ b/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
@@ -0,0 +1,190 @@
+From 26ee370982e7cd7795921e9533b61a5a89d11b6a Mon Sep 17 00:00:00 2001
+From: Bernd Buschinski <b.buschinski@googlemail.com>
+Date: Sat, 8 Jun 2024 16:50:47 +0200
+Subject: [PATCH] initial support for python 3.12
+
+---
+ CMakeLists.txt                  |  2 +-
+ duchain/tests/pyduchaintest.cpp |  5 +++++
+ parser/ast.cpp                  |  3 +++
+ parser/ast.h                    |  6 ++++++
+ parser/astbuilder.cpp           | 15 +++++++++++++--
+ parser/asttransformer.cpp       |  6 ++++++
+ parser/astvisitor.cpp           |  1 +
+ parser/python_grammar.h         | 15 +++++++++++++++
+ 8 files changed, 50 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9fba20c3..29b83950 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_definitions( -DTRANSLATION_DOMAIN=\"kdevpython\" )
+ 
+ set(Python3_USE_STATIC_LIBS FALSE)
+ set(Python3_FIND_STRATEGY VERSION)
+-find_package(Python3 3.4.3...<3.12 COMPONENTS Interpreter Development REQUIRED)
++find_package(Python3 3.4.3...<3.13 COMPONENTS Interpreter Development REQUIRED)
+ 
+ configure_file(kdevpythonversion.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/kdevpythonversion.h" @ONLY)
+ 
+diff --git a/duchain/tests/pyduchaintest.cpp b/duchain/tests/pyduchaintest.cpp
+index b0711fd0..8a4a75e4 100644
+--- a/duchain/tests/pyduchaintest.cpp
++++ b/duchain/tests/pyduchaintest.cpp
+@@ -439,6 +439,11 @@ void PyDUChainTest::testCrashes_data() {
+ #if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
+     QTest::newRow("except_star") << "try: pass\nexcept* (IndexError, ValueError): pass";
+ #endif
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++    QTest::newRow("type_alias") << "type Point = tuple[float, float]";
++    QTest::newRow("generic_function") << "def func[T](arg: T): pass";
++    QTest::newRow("generic_class") << "class Bag[T]: pass";
++#endif
+ }
+ 
+ void PyDUChainTest::testClassVariables()
+diff --git a/parser/ast.cpp b/parser/ast.cpp
+index a63ac231..4a371b10 100644
+--- a/parser/ast.cpp
++++ b/parser/ast.cpp
+@@ -765,6 +765,9 @@ QString TryAst::dump() const
+     return r;
+ }
+ 
++TypeAliasAst::TypeAliasAst(Ast* parent): StatementAst(parent, Ast::TypeAliasType)
++{
++}
+ 
+ WhileAst::WhileAst(Ast* parent): StatementAst(parent, Ast::WhileAstType), condition(nullptr)
+ {
+diff --git a/parser/ast.h b/parser/ast.h
+index 430b70d6..acaf79f7 100644
+--- a/parser/ast.h
++++ b/parser/ast.h
+@@ -137,6 +137,7 @@ public:
+         ExceptionHandlerAstType,
+         AliasAstType, // for imports
+         IdentifierAstType,
++        TypeAliasType, // for types
+         LastAstType // the largest one, not valid!
+     };
+     
+@@ -437,6 +438,11 @@ public:
+     QList<Ast*> finally;
+ };
+ 
++class KDEVPYTHONPARSER_EXPORT TypeAliasAst : public StatementAst {
++public:
++    TypeAliasAst(Ast* parent);
++};
++
+ class KDEVPYTHONPARSER_EXPORT ImportAst : public StatementAst {
+ public:
+     ImportAst(Ast* parent);
+diff --git a/parser/astbuilder.cpp b/parser/astbuilder.cpp
+index 9c9ec056..32ab95c7 100644
+--- a/parser/astbuilder.cpp
++++ b/parser/astbuilder.cpp
+@@ -57,7 +57,16 @@ struct PythonParser : private QMutexLocker
+ 
+     PythonParser(QMutex& lock): QMutexLocker(&lock)
+     {
++#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
+         Py_InitializeEx(0);
++#else
++        PyConfig config;
++        PyConfig_InitPythonConfig(&config);
++        config.site_import = 0;
++        config.install_signal_handlers = 0;
++        Py_InitializeFromConfig(&config);
++#endif
++
+         Q_ASSERT(Py_IsInitialized());
+         m_parser_mod = PyImport_ImportModule("ast");
+         Q_ASSERT(m_parser_mod); // parser import error
+@@ -92,9 +101,11 @@ struct PythonParser : private QMutexLocker
+ CodeAst::Ptr AstBuilder::parse(const QUrl& filename, QString &contents)
+ {
+     qCDebug(KDEV_PYTHON_PARSER) << " ====> AST     ====>     building abstract syntax tree for " << filename.path();
+-    
++
++#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
+     Py_NoSiteFlag = 1;
+-    
++#endif
++
+     contents.append('\n');
+     
+     PythonParser py_parser(pyInitLock);
+diff --git a/parser/asttransformer.cpp b/parser/asttransformer.cpp
+index 3884ae13..0c54a498 100644
+--- a/parser/asttransformer.cpp
++++ b/parser/asttransformer.cpp
+@@ -1246,6 +1246,12 @@ Ast* AstTransformer::visitStmtNode(PyObject* node, Ast* parent)
+         }
+         result = v;
+     }
++#endif
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++    else if (PyObject_IsInstance(node, grammar.ast_TypeAlias)) {
++        TypeAliasAst* v = new TypeAliasAst(parent);
++        result = v;
++    }
+ #endif
+     else {
+         qWarning() << "Unsupported _stmt AST type: " << PyUnicodeObjectToQString(PyObject_Str(node));
+diff --git a/parser/astvisitor.cpp b/parser/astvisitor.cpp
+index eda66000..df21cddf 100644
+--- a/parser/astvisitor.cpp
++++ b/parser/astvisitor.cpp
+@@ -104,6 +104,7 @@ void AstVisitor::visitNode(Ast* node)
+         case Ast::LastStatementType:                            Q_ASSERT(false); break;
+         case Ast::LastExpressionType:                           Q_ASSERT(false); break;
+         case Ast::LastPatternType:                              Q_ASSERT(false); break;
++        case Ast::TypeAliasType:                                break;
+     }
+ }
+ 
+diff --git a/parser/python_grammar.h b/parser/python_grammar.h
+index 1b30be49..88c68f70 100644
+--- a/parser/python_grammar.h
++++ b/parser/python_grammar.h
+@@ -45,6 +45,10 @@ public:
+     PyObject* ast_Pass;
+     PyObject* ast_Break;
+     PyObject* ast_Continue;
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++    // type
++    PyObject* ast_TypeAlias;
++#endif
+ 
+     // expr
+     PyObject* ast_expr;
+@@ -330,6 +334,10 @@ public:
+         Py_GRAMMAR_GET(mod, Bytes);
+ #endif
+ 
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++        Py_GRAMMAR_GET(mod, TypeAlias);
++#endif
++
+         Py_DECREF(mod);
+     }
+ 
+@@ -472,6 +480,13 @@ public:
+         Py_XDECREF(ast_Str);
+         Py_XDECREF(ast_Bytes);
+ #endif
++
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
++        Py_XDECREF(ast_TryStar);
++#endif
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++        Py_XDECREF(ast_TypeAlias);
++#endif
+     }
+ };
+ 
+-- 
+GitLab
+
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.05.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild
index ca3cc3e268ca..5825a13345bf 100644
--- a/dev-util/kdevelop-python/kdevelop-python-24.05.0.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_TEST="forceoptional"
 KDE_ORG_CATEGORY="kdevelop"
 KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 KFMIN=5.115.0
 QTMIN=5.15.12
 inherit ecm gear.kde.org python-single-r1
@@ -45,6 +45,8 @@ RDEPEND="${DEPEND}
 	')
 "
 
+PATCHES=( "${FILESDIR}/${P}-python3.12.patch" ) # bug 929546
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	ecm_pkg_setup
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 9864050db09d..5daad3d04837 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-24.02.2.tar.xz 8753012 BLAKE2B 21776d734ca5e9a38500f58a3aee685c2e254f9073bbb505fe8aa5c91fc996b3ab1dcdf8df46073c5054afe8520fa63b763840e2ec1c25483e146a6e2c300e6c SHA512 eceb82d76788f1577cff1dbc91f30556a985e7597daeb0cf1de5ac9a59046bf13f326dee77bed406b3c9c24d66cf4c5a6a86dbfe37431d6c9c1d4c0f7d64a3b1
-DIST kdevelop-24.05.0.tar.xz 8766000 BLAKE2B fa1c84e37b0413b904cd42d5d820f1b738b4817ae73e1be10101feea54c2ea29223b3501a9e25b9b7d731a3307f3d95110afc31f69ce693a5610aa267ab10df8 SHA512 9f5b3a62962352191091503305448956bf352884b4be0b50c4649d8a7fff6332907238883360a56075141b3d74e2c002bbef821a1776940fa0ddea541f97f3cc
+DIST kdevelop-24.05.1.tar.xz 8766460 BLAKE2B adf09209f3de4649ffec7e7320dd77fbed9e838b98a793382a693138ffb5718b6d5610d809a334b5b01bd2858a64c5940b823ce162c2a325e14558590b593f1a SHA512 d3243a427c3dc2194977dd9073faee2bb6605c7a791733dbafb52f332453f383b4e7b05bc2ee4385d457f7ee625b2562ebabc65b635c45033be123f099584e4d
 EBUILD kdevelop-24.02.2.ebuild 4137 BLAKE2B 4361823359b671f5256566e99af7189fc5397ddeb338d76d69361c6f126142a491e146f438832f9a4f7e4a1886c0133cf8bdf6a8fbb4703a31ce060d565c7bdf SHA512 bdf5624152863a2d37135214e66feb2d99a96d572896ba2c22ab842ade4c4488ba7bee14cb1e60c7b74d549dc6e7ae71b08c6a1e0749d58fa74fa1fa290d5c42
-EBUILD kdevelop-24.05.0.ebuild 3919 BLAKE2B 8315f817be5432d432f6c560178147034973b5f129960f53a94b33b13b2997ae9b00ef841671ea8466112611a9a70da84371c381180984c298c0e0f8c62a053f SHA512 e396b5227b58f8d1043a58f4b931853c94cd26029f8ec27bf5e9253163ad7ab1bb9374ca0bc6b9654b152165b93b993b706b7ef150cd8b0a5d6c58666462f81c
+EBUILD kdevelop-24.05.1.ebuild 3919 BLAKE2B 8315f817be5432d432f6c560178147034973b5f129960f53a94b33b13b2997ae9b00ef841671ea8466112611a9a70da84371c381180984c298c0e0f8c62a053f SHA512 e396b5227b58f8d1043a58f4b931853c94cd26029f8ec27bf5e9253163ad7ab1bb9374ca0bc6b9654b152165b93b993b706b7ef150cd8b0a5d6c58666462f81c
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-24.05.0.ebuild b/dev-util/kdevelop/kdevelop-24.05.1.ebuild
index 4f6a9154cdfb..4f6a9154cdfb 100644
--- a/dev-util/kdevelop/kdevelop-24.05.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-24.05.1.ebuild
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index 0e96ea3b4e94..45b6c882f029 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kio-24.02.2.tar.xz 40468 BLAKE2B 3c835dcf03a2c85d0acef9f38ca463f2b0114c7297759bfac6b6ba7879adb34ec8c68cf0145da66d0089757bc7e72fb6ae9b7fd4556a4d9c661ee2cf26e26db3 SHA512 3c005bbe1868b91997beb464a7ca9ef27beb81e8599127be497957d202be2b526ab4366bf85c1e2c30dfdda995c675a233f6613d8521e82d332a94d735e1f94d
-DIST kdesdk-kio-24.05.0.tar.xz 41112 BLAKE2B ecb37def3abd4e4ad959ed2a3e766c25d3f3cd0b9a92438d3dd6aadfecb842aa936ef34b156c9fd1bff0c7f0121a40d5fc77585bf574f112cfcd84510b935996 SHA512 16ffe00ae7421e37491321447b46f5cb948c967bb523a2f893326a4e7aeea4c18ccff99f3079976d8ae7250c70a5a58344331fa079baaa887097f7e672b64341
+DIST kdesdk-kio-24.05.1.tar.xz 41152 BLAKE2B d114e56c2bd63d3e0877af306e9537a461505a156a6dd0eace27c2270f4e242aed5c1f9c97d710777d80252f408347def1948016cd9b0daf632c80a1c39c1726 SHA512 034ed0dc5eea26a272cc6330786bdec4a062618f7a7cba4da42c913529a068561e33cb23edb8bb156f91a51fe5488b02d850fe5da61444cc620e47f097e48b7a
 EBUILD kio-perldoc-24.02.2.ebuild 491 BLAKE2B 4a1c84e2e8430aa347597d2ed2b0b972168ae6481808e0185a8a901db7ef03e6884cf234a246e177ebaaff87fc564767523048de223b3bb9292ce31248c25be2 SHA512 9e025f2c7775986387d62e8475d051bd280a5f743bff035f763ac9b030af11a4714b121a43a03c07a84b72560122b61b830750128bbb195711b1ddaf69ed77cc
-EBUILD kio-perldoc-24.05.0.ebuild 473 BLAKE2B 3172a4a1c80e48f76fca9670d9dd44b45ee287fcb5d9671384fb7c63dd9bc5a90996a37d16f55f54818ebb68ba64b887be20de80985401627e5072aebcf71271 SHA512 5992744b1bcdad41cf676e8081720c3fd8afab7153bb1ff30f5c6c669c914a5a0639e0611a6d8ed7db103ba8cc5634917eb2408a2f5e8e185fdb46c195319f95
+EBUILD kio-perldoc-24.05.1.ebuild 473 BLAKE2B ed4934bc383b43c10a42572046392874ccc8f5ad6cc23d82cb8e7404ce66d7634dfaa79b0bffee13aeda366edfe7b5312a87b3178132b5ba845bfc810731ab77 SHA512 b0e9e78cd8ccc6dcf761d5264d15a76a18a8b5c9a787251abe625475b637d27fa5e4b951512bb761e01d1f5450d5f2af03b8ed2dc9c6477555f6e80a652b4ba9
 MISC metadata.xml 376 BLAKE2B 973773b9cb2a2e9d2a7e187056409bbbe4a1f88bf97b791fe4b096beb1c638bbfef558abb19920383471641454784549ada0fe5aba4fcfb6ce762156711457c6 SHA512 e29785bf513fab36b159f7bdca1a339dc3e004e067b1e98ae5997f865494ac70ef4e27a74387cc65a486decd42f91926fe478143b6ac9906753a69f0b546617a
diff --git a/dev-util/kio-perldoc/kio-perldoc-24.05.0.ebuild b/dev-util/kio-perldoc/kio-perldoc-24.05.1.ebuild
index 0690f310349c..ced35f78a882 100644
--- a/dev-util/kio-perldoc/kio-perldoc-24.05.0.ebuild
+++ b/dev-util/kio-perldoc/kio-perldoc-24.05.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 KDE_ORG_NAME="kdesdk-kio"
-KFMIN=6.0.0
+KFMIN=6.3.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="KIO worker interface to browse Perl documentation"
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 10d1b3509bbf..0dce90bd05ac 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,4 +1,7 @@
+DIST packer-1.11.0-deps.tar.xz 274685472 BLAKE2B 211e076e5032c5199597bda8d05a4f13d15db321d78f58ac3e5775f8ba16b0bd7dd348a396bb6bed41c039924d288e5ea6abd5a140558f25d1edbc75d39c4ba0 SHA512 200d2aa56b834202bd3b1506991f6ea4686e95345fed09eea923fbf00577d8ac2454cfd567c89926b9e99f777203b3ee908c30a4d9f7e71f2370061f09d53603
+DIST packer-1.11.0.tar.gz 2296683 BLAKE2B 8b8eee2294109d305b94186829995f881d1b8a1a0db4a57e117e4473705f3a8e7e589ec7bb3d7efa10acbecc967623404902aeecdcd1474e266bc9c43410604c SHA512 304dbacfaf59fcc35876754f6a6766cc89e052b64970f42aa315c1141f349d6437538195512dc8cd7626d467faaf0bd68575cc8310f9fc8e7606faabd7cf748d
 DIST packer-1.9.5-deps.tar.xz 373922748 BLAKE2B 793b0e5501bca56849a2471fbe2892c4775c3aa2d3ad6346e65f3d0cf1e3d86339a64371a35e4fddb0053082e98e2ec527b4f052b901bf8d35bd5db08a577ee4 SHA512 1f49b45841308dba95fcce2139d21931708e099102cc0870be00f2142cfb0d0e8ce9e2c729c9556ca68c1036e224f120fe0cd8833715a62cc212eead2448a6e3
 DIST packer-1.9.5.tar.gz 2302965 BLAKE2B dc0b8fedd83a477594c7235ffe6ca2052ba389e105bd451ad6c3987cea68c37f9c3153957012339f2a09045f20ac81ff6a59ed33834247408a3539643d9ecedf SHA512 7df1a85d0746e400c42f2b2a52b14ef5a806bcd2dc346eceaf5f8928b42a8b046ff8da7b45e5af0486bd444d8325e1cabdcd15f7b28711241a46034c9781a279
+EBUILD packer-1.11.0.ebuild 796 BLAKE2B fc5cef26af01da085fd4d667e9ae156f715148ebc3aa7ffa0f3fd1ce14591c5b85a27990c1ea01174257088b635a7da3f4f7b03e497a6692cfdc16a6f8b3a176 SHA512 e1e5f535529e5ecca4151edfa5c197f328473f5991fcc3933ce968fe813332bd2610027de6d7666c7b28ec9995b10be7e325daf5304ce2f4cd2a3766d3b2cca6
 EBUILD packer-1.9.5.ebuild 762 BLAKE2B c970a797ba9409c0403873b4378de49c195d03662a0b8af2b52d854b9f2010a262cb1247d57032780595add9372acd20c6fd4e947c2cac4688cdc8ba0feda099 SHA512 cf116262ea2fbed1d19d6d29da6130e153eee4d5fadb35fcd560566f71cbd92109792dd54fba0bc568f6f8b5ac587bebe116e41798fcaca11e4182004ae32c9b
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.11.0.ebuild b/dev-util/packer/packer-1.11.0.ebuild
new file mode 100644
index 000000000000..cbf0fffdc750
--- /dev/null
+++ b/dev-util/packer/packer-1.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoo.neutroniak.com/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 BSD-4 MIT MPL-2.0 unicode Unicode-DFS-2016 ISC BUSL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DOCS=( {README,CHANGELOG}.md )
+
+RESTRICT+=" test"
+
+src_compile() {
+	ego build \
+		-mod=readonly \
+		-ldflags "${go_ldflags}" \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index f620c55487fe..06be7c501199 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -9,4 +9,4 @@ EBUILD tree-sitter-cli-0.22.2-r1.ebuild 941 BLAKE2B 083d1e90da8b718c64a095f314c6
 EBUILD tree-sitter-cli-0.22.4-r1.ebuild 899 BLAKE2B 2ca614b84c2ac24af555512aa96cc9704f4330ec69324ea930f0509e8b14c664aeba4e93e90f60f14ce906b802ed26d31351d8a7eeab23df45635f083335e544 SHA512 4d70728d73ab197dadc096942483db7e4798f97bd1b0b70175dea18ec11f4652fb1d11afdb92ae2f5831e2fb116d9baf926a552af7e9cd7bcca74d64281af95b
 EBUILD tree-sitter-cli-0.22.5.ebuild 900 BLAKE2B e7ef5e9995e838b1f4a32d04113c75bf881486f88649cc17c6760b3f132b879493cab04025b91a3fd523c5316a7f922760b145bddc92dca0e046831c0d7d0306 SHA512 448e0e275386cf4c6eab01f8fc170fbb65161676c8d0aa32dd159dab02f39f4aef7463ddb2e10d6b256f49d43e5fabb59f8a0c73a7598e0f797f2aa9d18e53df
 EBUILD tree-sitter-cli-0.22.6.ebuild 916 BLAKE2B 28ac3fbf95af4d731ca58851b17f74c39c2f56de7ce630000a601b3bd91fd1838e8205511f2d7491f37b78ee31e00593c7c5ad80db1883d7858b616d03ed2ba4 SHA512 d133b4eedb0d04ed7000243a5bdbbd095af8b8eb0aeb945b849a5039954e19763474ddc858d5d82dbfb90c43faedc75d9994783fc2ea9a06dfc6623bc868637c
-MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
+MISC metadata.xml 575 BLAKE2B 947ff8b1c885927a6b51e08f761706ecace1c18177e3b455ea25b1cb17eb5c1fbe5aeb6ce68bbffdf626dc968a99f8cf2792356c8e90f27ab8f0fc23d618f09e SHA512 2f19b11f3aff1313d5983697628e1df2e04505611d20d3bd0331d4265cc0f569fd2694a61edb67c6834885e2a61d7d9ef650731a72be04c96d00c574e7d9ba09
diff --git a/dev-util/tree-sitter-cli/metadata.xml b/dev-util/tree-sitter-cli/metadata.xml
index 9c493d5039b6..944295ace2bd 100644
--- a/dev-util/tree-sitter-cli/metadata.xml
+++ b/dev-util/tree-sitter-cli/metadata.xml
@@ -9,10 +9,6 @@
   <email>mva@gentoo.org</email>
   <name>Vadim Misbakh-Soloviov</name>
 </maintainer>
-<maintainer type="person">
-  <email>sarnex@gentoo.org</email>
-  <name>Nick Sarnie</name>
-</maintainer>
 <maintainer type="person" proxied="yes">
   <email>abdelqaderali@protonmail.com</email>
   <name>Ali Abdel-Qader</name>