gentoo auto-resync : 23:06:2024 - 00:11:30

9 files changed, 261 insertions, 6 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 45a24594996b..6acf08742b39 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 bebe6dfff2e8..454e0fdcf5ce 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,6 +1,8 @@
 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.2.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.2.ebuild
new file mode 100644
index 000000000000..a50a1338ca92
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.35.2.ebuild
@@ -0,0 +1,37 @@
+# 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 d64db5a30a9f..17f50b0481f1 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,8 @@
 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.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.35.2.ebuild
new file mode 100644
index 000000000000..b5c7cbc40759
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.35.2.ebuild
@@ -0,0 +1,23 @@
+# 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 745b7186b049..877b4d885eab 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,7 +4,11 @@ DIST kitty-0.34.1.tar.xz.sig 566 BLAKE2B fb01069e33f958bfc1aee3e42ab5d8d775d79cf
 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 5257 BLAKE2B 4b0480c98159c001df41dc4021d2f53fe91dd23f8999159c6240ccb84d8768e2b318c78011942b69b618266815e4d0d9fef333c64ea9698d45d368a31dea50a2 SHA512 11de41f0d50625e88c14d1bbfc4f88e9adc893bd245aa4ac47540969d406c504512597b722b432fc47a5c7b5d8c5ac092a6f158401e1c9f6fb450d1a94460246
-EBUILD kitty-9999.ebuild 5257 BLAKE2B 4b0480c98159c001df41dc4021d2f53fe91dd23f8999159c6240ccb84d8768e2b318c78011942b69b618266815e4d0d9fef333c64ea9698d45d368a31dea50a2 SHA512 11de41f0d50625e88c14d1bbfc4f88e9adc893bd245aa4ac47540969d406c504512597b722b432fc47a5c7b5d8c5ac092a6f158401e1c9f6fb450d1a94460246
+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
index 77384a8a8578..7656c827e9ed 100644
--- a/x11-terms/kitty/kitty-0.35.1.ebuild
+++ b/x11-terms/kitty/kitty-0.35.1.ebuild
@@ -18,8 +18,6 @@ else
 		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
-	# x86 currently still works but note that upstream has dropped support and
-	# may ignore issues: https://github.com/kovidgoyal/kitty/commit/29cb128fd
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
diff --git a/x11-terms/kitty/kitty-0.35.2.ebuild b/x11-terms/kitty/kitty-0.35.2.ebuild
new file mode 100644
index 000000000000..7656c827e9ed
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.35.2.ebuild
@@ -0,0 +1,191 @@
+# 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/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 77384a8a8578..7656c827e9ed 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -18,8 +18,6 @@ else
 		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
-	# x86 currently still works but note that upstream has dropped support and
-	# may ignore issues: https://github.com/kovidgoyal/kitty/commit/29cb128fd
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi