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 Jan 2017 22:38:13
Message-Id: 1483310264.bf82aaeb102efc049c6cfde000a7601c2e648dcd.blueness@gentoo
1 commit: bf82aaeb102efc049c6cfde000a7601c2e648dcd
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 1 22:37:44 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 22:37:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf82aaeb
7
8 net-misc/curl: remove 7.52.1, bug #603574c7
9
10 Package-Manager: portage-2.3.0
11
12 net-misc/curl/curl-7.52.1.ebuild | 251 ---------------------------------------
13 1 file changed, 251 deletions(-)
14
15 diff --git a/net-misc/curl/curl-7.52.1.ebuild b/net-misc/curl/curl-7.52.1.ebuild
16 deleted file mode 100644
17 index 970d65c..00000000
18 --- a/net-misc/curl/curl-7.52.1.ebuild
19 +++ /dev/null
20 @@ -1,251 +0,0 @@
21 -# Copyright 1999-2016 Gentoo Foundation
22 -# Distributed under the terms of the GNU General Public License v2
23 -# $Id$
24 -
25 -EAPI="6"
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.bz2"
32 -
33 -LICENSE="MIT"
34 -SLOT="0"
35 -KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
36 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
37 -IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
38 -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
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 - ssl? (
46 - curl_ssl_axtls? (
47 - net-libs/axtls:0=[${MULTILIB_USEDEP}]
48 - app-misc/ca-certificates
49 - )
50 - curl_ssl_gnutls? (
51 - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
52 - dev-libs/nettle:0=[${MULTILIB_USEDEP}]
53 - app-misc/ca-certificates
54 - )
55 - curl_ssl_libressl? (
56 - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
57 - )
58 - curl_ssl_mbedtls? (
59 - net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
60 - app-misc/ca-certificates
61 - )
62 - curl_ssl_openssl? (
63 - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
64 - )
65 - curl_ssl_nss? (
66 - dev-libs/nss:0[${MULTILIB_USEDEP}]
67 - app-misc/ca-certificates
68 - )
69 - curl_ssl_polarssl? (
70 - net-libs/polarssl:0=[${MULTILIB_USEDEP}]
71 - app-misc/ca-certificates
72 - )
73 - )
74 - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
75 - idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
76 - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
77 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
78 - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
79 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
80 - ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
81 - sys-libs/zlib[${MULTILIB_USEDEP}]
82 - abi_x86_32? (
83 - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
84 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
85 - )"
86 -
87 -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
88 -# rtmp? (
89 -# media-video/rtmpdump
90 -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
91 -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
92 -# )
93 -
94 -# ssl providers to be added:
95 -# fbopenssl $(use_with spnego)
96 -
97 -DEPEND="${RDEPEND}
98 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
99 - test? (
100 - sys-apps/diffutils
101 - dev-lang/perl
102 - )"
103 -
104 -# c-ares must be disabled for threads
105 -# only one ssl provider can be enabled
106 -REQUIRED_USE="
107 - curl_ssl_winssl? ( elibc_Winnt )
108 - threads? ( !adns )
109 - ssl? (
110 - ^^ (
111 - curl_ssl_axtls
112 - curl_ssl_gnutls
113 - curl_ssl_libressl
114 - curl_ssl_mbedtls
115 - curl_ssl_nss
116 - curl_ssl_openssl
117 - curl_ssl_polarssl
118 - curl_ssl_winssl
119 - )
120 - )"
121 -
122 -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
123 - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
124 -
125 -MULTILIB_WRAPPED_HEADERS=(
126 - /usr/include/curl/curlbuild.h
127 -)
128 -
129 -MULTILIB_CHOST_TOOLS=(
130 - /usr/bin/curl-config
131 -)
132 -
133 -src_prepare() {
134 - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
135 - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
136 - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
137 -
138 - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
139 -
140 - eapply_user
141 - eprefixify curl-config.in
142 - eautoreconf
143 -}
144 -
145 -multilib_src_configure() {
146 - # We make use of the fact that later flags override earlier ones
147 - # So start with all ssl providers off until proven otherwise
148 - local myconf=()
149 - myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
150 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
151 - if use ssl ; then
152 - if use curl_ssl_axtls; then
153 - einfo "SSL provided by axtls"
154 - myconf+=( --with-axtls )
155 - elif use curl_ssl_gnutls; then
156 - einfo "SSL provided by gnutls"
157 - myconf+=( --with-gnutls --with-nettle )
158 - elif use curl_ssl_libressl; then
159 - einfo "SSL provided by LibreSSL"
160 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
161 - elif use curl_ssl_mbedtls; then
162 - einfo "SSL provided by mbedtls"
163 - myconf+=( --with-mbedtls )
164 - elif use curl_ssl_nss; then
165 - einfo "SSL provided by nss"
166 - myconf+=( --with-nss )
167 - elif use curl_ssl_polarssl; then
168 - einfo "SSL provided by polarssl"
169 - myconf+=( --with-polarssl )
170 - elif use curl_ssl_openssl; then
171 - einfo "SSL provided by openssl"
172 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
173 - elif use curl_ssl_winssl; then
174 - einfo "SSL provided by Windows"
175 - myconf+=( --with-winssl )
176 - else
177 - eerror "We can't be here because of REQUIRED_USE."
178 - fi
179 - else
180 - einfo "SSL disabled"
181 - fi
182 -
183 - # These configuration options are organized alphabetically
184 - # within each category. This should make it easier if we
185 - # ever decide to make any of them contingent on USE flags:
186 - # 1) protocols first. To see them all do
187 - # 'grep SUPPORT_PROTOCOLS configure.ac'
188 - # 2) --enable/disable options second.
189 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
190 - # 3) --with/without options third.
191 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
192 - ECONF_SOURCE="${S}" \
193 - econf \
194 - --enable-crypto-auth \
195 - --enable-dict \
196 - --enable-file \
197 - --enable-ftp \
198 - --enable-gopher \
199 - --enable-http \
200 - --enable-imap \
201 - $(use_enable ldap) \
202 - $(use_enable ldap ldaps) \
203 - --disable-ntlm-wb \
204 - --enable-pop3 \
205 - --enable-rt \
206 - --enable-rtsp \
207 - $(use_enable samba smb) \
208 - $(use_with ssh libssh2) \
209 - --enable-smtp \
210 - --enable-telnet \
211 - --enable-tftp \
212 - --enable-tls-srp \
213 - $(use_enable adns ares) \
214 - --enable-cookies \
215 - --enable-hidden-symbols \
216 - $(use_enable ipv6) \
217 - --enable-largefile \
218 - --without-libpsl \
219 - --enable-manual \
220 - --enable-proxy \
221 - --disable-soname-bump \
222 - --disable-sspi \
223 - $(use_enable static-libs static) \
224 - $(use_enable threads threaded-resolver) \
225 - --disable-versioned-symbols \
226 - --without-cyassl \
227 - --without-darwinssl \
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 rtmp librtmp) \
233 - --without-spnego \
234 - --without-winidn \
235 - --with-zlib \
236 - "${myconf[@]}"
237 -
238 - if ! multilib_is_native_abi; then
239 - # avoid building the client
240 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
241 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
242 - fi
243 -
244 - # Fix up the pkg-config file to be more robust.
245 - # https://github.com/curl/curl/issues/864
246 - local priv=() libs=()
247 - # We always enable zlib.
248 - libs+=( "-lz" )
249 - priv+=( "zlib" )
250 - if use http2; then
251 - libs+=( "-lnghttp2" )
252 - priv+=( "libnghttp2" )
253 - fi
254 - if use curl_ssl_openssl; then
255 - libs+=( "-lssl" "-lcrypto" )
256 - priv+=( "openssl" )
257 - fi
258 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
259 - libs=$(printf '|%s' "${libs[@]}")
260 - sed -i -r \
261 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
262 - libcurl.pc || die
263 - echo "Requires.private: ${priv[*]}" >> libcurl.pc
264 -}
265 -
266 -multilib_src_install_all() {
267 - einstalldocs
268 - prune_libtool_files --all
269 -
270 - rm -rf "${ED}"/etc/
271 -}