public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Takuya Wakazono" <pastalian46@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/swww/
Date: Wed, 28 Aug 2024 13:59:51 +0000 (UTC)	[thread overview]
Message-ID: <1724853396.111978f3683fe1f8b695918ab837cb632f6b19d1.pastalian46@gentoo> (raw)

commit:     111978f3683fe1f8b695918ab837cb632f6b19d1
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Aug 28 13:53:45 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
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
 }


             reply	other threads:[~2024-08-28 13:59 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-28 13:59 Takuya Wakazono [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-03 17:43 [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/swww/ Philippe-Alexandre Mathieu
2024-11-10 15:34 Viorel Munteanu
2024-08-28 13:59 Takuya Wakazono
2024-05-09 10:04 David Roman
2024-04-13  7:06 Remigiusz Micielski
2024-04-05 10:28 Julien Roy
2024-01-26 16:36 Remigiusz Micielski
2024-01-16 20:15 Remigiusz Micielski
2024-01-16 19:57 Remigiusz Micielski
2023-12-04 18:07 Remigiusz Micielski
2023-12-03  9:47 Remigiusz Micielski
2023-11-26 17:13 Gonçalo Negrier Duarte
2023-11-26 17:09 Gonçalo Negrier Duarte
2023-11-26 17:09 Gonçalo Negrier Duarte
2023-08-29 15:24 Remigiusz Micielski
2023-04-24 12:56 Remigiusz Micielski
2023-04-22 12:01 Remigiusz Micielski
2023-04-22 11:58 Remigiusz Micielski
2023-04-02 11:46 Remigiusz Micielski
2023-03-26 15:37 Remigiusz Micielski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1724853396.111978f3683fe1f8b695918ab837cb632f6b19d1.pastalian46@gentoo \
    --to=pastalian46@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox