diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2019-07-30 14:18:31 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2019-07-31 10:06:48 -0400 |
| commit | 4157b8d7f8b33c7aa7ee5a2613c4e89bcf1c3ac0 (patch) | |
| tree | f544cbd8b6e67f1680a30eb483d7f2e0964ca7ae /sys-apps | |
| parent | sys-apps/systemd: remove old (diff) | |
| download | gentoo-4157b8d7f8b33c7aa7ee5a2613c4e89bcf1c3ac0.tar.gz gentoo-4157b8d7f8b33c7aa7ee5a2613c4e89bcf1c3ac0.tar.bz2 gentoo-4157b8d7f8b33c7aa7ee5a2613c4e89bcf1c3ac0.zip | |
sys-apps/systemd: simplify libidn dependency
Package-Manager: Portage-2.3.69_p3, Repoman-2.3.16_p12
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index e1f7788216d1..de934f0f3261 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 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 +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 )" @@ -45,10 +45,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}] >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) - idn? ( - libidn2? ( net-dns/libidn2:= ) - !libidn2? ( net-dns/libidn:= ) - ) + idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= @@ -259,6 +256,7 @@ multilib_src_configure() { -Dgnu-efi=$(meson_multilib_native_use gnuefi) -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)" -Dmicrohttpd=$(meson_multilib_native_use http) + -Didn=$(meson_multilib_native_use idn) -Dimportd=$(meson_multilib_native_use importd) -Dbzip2=$(meson_multilib_native_use importd) -Dzlib=$(meson_multilib_native_use importd) @@ -303,18 +301,6 @@ multilib_src_configure() { -Dvconsole=$(meson_multilib) ) - if multilib_is_native_abi && use idn; then - myconf+=( - -Dlibidn2=$(usex libidn2 true false) - -Dlibidn=$(usex libidn2 false true) - ) - else - myconf+=( - -Dlibidn2=false - -Dlibidn=false - ) - fi - meson_src_configure "${myconf[@]}" } |