Version bump (bug #159141). Dropped old versions.

(Portage version: 2.1.2_rc4-r1)
 (Unsigned Manifest commit)

10 files changed, 12 insertions, 184 deletions

diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index c3e8eb6d5d46..480ff28a8807 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,49 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX cherrypy-2.0.0-setup-gentoo.diff 471 RMD160 1bde9a6a712a11df1da9ec831f104d88f4ebf171 SHA1 dafb179ae3548668f4fee229cbfb001d10e3a63a SHA256 f8f2a9ac6bf99a779b228544b759e26e31842734eecd0415738ef6779cf26ca3
-MD5 c885c6173e005c060a73ecf836011132 files/cherrypy-2.0.0-setup-gentoo.diff 471
-RMD160 1bde9a6a712a11df1da9ec831f104d88f4ebf171 files/cherrypy-2.0.0-setup-gentoo.diff 471
-SHA256 f8f2a9ac6bf99a779b228544b759e26e31842734eecd0415738ef6779cf26ca3 files/cherrypy-2.0.0-setup-gentoo.diff 471
-AUX cherrypy-2.0.0-test-gentoo.diff 212 RMD160 7fd44a75860116fc449a11c80c12a631831d354e SHA1 4a98a395a4ac9ddbebd63171d5a8c7c2b7aa8e3c SHA256 fccb5792ced73f92dfa5a95f02572b2a34c3bc6fb919f5d0b7f21334574a7b1d
-MD5 f411ca60958e839619324a1a81b9af4d files/cherrypy-2.0.0-test-gentoo.diff 212
-RMD160 7fd44a75860116fc449a11c80c12a631831d354e files/cherrypy-2.0.0-test-gentoo.diff 212
-SHA256 fccb5792ced73f92dfa5a95f02572b2a34c3bc6fb919f5d0b7f21334574a7b1d files/cherrypy-2.0.0-test-gentoo.diff 212
-AUX cherrypy-2.1.0-test-gentoo.patch 260 RMD160 76705521adab4ce2c131e551a87344a1901fa7aa SHA1 b48c5a01b33bb253b7a2434388dd544df9dd42b4 SHA256 f5ee1a1295e2dc6f9658adabbceafc513248c156d5d94d1751616d6c325aeaa2
-MD5 4cf9009699f529b3c7921c0e1ab0cc94 files/cherrypy-2.1.0-test-gentoo.patch 260
-RMD160 76705521adab4ce2c131e551a87344a1901fa7aa files/cherrypy-2.1.0-test-gentoo.patch 260
-SHA256 f5ee1a1295e2dc6f9658adabbceafc513248c156d5d94d1751616d6c325aeaa2 files/cherrypy-2.1.0-test-gentoo.patch 260
 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
-AUX cherrypy-2.2.0-test-gentoo.patch 292 RMD160 69514be4a7cc1d18a8af015db4fa754a915c4a06 SHA1 f5a57f94bc1fd13d830f8d844129bf256fac5210 SHA256 1cfe8b28ac523c1ae8d03669e69ac701ba45ed9f9685d7112db19554997fe25a
-MD5 49096b105f263f3c38d13c72b8cfc4b8 files/cherrypy-2.2.0-test-gentoo.patch 292
-RMD160 69514be4a7cc1d18a8af015db4fa754a915c4a06 files/cherrypy-2.2.0-test-gentoo.patch 292
-SHA256 1cfe8b28ac523c1ae8d03669e69ac701ba45ed9f9685d7112db19554997fe25a files/cherrypy-2.2.0-test-gentoo.patch 292
-AUX cherrypy-2.2.1-test-gentoo.patch 264 RMD160 edd3b6cd2b36084bac82d2457220449b5fa3d48e SHA1 fa79737e3cfb999273c3ca96c3f5853b70784602 SHA256 5a92d9a85bfe0a01f1143d600042065e93dcfb9bcff98aad8412d6acfed0b6d9
-MD5 b3fc3562ac3395e91d2ef362002140d5 files/cherrypy-2.2.1-test-gentoo.patch 264
-RMD160 edd3b6cd2b36084bac82d2457220449b5fa3d48e files/cherrypy-2.2.1-test-gentoo.patch 264
-SHA256 5a92d9a85bfe0a01f1143d600042065e93dcfb9bcff98aad8412d6acfed0b6d9 files/cherrypy-2.2.1-test-gentoo.patch 264
 DIST CherryPy-2.1.1.tar.gz 177839 RMD160 9f310f96fe6f8046a6e05fef6b855e66018d48be SHA1 fde88381b93b58ade3275d8c73eea49cc4f2098c SHA256 2edb7213b030c116c53bbe5bc72c85e2978ed2aa515b6ba9560c8a8ce8968cf0
-DIST CherryPy-2.2.0.tar.gz 221662 RMD160 bd7f9f60e5a9a7fda21bb295d61e93714dc4eac8 SHA256 3dd0e0dc2cdd0900d8f4a27fdb80fcdd98634f34aa00ad78b96e8e229f1f2b9b
-DIST CherryPy-2.2.1.tar.gz 219932 RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
+DIST CherryPy-3.0.0.tar.gz 253348 RMD160 e162013d2b7cbb0ee1020c96653d7c26f6fa6481 SHA1 8deb77b5ce9f80ba58ac010824636a609ec909c4 SHA256 84dfd1661451c300d80eed214f9280f4caeae075833718a6e539e3f45c881561
 EBUILD cherrypy-2.1.1.ebuild 919 RMD160 264f6cd68aaff2f9dfaf423045cd2241461925b8 SHA1 cc07b01c681e7642e775457efb21aba755bbad91 SHA256 9992bd112bacf4de1d8342f5448540a311119729c51cfee192202a23b0de086c
 MD5 891f28e74476f31afe88fde6d41c3eab cherrypy-2.1.1.ebuild 919
 RMD160 264f6cd68aaff2f9dfaf423045cd2241461925b8 cherrypy-2.1.1.ebuild 919
 SHA256 9992bd112bacf4de1d8342f5448540a311119729c51cfee192202a23b0de086c cherrypy-2.1.1.ebuild 919
-EBUILD cherrypy-2.2.0.ebuild 923 RMD160 4bf609e3ce44675dfd54393f0eb75af4a610057c SHA1 1dbf3c77f44edf2f031d3b5126c85f8f37576272 SHA256 5348cb40c6a429f47d5ba399bdc7560cf5889f1e2cee1d2ef45f0cb7e9c0f35c
-MD5 46edcb9f39effc81b5ebf1fe43d2e63d cherrypy-2.2.0.ebuild 923
-RMD160 4bf609e3ce44675dfd54393f0eb75af4a610057c cherrypy-2.2.0.ebuild 923
-SHA256 5348cb40c6a429f47d5ba399bdc7560cf5889f1e2cee1d2ef45f0cb7e9c0f35c cherrypy-2.2.0.ebuild 923
-EBUILD cherrypy-2.2.1.ebuild 923 RMD160 b7a5ffcfbe6f9ea021061ae67bb7e655c430c98c SHA1 cda3cae65909b27487053f8a45abaa3927542f37 SHA256 b5888006178a005d022c443953486c5353e53365fba380281a1c0bac20da3c64
-MD5 b70d5bf70e8040e1ac575c647e0e8090 cherrypy-2.2.1.ebuild 923
-RMD160 b7a5ffcfbe6f9ea021061ae67bb7e655c430c98c cherrypy-2.2.1.ebuild 923
-SHA256 b5888006178a005d022c443953486c5353e53365fba380281a1c0bac20da3c64 cherrypy-2.2.1.ebuild 923
-MISC ChangeLog 2866 RMD160 677e7d976d1fe8c2a1f99e0841d7de162f8cd6bb SHA1 e4e0f68a32664868945866b215103b3c69869193 SHA256 a439ca3dd59b4266e11ce1bca868665abf2730f527ffa4105c5f7b74d9dda281
-MD5 8dcfa6ae065099b5154b78930924f742 ChangeLog 2866
-RMD160 677e7d976d1fe8c2a1f99e0841d7de162f8cd6bb ChangeLog 2866
-SHA256 a439ca3dd59b4266e11ce1bca868665abf2730f527ffa4105c5f7b74d9dda281 ChangeLog 2866
+EBUILD cherrypy-3.0.0.ebuild 640 RMD160 b0879c866d64b89c2c573976b434304daddb7c84 SHA1 8bbeb6766da190d9422fc3f671f0a1d3392fb70b SHA256 00116beb230d33875ca297483e3878c2193e7801c0af76caa6ea48cc2c57d197
+MD5 fbc97b66e32f1a04a4784f1475c9f009 cherrypy-3.0.0.ebuild 640
+RMD160 b0879c866d64b89c2c573976b434304daddb7c84 cherrypy-3.0.0.ebuild 640
+SHA256 00116beb230d33875ca297483e3878c2193e7801c0af76caa6ea48cc2c57d197 cherrypy-3.0.0.ebuild 640
+MISC ChangeLog 3292 RMD160 76ac1a78e86291857b4b0615535a30fbdb9f525f SHA1 f064e2c427282e73ed5833171122bf2e88209a08 SHA256 e4d09b41f9a212b9f3a0ba81fac0181b3f5b4b43c0287209b1042a2e15566dfe
+MD5 00457341158dba6ebf07e4cda0533296 ChangeLog 3292
+RMD160 76ac1a78e86291857b4b0615535a30fbdb9f525f ChangeLog 3292
+SHA256 e4d09b41f9a212b9f3a0ba81fac0181b3f5b4b43c0287209b1042a2e15566dfe ChangeLog 3292
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
@@ -51,16 +23,6 @@ SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a metadata
 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 2130b907fbf7ec640b35c1e13b0526ae files/digest-cherrypy-2.2.0 244
-RMD160 ff671d7e3c7fe63a721e44d747f6ce518cee6972 files/digest-cherrypy-2.2.0 244
-SHA256 4b2a26660a9476e737b976359213c6fb0b825fea61b9ca87b614ec945e7661bf files/digest-cherrypy-2.2.0 244
-MD5 0d16822fb4c8746436069f025091810b files/digest-cherrypy-2.2.1 244
-RMD160 8c70bb340dc185f091b8d5f6ec057174629a076f files/digest-cherrypy-2.2.1 244
-SHA256 8f63ac22513c6bc4d84d9cbf6b62befefc3e8bcee201d8f1d0a62ee866584699 files/digest-cherrypy-2.2.1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEuSySuB6ZT1m7QRERAp2XAKCWJXY5hlXEfVTOgdwb3U4gikdRZQCfR9zh
-/hqvo+cj2nziHlcebJHmJbI=
-=GxPH
------END PGP SIGNATURE-----
+MD5 3222135487038b3c9f091065dc37cf1b files/digest-cherrypy-3.0.0 244
+RMD160 3217321ab734d69c3f29fca1c810040ec6c1b839 files/digest-cherrypy-3.0.0 244
+SHA256 5b9d5789a05b9bb75cf11214f3d84b0de7f6d1d3577005de8425b538cde3d34f files/digest-cherrypy-3.0.0 244
diff --git a/dev-python/cherrypy/cherrypy-2.2.0.ebuild b/dev-python/cherrypy/cherrypy-2.2.0.ebuild
deleted file mode 100644
index cbf51e9bddc9..000000000000
--- a/dev-python/cherrypy/cherrypy-2.2.0.ebuild
+++ /dev/null
@@ -1,39 +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.2.0.ebuild,v 1.1 2006/04/06 15:23:11 pythonhead 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.ebuild b/dev-python/cherrypy/cherrypy-2.2.1.ebuild
deleted file mode 100644
index 9c2e67ebd3af..000000000000
--- a/dev-python/cherrypy/cherrypy-2.2.1.ebuild
+++ /dev/null
@@ -1,39 +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.2.1.ebuild,v 1.1 2006/04/26 01:42:09 pythonhead 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/files/cherrypy-2.0.0-setup-gentoo.diff b/dev-python/cherrypy/files/cherrypy-2.0.0-setup-gentoo.diff
deleted file mode 100644
index f61806f0e4a8..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.0.0-setup-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.org	2005-05-04 15:56:57.541695864 -0700
-+++ setup.py	2005-05-04 15:57:51.783449864 -0700
-@@ -22,7 +22,7 @@
-       author_email="team@cherrypy.org",
-       url="http://www.cherrypy.org",
-       license="BSD",
--      packages=["cherrypy", "cherrypy.lib", "cherrypy.lib.filter", "cherrypy.tutorial", "cherrypy.test"],
-+      packages=["cherrypy", "cherrypy.lib", "cherrypy.lib.filter"],
-       download_url="http://www.cherrypy.org/wiki/CherryPyDownload",
- )
- 
diff --git a/dev-python/cherrypy/files/cherrypy-2.0.0-test-gentoo.diff b/dev-python/cherrypy/files/cherrypy-2.0.0-test-gentoo.diff
deleted file mode 100644
index cc8a5823a35b..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.0.0-test-gentoo.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- cherrypy/test/test.py.org	2005-05-04 15:59:20.423974456 -0700
-+++ cherrypy/test/test.py	2005-05-04 15:59:41.422782152 -0700
-@@ -187,4 +187,3 @@
- #    - test hidden classes
- #    ...
- 
--raw_input('hit enter')
diff --git a/dev-python/cherrypy/files/cherrypy-2.1.0-test-gentoo.patch b/dev-python/cherrypy/files/cherrypy-2.1.0-test-gentoo.patch
deleted file mode 100644
index 8e3eea433d62..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.1.0-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.0-test-gentoo.patch b/dev-python/cherrypy/files/cherrypy-2.2.0-test-gentoo.patch
deleted file mode 100644
index 2e25d4b510c2..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.2.0-test-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cherrypy/test/test.py.orig	2006-03-30 07:36:26.000000000 -0800
-+++ cherrypy/test/test.py	2006-04-06 08:18:16.000000000 -0700
-@@ -310,9 +310,6 @@
-     ]

-     CommandLineParser(testList).run()

-     

--    print

--    raw_input('hit enter')

--

- 

- if __name__ == '__main__':

-     run()

diff --git a/dev-python/cherrypy/files/cherrypy-2.2.1-test-gentoo.patch b/dev-python/cherrypy/files/cherrypy-2.2.1-test-gentoo.patch
deleted file mode 100644
index a833b3fbb0d0..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.2.1-test-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cherrypy/test/test.py.org	2006-04-25 18:07:04.000000000 -0700
-+++ cherrypy/test/test.py	2006-04-25 18:07:23.000000000 -0700
-@@ -311,7 +311,6 @@
-     CommandLineParser(testList).run()
-     
-     print
--    raw_input('hit enter')
- 
- 
- if __name__ == '__main__':
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.2.0 b/dev-python/cherrypy/files/digest-cherrypy-2.2.0
deleted file mode 100644
index 2bce6a7c28c3..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-2.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13ea297f2f0c650cca856276a45ed29a CherryPy-2.2.0.tar.gz 221662
-RMD160 bd7f9f60e5a9a7fda21bb295d61e93714dc4eac8 CherryPy-2.2.0.tar.gz 221662
-SHA256 3dd0e0dc2cdd0900d8f4a27fdb80fcdd98634f34aa00ad78b96e8e229f1f2b9b CherryPy-2.2.0.tar.gz 221662
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.2.1 b/dev-python/cherrypy/files/digest-cherrypy-2.2.1
deleted file mode 100644
index 9c6163b20695..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-2.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14bf17b0706bc480342cb8fcfaed74cd CherryPy-2.2.1.tar.gz 219932
-RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 CherryPy-2.2.1.tar.gz 219932
-SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b CherryPy-2.2.1.tar.gz 219932