gentoo auto-resync : 21:04:2023 - 12:02:15

3 files changed, 171 insertions, 2 deletions

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 4d425863544c..cedec62c954c 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -6,8 +6,12 @@ DIST kitty-0.27.1.tar.xz.sig 566 BLAKE2B 49cb96d99c48cfe74a50191687fac269cdc3314
 DIST kitty-0.28.0-vendor.tar.xz 1324380 BLAKE2B 0e10660fd5ff95827746ba2f669a8941a1855958e91ca623090c184d972e39ba9b8b8c773321de812429345f75f3b6d75af9f5e70a3aff1e638afa718801133a SHA512 7c871feb7dda605b9b7af42b9136b6047b6442a06e7e7e0a1ff9dd74d845100d70359f88c07e1dc86dc6e39e8e2a850c1a7619a5cbb696b6000957b50783d545
 DIST kitty-0.28.0.tar.xz 7900352 BLAKE2B fea1944e818354522a386d9d6bfa778e70bef3404c3b3f3c87667cee16edc54206540d0ef022f1383e22ed1caf929cc839b226da21c86f9d9b1cda8f8a9a847f SHA512 d133dab019c67367e90cc2e2dce7e614a65400b079cdcfa854f2e1cb7399af7b1ba0f3ef4d30867ae588c9919a772c03ee12457b6dc5922f58c034a6da927127
 DIST kitty-0.28.0.tar.xz.sig 566 BLAKE2B cd52127069a443f7b94de173d7b7497be88420032907a555cea40ad922dfa4a67701e62fbb93dceae280bd21e28a352a02a84e48a3678f63e5312d3121d713e6 SHA512 2d9d147eca26496bdba17551eca64a07437c5ea183c0a748a76418374963742c5cfe20b68c0102b5afe2f9f1b36be58736f014d54c028d33f55d940a32213ac6
+DIST kitty-0.28.1-vendor.tar.xz 1344988 BLAKE2B 768a2859f18b743a23007be60323035f54375496cb08d45dabab12ca09b3227451f7c1e78dda72bc79712835e1e0541549b1c1f7b5f68f8b1164062c77ba7520 SHA512 bc111e7428660d79e116a88f0c62c4dc54c79c423c364156219c5a6251f0725fc43e34e8b518352b00433c2443371619b4f6ab5c41d32ddf129c42f98ced0694
+DIST kitty-0.28.1.tar.xz 7850232 BLAKE2B 18567e54bbd2ac183120122847951744bb8494829911d4c66b5db23488fcc257c895b8d788c1b386ffec832aceb4f691a8a10339be07d43e54957c9c98365a01 SHA512 a8863c8bf5a3c385671d98bd50481ffcd3984e45ee051173eb38de9aac79643e69a312e08b8f655759f3ecdfab4efe38dca39167f5590e482748b5e85dea5537
+DIST kitty-0.28.1.tar.xz.sig 566 BLAKE2B 5ad5fa8fa0143dcd5760dbd885c718582e5001d2eeb5b6b559abffd556407e1061ebe9c84757f49c57803233f38ebe6f7d813f9f50a55b7ce8532c0f589cd8ae SHA512 cf13e09978187c19d53903aea0032ef2088950eb050e0d183283919e96d9a2ae14dd2a40f63ee0fc5180be3e5a9066ade86943f1bcac042d6da890fa2ed13720
 EBUILD kitty-0.26.5-r1.ebuild 3431 BLAKE2B 51eec6dbc5250040fb5c223646586f6114f97eefaa718baab7b3e9c338351467f67a26dd668cf511b18b082d0083ca202a60e8eb7d79a6aaa63ebbe8ba60e821 SHA512 42b24d286efc77299eb984fabf2b4272ced8d9a0a567251ab750b417dfe3584234c04afd8fd19f487d164954915a3ae382fd6bbd4be13d87e5d9544bc5de3920
 EBUILD kitty-0.27.1.ebuild 4478 BLAKE2B bad5756d3e2af0b31b781dfd6937b0a3c8c458d03a30f2b300abbbdf4bfcc204b9a5cc5e21f611b44274fecf6a5960bd8711dba534f50a106113546e8ee38750 SHA512 e3e5fa196300f91a701067e7131cf78b7065da3a663c17aae71dd172eb8732b63b199c48a16f565efc54a8d9ba92b79be39b61c2483916bdfaa116f0f4d2c3f0
 EBUILD kitty-0.28.0.ebuild 4670 BLAKE2B ad9c77d4ecce0bd3852ccf5490844670610f319c7eb8722ef4530b836707cb23726a1fb1762e47b9a70678875a1ad318782c1014c851f5c9aa0e526bdb4de2e0 SHA512 e2725d009a22c7efd726fe56094447dab48d0c923d4c585b931a5f1f9c07a884e595f2e922f75a170bdc2f7c081faae52fee8f50ed0611ac8d9d9de8b09cac97
-EBUILD kitty-9999.ebuild 4480 BLAKE2B 143c41f0c08776bf813003c1a260826a79e275a0a493889c9359e570f0e3c471d67b8de8ba7fc687bdee7ac9f5a3b7d8c2ef6e5e6de6ca614a5c000fc6dcedf0 SHA512 6a40355540aecc843739d28ba57f8865931fa347b03adf0ffb0cd3a2fda6eb52a761875e3cbc06a6058aa59c37306d991906173b6f8054ed1ab208e2061281d5
+EBUILD kitty-0.28.1.ebuild 4488 BLAKE2B e1eb8b7ce445a468feea7024537136174de0a840fce1b85854c5faa077fbff4240498c4384a80d7c5efba8d7acf0e544a5f37ab62d16e6ca68856ec482ece1c0 SHA512 7af50927eaac59951768d1f0c11cf5258784f432179da1dedbe3cefd382072e3f6924562536a93cbade8541b3cd7ca644e9330a8cf04532edca799d13eac7d8e
+EBUILD kitty-9999.ebuild 4488 BLAKE2B e1eb8b7ce445a468feea7024537136174de0a840fce1b85854c5faa077fbff4240498c4384a80d7c5efba8d7acf0e544a5f37ab62d16e6ca68856ec482ece1c0 SHA512 7af50927eaac59951768d1f0c11cf5258784f432179da1dedbe3cefd382072e3f6924562536a93cbade8541b3cd7ca644e9330a8cf04532edca799d13eac7d8e
 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
diff --git a/x11-terms/kitty/kitty-0.28.1.ebuild b/x11-terms/kitty/kitty-0.28.1.ebuild
new file mode 100644
index 000000000000..e034994923d5
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.28.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 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:=
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libglvnd[X?]
+	media-libs/libpng:=
+	net-libs/librsync:=
+	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.20
+	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/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"
+		--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
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 376cd09c4465..e034994923d5 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -23,7 +23,7 @@ DESCRIPTION="Fast, feature-rich, GPU-based terminal"
 HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
 
 LICENSE="GPL-3 ZLIB"
-LICENSE+=" Apache-2.0 BSD MIT" # go
+LICENSE+=" Apache-2.0 BSD MIT MPL-2.0" # go
 SLOT="0"
 IUSE="+X test wayland"
 REQUIRED_USE="