diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-12-05 14:41:30 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2022-12-05 14:44:16 -0500 |
| commit | 14c4b791fb76f3846286c0cabe3c62a4514645da (patch) | |
| tree | e49bdf42e486f642e85a09f110f9c5ca104b6ad9 /net-fs | |
| parent | net-fs/davfs2: fix file collision with merged-usr (diff) | |
| download | gentoo-14c4b791fb76f3846286c0cabe3c62a4514645da.tar.gz gentoo-14c4b791fb76f3846286c0cabe3c62a4514645da.tar.bz2 gentoo-14c4b791fb76f3846286c0cabe3c62a4514645da.zip | |
net-fs/davfs2: apply merged-usr fix to stable ebuild
Also revbump to ensure new binpkgs get generated.
Bug: https://bugs.gentoo.org/884323
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/davfs2/davfs2-1.6.0-r1.ebuild (renamed from net-fs/davfs2/davfs2-1.6.0.ebuild) | 13 | ||||
| -rw-r--r-- | net-fs/davfs2/davfs2-1.6.1-r1.ebuild (renamed from net-fs/davfs2/davfs2-1.6.1.ebuild) | 0 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net-fs/davfs2/davfs2-1.6.0.ebuild b/net-fs/davfs2/davfs2-1.6.0-r1.ebuild index 67767035ccb4..fdd0b7931658 100644 --- a/net-fs/davfs2/davfs2-1.6.0.ebuild +++ b/net-fs/davfs2/davfs2-1.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 @@ -45,7 +45,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() { diff --git a/net-fs/davfs2/davfs2-1.6.1.ebuild b/net-fs/davfs2/davfs2-1.6.1-r1.ebuild index 973dc3c12987..973dc3c12987 100644 --- a/net-fs/davfs2/davfs2-1.6.1.ebuild +++ b/net-fs/davfs2/davfs2-1.6.1-r1.ebuild |