| 1 |
blueness 14/03/31 13:42:39 |
| 2 |
|
| 3 |
Modified: curl-7.36.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Enable tests, bug #285669 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-misc/curl/curl-7.36.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: curl-7.36.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- curl-7.36.0.ebuild 27 Mar 2014 12:52:15 -0000 1.1 |
| 23 |
+++ curl-7.36.0.ebuild 31 Mar 2014 13:42:39 -0000 1.2 |
| 24 |
@@ -1,10 +1,11 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.1 2014/03/27 12:52:15 blueness Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.2 2014/03/31 13:42:39 blueness Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
-inherit autotools eutils prefix |
| 33 |
+PYTHON_COMPAT=( python2_6 python2_7 ) |
| 34 |
+inherit autotools eutils prefix python-any-r1 |
| 35 |
|
| 36 |
DESCRIPTION="A Client that groks URLs" |
| 37 |
HOMEPAGE="http://curl.haxx.se/" |
| 38 |
@@ -16,9 +17,6 @@ |
| 39 |
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads" |
| 40 |
IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl" |
| 41 |
|
| 42 |
-#lead to lots of false negatives, bug #285669 |
| 43 |
-RESTRICT="test" |
| 44 |
- |
| 45 |
RDEPEND="ldap? ( net-nds/openldap ) |
| 46 |
ssl? ( |
| 47 |
curl_ssl_axtls? ( net-libs/axtls app-misc/ca-certificates ) |
| 48 |
@@ -58,6 +56,7 @@ |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
virtual/pkgconfig |
| 51 |
test? ( |
| 52 |
+ ${PYTHON_DEPS} |
| 53 |
sys-apps/diffutils |
| 54 |
dev-lang/perl |
| 55 |
)" |
| 56 |
@@ -80,11 +79,18 @@ |
| 57 |
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ |
| 58 |
docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) |
| 59 |
|
| 60 |
+pkg_setup() { |
| 61 |
+ if use test ; then |
| 62 |
+ python-any-r1_pkg_setup |
| 63 |
+ fi |
| 64 |
+} |
| 65 |
+ |
| 66 |
src_prepare() { |
| 67 |
epatch \ |
| 68 |
"${FILESDIR}"/${PN}-7.30.0-prefix.patch \ |
| 69 |
"${FILESDIR}"/${PN}-respect-cflags-3.patch \ |
| 70 |
"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch |
| 71 |
+ |
| 72 |
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 |
| 73 |
|
| 74 |
epatch_user |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.343 net-misc/curl/ChangeLog |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.343&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?rev=1.343&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/ChangeLog?r1=1.342&r2=1.343 |
| 83 |
|
| 84 |
Index: ChangeLog |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v |
| 87 |
retrieving revision 1.342 |
| 88 |
retrieving revision 1.343 |
| 89 |
diff -u -r1.342 -r1.343 |
| 90 |
--- ChangeLog 27 Mar 2014 12:52:16 -0000 1.342 |
| 91 |
+++ ChangeLog 31 Mar 2014 13:42:39 -0000 1.343 |
| 92 |
@@ -1,6 +1,9 @@ |
| 93 |
# ChangeLog for net-misc/curl |
| 94 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.342 2014/03/27 12:52:16 blueness Exp $ |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.343 2014/03/31 13:42:39 blueness Exp $ |
| 97 |
+ |
| 98 |
+ 31 Mar 2014; Anthony G. Basile <blueness@g.o> curl-7.36.0.ebuild: |
| 99 |
+ Enable tests, bug #285669 |
| 100 |
|
| 101 |
*curl-7.36.0 (27 Mar 2014) |
Archives