| 1 |
idella4 14/06/28 10:51:59 |
| 2 |
|
| 3 |
Modified: pycurl-7.19.3.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
add test deps, upstream patch, drop amd64-fbsd hppa x86-fbsd keywords to include test dep (for re-keywording), unrestrict and update test phase |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 dev-python/pycurl/pycurl-7.19.3.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: pycurl-7.19.3.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- pycurl-7.19.3.1.ebuild 15 Jun 2014 15:22:12 -0000 1.4 |
| 23 |
+++ pycurl-7.19.3.1.ebuild 28 Jun 2014 10:51:59 -0000 1.5 |
| 24 |
@@ -1,7 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.4 2014/06/15 15:22:12 mgorny Exp $ |
| 28 |
- |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.5 2014/06/28 10:51:59 idella4 Exp $ |
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
# The selftests fail with pypy, and urlgrabber segfaults for me. |
| 33 |
@@ -15,8 +14,8 @@ |
| 34 |
|
| 35 |
LICENSE="LGPL-2.1" |
| 36 |
SLOT="0" |
| 37 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 38 |
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl" |
| 39 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 40 |
+IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test" |
| 41 |
|
| 42 |
# Depend on a curl with curl_ssl_* USE flags. |
| 43 |
# libcurl must not be using an ssl backend we do not support. |
| 44 |
@@ -24,14 +23,17 @@ |
| 45 |
# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl |
| 46 |
# does not need to initialize gcrypt threading and we do not need to |
| 47 |
# explicitly link to libgcrypt. |
| 48 |
-DEPEND=">=net-misc/curl-7.25.0-r1[ssl=] |
| 49 |
+RDEPEND=">=net-misc/curl-7.25.0-r1[ssl=] |
| 50 |
ssl? ( |
| 51 |
net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] |
| 52 |
- curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) |
| 53 |
- )" |
| 54 |
-RDEPEND="${DEPEND}" |
| 55 |
-# Tests have new deps that can never be keyworded, for now |
| 56 |
-RESTRICT="test" |
| 57 |
+ curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) )" |
| 58 |
+DEPEND="${RDEPEND} |
| 59 |
+ test? ( dev-python/nose[${PYTHON_USEDEP}] |
| 60 |
+ dev-python/bottle[${PYTHON_USEDEP}] )" |
| 61 |
+# Needed for individual runs of testsuite by python impls. |
| 62 |
+DISTUTILS_IN_SOURCE_BUILD=1 |
| 63 |
+ |
| 64 |
+PATCHES=( "${FILESDIR}"/${P}-ssl-test.patch ) |
| 65 |
|
| 66 |
python_prepare_all() { |
| 67 |
sed -e "/data_files=/d" -i setup.py || die |
| 68 |
@@ -56,11 +58,7 @@ |
| 69 |
|
| 70 |
python_test() { |
| 71 |
# https://github.com/pycurl/pycurl/issues/180 |
| 72 |
- if [[ "${EPYTHON}" == python2.7 ]]; then |
| 73 |
- sed -e 's:test_request_with_certinfo:_&:' \ |
| 74 |
- -e 's:test_request_without_certinfo:_&:' \ |
| 75 |
- -i tests/certinfo_test.py || die |
| 76 |
- elif [[ "${EPYTHON}" == python3.4 ]]; then |
| 77 |
+ if [[ "${EPYTHON}" == python3.4 ]]; then |
| 78 |
sed -e 's:test_post_buffer:_&:' \ |
| 79 |
-e 's:test_post_file:_&:' \ |
| 80 |
-i tests/post_test.py || die |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.96 dev-python/pycurl/ChangeLog |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycurl/ChangeLog?rev=1.96&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycurl/ChangeLog?rev=1.96&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycurl/ChangeLog?r1=1.95&r2=1.96 |
| 89 |
|
| 90 |
Index: ChangeLog |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v |
| 93 |
retrieving revision 1.95 |
| 94 |
retrieving revision 1.96 |
| 95 |
diff -u -r1.95 -r1.96 |
| 96 |
--- ChangeLog 15 Jun 2014 15:22:12 -0000 1.95 |
| 97 |
+++ ChangeLog 28 Jun 2014 10:51:59 -0000 1.96 |
| 98 |
@@ -1,6 +1,11 @@ |
| 99 |
# ChangeLog for dev-python/pycurl |
| 100 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.95 2014/06/15 15:22:12 mgorny Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.96 2014/06/28 10:51:59 idella4 Exp $ |
| 103 |
+ |
| 104 |
+ 28 Jun 2014; Ian Delaney <idella4@g.o> |
| 105 |
+ +files/pycurl-7.19.3.1-ssl-test.patch, pycurl-7.19.3.1.ebuild: |
| 106 |
+ add test deps, upstream patch, drop amd64-fbsd hppa x86-fbsd keywords to |
| 107 |
+ include test dep (for re-keywording), unrestrict and update test phase |
| 108 |
|
| 109 |
15 Jun 2014; Michał Górny <mgorny@g.o> pycurl-7.19.0-r1.ebuild, |
| 110 |
pycurl-7.19.0-r2.ebuild, pycurl-7.19.0-r3.ebuild, pycurl-7.19.3.1.ebuild: |
Archives