[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2024-05-26 Thread Sam James 
commit: 424fee323403a7ddc5aa4b0f8e840804ce76951f
Author: Sam James  gentoo  org>
AuthorDate: Sun May 26 06:00:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 26 06:00:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424fee32

net-misc/cadaver: Stabilize 0.24 ppc64, #932745

Signed-off-by: Sam James  gentoo.org>

 net-misc/cadaver/cadaver-0.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/cadaver/cadaver-0.24.ebuild 
b/net-misc/cadaver/cadaver-0.24.ebuild
index b5ca9de7bf8f..b24b103566e3 100644
--- a/net-misc/cadaver/cadaver-0.24.ebuild
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/cadaver/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 BDEPEND="sys-devel/gettext"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2024-05-25 Thread Joonas Niilola 
commit: 24f63968bd7cd3b01ace8d4803d772469cdcea50
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May 26 05:44:45 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 26 05:44:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f63968

net-misc/cadaver: Stabilize 0.24 amd64, #932745

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/cadaver/cadaver-0.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/cadaver/cadaver-0.24.ebuild 
b/net-misc/cadaver/cadaver-0.24.ebuild
index b9220d4366d2..7cf60fccbf31 100644
--- a/net-misc/cadaver/cadaver-0.24.ebuild
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/cadaver/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls"
 
 BDEPEND="sys-devel/gettext"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2024-05-25 Thread Joonas Niilola 
commit: 4521578ec0097d2c908fc063fe07744842324be3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun May 26 05:45:25 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun May 26 05:45:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4521578e

net-misc/cadaver: Stabilize 0.24 x86, #932745

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/cadaver/cadaver-0.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/cadaver/cadaver-0.24.ebuild 
b/net-misc/cadaver/cadaver-0.24.ebuild
index 7cf60fccbf31..b5ca9de7bf8f 100644
--- a/net-misc/cadaver/cadaver-0.24.ebuild
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/cadaver/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="nls"
 
 BDEPEND="sys-devel/gettext"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/

2024-04-16 Thread Sam James 
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/

2024-04-16 Thread Sam James 
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/, net-misc/cadaver/files/

2024-04-16 Thread Sam James 
commit: c9dbd4fa234c88d579afd19236b3bc999ed36b53
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 16 23:54:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 16 23:54:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9dbd4fa

net-misc/cadaver: fix quoting w/ autoconf-2.72, respect CFLAGS during link

See https://github.com/gentoo/gentoo/pull/36274#issuecomment-2058032256.

Signed-off-by: Sam James  gentoo.org>

 net-misc/cadaver/cadaver-0.24.ebuild   |  2 +
 .../cadaver/files/cadaver-0.24-autoconf-2.72.patch | 63 ++
 .../cadaver/files/cadaver-0.24-link-cflags.patch   | 24 +
 3 files changed, 89 insertions(+)

diff --git a/net-misc/cadaver/cadaver-0.24.ebuild 
b/net-misc/cadaver/cadaver-0.24.ebuild
index 2b63e89112aa..b9220d4366d2 100644
--- a/net-misc/cadaver/cadaver-0.24.ebuild
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -23,6 +23,8 @@ 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
+   "${FILESDIR}"/${PN}-0.24-autoconf-2.72.patch
+   "${FILESDIR}"/${PN}-0.24-link-cflags.patch
 )
 
 src_prepare() {

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
new file mode 100644
index ..addf7f0345a9
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch
@@ -0,0 +1,63 @@
+https://github.com/notroj/cadaver/pull/42
+
+From 4f2ab67be45132ffdd9765d47b8457ca986b6fe3 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
+
+Without this, with autoconf-2.72 at least, we get:
+```
+$ ./configure
+[...]
+checking for pkg-config... /usr/sbin/pkg-config
+checking pkg-config is at least version 0.9.0... yes
+checking for tputs in -lcurses... ./configure: 5319: ac_fn_c_try_link: not 
found
+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,
+   [use_readline=$enableval],
+   [use_readline=yes])  dnl Defaults to ON (if found)
+ 
+-if test "$use_readline" = "yes"; then
+-  AC_CHECK_LIB(curses, tputs, LIBS="$LIBS -lcurses",
+-  AC_CHECK_LIB(ncurses, tputs))
+-  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([readline], [readline])
+ 
+-  AC_SEARCH_LIBS(add_history, history,
+-  AC_DEFINE(HAVE_ADD_HISTORY, 1, [Define if you have the 
add_history function])
++  AC_SEARCH_LIBS([add_history], [history],
++  AC_DEFINE([HAVE_ADD_HISTORY], [1], [Define if you have the 
add_history function])
+   )
+ 
+-  AC_CHECK_HEADERS(history.h readline/history.h readline.h 
readline/readline.h)
++  AC_CHECK_HEADERS([history.h readline/history.h readline.h 
readline/readline.h])
+ 
+   # Check for rl_completion_matches as in readline 4.2
+-  AC_CHECK_FUNCS(rl_completion_matches)
+-  
++  AC_CHECK_FUNCS([rl_completion_matches])
++
+   msg_readline="enabled"
+-else
++], [
+   msg_readline="disabled"
+-fi
+-
+-])
+-
++])])
+

diff --git a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch 
b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch
new file mode 100644
index ..f4e537d6482a
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch
@@ -0,0 +1,24 @@
+From e798c0144d3042cf6139d1ab85d84a8416cf5f00 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Wed, 17 Apr 2024 00:51:57 +0100
+Subject: [PATCH] Makefile.in: include CFLAGS at link-time
+
+GCC's documentation recommends this [0] for e.g. LTO. As a trivial silly
+example, my -fdiagnostics-color=always was stripped out, so a warning
+I got wasn't in colour.
+
+[0] https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
+--- a/Makefile.in
 b/Makefile.in
+@@ -56,7 +56,7 @@ all: $(TARGET)
+ .PHONY: subdirs install clean distclean
+ 
+ $(TARGET): $(ALLOBJS) subdirs
+-  $(CC) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
++  $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
+ 
+ .c.o:
+   $(CC) $(ALL_CFLAGS) -o $@ -c $<
+-- 
+2.44.0
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/

2024-04-16 Thread Sam James 
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/

2024-04-16 Thread Sam James 
commit: b77fa8180d1c13b125e4974d77f0ef4d2598ebfe
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 16 23:39:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 16 23:39:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77fa818

net-misc/cadaver: destabilize 0.24 for ~amd64, ~ppc64, ~x86

Signed-off-by: Sam James  gentoo.org>

 net-misc/cadaver/cadaver-0.24.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.24.ebuild 
b/net-misc/cadaver/cadaver-0.24.ebuild
index 075ca4e70f1a..2b63e89112aa 100644
--- a/net-misc/cadaver/cadaver-0.24.ebuild
+++ b/net-misc/cadaver/cadaver-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2022 Gentoo Authors
+# Copyright 2003-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/cadaver/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls"
 
 BDEPEND="sys-devel/gettext"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/, net-misc/cadaver/files/

2024-04-16 Thread Sam James 
commit: 32688b27cd951855dc351aed45a6f1940397b612
Author: Hank Leininger  korelogic  com>
AuthorDate: Tue Apr 16 00:19:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 16 23:38:33 2024 +
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  korelogic.com>
Closes: https://github.com/gentoo/gentoo/pull/36274
Signed-off-by: Sam James  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 ..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 ..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

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2023-05-04 Thread Jakov Smolić 
commit: 3575a769009ba6d6a6bddf17444193c1fc8ae263
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu May  4 19:01:34 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu May  4 19:01:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3575a769

net-misc/cadaver: Reassign inactive maintainer

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/cadaver/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index a09139478be5..f3445a9a70b0 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -1,14 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   arfrever@gmail.com
-   Arfrever Frehtes Taifersar Arahesis
-   
-   
-   jsmo...@gentoo.org
-   Jakov Smolić
-   
+   

notroj/cadaver

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/, net-misc/cadaver/

2022-02-01 Thread Jakov Smolić 
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/

2022-02-01 Thread Jakov Smolić 
commit: cbded5cd457b259af7522eec17528d6f00fde272
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Feb  1 04:00:00 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb  1 18:10:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbded5cd

net-misc/cadaver: Use EAPI="8"

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Closes: https://github.com/gentoo/gentoo/pull/24036
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild 
b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
index e5bbfcb90334..d26e0bb35464 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="7"
+EAPI="8"
 
 inherit autotools
 
@@ -15,7 +15,7 @@ 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)

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2022-02-01 Thread Jakov Smolić 
commit: cde8d5de155c26fb5d1030c289de68b542145612
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Jan 31 03:00:00 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb  1 18:10:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde8d5de

net-misc/cadaver: Set Jakov Smolić as proxy

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/cadaver/metadata.xml | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index 9bb005e5c177..a09139478be5 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -3,9 +3,13 @@
 

arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis


-   flop...@gentoo.org
-   Mike Gilbert
+   jsmo...@gentoo.org
+   Jakov Smolić

+   
+   notroj/cadaver
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2022-02-01 Thread Jakov Smolić 
commit: 84a920f66a80f5dffe9b99d69737e375197388f5
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Jan 30 10:00:00 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb  1 18:10:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a920f6

net-misc/cadaver: 0.23.3-r1 AMD64 stabilization

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild 
b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
index 106581d1064d..e5bbfcb90334 100644
--- a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2021 Gentoo Authors
+# Copyright 2003-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://webdav.org/cadaver/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 BDEPEND="sys-devel/gettext"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2021-09-27 Thread Sam James 
commit: b4dd8502a9b30982ea746f42e879745d9e87c228
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 28 05:18:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 28 05:18:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4dd8502

net-misc/cadaver: allow building with newer neon

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

Signed-off-by: Sam James  gentoo.org>

 net-misc/cadaver/{cadaver-0.23.3.ebuild => cadaver-0.23.3-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
similarity index 92%
rename from net-misc/cadaver/cadaver-0.23.3.ebuild
rename to net-misc/cadaver/cadaver-0.23.3-r1.ebuild
index 3b5240b2e50..106581d1064 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 BDEPEND="sys-devel/gettext"
-DEPEND=">=net-libs/neon-0.27.0"
+DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2021-04-16 Thread Mike Gilbert 
commit: 04654bed997f32eb0482b64bc47a3655d79e7ec1
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Apr 16 02:00:00 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Apr 16 16:59:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04654bed

net-misc/cadaver: Use EAPI="7".

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index a9288a4027b..3b5240b2e50 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools
 
 DESCRIPTION="Command-line WebDAV client"
-HOMEPAGE="http://webdav.org/cadaver/;
+HOMEPAGE="http://webdav.org/cadaver/ https://github.com/notroj/cadaver;
 SRC_URI="http://webdav.org/cadaver/${P}.tar.gz;
 
 LICENSE="GPL-2"
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="nls"
 
-RDEPEND=">=net-libs/neon-0.27.0"
-DEPEND="${RDEPEND}
-   sys-devel/gettext"
+BDEPEND="sys-devel/gettext"
+DEPEND=">=net-libs/neon-0.27.0"
+RDEPEND="${DEPEND}"
 
 DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO)
 
@@ -31,7 +31,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 "${EPREFIX}/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

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2021-03-09 Thread Lars Wendler 
commit: 49adda165451ef32ed0c7b619650b79d1325f5f9
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Mar  9 00:00:00 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar  9 22:48:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49adda16

net-misc/cadaver: Create config.rpath for newer Autoconf.

Closes: https://bugs.gentoo.org/775092
Closes: https://github.com/gentoo/gentoo/pull/19848
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Lars Wendler  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 3c957659343..a9288a4027b 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -33,6 +33,7 @@ src_prepare() {
sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in 
failed"
cp "${EPREFIX}/usr/share/gettext/po/Makefile.in.in" po || die "cp 
failed"
 
+   config_rpath_update .
AT_M4DIR="m4 m4/neon" eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2020-11-16 Thread Mike Gilbert 
commit: 4c4b194a7b45f44aee3f4dbae055168d36b30dc5
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 05:00:00 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c4b194a

net-misc/cadaver: Fix building with Neon >=0.31.

Closes: https://bugs.gentoo.org/715512
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index e6b4ec10f0a..3c957659343 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 
rm -r lib/{expat,intl,neon} || die "rm failed"
sed \
-   -e "/NE_REQUIRE_VERSIONS/s:29:& 30:" \
+   -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"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2020-07-14 Thread Mike Gilbert 
commit: b2f63173e89037dacacb5e13240a96ca0778e594
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Jul 14 18:49:24 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jul 14 19:05:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f63173

net-misc/cadaver: Avoid -L/usr/lib.

-L/usr/lib breaks building with linker LLD.

Closes: https://bugs.gentoo.org/731284
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index c329d370cd8..e6b4ec10f0a 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -38,6 +38,5 @@ src_prepare() {
 
 src_configure() {
econf \
-   $(use_enable nls) \
-   --with-libs=/usr
+   $(use_enable nls)
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2019-06-18 Thread Mike Gilbert 
commit: 3ff3196b2d293228aff64dd300bd405851aaae3c
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Jun 18 16:05:30 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jun 18 16:10:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff3196b

net-misc/cadaver: Add ${EPREFIX}.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index cbb8805aaa1..c329d370cd8 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -30,8 +30,8 @@ src_prepare() {
-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 /usr/share/gettext/po/Makefile.in.in po || die "cp failed"
+   sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in 
failed"
+   cp "${EPREFIX}/usr/share/gettext/po/Makefile.in.in" po || die "cp 
failed"
 
AT_M4DIR="m4 m4/neon" eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2019-06-18 Thread Mike Gilbert 
commit: 69dbc608e2213a54b525bffaef0d6b04c5335088
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Jun 18 15:26:52 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jun 18 15:59:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69dbc608

net-misc/cadaver: Fix eautoreconf with >=sys-devel/gettext-0.20.

Fixes: https://bugs.gentoo.org/686152
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index edb1d0379d7..cbb8805aaa1 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,8 +26,9 @@ src_prepare() {
 
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 ::" \
+   -e "/NE_REQUIRE_VERSIONS/s:29:& 30:" \
+   -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 /usr/share/gettext/po/Makefile.in.in po || die "cp failed"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2018-12-19 Thread Mike Gilbert 
commit: 3666a6e7902d8dca3a3dc86c8fb03050cebc21b1
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Dec 19 17:47:17 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Dec 19 17:59:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3666a6e7

Revert "net-misc/cadaver: update HOMEPAGE and SRC_URI.".

This reverts commit 0f5d90dae7a92885aa90f7df75470891015563f2.
Homepage works again.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 7b62221093c..edb1d0379d7 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Command-line WebDAV client"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://webdav.org/cadaver/;
+SRC_URI="http://webdav.org/cadaver/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2018-08-05 Thread Patrice Clement 
commit: 0f5d90dae7a92885aa90f7df75470891015563f2
Author: Francesco Turco  fastmail  fm>
AuthorDate: Sat Aug  4 13:31:22 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Aug  5 21:47:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5d90da

net-misc/cadaver: update HOMEPAGE and SRC_URI.

Closes: https://github.com/gentoo/gentoo/pull/9440

 net-misc/cadaver/cadaver-0.23.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index 0401ea0f0ca..7b62221093c 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Command-line WebDAV client"
-HOMEPAGE="http://www.webdav.org/cadaver;
-SRC_URI="http://www.webdav.org/cadaver/${P}.tar.gz;
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/files/, net-misc/cadaver/

2018-01-08 Thread Mike Gilbert 
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