| 1 |
commit: 7ec422095cd8eed8561c581f3a8d61d9f32539bc |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 1 18:17:03 2022 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 1 18:17:03 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec42209 |
| 7 |
|
| 8 |
net-misc/cadaver: Update style |
| 9 |
|
| 10 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/cadaver/cadaver-0.23.3-r1.ebuild | 13 ++++++++----- |
| 13 |
net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch | 4 ++-- |
| 14 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild |
| 17 |
index d26e0bb35464..422a87282d65 100644 |
| 18 |
--- a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild |
| 19 |
+++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
# Copyright 2003-2022 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="8" |
| 25 |
+EAPI=8 |
| 26 |
|
| 27 |
inherit autotools |
| 28 |
|
| 29 |
@@ -18,11 +18,14 @@ BDEPEND="sys-devel/gettext" |
| 30 |
DEPEND=">=net-libs/neon-0.27.0:=" |
| 31 |
RDEPEND="${DEPEND}" |
| 32 |
|
| 33 |
-DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO) |
| 34 |
+DOCS=( BUGS ChangeLog FAQ NEWS README THANKS TODO ) |
| 35 |
+ |
| 36 |
+PATCHES=( |
| 37 |
+ "${FILESDIR}"/${PN}-0.23.2-disable-nls.patch |
| 38 |
+) |
| 39 |
|
| 40 |
src_prepare() { |
| 41 |
- eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch" |
| 42 |
- eapply_user |
| 43 |
+ default |
| 44 |
|
| 45 |
rm -r lib/{expat,intl,neon} || die "rm failed" |
| 46 |
sed \ |
| 47 |
@@ -31,7 +34,7 @@ src_prepare() { |
| 48 |
-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \ |
| 49 |
-i configure.ac || die "sed configure.ac failed" |
| 50 |
sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed" |
| 51 |
- cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed" |
| 52 |
+ cp "${BROOT}"/usr/share/gettext/po/Makefile.in.in po || die "cp failed" |
| 53 |
|
| 54 |
config_rpath_update . |
| 55 |
AT_M4DIR="m4 m4/neon" eautoreconf |
| 56 |
|
| 57 |
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 |
| 58 |
index ead3d70553b8..80f029f4f40f 100644 |
| 59 |
--- a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch |
| 60 |
+++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch |
| 61 |
@@ -1,7 +1,7 @@ |
| 62 |
Fix building with --disable-nls. |
| 63 |
|
| 64 |
---- /src/cadaver.c |
| 65 |
-+++ /src/cadaver.c |
| 66 |
+--- a/src/cadaver.c |
| 67 |
++++ b/src/cadaver.c |
| 68 |
@@ -838,11 +838,11 @@ |
| 69 |
|
| 70 |
progname = argv[0]; |
Archives