revbump; after discussion with dev who committed last bump; drop IUSE curl making pycurl an unconditional dep, add optional deps to CDEPEND, correct mock

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

3 files changed, 78 insertions, 6 deletions

diff --git a/www-servers/tornado/ChangeLog b/www-servers/tornado/ChangeLog
index 26bdcb885a9a..c262a31e1383 100644
--- a/www-servers/tornado/ChangeLog
+++ b/www-servers/tornado/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tornado
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.66 2015/05/10 09:35:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/ChangeLog,v 1.67 2015/05/13 16:39:43 idella4 Exp $
+
+*tornado-4.1.0-r1 (13 May 2015)
+
+  13 May 2015; Ian Delaney <idella4@gentoo.org> +tornado-4.1.0-r1.ebuild:
+  revbump; after discussion with dev who committed last bump; drop IUSE curl
+  making pycurl an unconditional dep, add optional deps to CDEPEND, correct mock
 
   10 May 2015; Jeroen Roovers <jer@gentoo.org> tornado-4.1.0.ebuild:
   Mark ~ppc64 (bug #548938).
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index ead4e4fc0274..2ec994e31133 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -16,13 +16,16 @@ EBUILD tornado-3.2.1.ebuild 1425 SHA256 035f391bdc88c856349495ad4ccfae3a6605cffb
 EBUILD tornado-3.2.ebuild 1546 SHA256 d2cf880c5078be94ba107d575c613e1b33d0b54cca557e137ced7357abc3e9f1 SHA512 7509a46d8c1514e60a0eafb79b13214ae273e441038036339e1fd8ba51236653e4c3cf9143d3a91801758c75577d9b3232f656ad21b5062e2eae305808fc3c12 WHIRLPOOL fb4fd6256d85577fd9b41a2d6e05ed8daf76131074ad7909f00edd82594c8142dd838abc5f0b7d3ce1be031ed7f0aedb5f37a05008a64d2da99461694bd34f02
 EBUILD tornado-4.0.1.ebuild 1190 SHA256 5583e7f7a95ccbe0fb6161eb9951724fa087aeca9863c0f058bd028b77139e09 SHA512 c36f4250e43f3b604389fc500bf648e39a362d870874254e5c640590855692bec32d64b4fecfebd56672e19668f0f53046f060345f8d7ef118c4be304f071517 WHIRLPOOL a7dec0942d892d2713b3014d07d19ac3bc8397b80938cef3432fd2c3dc02e755327e95522fe29683ba2ccf523bb6a8986321f300a38b0ebc807d2c87309c0f69
 EBUILD tornado-4.0.2.ebuild 1196 SHA256 7c4f44093a3a2c0a5a81c3e94f6d689ea47b7fa89fd592e32e6e6e1924a0895f SHA512 f2a3e7331588618d75ff57dc360bbbb127fdc01f208f896659ff0193864137581935fadbe26f2c3155dd8b5cd30199dfea30429d63d682401b72d2623478cdd5 WHIRLPOOL 5d12988933e6a910488e6958d2647291d2557ab5a50d40796760656c2c1216fe94ca407ffad323214a69c39b18d93583b14478bc18d1ad20eb679829daa2b692
+EBUILD tornado-4.1.0-r1.ebuild 1813 SHA256 d33b9df03590ac220724c82b0bfd72010e5275198ab93b150e813452c2d44c4e SHA512 7893aba6fd57bc24cbcdb7d99169dc8037bcd21b0ba13878799a1b57e60e509f01270e12bcd1af963ef0152f38a3ca32832ae721771388c279eb0e9a5ac9c4d5 WHIRLPOOL c639e66db980cf34c8b35afb3cb71e544f0498466f252c5bc132bf2458249c21a8abaf584989596a7ae0e89adf9cadd03d232e0329fcd2de48e298e1759df908
 EBUILD tornado-4.1.0.ebuild 1715 SHA256 13e858146a964ca7f0bf978a07e3398c0876ba0d9d880a078303225e990ac390 SHA512 33e26c4a1d3aa772da3de31b0ad827db50d2735f70bbe9b8365ba67e9a13a050137897e587ebe7f1e0b13bd211a1ee4382d51ef6c05a91d4b37319662e3e02f4 WHIRLPOOL 711ed61e5a6b02b1e865bc3173ec9c180f26cf84400d7bcaa23c4f4b68a6a819f1f53d25f9a068e6c5797da5fbc812d2afa1d13d8b69d0366f845307185bb0ab
-MISC ChangeLog 8973 SHA256 ccb1434ae3c4357dafc5441552edf006bc1c2fecfef4d8fe16cd66d70c519ff2 SHA512 4ae0517a39e007f7abb371b86c772581e59b494a7828917961f37f9e8724e2a6ccc0c5fcca8c9ec24508d757a757755509fc8d8a87e63d99c6d9baad05d631e8 WHIRLPOOL 23795c77b3ef1e74163da773cc382c97a2a98c33111eb924e8af5775bdcac2077e8feac4ac701257cae685412844c14636735309deb1de0099546228d60b6db4
+MISC ChangeLog 9243 SHA256 b289f902ecf08a5bb5143cd667941564f1bdfa5a408f71703b6c1533cd019c13 SHA512 222d00c9220ae68591825f01f34bde93f6470f2d334cc900f2781767397e1814a56ad684f1790a355e310a1d156a4913540dc829659a92562f78abdc3ad230b0 WHIRLPOOL aa989e01a4a87c4b6f0f6a0435a97f8aeb0662ebcd3cd086af962176c347a868b152137f40a41a9ae1ab6b86bf653d9d17e099e3e80de6fe09f64332fbc312ab
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVPJmgACgkQVWmRsqeSphPf3ACeNxL4GB/EgARg+PuLwm69SYen
-bK0An30OIsOmXbntppN+rGOqkBsxvxZ8
-=wiHV
+iKYEAREIAGYFAlVTfl1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw3CNwCg17toXxMWri7645hXnLkQcAva
+ElEAniFcZJ+oldez7f5DnoHes1fGs7pR
+=0jfq
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tornado/tornado-4.1.0-r1.ebuild b/www-servers/tornado/tornado-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..5a8186ad2c63
--- /dev/null
+++ b/www-servers/tornado/tornado-4.1.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-4.1.0-r1.ebuild,v 1.1 2015/05/13 16:39:43 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="https://github.com/tornadoweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' python2_7)
+"
+# dev-python/twisted-* only supports python2_7 currently
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/drop-intersphinx.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs sphinx
+}
+
+python_test() {
+	"${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}