Version bump.

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

4 files changed, 80 insertions, 5 deletions

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 5e252db0bd5a..8d0fce2254ee 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.60 2014/04/05 21:07:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.61 2014/05/03 16:51:59 floppym Exp $
+
+*cherrypy-3.3.0 (03 May 2014)
+
+  03 May 2014; Mike Gilbert <floppym@gentoo.org> +cherrypy-3.3.0.ebuild,
+  +files/cherrypy-3.3.0-test_config.patch:
+  Version bump.
 
   05 Apr 2014; Mike Gilbert <floppym@gentoo.org>
   +files/cherrypy-3.2.5-issue1234.patch, cherrypy-3.2.5.ebuild:
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 2f11d23ff80e..3f77af33766b 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -2,12 +2,14 @@
 Hash: SHA256
 
 AUX cherrypy-3.2.5-issue1234.patch 394 SHA256 4869b0228c93f926b980129927476701f2332dfad6241c47309d5ee73cf6f6e6 SHA512 57992292b66d019dbbfcaaa5bc025fed2fbb2c5e3e4af44404165f68ad01f0679ac4710527cf397d67ae6f93b55beca53d68de511599ba668d1741e3a11c9dc2 WHIRLPOOL 5601d8a0a4db9fde661088c64a2a1cd89f98e630ae92d0fa6ecac53aeebc121162ee46d70af7ba9a4e8683fad4d710697ff06e7cab7913060197a55ea63a4b59
+AUX cherrypy-3.3.0-test_config.patch 416 SHA256 c59ebc1c3b228507e7e84b586e9e3ea47815be3a37ffaf764bb080dc0a5926c9 SHA512 c5dc1f08a21934c8c5a299baf5d7be7d80d5f36bf5b64d1b3128fd7983f7cc8b4c504a2d8b070fbb188aa299e2c15c3085131a6ec958c6d2082296b22015a28c WHIRLPOOL e7ef38c03781cdcc497f844265f6f1c82202d4387befba104d0bd99ebbe6798e9ea4d263c6d668c128847f9a21dd39bdbddd25111f57d9d09c11451a6b97cfa4
 DIST CherryPy-2.3.0.tar.gz 241999 SHA256 a41e1b31ab723f50223b303991bb4e1a420a05deb2f4ab923a2ceadece4854cf SHA512 71359ff92354abc7c2156d0f66e361c16b145180e04bb14c9bb2ebae474de6a3c8a3b266363dd6df370c21b559112cbe122fcdf08d68f03f755000bb8ca4eca8 WHIRLPOOL a74b3fff30c776fb51f0dcec97e7f4e676a60a2791901ebf037abaf0e3cc59598b985e467dbabf712af013da8ca77c1925e6b53d65e523f7d535e8ecdcd6213a
 DIST CherryPy-3.1.2.tar.gz 319196 SHA256 0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6 SHA512 968b1c7caa64a47d4e998083ca829fdb700b904eb243e0785e1cf490e034f4e883bbfe29680430ecc9c8000beec2c46b3fe24061e8d5e22aab666b5fe86e3ca6 WHIRLPOOL ef6349d26da654c11e0097be5f71cff79cfa21b81ed1f1e15d9c3f5dcc983d8a605a21a9cf6e34ab49160a1cb1b31ac6c2fff967be06a78c501289f80dd0977c
 DIST CherryPy-3.2.0.tar.gz 921937 SHA256 0a70d163ee33b892df064ab70d097d0fc125c74fc0c6da418b2964bb1d6d18fe SHA512 3cdf8b65b819d1c3af08c68e12e8c972ba1c313432cb0c822993cb7f14dd8544a73e778a3fcc956667da1c51d224b4561f354a03eeba371d54cdea5369f5a27d WHIRLPOOL bb4c9858e45e0d44fc56446c1820dca0c0bf87b8ce133f6d158fe48b74afd3fb594ee8bd98dfca36cc6719efb6e896cf9f616433459acb379a12d0e32e0eb146
 DIST CherryPy-3.2.1.tar.gz 568070 SHA256 e1d1f51dd51ebf11efb157c36a4b8df4f5d5cb62af073b3ca50a9284ce83128d SHA512 8c8e5672bebfdcada7ffed17f2f160154db00d2c42b78b53277292c443495dfd2f8c07d2cbb1496c5cd39219b338e93e9efc8989ebcf04fcedc8f40beab97a8a WHIRLPOOL 22daf41e03854edbd53ceb711d002d0cb67f2c3df5319f347dc16d01d57058a7fe6b77abb3184fe77fbbb00777ab9947dc08d5dd06e585b71dc20b441833c6de
 DIST CherryPy-3.2.2.tar.gz 414099 SHA256 dc5a88562795c2ee462dac5b37aba1cf4f34f3e27281ec11049227039308b691 SHA512 89cebf63d48df5bec880bcbc13b3e2ae6da76f59c06803177cc8d6905e2d4444de7bb9a63189e3d6a3fd82e2a2464f419cfa74c60b2765e9ef89866847d55b7e WHIRLPOOL b9407b60d6138e00f1ead9367f973a34fd591ab858a836251a70c8df693f2d62cb06d4497b19e147fbd963bccf3ba9cafbf57dbacceb8241653d55400bfd2a7a
 DIST CherryPy-3.2.5.tar.gz 423774 SHA256 1a0ce16d06d9d3b587af6122b7b19c9a9ce521d51640d21a155626c9c76aa7e7 SHA512 562a8dbacf35dc64ba015ab01cdf076eb6c58a21df67fc9cb3936ff37f3d6dad6271595ba431920533f3cc6c6c10896d9a36e818fada70d87ae041d7f00d97d8 WHIRLPOOL 65aa21bbe77c720f999bc07d57dfe191a9eb96f8740c941b4bc0e3279fb863e2685bf8b0a388a7bf745993964c16117ed367eff371dc0e3dc4dee3bf13fc95cd
+DIST CherryPy-3.3.0.tar.gz 429204 SHA256 f8829bf1b4f613833b690b33b2fd00b1da4ef98df3c70240f78ee91b70f4a5a2 SHA512 605d1ca5694cd8c5237f2115ef2ca39d7290b90c82b91c3699cfb59ad346c3506a1b78ad0502f89de43f8711d01afbbc2eb82f00f86ffbc0fcd63c1def88f0a4 WHIRLPOOL 406c735ae3b5f52408bab6fdde32684caeeb2092b4b0124b12cd43923beb1b11e899069ed48d395839bbb55e202e748ad2cb4e0c626ed29a0d2ff0bfef8aae5b
 EBUILD cherrypy-2.3.0.ebuild 1326 SHA256 0dcc334799ffd8cd418c115c08b1351cc3e76f8a4e258cbc1fdb3b644e1f72d4 SHA512 9051ec7033de98ca5959897c301a6ef5ef1c256c0b922cf67284d3a46a2619f3782fff17194d188ec8376521489a36036d77028068b4df577278a2a6e9471d71 WHIRLPOOL 1bcba56b898d4d50eecaa52fbdbc4af4197eb438516c5ae9be10af05a9e513b08476ed1932ac440d4045466fe15c283e88e82fda8923c83ccd62b9e7a8bf47ee
 EBUILD cherrypy-3.1.2.ebuild 1106 SHA256 71021a809633d279034d3235c29e5f0c98e6f7de698fcd879f836abfc443e799 SHA512 5441790175dbc88c45ba07a9d66a57d234c2bb53cad952151a9ea6ec606f4fd8eeb0f26070d49915b47dc6f951fda95605c063f9dc27867c5123201ad8a96cd3 WHIRLPOOL 60d33302217bd09794dd1819d033bd14cd1be0f38f0b1698210805e9dec25f1991f79ccc73cbb690c5b83ae27a09bc72d2c38cc6b7191c8cd1b9c30d070b2730
 EBUILD cherrypy-3.2.0.ebuild 1504 SHA256 b79ffc0ddf8b6d7f47bf615db1fee128241ccc4100d5c792674a7619072cadf5 SHA512 6180d4b5b79096829949399f6e9a56fa4b4135da29f079dd9335622f68de2beb7f9d41c1a2be8cdd123efc4a542fecd11e57b490b9122038e17f690d0023e6dd WHIRLPOOL e06a1961bcc86aef53c43f2f1c621f36c9793613e9b8a4b6356411f3e8a6205e9505d7d5d86eb26bedc04f6d2e4305a8cd08da976e575d43ef7cba48f0908836
@@ -15,12 +17,13 @@ EBUILD cherrypy-3.2.1.ebuild 1275 SHA256 e1571688f70795fbeb1180953523fd149f0334d
 EBUILD cherrypy-3.2.2-r1.ebuild 1605 SHA256 c1ac12f4fc778ebd720b713cabacf37053c3c847df441aaea66a64a01e378e33 SHA512 15793c963118e71c3c15771c54f8b8b7ea23d723e42a4d787af570ce5bb3e499e0d58d2df99f462b4d87da51c21be4db9e23375e17728bf45a6a43a5001a90ca WHIRLPOOL 3fe040d7d7aae6305052791253667d2bfc49ad3f33bf208688e868b94dcb63bda93421a20a8942a7a7f5f4a5c0a22483255d87472a2b90ab8af3d1a15e25dab5
 EBUILD cherrypy-3.2.2.ebuild 1233 SHA256 f6552d3bd15783bcd4c69633702295271191ae840282511fd9e3140836ebf72b SHA512 91d76de71c9032a88df0b5a90e4f4a69b9438923326e8bc252f5368267de02dca89cc3da121951a15837c2393debb6cc5aab1dbdb51f347b6f03f9bc11d7577f WHIRLPOOL ab078a8354bf20788191ee340e3f5638d690bd6077d89a57b031383d0482f9ce980d8b61e4e596384a435f275aba6eaa456ed2af87909131f3a5c51f0fc90cf6
 EBUILD cherrypy-3.2.5.ebuild 1412 SHA256 825d9e2a5db765050b1eb19ea78d036ab53c8f78698da6ebc0a45b5fb87913b6 SHA512 ca391abdf2acdd5cafc59653f1b32d278d248f81752e5fa86a961301ee341086e6c55c42fe1b7a22bc90fea313a99192c75a9ebf7f82285dae6fe4aa7aa50e82 WHIRLPOOL 701fcc6b2f0b844b5dc9adb465e97f57700f585898482a7f9c5dd8261eefa27d872341b9d4ffd48670821a52e2b17ad29ec2638f7fb0e193504751e95c55f2f7
-MISC ChangeLog 9370 SHA256 c74a8114f5c34566d2dac22bf88f19c8c0d69d2760c49807c610aeb6c06bd9a1 SHA512 05bd3a9568078f94341524290bac031bac444a2b19cd43262b11c109b8e945119904663871db372160c834ccca585d616dde0031772b325d2cd30f8efc0d79ff WHIRLPOOL 6c34023d95ab12f4129b82936ae98f9d8c8ec8fae05bcfcf0411ebdad86fa807f73489dfd8c8775cd9d39ec52eb4fb11be35c287f0e7d14e07bfb6d619427e17
+EBUILD cherrypy-3.3.0.ebuild 1544 SHA256 4d4373dc7ac2aa8ee8720c58a7ac4ca5dd7795b624a54da64f945028145efa8f SHA512 c208bd37b12d189f8c0e0261ab2dc0bb0842a1742415ad15eb8961224d4abbcc26fe865a5c36050dfde9b52eebe8e049ee87bcb10dc200bf1776a1b9cab5ee0f WHIRLPOOL 01b0f0c6cebb5501180de542337fe09316526d633493df952ab54c0119c18e7539d4ca3f382ac4657fcb552f3d0fcad535d0a0e6c4156c5a109afb84ee3fcd3b
+MISC ChangeLog 9534 SHA256 3a4e3f7d3e003cd627807b09801458beb20da8af3474785186a7d918083c21b5 SHA512 fd110eaecbf1293c27bdc93e3fee220072df6858ad17a583011483aa5e80450331790ce6fb7348bf4fbb1f20418e511e0273aef875e9e2cb26e00f720122f472 WHIRLPOOL 7a5aff42b508b815bc39181488e0263256598b537628929caad01dee330d0def2276a0c06ef47d3dc56ee033a29d4b421f0c95a51a266dc09130b93fa0d399d7
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNAcKEACgkQC77qH+pIQ6TyHAEAlptArk6ZmRVr0344r6ErVyPB
-twC/cBsM9TQMITOdakcA/0FkcRi5iLlubnGcT/nOFecg2WXQbxC13qF38TMg4vHW
-=6tJ0
+iF4EAREIAAYFAlNlHrAACgkQC77qH+pIQ6TWaAEAjYIEbqUB7w/sPvJydrbHFGrN
+zzh93zxU1XXJQQhBgTUA/A/IoJ8rE7xiF6ty8Crul7xLNMD8R0Q/nL2ytKomsstE
+=IO+s
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cherrypy/cherrypy-3.3.0.ebuild b/dev-python/cherrypy/cherrypy-3.3.0.ebuild
new file mode 100644
index 000000000000..b6ecb21404bd
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-3.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.3.0.ebuild,v 1.1 2014/05/03 16:51:59 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-test_config.patch" )
+
+python_prepare_all() {
+	# Prevent interactive failures (hangs) in the test suite
+	sed -i -e "s/interactive = True/interactive = False/" cherrypy/test/webtest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# https://bitbucket.org/cherrypy/cherrypy/issue/1306
+		-e test_session
+
+		# https://bitbucket.org/cherrypy/cherrypy/issue/1308
+		-e test_file_stream
+
+		# https://bitbucket.org/cherrypy/cherrypy/issue/1315
+		-e test_HTTP11_pipelining
+	)
+
+	# This really doesn't sit well with multiprocessing
+	nosetests "${exclude[@]}" < /dev/tty || die "Testing failed with ${EPYTHON}"
+}
+
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
diff --git a/dev-python/cherrypy/files/cherrypy-3.3.0-test_config.patch b/dev-python/cherrypy/files/cherrypy-3.3.0-test_config.patch
new file mode 100644
index 000000000000..24d96eb2e2f5
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-3.3.0-test_config.patch
@@ -0,0 +1,12 @@
+diff --git a/cherrypy/test/test_config.py b/cherrypy/test/test_config.py
+--- a/cherrypy/test/test_config.py
++++ b/cherrypy/test/test_config.py
+@@ -206,7 +206,7 @@
+ 
+         if not compat.py3k:
+             self.getPage("/repr?key=thing3")
+-            self.assertBody(repr(u'test'))
++            self.assertBody(repr(unicode('test')))
+ 
+         self.getPage("/repr?key=complex")
+         self.assertBody("(3+2j)")