gentoo auto-resync : 19:03:2025 - 00:30:03

8 files changed, 258 insertions, 7 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 129e07c7b767..380cd2b6ee66 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 398d7e65a0b6..f56bace4e08d 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,6 +1,8 @@
 DIST kitty-0.39.1.tar.xz 8942308 BLAKE2B cb9eec3a8e568ef2caa5d50b52d13c2a0acc5f090dce40d0a6ae1bd4c2d78164506e6416d0d915f2c0028af1d7bbbc8b98bc81b2ff8831f3ce9e33374a0f27a9 SHA512 50d8e083e63fb5ccee5d6a4d7a3d07e775fe609307ad724527cd50ab33a7023d4e6694dd08ce322e643806fdcf92c0e990f14212ad168dbf4f39b8a666634000
 DIST kitty-0.40.0.tar.xz 9000332 BLAKE2B cd0fe553b0500e914d9b410176bf0a0420d97a6842b5794c90fd6f5904f7105408b124f475bd4df4859430d81d1ff17d842d658ce12d3696aa2fdc5fac82183f SHA512 9e10c38f117030ed0a0b38a65d8cd3921bba120ab5d1475850e87e3c5e342773b7f5844ea50ea341bf1bd083270a608da87de18f521a6b9d6b23c36ec64a3df5
+DIST kitty-0.40.1.tar.xz 9063044 BLAKE2B 0e7551051059eb9a67e68b051f57a34a1e4c6413a53ec3db3cdae1352c2d694d458036fccd8cb3d55590aef4e1ae2dc65731c46ccd9f294fc728440f3f1cfe1a SHA512 3435a133abbd65993a5841f9c4914859ecb65d612ea616a176e6d717f1f05abe0bf7bb4940f5ce6f52317ad2da72e64542af4139375d7f57efe438a958780ba6
 EBUILD kitty-shell-integration-0.39.1.ebuild 1547 BLAKE2B b225e57f603183081cdf6259a3dada6fa5a0a04d363eb4dc8ea4c5acc0ff93ad1cc76bd689e361dc6f3dffa7375be438616ab2477a41c65cf0eb79dcbfc3a860 SHA512 9abeba66fbbbde1cfe2bcbc7bb2e363fddd927529be57699996acae03ee273979d62f14af02af05a9305b09c3fdd18201356ea9f7e101edb4487def21460b1b6
 EBUILD kitty-shell-integration-0.40.0.ebuild 1550 BLAKE2B 073a6631deb83af9f082fadd0b85c12c7ffc361875db3947f8031ae856e3793dfb6332f72992dfc718f28ae71df1f416e8ec5ad872b52ee7e0c46fba14a5c7b7 SHA512 73e3af0c8b134a26646a4facf0a88c1c5397ef59cd365933ca275293b99d2e880c32bef370695a6e0e30b631a21c1501749c6a7a62e7296f9ddacbaa23d88ae8
+EBUILD kitty-shell-integration-0.40.1.ebuild 1550 BLAKE2B 073a6631deb83af9f082fadd0b85c12c7ffc361875db3947f8031ae856e3793dfb6332f72992dfc718f28ae71df1f416e8ec5ad872b52ee7e0c46fba14a5c7b7 SHA512 73e3af0c8b134a26646a4facf0a88c1c5397ef59cd365933ca275293b99d2e880c32bef370695a6e0e30b631a21c1501749c6a7a62e7296f9ddacbaa23d88ae8
 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.40.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.40.1.ebuild
new file mode 100644
index 000000000000..180d8106dfee
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.40.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2025 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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 cb29d25d49aa..8bb4788357a5 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,8 @@
 DIST kitty-0.39.1.tar.xz 8942308 BLAKE2B cb9eec3a8e568ef2caa5d50b52d13c2a0acc5f090dce40d0a6ae1bd4c2d78164506e6416d0d915f2c0028af1d7bbbc8b98bc81b2ff8831f3ce9e33374a0f27a9 SHA512 50d8e083e63fb5ccee5d6a4d7a3d07e775fe609307ad724527cd50ab33a7023d4e6694dd08ce322e643806fdcf92c0e990f14212ad168dbf4f39b8a666634000
 DIST kitty-0.40.0.tar.xz 9000332 BLAKE2B cd0fe553b0500e914d9b410176bf0a0420d97a6842b5794c90fd6f5904f7105408b124f475bd4df4859430d81d1ff17d842d658ce12d3696aa2fdc5fac82183f SHA512 9e10c38f117030ed0a0b38a65d8cd3921bba120ab5d1475850e87e3c5e342773b7f5844ea50ea341bf1bd083270a608da87de18f521a6b9d6b23c36ec64a3df5
+DIST kitty-0.40.1.tar.xz 9063044 BLAKE2B 0e7551051059eb9a67e68b051f57a34a1e4c6413a53ec3db3cdae1352c2d694d458036fccd8cb3d55590aef4e1ae2dc65731c46ccd9f294fc728440f3f1cfe1a SHA512 3435a133abbd65993a5841f9c4914859ecb65d612ea616a176e6d717f1f05abe0bf7bb4940f5ce6f52317ad2da72e64542af4139375d7f57efe438a958780ba6
 EBUILD kitty-terminfo-0.39.1.ebuild 680 BLAKE2B 7099dcfd09421e58eb981699bc82efac1fed03bec2a27dc321f51b23870d33e76f48e73f193918144a8a552fd2f05cfc6e99a121f6bf623f1f8e201b6fb497e7 SHA512 8412b1c4be20238f761e8a3198b872c3992710c8f6041284114ec4a93554852bb29a500945fbe7b055cfb8298ea6d15fe57a153dbc18c3e2573a2aac2f1f21fa
 EBUILD kitty-terminfo-0.40.0.ebuild 683 BLAKE2B 8b9178ddc488d230c92eeda39865d8b09ea5c9d74ea0e0bec684272c0cd0d8eccf600e30c510869fc418aede16b313ec413072113a533d2a9819b1b8b0845380 SHA512 cc4898eeb89bc241d22d639a27c1e8f128814bc9740ba29a847bb75c01058785316d180bcfab9a45d8ce9c77874f6d2d08f87188dc4c26b905efa531c6c8303b
+EBUILD kitty-terminfo-0.40.1.ebuild 683 BLAKE2B 8b9178ddc488d230c92eeda39865d8b09ea5c9d74ea0e0bec684272c0cd0d8eccf600e30c510869fc418aede16b313ec413072113a533d2a9819b1b8b0845380 SHA512 cc4898eeb89bc241d22d639a27c1e8f128814bc9740ba29a847bb75c01058785316d180bcfab9a45d8ce9c77874f6d2d08f87188dc4c26b905efa531c6c8303b
 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.40.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.40.1.ebuild
new file mode 100644
index 000000000000..00c37bdc2955
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.40.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2025 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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 0d220c1d3501..0f62e5c4e520 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,7 +4,11 @@ DIST kitty-0.39.1.tar.xz.sig 566 BLAKE2B ad055db8e0de99ceea2745f795ad629dc7237a7
 DIST kitty-0.40.0-vendor.tar.xz 1577692 BLAKE2B 04f36d364675d7a3d15a83f2b66f1cf663df2a82d00f7ae70449cd24be0e10a8518805c8492e6b65ac7c403349e5b6e2fed30eed4f956e3ce5ba2618c266616a SHA512 c02d575d3ffc2d04a3dba9ea7b8a50ea0593a955ff1656e177a0d449c2eb0dac15a170e8a1e241a9a30884d2e63d3c26da826d74e0799bd8e03e03334123e513
 DIST kitty-0.40.0.tar.xz 9000332 BLAKE2B cd0fe553b0500e914d9b410176bf0a0420d97a6842b5794c90fd6f5904f7105408b124f475bd4df4859430d81d1ff17d842d658ce12d3696aa2fdc5fac82183f SHA512 9e10c38f117030ed0a0b38a65d8cd3921bba120ab5d1475850e87e3c5e342773b7f5844ea50ea341bf1bd083270a608da87de18f521a6b9d6b23c36ec64a3df5
 DIST kitty-0.40.0.tar.xz.sig 566 BLAKE2B 022a8f544a680ef98c84275cdba5dcab3cc21f7d4139e9c46d43fa08bc1a1b64cac97ae07cbbb5c6b0350433ca07591e9313dca9d80abf5c23bd532803c5eb5a SHA512 79ec3f9ba9010cc111ab470ec14525cafd367ecc3effc2a775d4911132aae462f5bb6fc9c92351c3cc57e874a134ab6819d06904cbf5d397e875f4e377a49830
+DIST kitty-0.40.1-vendor.tar.xz 1577408 BLAKE2B 557d6b9dc1ed8f003aca96445dfc1f79f5c2e87a2fba1dcf2f867a467ed7a128030afd2f27f2d9e8de63bd90fe440ccb048409bf979a20df101fcb75ac11762c SHA512 413649ce3dd04eca1fe3039e70d9aaa15511a7526f23d58b1d066b5e148efd1f25b319983673ff02107c21a3c392edc22f63b82bb627981c39096cbb855e426b
+DIST kitty-0.40.1.tar.xz 9063044 BLAKE2B 0e7551051059eb9a67e68b051f57a34a1e4c6413a53ec3db3cdae1352c2d694d458036fccd8cb3d55590aef4e1ae2dc65731c46ccd9f294fc728440f3f1cfe1a SHA512 3435a133abbd65993a5841f9c4914859ecb65d612ea616a176e6d717f1f05abe0bf7bb4940f5ce6f52317ad2da72e64542af4139375d7f57efe438a958780ba6
+DIST kitty-0.40.1.tar.xz.sig 566 BLAKE2B ada6ac48cacf50986c75387469d984bcd6b9587869f2aa90b62fe6166f7f4f3a938d7ab134457af06755446d39bc331bf0f4ce5f911699de7ad0b9c7ef43030c SHA512 cf3514b2f77378efe5262ab972bc9f6ddf7ac6550c0d848f3f636a897f0ff94d51bf7c4e67dc10285d6c40080f54a22df9b760cfe53e1ddc6cb26921369f7191
 EBUILD kitty-0.39.1.ebuild 5152 BLAKE2B c601ad264f62e603dc78abfac2cd6b4cd619958011a91c51d5516d13df6c8417d9494ab0e23e5125b7c27a70fb6dab92ba3590f4340d7f5b9414fc288ec800e1 SHA512 8e1b9deb8d71972023b3156b0bb801fcec4e53e0aeb64051a3256d12777484b1199502e146d2b5356c48a4a2fb6a40ade2aee75d456eb59a8c4f44f196305dab
 EBUILD kitty-0.40.0.ebuild 5413 BLAKE2B c5902482a9dc635a6f5426d8548f302dc926b2024ecb9c5e319c44c3768078ef7f6d0a5e40970d923fe140112d8d490b71e6f17e0eb2e64a2bc442523b62c481 SHA512 9a6f7a31968a16cef69671df0bd3c6432238eeb2f27e4c9c0227fbcc1533b1b16b7b25d2394f68aa3da5e156056e1dca22a32a75a7daea6975687d10ba9e9a6c
-EBUILD kitty-9999.ebuild 5413 BLAKE2B c5902482a9dc635a6f5426d8548f302dc926b2024ecb9c5e319c44c3768078ef7f6d0a5e40970d923fe140112d8d490b71e6f17e0eb2e64a2bc442523b62c481 SHA512 9a6f7a31968a16cef69671df0bd3c6432238eeb2f27e4c9c0227fbcc1533b1b16b7b25d2394f68aa3da5e156056e1dca22a32a75a7daea6975687d10ba9e9a6c
+EBUILD kitty-0.40.1.ebuild 5169 BLAKE2B f660120c76ab0506a8eccf8de116415fbf06e0235bd25d8df7671b6964cc4712280622d7c4b18711ea80e1970d895d5414ad6ae173d8b909b074ce80b19716d0 SHA512 fa44b538c12acd1a4af274e6c717f153b7ac42a2d1daa095e90b49b8ea8908e30c38541fe8820f8ef5f4a8c815e4e7c098fbf6f225ad5f34d633c147e0cf4c1f
+EBUILD kitty-9999.ebuild 5169 BLAKE2B f660120c76ab0506a8eccf8de116415fbf06e0235bd25d8df7671b6964cc4712280622d7c4b18711ea80e1970d895d5414ad6ae173d8b909b074ce80b19716d0 SHA512 fa44b538c12acd1a4af274e6c717f153b7ac42a2d1daa095e90b49b8ea8908e30c38541fe8820f8ef5f4a8c815e4e7c098fbf6f225ad5f34d633c147e0cf4c1f
 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
diff --git a/x11-terms/kitty/kitty-0.40.1.ebuild b/x11-terms/kitty/kitty-0.40.1.ebuild
new file mode 100644
index 000000000000..074edc517bd4
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.40.1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit edo 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-fonts/symbols-nerd-font
+	media-libs/freetype
+	media-libs/harfbuzz:=[truetype]
+	media-libs/lcms:2
+	media-libs/libglvnd[X?]
+	media-libs/libpng:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	x11-libs/cairo
+	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.23:=
+	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"
+
+	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
+
+	# kitty currently detects and copies the system's nerd font at build
+	# time, then uses that rather than the system's at runtime
+	dosym -r /usr/share/fonts/symbols-nerd-font/SymbolsNerdFontMono-Regular.ttf \
+		/usr/"$(get_libdir)"/kitty/fonts/SymbolsNerdFontMono-Regular.ttf
+}
+
+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 88bbd192ca41..074edc517bd4 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -119,10 +119,6 @@ src_prepare() {
 
 	sed -i setup.py "${sedargs[@]}" || die
 
-	# temporary, see --shell-integration below and try again on bump
-	sed -e "/shell_integration: /s/'enabled'/&, 'no-rc', 'no-sudo'/" \
-		-i kitty/options/types.py || die
-
 	local skiptests=(
 		# relies on 'who' command which doesn't detect users with pid-sandbox
 		kitty_tests/utmp.py
@@ -146,8 +142,7 @@ src_compile() {
 		--disable-link-time-optimization
 		--ignore-compiler-warnings
 		--libdir-name=$(get_libdir)
-		# option seems(?) currently broken, needs looking into (see sed above)
-#		--shell-integration="enabled no-rc no-sudo"
+		--shell-integration="enabled no-rc no-sudo"
 		--update-check-interval=0
 		--verbose
 	)