commit:     9750c1ac923f43e8337990ff1b5a6fb156b34019
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Jan  1 00:31:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 01:11:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9750c1ac

net-fs/davfs2: remove pointless no-op USE=split-usr

In bug 884323 it was noted that merged-usr systems get a conflict,
because upstream attempted to install a symlink in /sbin pointing to
/usr/sbin. It was noted in the bug that /sbin isn't needed at all,
despite which the chosen solution was to add IUSE=split-usr and
conditionally create the (useless) symlink.

In version 1.7.0 upstream dropped this entirely, so no symlink is
created either way -- but we still defined the USE flag and invalidated
binpkg changed-use matches. Also we wasted ebuild real estate redefining
the src_install function.

Get rid of this dead weight.

Bug: https://bugs.gentoo.org/884323
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-fs/davfs2/davfs2-1.7.0.ebuild | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/net-fs/davfs2/davfs2-1.7.0.ebuild 
b/net-fs/davfs2/davfs2-1.7.0.ebuild
index 21569512202b..3ac4673512f8 100644
--- a/net-fs/davfs2/davfs2-1.7.0.ebuild
+++ b/net-fs/davfs2/davfs2-1.7.0.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 split-usr"
+IUSE="nls"
 RESTRICT="test"
 
 RDEPEND="dev-libs/libxml2
@@ -42,18 +42,6 @@ src_configure() {
        econf --enable-largefile $(use_enable nls)
 }
 
-src_install() {
-       local ssbindir
-       if use split-usr; then
-               ssbindir=${EPREFIX}/sbin
-       else
-               ssbindir=${EPREFIX}/usr/sbin
-       fi
-
-       emake DESTDIR="${D}" sbindir="${ssbindir}" install
-       einstalldocs
-}
-
 pkg_postinst() {
        elog
        elog "Quick setup:"

Reply via email to