From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- sys-fs/udev/udev-248.ebuild | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'sys-fs/udev/udev-248.ebuild') diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild index 177412dc751e..676b5a0be4e7 100644 --- a/sys-fs/udev/udev-248.ebuild +++ b/sys-fs/udev/udev-248.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript +inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript if [[ ${PV} = 9999* ]] ; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" @@ -99,24 +99,16 @@ src_prepare() { default } -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1" ; then - echo true - else - echo false - fi -} - multilib_src_configure() { local emesonargs=( - -Dacl=$(meson_multilib_native_use acl) + $(meson_native_use_bool acl) -Defi=false - -Dkmod=$(meson_multilib_native_use kmod) - -Dselinux=$(meson_multilib_native_use selinux) + $(meson_native_use_bool kmod) + $(meson_native_use_bool selinux) -Dlink-udev-shared=false -Dsplit-usr=true -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dstatic-libudev=$(usex static-libs true false) + $(meson_use static-libs static-libudev) # Prevent automagic deps -Dgcrypt=false -- cgit v1.2.3