From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41D9F15803E for ; Mon, 1 Jan 2024 01:11:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BD722BC027; Mon, 1 Jan 2024 01:11:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AEFF2BC027 for ; Mon, 1 Jan 2024 01:11:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AA6C335DC5 for ; Mon, 1 Jan 2024 01:11:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90B8E12BB for ; Mon, 1 Jan 2024 01:11:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1704071467.9750c1ac923f43e8337990ff1b5a6fb156b34019.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/davfs2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/davfs2/davfs2-1.7.0.ebuild X-VCS-Directories: net-fs/davfs2/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9750c1ac923f43e8337990ff1b5a6fb156b34019 X-VCS-Branch: master Date: Mon, 1 Jan 2024 01:11:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e47d14b-c4b1-4e13-921c-9b6ca8041cbc X-Archives-Hash: 206d0267b4ddef7e1d89c69b3ac0dd06 commit: 9750c1ac923f43e8337990ff1b5a6fb156b34019 Author: Eli Schwartz gmail com> AuthorDate: Mon Jan 1 00:31:12 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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:"