Version bump.

(Portage version: 2.1_pre7-r4)

5 files changed, 77 insertions, 8 deletions

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 771fe5f0d73a..0e69f692efc7 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.11 2006/04/01 14:47:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.12 2006/04/06 15:23:10 pythonhead Exp $
+
+*cherrypy-2.2.0 (06 Apr 2006)
+
+  06 Apr 2006; Rob Cakebread <pythonhead@gentoo.org>
+  +files/cherrypy-2.2.0-test-gentoo.patch, +cherrypy-2.2.0.ebuild:
+  Version bump.
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org> cherrypy-2.1.1.ebuild:
   Mark 2.1.1 ~ia64
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 5c97e85a8bbd..4072a811d186 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aee25de1570b1ee8d06bed5f4bea1181 ChangeLog 2189
-RMD160 9fc71bb392412ba9679710f109fe53a4e2b3a00c ChangeLog 2189
-SHA256 2ee542bd3b7786f76c88a15c052bb57096d752e27152e42c5290e5180de1d99d ChangeLog 2189
+MD5 98408880d6321fd887a450e5134f9d70 ChangeLog 2357
+RMD160 dc783a5102ae9a459ae3f556eb5778b794a8ed2b ChangeLog 2357
+SHA256 c881a62c7a6eec1e7f639c17196282516ed4f40b8b80dc80699a889e8f161a1c ChangeLog 2357
 MD5 0f5c2b2e82673db6c01ba3e74a22858c cherrypy-2.0.0.ebuild 1144
 RMD160 1afe3c2eaaa25389ddbcff87dc490f1c5aa81673 cherrypy-2.0.0.ebuild 1144
 SHA256 0340f97eb67ad6caa9a40ffcbad70472c5a823b3fd677ab560bf1d2b4aa29a66 cherrypy-2.0.0.ebuild 1144
@@ -13,6 +13,9 @@ SHA256 6db6fdb43343f063cf59cbe8182a0db52314cdf117fac14199b2aeef0bc6547c cherrypy
 MD5 6cc63176fc313ee6f88fe5c36b96868f cherrypy-2.1.1.ebuild 921
 RMD160 691a35f97b784155f5856a2dd040808184cd556b cherrypy-2.1.1.ebuild 921
 SHA256 6d4d09db55619eaf45b5b43466e686044ba94a689db9384712ab238747c071a5 cherrypy-2.1.1.ebuild 921
+MD5 81561cada66176c20714817c0cc01252 cherrypy-2.2.0.ebuild 920
+RMD160 1bb6fdaa6a5495a4b7b19395c60a972c8d5fdd0b cherrypy-2.2.0.ebuild 920
+SHA256 8c6338e57ab851d74af52dd48d2a4bb74d83ed9c4eaa898c5fd5e8e9cae1c870 cherrypy-2.2.0.ebuild 920
 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
@@ -25,6 +28,9 @@ SHA256 f5ee1a1295e2dc6f9658adabbceafc513248c156d5d94d1751616d6c325aeaa2 files/ch
 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
+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
 MD5 4991e5ddb5d31fb149fdadc26b75f551 files/digest-cherrypy-2.0.0 65
 RMD160 453d2941693fee6564200c340c57d7200efbb1ad files/digest-cherrypy-2.0.0 65
 SHA256 4e1fd606df517eca492f16461bcd50080ded009e8bc0cd592e3d8e2418cd6809 files/digest-cherrypy-2.0.0 65
@@ -34,13 +40,16 @@ SHA256 e29726658e4c5112dbb20310f1efcf320f43333cce75cddef92ed41644dbd5d3 files/di
 MD5 8df5adbbfaa6195b3750466d1647165b files/digest-cherrypy-2.1.1 66
 RMD160 ed4eee3c2a88e40300e350b8b93201c9bf441dd9 files/digest-cherrypy-2.1.1 66
 SHA256 401efbea31ffd5bfce9c3a68a2b34a75228c545f9f9963831d99e1691630aa1a files/digest-cherrypy-2.1.1 66
+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 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a metadata.xml 160
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFELpKFJrHF4yAQTrARAi5SAKCEqKyhgY+n9RT5aV1/OT3CTYrWeQCfVvOb
-HSUGm/wpgk0r1FySObC3nN8=
-=L+yL
+iD8DBQFENTMbTry2jroju7wRAp8UAJ9DHV5COpLklGjjOzjobZBi639HKACfTWsy
+j1wNgqBMMo/+zmDpIc/bhoE=
+=rk8s
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cherrypy/cherrypy-2.2.0.ebuild b/dev-python/cherrypy/cherrypy-2.2.0.ebuild
new file mode 100644
index 000000000000..cbf51e9bddc9
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-2.2.0.ebuild
@@ -0,0 +1,39 @@
+# 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/files/cherrypy-2.2.0-test-gentoo.patch b/dev-python/cherrypy/files/cherrypy-2.2.0-test-gentoo.patch
new file mode 100644
index 000000000000..2e25d4b510c2
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-2.2.0-test-gentoo.patch
@@ -0,0 +1,12 @@
+--- 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/digest-cherrypy-2.2.0 b/dev-python/cherrypy/files/digest-cherrypy-2.2.0
new file mode 100644
index 000000000000..2bce6a7c28c3
--- /dev/null
+++ b/dev-python/cherrypy/files/digest-cherrypy-2.2.0
@@ -0,0 +1,3 @@
+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