[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/
commit: ba4c126af687ad37e09cf102c9e0d4f1399cf433 Author: Sam James gentoo org> AuthorDate: Wed Apr 17 00:02:21 2024 + Commit: Sam James gentoo org> CommitDate: Wed Apr 17 00:02:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4c126a net-misc/cadaver: slightly tweak autoconf-2.72 patch One more instance we should quote for good measure. Signed-off-by: Sam James gentoo.org> net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch index addf7f0345a9..6051c719e36f 100644 --- a/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch +++ b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch @@ -1,6 +1,6 @@ https://github.com/notroj/cadaver/pull/42 -From 4f2ab67be45132ffdd9765d47b8457ca986b6fe3 Mon Sep 17 00:00:00 2001 +From 2eab7a8225b6fc0c6fd4773794abe83561f2d733 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 17 Apr 2024 00:48:11 +0100 Subject: [PATCH] m4: fix quoting in readline.m4 @@ -16,12 +16,6 @@ no checking for tputs in -lncurses... no [...] ``` - m4/readline.m4 | 25 +++-- - 1 file changed, 11 insertions(+), 14 deletions(-) - -diff --git a/m4/readline.m4 b/m4/readline.m4 -index c0ab8af..9d650b9 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -9,24 +9,21 @@ AC_ARG_ENABLE(readline, @@ -34,7 +28,7 @@ index c0ab8af..9d650b9 100644 - AC_CHECK_LIB(readline, readline) +AS_IF([test "$use_readline" = "yes"], [ + AC_CHECK_LIB([curses], [tputs], [LIBS="$LIBS -lcurses"], -+ [AC_CHECK_LIB(ncurses, tputs)]) ++ [AC_CHECK_LIB([ncurses], [tputs])]) + AC_CHECK_LIB([readline], [readline]) - AC_SEARCH_LIBS(add_history, history, @@ -60,4 +54,6 @@ index c0ab8af..9d650b9 100644 -]) - +])]) +-- +2.44.0
[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/
commit: d99c0736502c7e23dd852a61b9c8ea299d711f02 Author: Sam James gentoo org> AuthorDate: Tue Apr 16 23:55:19 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 16 23:55:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99c0736 net-misc/cadaver: add PR link to other patch too Signed-off-by: Sam James gentoo.org> net-misc/cadaver/files/cadaver-0.24-link-cflags.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch index f4e537d6482a..d2e18eefade4 100644 --- a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch +++ b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch @@ -1,3 +1,5 @@ +https://github.com/notroj/cadaver/pull/42 + From e798c0144d3042cf6139d1ab85d84a8416cf5f00 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 17 Apr 2024 00:51:57 +0100
[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/
commit: f693b5749c6e6b42ac428f9fc43e629d45ede5bc Author: Sam James gentoo org> AuthorDate: Tue Apr 16 23:42:42 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 16 23:42:58 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f693b574 net-misc/cadaver: drop version change hunk from neon-0.33 patch We don't want to identify as a newer version as it might affect e.g. --version output. Signed-off-by: Sam James gentoo.org> net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch | 11 --- 1 file changed, 11 deletions(-) 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 index aad849ab3dd4..9b6d1a2dceb7 100644 --- a/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch +++ b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch @@ -2,19 +2,8 @@ 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/, net-misc/cadaver/
commit: 7ec422095cd8eed8561c581f3a8d61d9f32539bc
Author: Jakov Smolić gentoo org>
AuthorDate: Tue Feb 1 18:17:03 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Tue Feb 1 18:17:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec42209
net-misc/cadaver: Update style
Signed-off-by: Jakov Smolić gentoo.org>
net-misc/cadaver/cadaver-0.23.3-r1.ebuild | 13 -
net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch | 4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
index d26e0bb35464..422a87282d65 100644
--- a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 2003-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="8"
+EAPI=8
inherit autotools
@@ -18,11 +18,14 @@ BDEPEND="sys-devel/gettext"
DEPEND=">=net-libs/neon-0.27.0:="
RDEPEND="${DEPEND}"
-DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
+DOCS=( BUGS ChangeLog FAQ NEWS README THANKS TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.23.2-disable-nls.patch
+)
src_prepare() {
- eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
- eapply_user
+ default
rm -r lib/{expat,intl,neon} || die "rm failed"
sed \
@@ -31,7 +34,7 @@ src_prepare() {
-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"
+ cp "${BROOT}"/usr/share/gettext/po/Makefile.in.in po || die "cp failed"
config_rpath_update .
AT_M4DIR="m4 m4/neon" eautoreconf
diff --git a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
index ead3d70553b8..80f029f4f40f 100644
--- a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
+++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
@@ -1,7 +1,7 @@
Fix building with --disable-nls.
/src/cadaver.c
-+++ /src/cadaver.c
+--- a/src/cadaver.c
b/src/cadaver.c
@@ -838,11 +838,11 @@
progname = argv[0];
[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/, net-misc/cadaver/
commit: 9469bb34a761896acd3335f30e26cc8e1550b8ac
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Mon Jan 8 19:19:23 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jan 8 21:29:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9469bb34
net-misc/cadaver: Use EAPI="6".
net-misc/cadaver/cadaver-0.23.3.ebuild | 18 --
.../cadaver/files/cadaver-0.23.2-disable-nls.patch | 8
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 89897109b85..0401ea0f0ca 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="3"
+EAPI="6"
-inherit autotools eutils
+inherit autotools
DESCRIPTION="Command-line WebDAV client"
HOMEPAGE="http://www.webdav.org/cadaver;
@@ -18,10 +18,13 @@ RDEPEND=">=net-libs/neon-0.27.0"
DEPEND="${RDEPEND}
sys-devel/gettext"
+DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
+ eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch"
+ eapply_user
- rm -fr lib/{expat,intl,neon}
+ rm -r lib/{expat,intl,neon} || die "rm failed"
sed \
-e "/NE_REQUIRE_VERSIONS/s/29/& 30/" \
-e "s:lib/neon/Makefile lib/intl/Makefile ::" \
@@ -37,8 +40,3 @@ src_configure() {
$(use_enable nls) \
--with-libs=/usr
}
-
-src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc BUGS ChangeLog FAQ NEWS README THANKS TODO
-}
diff --git a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
index 6610d479b30..ead3d70553b 100644
--- a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
+++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
@@ -1,12 +1,12 @@
Fix building with --disable-nls.
src/cadaver.c.~1~ 2007-08-22 14:17:27.0 +0200
-+++ src/cadaver.c 2008-03-29 08:58:57.248793293 +0100
-@@ -838,11 +838,12 @@
+
+--- /src/cadaver.c
/src/cadaver.c
+@@ -838,11 +838,11 @@
progname = argv[0];
+#ifdef ENABLE_NLS
-+
#ifdef HAVE_SETLOCALE
setlocale(LC_ALL, "");
#endif
