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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C0AB2158020 for ; Mon, 5 Dec 2022 19:44:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC96BE0825; Mon, 5 Dec 2022 19:44:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 D3B50E0825 for ; Mon, 5 Dec 2022 19:44:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4DFD340E8B for ; Mon, 5 Dec 2022 19:44:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D6BB54C for ; Mon, 5 Dec 2022 19:44:19 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1670269456.bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4.floppym@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.6.1.ebuild X-VCS-Directories: net-fs/davfs2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4 X-VCS-Branch: master Date: Mon, 5 Dec 2022 19:44:19 +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: 898ebc01-87a6-4afd-8dd4-372ffc019918 X-Archives-Hash: e44b57141ece368de9a25c38aa0e5e14 commit: bae0b5e05fd63c95f7ed7ad36116da0d2e1ee5f4 Author: Alexander Tsoy tsoy me> AuthorDate: Sun Dec 4 16:56:47 2022 +0000 Commit: Mike Gilbert gentoo 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 tsoy.me> Signed-off-by: Mike Gilbert 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() {