commit:     32688b27cd951855dc351aed45a6f1940397b612
Author:     Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Tue Apr 16 00:19:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:38:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32688b27

net-misc/cadaver: add 0.24

This cherry-picks part of a recent upstream patch that adds support
for neon-0.33.x.

Closes: https://bugs.gentoo.org/925869
Closes: https://bugs.gentoo.org/922112
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://github.com/gentoo/gentoo/pull/36274
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/cadaver/Manifest                          |  1 +
 net-misc/cadaver/cadaver-0.24.ebuild               | 45 ++++++++++++++++++++++
 .../cadaver/files/cadaver-0.24-neon-0.33.patch     | 26 +++++++++++++
 3 files changed, 72 insertions(+)

diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index c63115a8d408..3d3d9b0ed6ce 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1 +1,2 @@
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 
40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb
 SHA512 
48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
+DIST cadaver-0.24.tar.gz 808069 BLAKE2B 
67e2f45a8c78972df9a972b6126e09ffdc8d7067d78bf748ca5c1b987f4138d0f278194c324206df294d77f7e797787edc612942168c6c78adc30f52bb3c996a
 SHA512 
2c0131fd2f591350f6578385eedb353d81d87bae5582b2c8c96555cb51bf31fd15294898206bc7a8307b0e30e7adb1d47535e792cf28c5c1f5c2276bea0141a4

diff --git a/net-misc/cadaver/cadaver-0.24.ebuild 
b/net-misc/cadaver/cadaver-0.24.ebuild
new file mode 100644
index 000000000000..075ca4e70f1a
--- /dev/null
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2003-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Command-line WebDAV client"
+HOMEPAGE="https://notroj.github.io/cadaver/ https://github.com/notroj/cadaver";
+SRC_URI="https://notroj.github.io/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.md THANKS TODO )
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.23.2-disable-nls.patch
+       "${FILESDIR}"/${PN}-0.24-neon-0.33.patch
+)
+
+src_prepare() {
+       default
+
+       rm -r lib/expat || die "rm failed"
+       sed \
+               -e "/AC_CONFIG_FILES/s: neon/src/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" eautoreconf
+}
+
+src_configure() {
+       econf \
+               $(use_enable nls)
+}

diff --git a/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch 
b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch
new file mode 100644
index 000000000000..aad849ab3dd4
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch
@@ -0,0 +1,26 @@
+Trimmed from diffing upstream d0de5ee5276e83ac1b5ff6bde56084a565bff5fb
+to 3c8ecfe9bc8a7fbee58425be69aea89ae3f718e9, which included some
+extraneous bits.
+
+diff --git a/configure.ac b/configure.ac
+index 3ca7151..fbdd034 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ dnl configure script
+ 
+ AC_PREREQ([2.69])
+-AC_INIT([cadaver],[0.24],,,[https://github.com/notroj/cadaver])
++AC_INIT([cadaver],[0.25-dev],,,[https://github.com/notroj/cadaver])
+ 
+ AC_CONFIG_SRCDIR(src/cadaver.c)
+ AC_CONFIG_HEADERS([config.h])
+@@ -35,7 +35,7 @@ AS_HELP_STRING([--disable-netrc],[enable .netrc support]),,
+ 
+ NEON_WITH_LIBS
+ 
+-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32])
++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33])
+ 
+ dnl Don't enable zlib or ACL support in neon
+ NEON_WITHOUT_ZLIB

Reply via email to