From: Mike Gilbert Date: Thu, 2 Apr 2020 16:53:40 +0000 (-0400) Subject: sys-apps/systemd: add 'homed' and 'repart' USE flags X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1fd5e297e071a753c93813d8e31d2cf2998ff933;p=gentoo.git sys-apps/systemd: add 'homed' and 'repart' USE flags Fixes automagic dep on dev-libs/openssl. Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 Signed-off-by: Mike Gilbert --- diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index fdbbc809fd18..336245a670ab 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -18,6 +18,7 @@ Enable EFI boot manager and stub loader (built using sys-boot/gnu-efi) Enable coredump stacktraces in the journal Enable sealing of journal files using gcrypt + Enable portable home directories Enable embedded HTTP server in journald Enable import daemon Enable kernel module loading via sys-apps/kmod @@ -25,6 +26,7 @@ Enable support for network address translation in networkd Enable PKCS#11 support for cryptsetup and homed Enable password quality checking in homed + Enable support for growing/adding partitions Enable qrcode output support in journal Install resolvconf symlink for systemd-resolve Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown diff --git a/sys-apps/systemd/systemd-245.ebuild b/sys-apps/systemd/systemd-245-r1.ebuild similarity index 96% rename from sys-apps/systemd/systemd-245.ebuild rename to sys-apps/systemd/systemd-245-r1.ebuild index 0b39a8aceb4b..685eef777e0f 100644 --- a/sys-apps/systemd/systemd-245.ebuild +++ b/sys-apps/systemd/systemd-245-r1.ebuild @@ -28,13 +28,18 @@ 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 http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +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 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" -REQUIRED_USE="importd? ( curl gcrypt lzma )" +REQUIRED_USE=" + homed? ( cryptsetup ) + importd? ( curl gcrypt lzma ) +" RESTRICT="!test? ( test )" MINKV="3.11" +OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" + COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] sys-libs/libcap:0=[${MULTILIB_USEDEP}] acl? ( sys-apps/acl:0= ) @@ -45,6 +50,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + homed? ( ${OPENSSL_DEP} ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= @@ -63,6 +69,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) + repart? ( ${OPENSSL_DEP} ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" @@ -267,6 +274,7 @@ multilib_src_configure() { -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + -Dhomed=$(meson_multilib_native_use homed) -Dmicrohttpd=$(meson_multilib_native_use http) -Didn=$(meson_multilib_native_use idn) -Dimportd=$(meson_multilib_native_use importd) @@ -282,6 +290,7 @@ multilib_src_configure() { -Dpolkit=$(meson_multilib_native_use policykit) -Dpwquality=$(meson_multilib_native_use pwquality) -Dqrencode=$(meson_multilib_native_use qrcode) + -Drepart=$(meson_multilib_native_use repart) -Dseccomp=$(meson_multilib_native_use seccomp) -Dselinux=$(meson_multilib_native_use selinux) -Ddbus=$(meson_multilib_native_use test) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 6454de6e1695..07b2f6f009a9 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -28,13 +28,18 @@ 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 http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +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 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" -REQUIRED_USE="importd? ( curl gcrypt lzma )" +REQUIRED_USE=" + homed? ( cryptsetup ) + importd? ( curl gcrypt lzma ) +" RESTRICT="!test? ( test )" MINKV="3.11" +OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0=" + COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] sys-libs/libcap:0=[${MULTILIB_USEDEP}] acl? ( sys-apps/acl:0= ) @@ -45,6 +50,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + homed? ( ${OPENSSL_DEP} ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= @@ -63,6 +69,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) + repart? ( ${OPENSSL_DEP} ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )" @@ -266,6 +273,7 @@ multilib_src_configure() { -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" + -Dhomed=$(meson_multilib_native_use homed) -Dmicrohttpd=$(meson_multilib_native_use http) -Didn=$(meson_multilib_native_use idn) -Dimportd=$(meson_multilib_native_use importd) @@ -281,6 +289,7 @@ multilib_src_configure() { -Dpolkit=$(meson_multilib_native_use policykit) -Dpwquality=$(meson_multilib_native_use pwquality) -Dqrencode=$(meson_multilib_native_use qrcode) + -Drepart=$(meson_multilib_native_use repart) -Dseccomp=$(meson_multilib_native_use seccomp) -Dselinux=$(meson_multilib_native_use selinux) -Ddbus=$(meson_multilib_native_use test)