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).

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

3 files changed, 29 insertions, 22 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 0f5328efd3d6..6cd4bdfba369 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/requests
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.34 2013/03/25 16:43:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.35 2013/03/28 10:18:18 mgorny Exp $
+
+  28 Mar 2013; Michał Górny <mgorny@gentoo.org> requests-0.14.2-r1.ebuild,
+  requests-1.1.0.ebuild:
+  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).
 
 *requests-0.14.2-r1 (25 Mar 2013)
 
diff --git a/dev-python/requests/requests-0.14.2-r1.ebuild b/dev-python/requests/requests-0.14.2-r1.ebuild
index fb312382028d..4d26abd1e694 100644
--- a/dev-python/requests/requests-0.14.2-r1.ebuild
+++ b/dev-python/requests/requests-0.14.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="HTTP library for human beings"
 HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
@@ -14,34 +14,36 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND="app-misc/ca-certificates
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/oauthlib[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 # tests connect to various remote sites
 RESTRICT="test"
 
-src_prepare() {
-	# use system libs for chardet, oauthlib, and urllib3
-	rm -r requests/packages || die
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-libs.patch
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.14.1-system-cacerts.patch
+		"${FILESDIR}"/${PN}-0.14.1-system-libs.patch
+	)
 
-	# use system ca-certificates
-	rm requests/cacert.pem || die
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-cacerts.patch
+	# use system libs for chardet, oauthlib, and urllib3
+	rm -r requests/packages requests/cacert.pem || die
 
 	# Different packages are installed depending on the python version.
 	# Need to remove stale egg-info data and build in separate directories.
 	rm -r requests.egg-info || die
 
-	distutils-r1_python_prepare
+	# lolwut? they explicitly cause 'install' to fail...
+	sed -i -e '/DONTWRITEBYTECODE/d' setup.py || die
+
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
diff --git a/dev-python/requests/requests-1.1.0.ebuild b/dev-python/requests/requests-1.1.0.ebuild
index baa2469dbe01..53ce3ab525ea 100644
--- a/dev-python/requests/requests-1.1.0.ebuild
+++ b/dev-python/requests/requests-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.3 2013/03/24 01:45:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.4 2013/03/28 10:18:18 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -26,14 +26,14 @@ DEPEND="${RDEPEND}
 # tests connect to various remote sites
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-system-cacerts.patch
-	"${FILESDIR}"/${P}-system-libs.patch
-)
-
 DOCS=( README.rst HISTORY.rst )
 
 python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-system-cacerts.patch
+		"${FILESDIR}"/${P}-system-libs.patch
+	)
+
 	# use system charade
 	rm -r requests/packages/charade || die
 
@@ -41,5 +41,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	nosetests || die
+	nosetests || die "Tests fail with ${EPYTHON}"
 }