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/Manifest | 4 ++-- sys-fs/udev/udev-248.ebuild | 18 +++++------------- sys-fs/udev/udev-9999.ebuild | 18 +++++------------- 3 files changed, 12 insertions(+), 28 deletions(-) (limited to 'sys-fs/udev') diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 53447609ca45..13d0a2fdcf14 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -6,6 +6,6 @@ DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102 EBUILD udev-245.5-r1.ebuild 5928 BLAKE2B 5fc1655db3633cd1a7459bc05d2065a0878a43e8cf48ac6a5957a71b662f9ddce8dd18c906de8707fdf411378ffe82e71b6217f2d6e8ea0136830718af125af3 SHA512 4450cd68fcebc939de12f641f4404570e48b6cb623a4ccc8536dad9d3ca92534d5d2b44b68fa723baf24446b034193788ca4e32ade975f2e4c7413cea3f99092 EBUILD udev-246-r1.ebuild 5927 BLAKE2B a8830dbfefdb6c12fa7e8d6034bcb9c94b0eb81eee871655e8f57bb3732d693b345588ab6e3f1c211695fdd15e7402bea08ac097c7721998f9625a77ca725430 SHA512 a113458cf68bff8881e0b1c7ff80bc4ff4dbe715dcec7f4f83b264e8f5f0f4c0153a6365ce3e1105d1dbbe8144016d94c1c530397e3ae768f9bc2bb3030428a9 EBUILD udev-247.2.ebuild 5648 BLAKE2B c99ee7449eecca95e92f2178a2b7e0b38fc9d2211b171539af45d28fd407c31012ab0ca4b877392f39d7e42828686661abfff2ca72efe01ca8f0bdf64b6018fb SHA512 98f3bcc0e3a6277685e52e570e4a6f3d279329ad3fbe6dc0bbb33a0ee7fa7491b422878afde0eeab00223567de3126c331df1de83fa30350919f56d1e7bfa75a -EBUILD udev-248.ebuild 5626 BLAKE2B a01e3a54a543dfb4767f20d7ee66b1366b8360d8ed7addd4aec1905ad917d86bdf28eb7d37f146ea552a163d0a395741868df55aaeece9a86f467f4658c803bb SHA512 b9173e54339135bb0150dbf721d22a157478f3e3cdc81b1d6d608f215275e4a718da019fe780c0a876a1e150bbe76ed6487d76c7577b128ead7ac88b950b31cf -EBUILD udev-9999.ebuild 5626 BLAKE2B a01e3a54a543dfb4767f20d7ee66b1366b8360d8ed7addd4aec1905ad917d86bdf28eb7d37f146ea552a163d0a395741868df55aaeece9a86f467f4658c803bb SHA512 b9173e54339135bb0150dbf721d22a157478f3e3cdc81b1d6d608f215275e4a718da019fe780c0a876a1e150bbe76ed6487d76c7577b128ead7ac88b950b31cf +EBUILD udev-248.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2 +EBUILD udev-9999.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d 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 diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 177412dc751e..676b5a0be4e7 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.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