Version bump, fixes #473574 by Dirkjan Ochtman <djc@gentoo.org>

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

3 files changed, 61 insertions, 17 deletions

diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index bc58d2fd6fbb..89dbfb9c0816 100644
--- a/www-servers/tornado/ChangeLog
+++ b/www-servers/tornado/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tornado
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.37 2013/09/05 19:44:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.38 2013/09/28 08:01:01 xarthisius Exp $
+
+*tornado-3.1.1 (28 Sep 2013)
+
+  28 Sep 2013; Kacper Kowalik <xarthisius@gentoo.org> +tornado-3.1.1.ebuild,
+  tornado-2.4-r1.ebuild:
+  Version bump, fixes #473574 by Dirkjan Ochtman <djc@gentoo.org>
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> tornado-2.4-r1.ebuild,
   tornado-2.4.1.ebuild:
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 725b8b8d0dca..96e28fbda8dd 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -4,28 +4,28 @@ Hash: SHA256
 DIST tornado-2.2.1.tar.gz 330509 SHA256 466fea7696457be3d7b9c9a97c16011f0988788336e7d6fd344554a042d203c1 SHA512 f773d1bd761babc4d5367a72fa4ceecb01db2a3235f8f4e6c40a755f9042bdb283dbdbb42f9c4ccfe5474180dfc98bc39b126cf850a7367eed83d6b261227725 WHIRLPOOL ebab538e34e51e3a1df5d87e0e2fe1d5f54ffeacc600394c88882315bd393a4bcebce5bf4a5d61ae65302414b17c8423103f5de91be9f22c725d6521aebcff6f
 DIST tornado-2.4.1.tar.gz 348198 SHA256 14d392cf14698eba75b9299748fa83716f7c02fc49684dfc5011668c30ba6b00 SHA512 a33260ada089850c111ca2d3aa06a51b58bf4f64f1de97d7421a3a6ee068501f9593d6775a4a4c5aeb1c020eb5614df97d0a508e2937a75307585777189a6b85 WHIRLPOOL 39ddce965687b69ab57f9460c7b1f59ad99c1e3edc533553a72e31c357b19ecd8967eceffbb96b0146e8b4451a029ce61a7e8c0343965062257b042ec82db418
 DIST tornado-2.4.tar.gz 347522 SHA256 154f69547fd4731f3472b4094055567c3836b2af613068499cc6d09c2333ffbf SHA512 8da1c98d179ed221b5e432e2a7c59084d09072ac5884b5889cb3482ad36d54a801da15ae06ed543efe5733aea8364af49fbf1d64868fe4cb1d2592aae0673205 WHIRLPOOL 2e6f12c1af8322cb9eb6ffeff008fba6477cf62aa3f38d61df8780f84c494a8699b1ccea2157a79277b00406be17c58d75831d78f664f8bef11f94bbeae8ccd8
+DIST tornado-3.1.1.tar.gz 374086 SHA256 345904bfe4a0ce5d687203f783986a73cfd7dc3a9957ee3342cd43d4e310fdc6 SHA512 13f17166153a89ecf1a16a08f0d15cd342f5de7ad964e669e015c2226e2c18297306f47ffc560164ec9f8080489a5fb81cbf6b41f89f12fe1745b0cd73524207 WHIRLPOOL 689f4ba4dc4d98ac7b7de33b15288aa90683bc529364b02c0d5d1c9090b47c5178ef520cdcc93ae94e8886278cc4a16100c167e33a05f406c9431f4a0888087b
 EBUILD tornado-2.2.1.ebuild 854 SHA256 d0f3353d847c391b9197ce772e97ba9e15e5461cf38579bcefd3083e3cbdede8 SHA512 a3129225371393ee1921e83ce5a77e616169ff0aefbe582418c3e5a861f282ef1f71164d6f8d2570da7cf7f54a391af1c703b393b131013b960f2c8410ad3aff WHIRLPOOL d257360453916fb11c13821ae2e9bd67002a8d93d20d3cf59464453961798fd304626a30b3e4ffc6c5d70d316f173504609b8bb1dfdd47a77f936a73170e2f07
 EBUILD tornado-2.4-r1.ebuild 1183 SHA256 f01f7d89f3b90839d0d79dba6383c2b3e71839b5cf197483b19b4e2296bf85e6 SHA512 1241fd6ff3d59d0c62240cae6dbb200a3e0b5b5648177b674751bf0bd28d38d065d147405656512c63a437752873170649114546debcaed57d2934c46f25a263 WHIRLPOOL 4614a5827b3fd5df384577cdff826079c828f1e65b1384344caa8720a326526f5d26f3710d4f390eb55dca2973694442ed5133dd01d72ce0fe5154eafb830ccd
 EBUILD tornado-2.4.1.ebuild 1182 SHA256 e654955dd5670964fac70e7e8c0670059ae6189932541bd79562cd0072f19c78 SHA512 d0a7fb6c6f20143d1a6f2be4e3bc787a5a647e574c3e3c2830ab7acc500ed291b7bbf7fcd0a8ba136775808f364da243c5ba20b8990985f47a2c15d872f7afa3 WHIRLPOOL 54e128b574be4c695204c446d8e6f7265fe8d23dd53a6c83b9b034878b6322194f681f5ea88c74c19af51bf720c898757e2594ca04ae23d5bcf1a070603d303f
 EBUILD tornado-2.4.ebuild 951 SHA256 ef7470ad841f08c6048139e1c8faa472fd32913da5ec4ec6f0cb129014fa3e0a SHA512 31ad5b6f33477bfc333be9afeb2edba2e5ea4f4e0d94cef5510e9158f7fa0bf9418d00f61bd8c8f3188f52c6c8e81f0ab9c932cf78df4491375bbeb7b65eef6b WHIRLPOOL 067ae6af004e56a33f5b9e866da390d9b8815de912c0a536adef267c32d64d35439ff2ca0a66347539e0151a00092c1f7687b3cd75f145adeca772355507b291
-MISC ChangeLog 4783 SHA256 78b23d61279cc9e96235da9b73aa5d26d1b211633bb688fb66d7e6914acf767e SHA512 3ab18ea247a2af1e5e577da01beb31c5e3919848be3963e739ed8e3a3985a0633a55ae09c71e6eb41b890cf7d163caab2dbca6307cda8e353379208423310522 WHIRLPOOL 3f71bdf79634bd2afb10ea53ba0af38165ad0228967b56469d1ca7ecef628ab9e1725373d747315178af09dd1f3ce15a9c2b935c3503d35158a1ee3a95640148
+EBUILD tornado-3.1.1.ebuild 1179 SHA256 4685945de42d229c76b52f055e5395aef6d0535e26e6c25e655001e7e13d1c03 SHA512 7d6162dd3131668bb7e8eb1f70b14f874babe4d062814e472ad1354e578202bf3458ed485bf08ad8d7ae4032f711c6f8e514be30289efa75420a055c758bf975 WHIRLPOOL c7b91e23e7f07d0008efb24d0cea6c983c3738a10413b326556a2e457ce2a0cc890facbfaec9465224cd304d37046fdaaab67427592a5ffd3fe560446a5685ec
+MISC ChangeLog 4986 SHA256 724e83997d644667fb973576f1d28780fe7c3de86bdcfa42e2bc7cb513ba9ab6 SHA512 35654a30b2665e65067d4c6601d9542c266f51ed68811bbcdd476e5eb0cf1ecca7481cca843c53842f3825e4949ab1f2b2b86293889e193ffa006482d442ddde WHIRLPOOL 9bbd1667a9ea466c34765c1ecf3736c91875496313534569c023038d0d531c681f45ad89b3e6a0bb606668380eb990bdc512f6b614ca9e3f43123581268f145e
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKN+EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlU4QAIVa4IO5ctuYIpoA3RfS0uKK
-l2o/Aehujm8dBFG8FhFlaMMEu4HrGSPL2wlTR9Etney9PCdVU1BxGfnNMIMi4csR
-CDaGE5iLDcGeCk9gJM+6vdC9lqHqf+B5zFCBrNEXGAA4dE6QYKL7qXv/0e/mFNH3
-ZeysEXXZh4S1On70mSwkWSyq727K+XUjh6nUzeKPE5DUqCgX3kV6WmykBQtza/na
-wPx6RwIospo/PXOAkY+qyI/w8POQhtfBXAtrBGzdfwNznEhlt/tlv+w8/PbZGB45
-rNXW42HC3M2ffXJcBsdPHH2rfJhDno6k95vs7TEdZlmngPZBl3v59hXtU8fafNsu
-RWrGpRZknF4C/bxqo4687WJurZNjd+b16JU1cNbLK56Mf3onhhdodrrykp+viRRT
-3Aitj1Kx1vVg3JSC3Szn8QCmx4plgv+OlxX78XaoRwSy6NjYKRqXsWjzgZL0NU6x
-K/cowjnwpKOgxlloU2kzeNwg3Y3NRwOBeu1cSbsLkuNfJ/L1rCNM0bxzq+tUUaJJ
-OCfTeX1nQ+NgozDWOPme3Wh9jcjrKO7J5cAQqm0toJCyu8uhBtYFBrCnfAsOwiMy
-0iUU+fm1ZgCKKkVn4Q84Zp837n5H4vTRlYfmYjXGpe6dJp6rEB9wk0ur1Z6syRSM
-Ic3RR7JcT3DjAqP2Qnpv
-=ttMg
+iQIcBAEBCAAGBQJSRoyBAAoJEF0huFKJUZL5/ywP/0G87hdsDsLc/KeH1MLN2rO9
+8r6oJhq7eZ4JHX7wrrINtpJ0igctQI/p5i6nsvr3dGkWL7WCJElHEaey48jHqYuM
+OoJQlguYutmSNTTOYmTE4GjkvmuaENj23H3Ez5y2z2WS3sle8xAW9KgjZqmUDY8h
+G03wCQknaveV3dw9P1RtXy6HCHqzwADt7nQjflbGuyiRvH9jAseIHoZwpQuptdWa
+ejoR3uoF4URqlBEyqm5jxG8GwiGJJUEgAHa6dpCi/q10a5ayDvWbmIKnUe/oJSO5
+GPJxcjDYALJbh8tAG7F4cR0ya9sKgPvBcQ2LG16xelUu2T+soPFlw+GMHMXmyMl+
+KUhrOQYfZBbZkxUeqrm0kgJDm8+Hf1oUpgP8l/KcVLkf5GeVcgJLMUbgeld0foa+
+z0EZEiRqn+X1omMSU8sZhPdBcgF+2XLMoGgECPApPo/YobAnW4vclwvUggufApDb
+vhw/tjvfpMtu9Gq9HDeudOJHHF2CCM526BOR4I8txVTPgcPHA1XS/gm8DxRhhJBY
+JzkfjbwVJZ966WI/i3wY/FBK3+Oib4tXd4qMbpRXNnUtQgxxCNw7g3TnBvyp1NH3
++0Scjbz0fR4wOqRlEBKvlZNRvayLCXSLsZzUADliZhwv7XP9FR0xIoEtz22ugVyc
+H2lVj5GGw/TLXIDdETGt
+=mHob
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tornado/tornado-3.1.1.ebuild b/www-servers/tornado/tornado-3.1.1.ebuild
new file mode 100644
index 000000000000..544df8866d83
--- /dev/null
+++ b/www-servers/tornado/tornado-3.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.1.1.ebuild,v 1.1 2013/09/28 08:01:01 xarthisius Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Scalable, non-blocking web server and tools"
+HOMEPAGE="http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl"
+
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2*) ) )"
+
+src_test() {
+	# The test server tries to bind at an unused port but suffers
+	# a race condition in it. Seems to be fixed already.
+	# https://github.com/facebook/tornado/blob/master/tornado/test/process_test.py#L64
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	cd "${TMPDIR}" || die
+	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}