diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-03-31 13:42:39 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-03-31 13:42:39 +0000 |
| commit | 3c3b29219f84a0332cd1e3296bf08c2d92b7d69c (patch) | |
| tree | d2c2c3b3125647633664e1cb39ef0b03ee457d56 /net-misc | |
| parent | Version bump. (diff) | |
| download | gentoo-2-3c3b29219f84a0332cd1e3296bf08c2d92b7d69c.tar.gz gentoo-2-3c3b29219f84a0332cd1e3296bf08c2d92b7d69c.tar.bz2 gentoo-2-3c3b29219f84a0332cd1e3296bf08c2d92b7d69c.zip | |
Enable tests, bug #285669
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/curl/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/curl/curl-7.36.0.ebuild | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 34d89a87a883..6b8c7e4c984d 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -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 <blueness@gentoo.org> curl-7.36.0.ebuild: + Enable tests, bug #285669 *curl-7.36.0 (27 Mar 2014) diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild index ebfabad15800..a6bb727eb801 100644 --- a/net-misc/curl/curl-7.36.0.ebuild +++ b/net-misc/curl/curl-7.36.0.ebuild @@ -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 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s 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 @@ RDEPEND="ldap? ( net-nds/openldap ) DEPEND="${RDEPEND} virtual/pkgconfig test? ( + ${PYTHON_DEPS} sys-apps/diffutils dev-lang/perl )" @@ -80,11 +79,18 @@ REQUIRED_USE=" 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 |