public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/davfs2/
Date: Mon,  1 Jan 2024 01:11:22 +0000 (UTC)	[thread overview]
Message-ID: <1704071467.9750c1ac923f43e8337990ff1b5a6fb156b34019.sam@gentoo> (raw)

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	other threads:[~2024-01-01  1:11 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-01  1:11 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-10  9:02 [gentoo-commits] repo/gentoo:master commit in: net-fs/davfs2/ Sam James
2025-05-08 14:05 Arthur Zamarin
2025-05-08  8:34 Sam James
2024-11-14  4:59 Jakov Smolić
2024-11-13  3:50 Sam James
2024-11-12 21:34 Sam James
2024-04-20 10:11 Amy Liffey
2024-04-20 10:11 Amy Liffey
2024-02-28  2:32 Ionen Wolkens
2024-02-12 13:05 Sam James
2024-02-12 13:05 Sam James
2024-01-01  1:11 Sam James
2023-01-30  7:29 Göktürk Yüksek
2022-12-05 19:44 Mike Gilbert
2022-12-05 19:44 Mike Gilbert
2022-10-18  2:28 Sam James
2022-02-13  5:52 Göktürk Yüksek
2021-02-01 13:30 Sam James
2021-01-30 14:30 Sam James
2021-01-30 14:29 Sam James
2020-11-25  2:29 Göktürk Yüksek
2020-09-29 22:15 Sam James
2020-07-20 13:01 Joonas Niilola
2020-07-20 13:01 Joonas Niilola
2020-07-20 13:01 Joonas Niilola
2020-05-06  1:27 Göktürk Yüksek
2020-01-28  2:32 Göktürk Yüksek
2019-03-13  0:42 Göktürk Yüksek
2019-03-13  0:42 Göktürk Yüksek
2018-03-14 21:09 Markus Meier
2017-01-21 21:00 Göktürk Yüksek
2017-01-19 11:34 Agostino Sarubbo
2017-01-19 11:25 Agostino Sarubbo
2016-05-22 17:09 Göktürk Yüksek
2016-05-17  5:48 Ian Delaney
2016-04-23 18:13 Patrice Clement
2016-04-23  7:59 Patrice Clement
2016-01-27  9:05 Patrice Clement
2015-12-15 19:54 Amy Winston
2015-12-07 11:40 Agostino Sarubbo
2015-12-03 13:28 Agostino Sarubbo
2015-11-30  9:17 Agostino Sarubbo
2015-10-16 10:40 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1704071467.9750c1ac923f43e8337990ff1b5a6fb156b34019.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox