1 |
commit: b6c3b87bc33bba6168572ac015ba50488ff35067 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 29 20:40:31 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 23:41:33 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c3b87b |
7 |
|
8 |
net-misc/curl: Drop unused eutils, some cosmetics |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
net-misc/curl/curl-7.74.0-r4.ebuild | 184 ++++++++++++++++++------------------ |
14 |
1 file changed, 94 insertions(+), 90 deletions(-) |
15 |
|
16 |
diff --git a/net-misc/curl/curl-7.74.0-r4.ebuild b/net-misc/curl/curl-7.74.0-r4.ebuild |
17 |
index c7d9410a7e0..a7f5ed1aa1d 100644 |
18 |
--- a/net-misc/curl/curl-7.74.0-r4.ebuild |
19 |
+++ b/net-misc/curl/curl-7.74.0-r4.ebuild |
20 |
@@ -3,7 +3,7 @@ |
21 |
|
22 |
EAPI="7" |
23 |
|
24 |
-inherit autotools eutils prefix multilib-minimal |
25 |
+inherit autotools prefix multilib-minimal |
26 |
|
27 |
DESCRIPTION="A Client that groks URLs" |
28 |
HOMEPAGE="https://curl.haxx.se/" |
29 |
@@ -17,7 +17,22 @@ IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl |
30 |
IUSE+=" nghttp3 quiche" |
31 |
IUSE+=" elibc_Winnt" |
32 |
|
33 |
-#lead to lots of false negatives, bug #285669 |
34 |
+# c-ares must be disabled for threads |
35 |
+# only one default ssl provider can be enabled |
36 |
+REQUIRED_USE=" |
37 |
+ winssl? ( elibc_Winnt ) |
38 |
+ threads? ( !adns ) |
39 |
+ ssl? ( |
40 |
+ ^^ ( |
41 |
+ curl_ssl_gnutls |
42 |
+ curl_ssl_mbedtls |
43 |
+ curl_ssl_nss |
44 |
+ curl_ssl_openssl |
45 |
+ curl_ssl_winssl |
46 |
+ ) |
47 |
+ )" |
48 |
+ |
49 |
+# lead to lots of false negatives, bug #285669 |
50 |
RESTRICT="!test? ( test )" |
51 |
|
52 |
RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
53 |
@@ -72,23 +87,7 @@ BDEPEND="virtual/pkgconfig |
54 |
dev-lang/perl |
55 |
)" |
56 |
|
57 |
-# c-ares must be disabled for threads |
58 |
-# only one default ssl provider can be enabled |
59 |
-REQUIRED_USE=" |
60 |
- winssl? ( elibc_Winnt ) |
61 |
- threads? ( !adns ) |
62 |
- ssl? ( |
63 |
- ^^ ( |
64 |
- curl_ssl_gnutls |
65 |
- curl_ssl_mbedtls |
66 |
- curl_ssl_nss |
67 |
- curl_ssl_openssl |
68 |
- curl_ssl_winssl |
69 |
- ) |
70 |
- )" |
71 |
- |
72 |
-DOCS=( CHANGES README docs/FEATURES.md docs/INTERNALS.md \ |
73 |
- docs/FAQ docs/BUGS.md docs/CONTRIBUTE.md ) |
74 |
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) |
75 |
|
76 |
MULTILIB_WRAPPED_HEADERS=( |
77 |
/usr/include/curl/curlbuild.h |
78 |
@@ -98,15 +97,18 @@ MULTILIB_CHOST_TOOLS=( |
79 |
/usr/bin/curl-config |
80 |
) |
81 |
|
82 |
+PATCHES=( |
83 |
+ "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
84 |
+ "${FILESDIR}"/${PN}-respect-cflags-3.patch |
85 |
+ "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
86 |
+) |
87 |
+ |
88 |
src_prepare() { |
89 |
- eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch |
90 |
- eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch |
91 |
- eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
92 |
+ default |
93 |
|
94 |
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
95 |
sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 |
96 |
|
97 |
- eapply_user |
98 |
eprefixify curl-config.in |
99 |
eautoreconf |
100 |
} |
101 |
@@ -175,72 +177,74 @@ multilib_src_configure() { |
102 |
# 3) --with/without options third. |
103 |
# grep -- --with configure | grep Check | awk '{ print $4 }' | sort |
104 |
|
105 |
+ myconf+=( |
106 |
+ $(use_enable alt-svc) |
107 |
+ --enable-crypto-auth |
108 |
+ --enable-dict |
109 |
+ --disable-ech |
110 |
+ --enable-file |
111 |
+ $(use_enable ftp) |
112 |
+ $(use_enable gopher) |
113 |
+ $(use_enable hsts) |
114 |
+ --enable-http |
115 |
+ $(use_enable imap) |
116 |
+ $(use_enable ldap) |
117 |
+ $(use_enable ldap ldaps) |
118 |
+ --disable-ntlm-wb |
119 |
+ $(use_enable pop3) |
120 |
+ --enable-rt |
121 |
+ --enable-rtsp |
122 |
+ $(use_enable samba smb) |
123 |
+ $(use_with ssh libssh2) |
124 |
+ $(use_enable smtp) |
125 |
+ $(use_enable telnet) |
126 |
+ $(use_enable tftp) |
127 |
+ --enable-tls-srp |
128 |
+ $(use_enable adns ares) |
129 |
+ --enable-cookies |
130 |
+ --enable-dateparse |
131 |
+ --enable-dnsshuffle |
132 |
+ --enable-doh |
133 |
+ --enable-hidden-symbols |
134 |
+ --enable-http-auth |
135 |
+ $(use_enable ipv6) |
136 |
+ --enable-largefile |
137 |
+ --enable-manual |
138 |
+ --enable-mime |
139 |
+ --enable-netrc |
140 |
+ $(use_enable progress-meter) |
141 |
+ --enable-proxy |
142 |
+ --disable-sspi |
143 |
+ $(use_enable static-libs static) |
144 |
+ $(use_enable threads threaded-resolver) |
145 |
+ $(use_enable threads pthreads) |
146 |
+ --disable-versioned-symbols |
147 |
+ --without-amissl |
148 |
+ --without-bearssl |
149 |
+ --without-cyassl |
150 |
+ --without-darwinssl |
151 |
+ --without-fish-functions-dir |
152 |
+ $(use_with idn libidn2) |
153 |
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) |
154 |
+ $(use_with metalink libmetalink) |
155 |
+ $(use_with http2 nghttp2) |
156 |
+ --without-libpsl |
157 |
+ $(use_with nghttp3) |
158 |
+ $(use_with nghttp3 ngtcp2) |
159 |
+ $(use_with quiche) |
160 |
+ $(use_with rtmp librtmp) |
161 |
+ $(use_with brotli) |
162 |
+ --without-schannel |
163 |
+ --without-secure-transport |
164 |
+ --without-spnego |
165 |
+ --without-winidn |
166 |
+ --without-wolfssl |
167 |
+ --with-zlib |
168 |
+ $(use_with zstd) |
169 |
+ ) |
170 |
+ |
171 |
ECONF_SOURCE="${S}" \ |
172 |
- econf \ |
173 |
- $(use_enable alt-svc) \ |
174 |
- --enable-crypto-auth \ |
175 |
- --enable-dict \ |
176 |
- --disable-ech \ |
177 |
- --enable-file \ |
178 |
- $(use_enable ftp) \ |
179 |
- $(use_enable gopher) \ |
180 |
- $(use_enable hsts) \ |
181 |
- --enable-http \ |
182 |
- $(use_enable imap) \ |
183 |
- $(use_enable ldap) \ |
184 |
- $(use_enable ldap ldaps) \ |
185 |
- --disable-ntlm-wb \ |
186 |
- $(use_enable pop3) \ |
187 |
- --enable-rt \ |
188 |
- --enable-rtsp \ |
189 |
- $(use_enable samba smb) \ |
190 |
- $(use_with ssh libssh2) \ |
191 |
- $(use_enable smtp) \ |
192 |
- $(use_enable telnet) \ |
193 |
- $(use_enable tftp) \ |
194 |
- --enable-tls-srp \ |
195 |
- $(use_enable adns ares) \ |
196 |
- --enable-cookies \ |
197 |
- --enable-dateparse \ |
198 |
- --enable-dnsshuffle \ |
199 |
- --enable-doh \ |
200 |
- --enable-hidden-symbols \ |
201 |
- --enable-http-auth \ |
202 |
- $(use_enable ipv6) \ |
203 |
- --enable-largefile \ |
204 |
- --enable-manual \ |
205 |
- --enable-mime \ |
206 |
- --enable-netrc \ |
207 |
- $(use_enable progress-meter) \ |
208 |
- --enable-proxy \ |
209 |
- --disable-sspi \ |
210 |
- $(use_enable static-libs static) \ |
211 |
- $(use_enable threads threaded-resolver) \ |
212 |
- $(use_enable threads pthreads) \ |
213 |
- --disable-versioned-symbols \ |
214 |
- --without-amissl \ |
215 |
- --without-bearssl \ |
216 |
- --without-cyassl \ |
217 |
- --without-darwinssl \ |
218 |
- --without-fish-functions-dir \ |
219 |
- $(use_with idn libidn2) \ |
220 |
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \ |
221 |
- $(use_with metalink libmetalink) \ |
222 |
- $(use_with http2 nghttp2) \ |
223 |
- --without-libpsl \ |
224 |
- $(use_with nghttp3) \ |
225 |
- $(use_with nghttp3 ngtcp2) \ |
226 |
- $(use_with quiche) \ |
227 |
- $(use_with rtmp librtmp) \ |
228 |
- $(use_with brotli) \ |
229 |
- --without-schannel \ |
230 |
- --without-secure-transport \ |
231 |
- --without-spnego \ |
232 |
- --without-winidn \ |
233 |
- --without-wolfssl \ |
234 |
- --with-zlib \ |
235 |
- $(use_with zstd) \ |
236 |
- "${myconf[@]}" |
237 |
+ econf "${myconf[@]}" |
238 |
|
239 |
if ! multilib_is_native_abi; then |
240 |
# avoid building the client |
241 |
@@ -280,6 +284,6 @@ multilib_src_configure() { |
242 |
|
243 |
multilib_src_install_all() { |
244 |
einstalldocs |
245 |
- find "${ED}" -type f -name '*.la' -delete |
246 |
- rm -rf "${ED}"/etc/ |
247 |
+ find "${ED}" -type f -name '*.la' -delete || die |
248 |
+ rm -rf "${ED}"/etc/ || die |
249 |
} |