From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A500E13835A for ; Fri, 4 Jun 2021 01:14:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8380E0880; Fri, 4 Jun 2021 01:14:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFD08E0880 for ; Fri, 4 Jun 2021 01:14:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6230340F2E for ; Fri, 4 Jun 2021 01:14:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E714A7AC for ; Fri, 4 Jun 2021 01:14:34 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1622769253.a85e71118da8a3dee180034d15a671878df83065.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/fuse/fuse-3.10.3.ebuild sys-fs/fuse/fuse-3.9.3.ebuild X-VCS-Directories: sys-fs/fuse/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a85e71118da8a3dee180034d15a671878df83065 X-VCS-Branch: master Date: Fri, 4 Jun 2021 01:14:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31a2012a-082a-42a1-a668-14e50ed74666 X-Archives-Hash: 965336a4fb5971a7c8519c99a6ebd3c2 commit: a85e71118da8a3dee180034d15a671878df83065 Author: Matt Turner gentoo org> AuthorDate: Fri May 28 02:06:27 2021 +0000 Commit: Matt Turner gentoo 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 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