[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     9128f4f7852f868909d3f5c7eff3879624e3a940
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  5 14:43:00 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct  5 15:20:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9128f4f7

x11-terms/kitty: add 0.30.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-terms/kitty/Manifest                         |   3 +
 x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch |  21 +++
 x11-terms/kitty/kitty-0.30.1.ebuild              | 174 +++++++++++++++++++++++
 3 files changed, 198 insertions(+)

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index d0caf5e430be..5fa2a9e2427f 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,3 +4,6 @@ DIST kitty-0.29.2.tar.xz.sig 566 BLAKE2B 52fe246f3c4a74dfb62ed34b12b639858eb91ae
 DIST kitty-0.30.0-vendor.tar.xz 1412860 BLAKE2B 71ca2f2981bab51af5d6baa85485b8c5f91d721f19039c129ec1b10d52b50667a7ee593798db5bc85c0b7e835ce2c1a1eb53d6b9a0b0413b7e7dc77ac4a0713b SHA512 a1649f626cd52472e87d1e4570331f21db6875c61c991e6535e6e81404dc069e52e8ba438ed956da8f1a51bcc9bdb71a541c8e0a6b8cb7678e4bb839bda85402
 DIST kitty-0.30.0.tar.xz 7842724 BLAKE2B a656fbb74a92a6b834fe8d06a89eaa1240044b132d64d7ad9eb429c71fd60e564ed963638bb9ba4e99d3e31c2ac594543e702b298a0b53aea1050e3b2e19ae9a SHA512 05438de8752057d7c419da41621b4d8fcfa6e7189530efc32c7c8a0bf2e6dae0332dd1b661206f9dea5bf374713e86ea5e69f640b0e73fe617f528bc963a8792
 DIST kitty-0.30.0.tar.xz.sig 566 BLAKE2B bb11c31561fb97ae229cd4eaae787a91cc9937f85bf98a4413476c9540334ff85a94e67a7699d04e326a6e067645e2c831761722d8780ab67c3cc66745bdabca SHA512 117c83e2b2190d6095a4e19386e897c03776ebb11509a23564db7f746dfd31e5ad9865bf88111b3bacf21547385ab08e33d7234027c50ab366f8a69105df8bb4
+DIST kitty-0.30.1-vendor.tar.xz 1425096 BLAKE2B dcf65787badf2439b5e7dc9ff1fb2073d0d8b124a7c39e017aee70a9c5c8f9b5f75b9c7942748cdd7327c75e506d667736eb13d91d8c42f46dfff12ffb9ae4d9 SHA512 4cabb39c82b4dfde96390bfd739d24af3abc6a48f2f6013fb51a1d95d31b04c545f8dbf0d3fc89bcb692c26955bdefe196e95d41eed7222eb815b3f05688a362
+DIST kitty-0.30.1.tar.xz 7799076 BLAKE2B 99ada03fa957819e716d3225fbee20af62135ff8861d3a6ce8aaf442b4526a69f34dae0ec126db48a4336fcbd2dfde5583e2ff8f16140e938fada6c0a8854a60 SHA512 e5fd68b8acf3eae8f53a2c27101d998eb0d8eff1571de1b03ab431bceafcab0efae821590684ec48b5ed6e3d86fb984d9e04784022ba50c0378d37a68598f9ed
+DIST kitty-0.30.1.tar.xz.sig 566 BLAKE2B 18ad4df3ef3e161d8382f635f371b0100ff812d3eb2d5d1a2af1df2e04d1c15a344e4dd86d6a8faaf663a6a9d579521cdacdf6c5b1852d2120d94c43cd765826 SHA512 8c90733cb1683f6cb7c57fcf1efdbd0a99b16c4e1edca9b7e99820e5108694fcee521fecd7adaecc331a744b04d2041594adbf058d6218cd82099550f04b961e

diff --git a/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch b/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch
new file mode 100644
index 000000000000..d22bca5de0b5
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch
@@ -0,0 +1,21 @@
+Ensure no sudo wrapper given may easily result in an error with no permission
+to set TERMINFO. Normally disabled by "no-sudo" but depending on load ordering
+or user configs overwriting that without disabling it as well, it could give
+poor surprises.
+
+Not needed on Gentoo given have a kitty-terminfo package installed in standard
+paths without needing TERMINFO set.
+--- a/shell-integration/bash/kitty.bash
++++ b/shell-integration/bash/kitty.bash
+@@ -215,4 +214,0 @@
+-    if [[ "${_ksi_prompt[sudo]}" == "y" ]]; then
+-        # Ensure terminfo is available in sudo
+-        [[ -n "$TERMINFO" ]] && builtin alias sudo="sudo TERMINFO=\"$TERMINFO\""
+-    fi
+--- a/shell-integration/zsh/kitty-integration
++++ b/shell-integration/zsh/kitty-integration
+@@ -391,4 +390,0 @@
+-    if (( ! opt[(Ie)no-sudo] )); then
+-        # Ensure terminfo is available in sudo
+-        [[ -n "$TERMINFO" ]] && builtin alias sudo="sudo TERMINFO=\"$TERMINFO\""
+-    fi

diff --git a/x11-terms/kitty/kitty-0.30.1.ebuild b/x11-terms/kitty/kitty-0.30.1.ebuild
new file mode 100644
index 000000000000..884afab7f454
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.30.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit edo optfeature multiprocessing 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="${BROOT}/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 )
+	wayland? ( dev-libs/wayland )
+	!sci-mathematics/kissat
+"
+DEPEND="
+	${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+	)
+	wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-lang/go-1.21
+	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
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.30.1-no-sudo.patch
+)
+
+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/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 GOFLAGS="-p=$(makeopts_jobs) -v -x"
+	use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie"
+	local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+
+	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
+	optfeature "opening links from the terminal" x11-misc/xdg-utils
+}