From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1495542-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 3767415802F
	for <garchives@archives.gentoo.org>; Sun, 12 Mar 2023 03:21:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 46D96E07EE;
	Sun, 12 Mar 2023 03:21:33 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1ACA6E07EE
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Mar 2023 03:21:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 6AEA8340E25
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Mar 2023 03:21:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A59118B7
	for <gentoo-commits@lists.gentoo.org>; Sun, 12 Mar 2023 03:21:29 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1678591221.76f59c5570cf541ff06e8704c7844864f5f6a5db.floppym@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.12.0.ebuild sys-fs/fuse/fuse-3.13.1-r1.ebuild sys-fs/fuse/fuse-3.14.0.ebuild
X-VCS-Directories: sys-fs/fuse/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 76f59c5570cf541ff06e8704c7844864f5f6a5db
X-VCS-Branch: master
Date: Sun, 12 Mar 2023 03:21:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6ddfd172-e404-4924-bcca-c27d0477821d
X-Archives-Hash: 78776aec095b18676fb21e4651bcda92

commit:     76f59c5570cf541ff06e8704c7844864f5f6a5db
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 03:20:21 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 03:20:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f59c55

sys-fs/fuse: pass -Dinitscriptdir= to meson setup

We don't want to install the sysv init script anyway, and this prevents
it from being installed outside of EPREFIX.

Closes: https://bugs.gentoo.org/899698
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-fs/fuse/fuse-3.12.0.ebuild    | 2 +-
 sys-fs/fuse/fuse-3.13.1-r1.ebuild | 2 +-
 sys-fs/fuse/fuse-3.14.0.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-fs/fuse/fuse-3.12.0.ebuild b/sys-fs/fuse/fuse-3.12.0.ebuild
index de516e58dd48..dc5ea9f7073f 100644
--- a/sys-fs/fuse/fuse-3.12.0.ebuild
+++ b/sys-fs/fuse/fuse-3.12.0.ebuild
@@ -38,6 +38,7 @@ multilib_src_configure() {
 		$(meson_use test examples)
 		$(meson_use test tests)
 		-Duseroot=false
+		-Dinitscriptdir=
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
 	meson_src_configure
@@ -58,7 +59,6 @@ multilib_src_test() {
 multilib_src_install_all() {
 	# Installed via fuse-common
 	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-	rm -rf "${ED}"/etc || die
 
 	# useroot=false prevents the build system from doing this.
 	use suid && fperms u+s /usr/bin/fusermount3

diff --git a/sys-fs/fuse/fuse-3.13.1-r1.ebuild b/sys-fs/fuse/fuse-3.13.1-r1.ebuild
index 32261573b414..7f4f571e0b4e 100644
--- a/sys-fs/fuse/fuse-3.13.1-r1.ebuild
+++ b/sys-fs/fuse/fuse-3.13.1-r1.ebuild
@@ -45,6 +45,7 @@ multilib_src_configure() {
 		$(meson_use test examples)
 		$(meson_use test tests)
 		-Duseroot=false
+		-Dinitscriptdir=
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
 	meson_src_configure
@@ -65,7 +66,6 @@ multilib_src_test() {
 multilib_src_install_all() {
 	# Installed via fuse-common
 	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-	rm -rf "${ED}"/etc || die
 
 	# useroot=false prevents the build system from doing this.
 	use suid && fperms u+s /usr/bin/fusermount3

diff --git a/sys-fs/fuse/fuse-3.14.0.ebuild b/sys-fs/fuse/fuse-3.14.0.ebuild
index 548762c989b8..2107926ca89f 100644
--- a/sys-fs/fuse/fuse-3.14.0.ebuild
+++ b/sys-fs/fuse/fuse-3.14.0.ebuild
@@ -41,6 +41,7 @@ multilib_src_configure() {
 		$(meson_use test examples)
 		$(meson_use test tests)
 		-Duseroot=false
+		-Dinitscriptdir=
 		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
 	meson_src_configure
@@ -61,7 +62,6 @@ multilib_src_test() {
 multilib_src_install_all() {
 	# Installed via fuse-common
 	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-	rm -rf "${ED}"/etc || die
 
 	# useroot=false prevents the build system from doing this.
 	use suid && fperms u+s /usr/bin/fusermount3