gentoo auto-resync : 29:08:2022 - 10:46:12

3 files changed, 143 insertions, 9 deletions

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 0e06843da6b9..386d2a92d0a8 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,6 +1,9 @@
 AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9
+DIST kitty-0.26.0.tar.xz 4719488 BLAKE2B 02e06ed8dd6bfdca789efe53211a27855582b2baa845558efd454a9ee8d2d6a71749f8baaad6ac6ba3f5b0878b2786302a26be190dec544488c3918de70ab581 SHA512 e8e041cb8cbe8560e35126d9f717111e0094ef9dd260ade07017f36d8e8e18fd4198cf186198b78089b8a05baa98a512d273b24b7f3f0d4f9f6d06107eb76c58
+DIST kitty-0.26.0.tar.xz.sig 566 BLAKE2B 9f05eb2083ea59f41284dcbf405be46f99fdc910167b522c4d281d8626e59d2e843f82f4526c17d7370e17bf72c3c372e490704702dc851fb3623fae7210db76 SHA512 c9057512767a6a93cd2ba1e621a10a1979aa4788a2fb16e5747df915647efe4a981cc1db772588a8f331d1988bb6f4918cc5e071bcd4dbbe86a7fc228d0856c3
 EBUILD kitty-0.25.2.ebuild 3564 BLAKE2B a1399f7f37f98dff758acdb95099abea500b529dff0be0b7a2d37f40b1f3373c4a5b4527a846b89cd194cf01eb52122e3487446066bdcae317f1ae399cfea167 SHA512 b37438a48ae27c198a9e7be0f8d8b3f3735b77329939630122601013d57fea8e9e4d7d821601ca3444bb15526c2afdc7ae0b3aace48a1305d78df7a0a0b4e909
-EBUILD kitty-9999.ebuild 3534 BLAKE2B ab8d87cc0831f3099955d353f8f89974523e5fff0ed3b7aa8f9c4c375f64769696a33f4f3c232d53e4d2cd38f48e4b6f5a9a3594918eca170c6b49fec58ece49 SHA512 b9f4807ae45fb4e43a95434fec45cfb5a6598007c0ec5404fd58fd513e29a313e5ee60c918065ab19dff42d6d46240c11ce9bd3ddd78c237510dfa508f748dcc
+EBUILD kitty-0.26.0.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
+EBUILD kitty-9999.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.26.0.ebuild b/x11-terms/kitty/kitty-0.26.0.ebuild
new file mode 100644
index 000000000000..3ee9cbb30121
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.26.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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
+		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 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Fast, feature-rich, GPU-based terminal"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+X test transfer wayland"
+REQUIRED_USE="
+	|| ( X wayland )
+	${PYTHON_REQUIRED_USE}"
+RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
+
+# dlopen: fontconfig,libglvnd
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/openssl:=
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	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 )
+	transfer? ( net-libs/librsync:= )
+	wayland? ( dev-libs/wayland )"
+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}
+	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 )"
+
+src_prepare() {
+	default
+
+	# seds unfortunately feel easier on maintainenance than patches here
+	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
+		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
+		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
+		-i setup.py || die
+
+	if use !transfer; then
+		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
+		rm -r kittens/transfer || die
+	fi
+
+	# test relies on 'who' command which doesn't detect users with pid-sandbox
+	rm kitty_tests/utmp.py || die
+
+	# test may fail/hang depending on environment and shell initialization scripts
+	rm kitty_tests/{shell_integration,ssh}.py || die
+
+	# skip docs for live version
+	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
+}
+
+src_compile() {
+	tc-export CC
+	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+
+	local conf=(
+		--disable-link-time-optimization
+		--ignore-compiler-warnings
+		--libdir-name=$(get_libdir)
+		--shell-integration="enabled no-rc"
+		--update-check-interval=0
+		--verbose
+	)
+
+	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
+	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
+
+	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
+	rm -r linux-package/share/terminfo || die
+}
+
+src_test() {
+	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/.
+
+	fperms +x /usr/bin/kitty \
+		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
+	optfeature "audio-based terminal bell support" media-libs/libcanberra
+	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 92a0509aac27..3ee9cbb30121 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg
+inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -32,6 +32,7 @@ RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
 # dlopen: fontconfig,libglvnd
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-libs/openssl:=
 	media-libs/fontconfig
 	media-libs/harfbuzz:=
 	media-libs/lcms:2
@@ -67,9 +68,10 @@ BDEPEND="
 src_prepare() {
 	default
 
+	# seds unfortunately feel easier on maintainenance than patches here
 	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
 		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
-		-e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \
+		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
 		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
 		-i setup.py || die
 
@@ -92,8 +94,7 @@ src_compile() {
 	tc-export CC
 	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
 
-	local setup=(
-		${EPYTHON} setup.py linux-package
+	local conf=(
 		--disable-link-time-optimization
 		--ignore-compiler-warnings
 		--libdir-name=$(get_libdir)
@@ -102,16 +103,15 @@ src_compile() {
 		--verbose
 	)
 
-	echo "${setup[*]}"
-	"${setup[@]}" || die "setup.py failed to compile ${PN}"
+	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
+	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
 
 	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
 	rm -r linux-package/share/terminfo || die
 }
 
 src_test() {
-	PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \
-		${EPYTHON} test.py || die
+	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
 }
 
 src_install() {