bump

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

7 files changed, 25 insertions, 181 deletions

diff --git a/dev-python/testify/ChangeLog b/dev-python/testify/ChangeLog
index 03c15f24767c..3dce94445318 100644
--- a/dev-python/testify/ChangeLog
+++ b/dev-python/testify/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/testify
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/ChangeLog,v 1.12 2014/05/26 08:10:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/ChangeLog,v 1.13 2014/06/03 10:53:39 idella4 Exp $
+
+*testify-0.3.3 (03 Jun 2014)
+
+  03 Jun 2014; Ian Delaney <idella4@gentoo.org> +testify-0.3.3.ebuild,
+  -testify-0.2.10.ebuild, -testify-0.2.6.ebuild, -testify-0.2.7.ebuild,
+  -testify-0.2.8.ebuild, -testify-0.2.9.ebuild:
+  bump
 
 *testify-0.3.2 (26 May 2014)
 
diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest
index 82ae1d8f26f8..05f5974a78b6 100644
--- a/dev-python/testify/Manifest
+++ b/dev-python/testify/Manifest
@@ -1,19 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX testify-0.2.6-tests.patch 929 SHA256 e32c2063efcff255031afa35f62f2156e2710226c68d673325dd4cf7eb51ee80 SHA512 103340679a434fa27db895270133e0da85e6dd4d2dcaba6efe4c4ab9bc18e88c790f94c05236b4e5671a7262bac637870717f8ec0ccdd1a1afef871e09b7714d WHIRLPOOL 2cb001750087034e082a746884fadd8233022437247f84f4b3da396a654ac28b61d9f33cb65be8d6757d44350223b7c0eb56f6761f239fc83f84b5540b447909
-DIST testify-0.2.10.tar.gz 54421 SHA256 802f2c61378f040dcb70a3ba5ca11fea95bd30db4fd76014fb6fa10cd23e5d28 SHA512 fba9c0fcdbef994239a2e9e58ed95b4047ec7fa7d0e03ea5b1237591640bec1cedaa0fb77495d013622bff51ac1b34e65e9f0f165ee7f78e1778c888cd38ed0c WHIRLPOOL 0f36758f14e32507452ba500f77849368d5264fd97c7de7eee0a7cc0c0a94dbbbad56aa4b3964304b5b04b8780fc6b48062d3b96081582647a172c4e8eb1aa6a
-DIST testify-0.2.6.tar.gz 47408 SHA256 2022434f032e1c354bc3e224fd20781a48df1bfb0004d6b87aeea9b387c3bc5d SHA512 d0310ad80b0b6fae011bed2d7b06416cb669f50b6f8a9773ee0e31d1cd46c8a1d4b97da676f45ec1aa56fba85baabebcb5140998033209abd3da720b89fa4271 WHIRLPOOL 4fbea81c15d022192c26a9968eeab915e0b74b27b60779833999fe53197bbc19f609a9b66553d5809e3dd6a74268037d9ba979f414a1ba5f220325c8f650100d
-DIST testify-0.2.7.tar.gz 48814 SHA256 abfd329de7d0146f1bc5706028ddf8c58c8334b7bab94fd60daec6a3e02cff73 SHA512 5ef77f2d7050f0ebab35aaf83d93b3daae2fcfa6eed4eb31fe7635ff2450ab731452fec2c286d6c58375021d3231d73c55b05be42fc2e11bb35022a5e6fa1373 WHIRLPOOL 2aab37fdc3d5f9587162fc1b8cfa03be819d965aa888aadba6a2646807bb4bc7dc2392131d86f6832cba4aca84eff961b503d25f314956dded5520179c94ba0b
-DIST testify-0.2.8.tar.gz 52223 SHA256 703642f3f6e6f3913a2b10d5c508476e4428176be827ce66cbdb30d57cbd4edf SHA512 55ccf33020518a666e3864efcfb09475926fa0100e2b22b49627d7e3919a0b79cab847aa358238f039cf1fc51c22748bbe3ee8e750af9354a0ca4a87af11e89f WHIRLPOOL 0ce663793eea109bcf02cd6141d2765a71844d842855b9decf13f5dc5d30f25c2ab644499b83e15cdcb514fe188c9f5620cccb0a1c08808ce02f5a7c6c17d3b6
-DIST testify-0.2.9.tar.gz 53142 SHA256 d7ce5b96fd30b143c98cbd3bc4ee51154e4a24fce5157adb7edc8e3144507dc5 SHA512 3fcf6cfbb7730ab322091d3042bab916148388be61f517e108547b0927bc0f40435c11015af763097cc91dc6c7ba942f5a308ccd0ab1cfffc34358d0034a97a7 WHIRLPOOL 3352a4bac0810ec7898e86a9d125dca91fd74d8ab26b6d63c74c8ac95cf3549f9b649223da1c0efd57f2d69bda6b7f8e758b3107867b03930fcac773d8085808
 DIST testify-0.3.0.tar.gz 57882 SHA256 1182efebb3e9ff6c46ea4fe9761b732282bb3557099cc780cc3d4de64d6407e7 SHA512 36e5f8aff152ac9aa3bc98e5e615b9605cdff53d4aa977960025cc633dde6514dec3efa0d581b5ed2b8e852539a0935a82529423754a54bc987b75ef7fb624c3 WHIRLPOOL 2a728f534dd00d72ea8a691e540846c49bf7bcc0978043099ff6776aa233597148ad9b58abb52aa6ac02af20e41be0bc774a6ff4223269b7b379c710e5e6f42e
 DIST testify-0.3.1.tar.gz 59494 SHA256 a7a1e233ffd85f9272b463d83bedc7e6cf0d03b156c63219eaa6a2a954df69da SHA512 03a9084ec29b1cacfa9e47d208869f57322703da8eec3b2e4eb398716378179ba18090851bf8a1142d89f3df586de9d164b0022a043310358ce7defefc54a8cf WHIRLPOOL 327a1a811aa356c3dbab6c2e0840c007490dbd0395545f00d97fd9e17e6c399d783b8ca8be2fee1cd6fd520b48d542b80fb6836562382f4a442e38edf2020d20
 DIST testify-0.3.2.tar.gz 61003 SHA256 a461a1d0e62a2921000e0a9321040a1fb13a32167807db38c945a264355bb822 SHA512 2b4d6fe2ffbfadb28c0c02ab6182296af563c2dd220482cfa800ad04acaffde42dfb6024d17a838c711d14eb64e2f5f2f7e441806b1ffcccc16dd87b807c5a75 WHIRLPOOL a04bcf1320b42c72a1c298aa37c32241bf7cf4fe336b6c6321a00efcab6d170fdbbbb31aaac4e2f55096512a2458a550d03390baffacd1bf77bc2520a634ca4e
-EBUILD testify-0.2.10.ebuild 1045 SHA256 559b0539b77fcde3c6fa0772c23dfbe5a8d2944d2b6a6b0e2f8d4d0d4125334a SHA512 9a25f23aa8066d943cb5ce2940c253dec9cb1b6e9ad29e92768a32c24723241a85bf5b7026504b515b8baf987914b0321b54ed23d97397f6641c3c8fe3681db1 WHIRLPOOL 469551ba537ce0e862892f1f29e788f770dcb0f10d949e8c00431f33da349ceecb4ab3e550708dc8d3c59275da0f75a8326061c136e47c3112f9c4bbad6bfc35
-EBUILD testify-0.2.6.ebuild 1075 SHA256 713a45eda16f0e2ffe476277829d5b4a54578a1a7c03d5d4dc243a6b17695555 SHA512 0efae1853534207e5b3e14bc73917177b82cbd2a0dafe0983cb54118175eb1b35c3cbfcfe2ee2b4ca07e03a9f1e6e31553769aee1499f3d75525f0d7b110179f WHIRLPOOL 795cbf3769d5e4feba01369a691962908387f76f4d608b65c0c072dd446a7bcb3c2ba47c1adbd1a6f87ea87d63677f5954a124e380b84cf1c27d43b2967f7afc
-EBUILD testify-0.2.7.ebuild 1081 SHA256 24877d767f99ed5210e5a89af41691cd98820231228ff30205f3d7d121785d82 SHA512 dc94844467d9f8ae2e900ec434a627d72cc757ae93c4450cfbed5c1081b419d167a61c48f4cb027ac0339d4713724cc09e30138cae00928a8a6e1a14fb27b519 WHIRLPOOL 7c19a0f6808133ca54f3a15fd22acafd3ef9a2de8e1c84128de493aa8cfb84c28084dc38a70fb947e71d006408268bf9dff313f36519569532842172a25894f8
-EBUILD testify-0.2.8.ebuild 1120 SHA256 472a416fe6edda43be48dba54e5646c2280ef97633225daba8c4f975431c17e5 SHA512 ebfb80e149a1695959cd97e5f76ced68b42d88fd7dc97cba9b711a00b68d829ad45e3b9b8bb7a27e3984637247ffc658e3c6323d782961efafb4d73551d3ac5c WHIRLPOOL dc33161d4e4e5c611ad5e8c1fb576cadf5a42de67973b8dbe68c540bc029ee007baa33b9d308b236eafdd4d4e7045112ab5d1fe38c648f519441cecf21675fed
-EBUILD testify-0.2.9.ebuild 1120 SHA256 7e24322e93edada73365b3513fb0a07251f134efd01098e54f8a99e1491dfdb1 SHA512 998dc4334f2b9e279fe745cecddf11a0bda34f518e11906a285764af1daa6fcaa7846b9c50aaaece3dbac9312e6e858abff1067b940b82b322b474de2e74a581 WHIRLPOOL 9b0bb4b052c5a3cbeb15d607351a7570c496ede7fccee7e82007e656e6fab81718928dd3f9633398283cebb7a9add41da9e198be70db294b1280d69d4831e78a
+DIST testify-0.3.3.tar.gz 62149 SHA256 686c06ec91e80387919ecd7bf713ebfb2f3917db2c6d71f24e94b72de43f7a05 SHA512 5760710fb6dcd8127b7a7a4f31d023c50fbc77831ad037a8728672528bef53728bc7246ddb911404533eaa4953650b87ab4b07aeaa656f280ff32bbed64c7629 WHIRLPOOL 3d74318c75e4c72f083be910f5dc776b37be1a3eb115de528b9344ac6500287e6de154632b446cdcae6f686a51974695a90ed91d3345cee7e7a00f0561857a10
 EBUILD testify-0.3.0.ebuild 1044 SHA256 0c59523ecc1a6e51ec91ceced42aa316de1f3e34b9a06589667aed46c94cdac9 SHA512 a9c7b6be6ab9eff457ea178e164cda5b799730ddc39286c7dbca48fd12a76d14e728e215a899949ae130980a9866080dc53ff74b7b584ed4a1851820b00b5434 WHIRLPOOL b7c89c630ea5b160f184944bbdb21feae1f1200615a1dafe45db12ef68cd5d7f1ba383567d7038b0fdd02a8815f966c5b5bdc7572a140ecf4d524c87dd0e7e40
 EBUILD testify-0.3.1.ebuild 973 SHA256 5a7f29961f5cba2e4db5f47aa0d8e0e88307034b39ac79c009314180281096ce SHA512 c06eac7d454d0db61f33692929680a6e027d0a3e571024c62219ad6ea0c0f041bcccc98ed62b0ff4c6152f89ae16013ac8d6f0a87c7b383662bd5596c57e278d WHIRLPOOL 5b13eeac303027545baa9036dcabc8541d975831d3ff37b517dd3ec9cf84aee9f51849367025d9d5f1a8c21903da66be6d65d2a7d56350895133c639923db3e7
 EBUILD testify-0.3.2.ebuild 973 SHA256 fac4c05666eb3bc8de703724eea1e2b5ce8deb6182dd68b673e4bea5f8ea0197 SHA512 b69a78c3698d64eb27cf22122ca21fae2d207586b92ce5018f2115a5bcc38cb7c9d9c982b7ca9a7751ecce6e4bf095ba8db5100bd528d9d293123af1d2469207 WHIRLPOOL 0162a45a2c83a5c0ba2a4c33c87f28e441f4a8a989a81ae827dfa9a9256927bfbb35ac01c46bf1a17a2df7a4c4fc7940fbbc09aff9e12463e676658d6e2768e5
-MISC ChangeLog 1849 SHA256 9af1236066c4a6f48d86126af988d961518126b19ae6fc5c2cf5ae3d30030e65 SHA512 5f21774ec5a18315b201dcd28377b5ec323d7af509a51e86c0255c72d7ba5f706c2454f8220b88e01c5591a3f1574b592c824074c4856ab5e71bf28cc3626f85 WHIRLPOOL b024bcde20e5834fd353e442ca8c5eaee38808ed8f5e798869a55c9352c119f7084d31671f3a70fa70c57bbce5d1ad02c2336783dbf41f44270d6fc2bbe71306
+EBUILD testify-0.3.3.ebuild 992 SHA256 bed81811c31ed2a6992edc7d74532c09ee7b62d6cf582c6e5436303ccb3224d7 SHA512 56f211f96332203c59d3c6aa58ef99ba6cbf6dca295cb2cd45959055bcefdb8473036325e07bd184281a5bf1dba2a93de832df562aeb84ed4b68f3431d02573a WHIRLPOOL 7f69912248954b845c8250241ecca003518f9cff62c765b45130aa4ed6edde6c79686fc0557cb78c4aaebc4b8e1cb9802d160e27c9a97e7e4c4b018a879cf612
+MISC ChangeLog 2078 SHA256 87ed8b7ce0cf8f4e9dfd77ea4294daf27ab25fa8080dd3dd99a3c7e20e955bf2 SHA512 29a4e204f3b5365138c02e2729a3f11c26d6a2906e77a5576473f9fcc0a668f2a76be04710bbe9ddb5e9d5a9e9d235432e1949d81e5f4a4d7576e70a92bfc02a WHIRLPOOL 0a8d75a6dce57b9d79df803718a94da4e64cface63150a73830bb3c1bbf7ac1f31cbd234c00fad5c37abe8b5f53b0931f7fd87a1a3b61ee150cac23e2c492be0
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlONp1sACgkQso7CE7gHKw1DMACg3T9eXity4uoCvbCi9JR71sbX
+cuoAniq6dELUm9iuGSYXqRKSa1sYKMKg
+=AtZ7
+-----END PGP SIGNATURE-----
diff --git a/dev-python/testify/testify-0.2.6.ebuild b/dev-python/testify/testify-0.2.6.ebuild
deleted file mode 100644
index 865ab29fbc68..000000000000
--- a/dev-python/testify/testify-0.2.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/testify-0.2.6.ebuild,v 1.2 2012/05/20 13:16:37 klausman Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-# TODO: verify 2.5
-RESTRICT_PYTHON_ABIS="2.5 3.* 2.7-pypy-*"
-
-inherit eutils distutils vcs-snapshot
-
-DESCRIPTION="A more pythonic replacement for the unittest module and nose"
-HOMEPAGE="https://github.com/Yelp/testify http://pypi.python.org/pypi/testify/"
-SRC_URI="https://github.com/Yelp/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml
-	dev-python/sqlalchemy
-	www-servers/tornado
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
-DEPEND="dev-python/setuptools
-	test? ( ${RDEPEND} )"
-
-#DOCS="README.txt"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/${P}-tests.patch
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib/"  "$(PYTHON)" bin/${PN} test
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/testify/testify-0.2.7.ebuild b/dev-python/testify/testify-0.2.7.ebuild
deleted file mode 100644
index 94b85c61fa42..000000000000
--- a/dev-python/testify/testify-0.2.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/testify-0.2.7.ebuild,v 1.1 2012/07/30 07:06:26 patrick Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-# TODO: verify 2.5
-RESTRICT_PYTHON_ABIS="2.5 3.* 2.7-pypy-*"
-
-inherit eutils distutils vcs-snapshot
-
-DESCRIPTION="A more pythonic replacement for the unittest module and nose"
-HOMEPAGE="https://github.com/Yelp/testify http://pypi.python.org/pypi/testify/"
-SRC_URI="https://github.com/Yelp/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml
-	dev-python/sqlalchemy
-	www-servers/tornado
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
-DEPEND="dev-python/setuptools
-	test? ( ${RDEPEND} )"
-
-#DOCS="README.txt"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/${PN}-0.2.6-tests.patch
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib/"  "$(PYTHON)" bin/${PN} test
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/testify/testify-0.2.8.ebuild b/dev-python/testify/testify-0.2.8.ebuild
deleted file mode 100644
index 8d4d69b16954..000000000000
--- a/dev-python/testify/testify-0.2.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/testify-0.2.8.ebuild,v 1.3 2012/11/29 15:53:05 idella4 Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.7-pypy-1.*"
-inherit eutils distutils vcs-snapshot
-
-DESCRIPTION="A more pythonic replacement for the unittest module and nose"
-HOMEPAGE="https://github.com/Yelp/testify http://pypi.python.org/pypi/testify/"
-SRC_URI="https://github.com/Yelp/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml
-	dev-python/sqlalchemy
-	www-servers/tornado
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
-DEPEND="dev-python/setuptools
-	test? ( ${RDEPEND} )"
-
-#DOCS="README.txt"
-
-src_prepare() {
-	distutils_src_prepare
-	# Rm rogue test, Bug #438032
-	rm -f test/plugins//http_reporter_test.py
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib/" "$(PYTHON)" bin/${PN} test
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/testify/testify-0.2.9.ebuild b/dev-python/testify/testify-0.2.9.ebuild
deleted file mode 100644
index 7e5c07fec03c..000000000000
--- a/dev-python/testify/testify-0.2.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/testify-0.2.9.ebuild,v 1.1 2013/01/14 04:06:44 patrick Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.7-pypy-1.*"
-inherit eutils distutils vcs-snapshot
-
-DESCRIPTION="A more pythonic replacement for the unittest module and nose"
-HOMEPAGE="https://github.com/Yelp/testify http://pypi.python.org/pypi/testify/"
-SRC_URI="https://github.com/Yelp/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml
-	dev-python/sqlalchemy
-	www-servers/tornado
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
-DEPEND="dev-python/setuptools
-	test? ( ${RDEPEND} )"
-
-#DOCS="README.txt"
-
-src_prepare() {
-	distutils_src_prepare
-	# Rm rogue test, Bug #438032
-	rm -f test/plugins//http_reporter_test.py
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib/" "$(PYTHON)" bin/${PN} test
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/testify/testify-0.2.10.ebuild b/dev-python/testify/testify-0.3.3.ebuild
index 6275c760f45f..9ea00c7510e9 100644
--- a/dev-python/testify/testify-0.2.10.ebuild
+++ b/dev-python/testify/testify-0.3.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/testify-0.2.10.ebuild,v 1.3 2014/05/20 15:16:08 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testify/testify-0.3.3.ebuild,v 1.1 2014/06/03 10:53:39 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 pypy )
+RESTRICT="test" # basically broken
 
 inherit distutils-r1 vcs-snapshot
 
@@ -16,12 +17,10 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-RESTRICT="test"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
+	www-servers/tornado[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )"