diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index c7c46b6219eea..9b7e3ed5150e0 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -31,6 +31,7 @@
Enable PKCS#11 support for cryptsetup and homed
Use dev-libs/libpwquality for password checking in homed
Enable qrcode output support in journal
+ Enable remote journal access
Install resolvconf symlink for systemd-resolve
Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown
Enable TPM support
diff --git a/sys-apps/systemd/systemd-260.ebuild b/sys-apps/systemd/systemd-260.ebuild
index 8709aa74e8d9e..f8345ade9a406 100644
--- a/sys-apps/systemd/systemd-260.ebuild
+++ b/sys-apps/systemd/systemd-260.ebuild
@@ -34,12 +34,13 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
IUSE="
acl apparmor audit boot bpf cryptsetup curl +dns-over-tls elfutils
- fido2 +gcrypt gnutls homed http idn importd +kernel-install +kmod
- +lz4 lzma +openssl pam passwdqc pcre pkcs11 policykit pwquality qrcode
+ fido2 +gcrypt gnutls homed idn importd +kernel-install +kmod +lz4 lzma
+ +openssl pam passwdqc pcre pkcs11 policykit pwquality qrcode remote
+resolvconf +seccomp selinux sysv-utils test tpm ukify vanilla xkb +zstd
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
+ boot? ( kernel-install )
dns-over-tls? ( openssl )
fido2? ( cryptsetup openssl )
homed? ( cryptsetup pam openssl )
@@ -47,7 +48,7 @@ REQUIRED_USE="
?? ( passwdqc pwquality )
passwdqc? ( homed )
pwquality? ( homed )
- boot? ( kernel-install )
+ remote? ( curl )
ukify? ( boot )
"
RESTRICT="!test? ( test )"
@@ -76,7 +77,7 @@ COMMON_DEPEND="
)
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
gnutls? ( >=net-libs/gnutls-3.6.0:0= )
- http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+ remote? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
idn? ( net-dns/libidn2 )
importd? (
app-arch/bzip2:0=
@@ -332,7 +333,6 @@ multilib_src_configure() {
$(meson_feature fido2 libfido2)
$(meson_feature gcrypt)
$(meson_feature gnutls)
- $(meson_feature http microhttpd)
$(meson_feature homed)
$(meson_use idn)
$(meson_feature importd)
@@ -351,6 +351,8 @@ multilib_src_configure() {
$(meson_feature policykit polkit)
$(meson_feature pwquality)
$(meson_feature qrcode qrencode)
+ $(meson_feature remote)
+ $(meson_feature remote microhttpd)
$(meson_feature seccomp)
$(meson_feature selinux)
$(meson_feature tpm tpm2)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8709aa74e8d9e..f8345ade9a406 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -34,12 +34,13 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
IUSE="
acl apparmor audit boot bpf cryptsetup curl +dns-over-tls elfutils
- fido2 +gcrypt gnutls homed http idn importd +kernel-install +kmod
- +lz4 lzma +openssl pam passwdqc pcre pkcs11 policykit pwquality qrcode
+ fido2 +gcrypt gnutls homed idn importd +kernel-install +kmod +lz4 lzma
+ +openssl pam passwdqc pcre pkcs11 policykit pwquality qrcode remote
+resolvconf +seccomp selinux sysv-utils test tpm ukify vanilla xkb +zstd
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
+ boot? ( kernel-install )
dns-over-tls? ( openssl )
fido2? ( cryptsetup openssl )
homed? ( cryptsetup pam openssl )
@@ -47,7 +48,7 @@ REQUIRED_USE="
?? ( passwdqc pwquality )
passwdqc? ( homed )
pwquality? ( homed )
- boot? ( kernel-install )
+ remote? ( curl )
ukify? ( boot )
"
RESTRICT="!test? ( test )"
@@ -76,7 +77,7 @@ COMMON_DEPEND="
)
gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
gnutls? ( >=net-libs/gnutls-3.6.0:0= )
- http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+ remote? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
idn? ( net-dns/libidn2 )
importd? (
app-arch/bzip2:0=
@@ -332,7 +333,6 @@ multilib_src_configure() {
$(meson_feature fido2 libfido2)
$(meson_feature gcrypt)
$(meson_feature gnutls)
- $(meson_feature http microhttpd)
$(meson_feature homed)
$(meson_use idn)
$(meson_feature importd)
@@ -351,6 +351,8 @@ multilib_src_configure() {
$(meson_feature policykit polkit)
$(meson_feature pwquality)
$(meson_feature qrcode qrencode)
+ $(meson_feature remote)
+ $(meson_feature remote microhttpd)
$(meson_feature seccomp)
$(meson_feature selinux)
$(meson_feature tpm tpm2)