Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/neon/
Date: Tue, 01 Feb 2022 18:19:24
Message-Id: 1643739023.3caf8a9b14e86287060937ca02e50ab37a5e2978.jsmolic@gentoo
1 commit: 3caf8a9b14e86287060937ca02e50ab37a5e2978
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Sun Jan 30 06:00:00 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 1 18:10:23 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3caf8a9b
7
8 net-libs/neon: Use EAPI="8"
9
10 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
11 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
12
13 net-libs/neon/neon-0.32.2.ebuild | 23 ++++++++++-------------
14 1 file changed, 10 insertions(+), 13 deletions(-)
15
16 diff --git a/net-libs/neon/neon-0.32.2.ebuild b/net-libs/neon/neon-0.32.2.ebuild
17 index e380e3fd9cb2..af48c195905c 100644
18 --- a/net-libs/neon/neon-0.32.2.ebuild
19 +++ b/net-libs/neon/neon-0.32.2.ebuild
20 @@ -1,12 +1,12 @@
21 # Copyright 2001-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=7
25 +EAPI="8"
26
27 inherit autotools libtool multilib-minimal
28
29 DESCRIPTION="HTTP and WebDAV client library"
30 -HOMEPAGE="https://notroj.github.io/neon/"
31 +HOMEPAGE="https://notroj.github.io/neon/ https://github.com/notroj/neon"
32 SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
33
34 LICENSE="GPL-2"
35 @@ -16,7 +16,7 @@ IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
36 RESTRICT="test"
37
38 BDEPEND="virtual/pkgconfig"
39 -RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
40 +DEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
41 !expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
42 kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
43 libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
44 @@ -26,18 +26,18 @@ RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
45 app-misc/ca-certificates
46 net-libs/gnutls:0=[${MULTILIB_USEDEP}]
47 )
48 - !gnutls? (
49 - dev-libs/openssl:0=[${MULTILIB_USEDEP}]
50 - )
51 + !gnutls? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
52 pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
53 )
54 zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
55 -DEPEND="${RDEPEND}"
56 +RDEPEND="${DEPEND}"
57
58 MULTILIB_CHOST_TOOLS=(
59 /usr/bin/neon-config
60 )
61
62 +DOCS=( AUTHORS BUGS NEWS README.md THANKS TODO )
63 +
64 src_prepare() {
65 # Use CHOST-prefixed version of xml2-config for cross-compilation.
66 sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
67 @@ -91,15 +91,12 @@ multilib_src_install() {
68 emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
69
70 if multilib_is_native_abi && use doc; then
71 - (
72 - docinto html
73 - dodoc -r doc/html/*
74 - )
75 + dodoc -r doc/html
76 fi
77 }
78
79 multilib_src_install_all() {
80 - find "${D}" -name "*.la" -type f -delete || die
81 + find "${ED}" -name "*.la" -delete || die
82
83 - dodoc AUTHORS BUGS NEWS README.md THANKS TODO
84 + einstalldocs
85 }