diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-04-02 15:38:28 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-04-02 15:38:28 +0000 |
| commit | 029615f15ace61be796933ebc0adfd2e1631e24f (patch) | |
| tree | b1ce1acf4e32dae4a4b68a628624f58db9d5dd4d /net-misc | |
| parent | Fix polarssl bug #503558, re-introduce tests bug #285669 (diff) | |
| download | gentoo-2-029615f15ace61be796933ebc0adfd2e1631e24f.tar.gz gentoo-2-029615f15ace61be796933ebc0adfd2e1631e24f.tar.bz2 gentoo-2-029615f15ace61be796933ebc0adfd2e1631e24f.zip | |
Disable tests again on 7.36.0
(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 | 15 |
2 files changed, 9 insertions, 11 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index 2c2908b430a0..9536aa89b80b 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.344 2014/04/02 15:29:40 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.345 2014/04/02 15:38:28 blueness Exp $ + + 02 Apr 2014; Anthony G. Basile <blueness@gentoo.org> curl-7.36.0.ebuild: + Disable tests again on 7.36.0 *curl-7.35.0-r1 (02 Apr 2014) diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild index a6bb727eb801..375cd7fad25f 100644 --- a/net-misc/curl/curl-7.36.0.ebuild +++ b/net-misc/curl/curl-7.36.0.ebuild @@ -1,11 +1,10 @@ # 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.2 2014/03/31 13:42:39 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.3 2014/04/02 15:38:28 blueness Exp $ EAPI="5" -PYTHON_COMPAT=( python2_6 python2_7 ) -inherit autotools eutils prefix python-any-r1 +inherit autotools eutils prefix DESCRIPTION="A Client that groks URLs" HOMEPAGE="http://curl.haxx.se/" @@ -17,6 +16,9 @@ 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 ) @@ -56,7 +58,6 @@ RDEPEND="ldap? ( net-nds/openldap ) DEPEND="${RDEPEND} virtual/pkgconfig test? ( - ${PYTHON_DEPS} sys-apps/diffutils dev-lang/perl )" @@ -79,12 +80,6 @@ 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 \ |