bump; add deps for testsuite, tidy

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 60 insertions, 20 deletions

diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index 3074eb86913f..7fc1905b431a 100644
--- a/www-servers/tornado/ChangeLog
+++ b/www-servers/tornado/ChangeLog
@@ -1,6 +1,12 @@
 # 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.48 2014/08/13 18:24:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.49 2014/09/02 09:35:56 idella4 Exp $
+
+*tornado-4.0.1 (02 Sep 2014)
+
+  02 Sep 2014; Ian Delaney <idella4@gentoo.org> +tornado-4.0.1.ebuild,
+  tornado-3.2.1.ebuild:
+  bump; add deps for testsuite, tidy
 
   13 Aug 2014; Anthony G. Basile <blueness@gentoo.org> tornado-2.2.1.ebuild,
   tornado-2.4-r1.ebuild, tornado-2.4.1.ebuild, tornado-2.4.ebuild,
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 45929ce8affc..f567ebdcd81c 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -9,30 +9,22 @@ DIST tornado-2.4.tar.gz 347522 SHA256 154f69547fd4731f3472b4094055567c3836b2af61
 DIST tornado-3.1.1.tar.gz 374086 SHA256 345904bfe4a0ce5d687203f783986a73cfd7dc3a9957ee3342cd43d4e310fdc6 SHA512 13f17166153a89ecf1a16a08f0d15cd342f5de7ad964e669e015c2226e2c18297306f47ffc560164ec9f8080489a5fb81cbf6b41f89f12fe1745b0cd73524207 WHIRLPOOL 689f4ba4dc4d98ac7b7de33b15288aa90683bc529364b02c0d5d1c9090b47c5178ef520cdcc93ae94e8886278cc4a16100c167e33a05f406c9431f4a0888087b
 DIST tornado-3.2.1.tar.gz 403419 SHA256 4a5f0b1b381d80ec320c7c8f3265e6008afc527cc35b6c36d03acf18c21fcac6 SHA512 8d42b5c639c302d915d98c01a729d142617242c382830f9068bb220a6536d6a3cf503b68b1001d9acb6ba62457b9072caf1e3b762f2239a9b396f697618e8171 WHIRLPOOL 87dc3062e57c34d713e74c0a3a2066f768274a3c2b5a618c2332ce9e7694fd9b0cadb0eb5b1e0ee4c2c69b3772a343a830ce409ada8f3691a6414d156a6f63c6
 DIST tornado-3.2.tar.gz 400403 SHA256 c8c2949c8d42af781437e356978f00a42b16a090612573cd7385c62451a00c2b SHA512 634b721743aa6805a1216fd79dfe91b9d2fdbcf49054ee36a188de080821659d84bdb9db861fc30c66f1a71b9f1483d972c3aa8806157777a982adf99351a751 WHIRLPOOL 083b5a423eeaafbc96dfc5539953d9dcbfe909e7b03879c0972355df2b11dd36570b4e481dd1015d7a9ee5a3a6ea757c51596b41262d9cf6844881f30d79a4cb
+DIST tornado-4.0.1.tar.gz 314852 SHA256 ae058668b276b1ec7383cfc911323e6d27b3b47e38a12d3d3eaf6b6577b99901 SHA512 a4e0231e77ebbc2885bab648b292b842cb15c84d66a1972de18cb00fcc611eae2794b872f070ab7d5af32dd0c6c1773527fe1332bd382c1821e1f2d5d76808fb WHIRLPOOL eafd8c3cf60c2aacdbdc495f21d4e677cf77ce5ad5ce17d8e13b66b79bb1e416f9837d1b2dfbbe6d24b6447507b71270f1abe533e260e4a960477f974623045a
 EBUILD tornado-2.2.1.ebuild 852 SHA256 895484cba8123cb8787f9b4aa8eed9c7e01fe2bacb880477a6b98811bee0a925 SHA512 6b664b5d47a25faa24828dbee5832aa48d46edbcf813d3221b06f108a9fb746dc341bf8742bfacfe47fdcb8bd0ddf90fdc54fab7aa68f46ddf05260657d03281 WHIRLPOOL 6f790cfc5f7e4d53dbc55c14ec519cce8826bd7c87598f1d4f504fe2625250161fa3954a6482475f72bb1849e36b4137eda5f5e23d108e649a31870ce575b2b3
 EBUILD tornado-2.4-r1.ebuild 1202 SHA256 4dfcb110ef9a4b596c5f21024836b11f62ddcc450353cec4fa2d27d6e129e305 SHA512 78cab616af0346a89a763ca1ec7b6b3d342e09cf0bc61e3ab6a48712db89254be325414e93f3e61a6f50aac443c26fedabf1eca73b5993be767344ef62c8338f WHIRLPOOL f58023152428cba544620d6fc77a8b5b555c256ae9ca221d345bb8fbec5acbf9e13afc5e8402e8e662701de22a87014043f16fe8306abebefd03d1a3b2916819
 EBUILD tornado-2.4.1.ebuild 1201 SHA256 838f9b9d72b746811e71dba865559a65e9f9ef32301b9031bdc69b6cba723b7a SHA512 2a3b1fa25e4fd0936915a89a7a28a7c802623715207372bcd1c3f14270df575e3a5a2eb13416885ee305b5bd6801659c210910973e48a6af10bd0ebe0003269f WHIRLPOOL 0e51261edf7876d9e2def7199d4ea90fb55fd653f49ea645a2bb8a7096e92523cccd641130787fb3820c6ff7c558535027b3a8301315fbedc39c07855594d99f
 EBUILD tornado-2.4.ebuild 968 SHA256 a4ad74d6fadce5aeecc0d2e9b53495fea4b003a9d62f5c38c0cb1d8284ed61df SHA512 0504117f637b0ac138381e27bd134bc6603d267c645eb106e17eee29e4d414ce6e65ea0c39b5467ccf5c089950996f7108e0952839ad8ccb6715b41319ffdb84 WHIRLPOOL 34a32c8c11906be6fb0bc6388cbebff2a04a977e58a1b7b36f9df8bc2969a151044b06a866396dd18483b7dad45ab075c3adee69f60630a39936b6b47e665f2e
 EBUILD tornado-3.1.1-r1.ebuild 1434 SHA256 38fa8d32f6ae63eaab1b9caf51d3ae2a9884a221fe686b63d943cfd2a7a66bee SHA512 7c4ea2a6ce70fbcb410517990738359e79c2126353837b9a06b88d9ac68c752673a36dbf897f1227b52e45620591743bd2a8b5b01286d3e77b1f7324bfcd8292 WHIRLPOOL 196ea953cee635e1b371c7b5c95ed3705831693e4417f3a6c72c5268283c6c1efd2b45f26d6362aa807e00ff320dcc1ce587bc686ac2564b7cd162ab40af636a
 EBUILD tornado-3.1.1.ebuild 1191 SHA256 338ba20c6b0f34b2d6d234a393505ab17934f7a9511491ccd349ef4ff219fdf3 SHA512 1e36c44fdbc6b84770420999fa2c80ccd5bd590577980935a9461a420becab8df4922e289178b1b508dab631474eaef18ade255156e6f5840550a425a1d001de WHIRLPOOL 72dcac508ee79bb54073dc72199f156e2d8d910d62ae6290b69963d4f6139915b5c39ce130da1cea09ad90b5254eb46354a5d6e61d3b95b77a27c92a26c0610f
-EBUILD tornado-3.2.1.ebuild 1424 SHA256 2a3ad4f3f3d7a4f33b420fc5c000b879d113429554c848b638b46e77726bc01f SHA512 d5a89fc647ca391a4e92b6ca74a945a2556da94003e6cd84a60b048ddaec8fe02581fc2cec573bb4d6ae65f25b035d41902814aa1c34d73678f66a391f2edcb2 WHIRLPOOL 482601aeb156d38452931c8c52f39d7eca14b7add880e35406f8158657cf5d99a23a6d9617767e21ae1603ad8d69afc00b8863c140854d9f45db76c8218bd4e4
+EBUILD tornado-3.2.1.ebuild 1424 SHA256 d6ef271a3eebbf2c735adb1944ef44e2729ee4619faa7321b3bb393dcc5cc7bc SHA512 815ae55676cd813f5f04c689ed780e125902e91c291f4814222ef5b8d0706aadf0957b10117d889206c4e8a175c77a0309f57e4259fbd154e4c398ced4b40a9b WHIRLPOOL d4854cceedbb2a5c94f5d1b077bf7aeb26aa6070b66d8ff7fb9b04b8b602871b3098d6ff58c2a5fed4339eaf34d12eb8047ef75a6f2d5c691a84fc04df9392e2
 EBUILD tornado-3.2.ebuild 1554 SHA256 27d8b2490d439fd62fd00e4a9d7b58f110ff1c047c9fed5c88373de3c65a8034 SHA512 db6d8954382f37422ef862531dac5d8a7ac0529cf4f534442d0971f779b5f94c4822f759d25bb039caef90561957cf4df1048cc74780a75b884750e7d91e1a91 WHIRLPOOL 6b662916fe4c0904d249df85f16fea2a1766a6bf52e67446a5b07913bee1b25c82c98bece2b75cda053c8f1bcb8381a8bc1cfa95e3989dff15ee5887905c18ba
-MISC ChangeLog 6682 SHA256 b8e45b5a9433b42a9b6fd8c9ea36b350b7e17de0b3aef40bb19166eb52314b86 SHA512 dbca642cf28f88b2e6e24ec0150bdfe421539923f115bda66f373d46a683698d673e41bd05b7cda393f7996986c903b3450e0679d3b8f2d2f496ad3bbe1a9146 WHIRLPOOL 2b76e45110250e5a89ea04107d5733dfcd05f4edb1922848e50fb32dc9300aa6559537b8a0250b600c6c07bb1270735a243977cd058fa896984d4f832a1151e6
+EBUILD tornado-4.0.1.ebuild 1320 SHA256 58f584518caff7607341db518d871019a61a95fd09194d2ad9ff87f3f214ca64 SHA512 0e6723e6eff6ce9a5212dc1c66aa77f6043fa06014182568f52cdd958ba9bf8850dbac7a7c6e51854220c40757052230ecc0d3379dac140cfc9bd41cb7bb40d5 WHIRLPOOL 231598aa5dc58c5bfa3fe0e1b3c8f61dec34201b6a3d263286a5f1bf30eecb40fb2f69be3084060bed1aacf4e26f7e01538164023dd8c4acc4c0ccba2aae1e6c
+MISC ChangeLog 6844 SHA256 681917d9d9f727080bd9a41a81341a698635f65fd2cf230b6d78f6693580899e SHA512 3778380b4e644e5a7fd38f678dddc7c8c2f41f13cc465226125c97a04c87ac09163d391876398d166f18cb20e301bba86408bd64b5547bf2c396beee05cc88f2 WHIRLPOOL 5bd7e7222c4078ed12685d00d9128fbde33302fdc0abe4a94899f6f389fff8260429b4cf96ba66eafb718af10ae02dfa577e916eb1dc2eb990aa9ce66a0748df
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJT663WAAoJEJOE+m71LUu6Tm4P/1G4JUzrQ1Ny44Ny2itaYD5o
-CosW9/IB3LX4anEiZWuv5vitqJ7PBNOYY6VwmkwyB9GS3+axIIZe+QwA1eyyDOLt
-kPEK4Abe6WnkCJUKcAJQgM3yZeMrCsv+b+fzTwS8iXb5j/EyIHtyCnloW8L1jPmt
-lpBZ1VWLuvbRJpBKVBpLXmZ0/sR/aL1d3kCS6r/cb7kWZtVBCkRRI3ftikkduMwQ
-fQkNhXWz/XcrXKKQ6gj2PMXiEEPk+GbMxZDiT5LGSUWl4fRDKO6lhRD0g7Er1e6t
-NvI9MfRSAMLipFBTHwjhzFXDe9/n43rlKFaAU1tbykM0o7BWGHh4DrHg1740UxIV
-bCvu+vKCbGybD3yxP0mGyRVq+pF1bi8D6Wwzi+pHp/ecnzW5LqxyZGj4PYeGMjzD
-prZmGnyJ4klEYcZjZpdEEWxMXFB2AYMfFgYt18fy3fNtfJ32Z/u7RQzmPL69+Pk7
-p6VfrfY6YJ8v9m8v1fd0MYFvmx6kcsBDjzDVXKpCHkf3v0fDIvELpx34/Kl+Hbue
-IUgYNxSuKJ9Q8obiKFGRcGhhghozjSuGpwsd+Lk4Y3Cn/4A7kJ9aivbf8N9ZMN0f
-iqdjQsIabTHlU3eYcRnQkwx3R0D/JX1wa6KWGPGWWE2qFdgahJGWl3TL/XUo9diZ
-1VCdxRazCKc4IAqG+Bg1
-=aDnJ
+iEYEAREIAAYFAlQFjVoACgkQso7CE7gHKw3NDgCgkRJMPXT8fAxPoxCfVnSDTCDv
+dCEAoJernMd/S6irEZE+YbEvNFmp+9Hq
+=yTCL
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tornado/tornado-3.2.1.ebuild b/www-servers/tornado/tornado-3.2.1.ebuild
index ac2c22dd8866..4bfd14aa5211 100644
--- a/www-servers/tornado/tornado-3.2.1.ebuild
+++ b/www-servers/tornado/tornado-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.3 2014/08/13 18:24:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.2.1.ebuild,v 1.4 2014/09/02 09:35:56 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
 IUSE="curl test"
 REQUIRED_USE="curl? ( || ( $(python_gen_useflags 'python2*') ) )"
 
@@ -25,8 +27,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7] )
-	)
-"
+	)"
 
 src_test() {
 	# The test server tries to bind at an unused port but suffers
diff --git a/www-servers/tornado/tornado-4.0.1.ebuild b/www-servers/tornado/tornado-4.0.1.ebuild
new file mode 100644
index 000000000000..8e347d2922b3
--- /dev/null
+++ b/www-servers/tornado/tornado-4.0.1.ebuild
@@ -0,0 +1,41 @@
+# 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-4.0.1.ebuild,v 1.1 2014/09/02 09:35:56 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+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 ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl test"
+
+RDEPEND="curl? ( $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' python2_7) )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
+		dev-python/certifi[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)"
+
+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() {
+	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}