gentoo auto-resync : 29:06:2024 - 08:00:25

14 files changed, 8 insertions, 367 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 487ca0c137f8..6095c62bd302 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 454e0fdcf5ce..af18ba1a50e8 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,8 +1,6 @@
 DIST kitty-0.34.1.tar.xz 8176176 BLAKE2B c39709a065a04b04bf15e6decb9a96c1699c1082de44690c36e4e05a288f6835fa3c5dd059c363a272c98934b5c66cf5d79078b6403c7f15a9e94f3f72aa680c SHA512 1b361823741c8c2a6ce3c5d56d0cbbd51bd0a0d2574312ef5c05f359c70862e0889a9636e4b95865750cbd239b517763315ed0cf4ec46e1feaffc27cf20e0e66
-DIST kitty-0.35.1.tar.xz 8206388 BLAKE2B cb50b1d6011cf5eac61175c07a8365004c22505363a0a43114f010e6d47388959b308343124b427422797836d6b0e1954ec278301d98ff33acd103d611052727 SHA512 aecda31410b8d52ec7df5a9947f29be04249fadb6af24ee7e0cbb649f09a9e510d9fe6913d24d10c36ef7227187c96a1e3f25a8da840a16ed0bcb8cb46f1f089
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
 EBUILD kitty-shell-integration-0.34.1-r1.ebuild 1498 BLAKE2B 9c23bd53c1d50395b5e7349f313ca82c2514c7bcb751d39798601cfc695dc241e89f6ab4439a6dada7764db3ea72d4619a7b0d42e01b3d9e67bc18d822f9979f SHA512 5b45f302ea80fb9da12a14dece17978beb1ab66a9ea163e881aa224872b96c271f6f01b1b3e6e4969c90d5bf24efe14725a9c90661d562e8fd5daf5c8cf10ad3
-EBUILD kitty-shell-integration-0.35.1.ebuild 1501 BLAKE2B 55b94af1a7341b8c9e228d51afb55003119415e40b05714c1425fae8f5606850de17d1b14ff47617f29cbd97f1b931f24f17207c96889af1c076053c81d5bf41 SHA512 a1969519f2ab0e9a3dbaf676ea1ec1ebe7586862cdfa9fc58b57f036f8f2046fd8734f210f2bef73fb192e586c76ae93e1d5ee8aed7f238550e68bc19906274c
 EBUILD kitty-shell-integration-0.35.2.ebuild 1501 BLAKE2B 55b94af1a7341b8c9e228d51afb55003119415e40b05714c1425fae8f5606850de17d1b14ff47617f29cbd97f1b931f24f17207c96889af1c076053c81d5bf41 SHA512 a1969519f2ab0e9a3dbaf676ea1ec1ebe7586862cdfa9fc58b57f036f8f2046fd8734f210f2bef73fb192e586c76ae93e1d5ee8aed7f238550e68bc19906274c
 EBUILD kitty-shell-integration-9999.ebuild 1412 BLAKE2B e669120f3274561174e2d299713cd5f8605ea0c82f19203a9a26824b02df316b631917846b77a84c96ed3b59229b916fa94d392054f89a43f13c269c534a00b5 SHA512 7910b0677a277822d1d3145502cfb907debe1f8019eaaad429c410d83b9e5ac45fd2b85c92781e089ab6378c8a2555ef53d41e0f5b8b8494bee27865f4e004fc
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.1.ebuild
deleted file mode 100644
index a50a1338ca92..000000000000
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-src_compile() { :; }
-
-src_install() {
-	# install the whole directory in the upstream suggested location
-	# for consistency (i.e. less variation between distros if someone
-	# ssh into Gentoo), then set symlinks to autoload where possible
-	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
-	insinto /usr/share/kitty
-	doins -r shell-integration
-
-	dosym -r {/usr/share/kitty/shell-integration/bash/,/etc/bash/bashrc.d/90-}kitty.bash
-
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
-
-	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
-	# zsh integration is handled automatically without needing to modify rc files,
-	# but may require user intervention depending on zsh invocation or if remote
-
-	# this is used internally by the ssh kitten and is not useful there
-	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
-}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 17f50b0481f1..bbceda656ad6 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,8 +1,6 @@
 DIST kitty-0.34.1.tar.xz 8176176 BLAKE2B c39709a065a04b04bf15e6decb9a96c1699c1082de44690c36e4e05a288f6835fa3c5dd059c363a272c98934b5c66cf5d79078b6403c7f15a9e94f3f72aa680c SHA512 1b361823741c8c2a6ce3c5d56d0cbbd51bd0a0d2574312ef5c05f359c70862e0889a9636e4b95865750cbd239b517763315ed0cf4ec46e1feaffc27cf20e0e66
-DIST kitty-0.35.1.tar.xz 8206388 BLAKE2B cb50b1d6011cf5eac61175c07a8365004c22505363a0a43114f010e6d47388959b308343124b427422797836d6b0e1954ec278301d98ff33acd103d611052727 SHA512 aecda31410b8d52ec7df5a9947f29be04249fadb6af24ee7e0cbb649f09a9e510d9fe6913d24d10c36ef7227187c96a1e3f25a8da840a16ed0bcb8cb46f1f089
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
 EBUILD kitty-terminfo-0.34.1.ebuild 631 BLAKE2B 3e61a196a09738cbef2603fccbbc5eece8346495f3a3606acbcea6d7c134961e405b9aabc915bf704f9c327037abf4363619e206f1c548d24c112f4f2b607129 SHA512 ba5541c668843f4718c4efd53dedf71fae5e56ca39ad7bb819a4f13c9efec3d85bd9cd18e3dd4184abc02bf28cdca12c847117933d7f7590b3cc2d88c2d5f7f9
-EBUILD kitty-terminfo-0.35.1.ebuild 634 BLAKE2B 99a8ac0e32d93d02675d0c674d6e8df2780631ae33b45d27ee0817cfc8b37739e07e5d06efb6ba5d16ad7858d75534e0cdc317dbac23ee3e4faf457bfdea615b SHA512 265602d0b5b326609e04ab8b060333289bfb80a11ca20a82971cac1d0cf5f0f7310914cd4730de49597585650a70a4288f9783b82e2e683d0d135a820f58d9a6
 EBUILD kitty-terminfo-0.35.2.ebuild 634 BLAKE2B 99a8ac0e32d93d02675d0c674d6e8df2780631ae33b45d27ee0817cfc8b37739e07e5d06efb6ba5d16ad7858d75534e0cdc317dbac23ee3e4faf457bfdea615b SHA512 265602d0b5b326609e04ab8b060333289bfb80a11ca20a82971cac1d0cf5f0f7310914cd4730de49597585650a70a4288f9783b82e2e683d0d135a820f58d9a6
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.35.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.35.1.ebuild
deleted file mode 100644
index b5c7cbc40759..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.35.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-BDEPEND="sys-libs/ncurses"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/terminfo
-	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
-}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 877b4d885eab..aa8d31e17e82 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,14 +1,10 @@
 DIST kitty-0.34.1-vendor.tar.xz 1528400 BLAKE2B fde7ba3a9713e10e1b6f3d4e3a35bb1edf0ed50004862e2f367df30b416a1b8e34c03c38c47ec4f7363bc10eace0dd03215875c1b5121151671c0b22ac47e189 SHA512 875ca8c324b80e3be8fead1c56710f7f9ca7f5aa0f8e4e8f1e825005cbe85837d9b58a2b271ead201637f9b10fd5e61b7e8e52276e950f30fe326546c6ee33ee
 DIST kitty-0.34.1.tar.xz 8176176 BLAKE2B c39709a065a04b04bf15e6decb9a96c1699c1082de44690c36e4e05a288f6835fa3c5dd059c363a272c98934b5c66cf5d79078b6403c7f15a9e94f3f72aa680c SHA512 1b361823741c8c2a6ce3c5d56d0cbbd51bd0a0d2574312ef5c05f359c70862e0889a9636e4b95865750cbd239b517763315ed0cf4ec46e1feaffc27cf20e0e66
 DIST kitty-0.34.1.tar.xz.sig 566 BLAKE2B fb01069e33f958bfc1aee3e42ab5d8d775d79cf0c54b427690f4455c524d9baff3789823a6a8dce6494a8006715bc17530f1569c540b30f423c41f8833ae08f8 SHA512 cf60f1044661a62e73191526680ce862ae02e0dd89e017c139261cff8667b20be6aca0fb3b56f06c8ddb0e08a3c55eb428358a9db0b59ef65f2bd246fcf9cd01
-DIST kitty-0.35.1-vendor.tar.xz 1556700 BLAKE2B 5ddd5dfee2d443ba74cabe86c2681e957f18533a55f0d2ee8937218fd147c31c661b6ab6f4b66cecf8c1f24fbd515684ac7d89d38d3b4c09753ff787274a64b2 SHA512 12f924a9c1ae7458cdc252295c01ca722e325f28e2f918655fa996a10e5b619b9d21b31218a86fe23674df99bab7d5eb1560fd4f4e19eed26b5a836b0e0a2e43
-DIST kitty-0.35.1.tar.xz 8206388 BLAKE2B cb50b1d6011cf5eac61175c07a8365004c22505363a0a43114f010e6d47388959b308343124b427422797836d6b0e1954ec278301d98ff33acd103d611052727 SHA512 aecda31410b8d52ec7df5a9947f29be04249fadb6af24ee7e0cbb649f09a9e510d9fe6913d24d10c36ef7227187c96a1e3f25a8da840a16ed0bcb8cb46f1f089
-DIST kitty-0.35.1.tar.xz.sig 566 BLAKE2B 2df73c05b410daf39ee03f7f330ef18e13f5457022e081c2fda9992a8b143b8364a0d407abb2e5262419e2924a40009e40f7128c60b9459d34bcf1b309cf1af4 SHA512 3de27d82d48eac0a46c9431b52e857acf5d33407e4b5559aa8c09935fecd88199b0e0be4919cff3892900c43ce0ca28681674525622eeeed285ba9081329b55a
 DIST kitty-0.35.2-vendor.tar.xz 1558376 BLAKE2B be02d81411e8549afa81f1f84f05fbc9f9aef8b634bb5572f4301721b25b18c22381e5d8d9ab724cd98e5aee45ac58c338b56e69813cc5d38b6ec1eb39c2b3fb SHA512 bd1ecd57b7a29bbc391fcc093c3a92223656422ee7726815f07015bfd9fd829118570d8177c19867a3e6a200d1f5ba73919e7a7639584d1bfcae21853c3d7140
 DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56
 DIST kitty-0.35.2.tar.xz.sig 566 BLAKE2B 89e636f2fcd8ee12be37e41187d131d2092e667ec8b62a5ca1c745d8c5813e55c1d776cafa7d1b9ba7b6142f6bd9c204c6943f22ecc0236329a02912d767831c SHA512 bc3d6734012e81727494c5879f847a72e0a84263a9c156578260592b5ae55558b880315977c586e0f9c4845485d2a10ef414929fb3a12a27ae3248df46338bfc
 EBUILD kitty-0.34.1.ebuild 5017 BLAKE2B 1a518658f92f75a5035eece6d9d6d0e1412b5cabb0d75648736d787b4cb72d8e0302c2d1b49ea900cd1fd22e148a4b73e8f8130a72d8a5cc82f7fc8bddc4b13e SHA512 a8077df09ea5efdc36c14026ea068cad4d0ee98e54b93b2d19ffe4281b89b596f01122b454c0e893a39f28cecb4751aaa800290d0964403f91ac63f18c0cc4e7
-EBUILD kitty-0.35.1.ebuild 5106 BLAKE2B 26c9fed8db011ca2aae749a601e3350329b7c070665e60c0222dca4be890204b2f053aadb9fca6d19258a4f5ea70a4a48939f5ba62e0a9baf6873bfff03506fe SHA512 cc53d66837626429a8f6ba5d006e2a3724946c79e53de28f0859af96bccd4f2a203bad7cf08e049826b3e83f29633e8a28db2793742d0b5c96d60cf797fda3ee
 EBUILD kitty-0.35.2.ebuild 5106 BLAKE2B 26c9fed8db011ca2aae749a601e3350329b7c070665e60c0222dca4be890204b2f053aadb9fca6d19258a4f5ea70a4a48939f5ba62e0a9baf6873bfff03506fe SHA512 cc53d66837626429a8f6ba5d006e2a3724946c79e53de28f0859af96bccd4f2a203bad7cf08e049826b3e83f29633e8a28db2793742d0b5c96d60cf797fda3ee
 EBUILD kitty-9999.ebuild 5106 BLAKE2B 26c9fed8db011ca2aae749a601e3350329b7c070665e60c0222dca4be890204b2f053aadb9fca6d19258a4f5ea70a4a48939f5ba62e0a9baf6873bfff03506fe SHA512 cc53d66837626429a8f6ba5d006e2a3724946c79e53de28f0859af96bccd4f2a203bad7cf08e049826b3e83f29633e8a28db2793742d0b5c96d60cf797fda3ee
 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
diff --git a/x11-terms/kitty/kitty-0.35.1.ebuild b/x11-terms/kitty/kitty-0.35.1.ebuild
deleted file mode 100644
index 7656c827e9ed..000000000000
--- a/x11-terms/kitty/kitty-0.35.1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit edo flag-o-matic go-env optfeature multiprocessing
-inherit python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
-		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )
-	"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3 ZLIB"
-LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0" # go
-SLOT="0"
-IUSE="+X test wayland"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( X wayland )
-	test? ( X wayland )
-"
-RESTRICT="!test? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	media-libs/fontconfig
-	media-libs/harfbuzz:=[truetype]
-	media-libs/lcms:2
-	media-libs/libglvnd[X?]
-	media-libs/libpng:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libxkbcommon[X?]
-	x11-misc/xkeyboard-config
-	~x11-terms/kitty-shell-integration-${PV}
-	~x11-terms/kitty-terminfo-${PV}
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-	)
-	wayland? ( dev-libs/wayland )
-	!sci-mathematics/kissat
-"
-DEPEND="
-	${RDEPEND}
-	amd64? ( >=dev-libs/simde-0.8.0-r1 )
-	arm64? ( dev-libs/simde )
-	x86? ( dev-libs/simde )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-	)
-	wayland? ( dev-libs/wayland-protocols )
-"
-# bug #919751 wrt go subslot
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-lang/go-1.22:=
-	sys-libs/ncurses
-	virtual/pkgconfig
-	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
-	wayland? ( dev-util/wayland-scanner )
-"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		edo go mod vendor
-	else
-		use verify-sig &&
-			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sed unfortunately feels easier on maintenance than patches here
-	local sedargs=(
-		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/"
-		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//'
-		-e "s/cflags.append(fortify_source)/pass/" # use toolchain's _f_s
-		-e "s/ld_flags.append('-[sw]')/pass/"
-	)
-
-	# kitty is often popular on wayland-only setups, try to allow this
-	use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918
-	use !X || use !wayland &&
-		sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" )
-
-	# skip docs for live version, missing dependencies
-	[[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' )
-
-	sed -i setup.py "${sedargs[@]}" || die
-
-	local skiptests=(
-		# relies on 'who' command which doesn't detect users with pid-sandbox
-		kitty_tests/utmp.py
-		# may fail/hang depending on environment and shell initialization
-		kitty_tests/{shell_integration,ssh}.py
-		# relies on /proc/self/fd and gets confused when ran from here
-		tools/utils/tpmfile_test.go
-	)
-	use !test || rm "${skiptests[@]}" || die
-}
-
-src_compile() {
-	tc-export CC
-	local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
-	go-env_set_compile_environment
-	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false"
-	use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie"
-
-	# workaround link errors with Go + gcc + -g3 (bug #924436),
-	# retry now and then to see if can be dropped
-	tc-is-gcc &&
-		CGO_CFLAGS=$(
-			CFLAGS=${CGO_CFLAGS}
-			replace-flags -g3 -g
-			replace-flags -ggdb3 -ggdb
-			printf %s "${CFLAGS}"
-		)
-
-	local conf=(
-		--disable-link-time-optimization
-		--ignore-compiler-warnings
-		--libdir-name=$(get_libdir)
-		--shell-integration="enabled no-rc no-sudo"
-		--update-check-interval=0
-		--verbose
-	)
-
-	edo "${EPYTHON}" setup.py linux-package "${conf[@]}"
-	use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}"
-
-	rm -r linux-package/share/terminfo || die # provided by kitty-terminfo
-
-	if [[ ${PV} == 9999 ]]; then
-		mkdir -p linux-package/share/doc/${PF} || die
-	else
-		mv linux-package/share/doc/{${PN},${PF}} || die
-	fi
-
-	# generate default config as reference, command taken from docs/conf.rst
-	if ! tc-is-cross-compiler; then
-		linux-package/bin/kitty +runpy \
-			'from kitty.config import *; print(commented_out_default_config())' \
-			> linux-package/share/doc/${PF}/kitty.conf || die
-	fi
-}
-
-src_test() {
-	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
-}
-
-src_install() {
-	edo mv linux-package "${ED}"/usr
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "audio-based terminal bell support" media-libs/libcanberra
-	use X && optfeature "X11 startup notification support" x11-libs/startup-notification
-	optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 63c9f774e28c..3eb9485a4c4a 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,10 +1,6 @@
-DIST qterminal-1.3.0.tar.xz 217748 BLAKE2B 8da4e5388f13919cf67eb9931d4acd0e51b4b45a57acea1db1d8d98cfcec57e7b789e9b0f764fdefdfc71ff36b6a9722e2d389013b22872f8f730ebb1ff1d944 SHA512 f8cf2183da7af7869433b6057e20fba46be5cce30b75bdafb6cc0a5474e39fb1f2f8831f6841ca78f8b367f718ed2ee5a312a75850bc8192a37f20a6c5767a8d
 DIST qterminal-1.4.0.tar.xz 219500 BLAKE2B 86ac46180a5f58b24a7bed40796af622fd4456e5b4bf58484cb1271a9bb41ae7688368e74245b36cab99a3309ab6132b3d0c188af460b3a7d543a9ad4a45eb1a SHA512 95c7fffa0a7a91dae338168748e1a9061eb7d393a083a70c59e3324f78ae8200e1e3bb07aa131564b208068e62fc744cc75e96694d70443559c7205ec9f91121
-DIST qterminal-2.0.0.tar.xz 228584 BLAKE2B 5c1bbd536659becd3708806a46a967bd35b479947cdca0412d0b2fecd31ce64f1dc71266dd48f3280fbac4e3e534c5b99e43442a63b139fb8789f443e1c67197 SHA512 455ca913f38eed881af50eb17d4798985d546c3c633d4df8887316abd4a56e76d1f716dcaece471e092471c0381a328ca685ec27f4d4690e89087166dc7fb0a3
 DIST qterminal-2.0.1.tar.xz 229556 BLAKE2B f6afe5f7a1a169d17e52bed372f760ee9112ca533c1cb0e8adf5b659739f459f0764a723934bdaba629fec94617ec67f157252dc83982fadb7fd58ae66503955 SHA512 5587e52edf9cc2227584e8eebe742414d566b51dc1647b643d9af6710adbe38e5d84634e7ea073fcb71397e1de0fccb5ca1af544b629685d36b645da5dd80c3d
-EBUILD qterminal-1.3.0.ebuild 993 BLAKE2B 6d6b94af3dbfc3d691eb7d6142cdcaa7557040bec4b744463c6a5da0f8146dc033a74d4365190a4b59cdcd3329a0be8accfb0f7334358363a4011550b6bb4549 SHA512 96e08b86374fd00cf62a1ace289f736184c0fb79bbf3e9a72888a57b8c5baf7aa6f112d5185c67e3e8b3942d1a03e1a6dc44c6c332f499a273ff80c96c2ef148
 EBUILD qterminal-1.4.0.ebuild 993 BLAKE2B 6e0e124002d021241896d92feb8a32104497f8c2240d8d47897b62468161fdfbff99469d7ff3d101613772a9dc283be9b65fe903fe417fd3a2bf8da05223dfc8 SHA512 6f1db0a608adec777a35aa0d02ad352b0ad77f15903bd3df2c74a295eee92de81a1aa30e3a92deb57ec26fefffe1bc617d0704001ef5ce88ff70d1dbe6425c42
-EBUILD qterminal-2.0.0-r1.ebuild 845 BLAKE2B a0313b536373946f55e83ce2236b944e67d9ed3ee22d6689ab35b0c38f17af67aa3ff2b89fd869d601bbe0d38f6cb3cf96c35d22b9f588167e92f668ebfea899 SHA512 1c20c4741260143a14d8434dd9e339a1f5c9718f1017228da2b052f01e26e8445876f9ff43f9b4ecb55c70fc3660ec94eaff4410e8c3c1bd32654b7f5abcc5e0
-EBUILD qterminal-2.0.1.ebuild 845 BLAKE2B a0313b536373946f55e83ce2236b944e67d9ed3ee22d6689ab35b0c38f17af67aa3ff2b89fd869d601bbe0d38f6cb3cf96c35d22b9f588167e92f668ebfea899 SHA512 1c20c4741260143a14d8434dd9e339a1f5c9718f1017228da2b052f01e26e8445876f9ff43f9b4ecb55c70fc3660ec94eaff4410e8c3c1bd32654b7f5abcc5e0
-EBUILD qterminal-9999.ebuild 845 BLAKE2B a0313b536373946f55e83ce2236b944e67d9ed3ee22d6689ab35b0c38f17af67aa3ff2b89fd869d601bbe0d38f6cb3cf96c35d22b9f588167e92f668ebfea899 SHA512 1c20c4741260143a14d8434dd9e339a1f5c9718f1017228da2b052f01e26e8445876f9ff43f9b4ecb55c70fc3660ec94eaff4410e8c3c1bd32654b7f5abcc5e0
+EBUILD qterminal-2.0.1-r1.ebuild 898 BLAKE2B 100215b83fa20894cda842803fee328ca16e170ab1f7d04d6e66c5baf451ba54485f52b9731bd32135fb13bd557ebdd4e3b7be84c76ba3dc023b1f9172976a69 SHA512 8b9a19b19a018260a687d5c624d2f503d72bdd24f519323becdbb5abc7311d687ffe9c32033de7b7a42d0846655af1168bf5c25eb0d67f86562198a16c5e4fab
+EBUILD qterminal-9999.ebuild 898 BLAKE2B 100215b83fa20894cda842803fee328ca16e170ab1f7d04d6e66c5baf451ba54485f52b9731bd32135fb13bd557ebdd4e3b7be84c76ba3dc023b1f9172976a69 SHA512 8b9a19b19a018260a687d5c624d2f503d72bdd24f519323becdbb5abc7311d687ffe9c32033de7b7a42d0846655af1168bf5c25eb0d67f86562198a16c5e4fab
 MISC metadata.xml 321 BLAKE2B c6b03e0846d4503c4a802cdd0474e835a13d2f5f14af1134b631f034db0b26b774c631bf979a0bb89cd81df5eebcd88e14e6e8967286baed77e92ed79d5c8633 SHA512 783ebb2db0a3983d870ac442087474e22cbb4ef121aa713bcb3c70d041b57a52198b68693a90aaaaceeadda4fd4ecc13485376702dab6290cbcdf0ec99cfda51
diff --git a/x11-terms/qterminal/qterminal-1.3.0.ebuild b/x11-terms/qterminal/qterminal-1.3.0.ebuild
deleted file mode 100644
index 99c3fa6ec5e1..000000000000
--- a/x11-terms/qterminal/qterminal-1.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.13.0"
-DEPEND="
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtdbus-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
-	x11-libs/libX11
-	~x11-libs/qtermwidget-${PV}:=
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/qterminal/qterminal-2.0.0-r1.ebuild b/x11-terms/qterminal/qterminal-2.0.0-r1.ebuild
deleted file mode 100644
index 14dfb83303be..000000000000
--- a/x11-terms/qterminal/qterminal-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt-based multitab terminal emulator"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-util/lxqt-build-tools-2.0.0"
-DEPEND="
-	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets,X]
-	x11-libs/libX11
-	~x11-libs/qtermwidget-${PV}:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/qterminal/qterminal-2.0.1.ebuild b/x11-terms/qterminal/qterminal-2.0.1-r1.ebuild
index 14dfb83303be..9737d9111201 100644
--- a/x11-terms/qterminal/qterminal-2.0.1.ebuild
+++ b/x11-terms/qterminal/qterminal-2.0.1-r1.ebuild
@@ -24,6 +24,8 @@ RESTRICT="!test? ( test )"
 BDEPEND=">=dev-util/lxqt-build-tools-2.0.0"
 DEPEND="
 	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets,X]
+	kde-plasma/layer-shell-qt:6
+	media-libs/libcanberra
 	x11-libs/libX11
 	~x11-libs/qtermwidget-${PV}:=
 "
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index 14dfb83303be..9737d9111201 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -24,6 +24,8 @@ RESTRICT="!test? ( test )"
 BDEPEND=">=dev-util/lxqt-build-tools-2.0.0"
 DEPEND="
 	>=dev-qt/qtbase-6.6:6[dbus,gui,widgets,X]
+	kde-plasma/layer-shell-qt:6
+	media-libs/libcanberra
 	x11-libs/libX11
 	~x11-libs/qtermwidget-${PV}:=
 "
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index b6b196470563..858e882113a0 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -9,4 +9,4 @@ DIST rxvt-unicode-9.31.tar.bz2 880148 BLAKE2B 439a8c33b7260e0f2fd68b8a4409773c06
 DIST rxvt-unicode-9.31_24-bit-color_aur-9.31-20239117.patch.xz 7776 BLAKE2B 88c12e2db38991fc6c7909950aade09a8c089d93980535af5a602d40cb4712aaa97f659c67e49b52abb71e6d0e2b8279f3d9a6d66654cdf68dde68bf64279873 SHA512 dfc0388138f35345c0c80df0a392c28a52a03d008ca336999369522031898813046c314c1e4ec9a81fea41b81d3230f5ca09d47b84ef04c0f6da98c559812a16
 EBUILD rxvt-unicode-9.31-r2.ebuild 3487 BLAKE2B 15c796d5ab0a153d5b3683b8aa2c1dd5c3d141c3e37492a72e59a096e645abe7a541b07359264aa7f95d516507c67aebf0307e2cce83ec2b639ce3e8c0c2a432 SHA512 999d6409f4ae2725e15682829cfe24bd48ca75357a026d6ed09b349bbbe2557d5f951d52d839f0226950223ba72ff2617d6489bea874c64ac35d218506330079
 EBUILD rxvt-unicode-9.31-r3.ebuild 3550 BLAKE2B fa61c5bf38fba4b77e28d396448408dbad1b1e4d10cc4a84974ed62a7ba5c83da60619c84bd1a5ac47e5910b06260e520bfb8ba44adf8159963ceae577352276 SHA512 0ab4dc5a89dc7653158c7dd3fa01e0f132176347579142ce647213d5909dc0747554525e0a2d952e504624360b7f643bc232d4d4c0358b970ef87de90596ae53
-MISC metadata.xml 1719 BLAKE2B 9ded0b5e709dbcf085f1011fbc3a7138b5df7318c02106e492988bf0c1046f79b01876e96c9d55d79e1c4be4e854bca15744de5ced4507756a188328d55b7488 SHA512 bf8395517dccbb0185345e8bd0ee912f9ddb04beacaacd7e69edc6e40287928a51604a4e3cef06164b094b2e303b4faa52adf4630eabf24b3e9e351a034473a5
+MISC metadata.xml 1641 BLAKE2B ae081683e57088ae07627435af280c2d057c7a77c1f27674965b0f05248eeaa8356b04505d4f8b0446d261b1746035b6b185900eea88d508c8f0ac0a63bac5c0 SHA512 aa004a0ff420e6b0b7329fe385b68b30697f154b10b41ec8e609c7186a50b9d45c77d2f313990e342daec532978b0f734159ca2e062176207b8100b12faabc74
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index 90a61f186d30..799f74170b77 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<!-- co-maintainers welcome! -->
 	<use>
 		<flag name="24-bit-color">Enable 24-bit color support. Note that this feature