| 1 |
mgorny 13/03/28 10:18:18 |
| 2 |
|
| 3 |
Modified: requests-0.14.2-r1.ebuild requests-1.1.0.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Clean up global vars in the ebuild. Sync the -r1 backport to the fresh ebuild. Fix byte-compiling being explicitly disabled by the old version (bug #463574). |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-python/requests/requests-0.14.2-r1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/requests-0.14.2-r1.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/requests-0.14.2-r1.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/requests-0.14.2-r1.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: requests-0.14.2-r1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.14.2-r1.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- requests-0.14.2-r1.ebuild 25 Mar 2013 16:43:01 -0000 1.1 |
| 24 |
+++ requests-0.14.2-r1.ebuild 28 Mar 2013 10:18:18 -0000 1.2 |
| 25 |
@@ -1,11 +1,11 @@ |
| 26 |
# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.14.2-r1.ebuild,v 1.1 2013/03/25 16:43:01 prometheanfire Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.14.2-r1.ebuild,v 1.2 2013/03/28 10:18:18 mgorny Exp $ |
| 30 |
|
| 31 |
EAPI="5" |
| 32 |
PYTHON_COMPAT=( python2_{6,7} ) |
| 33 |
|
| 34 |
-inherit distutils-r1 eutils |
| 35 |
+inherit distutils-r1 |
| 36 |
|
| 37 |
DESCRIPTION="HTTP library for human beings" |
| 38 |
HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests" |
| 39 |
@@ -14,34 +14,36 @@ |
| 40 |
LICENSE="ISC" |
| 41 |
SLOT="0" |
| 42 |
KEYWORDS="~amd64 ~arm ~x86" |
| 43 |
-IUSE="" |
| 44 |
+IUSE="test" |
| 45 |
|
| 46 |
RDEPEND="app-misc/ca-certificates |
| 47 |
dev-python/chardet[${PYTHON_USEDEP}] |
| 48 |
dev-python/oauthlib[${PYTHON_USEDEP}] |
| 49 |
dev-python/urllib3[${PYTHON_USEDEP}]" |
| 50 |
DEPEND="${RDEPEND} |
| 51 |
- dev-python/setuptools[${PYTHON_USEDEP}]" |
| 52 |
- |
| 53 |
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1 |
| 54 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 55 |
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
| 56 |
|
| 57 |
# tests connect to various remote sites |
| 58 |
RESTRICT="test" |
| 59 |
|
| 60 |
-src_prepare() { |
| 61 |
- # use system libs for chardet, oauthlib, and urllib3 |
| 62 |
- rm -r requests/packages || die |
| 63 |
- epatch "${FILESDIR}"/${PN}-0.14.1-system-libs.patch |
| 64 |
+python_prepare_all() { |
| 65 |
+ local PATCHES=( |
| 66 |
+ "${FILESDIR}"/${PN}-0.14.1-system-cacerts.patch |
| 67 |
+ "${FILESDIR}"/${PN}-0.14.1-system-libs.patch |
| 68 |
+ ) |
| 69 |
|
| 70 |
- # use system ca-certificates |
| 71 |
- rm requests/cacert.pem || die |
| 72 |
- epatch "${FILESDIR}"/${PN}-0.14.1-system-cacerts.patch |
| 73 |
+ # use system libs for chardet, oauthlib, and urllib3 |
| 74 |
+ rm -r requests/packages requests/cacert.pem || die |
| 75 |
|
| 76 |
# Different packages are installed depending on the python version. |
| 77 |
# Need to remove stale egg-info data and build in separate directories. |
| 78 |
rm -r requests.egg-info || die |
| 79 |
|
| 80 |
- distutils-r1_python_prepare |
| 81 |
+ # lolwut? they explicitly cause 'install' to fail... |
| 82 |
+ sed -i -e '/DONTWRITEBYTECODE/d' setup.py || die |
| 83 |
+ |
| 84 |
+ distutils-r1_python_prepare_all |
| 85 |
} |
| 86 |
|
| 87 |
python_test() { |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.4 dev-python/requests/requests-1.1.0.ebuild |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild?rev=1.4&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild?rev=1.4&content-type=text/plain |
| 95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild?r1=1.3&r2=1.4 |
| 96 |
|
| 97 |
Index: requests-1.1.0.ebuild |
| 98 |
=================================================================== |
| 99 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v |
| 100 |
retrieving revision 1.3 |
| 101 |
retrieving revision 1.4 |
| 102 |
diff -u -r1.3 -r1.4 |
| 103 |
--- requests-1.1.0.ebuild 24 Mar 2013 01:45:45 -0000 1.3 |
| 104 |
+++ requests-1.1.0.ebuild 28 Mar 2013 10:18:18 -0000 1.4 |
| 105 |
@@ -1,6 +1,6 @@ |
| 106 |
# Copyright 1999-2013 Gentoo Foundation |
| 107 |
# Distributed under the terms of the GNU General Public License v2 |
| 108 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.3 2013/03/24 01:45:45 floppym Exp $ |
| 109 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.4 2013/03/28 10:18:18 mgorny Exp $ |
| 110 |
|
| 111 |
EAPI=5 |
| 112 |
PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} ) |
| 113 |
@@ -26,14 +26,14 @@ |
| 114 |
# tests connect to various remote sites |
| 115 |
RESTRICT="test" |
| 116 |
|
| 117 |
-PATCHES=( |
| 118 |
- "${FILESDIR}"/${P}-system-cacerts.patch |
| 119 |
- "${FILESDIR}"/${P}-system-libs.patch |
| 120 |
-) |
| 121 |
- |
| 122 |
DOCS=( README.rst HISTORY.rst ) |
| 123 |
|
| 124 |
python_prepare_all() { |
| 125 |
+ local PATCHES=( |
| 126 |
+ "${FILESDIR}"/${P}-system-cacerts.patch |
| 127 |
+ "${FILESDIR}"/${P}-system-libs.patch |
| 128 |
+ ) |
| 129 |
+ |
| 130 |
# use system charade |
| 131 |
rm -r requests/packages/charade || die |
| 132 |
|
| 133 |
@@ -41,5 +41,5 @@ |
| 134 |
} |
| 135 |
|
| 136 |
python_test() { |
| 137 |
- nosetests || die |
| 138 |
+ nosetests || die "Tests fail with ${EPYTHON}" |
| 139 |
} |
| 140 |
|
| 141 |
|
| 142 |
|
| 143 |
1.35 dev-python/requests/ChangeLog |
| 144 |
|
| 145 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/ChangeLog?rev=1.35&view=markup |
| 146 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/ChangeLog?rev=1.35&content-type=text/plain |
| 147 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/requests/ChangeLog?r1=1.34&r2=1.35 |
| 148 |
|
| 149 |
Index: ChangeLog |
| 150 |
=================================================================== |
| 151 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v |
| 152 |
retrieving revision 1.34 |
| 153 |
retrieving revision 1.35 |
| 154 |
diff -u -r1.34 -r1.35 |
| 155 |
--- ChangeLog 25 Mar 2013 16:43:01 -0000 1.34 |
| 156 |
+++ ChangeLog 28 Mar 2013 10:18:18 -0000 1.35 |
| 157 |
@@ -1,6 +1,11 @@ |
| 158 |
# ChangeLog for dev-python/requests |
| 159 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 160 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.34 2013/03/25 16:43:01 prometheanfire Exp $ |
| 161 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.35 2013/03/28 10:18:18 mgorny Exp $ |
| 162 |
+ |
| 163 |
+ 28 Mar 2013; Michał Górny <mgorny@g.o> requests-0.14.2-r1.ebuild, |
| 164 |
+ requests-1.1.0.ebuild: |
| 165 |
+ Clean up global vars in the ebuild. Sync the -r1 backport to the fresh ebuild. |
| 166 |
+ Fix byte-compiling being explicitly disabled by the old version (bug #463574). |
| 167 |
|
| 168 |
*requests-0.14.2-r1 (25 Mar 2013) |
Archives