Revision bump. Backported security patch for 2.2.1, bug 204829. Added patch to fix tests for python-2.5. Drop old.

Package-Manager: portage-2.1.4_rc14

11 files changed, 223 insertions, 131 deletions

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 2c9bfb3ca773..8ada9584855c 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.25 2008/01/08 17:16:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.26 2008/01/08 22:18:10 hawking Exp $
+
+*cherrypy-2.2.1-r2 (08 Jan 2008)
+
+  08 Jan 2008; Ali Polatel <hawking@gentoo.org>
+  -files/cherrypy-2.1.1-test-gentoo.patch,
+  +files/cherrypy-2.2.1-invalidsession.patch,
+  +files/cherrypy-2.2.1-py2.5.patch, -cherrypy-2.1.1.ebuild,
+  -cherrypy-2.2.1-r1.ebuild, +cherrypy-2.2.1-r2.ebuild,
+  -cherrypy-3.0.2.ebuild:
+  Revision bump. Backported security patch for 2.2.1, bug 204829. Added patch
+  to fix tests for python-2.5. Drop old.
 
   08 Jan 2008; Raúl Porcel <armin76@gentoo.org> cherrypy-3.0.2-r1.ebuild:
   ia64/x86 stable wrt security #204829
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 853e39c77bb3..3874baed9f46 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,47 +1,46 @@
-AUX cherrypy-2.1.1-test-gentoo.patch 260 RMD160 76705521adab4ce2c131e551a87344a1901fa7aa SHA1 b48c5a01b33bb253b7a2434388dd544df9dd42b4 SHA256 f5ee1a1295e2dc6f9658adabbceafc513248c156d5d94d1751616d6c325aeaa2
-MD5 4cf9009699f529b3c7921c0e1ab0cc94 files/cherrypy-2.1.1-test-gentoo.patch 260
-RMD160 76705521adab4ce2c131e551a87344a1901fa7aa files/cherrypy-2.1.1-test-gentoo.patch 260
-SHA256 f5ee1a1295e2dc6f9658adabbceafc513248c156d5d94d1751616d6c325aeaa2 files/cherrypy-2.1.1-test-gentoo.patch 260
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cherrypy-2.2.1-invalidsession.patch 996 RMD160 bc5e1da37b025aff36e8a213eea3f6d16849fe15 SHA1 7d9b7746316366e6e22b5470c09092645acbe1a4 SHA256 cde3b679672b132d84d30736303f407d64b26db78054c8589e7544363d089801
+MD5 1c56816b71d08189a8dfda0306e8573a files/cherrypy-2.2.1-invalidsession.patch 996
+RMD160 bc5e1da37b025aff36e8a213eea3f6d16849fe15 files/cherrypy-2.2.1-invalidsession.patch 996
+SHA256 cde3b679672b132d84d30736303f407d64b26db78054c8589e7544363d089801 files/cherrypy-2.2.1-invalidsession.patch 996
+AUX cherrypy-2.2.1-py2.5.patch 6037 RMD160 c9497987c0c962cae6fd073f270f3f2d38f86f38 SHA1 fda2f4c68ef0a8ecd63e30034299ea6ce828577e SHA256 f0e3fdf2efbb5c5bd53c339787653942a50b89cb646bd22a88b56e3fa7de4e0a
+MD5 d66ba1518bcb9f566cb762952d2f5ef7 files/cherrypy-2.2.1-py2.5.patch 6037
+RMD160 c9497987c0c962cae6fd073f270f3f2d38f86f38 files/cherrypy-2.2.1-py2.5.patch 6037
+SHA256 f0e3fdf2efbb5c5bd53c339787653942a50b89cb646bd22a88b56e3fa7de4e0a files/cherrypy-2.2.1-py2.5.patch 6037
 AUX cherrypy-3.0.2-invalidsession.patch 747 RMD160 92c088af4053b852a861109bbf7ac9e438573b0d SHA1 9a63febd16aaf72450be4ff85417d792400f5313 SHA256 cd9be33449056e8dd1bfdab67d1112d53fe237ef62392c2a11346956292328b0
 MD5 e2d3544642727e988a6fe4c8f71e0629 files/cherrypy-3.0.2-invalidsession.patch 747
 RMD160 92c088af4053b852a861109bbf7ac9e438573b0d files/cherrypy-3.0.2-invalidsession.patch 747
 SHA256 cd9be33449056e8dd1bfdab67d1112d53fe237ef62392c2a11346956292328b0 files/cherrypy-3.0.2-invalidsession.patch 747
-DIST CherryPy-2.1.1.tar.gz 177839 RMD160 9f310f96fe6f8046a6e05fef6b855e66018d48be SHA1 fde88381b93b58ade3275d8c73eea49cc4f2098c SHA256 2edb7213b030c116c53bbe5bc72c85e2978ed2aa515b6ba9560c8a8ce8968cf0
 DIST CherryPy-2.2.1.tar.gz 219932 RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 SHA1 cda044ceed78059a56c54ce157bca564f4907a51 SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
 DIST CherryPy-3.0.2.tar.gz 262428 RMD160 0bd98ca014b6539cd03969b6b3d85308d296b88e SHA1 8aae47ff892b42761c21ca552222f8f251dbc1b2 SHA256 cd590e57543bf1c590c006bfd7c222adce6ab1584ef35d72dd91558e4e281a1a
-EBUILD cherrypy-2.1.1.ebuild 919 RMD160 2254a645a38dc695629e6fb801bc89ba098095ba SHA1 96a24edc7a85b6a8fe6201dc5f626aca004bd44e SHA256 5fe02cd356fd7711c5b7ffbbbab9665708fab86fa00cf4194c901c301bbc2409
-MD5 254318a79e1296bb75a8a37c34651212 cherrypy-2.1.1.ebuild 919
-RMD160 2254a645a38dc695629e6fb801bc89ba098095ba cherrypy-2.1.1.ebuild 919
-SHA256 5fe02cd356fd7711c5b7ffbbbab9665708fab86fa00cf4194c901c301bbc2409 cherrypy-2.1.1.ebuild 919
-EBUILD cherrypy-2.2.1-r1.ebuild 1074 RMD160 1566341a12301fbd9742d98f08c1650c11fcc299 SHA1 e95cc2d8fd334209401ebb0dcd9d98ceeab1b07c SHA256 14c3dffaf1dc0b0db6db4255a550fa3dacfc1d1d62098866c0953076b1ebee6a
-MD5 d5c3d430a6249a5ed651952d26d097a5 cherrypy-2.2.1-r1.ebuild 1074
-RMD160 1566341a12301fbd9742d98f08c1650c11fcc299 cherrypy-2.2.1-r1.ebuild 1074
-SHA256 14c3dffaf1dc0b0db6db4255a550fa3dacfc1d1d62098866c0953076b1ebee6a cherrypy-2.2.1-r1.ebuild 1074
+EBUILD cherrypy-2.2.1-r2.ebuild 1165 RMD160 9a391b7077199b1bdd84425799c4cacdcf0e9bf1 SHA1 6bc5e91aad67470f70246d4deaf72705ef9a13c5 SHA256 6d1f6ca99508a89878e3c4ddc84506f34a194ea76acf214987379495f32fbdfb
+MD5 40ca44404ef9963da632a1c883c7dfad cherrypy-2.2.1-r2.ebuild 1165
+RMD160 9a391b7077199b1bdd84425799c4cacdcf0e9bf1 cherrypy-2.2.1-r2.ebuild 1165
+SHA256 6d1f6ca99508a89878e3c4ddc84506f34a194ea76acf214987379495f32fbdfb cherrypy-2.2.1-r2.ebuild 1165
 EBUILD cherrypy-3.0.2-r1.ebuild 998 RMD160 78a941af3506f4abd8d0259991edc9291508ae0c SHA1 4a0e5d32a66f109a019d6866d2e1f716d5b77d61 SHA256 25f17acff3da5743b38dab9bf13d15a5513a1ae97b1625c26f19b465220f94d5
 MD5 c329a604748df2bd8b4458c8bbd15328 cherrypy-3.0.2-r1.ebuild 998
 RMD160 78a941af3506f4abd8d0259991edc9291508ae0c cherrypy-3.0.2-r1.ebuild 998
 SHA256 25f17acff3da5743b38dab9bf13d15a5513a1ae97b1625c26f19b465220f94d5 cherrypy-3.0.2-r1.ebuild 998
-EBUILD cherrypy-3.0.2.ebuild 939 RMD160 868f86185293d2224391d2e1320382e31dd77b20 SHA1 bf4773366e1619a99aeba9310e530502e02922c4 SHA256 484c4fab54c494c8b609daaeb7d80877080375f43361716c81ecd8d7a91b388e
-MD5 0ad8dfa45e3db68e0c9561cfeda0e4ff cherrypy-3.0.2.ebuild 939
-RMD160 868f86185293d2224391d2e1320382e31dd77b20 cherrypy-3.0.2.ebuild 939
-SHA256 484c4fab54c494c8b609daaeb7d80877080375f43361716c81ecd8d7a91b388e cherrypy-3.0.2.ebuild 939
-MISC ChangeLog 4620 RMD160 6114ea02844f7d818cf382047c913318204302a4 SHA1 0a957110d645445c6c8ad403b70346b7e5110b89 SHA256 ef10028573074813f47dd47eb1d0aab4a3f570904c0e2eb61b39999fb4d174a0
-MD5 1e271f4a90a68746aa39499202a6b092 ChangeLog 4620
-RMD160 6114ea02844f7d818cf382047c913318204302a4 ChangeLog 4620
-SHA256 ef10028573074813f47dd47eb1d0aab4a3f570904c0e2eb61b39999fb4d174a0 ChangeLog 4620
+MISC ChangeLog 5054 RMD160 4f15d9bceb07ffa18d5fa2b4e94c93865dacaaa4 SHA1 21e0406042837435d64399f3e595673763f40af4 SHA256 93285156cf4d9c41b2fbd76982a910ff9667640deee735455f9cc422a5566e29
+MD5 8315ba9c5309afa6dde44b58f63db422 ChangeLog 5054
+RMD160 4f15d9bceb07ffa18d5fa2b4e94c93865dacaaa4 ChangeLog 5054
+SHA256 93285156cf4d9c41b2fbd76982a910ff9667640deee735455f9cc422a5566e29 ChangeLog 5054
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a metadata.xml 160
-MD5 60fdc3b8837e88c0d4ac74d2ce1b3591 files/digest-cherrypy-2.1.1 244
-RMD160 b579fa30e7340b80a2b8ea4f2127b055a2f49531 files/digest-cherrypy-2.1.1 244
-SHA256 69e3beefa9d475acf89944a830b82220be1d12bf140772ab5af8a48ac67bd45d files/digest-cherrypy-2.1.1 244
-MD5 0d16822fb4c8746436069f025091810b files/digest-cherrypy-2.2.1-r1 244
-RMD160 8c70bb340dc185f091b8d5f6ec057174629a076f files/digest-cherrypy-2.2.1-r1 244
-SHA256 8f63ac22513c6bc4d84d9cbf6b62befefc3e8bcee201d8f1d0a62ee866584699 files/digest-cherrypy-2.2.1-r1 244
-MD5 a9828dac3879ee9dadb24bf018977465 files/digest-cherrypy-3.0.2 244
-RMD160 23847e74345bc60ca877c0197447036648523035 files/digest-cherrypy-3.0.2 244
-SHA256 f8e0a8a922375b0ae532522ce528eac3faf5272d1526d010e0d1d993617747b4 files/digest-cherrypy-3.0.2 244
+MD5 0d16822fb4c8746436069f025091810b files/digest-cherrypy-2.2.1-r2 244
+RMD160 8c70bb340dc185f091b8d5f6ec057174629a076f files/digest-cherrypy-2.2.1-r2 244
+SHA256 8f63ac22513c6bc4d84d9cbf6b62befefc3e8bcee201d8f1d0a62ee866584699 files/digest-cherrypy-2.2.1-r2 244
 MD5 a9828dac3879ee9dadb24bf018977465 files/digest-cherrypy-3.0.2-r1 244
 RMD160 23847e74345bc60ca877c0197447036648523035 files/digest-cherrypy-3.0.2-r1 244
 SHA256 f8e0a8a922375b0ae532522ce528eac3faf5272d1526d010e0d1d993617747b4 files/digest-cherrypy-3.0.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeD9q8ACgkQQU4yORhF8iB9jgCfQO/IAgMQ8Q6wisNL6P+j6Qpe
+nI0AoLoS1XV6h8DA4/QikQnL2rsyzl1x
+=adtE
+-----END PGP SIGNATURE-----
diff --git a/dev-python/cherrypy/cherrypy-2.1.1.ebuild b/dev-python/cherrypy/cherrypy-2.1.1.ebuild
deleted file mode 100644
index d77c6236af93..000000000000
--- a/dev-python/cherrypy/cherrypy-2.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.1.1.ebuild,v 1.5 2007/07/11 06:19:47 mr_bones_ Exp $
-
-inherit distutils eutils
-
-MY_P=${P/cherrypy/CherryPy}
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
-SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.cherrypy.org/"
-DEPEND=">=dev-lang/python-2.3"
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ia64 ~ppc x86"
-LICENSE="BSD"
-S=${WORKDIR}/${MY_P}
-
-DOCS="CHANGELOG.txt CHERRYPYTEAM.txt"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-	epatch ${FILESDIR}/${P}-test-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/doc/${P}
-	doins -r cherrypy/tutorial
-	insinto /usr/share/${PN}
-	doins -r cherrypy/test
-}
-
-src_test() {
-	cd cherrypy/test
-	python test.py || die "Test failed."
-}
diff --git a/dev-python/cherrypy/cherrypy-2.2.1-r1.ebuild b/dev-python/cherrypy/cherrypy-2.2.1-r2.ebuild
index 8458b9bd80c9..9b712e8a68f4 100644
--- a/dev-python/cherrypy/cherrypy-2.2.1-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-2.2.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.2.1-r1.ebuild,v 1.2 2007/07/05 20:24:30 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.2.1-r2.ebuild,v 1.1 2008/01/08 22:18:10 hawking Exp $
 
-inherit distutils
+inherit eutils distutils
 
 MY_P=CherryPy-${PV}
 
@@ -23,6 +23,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-py2.5.patch
+	epatch "${FILESDIR}"/${P}-invalidsession.patch
 	sed -i \
 		-e '/raw_input/d' \
 		cherrypy/test/test.py || die "sed failed"
diff --git a/dev-python/cherrypy/cherrypy-3.0.2.ebuild b/dev-python/cherrypy/cherrypy-3.0.2.ebuild
deleted file mode 100644
index fc62df5a02cf..000000000000
--- a/dev-python/cherrypy/cherrypy-3.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.0.2.ebuild,v 1.2 2007/11/01 19:25:42 jokey Exp $
-
-inherit distutils
-
-MY_P=CherryPy-${PV}
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
-SRC_URI="http://download.cherrypy.org/cherrypy/${PV}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.cherrypy.org/"
-IUSE="doc"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc x86"
-LICENSE="BSD"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e 's/"cherrypy.tutorial",//' \
-		-e "/('cherrypy\/tutorial',/, /),/d" \
-		setup.py || die "sed failed"
-
-}
-
-src_install() {
-	distutils_src_install
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins -r cherrypy/tutorial
-	fi
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" cherrypy/test/test.py --dumb || die "test failed"
-}
diff --git a/dev-python/cherrypy/files/cherrypy-2.1.1-test-gentoo.patch b/dev-python/cherrypy/files/cherrypy-2.1.1-test-gentoo.patch
deleted file mode 100644
index 8e3eea433d62..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.1.1-test-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cherrypy/test/test.py.org	2005-10-21 13:35:14.068726072 -0700
-+++ cherrypy/test/test.py	2005-10-21 13:35:31.693046768 -0700
-@@ -350,7 +350,6 @@
-     CPTestHarness(testList).run()
-     
-     print
--    raw_input('hit enter')
- 
- 
- if __name__ == '__main__':
diff --git a/dev-python/cherrypy/files/cherrypy-2.2.1-invalidsession.patch b/dev-python/cherrypy/files/cherrypy-2.2.1-invalidsession.patch
new file mode 100644
index 000000000000..a01a606f4fdd
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-2.2.1-invalidsession.patch
@@ -0,0 +1,22 @@
+--- cherrypy/filters/sessionfilter.py	2006-04-25 04:37:45.000000000 +0300
++++ cherrypy/filters/sessionfilter.py	2008-01-08 23:01:09.000000000 +0200
+@@ -326,6 +326,8 @@
+             raise SessionStoragePathNotConfiguredError()
+         fileName = self.SESSION_PREFIX + id
+         file_path = os.path.join(storage_path, fileName)
++        if not os.path.normpath(file_path).startswith(storage_path):
++            raise cherrypy.HTTPError(400, "Invalid session id in cookie.")
+         return file_path
+     
+     def _lock_file(self, path):
+--- cherrypy/test/test_session_filter.py	2006-04-25 04:37:40.000000000 +0300
++++ cherrypy/test/test_session_filter.py	2008-01-08 23:00:39.000000000 +0200
+@@ -28,7 +28,7 @@
+             'server.environment': 'production',
+             'session_filter.on': True,
+             'session_filter.storage_type' : 'file',
+-            'session_filter.storage_path' : '.',
++            'session_filter.storage_path' : os.path.abspath('.'),
+     })
+ 
+ import helper
diff --git a/dev-python/cherrypy/files/cherrypy-2.2.1-py2.5.patch b/dev-python/cherrypy/files/cherrypy-2.2.1-py2.5.patch
new file mode 100644
index 000000000000..eddab6e1dccc
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-2.2.1-py2.5.patch
@@ -0,0 +1,155 @@
+diff -ur CherryPy-2.2.1/cherrypy/test/test_core.py CherryPy-2.2.1-py2.5/cherrypy/test/test_core.py
+--- CherryPy-2.2.1/cherrypy/test/test_core.py	2006-04-25 04:37:40.000000000 +0300
++++ CherryPy-2.2.1-py2.5/cherrypy/test/test_core.py	2008-01-08 23:37:55.000000000 +0200
+@@ -824,15 +824,27 @@
+         self.assertBody(data)
+     
+     def testCookies(self):
+-        self.getPage("/cookies/single?name=First",
++        import sys
++        if sys.version_info >= (2, 5):
++            self.getPage("/cookies/single?name=First",
++                    [('Cookie', 'First=Dinsdale;')])
++            self.assertHeader('Set-Cookie', 'First=Dinsdale')
++
++            self.getPage("/cookies/multiple?names=First&names=Last",
++                    [('Cookie', 'First=Dinsdale; Last=Piranha;'),
++                        ])
++            self.assertHeader('Set-Cookie', 'First=Dinsdale')
++            self.assertHeader('Set-Cookie', 'Last=Piranha')
++        else:
++            self.getPage("/cookies/single?name=First",
+                      [('Cookie', 'First=Dinsdale;')])
+-        self.assertHeader('Set-Cookie', 'First=Dinsdale;')
++            self.assertHeader('Set-Cookie', 'First=Dinsdale;')
+         
+-        self.getPage("/cookies/multiple?names=First&names=Last",
++            self.getPage("/cookies/multiple?names=First&names=Last",
+                      [('Cookie', 'First=Dinsdale; Last=Piranha;'),
+                       ])
+-        self.assertHeader('Set-Cookie', 'First=Dinsdale;')
+-        self.assertHeader('Set-Cookie', 'Last=Piranha;')
++            self.assertHeader('Set-Cookie', 'First=Dinsdale;')
++            self.assertHeader('Set-Cookie', 'Last=Piranha;')
+     
+     def testMaxRequestSize(self):
+         self.getPage("/", headers=[('From', "x" * 500)])
+diff -ur CherryPy-2.2.1/cherrypy/test/webtest.py CherryPy-2.2.1-py2.5/cherrypy/test/webtest.py
+--- CherryPy-2.2.1/cherrypy/test/webtest.py	2006-04-25 04:37:40.000000000 +0300
++++ CherryPy-2.2.1-py2.5/cherrypy/test/webtest.py	2008-01-08 23:58:51.000000000 +0200
+@@ -204,43 +204,81 @@
+     def exit(self):
+         sys.exit()
+     
+-    def __call__(self, result=None):
+-        if result is None:
+-            result = self.defaultTestResult()
+-        result.startTest(self)
+-        testMethod = getattr(self, self._TestCase__testMethodName)
+-        try:
+-            try:
+-                self.setUp()
+-            except (KeyboardInterrupt, SystemExit):
+-                raise
+-            except:
+-                result.addError(self, self._TestCase__exc_info())
+-                return
+-            
+-            ok = 0
++    if sys.version_info >= (2, 5):
++        def __call__(self, result=None):
++            if result is None:
++                result = self.defaultTestResult()
++            result.startTest(self)
++            testMethod = getattr(self, self._testMethodName)
+             try:
+-                testMethod()
+-                ok = 1
+-            except self.failureException:
+-                result.addFailure(self, self._TestCase__exc_info())
+-            except (KeyboardInterrupt, SystemExit):
+-                raise
+-            except:
+-                result.addError(self, self._TestCase__exc_info())
+-            
++                try:
++                    self.setUp()
++                except (KeyboardInterrupt, SystemExit):
++                    raise
++                except:
++                    result.addError(self, self._exc_info())
++                    return
++
++                ok = 0
++                try:
++                    testMethod()
++                    ok = 1
++                except self.failureException:
++                    result.addFailure(self, self._exc_info())
++                except (KeyboardInterrupt, SystemExit):
++                    raise
++                except:
++                    result.addError(self, self._exc_info())
++
++                try:
++                    self.tearDown()
++                except (KeyboardInterrupt, SystemExit):
++                    raise
++                except:
++                    result.addError(self, self._exc_info())
++                    ok = 0
++                if ok:
++                    result.addSuccess(self)
++            finally:
++                result.stopTest(self)
++    else:
++        def __call__(self, result=None):
++            if result is None:
++                result = self.defaultTestResult()
++            result.startTest(self)
++            testMethod = getattr(self, self._TestCase__testMethodName)
+             try:
+-                self.tearDown()
+-            except (KeyboardInterrupt, SystemExit):
+-                raise
+-            except:
+-                result.addError(self, self._TestCase__exc_info())
++                try:
++                    self.setUp()
++                except (KeyboardInterrupt, SystemExit):
++                    raise
++                except:
++                    result.addError(self, self._TestCase__exc_info())
++                    return
++
+                 ok = 0
+-            if ok:
+-                result.addSuccess(self)
+-        finally:
+-            result.stopTest(self)
+-    
++                try:
++                    testMethod()
++                    ok = 1
++                except self.failureException:
++                    result.addFailure(self, self._TestCase__exc_info())
++                except (KeyboardInterrupt, SystemExit):
++                    raise
++                except:
++                    result.addError(self, self._TestCase__exc_info())
++
++                try:
++                    self.tearDown()
++                except (KeyboardInterrupt, SystemExit):
++                    raise
++                except:
++                    result.addError(self, self._TestCase__exc_info())
++                    ok = 0
++                if ok:
++                    result.addSuccess(self)
++            finally:
++                result.stopTest(self)
++
+     def assertStatus(self, status, msg=None):
+         """Fail if self.status != status."""
+         if isinstance(status, basestring):
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.1.1 b/dev-python/cherrypy/files/digest-cherrypy-2.1.1
deleted file mode 100644
index ffea61fe0daf..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-2.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f36d73a8c38c1444285b37c3451dce86 CherryPy-2.1.1.tar.gz 177839
-RMD160 9f310f96fe6f8046a6e05fef6b855e66018d48be CherryPy-2.1.1.tar.gz 177839
-SHA256 2edb7213b030c116c53bbe5bc72c85e2978ed2aa515b6ba9560c8a8ce8968cf0 CherryPy-2.1.1.tar.gz 177839
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.2.1-r1 b/dev-python/cherrypy/files/digest-cherrypy-2.2.1-r2
index 9c6163b20695..9c6163b20695 100644
--- a/dev-python/cherrypy/files/digest-cherrypy-2.2.1-r1
+++ b/dev-python/cherrypy/files/digest-cherrypy-2.2.1-r2
diff --git a/dev-python/cherrypy/files/digest-cherrypy-3.0.2 b/dev-python/cherrypy/files/digest-cherrypy-3.0.2
deleted file mode 100644
index 8c807b9dd474..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-3.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0b10db126a708b763f243ef764ad21a CherryPy-3.0.2.tar.gz 262428
-RMD160 0bd98ca014b6539cd03969b6b3d85308d296b88e CherryPy-3.0.2.tar.gz 262428
-SHA256 cd590e57543bf1c590c006bfd7c222adce6ab1584ef35d72dd91558e4e281a1a CherryPy-3.0.2.tar.gz 262428