commit: a85e71118da8a3dee180034d15a671878df83065
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 02:06:27 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 01:14:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85e7111
sys-fs/fuse: Switch to meson-multilib
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-fs/fuse/fuse-3.10.3.ebuild | 14 ++------------
sys-fs/fuse/fuse-3.9.3.ebuild | 14 ++------------
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index 0d221326b6f..4621e41834f 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit meson multilib-minimal udev python-any-r1
+inherit meson-multilib udev python-any-r1
DESCRIPTION="An interface for filesystems implemented in userspace"
HOMEPAGE="https://github.com/libfuse/libfuse";
@@ -35,17 +35,13 @@ pkg_setup() {
multilib_src_configure() {
local emesonargs=(
- -Dexamples=$(usex test true false)
+ $(meson_use test examples)
-Duseroot=false
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
)
meson_src_configure
}
-multilib_src_compile() {
- eninja
-}
-
src_test() {
if [[ ${EUID} != 0 ]]; then
ewarn "Running as non-root user, skipping tests"
@@ -60,13 +56,7 @@ multilib_src_test() {
${EPYTHON} -m pytest test || die
}
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
-
multilib_src_install_all() {
- einstalldocs
-
# installed via fuse-common
rm -r "${ED}"/{etc,$(get_udevdir)} || die
diff --git a/sys-fs/fuse/fuse-3.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild
index 5e10d166e38..e5d07d2d969 100644
--- a/sys-fs/fuse/fuse-3.9.3.ebuild
+++ b/sys-fs/fuse/fuse-3.9.3.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8} )
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
+inherit meson-multilib flag-o-matic udev python-any-r1
DESCRIPTION="An interface for filesystems implemented in userspace"
HOMEPAGE="https://github.com/libfuse/libfuse";
@@ -42,17 +42,13 @@ src_prepare() {
multilib_src_configure() {
local emesonargs=(
- -Dexamples=$(usex test true false)
+ $(meson_use test examples)
-Duseroot=false
-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
)
meson_src_configure
}
-multilib_src_compile() {
- eninja
-}
-
src_test() {
if [[ ${EUID} != 0 ]]; then
ewarn "Running as non-root user, skipping tests"
@@ -67,13 +63,7 @@ multilib_src_test() {
${EPYTHON} -m pytest test || die
}
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
-
multilib_src_install_all() {
- einstalldocs
-
# installed via fuse-common
rm -r "${ED}"/{etc,$(get_udevdir)} || die
