commit: bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Sun Dec 4 16:56:47 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Dec 5 19:44:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae0b5e0
net-fs/davfs2: fix file collision with merged-usr Closes: https://bugs.gentoo.org/884323 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> 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 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() {
