commit: 111978f3683fe1f8b695918ab837cb632f6b19d1 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Wed Aug 28 13:53:45 2024 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Wed Aug 28 13:56:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=111978f3
gui-apps/swww: use cargo_target_dir helper Closes: https://bugs.gentoo.org/938503 Closes: https://bugs.gentoo.org/928267 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> gui-apps/swww/metadata.xml | 3 -- .../{swww-0.9.5.ebuild => swww-0.9.5-r1.ebuild} | 45 ++++++++-------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/gui-apps/swww/metadata.xml b/gui-apps/swww/metadata.xml index 0d1a0a536..37d6232a4 100644 --- a/gui-apps/swww/metadata.xml +++ b/gui-apps/swww/metadata.xml @@ -6,7 +6,4 @@ <remote-id type="github">LGFae/swww</remote-id> <bugs-to>https://github.com/LGFae/swww/issues</bugs-to> </upstream> - <use> - <flag name="man">Build and install man pages</flag> - </use> </pkgmetadata> diff --git a/gui-apps/swww/swww-0.9.5.ebuild b/gui-apps/swww/swww-0.9.5-r1.ebuild similarity index 87% rename from gui-apps/swww/swww-0.9.5.ebuild rename to gui-apps/swww/swww-0.9.5-r1.ebuild index 00169d78c..1d9067efc 100644 --- a/gui-apps/swww/swww-0.9.5.ebuild +++ b/gui-apps/swww/swww-0.9.5-r1.ebuild @@ -240,17 +240,15 @@ LICENSE+=" " SLOT="0" KEYWORDS="~amd64" -IUSE="+man" - -IUSE="+man" DEPEND=" - app-arch/lz4 - x11-libs/libxkbcommon[wayland]" + app-arch/lz4:= + x11-libs/libxkbcommon[wayland] +" RDEPEND="${DEPEND}" BDEPEND=" - >=virtual/rust-1.74.0 - man? ( app-text/scdoc ) + app-text/scdoc + >=virtual/rust-1.75.0 " QA_FLAGS_IGNORED=" @@ -258,28 +256,17 @@ QA_FLAGS_IGNORED=" usr/bin/${PN}-daemon " -src_install() { - dodoc README.md CHANGELOG.md - dobashcomp "${WORKDIR}/swww-${PV}/completions/swww.bash" - dofishcomp "${WORKDIR}/swww-${PV}/completions/swww.fish" - - if use man ; then - cd "${WORKDIR}/swww-${PV}/doc/" || die - ./gen.sh || die #generate the man pages - doman "generated/swww.1" - doman "generated/swww-clear.1" - doman "generated/swww-daemon.1" - doman "generated/swww-img.1" - doman "generated/swww-init.1" - doman "generated/swww-kill.1" - doman "generated/swww-query.1" - fi +src_compile() { + cargo_src_compile + ./doc/gen.sh || die # generate man pages +} - if use debug ; then - cd "${WORKDIR}/swww-${PV}/target/debug" || die - else - cd "${WORKDIR}/swww-${PV}/target/release" || die - fi +src_install() { + dobin "$(cargo_target_dir)"/swww{,-daemon} + doman doc/generated/*.1 - dobin swww{,-daemon} + dodoc README.md CHANGELOG.md + newbashcomp completions/swww.bash swww + dofishcomp completions/swww.fish + dozshcomp completions/_swww }
