From b4dd8502a9b30982ea746f42e879745d9e87c228 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 28 Sep 2021 06:18:23 +0100
Subject: net-misc/cadaver: allow building with newer neon

Tries to use an internal/bundled (removed) copy and fails
otherwise.

Signed-off-by: Sam James <sam@gentoo.org>
---
 net-misc/cadaver/cadaver-0.23.3-r1.ebuild | 43 +++++++++++++++++++++++++++++++
 net-misc/cadaver/cadaver-0.23.3.ebuild    | 43 -------------------------------
 2 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 net-misc/cadaver/cadaver-0.23.3-r1.ebuild
 delete mode 100644 net-misc/cadaver/cadaver-0.23.3.ebuild

(limited to 'net-misc')

diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
new file mode 100644
index 000000000000..106581d1064d
--- /dev/null
+++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="Command-line WebDAV client"
+HOMEPAGE="http://webdav.org/cadaver/ https://github.com/notroj/cadaver"
+SRC_URI="http://webdav.org/cadaver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+IUSE="nls"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="<net-libs/neon-0.33.0:="
+RDEPEND="${DEPEND}"
+
+DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
+	eapply_user
+
+	rm -r lib/{expat,intl,neon} || die "rm failed"
+	sed \
+		-e "/NE_REQUIRE_VERSIONS/s:29:& 30 31 32:" \
+		-e "/AM_GNU_GETTEXT/s:no-libtool:external:" \
+		-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \
+		-i configure.ac || die "sed configure.ac failed"
+	sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed"
+	cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed"
+
+	config_rpath_update .
+	AT_M4DIR="m4 m4/neon" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
deleted file mode 100644
index 3b5240b2e504..000000000000
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2003-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="Command-line WebDAV client"
-HOMEPAGE="http://webdav.org/cadaver/ https://github.com/notroj/cadaver"
-SRC_URI="http://webdav.org/cadaver/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
-IUSE="nls"
-
-BDEPEND="sys-devel/gettext"
-DEPEND=">=net-libs/neon-0.27.0"
-RDEPEND="${DEPEND}"
-
-DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
-	eapply_user
-
-	rm -r lib/{expat,intl,neon} || die "rm failed"
-	sed \
-		-e "/NE_REQUIRE_VERSIONS/s:29:& 30 31:" \
-		-e "/AM_GNU_GETTEXT/s:no-libtool:external:" \
-		-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \
-		-i configure.ac || die "sed configure.ac failed"
-	sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed"
-	cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed"
-
-	config_rpath_update .
-	AT_M4DIR="m4 m4/neon" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls)
-}
-- 
cgit v1.2.3-65-gdbad