commit: 8dbafb543a184817f1ee41edff917bf87dedf65b Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat May 13 21:03:09 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat May 13 21:03:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbafb54
sys-apps/systemd: add libidn2 support Bug: https://bugs.gentoo.org/618384 Package-Manager: Portage-2.3.5_p32, Repoman-2.3.2_p62 sys-apps/systemd/metadata.xml | 1 + sys-apps/systemd/systemd-9999.ebuild | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml index 9970bd19253..922bac04c72 100644 --- a/sys-apps/systemd/metadata.xml +++ b/sys-apps/systemd/metadata.xml @@ -23,6 +23,7 @@ <flag name="importd">Enable import daemon</flag> <flag name="kdbus">Connect to kernel dbus (KDBUS) instead of userspace dbus if available</flag> <flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag> + <flag name="libidn2">If IDN support is enabled, use <pkg>net-dns/libidn2</pkg> instead of <pkg>net-dns/libidn</pkg></flag> <flag name="lz4">Enable lz4 compression for the journal</flag> <flag name="nat">Enable support for network address translation in networkd</flag> <flag name="qrcode">Enable qrcode output support in journal</flag> diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index a4a556cd32d..4b3f649fd62 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -21,7 +21,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 +lz4 lzma nat pam policykit + idn importd +kmod +libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" REQUIRED_USE="importd? ( curl gcrypt lzma )" @@ -42,7 +42,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}] >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) - idn? ( net-dns/libidn:0= ) + idn? ( + libidn2? ( net-dns/libidn2 ) + !libidn2? ( net-dns/libidn ) + ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= @@ -221,7 +224,6 @@ multilib_src_configure() { -Defi-libdir="/usr/$(get_libdir)" -Dmicrohttpd=$(meson_multilib_native_use http) $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false) - -Dlibidn=$(meson_multilib_native_use idn) -Dimportd=$(meson_multilib_native_use importd) -Dbzip2=$(meson_multilib_native_use importd) -Dzlib=$(meson_multilib_native_use importd) @@ -266,6 +268,18 @@ 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 + set -- meson "${myconf[@]}" "${S}" echo "$@" "$@" || die
