Version bump.

Package-Manager: portage-2.2.0_alpha175/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 76 insertions, 6 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 97c2195b482b..d1dfa90dc3c5 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2013/05/16 17:17:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.39 2013/05/21 08:09:17 radhermit Exp $
+
+*requests-1.2.1 (21 May 2013)
+
+  21 May 2013; Tim Harder <radhermit@gentoo.org> +requests-1.2.1.ebuild,
+  +files/requests-1.2.1-urllib3-py3.patch:
+  Version bump.
 
   16 May 2013; Markus Meier <maekke@gentoo.org> requests-1.2.0.ebuild:
   add ~arm, bug #447650
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index f5fac679bebc..a41f807b8ad9 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -10,23 +10,30 @@ AUX requests-1.1.0-system-cacerts.patch 388 SHA256 51159bb886ee91ba5de425cdf0362
 AUX requests-1.1.0-system-libs.patch 498 SHA256 0e379ff9a6047b31638f0e57d30ae988476fe375a8a4378763e9058481b078b8 SHA512 5472bf1b349ea0097700034a465e612b8a8a81af328891b622db861845a1ab2521d78d76d6c8a003ae55b85d426c7e6cdd1afc1c9bf7c49a1847b69d3cbdc8b0 WHIRLPOOL c98ab35b8d1c1dab4e2fa7e272567aecfdc8923da063b34303b8b8143dcb26534f7d30eda881a70a7488f22afcf82be1057adfb25044cf3caf7bb94a71d104f2
 AUX requests-1.2.0-system-cacerts.patch 379 SHA256 be3c6dc94c881842b7dc28e893d5708ef6649d04eadad92a6d59e103d58b80d6 SHA512 065379c8259adf60117b6dfe40e0e8241fcf72a74c942c786753c9eeab95e60aa3de54d9e596d1b630794ac2f658a97105be540276f398eb97cbf4bf9b066b15 WHIRLPOOL d12d9a0e08ebc1298be8be8bc6dcd273bb6c1354dc5cbb0cf146c7873b60a5d3595e88207d53c996b9750f007f8ad17ab3c6d9ed358d592d2f190c52229396b3
 AUX requests-1.2.0-system-libs.patch 501 SHA256 5bd4be07b4072a713857ede3542f78ef200a124216c67830edfad6aaa21111fa SHA512 1cc1065af47012c8275f5a9dc9ec367e801e300f24d18b0829cf33134b6c3c499842c51b2aa88e33554a17fc5a89c672ad90a22c3969b88447ded5c8c1e09a1e WHIRLPOOL 4ba6bc9aabad035a8d922e876d9383c964faac463cb84e5f85e50e008e7e73ce4fc327b925cd85d3675de9ba73df13bbb140ab86802359807b9b3298141907eb
+AUX requests-1.2.1-urllib3-py3.patch 569 SHA256 a156046ccd0462b446a6a99b7b1e6121ff038cbdc9eba8eda44085e9242a12fb SHA512 dbd12eaf466b3b0a2e8b78876cf10d43bf988914cc829746516a6f60d46634018ced86110dbb977430533b9fc5cf4f2d6492145195f6d769263b970e7f23eacd WHIRLPOOL 8901f22a1f491bfa119672a04d2c978d8894fbeb13d90b1b405298e9a2b07890e2c41c0a04d3dd20b5fbff408fcc4e563419916217597e50cd81a46281c60246
 DIST requests-0.13.1.tar.gz 68474 SHA256 31f3ae96787fe74a78c7dd9626bf997fd4eabacc040b7b33fbd8632d2c2a97f6 SHA512 97472d56a2da10216e735b575610d9aa7f97f1d4705fb20e72a79f520090dec59b91d5b5059e9966bc2fd05982b6b8f3e2a1c794e9cf9042713ae8d481162df8 WHIRLPOOL f50251d2d71262118f208da14c4f3067ff904893416e22a8b3cbc1817d53709efef79e23a6c05b63b497f0cd105f1e106fa8eb751a4cd78d4733be027a663966
 DIST requests-0.14.2.tar.gz 361488 SHA256 0e3345a8ac0d712bf17bd9d3276415050c5f972265ab62993cd4540a3a1aaaef SHA512 d791f68b2fdc46ad6abaf2bcd49a038a335fddb476f89c6b7023370c716f0165a8ad09e8d0d1f3d145255d604c2d10f810e4090facd2381515b43f2306ca0365 WHIRLPOOL ed71a4a4db8279e1587d32dfb3dc2c219a87267e484bf23915db158c8843eea4d396d439e12919c29cb37677bb0b2615c87cabbd602a7de25a0273aca302c6ba
 DIST requests-1.0.4.tar.gz 336280 SHA256 f363690a47dd4d6d6e7605fc686b668097a114cd946dffdf21fe0c6a6a46f9e6 SHA512 90adf87f46a65eca0fc539a56eeda38f40c4b5743091eaaf5829de5c50c67d6bfa28a8e548a0e12cc3d38bf2af65d2b23096659438bb4fde2742fb0db70960c9 WHIRLPOOL 3effdd4c971daf2ccf7d8dd1613dd43e4684cfa14a931d3ffdbd040e471df00350ae7e39766389a0eda20fbe73dab5625271b1aad20936ee933e127d17d0054e
 DIST requests-1.1.0.tar.gz 337229 SHA256 21a81ddf1a3c2f956524538966ae19c38cae251f5629821588cdc8246a1335f7 SHA512 5ab10ba43d492ab227d88b90c7b6db7840232fd7fe4638642f994e1721576bbcf7276515a918a059edf5ded14456eb57e06b76eec9d7f4b95b5489d498de52d4 WHIRLPOOL d7e26094c58b530afd5ef8a2fb127bc3fa69d73f48fb0f57815993a76626ec5d14aee9056056454fa1deace9b7c3a23642ac4723f4d10b0d77c81ac89307bcd9
 DIST requests-1.2.0.tar.gz 341511 SHA256 cfa615644ae38efe8423ce9edb23470a4615a9147fa3cea5026afb47c9bb3913 SHA512 b23447d49a09f8b6ed3e718afd46e95deb6de97f0a263e41ead7cce155c9950e14e5be278ba5c9a9a3f8ed181e460f3f006b1506750c75f0d022104104bf45eb WHIRLPOOL 9353eaf118ca4d9c431b163c971cc7e28d5416aee1189c4e64df52cecba6b184a474f7335f870a77c9e51d64f4732c426aeba37696307fb09a3e40d65894a60c
+DIST requests-1.2.1.tar.gz 348710 SHA256 946b7c856aa62f4ad31de2b9bb501cfdcdb4afdc882ee76bd4664f57caefaa44 SHA512 b8e75e1aa41e0b062305e72c9cffe517eef16bc4c123d703bb57a94115d75259d9019f6d849abb9ac5ba345b2ddd304079e3582747e61e3f24c89c6fe010ca3b WHIRLPOOL b8800a52fe30a1da4b786241d0d4055d76c8dd4b5dbe2d2ab68be4477739c22586ee9be98d7217fd30bf26994aeb62ed78467d9bc0e82166b8e683df6e2a45f8
 EBUILD requests-0.13.1.ebuild 929 SHA256 2142584f7fa5de965950846c32a8e233935af2bf3ef15cd9ddaf3536f027925b SHA512 e05e8a54c0e4bed7e6c40d0b6fb3738e5b01cdebedba3260cb4bf4b91e467f860ce2c2a77f0fd888d4cfffa46fb7f901c01e55fb53e4bd7470bf7ce1820fbf4a WHIRLPOOL c5fe749d6c1f97ab40e5b918d35143abb97d78b2892d92f06b792cf2ed0f2e379965d3fe4ac0e9c36b5f59bdbee7cf41b64f6072fc95e8c95d63958fd180bc24
 EBUILD requests-0.14.2-r1.ebuild 1471 SHA256 fbc99b24874ca7f775d70df0e92b936e19e607d901219bb5425dfb94cf8aae3f SHA512 2a7f4b4b37cb78bec4d6412f69ef28c29c5a321f7cd6ea9e6c1ac9b84bb75bf236274738b9b05d7b5a3e74be5e52ea8884637288f223d3a1d06979bb9561d611 WHIRLPOOL 9e5f265bcd70ef907a4318e8e2bcfeed750eb42886ad09bb3d76a813acb3804f107d919da15e3744765e364c5a27dbb0eaafb438832101e95a049761f22301b9
 EBUILD requests-0.14.2.ebuild 1458 SHA256 ea85de3f5ce68574ba9db938951956c7d6d4b880234020eec80a68a386e76d7a SHA512 248f9be799422649b0ce06c3ea3414ceef73722d095e118672d24f9a6090c5b2ddab4be10db1fb71f417a8b2f2096458f8fbefbdd2249df9c67f8f70512c62ec WHIRLPOOL 7aa3b26ff4fdbacf141e28c4e9394a3dadba13deb1dca49d1f1b49090c4d64cbf59aa165aa88d92729eebfa87fd7752071f11715a2939a457c00bffcc72943ae
 EBUILD requests-1.0.4.ebuild 1114 SHA256 4e7e1a66805a44c4880ff626e1491efcadc32c518a8d6fc0d5ac6da14bcd1bfb SHA512 d9587b67e6b13b723cc872ca63dba3221e6e45828cb87b34e8db0c262a7ad3098b0541b85267990292d4887385debed8bfc133d32de40087ac119eb1b95bbc3c WHIRLPOOL 5ca29229f9383fe14eb4fda4109f11c0dc0d9ffe0a1f1671549bcbd28d35a17d8697995779e90a4de6857e4395a66f855463a4438ef92830aff79b33496aecf4
 EBUILD requests-1.1.0.ebuild 1135 SHA256 f5e5c0093b8d99553371488f94ca2ee0466bb373e9920413f46708d38319edce SHA512 8abcea70b27e7ec6c6676ac0efa88bc26828a3f76810b68fe0094d9d6c424dd89d9410539c58c78145bf4026e14b7bd07251a85b84c8cfdf1fabf6217f6eb299 WHIRLPOOL f9e6e22ac4d71774918a781770fafa61d3506d7fe15c611e1f8cbf340e573eac1556ad799429856a37af522a2fae7e92e886d4109a3b1299325142c32040446b
 EBUILD requests-1.2.0.ebuild 1154 SHA256 a50be2ed01e42e25103f3f17e766fe1bf1705536606701a3b74493f1424e9c99 SHA512 6e2ae248dd3b2dd4cbad6e6547482f76ebac42f2e601f77cade866925b02afd96276de80fdd4f7dc0a8ad048f8722226b348e0b4e223098a668ddb0f3f5041de WHIRLPOOL fdb3379c40a68a38b5c81595e15adf675ddc10a42c79de58c16a1f42dafef2385bd58e925cfbf78472c77a3d62c2d23d583fe63f3a93bb1f38bf34de7495612e
-MISC ChangeLog 6511 SHA256 c0c49ead413e2a074b0c10bb7264dba1557d042cf47ee8ca5a9f4d31ecac8a26 SHA512 c6571cbcaff10037ab3ed274f3b60131e165008032e0ee833e520a209299ea72c90231a59da91a3107651c6727903aa3425848bf9927eae1d239b8979a99bedc WHIRLPOOL 067f9bb05a756f1303c387875cfe3830f838da2de6a8724c43e8eb95afa762d338629e8287b6efa1b0cbe92ce163000c5b68b2fbca9e884d81647b76cdd969a9
+EBUILD requests-1.2.1.ebuild 1210 SHA256 696f6a0602ee31b13293e4eb5078fa5f9f5e06bf2151e961cbd9487a2d20c4cd SHA512 5f84dab8339a2cbf859c75eabda24a38d934aee2bc276c5a62e9ee33ac3c1d045ebdffad3dcd6ff1326fdea01b46810c264c11d92c0dbb8a1960b13ea73da84c WHIRLPOOL 686847cfedeecbd8e522d434d4969109f2df3c7a6bf73e1137d53fb01644ce52fbb149d8c82c58dec9c83af72bf276630fe576f2dc0a0fd89651194220c29cb7
+MISC ChangeLog 6678 SHA256 1dbb8767ec2943245b123cbc40d8cb68370760b9d7ac131c56bdf3eacd657097 SHA512 15dcf69093fb984eee73d3c23f9b2d307e83500979936f71064f27a3b5cd2334493e99b3c7e33ff69ef4c121ae542700f4911d3aaa3461595b2786a1fd8aa453 WHIRLPOOL 1fb6bc169ca5839095cadaca59853cc69ab3b1d099a1f76846fd3b3e46c6ba4a44d359a6e81622fdbf34716b212ad97b293bb97c496a46f7ad9784e9da94ba07
 MISC metadata.xml 231 SHA256 7bbca8901dd0afb4da18f659567071156f1efea52100213d20d43e53721a0ff9 SHA512 dce3df6bc1c4fc9517e39c41e0c904f39fd092cd63024f03ee5c15aef5b4840dfb265ebe565a5e5a8da9a8805d58b3ec3f772429bf00b125c3172f2f79e089bb WHIRLPOOL 2f6573a3f74f88a549a3344deeea5cdd4f27a310b59d466684902f009c7b404c0557f26f416b450f1f7bdce133c3d52897c5169fce01707233630ddfa783d9c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGVFhEACgkQkKaRLQcq0GI3SQCdGYshfb6anMPv+BVIO3ADOooy
-iK0AoKf/DZw9yyUjphAG1snMY5ckvIVw
-=TNzj
+iQEcBAEBCAAGBQJRmyuvAAoJEEqz6FtPBkyjb30H/0OejZd9cnwzMsye08KgIUu1
+z02hO3uGvBkW11rKcG/1Eorrw7B4p6gxgQi/idgbORyWELxlMzvzV/qzM2bK+4cG
+cinyjRd+ZlyM93WnLZtAYxvuy6TTBUtx3pxgYA11No/xJFeK/534krQE7xf7Fbk/
+mRJHSVK3exHhuwWfaJcDKpRhYnx+RESYu+WyUdgKAp6w4x/yeYRpUMREuiWC70Se
+wcFv9gZeFLk3Ppjn6FLBq+jg54cvI233Mkro3OxzZ1CkDcTUk5osy5pYcT8RZReG
+PReNiykcn3nP6mqOp55gOYzgfBRMS/VLTrOTC0HXfZGe6ZYcBNIrVhxpRZijrnA=
+=D1IZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/requests/files/requests-1.2.1-urllib3-py3.patch b/dev-python/requests/files/requests-1.2.1-urllib3-py3.patch
new file mode 100644
index 000000000000..ec9c675cb01c
--- /dev/null
+++ b/dev-python/requests/files/requests-1.2.1-urllib3-py3.patch
@@ -0,0 +1,11 @@
+--- requests-1.2.1/requests/packages/urllib3/contrib/ntlmpool.py
++++ requests-1.2.1/requests/packages/urllib3/contrib/ntlmpool.py
+@@ -33,7 +33,7 @@
+     def __init__(self, user, pw, authurl, *args, **kwargs):
+         """
+         authurl is a random URL on the server that is protected by NTLM.
+-        user is the Windows user, probably in the DOMAIN\username format.
++        user is the Windows user, probably in the DOMAIN\\username format.
+         pw is the password for the user.
+         """
+         super(NTLMConnectionPool, self).__init__(*args, **kwargs)
diff --git a/dev-python/requests/requests-1.2.1.ebuild b/dev-python/requests/requests-1.2.1.ebuild
new file mode 100644
index 000000000000..50f60af6de74
--- /dev/null
+++ b/dev-python/requests/requests-1.2.1.ebuild
@@ -0,0 +1,46 @@
+# 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.2.1.ebuild,v 1.1 2013/05/21 08:09:17 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+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 ~arm ~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"
+
+DOCS=( README.rst HISTORY.rst )
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.2.0-system-cacerts.patch
+		"${FILESDIR}"/${PN}-1.2.0-system-libs.patch
+		"${FILESDIR}"/${P}-urllib3-py3.patch
+	)
+
+	# use system charade
+	rm -r requests/packages/charade || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}