diff options
Diffstat (limited to 'sys-apps/systemd/systemd-9999.ebuild')
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 06bfb8de5b72..5034ed902a78 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -34,16 +34,15 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" IUSE=" acl apparmor audit boot bpf cgroup-hybrid cryptsetup curl +dns-over-tls elfutils - fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod - +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode + fido2 +gcrypt homed http idn importd iptables +kernel-install +kmod + +lz4 lzma pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd " REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - dns-over-tls? ( || ( gnutls openssl ) ) - fido2? ( cryptsetup openssl ) - homed? ( cryptsetup pam openssl ) - importd? ( curl lzma || ( gcrypt openssl ) ) + fido2? ( cryptsetup ) + homed? ( cryptsetup pam ) + importd? ( curl lzma ) pwquality? ( homed ) boot? ( kernel-install ) ukify? ( boot ) @@ -52,6 +51,8 @@ RESTRICT="!test? ( test )" MINKV="4.15" +OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" + COMMON_DEPEND=" >=sys-apps/util-linux-2.32:0=[${MULTILIB_USEDEP}] sys-libs/libcap:0=[${MULTILIB_USEDEP}] @@ -62,13 +63,18 @@ COMMON_DEPEND=" bpf? ( >=dev-libs/libbpf-1.4.0:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( >=net-misc/curl-7.32.0:0= ) + dns-over-tls? ( ${OPENSSL_DEP} ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) - fido2? ( dev-libs/libfido2:0= ) + fido2? ( + ${OPENSSL_DEP} + dev-libs/libfido2:0= + ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - gnutls? ( >=net-libs/gnutls-3.6.0:0= ) + homed? ( ${OPENSSL_DEP} ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( + ${OPENSSL_DEP} app-arch/bzip2:0= sys-libs/zlib:0= ) @@ -76,7 +82,6 @@ COMMON_DEPEND=" lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) iptables? ( net-firewall/iptables:0= ) - openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] ) pkcs11? ( >=app-crypt/p11-kit-0.23.3:0= ) pcre? ( dev-libs/libpcre2 ) @@ -105,6 +110,7 @@ RDEPEND="${COMMON_DEPEND} >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 + acct-group/clock >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 @@ -276,7 +282,7 @@ src_prepare() { if ! use vanilla; then PATCHES+=( - "${FILESDIR}/gentoo-journald-audit-r1.patch" + "${FILESDIR}/gentoo-journald-audit-r2.patch" ) fi @@ -324,7 +330,6 @@ multilib_src_configure() { $(meson_native_use_feature elfutils) $(meson_native_use_feature fido2 libfido2) $(meson_feature gcrypt) - $(meson_native_use_feature gnutls) $(meson_native_use_feature homed) $(meson_native_use_feature http microhttpd) $(meson_native_use_bool idn) @@ -338,7 +343,6 @@ multilib_src_configure() { $(meson_use test tests) $(meson_feature zstd) $(meson_native_use_feature iptables libiptc) - $(meson_native_use_feature openssl) $(meson_feature pam) $(meson_native_use_feature pkcs11 p11kit) $(meson_native_use_feature pcre pcre2) |