6 files changed, 12 insertions, 55 deletions
diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 64b2a2b82558..829cdad5fb34 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.21 2007/07/05 20:24:30 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.22 2007/09/04 09:22:30 lucass Exp $
+
+*cherrypy-3.0.2 (04 Sep 2007)
+
+  04 Sep 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -cherrypy-2.2.1.ebuild, -cherrypy-3.0.1.ebuild, +cherrypy-3.0.2.ebuild:
+  Version bump. Dropped old versions.
 
   05 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
   cherrypy-2.2.1-r1.ebuild:
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 335d569e0d45..000000000000
--- a/dev-python/cherrypy/cherrypy-2.2.1.ebuild
+++ /dev/null
@@ -1,46 +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-2.2.1.ebuild,v 1.3 2007/02/27 22:47:19 dev-zero 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 '/raw_input/d' \
-		cherrypy/test/test.py || die "sed failed"
-	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 || die "test failed"
-}
diff --git a/dev-python/cherrypy/cherrypy-3.0.1.ebuild b/dev-python/cherrypy/cherrypy-3.0.2.ebuild
index 13f69a4e922a..6caab957a7ba 100644
--- a/dev-python/cherrypy/cherrypy-3.0.1.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.2 2007/02/27 22:47:19 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.0.2.ebuild,v 1.1 2007/09/04 09:22:30 lucass Exp $
 
 inherit distutils
 
@@ -17,7 +17,7 @@ LICENSE="BSD"
 DEPEND=""
 RDEPEND=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
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
diff --git a/dev-python/cherrypy/files/digest-cherrypy-3.0.1 b/dev-python/cherrypy/files/digest-cherrypy-3.0.1
deleted file mode 100644
index b2854cd67435..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-3.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13b80dbdd9b0491a71b30d4916950968 CherryPy-3.0.1.tar.gz 262276
-RMD160 e74265cc9e221582fd20ce5e236bef9ab72db8df CherryPy-3.0.1.tar.gz 262276
-SHA256 c2d58d02d9b0b5772a52355136c1085fbaf14f6689f849eea41f4fe8bd573886 CherryPy-3.0.1.tar.gz 262276
diff --git a/dev-python/cherrypy/files/digest-cherrypy-3.0.2 b/dev-python/cherrypy/files/digest-cherrypy-3.0.2
new file mode 100644
index 000000000000..8c807b9dd474
--- /dev/null
+++ b/dev-python/cherrypy/files/digest-cherrypy-3.0.2
@@ -0,0 +1,3 @@
+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