commit: c9c82e2d502a1936be6761fbb259387610409739 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Thu Jul 4 00:47:01 2024 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Jul 9 08:50:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c82e2d
app-misc/zellij: build man page unconditionally with go-md2man Lowdown mangles the man page so go-md2man suits better and generate unconditionally to abide to policy. Additionally install bash completions, desktop icon and add a dependency on curl. With completions generation is better as the versions in the source ball are useless as is. Closes: https://bugs.gentoo.org/914970 Closes: https://github.com/gentoo/gentoo/pull/37415 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> ...ellij-0.40.1.ebuild => zellij-0.40.1-r1.ebuild} | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/app-misc/zellij/zellij-0.40.1.ebuild b/app-misc/zellij/zellij-0.40.1-r1.ebuild similarity index 95% rename from app-misc/zellij/zellij-0.40.1.ebuild rename to app-misc/zellij/zellij-0.40.1-r1.ebuild index e194243b183c..f88f7041ffa7 100644 --- a/app-misc/zellij/zellij-0.40.1.ebuild +++ b/app-misc/zellij/zellij-0.40.1-r1.ebuild @@ -515,7 +515,7 @@ CRATES=" [email protected] " -inherit desktop cargo +inherit cargo desktop shell-completion xdg DESCRIPTION="A terminal workspace with batteries included" HOMEPAGE=" @@ -536,10 +536,13 @@ LICENSE+=" SLOT="0" KEYWORDS="~amd64" -IUSE="doc" +RDEPEND=" + net-misc/curl +" +DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-text/lowdown ) + dev-go/go-md2man " # rust does not use *FLAGS from make.conf, silence portage warning @@ -562,9 +565,11 @@ src_compile() { cargo_src_compile popd 2>/dev/null || die - if use doc; then - lowdown -t man -o ${PN}.1 docs/MANPAGE.md || die - fi + go-md2man -in docs/MANPAGE.md -out ${PN}.1 || die + + "$(cargo_target_dir)"/zellij setup --generate-completion bash > zellij.bash || die + "$(cargo_target_dir)"/zellij setup --generate-completion fish > zellij.fish || die + "$(cargo_target_dir)"/zellij setup --generate-completion zsh > zellij.zsh || die } src_install() { @@ -577,12 +582,12 @@ src_install() { doins -r ${PN}-utils/assets/{layouts,plugins,config,shell} \ ${PN}-utils/assets/*.wasm ${PN}-utils/assets/README.md - use doc && doman ${PN}.1 - domenu assets/zellij.desktop + doman ${PN}.1 - insinto /usr/share/zsh/site-functions - newins ${PN}-utils/assets/completions/comp.zsh _${PN} + domenu assets/zellij.desktop + newicon assets/logo.png zellij.png - insinto /usr/share/fish/vendor_completions.d - newins ${PN}-utils/assets/completions/comp.fish ${PN}.fish + newbashcomp zellij.bash zellij + newfishcomp zellij.fish zellij.fish + newzshcomp zellij.zsh _zellij }
