commit: fed99419996b7319286dba751fc576e8cbe9de5f Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Mon Jan 1 00:37:34 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=fed99419
net-fs/davfs2: remove questionable 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, indicating they don't think it's a terribly good idea either. Take this opportunity to revert everything and go install exclusively to /usr/sbin, which should have been the original solution all along. Bug: https://bugs.gentoo.org/884323 Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> ...vfs2-1.6.1-r1.ebuild => davfs2-1.6.0-r2.ebuild} | 31 +++++++++++----------- ...vfs2-1.6.1-r1.ebuild => davfs2-1.6.1-r2.ebuild} | 13 +++------ 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/net-fs/davfs2/davfs2-1.6.1-r1.ebuild b/net-fs/davfs2/davfs2-1.6.0-r2.ebuild similarity index 75% copy from net-fs/davfs2/davfs2-1.6.1-r1.ebuild copy to net-fs/davfs2/davfs2-1.6.0-r2.ebuild index 973dc3c12987..3414aa6a5cd8 100644 --- a/net-fs/davfs2/davfs2-1.6.1-r1.ebuild +++ b/net-fs/davfs2/davfs2-1.6.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 inherit autotools @@ -12,19 +12,25 @@ 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 - acct-group/davfs2 - acct-user/davfs2 - net-libs/neon:= + net-libs/neon sys-libs/zlib nls? ( virtual/libintl virtual/libiconv ) " -BDEPEND=" +DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) " +RDEPEND="${RDEPEND} + acct-group/davfs2 + acct-user/davfs2 +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-neon-0.32-support.patch +) src_prepare() { local f @@ -32,21 +38,14 @@ src_prepare() { # Let the package manager handle man page compression while IFS="" read -d $'\0' -r f ; do sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die - done < <(find "${S}"/man -type f -name 'Makefile.am' -print0) + done < <(find "${S}"/man -type f -name 'Makefile.in' -print0) default eautoreconf } src_configure() { - local ssbindir - if use split-usr; then - ssbindir=${EPREFIX}/sbin - else - ssbindir=${EPREFIX}/usr/sbin - fi - - econf --enable-largefile $(use_enable nls) ssbindir="${ssbindir}" + econf --enable-largefile $(use_enable nls) ssbindir="${EPREFIX}/usr/sbin" } pkg_postinst() { diff --git a/net-fs/davfs2/davfs2-1.6.1-r1.ebuild b/net-fs/davfs2/davfs2-1.6.1-r2.ebuild similarity index 82% rename from net-fs/davfs2/davfs2-1.6.1-r1.ebuild rename to net-fs/davfs2/davfs2-1.6.1-r2.ebuild index 973dc3c12987..27aa924e32d7 100644 --- a/net-fs/davfs2/davfs2-1.6.1-r1.ebuild +++ b/net-fs/davfs2/davfs2-1.6.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 @@ -39,14 +39,7 @@ src_prepare() { } src_configure() { - local ssbindir - if use split-usr; then - ssbindir=${EPREFIX}/sbin - else - ssbindir=${EPREFIX}/usr/sbin - fi - - econf --enable-largefile $(use_enable nls) ssbindir="${ssbindir}" + econf --enable-largefile $(use_enable nls) ssbindir="${EPREFIX}/usr/sbin" } pkg_postinst() {
