commit:     4bf7b81548f70cbf7ce5ae377e85fd21ae259ce7
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 19:14:59 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 19:15:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf7b815

sys-apps/systemd: add zstd USE flag

Closes: https://bugs.gentoo.org/749023
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/{systemd-246-r1.ebuild => systemd-246-r2.ebuild} | 7 +++++--
 sys-apps/systemd/systemd-9999.ebuild                              | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys-apps/systemd/systemd-246-r1.ebuild 
b/sys-apps/systemd/systemd-246-r2.ebuild
similarity index 98%
rename from sys-apps/systemd/systemd-246-r1.ebuild
rename to sys-apps/systemd/systemd-246-r2.ebuild
index 757d69867be..18454dd4d57 100644
--- a/sys-apps/systemd/systemd-246-r1.ebuild
+++ b/sys-apps/systemd/systemd-246-r2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls 
elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam 
pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux 
split-usr static-libs +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls 
elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam 
pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux 
split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
        homed? ( cryptsetup )
@@ -72,7 +72,9 @@ 
COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        repart? ( ${OPENSSL_DEP} )
        seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
        selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+       zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
 
 # Newer linux-headers needed by ia64, bug #480218
 DEPEND="${COMMON_DEPEND}
@@ -281,6 +283,7 @@ multilib_src_configure() {
                -Dkmod=$(meson_multilib_native_use kmod)
                -Dlz4=$(meson_use lz4)
                -Dxz=$(meson_use lzma)
+               -Dzstd=$(meson_use zstd)
                -Dlibiptc=$(meson_multilib_native_use nat)
                -Dpam=$(meson_use pam)
                -Dp11kit=$(meson_multilib_native_use pkcs11)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index e762aa1e400..3cca3239a60 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls 
elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam 
pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux 
split-usr static-libs +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls 
elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam 
pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux 
split-usr static-libs +sysv-utils test vanilla xkb +zstd"
 
 REQUIRED_USE="
        homed? ( cryptsetup )
@@ -72,7 +72,9 @@ 
COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        repart? ( ${OPENSSL_DEP} )
        seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
        selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+       zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
 
 # Newer linux-headers needed by ia64, bug #480218
 DEPEND="${COMMON_DEPEND}
@@ -281,6 +283,7 @@ multilib_src_configure() {
                -Dkmod=$(meson_multilib_native_use kmod)
                -Dlz4=$(meson_use lz4)
                -Dxz=$(meson_use lzma)
+               -Dzstd=$(meson_use zstd)
                -Dlibiptc=$(meson_multilib_native_use nat)
                -Dpam=$(meson_use pam)
                -Dp11kit=$(meson_multilib_native_use pkcs11)

Reply via email to