Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/
Date: Sun, 01 Dec 2019 17:51:42
Message-Id: 1575222691.df310521aeb19b2dc867db777cad6cbd4845750a.blueness@gentoo
1 commit: df310521aeb19b2dc867db777cad6cbd4845750a
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 1 17:39:45 2019 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 1 17:51:31 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df310521
7
8 net-misc/curl: remove older unstable version
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.16
11 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
12
13 net-misc/curl/curl-7.67.0.ebuild | 264 ---------------------------------------
14 1 file changed, 264 deletions(-)
15
16 diff --git a/net-misc/curl/curl-7.67.0.ebuild b/net-misc/curl/curl-7.67.0.ebuild
17 deleted file mode 100644
18 index 3926522208f..00000000000
19 --- a/net-misc/curl/curl-7.67.0.ebuild
20 +++ /dev/null
21 @@ -1,264 +0,0 @@
22 -# Copyright 1999-2019 Gentoo Authors
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI="7"
26 -
27 -inherit autotools eutils prefix multilib-minimal
28 -
29 -DESCRIPTION="A Client that groks URLs"
30 -HOMEPAGE="https://curl.haxx.se/"
31 -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
32 -
33 -LICENSE="MIT"
34 -SLOT="0"
35 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
36 -IUSE="adns alt-svc brotli esni http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
37 -IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
38 -IUSE+=" nghttp3 quiche"
39 -IUSE+=" elibc_Winnt"
40 -
41 -#lead to lots of false negatives, bug #285669
42 -RESTRICT="test"
43 -
44 -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
45 - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
46 - ssl? (
47 - curl_ssl_gnutls? (
48 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
49 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
50 - app-misc/ca-certificates
51 - )
52 - curl_ssl_libressl? (
53 - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
54 - )
55 - curl_ssl_mbedtls? (
56 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
57 - app-misc/ca-certificates
58 - )
59 - curl_ssl_openssl? (
60 - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
61 - )
62 - curl_ssl_nss? (
63 - dev-libs/nss:0[${MULTILIB_USEDEP}]
64 - app-misc/ca-certificates
65 - )
66 - )
67 - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
68 - nghttp3? (
69 - net-libs/nghttp3[${MULTILIB_USEDEP}]
70 - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
71 - )
72 - quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] )
73 - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
74 - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
75 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
76 - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
77 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
78 - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
79 - sys-libs/zlib[${MULTILIB_USEDEP}]"
80 -
81 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
82 -# rtmp? (
83 -# media-video/rtmpdump
84 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
85 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
86 -# )
87 -
88 -# ssl providers to be added:
89 -# fbopenssl $(use_with spnego)
90 -
91 -DEPEND="${RDEPEND}"
92 -BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
93 - test? (
94 - sys-apps/diffutils
95 - dev-lang/perl
96 - )"
97 -
98 -# c-ares must be disabled for threads
99 -# only one ssl provider can be enabled
100 -REQUIRED_USE="
101 - curl_ssl_winssl? ( elibc_Winnt )
102 - threads? ( !adns )
103 - ssl? (
104 - ^^ (
105 - curl_ssl_gnutls
106 - curl_ssl_libressl
107 - curl_ssl_mbedtls
108 - curl_ssl_nss
109 - curl_ssl_openssl
110 - curl_ssl_winssl
111 - )
112 - )"
113 -
114 -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
115 - docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
116 -
117 -MULTILIB_WRAPPED_HEADERS=(
118 - /usr/include/curl/curlbuild.h
119 -)
120 -
121 -MULTILIB_CHOST_TOOLS=(
122 - /usr/bin/curl-config
123 -)
124 -
125 -src_prepare() {
126 - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
127 - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
128 - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
129 -
130 - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
131 - sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
132 -
133 - eapply_user
134 - eprefixify curl-config.in
135 - eautoreconf
136 -}
137 -
138 -multilib_src_configure() {
139 - # We make use of the fact that later flags override earlier ones
140 - # So start with all ssl providers off until proven otherwise
141 - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
142 - local myconf=()
143 - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
144 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
145 - if use ssl ; then
146 - if use curl_ssl_gnutls; then
147 - einfo "SSL provided by gnutls"
148 - myconf+=( --with-gnutls --with-nettle )
149 - elif use curl_ssl_libressl; then
150 - einfo "SSL provided by LibreSSL"
151 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
152 - elif use curl_ssl_mbedtls; then
153 - einfo "SSL provided by mbedtls"
154 - myconf+=( --with-mbedtls )
155 - elif use curl_ssl_nss; then
156 - einfo "SSL provided by nss"
157 - myconf+=( --with-nss )
158 - elif use curl_ssl_openssl; then
159 - einfo "SSL provided by openssl"
160 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
161 - elif use curl_ssl_winssl; then
162 - einfo "SSL provided by Windows"
163 - myconf+=( --with-winssl )
164 - else
165 - eerror "We can't be here because of REQUIRED_USE."
166 - fi
167 - else
168 - einfo "SSL disabled"
169 - fi
170 -
171 - # These configuration options are organized alphabetically
172 - # within each category. This should make it easier if we
173 - # ever decide to make any of them contingent on USE flags:
174 - # 1) protocols first. To see them all do
175 - # 'grep SUPPORT_PROTOCOLS configure.ac'
176 - # 2) --enable/disable options second.
177 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
178 - # 3) --with/without options third.
179 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
180 -
181 - ECONF_SOURCE="${S}" \
182 - econf \
183 - $(use_enable alt-svc) \
184 - --enable-crypto-auth \
185 - --enable-dict \
186 - $(use_enable esni) \
187 - --enable-file \
188 - --enable-ftp \
189 - --enable-gopher \
190 - --enable-http \
191 - --enable-imap \
192 - $(use_enable ldap) \
193 - $(use_enable ldap ldaps) \
194 - --disable-ntlm-wb \
195 - --enable-pop3 \
196 - --enable-rt \
197 - --enable-rtsp \
198 - $(use_enable samba smb) \
199 - $(use_with ssh libssh2) \
200 - --enable-smtp \
201 - --enable-telnet \
202 - --enable-tftp \
203 - --enable-tls-srp \
204 - $(use_enable adns ares) \
205 - --enable-cookies \
206 - --enable-dateparse \
207 - --enable-dnsshuffle \
208 - --enable-doh \
209 - --enable-hidden-symbols \
210 - --enable-http-auth \
211 - $(use_enable ipv6) \
212 - --enable-largefile \
213 - --without-libpsl \
214 - --enable-manual \
215 - --enable-mime \
216 - --enable-netrc \
217 - $(use_enable progress-meter) \
218 - --enable-proxy \
219 - --disable-sspi \
220 - $(use_enable static-libs static) \
221 - $(use_enable threads threaded-resolver) \
222 - $(use_enable threads pthreads) \
223 - --disable-versioned-symbols \
224 - --without-amissl \
225 - --without-cyassl \
226 - --without-darwinssl \
227 - --without-fish-functions-dir \
228 - $(use_with idn libidn2) \
229 - $(use_with kerberos gssapi "${EPREFIX}"/usr) \
230 - $(use_with metalink libmetalink) \
231 - $(use_with http2 nghttp2) \
232 - $(use_with nghttp3) \
233 - $(use_with nghttp3 ngtcp2) \
234 - $(use_with quiche) \
235 - $(use_with rtmp librtmp) \
236 - $(use_with brotli) \
237 - --without-schannel \
238 - --without-secure-transport \
239 - --without-spnego \
240 - --without-winidn \
241 - --without-wolfssl \
242 - --with-zlib \
243 - "${myconf[@]}"
244 -
245 - if ! multilib_is_native_abi; then
246 - # avoid building the client
247 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
248 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
249 - fi
250 -
251 - # Fix up the pkg-config file to be more robust.
252 - # https://github.com/curl/curl/issues/864
253 - local priv=() libs=()
254 - # We always enable zlib.
255 - libs+=( "-lz" )
256 - priv+=( "zlib" )
257 - if use http2; then
258 - libs+=( "-lnghttp2" )
259 - priv+=( "libnghttp2" )
260 - fi
261 - if use quiche; then
262 - libs+=( "-lquiche" )
263 - priv+=( "libquiche" )
264 - fi
265 - if use nghttp3; then
266 - libs+=( "-lnghttp3" "-lngtcp2" )
267 - priv+=( "libnghttp3" "-libtcp2" )
268 - fi
269 - if use ssl && use curl_ssl_openssl; then
270 - libs+=( "-lssl" "-lcrypto" )
271 - priv+=( "openssl" )
272 - fi
273 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
274 - libs=$(printf '|%s' "${libs[@]}")
275 - sed -i -r \
276 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
277 - libcurl.pc || die
278 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
279 -}
280 -
281 -multilib_src_install_all() {
282 - einstalldocs
283 - find "${ED}" -type f -name '*.la' -delete
284 - rm -rf "${ED}"/etc/
285 -}