diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /sys-apps/systemd/systemd-9999.ebuild | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'sys-apps/systemd/systemd-9999.ebuild')
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index c167a2fd0b76..201667ade310 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -23,7 +23,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 cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb" +IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" RESTRICT="!test? ( test )" @@ -38,11 +38,15 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) + dns-over-tls? ( + gnutls? ( >=net-libs/gnutls-3.5.3:0= ) + !gnutls? ( >=dev-libs/openssl-1.1.0:0= ) + ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= - ssl? ( >=net-libs/gnutls-3.1.4:0= ) + gnutls? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) @@ -99,6 +103,7 @@ BDEPEND=" >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 + sys-devel/m4 virtual/pkgconfig[${MULTILIB_USEDEP}] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 @@ -110,6 +115,11 @@ BDEPEND=" pkg_pretend() { if [[ ${MERGE_TYPE} != buildonly ]]; then + if use test && has pid-sandbox ${FEATURES}; then + ewarn "Tests are known to fail with PID sandboxing enabled." + ewarn "See https://bugs.gentoo.org/674458." + fi + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS @@ -228,9 +238,9 @@ multilib_src_configure() { -Delfutils=$(meson_multilib_native_use elfutils) -Dgcrypt=$(meson_use gcrypt) -Dgnu-efi=$(meson_multilib_native_use gnuefi) + -Dgnutls=$(meson_multilib_native_use gnutls) -Defi-libdir="${EPREFIX}/usr/$(get_libdir)" -Dmicrohttpd=$(meson_multilib_native_use http) - $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false) -Dimportd=$(meson_multilib_native_use importd) -Dbzip2=$(meson_multilib_native_use importd) -Dzlib=$(meson_multilib_native_use importd) @@ -244,7 +254,6 @@ multilib_src_configure() { -Dqrencode=$(meson_multilib_native_use qrcode) -Dseccomp=$(meson_multilib_native_use seccomp) -Dselinux=$(meson_multilib_native_use selinux) - #-Dtests=$(meson_multilib_native_use test) -Ddbus=$(meson_multilib_native_use test) -Dxkbcommon=$(meson_multilib_native_use xkb) # hardcode a few paths to spare some deps @@ -288,6 +297,15 @@ multilib_src_configure() { ) fi + if multilib_is_native_abi && use dns-over-tls; then + myconf+=( + -Ddns-over-tls=true + -Dopenssl=$(usex !gnutls true false) + ) + else + myconf+=( -Ddns-over-tls=false -Dopenssl=false ) + fi + meson_src_configure "${myconf[@]}" } |