gentoo auto-resync : 11:10:2023 - 00:10:45

5 files changed, 12 insertions, 183 deletions

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 133ee6bfb1d6..2174b24154ff 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -2,14 +2,10 @@ AUX kitty-0.30.1-no-sudo.patch 943 BLAKE2B 9e043ff036d98cb85f841fbeaff1ea586c285
 DIST kitty-0.29.2-vendor.tar.xz 1377044 BLAKE2B f342c7be9bec556b9b16b0e2032ac1ec80296f791a0c55d8b0831d8e148f05e2a7e1ae7c30090c70e7da7e6ca489e5b9b013f59d35af708eff073899f345b7ac SHA512 c0e2c55b0c7ca6ad435092c1267ed1164e042cc61ebf80b298477703607ac7611170cac1918d3703669e2363756e2d805d490018e66cc5b97efecbd0e516298e
 DIST kitty-0.29.2.tar.xz 7809388 BLAKE2B 6928d79a6cc0eaac4d92ce3babbeb0a42bf1dbc92b775386b521c8399352ba77ab9828f8cfd9f40c3e4f29ae98852b6f3cb9ee1f412474ba2ef655c18d2c294d SHA512 a34d8b5bc817dd9d27f1afa190856d916576f52458ede2253655b294358b6b89b1f103acb90d8d66a494b346420ddedc9fcf1a3399f561268ded82e7b1954b06
 DIST kitty-0.29.2.tar.xz.sig 566 BLAKE2B 52fe246f3c4a74dfb62ed34b12b639858eb91aef02c872e472e1a1272268f6da2027b325dc29e260346c76bfbaa206486c6ce2f44f259d33f1ca3a0fd82150ff SHA512 ffcc63904a09148ddbf2eb761686942d1de3ce2c8c7c93b8a1c59ef704e0886bce972dd162e88de65912682233b21398970685cebbda785f7c4215f02ddbf9fd
-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
-EBUILD kitty-0.29.2-r1.ebuild 4497 BLAKE2B df0094ef3f502a8fb6f1b6d8716d7325da45d4d09c8cc27272dcefaefeae3963a36c8a5b209b4160ded316cba73810cd94d94f01b3df5211ddb200845ca4ec9e SHA512 f50d09dd5cf57e01a5964afc08ce9963070726a593572a34161f5178a0e23a0e84775f13253ea23b8c6e3ab9854b1c60283725165b1eaa86bffac27f120c6e69
-EBUILD kitty-0.30.0.ebuild 4508 BLAKE2B 3d52f836867e6dd6017abfb563c581e6937e563563e664ec8819da36bf46c93770a5bce606fef89c759fd4337355d11228fb8688989ffc0ccb5cc3659a1b816e SHA512 33002f2ff5be9d3a195b97290c5d0028af7b907e6ff97a83b2488887ddea6ce85e5a69b2442f05b99658576909ec46b749616a606f822c36f807f858e1713359
-EBUILD kitty-0.30.1.ebuild 4571 BLAKE2B d7b498274a97f6642152b0ec391d8f8b1b8a747b2429d45ff272ff1e8c1aa2de998a5242fdcc65176c0c0b70ea19edb9dac474814a14e2496b05737aa8068ed6 SHA512 91c826e7a292aabe27348ae4bbf6b1f04f31d9a802d757ba67ad0788057d8af8f17127a3a26170ae4cb9d6b0470c7d4d33db5f008b1d19104763dea2f061dcd9
-EBUILD kitty-9999.ebuild 4571 BLAKE2B d7b498274a97f6642152b0ec391d8f8b1b8a747b2429d45ff272ff1e8c1aa2de998a5242fdcc65176c0c0b70ea19edb9dac474814a14e2496b05737aa8068ed6 SHA512 91c826e7a292aabe27348ae4bbf6b1f04f31d9a802d757ba67ad0788057d8af8f17127a3a26170ae4cb9d6b0470c7d4d33db5f008b1d19104763dea2f061dcd9
+EBUILD kitty-0.29.2-r1.ebuild 4514 BLAKE2B 7bd3a195e2e87bf5844d95e5c554e59cc995e97e067866d4a091a486c1b4a023116cf4b64d1f08d003746c69dcb772da64e758525f6b0d557cff2c6b99184c8d SHA512 bf2afe85063be288741dda6a2be0946cb51b1e71635ababbbc542b208b8a8857200b19bf38f1d2b117bc709eb4315396292d51a0f61298190fe8e283dbc32e56
+EBUILD kitty-0.30.1.ebuild 4588 BLAKE2B d1d3e189bcdf9caddf8f2397e0132b6f6c504d161b0ac22348c0998b7898bfee28700a9fd4a47fdfe9396f75ad3e581537c4a9cfa4f28aa138723112fab50025 SHA512 7172f62173094ac7c76175d254e94a2295a1274f28b325f6f6bde50043ae69c5403dc7c5b96bbc8cd46902f12a8fe88d6395b92faa4b22ff196d36b282da3721
+EBUILD kitty-9999.ebuild 4588 BLAKE2B d1d3e189bcdf9caddf8f2397e0132b6f6c504d161b0ac22348c0998b7898bfee28700a9fd4a47fdfe9396f75ad3e581537c4a9cfa4f28aa138723112fab50025 SHA512 7172f62173094ac7c76175d254e94a2295a1274f28b325f6f6bde50043ae69c5403dc7c5b96bbc8cd46902f12a8fe88d6395b92faa4b22ff196d36b282da3721
 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
diff --git a/x11-terms/kitty/kitty-0.29.2-r1.ebuild b/x11-terms/kitty/kitty-0.29.2-r1.ebuild
index 4d460614b658..5399ebaefc11 100644
--- a/x11-terms/kitty/kitty-0.29.2-r1.ebuild
+++ b/x11-terms/kitty/kitty-0.29.2-r1.ebuild
@@ -15,7 +15,6 @@ else
 		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
 
@@ -78,8 +77,10 @@ src_unpack() {
 		cd "${S}" || die
 		edo go mod vendor
 	else
-		use verify-sig &&
+		if use verify-sig; then
+			local VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg
 			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+		fi
 		default
 	fi
 }
diff --git a/x11-terms/kitty/kitty-0.30.0.ebuild b/x11-terms/kitty/kitty-0.30.0.ebuild
deleted file mode 100644
index 99e44b505ebd..000000000000
--- a/x11-terms/kitty/kitty-0.30.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# 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
-
-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-0.30.1.ebuild b/x11-terms/kitty/kitty-0.30.1.ebuild
index 884afab7f454..b5fe9c792ba6 100644
--- a/x11-terms/kitty/kitty-0.30.1.ebuild
+++ b/x11-terms/kitty/kitty-0.30.1.ebuild
@@ -16,7 +16,6 @@ else
 		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
 
@@ -87,8 +86,10 @@ src_unpack() {
 		cd "${S}" || die
 		edo go mod vendor
 	else
-		use verify-sig &&
+		if use verify-sig; then
+			local VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg
 			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+		fi
 		default
 	fi
 }
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 884afab7f454..b5fe9c792ba6 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -16,7 +16,6 @@ else
 		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
 
@@ -87,8 +86,10 @@ src_unpack() {
 		cd "${S}" || die
 		edo go mod vendor
 	else
-		use verify-sig &&
+		if use verify-sig; then
+			local VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg
 			verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+		fi
 		default
 	fi
 }