Version bump.

(Portage version: 2.2.0_alpha150/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 88 insertions, 1 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index f139bd91b7f6..c9abd58ee7e6 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2013/01/09 02:14:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.31 2013/01/11 00:59:49 radhermit Exp $
+
+*requests-1.1.0 (11 Jan 2013)
+
+  11 Jan 2013; Tim Harder <radhermit@gentoo.org> +requests-1.1.0.ebuild,
+  +files/requests-1.1.0-system-cacerts.patch,
+  +files/requests-1.1.0-system-libs.patch:
+  Version bump.
 
   09 Jan 2013; Tim Harder <radhermit@gentoo.org> -requests-1.0.3.ebuild,
   -files/requests-1.0.3-system-libs.patch:
diff --git a/dev-python/requests/files/requests-1.1.0-system-cacerts.patch b/dev-python/requests/files/requests-1.1.0-system-cacerts.patch
new file mode 100644
index 000000000000..3a4f0a6f732e
--- /dev/null
+++ b/dev-python/requests/files/requests-1.1.0-system-cacerts.patch
@@ -0,0 +1,14 @@
+--- requests-1.1.0/requests/certs.py
++++ requests-1.1.0/requests/certs.py
+@@ -22,8 +22,9 @@
+ 
+ def where():
+     """Return the preferred certificate bundle."""
+-    if certifi:
+-        return certifi.where()
++    cacerts = '/etc/ssl/certs/ca-certificates.crt'
++    if os.path.exists(cacerts):
++        return cacerts
+ 
+     return os.path.join(os.path.dirname(__file__), 'cacert.pem')
+ 
diff --git a/dev-python/requests/files/requests-1.1.0-system-libs.patch b/dev-python/requests/files/requests-1.1.0-system-libs.patch
new file mode 100644
index 000000000000..254ee73bb74a
--- /dev/null
+++ b/dev-python/requests/files/requests-1.1.0-system-libs.patch
@@ -0,0 +1,21 @@
+--- requests-1.1.0/requests/compat.py
++++ requests-1.1.0/requests/compat.py
+@@ -4,7 +4,7 @@
+ pythoncompat
+ """
+ 
+-from .packages import charade as chardet
++import charade as chardet
+ 
+ import sys
+ 
+--- requests-1.1.0/setup.py
++++ requests-1.1.0/setup.py
+@@ -17,7 +17,6 @@
+ packages = [
+     'requests',
+     'requests.packages',
+-	'requests.packages.charade',
+     'requests.packages.urllib3',
+     'requests.packages.urllib3.packages',
+     'requests.packages.urllib3.packages.ssl_match_hostname'
diff --git a/dev-python/requests/requests-1.1.0.ebuild b/dev-python/requests/requests-1.1.0.ebuild
new file mode 100644
index 000000000000..c30fd9b7b1c1
--- /dev/null
+++ b/dev-python/requests/requests-1.1.0.ebuild
@@ -0,0 +1,45 @@
+# 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.1 2013/01/11 00:59:49 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="app-misc/ca-certificates
+	dev-python/charade[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# 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() {
+	# use system charade
+	rm -r requests/packages/charade || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}