commit: 7ec422095cd8eed8561c581f3a8d61d9f32539bc
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 1 18:17:03 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Feb 1 18:17:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec42209
net-misc/cadaver: Update style
Signed-off-by: Jakov Smolić <jsmolic <AT> 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];
