From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4AB90158041 for ; Tue, 26 Mar 2024 17:30:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01D1D2BC016; Tue, 26 Mar 2024 17:30:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D313D2BC013 for ; Tue, 26 Mar 2024 17:30:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08C71340906 for ; Tue, 26 Mar 2024 17:30:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6489E15F0 for ; Tue, 26 Mar 2024 17:30:53 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1711473419.3900b54eb143ddb745570b10bd769b388721c797.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/godot/godot-3.5.3.ebuild dev-games/godot/godot-4.2.1.ebuild X-VCS-Directories: dev-games/godot/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 3900b54eb143ddb745570b10bd769b388721c797 X-VCS-Branch: master Date: Tue, 26 Mar 2024 17:30:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9474c83c-8ba9-4cfb-b030-47eac088e56a X-Archives-Hash: edb686c7eb69a438e76084689b36760b commit: 3900b54eb143ddb745570b10bd769b388721c797 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Mar 26 16:57:03 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Mar 26 17:16:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3900b54e dev-games/godot: fixup shell completion files Won't bother with godot*-runner. Skipping revbump given this is a long build and most users are likely not using shell commands and work through the GUI (which may explain why the only report for this being broken was automated). (missed QA myself given it only shows if bash-completion is installed) Closes: https://bugs.gentoo.org/927855 Signed-off-by: Ionen Wolkens gentoo.org> dev-games/godot/godot-3.5.3.ebuild | 18 +++++++----------- dev-games/godot/godot-4.2.1.ebuild | 18 +++++++----------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dev-games/godot/godot-3.5.3.ebuild b/dev-games/godot/godot-3.5.3.ebuild index 52470f766d26..8fadd2b5d978 100644 --- a/dev-games/godot/godot-3.5.3.ebuild +++ b/dev-games/godot/godot-3.5.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg +inherit desktop python-any-r1 scons-utils shell-completion toolchain-funcs xdg DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor" HOMEPAGE="https://godotengine.org/" @@ -82,10 +82,13 @@ PATCHES=( src_prepare() { default + # handle slotting sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \ -i misc/dist/linux/org.godotengine.Godot.desktop || die + sed -e "s/godot/&${SLOT}/g" \ + -i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/{x11,server}/detect.py || die @@ -210,13 +213,6 @@ src_install() { fi newbashcomp misc/dist/shell/godot.bash-completion ${s} - bashcomp_alias ${s}{,-runner} - - insinto /usr/share/fish/vendor_completions.d - newins misc/dist/shell/godot.fish ${s}.fish - dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish - - insinto /usr/share/zsh/site-functions - newins misc/dist/shell/_godot.zsh-completion _${s} - dosym _${s} /usr/share/zsh/site-functions/_${s}-runner + newfishcomp misc/dist/shell/godot.fish ${s}.fish + newzshcomp misc/dist/shell/_godot.zsh-completion _${s} } diff --git a/dev-games/godot/godot-4.2.1.ebuild b/dev-games/godot/godot-4.2.1.ebuild index 36ff25f89f52..448e6f0f2dad 100644 --- a/dev-games/godot/godot-4.2.1.ebuild +++ b/dev-games/godot/godot-4.2.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg +inherit desktop python-any-r1 scons-utils shell-completion toolchain-funcs xdg DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor" HOMEPAGE="https://godotengine.org/" @@ -85,10 +85,13 @@ PATCHES=( src_prepare() { default + # handle slotting sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \ -i misc/dist/linux/org.godotengine.Godot.desktop || die + sed -e "s/godot/&${SLOT}/g" \ + -i misc/dist/shell/{godot.bash-completion,godot.fish,_godot.zsh-completion} || die sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die @@ -228,13 +231,6 @@ src_install() { fi newbashcomp misc/dist/shell/godot.bash-completion ${s} - bashcomp_alias ${s}{,-runner} - - insinto /usr/share/fish/vendor_completions.d - newins misc/dist/shell/godot.fish ${s}.fish - dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish - - insinto /usr/share/zsh/site-functions - newins misc/dist/shell/_godot.zsh-completion _${s} - dosym _${s} /usr/share/zsh/site-functions/_${s}-runner + newfishcomp misc/dist/shell/godot.fish ${s}.fish + newzshcomp misc/dist/shell/_godot.zsh-completion _${s} }