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

Reply via email to