commit: e289ab974a20fc99f06b98cad5ff50cae81458fc Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Jul 10 17:37:13 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Jul 10 17:58:02 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e289ab97
sys-apps/systemd: simplify gnutls handling Drop gnutls USE flag. Instead, depend on gnutls whenever dns-over-tls or http is enabled. This also drops support for using openssl for dns-over-tls. Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/systemd-242-r5.ebuild | 20 ++++---------------- sys-apps/systemd/systemd-9999.ebuild | 20 ++++---------------- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/sys-apps/systemd/systemd-242-r5.ebuild b/sys-apps/systemd/systemd-242-r5.ebuild index 50b6ad640b2..ec26fa49f50 100644 --- a/sys-apps/systemd/systemd-242-r5.ebuild +++ b/sys-apps/systemd/systemd-242-r5.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 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" +IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi 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,15 +38,12 @@ 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= ) - ) + 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}] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= - gnutls? ( >=net-libs/gnutls-3.1.4:0= ) + >=net-libs/gnutls-3.1.4:0= ) idn? ( libidn2? ( net-dns/libidn2:= ) @@ -242,10 +239,10 @@ multilib_src_configure() { -Daudit=$(meson_multilib_native_use audit) -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup) -Dlibcurl=$(meson_multilib_native_use curl) + -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls) -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) -Dimportd=$(meson_multilib_native_use importd) @@ -304,15 +301,6 @@ 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[@]}" } diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index a3857fb1866..96e41bb6865 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 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" +IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi 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,15 +38,12 @@ 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= ) - ) + 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}] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= - gnutls? ( >=net-libs/gnutls-3.1.4:0= ) + >=net-libs/gnutls-3.1.4:0= ) idn? ( libidn2? ( net-dns/libidn2:= ) @@ -236,10 +233,10 @@ multilib_src_configure() { -Daudit=$(meson_multilib_native_use audit) -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup) -Dlibcurl=$(meson_multilib_native_use curl) + -Ddns-over-tls=$(meson_multilib_native_use dns-over-tls) -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) -Dimportd=$(meson_multilib_native_use importd) @@ -298,15 +295,6 @@ 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[@]}" }
