[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
[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];
