gentoo auto-resync : 22:11:2022 - 19:06:54

3 files changed, 28 insertions, 15 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 5421d686ede6..b5de57c00b00 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 0b2de4239b5d..f71e954b2906 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -4,5 +4,5 @@ DIST kitty-0.26.5.tar.xz 4749988 BLAKE2B 488969b4d7c6aed489a540a8e3bee183345fcfb
 DIST kitty-0.26.5.tar.xz.sig 566 BLAKE2B 377202d46e66854e0cf1998506e0fafca54b33d85264e47c13aa4b98d272c786809375f1e277ec169291e06809f11b5b061ec1243a708711fa2350243ad1eca2 SHA512 0c691d8becff2b0f24e09b941d7315efaac831beacfed6f66b9186bde9c502f2ae86289f4b0d8fa6a34624dce7a1e958ba2d0502fd87003ba08b07fa07c6ae17
 EBUILD kitty-0.26.4.ebuild 3610 BLAKE2B 9e8b094a98eba2ecaf05d4e668548a1d739ae70549e4577390e9ae292416999952a6ddf91b8a59f9e400a41a64f3315d67e7c1a44a52fd9b1dedbbce4faa185f SHA512 93905872870522c7412f3ca884c8185f48804cf5f6b0f4b2ec595c5c62dede63251e453137c804113fd3f3cf51d6c21c41b6b2a68068e950ebbd293c354cbf05
 EBUILD kitty-0.26.5-r1.ebuild 3431 BLAKE2B dc4f1f64327be14c10779bdd46d36e36c728e2784f796157b738999e970d5cb14ab9b894a6109078a5e532857738191f1f2ef6860cf939ee722c75217263d788 SHA512 5bf95478b917f3241bc77e57692dd8f532c20aeb35f00b84bd9834c52a9c8220b166a12e9121272ecb92afd82bf9af679107a6c8142932f1c024989f08d9c113
-EBUILD kitty-9999.ebuild 3569 BLAKE2B 3b5275a4533bf32c09581b7e3b0103d53af46720674d4ce4a5106a3df3a4aa40436cb50b983bd2b9c648d58027613a546157e754bf696a40b011ed1ee65b4c2b SHA512 93bc901f0135d29471a01de8764b365f285e32443953b7cdb4d5ad03112247460b5c25dfd630076c86cebf6719e16fd067a97b419241e446d44d8ac1e9a44ce4
+EBUILD kitty-9999.ebuild 3884 BLAKE2B 7ca411430d64d9ab3dd3cf92e1665d0314c873383abe570bca3e656166327a7c525bc0af3e4c050999eaa3a2e500097166e74ff4e1d61a3382c7d2e535224454 SHA512 ef0849e0cba43b580aae8f6782b0ce7138b04f87930d44f6a55ddbdafc783364ec0729dfdf9b51c95219cef309a4cb9d114a41ac4582fea5c34b3d25c3a76ed9
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 914583b0f335..46e484ae0258 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..11} )
-inherit edo go-module 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
@@ -60,16 +60,20 @@ DEPEND="
 	wayland? ( dev-libs/wayland-protocols )"
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-lang/go
 	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/kitty-tool" # written in Go
+
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
-		go-module_live_vendor
+		cd "${S}" || die
+		edo go mod vendor
 	else
 		verify-sig_src_unpack
 	fi
@@ -78,12 +82,22 @@ src_unpack() {
 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
+	# sed unfortunately feels easier on maintainenance 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
 
 	# test relies on 'who' command which doesn't detect users with pid-sandbox
 	rm kitty_tests/utmp.py || die
@@ -91,8 +105,6 @@ src_prepare() {
 	# 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() {
@@ -108,8 +120,8 @@ src_compile() {
 		--verbose
 	)
 
-	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
-	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
+	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
@@ -123,8 +135,9 @@ src_install() {
 	insinto /usr
 	doins -r linux-package/.
 
-	fperms +x /usr/bin/kitty \
-		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
+	local execbit
+	mapfile -t execbit < <(find linux-package -type f -perm /+x -printf '/usr/%P\n' || die)
+	fperms +x "${execbit[@]}"
 }
 
 pkg_postinst() {