From 9e68aee0e16e4b361fe06f9566c74b4bb2a22a27 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 May 2023 03:10:45 +0100 Subject: gentoo auto-resync : 27:05:2023 - 03:10:45 --- sys-apps/Manifest.gz | Bin 49480 -> 49481 bytes sys-apps/systemd/Manifest | 4 ++-- sys-apps/systemd/metadata.xml | 1 + sys-apps/systemd/systemd-9999.ebuild | 17 +++++++++-------- 4 files changed, 12 insertions(+), 10 deletions(-) (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index c2867cc86e23..5158e3b4e335 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index bd637946cb9e..ee682bc22901 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -8,5 +8,5 @@ DIST systemd-stable-253.3.tar.gz 11996044 BLAKE2B fdbac11914ea4a3718dd48c19f0dc3 DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a SHA512 cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1 EBUILD systemd-253.3-r1.ebuild 14579 BLAKE2B ec9e31176bad8f142e224369a868b275facb3d3f48e26a9753efd89f40af5c107e70febbbf79fffbefcfe174e258ffae6175e23dde6c3105cec40ec60e5aee7b SHA512 f25ca4b5fbeee20f1137ea9cdf7305a8eb41814ab10946bb3fbacb4bbd9aa5f03fe804119c76e5b4c05abc8b7abb2b5ed9d40dea300b009ca8dab774239b7069 EBUILD systemd-253.4.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af -EBUILD systemd-9999.ebuild 14536 BLAKE2B 87ff5f70255df499849825bf368f6c691ed00119a25ffe10c1e89521b9653be60f7ef66bd5b21d307c9bf5790eab7d757afcf17ef478eb69a7f4673bd69796df SHA512 5760c13575c4ef2dbbf867a20b72d640b3445c714112552725431d82162ba666f96e4ecc09d392af10c2da59ed3a701b59f847b72aa908d5149733548da51bc0 -MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565 +EBUILD systemd-9999.ebuild 14589 BLAKE2B 08cc66c07615cb459d4ba74af969481222e7eb5877e764349135cfcb7c158d9fe6fb56d0efff1478eb1a1a70c792f98c4985a3c75847b680768f22bad389e196 SHA512 45120218205f3071a89cd35c43a719abc9f078531f05776f28824370f74272cb66b20e64c589c4d005c02b9fdbe7635ee43edcd6f750eb6c60c0749e8e26fe12 +MISC metadata.xml 2612 BLAKE2B 60495769a304d0623f73de8eb305770eb93706fdcbea158a2de2beb72e5d04495fc5ef45b4e55d3003a9a70bc3f60a7a5d6880aaac9512647132be69f96112ad SHA512 397f63a498b46647edfb665f92680197607de5edef42c3c17ab96abf94f117d82eda4863bf138329e25880609e8c631e9d154277e8a548eafbe87e8b83e47ccc diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index 34a269d81d85..9576ddd514ee 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -10,6 +10,7 @@ Enable support for sys-process/audit + Enable EFI boot manager and stub loader Default to hybrid (legacy) cgroup hierarchy instead of unified (modern). Enable support for uploading journals Enable cryptsetup tools (includes unit generator for crypttab) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 8c40a935e8a7..6353d8f18ef3 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -35,8 +35,8 @@ HOMEPAGE="http://systemd.io/" LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0/2" IUSE=" - acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils - fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod + acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils + fido2 +gcrypt gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd " @@ -90,7 +90,6 @@ COMMON_DEPEND=" # Newer linux-headers needed by ia64, bug #480218 DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-${MINKV} - gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) " # baselayout-2.2 has /run @@ -162,11 +161,15 @@ BDEPEND=" dev-libs/libxslt:0 $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') + boot? ( $(python_gen_any_dep 'dev-python/pyelftools[${PYTHON_USEDEP}]') ) " python_check_deps() { - python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && - python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" || return + python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" || return + if use boot; then + python_has_version "dev-python/pyelftools[${PYTHON_USEDEP}]" || return + fi } QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" @@ -279,16 +282,14 @@ multilib_src_configure() { $(meson_native_use_bool acl) $(meson_native_use_bool apparmor) $(meson_native_use_bool audit) + $(meson_native_use_bool boot bootloader) $(meson_native_use_bool cryptsetup libcryptsetup) $(meson_native_use_bool curl libcurl) $(meson_native_use_bool dns-over-tls dns-over-tls) $(meson_native_use_bool elfutils) $(meson_native_use_bool fido2 libfido2) $(meson_use gcrypt) - $(meson_native_use_bool gnuefi gnu-efi) $(meson_native_use_bool gnutls) - -Defi-includedir="${ESYSROOT}/usr/include/efi" - -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" $(meson_native_use_bool homed) $(meson_native_use_bool http microhttpd) $(meson_native_use_bool idn) -- cgit v1.2.3