From 62ac1ae79c984c818889b9ca197ffb5339204f78 Mon Sep 17 00:00:00 2001
From: Alexander Miroshnichenko <alex@millerson.name>
Date: Sat, 19 Jun 2021 14:45:44 +0300
Subject: [PATCH] sys-fs/stratisd: update ebuild

---
 sys-fs/stratisd/Manifest              |  2 +-
 sys-fs/stratisd/stratisd-2.4.2.ebuild | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/sys-fs/stratisd/Manifest b/sys-fs/stratisd/Manifest
index 75ef6a0..38904ec 100644
--- a/sys-fs/stratisd/Manifest
+++ b/sys-fs/stratisd/Manifest
@@ -141,5 +141,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD stratisd-2.4.2.ebuild 5326 BLAKE2B fd1acd6af3169d1f77b830bb1c4eda3bbafc48bd408e7c4fea6e48b587629e7d8273fc31386d9616797dc9db1542863db56e9ad9cc7c0b2ebdf777f5deb2d513 SHA512 1678c3355d6c326eadee7824c057ab306b5d7ab4a9156f80ae89215183c8fb184b767eede7d082663c6b5f1c39d15a587dea1db2cf957db466119b4fd1993d10
+EBUILD stratisd-2.4.2.ebuild 5766 BLAKE2B 3b25e5ceafcecb25846ef76192d474c1873d3d37a5e660db26a1b8b4d4f31aa582e5294de670825a680b3a54a6e2c5dbad1626e552b584ba08aa370676c9f5ed SHA512 d6735a35835d4f510485b7a31a59cea46b91f099f8a23075372396f5423f7cc44e37a73dcdb6c46e0e75ed63395fbde69d9772fefd1fa7bd442622a839a1b175
 MISC metadata.xml 364 BLAKE2B 05556be8a2ea9f74b4592df7eb2038f3baee6c2863129b938540e509c241ede9651e8221dcc9abf13f015af316aafefafcf9e9121034cdaa1d5967b910e67be1 SHA512 ae850f4a01394975342a4e078a1486a179c4155cb262ad89a25073da25823d48989f7cb34673f4c71520f624f8619cb5932bff62b0c912af27ecc71fe8327a52
diff --git a/sys-fs/stratisd/stratisd-2.4.2.ebuild b/sys-fs/stratisd/stratisd-2.4.2.ebuild
index 7bc9bc8..3b1a000 100644
--- a/sys-fs/stratisd/stratisd-2.4.2.ebuild
+++ b/sys-fs/stratisd/stratisd-2.4.2.ebuild
@@ -166,6 +166,7 @@ DEPEND="
 		>=sys-kernel/dracut-051
 		sys-boot/plymouth
 	)
+	systemd? ( sys-apps/systemd )
 	app-crypt/clevis
 	sys-apps/dbus
 	virtual/udev
@@ -200,7 +201,19 @@ src_compile() {
 	    # allow building on musl with dynamic linking support
         # https://github.com/BurntSushi/rust-pcre2/issues/7
         use elibc_musl && export PCRE2_SYS_STATIC=0
-        cargo_src_compile --no-default-features --features dbus_enabled,min$(usex extra ",extras" "")$(usex systemd ",systemd_compat" "")
+        #export RUSTFLAGS="-D warnings -D future-incompatible -D unused -D bare-trait-objects -D ellipsis-inclusive-range-patterns"
+
+		# Compile main daemon
+		cargo_src_compile --bin=stratisd --no-default-features --features dbus_enabled,min
+
+		if use dracut;then
+			# Compile min binaries
+			cargo_src_compile --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features min,systemd_compat
+		fi
+
+		if use extra;then
+			cargo_src_compile --bin=stratis_dumpmetadata --no-default-features --features extras,min
+		fi
 }
 
 src_install() {
@@ -212,22 +225,23 @@ src_install() {
 	
 	udev_dorules ${S}/udev/61-stratisd.rules
 	
-	dobin  ${S}/target/release/stratis-min
-
 	exeinto "$(get_udevdir)"
 	newexe ${S}/target/release/stratis-utils stratis-str-cmp
 
 	dosym "$(get_udevdir)"/stratis-str-cmp "$(get_udevdir)"/stratis-base32-decode
 	dosym "$(get_udevdir)"/stratis-str-cmp "${EPREFIX}"/bin/stratis-predict-usage
 
-	exeinto /usr/libexec
-	doexe ${S}/target/release/stratisd ${S}/target/release/stratisd-min
 
 	if use extra; then
 		dobin ${S}/target/release/stratis_dumpmetadata
 	fi
 	
 	if use dracut; then
+		dobin  ${S}/target/release/stratis-min
+
+		exeinto /usr/libexec
+		doexe ${S}/target/release/stratisd ${S}/target/release/stratisd-min
+
 		insinto /usr/lib/dracut/modules.d/
 		doins -r ${S}/dracut/90stratis
 		doins -r ${S}/dracut/90stratis-clevis