[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/leftwm/

["Remigiusz Micielski" <remigiusz.micielski@gmail.com>]

commit:     2fb3e59beb173c21a82b8ccef5d4249ef81b7f4b
Author:     Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Mon Aug 14 12:24:57 2023 +0000
Commit:     Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> com>
CommitDate: Mon Aug 14 12:25:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2fb3e59b

x11-wm/leftwm: update LICENSE, move src_compile to src_configure

Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>

 x11-wm/leftwm/leftwm-0.4.2.ebuild | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/x11-wm/leftwm/leftwm-0.4.2.ebuild b/x11-wm/leftwm/leftwm-0.4.2.ebuild
index b85ca6a952..e649080855 100644
--- a/x11-wm/leftwm/leftwm-0.4.2.ebuild
+++ b/x11-wm/leftwm/leftwm-0.4.2.ebuild
@@ -178,16 +178,11 @@ SRC_URI="
 	${CARGO_CRATE_URIS}
 "
 
-LICENSE="
-	|| ( Apache-2.0 MIT )
-	|| ( Apache-2.0 MIT )
-	|| ( Apache-2.0 MIT MPL-2.0 )
-	|| ( MIT )
-	|| ( MIT Unlicense )
-	Apache-2.0
-	MIT
-	Unlicense
-	MPL-2.0
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	BSD-2 BSD MPL-2.0 Unicode-DFS-2016 ZLIB
+	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
 KEYWORDS="~amd64"
@@ -202,30 +197,22 @@ RDEPEND="${DEPEND}"
 
 QA_FLAGS_IGNORED="usr/bin/.*"
 
-src_compile() {
+src_configure() {
 	local myfeatures=(
 		$(usev lefthk)
 		$(usex systemd "journald-log" "")
 		$(usex syslog "sys-log" "")
 	)
-	cargo_src_compile --no-default-features
+	cargo_src_configure --no-default-features
 }
 
 src_install() {
 	dodoc README.md CHANGELOG
 	make_desktop_entry leftwm.desktop /usr/share/xsessions/
 
-	if use debug; then
-		cd target/debug || die "Couldn't cd into debug directory"
-	else
-		cd target/release || die "Couldn't cd into release directory"
-	fi
-
-	dobin leftwm{,-worker,-state,-check,-command}
-
-	if use lefthk; then
-		dobin lefthk-worker
-	fi
+	bins="target/$(usex debug debug release)"
+	dobin "${bins}"/leftwm{,-worker,-state,-check,-command}
+	use lefthk && dobin "${bins}"/lefthk-worker
 }
 
 src_test() {