Version bump.

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

3 files changed, 121 insertions, 1 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index b76f1ad32ee5..50251acc8423 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/requests
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.27 2012/12/21 21:26:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.28 2012/12/23 11:38:19 radhermit Exp $
+
+*requests-1.0.4 (23 Dec 2012)
+
+  23 Dec 2012; Tim Harder <radhermit@gentoo.org> +requests-1.0.4.ebuild,
+  +files/requests-1.0.4-system-libs.patch:
+  Version bump.
 
   21 Dec 2012; Tim Harder <radhermit@gentoo.org> requests-1.0.3.ebuild:
   Use PYTHON_USEDEP to pull in proper deps.
diff --git a/dev-python/requests/files/requests-1.0.4-system-libs.patch b/dev-python/requests/files/requests-1.0.4-system-libs.patch
new file mode 100644
index 000000000000..b32c7beb9c7f
--- /dev/null
+++ b/dev-python/requests/files/requests-1.0.4-system-libs.patch
@@ -0,0 +1,68 @@
+--- requests-1.0.4/requests/adapters.py
++++ requests-1.0.4/requests/adapters.py
+@@ -11,15 +11,15 @@
+ import socket
+ 
+ from .models import Response
+-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
++from urllib3.poolmanager import PoolManager, proxy_from_url
+ from .hooks import dispatch_hook
+ from .compat import urlparse, basestring
+ from .utils import DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers
+ from .structures import CaseInsensitiveDict
+-from .packages.urllib3.exceptions import MaxRetryError
+-from .packages.urllib3.exceptions import TimeoutError
+-from .packages.urllib3.exceptions import SSLError as _SSLError
+-from .packages.urllib3.exceptions import HTTPError as _HTTPError
++from urllib3.exceptions import MaxRetryError
++from urllib3.exceptions import TimeoutError
++from urllib3.exceptions import SSLError as _SSLError
++from urllib3.exceptions import HTTPError as _HTTPError
+ from .cookies import extract_cookies_to_jar
+ from .exceptions import ConnectionError, Timeout, SSLError
+ 
+--- requests-1.0.4/requests/compat.py
++++ requests-1.0.4/requests/compat.py
+@@ -4,7 +4,7 @@
+ pythoncompat
+ """
+ 
+-from .packages import charade as chardet
++import charade as chardet
+ 
+ import sys
+ 
+@@ -89,7 +89,7 @@
+     import cookielib
+     from Cookie import Morsel
+     from StringIO import StringIO
+-    from .packages.urllib3.packages.ordered_dict import OrderedDict
++    from urllib3.packages.ordered_dict import OrderedDict
+ 
+     builtin_str = str
+     bytes = str
+--- requests-1.0.4/requests/models.py
++++ requests-1.0.4/requests/models.py
+@@ -17,7 +17,7 @@
+ 
+ from .auth import HTTPBasicAuth
+ from .cookies import cookiejar_from_dict, get_cookie_header
+-from .packages.urllib3.filepost import encode_multipart_formdata
++from urllib3.filepost import encode_multipart_formdata
+ from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL
+ from .utils import (
+     stream_untransfer, guess_filename, requote_uri,
+--- requests-1.0.4/setup.py
++++ requests-1.0.4/setup.py
+@@ -16,11 +16,6 @@
+ 
+ packages = [
+     'requests',
+-    'requests.packages',
+-	'requests.packages.charade',
+-    'requests.packages.urllib3',
+-    'requests.packages.urllib3.packages',
+-    'requests.packages.urllib3.packages.ssl_match_hostname'
+ ]
+ 
+ requires = []
diff --git a/dev-python/requests/requests-1.0.4.ebuild b/dev-python/requests/requests-1.0.4.ebuild
new file mode 100644
index 000000000000..92f5536b556b
--- /dev/null
+++ b/dev-python/requests/requests-1.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.0.4.ebuild,v 1.1 2012/12/23 11:38:19 radhermit Exp $
+
+EAPI=5
+# 3.3 dropped due to bugs 438090 and 447084
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+
+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"
+
+RDEPEND="app-misc/ca-certificates
+	dev-python/charade[${PYTHON_USEDEP}]
+	dev-python/urllib3"
+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-libs.patch )
+
+DOCS=( README.rst HISTORY.rst )
+
+python_prepare_all() {
+	# use system libs for charade and urllib3
+	rm -r requests/packages || die
+
+	# use system ca-certificates
+	rm requests/cacert.pem || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die
+}