fixes bgo#486746

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

5 files changed, 143 insertions, 15 deletions

diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index 14b797fd7e2b..2179e33895f1 100644
--- a/www-servers/tornado/ChangeLog
+++ b/www-servers/tornado/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tornado
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.41 2014/02/16 20:39:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.42 2014/03/08 01:34:43 yac Exp $
+
+*tornado-3.1.1-r1 (08 Mar 2014)
+
+  08 Mar 2014; Jan Matejka <yac@gentoo.org>
+  +files/tornado-3.1.1-py2_6-tests-fix.patch,
+  +files/unittest2-import-issue-1005.patch, +tornado-3.1.1-r1.ebuild:
+  fixes bgo#486746
 
   16 Feb 2014; Mike Frysinger <vapier@gentoo.org> tornado-3.1.1.ebuild:
   Mark arm stable.
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 3267b06afcc8..cb7efba04d09 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tornado-3.1.1-py2_6-tests-fix.patch 1207 SHA256 9d626ebbb1c25a6ad58697269e78779b284285f1ea128785555bf064a310cf1a SHA512 b0880812cffcbc15a3c214073661def56fb90aaa4c2d7a88dad5ece25a65f5c877a4ba63e598e7faee0d67280860d687fc391856b0445cfb692abe4c6be00a55 WHIRLPOOL e7d322497636847205e32cb1a5c6c3631bb80158f278747c14d76156e7ed948a06eb46c4e4b9fbb885e1a35a32d78db23cb02e1ba8d4de3ccf7352b3d619a082
+AUX unittest2-import-issue-1005.patch 1415 SHA256 deb6c7204c93df4387a8c342aabad167268426fcd0cb087410e3044b693d5f1e SHA512 5220e51f494b72522556b79a809e822e20e2ae715df5f23ac9a68e5377f4494e24a44abef0ea2bbc1e7c182d681adee8441a82fa8e4486a69705c32904a822c9 WHIRLPOOL 69dce411bef03c89507d706a5c8d3e516ecf104f6a5c02977a0a6135914ea74ebe2ca71d37fe446f3e240a4a4d7de8f43a47c56974b90039e7d286589ce0c8ef
 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
@@ -9,23 +11,18 @@ EBUILD tornado-2.2.1.ebuild 854 SHA256 d0f3353d847c391b9197ce772e97ba9e15e5461cf
 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
+EBUILD tornado-3.1.1-r1.ebuild 1558 SHA256 3647e611cef1fc35b66ab3914fe0dd29b4c205a698dfdd8726020b287c3ea218 SHA512 554cd28fa8d9b7b60be6e67dcff55630dcfd3ce8720cf9dbf40ccca95c63e6235bbdcbb0ca71e3715840b5a4d0b934196a077f29e79bc2f555b9e89fd2b3a2de WHIRLPOOL 75a3a6c5cc8c0ee95a30de3ef2ae3318c0884eaff725d08ecf2e04238901121015e95f35c188b1121d584afa4adb31f3c2ea2853c4776bf9805efc3e9df21710
 EBUILD tornado-3.1.1.ebuild 1172 SHA256 e92da1b4531a1ad2ed1eef1269a0113f3e0f2c02e3d5a3f23bee69e7c1f4556b SHA512 800e283084fb709d89966aed2538751fcad053fc3ec69bbf1bb1e1c5c537f6a5ead7b2710f6859a4e68f8da8cd8290882bdbea934d2a8a0f0fa17ded1ea7d9b6 WHIRLPOOL 0bae37ae17aef4dd73df50255d90d8f9e6578460c8eab8a0a630cabfd56a96d79ec7bdce4af9d9311d2aa372247464d15c83eaa8ea9c613a71fca06ebd56308e
-MISC ChangeLog 5266 SHA256 b0e9519917028f79597b174250c85b45f81470145cde4321e7754a4c01a995c0 SHA512 15a553bb14630f5cc17bcf2508949f49ca9d97bd35115fad68ece2620eb8dd67ce6b25d8720bef8b7bde91bfc3d2430f062c2c0194d0f8c8ce6b62e52a3015f3 WHIRLPOOL 366784d264eb594b761a8178b43e040ea5c0543d98c41dd1ec30e0d2b588b95c77e1ed17ec03d177ac772a3492964ba57dcf09d800cf9037c36f1fe84544a1e7
+MISC ChangeLog 5476 SHA256 74f1bbde43956202627dcb41d12e585f39cced7113004a1b0854db040c0e58a4 SHA512 034677c8711d7a908d9f2660e3d93188d6e001425aec8761cb8004913087d1331108606af7a869f7ff64c86e7bfbdd6b3f60b5c7dcfd86dc5f2b946f784d9e09 WHIRLPOOL 4b781dfe77d7d2d0a07bb31527214a476fc094ccbeba4b53cddb803445fc691fe6961edbc8700284980c92652e0c8f72aad2649630d47bb785846219897ab1f9
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTASHvAAoJEPGu1DbS6WIAGr4P/0Fqy0fSlbSCGLx1eo4bDstI
-2Kne0ScE+gL+1f/IXj+KyrcWNdIYT7stJ+brK3uf+kTWZd1d+88aljwNgCGuLVyE
-UUiRUnr0/sBlsOLrJXtb+s8+cTkX0aL3f5AE0HwyDEPtDQ+ivrf/QWAh0ED/C0eP
-mFRcAWTY+ZdBjtrtb/cqp1mtRYdES9PHRq2BieX+yOiD9r/Z4JGUweHu/4w6w4x3
-y/+lBthBvKJriiazJZRLVi7K9yKIAkiBTXGvMrKjgq6JOfM8le+clzeoDwvE7Jn6
-f21DHGZY6MEqBaTLkFS83LZEIZG1m6NCjwMOp8PQI/dJjvuRFotOskZReWM1i+EF
-pG7f5ISwc1T7iXLS4aPOy+LUsMcUkOHnjOAIeRoY0VXdHdfotpU2hG3TnQMC6/aW
-cPi/1Fohch8Pf44IteqSLKhcR69ldz/a7sSKUTSzw5AXyZHbiZySkI6Q3UvGuID8
-UE/p+aXUY4GJMhinoS1LK4OzINQb1DSPZgL7DSlICR+Fvf3HCY5UkGDRPg+omGaz
-uuPZ6Te2OE80C9etO6l/EPbG44qLopSctU8nmrTJv4PhdozPQk/AHoKMLNcHpgKx
-SDqIXWeuX8CG7CesSlV34Y3n1a3J11aKgQ7uGPzKDVGMYgPPa0rcOCqa9AAyWfw6
-Jtm9+kB1lWkYNWHrYLNn
-=+ECi
+iQEcBAEBCAAGBQJTGnM4AAoJEIN+7RD5ejahU1sH/3/HOCjS+t/0gqstcGfeLIac
+/O9oTg7phsPfIjEU5Nn8lXoZv+MQNyb+jx0tlEdXnR4nipdRoGYSFkO4Ie4yI7cF
+xM//948y0u501eGmsDkuXiiT5KL2lVAm1uZxBuxM/Pxi1xep+mh1IFkPCH3vo1oF
+g/BcB/fwkY1/ZW29rqkFQrrpLPspWQz6Fhu1L9MCMZgZ/bTr5BXofy+7BrKTP7vy
+1WMgy4cbzUrAkZC2edaCMegfJmpGslJhnRr8LTHhx0U0+5h8BSWSjOjhl8psWSch
+Vb/UdxFigaJiudvATefxKcuRmZj5yKqeJhKMLr3jphYqoKwW71j6NXNgj9hLGbQ=
+=9NFG
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch b/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch
new file mode 100644
index 000000000000..ea18df2393ac
--- /dev/null
+++ b/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch
@@ -0,0 +1,31 @@
+diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
+index b8d9c6f..998282c 100644
+--- a/tornado/test/twisted_test.py
++++ b/tornado/test/twisted_test.py
+@@ -22,6 +22,7 @@ from __future__ import absolute_import, division, print_function, with_statement
+ import os
+ import shutil
+ import signal
++import sys
+ import tempfile
+ import threading
+ 
+@@ -477,8 +478,6 @@ if have_twisted:
+         'twisted.internet.test.test_fdset.ReactorFDSetTestsBuilder': [
+             "test_lostFileDescriptor",  # incompatible with epoll and kqueue
+         ],
+-        'twisted.internet.test.test_process.ProcessTestsBuilder': [
+-        ],
+         # Process tests appear to work on OSX 10.7, but not 10.6
+         #'twisted.internet.test.test_process.PTYProcessTestsBuilder': [
+         #    'test_systemCallUninterruptedByChildExit',
+@@ -519,6 +518,9 @@ if have_twisted:
+         ],
+         'twisted.internet.test.test_unix.UNIXPortTestsBuilder': [],
+     }
++    if sys.version_info >= (2,7):
++        twisted_tests['twisted.internet.test.test_process.ProcessTestsBuilder'] = []
++
+     for test_name, blacklist in twisted_tests.items():
+         try:
+             test_class = import_object(test_name)
diff --git a/www-servers/tornado/files/unittest2-import-issue-1005.patch b/www-servers/tornado/files/unittest2-import-issue-1005.patch
new file mode 100644
index 000000000000..3ad5b9158c0a
--- /dev/null
+++ b/www-servers/tornado/files/unittest2-import-issue-1005.patch
@@ -0,0 +1,41 @@
+commit 79e29c62ce095984d0e9da5b7c5072eb9aa6e131
+Author: yac <yac@gentoo.org>
+Date:   Sat Mar 8 00:32:09 2014 +0100
+
+    fixes #1005
+
+diff --git a/tornado/test/util.py b/tornado/test/util.py
+index 3604310..e4e37f0 100644
+--- a/tornado/test/util.py
++++ b/tornado/test/util.py
+@@ -3,6 +3,10 @@ from __future__ import absolute_import, division, print_function, with_statement
+ import os
+ import sys
+ 
++# Tornado's own test suite requires the updated unittest module
++# (either py27+ or unittest2) so tornado.test.util enforces
++# this requirement, but for other users of tornado.testing we want
++# to allow the older version if unitest2 is not available.
+ # Encapsulate the choice of unittest or unittest2 here.
+ # To be used as 'from tornado.test.util import unittest'.
+ if sys.version_info >= (2, 7):
+diff --git a/tornado/testing.py b/tornado/testing.py
+index 96fdd32..cd811d4 100644
+--- a/tornado/testing.py
++++ b/tornado/testing.py
+@@ -45,14 +45,7 @@ try:
+ except ImportError:
+     from io import StringIO  # py3
+ 
+-# Tornado's own test suite requires the updated unittest module
+-# (either py27+ or unittest2) so tornado.test.util enforces
+-# this requirement, but for other users of tornado.testing we want
+-# to allow the older version if unitest2 is not available.
+-try:
+-    import unittest2 as unittest
+-except ImportError:
+-    import unittest
++from tornado.test.util import unittest
+ 
+ _next_port = 10000
+ 
diff --git a/www-servers/tornado/tornado-3.1.1-r1.ebuild b/www-servers/tornado/tornado-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..4f06656c5ffe
--- /dev/null
+++ b/www-servers/tornado/tornado-3.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/03/08 01:34:43 yac 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 test"
+
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		python_targets_python2_6? (
+			dev-python/twisted-names[python_targets_python2_6]
+			virtual/python-unittest2[python_targets_python2_6]
+		)
+		python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7] )
+	)
+"
+
+REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2*) ) )"
+
+PATCHES=(
+	"${FILESDIR}/unittest2-import-issue-1005.patch"
+	"${FILESDIR}/${P}-py2_6-tests-fix.patch"
+)
+
+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}"
+}