Drop stale conditionals after py2.5 removal.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 30 insertions, 30 deletions

diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index cd3d6df260e4..c7b8a38d1373 100644
--- a/www-servers/tornado/ChangeLog
+++ b/www-servers/tornado/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2013/05/20 15:51:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.36 2013/09/05 14:14:28 mgorny Exp $
+
+  05 Sep 2013; Michał Górny <mgorny@gentoo.org> tornado-2.4-r1.ebuild,
+  tornado-2.4.1.ebuild:
+  Drop stale conditionals after py2.5 removal.
 
   20 May 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 fbe01c54a7c7..6d42c3f7309e 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -5,27 +5,27 @@ DIST tornado-2.2.1.tar.gz 330509 SHA256 466fea7696457be3d7b9c9a97c16011f09887883
 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
 EBUILD tornado-2.2.1.ebuild 854 SHA256 d0f3353d847c391b9197ce772e97ba9e15e5461cf38579bcefd3083e3cbdede8 SHA512 a3129225371393ee1921e83ce5a77e616169ff0aefbe582418c3e5a861f282ef1f71164d6f8d2570da7cf7f54a391af1c703b393b131013b960f2c8410ad3aff WHIRLPOOL d257360453916fb11c13821ae2e9bd67002a8d93d20d3cf59464453961798fd304626a30b3e4ffc6c5d70d316f173504609b8bb1dfdd47a77f936a73170e2f07
-EBUILD tornado-2.4-r1.ebuild 1274 SHA256 e7941301e73ff8a03bd1100e286f2336741a22012eaf77bce7683bc24db4ae0a SHA512 b6798d1987dded009d4f44ecbd8d5b44f2470accb0b6924741814751c5a49cdf9de57c0ee4905476d608b9f3967ab765234ddf647f20ea5d7c70f83053b5103d WHIRLPOOL 6bd1542b040b144ef73a3ef36ae1ac7af7de2b204dbd4b66d47d52e974e6f83524c4db8878091af22d5ac0113eea0ec1a24c31e143e9e78a1e40a79b09d8968c
-EBUILD tornado-2.4.1.ebuild 1273 SHA256 2c858b75fc998d804f413d15172b1da8730e39820f8bd504ac6d6a0039aa1290 SHA512 60b2d5f48c8f601b3fb8e32b0bb81fd48e6a24c06b777a10e0de986e34ab74519ef96540e509d89ea5207b3c177ca7719e081b35ba80c3f9a6e9bc7174fb0c79 WHIRLPOOL 53ff0d34b3143ef488361c45fe0476ebb0d6ae32672049cd525df18fb878ee2940ba1cda2ec99b4db739669f11ffccb5105642487b6e3a397289b333460a11c2
+EBUILD tornado-2.4-r1.ebuild 1189 SHA256 3d7e36e22ff3c14e27d200d166b1a2312e0ae7a45da65a4cb1d20babae436813 SHA512 eb666b45b9e26693c9c9b3cfeb546e8188a0dd02d29b4d49116affa6aee1caf3c273404d7e74952b30312718da35d9a61a7f088909232ce2e822305691d13820 WHIRLPOOL 20f1b2e28bbee2103dd6258e486832bb8b3b00a3c43c2186b2898096c20ca25fb330a012e4b041fc4cd3b1e52c785bdb31606e920805dc98b7a7b0b0a8c0f20b
+EBUILD tornado-2.4.1.ebuild 1188 SHA256 73aa0f7ffaaeaf2458f53c2c07c396e109996299be7b667d90e00232b4a4818b SHA512 b289d0a26573a35af046a4eab5768b70a8e5cc5e6f9675850e345f10f41e49c303e6e90f7023c0811778278eca0557fd26f57515cb3f85a5aaeeca2b7ff45680 WHIRLPOOL 91b14237e6d85803f4ad38236fb27f18bb977b6bd3bef1dac316a85930b1b4ddf6cd3308970091d8694bfb5c4d7668456d76958120e3f8d38751ede30e1b4746
 EBUILD tornado-2.4.ebuild 951 SHA256 ef7470ad841f08c6048139e1c8faa472fd32913da5ec4ec6f0cb129014fa3e0a SHA512 31ad5b6f33477bfc333be9afeb2edba2e5ea4f4e0d94cef5510e9158f7fa0bf9418d00f61bd8c8f3188f52c6c8e81f0ab9c932cf78df4491375bbeb7b65eef6b WHIRLPOOL 067ae6af004e56a33f5b9e866da390d9b8815de912c0a536adef267c32d64d35439ff2ca0a66347539e0151a00092c1f7687b3cd75f145adeca772355507b291
-MISC ChangeLog 4489 SHA256 c6ccc343fcdb64cce5cdf9f71b91189b144c2ab58d008ff7c39cbe61328687ae SHA512 29cf10140de948db342787d88d93f21f0d24d413e71b1cf173ae01c28e5f0aa25640252e5bfbd1ed50fa77d6644eff6ba22327bfd8e04a9203c1bb61d8202a42 WHIRLPOOL d4f92c006fbf63b91154b4c7a96df3308faaabcca7f39a2a4d596a646992cd1c1a7e09f9782ed31b26754cd9d9878d3f221fc930c50cc6a53762c3d05b622740
+MISC ChangeLog 4634 SHA256 3e0180d865a1edea9d834fc4f00d3b2d6c0e3f700c796f1e48e3327bc3cc86c5 SHA512 de27383c949b50756f93bb2376a39f24c79aadd30e25e39160c2194995f91c3d0cec464cdfebab11cf67983e13e8e942bfc9ca82922746f533c456d265d90c88 WHIRLPOOL bb7dc26cde810b3aabbac4beddb746f45b15b71c993f82bb81eef0bcf3aa8aaeaa36d1a342f81ab5ff756e402e948a2a94505d9d2d49d481e36bb59a52f9fab3
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRmkaTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDefQP/jjOWC+IB7ZQTiPFwOcNfsNS
-k08bA6M3bUweVV+U/MevsrqfaVp3M8j2znvgSExN3zWiOlCUYdYACecepG4voouV
-ZmTG3DsbCFHBaPbtrY03+P4dbcA2q1nYU6MJ4rrCjh64y97YUQisEEz/PDa0gvSn
-RxKhuTC8J089j+wj2vyd3KOCj1Ifo+LJBMtSzcNXnRsnzONuolk5IVuoDTod2ZnH
-DoXqGMVEEEN7XGho0BSNmFvCtuLF9gCxVUpxXPEIEvkdQU8BAMF77ppwJHEJuWHG
-STGjLO7unWewEvbxSYMaxPvDubwO6YyQCPUK54Tum/kRYqXJE/rbL7PYrgcYJsoZ
-5nxL0qQXBvBFLT9EWuDomlW6J2lqQg55kgZnwWOGrZe/p75iGB6VybwhJiVg9X0v
-re5LP3yhdS9pSXhksMoTumbYEpw7aaqVe1AZiyjNQm+SlRanprTmp7GacONlgK+w
-Ii/IpfeTiHAyiX294gXehpJNRuOA8EhcFMA21zRd+6A9G6TIl3S0VnEFR/Rmtflz
-azLVVnSk1WqB0/S2rgpcnss0wIpQSypD/8WJcgJQbGwMERra009sPKkyzG1fzPFu
-odp0Z1sH5XvvCgNCGorDt4lD8oyMPXO4YtfyOODwNbhSOZIvC0oa84wHW6a/tZnM
-U1S4SmZtdz4Gujq7zB4Y
-=ZOVM
+iQJ8BAEBCABmBQJSKJHfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOs0sQALmmn+xJKKrMERvKCD08oIdR
+gcY8lSbVJLVtL9ZB3kwthw46LoXNjbGgak5wieYELSoubMWIdu7rElN23J4o6Fno
+Q8QMJOmWZWdILrjK8yzNhw09qaO2TZxhtLfajXpAxMGhP3rUOkPOgTa/2GEWtn9G
+EKabyEXlSEnzsdtUYlsCo6q4BEdyK3F+s35B8eB34x+FuFnNLvLTDlZuqWBPizBz
+ZjYyybwpnTqO4+qmaFn/kmaES6RMJa5in/IL04lfazanK7n1OoSkQX8GSZbgnRoT
+cQb1iaJlLXy6cgw5ByYjZarUqhejF68Y0LbOLewC38cQ5THVsuNE71GMq35J+aWO
+Dqa1GU0n4UoZMwd/dTREmkWWqXK8WoJshI4+q3xEdau7I3FICtUBdVmaeBGM2H2g
+M1iQBmq+PIqwkXdT9xU1mKHFLmThsoaH/f3wis3kQJW9YEswEDgvx1RIM2exi7+a
+AV6gx1C3MT6QZtzf9S4ccf3VYb5zz8DuYvjv5S/hYpzoiBdKY/do5iRmgEtRIayC
+Ee1qlRQs3fPiOzJR4FAxNOfjyvxmYmntKlbcxCw2i0IOYZHa/FUKqtmTchtkpFQU
+ULphGaMAbQ0XYVSJA98nUqaAYc1jYquS/JqNQdXaRn1kjg8VhRqMltxQivnHz0Be
+fd+WSU5Qc/FjMV8ogxTg
+=Fgq/
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tornado/tornado-2.4-r1.ebuild b/www-servers/tornado/tornado-2.4-r1.ebuild
index 14b4f7cd2c8c..661e93baeee7 100644
--- a/www-servers/tornado/tornado-2.4-r1.ebuild
+++ b/www-servers/tornado/tornado-2.4-r1.ebuild
@@ -1,10 +1,10 @@
 # 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-2.4-r1.ebuild,v 1.4 2013/05/20 15:51:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.5 2013/09/05 14:14:28 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
 
 inherit distutils-r1
 
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
-RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )
-	python_targets_python2_5? (
-		dev-python/simplejson[python_targets_python2_5] )"
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/tornado/tornado-2.4.1.ebuild b/www-servers/tornado/tornado-2.4.1.ebuild
index 306950865043..88ffab236723 100644
--- a/www-servers/tornado/tornado-2.4.1.ebuild
+++ b/www-servers/tornado/tornado-2.4.1.ebuild
@@ -1,10 +1,10 @@
 # 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-2.4.1.ebuild,v 1.2 2013/05/20 15:51:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.3 2013/09/05 14:14:28 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
 
 inherit distutils-r1
 
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
-RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )
-	python_targets_python2_5? (
-		dev-python/simplejson[python_targets_python2_5] )"
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"