diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-03-26 12:57:03 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-03-26 13:16:59 -0400 |
| commit | 3900b54eb143ddb745570b10bd769b388721c797 (patch) | |
| tree | f7d7637060bacf3693a2b91be842f419ff4bba3a /dev-games | |
| parent | dev-games/godot: drop 4.0.4, 4.1.3 (diff) | |
| download | gentoo-3900b54eb143ddb745570b10bd769b388721c797.tar.gz gentoo-3900b54eb143ddb745570b10bd769b388721c797.tar.bz2 gentoo-3900b54eb143ddb745570b10bd769b388721c797.zip | |
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 <ionen@gentoo.org>
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/godot/godot-3.5.3.ebuild | 18 | ||||
| -rw-r--r-- | 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} } |