0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch

0001-net-fs-davfs2-fix-file-collision-with-merged-usr.patch (text/plain), 1.10 KB, created by Alexander Tsoy on 2022-12-04 16:59:07 UTC

From f92318662c1396385ad70254eec96dde0eac1d19 Mon Sep 17 00:00:00 2001
From: Alexander Tsoy <[e-mail]>
Date: Sun, 4 Dec 2022 19:56:47 +0300
Subject: [PATCH] net-fs/davfs2: fix file collision with merged-usr

Closes: https://bugs.gentoo.org/884323
Signed-off-by: Alexander Tsoy <[e-mail]>
---
 net-fs/davfs2/davfs2-1.6.1.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/net-fs/davfs2/davfs2-1.6.1.ebuild b/net-fs/davfs2/davfs2-1.6.1.ebuild
index a00ae2819d9..1f71c429d33 100644
--- a/net-fs/davfs2/davfs2-1.6.1.ebuild
+++ b/net-fs/davfs2/davfs2-1.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="nls"
+IUSE="nls split-usr"
 RESTRICT="test"
 
 RDEPEND="dev-libs/libxml2
@@ -39,7 +39,14 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --enable-largefile $(use_enable nls)
+	local ssbindir
+	if use split-usr; then
+		ssbindir=/sbin
+	else
+		ssbindir=/usr/sbin
+	fi
+
+	ssbindir=${ssbindir} econf --enable-largefile $(use_enable nls)
 }
 
 pkg_postinst() {
-- 
2.37.4