summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorAlexander Tsoy <alexander@tsoy.me>2022-12-04 19:56:47 +0300
committerMike Gilbert <floppym@gentoo.org>2022-12-05 14:44:16 -0500
commitbae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4 (patch)
tree4b244511297deaef1cdd04da6651e02d66d2ff16 /net-fs
parentdev-vcs/stgit: Keyword 2.0.3 x86, #882437 (diff)
downloadgentoo-bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4.tar.gz
gentoo-bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4.tar.bz2
gentoo-bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4.zip
net-fs/davfs2: fix file collision with merged-usr
Closes: https://bugs.gentoo.org/884323 Signed-off-by: Alexander Tsoy <alexander@tsoy.me> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/davfs2/davfs2-1.6.1.ebuild11
1 files 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 a00ae2819d90..973dc3c12987 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=${EPREFIX}/sbin
+ else
+ ssbindir=${EPREFIX}/usr/sbin
+ fi
+
+ econf --enable-largefile $(use_enable nls) ssbindir="${ssbindir}"
}
pkg_postinst() {