blueness 14/03/31 13:42:39 Modified: curl-7.36.0.ebuild ChangeLog Log: Enable tests, bug #285669 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.2 net-misc/curl/curl-7.36.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild?r1=1.1&r2=1.2 Index: curl-7.36.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- curl-7.36.0.ebuild 27 Mar 2014 12:52:15 -0000 1.1 +++ curl-7.36.0.ebuild 31 Mar 2014 13:42:39 -0000 1.2 @@ -1,10 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.1 2014/03/27 12:52:15 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.2 2014/03/31 13:42:39 blueness Exp $ EAPI="5" -inherit autotools eutils prefix +PYTHON_COMPAT=( python2_6 python2_7 ) +inherit autotools eutils prefix python-any-r1 DESCRIPTION="A Client that groks URLs" HOMEPAGE="http://curl.haxx.se/"; @@ -16,9 +17,6 @@ IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads" IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl" -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - RDEPEND="ldap? ( net-nds/openldap ) ssl? ( curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) @@ -58,6 +56,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig test? ( + ${PYTHON_DEPS} sys-apps/diffutils dev-lang/perl )" @@ -80,11 +79,18 @@ DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) +pkg_setup() { + if use test ; then + python-any-r1_pkg_setup + fi +} + src_prepare() { epatch \ "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ "${FILESDIR}"/${PN}-respect-cflags-3.patch \ "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 epatch_user 1.343 net-misc/curl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.343&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.343&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.342&r2=1.343 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- ChangeLog 27 Mar 2014 12:52:16 -0000 1.342 +++ ChangeLog 31 Mar 2014 13:42:39 -0000 1.343 @@ -1,6 +1,9 @@ # ChangeLog for net-misc/curl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.342 2014/03/27 12:52:16 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.343 2014/03/31 13:42:39 blueness Exp $ + + 31 Mar 2014; Anthony G. Basile <[email protected]> curl-7.36.0.ebuild: + Enable tests, bug #285669 *curl-7.36.0 (27 Mar 2014)
