Version bump. Removed obsolete beta

(Portage version: 1.589-cvs)

8 files changed, 29 insertions, 42 deletions

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 3991a7245c57..fdc87b4dbf0d 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.7 2005/07/28 09:45:08 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.8 2005/10/21 20:53:40 pythonhead Exp $
+
+*cherrypy-2.1.0 (21 Oct 2005)
+
+  21 Oct 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/cherrypy-2.1.0-test-gentoo.patch,
+  -files/cherrypy-2.1.0_beta1-setup-gentoo.diff,
+  -files/cherrypy-2.1.0_beta1-test-gentoo.diff,
+  -cherrypy-2.1.0_beta1.ebuild, +cherrypy-2.1.0.ebuild:
+  Version bump. Removed obsolete beta1
 
   28 Jul 2005; Simon Stelling <blubb@gentoo.org>
   cherrypy-2.1.0_beta1.ebuild:
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 530e4efc6b50..6a2c534d8707 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,10 +1,9 @@
-MD5 bf7c503b7459c333e624a69f0a47b423 ChangeLog 1476
-MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 MD5 8d956752dc9ee356c9ca5916a497d0ca cherrypy-2.0.0.ebuild 1135
-MD5 d12cf5cbc33e30f5d655293941530893 cherrypy-2.1.0_beta1.ebuild 1175
+MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
+MD5 cff059f70a6ae1dd2baa2f78d5a3adf0 ChangeLog 1796
+MD5 122b406a905f91b34083e3ddc3af5ba3 cherrypy-2.1.0.ebuild 911
 MD5 4991e5ddb5d31fb149fdadc26b75f551 files/digest-cherrypy-2.0.0 65
-MD5 42bc7139e01a8fb4317d96a2daa6dc36 files/cherrypy-2.1.0_beta1-setup-gentoo.diff 545
-MD5 bff1929ff5b5e5dfffcf005dadb6f3c9 files/digest-cherrypy-2.1.0_beta1 70
+MD5 4cf9009699f529b3c7921c0e1ab0cc94 files/cherrypy-2.1.0-test-gentoo.patch 260
 MD5 c885c6173e005c060a73ecf836011132 files/cherrypy-2.0.0-setup-gentoo.diff 471
 MD5 f411ca60958e839619324a1a81b9af4d files/cherrypy-2.0.0-test-gentoo.diff 212
-MD5 ab18a74a5ddaedcea79b8834eabcf04c files/cherrypy-2.1.0_beta1-test-gentoo.diff 326
+MD5 a2ab81d963b17955e9d2eaeff314679c files/digest-cherrypy-2.1.0 66
diff --git a/dev-python/cherrypy/cherrypy-2.1.0_beta1.ebuild b/dev-python/cherrypy/cherrypy-2.1.0.ebuild
index e76789c1332b..e6f597a36296 100644
--- a/dev-python/cherrypy/cherrypy-2.1.0_beta1.ebuild
+++ b/dev-python/cherrypy/cherrypy-2.1.0.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.1.0_beta1.ebuild,v 1.3 2005/07/28 09:45:08 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.1.0.ebuild,v 1.1 2005/10/21 20:53:40 pythonhead Exp $
 
 inherit distutils
 
-MY_P=${P/c/C}
-MY_P=${MY_P/p/P}
-MY_P=${MY_P/_beta1/-beta}
+MY_P=${P/cherrypy/CherryPy}
 
 DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
 SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
@@ -23,8 +21,7 @@ DOCS="CHANGELOG.txt CHERRYPYTEAM.txt"
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
-	epatch ${FILESDIR}/${P}-setup-gentoo.diff
-	epatch ${FILESDIR}/${P}-test-gentoo.diff
+	epatch ${FILESDIR}/${P}-test-gentoo.patch
 }
 
 src_install() {
@@ -33,7 +30,6 @@ src_install() {
 	doins -r cherrypy/tutorial
 	insinto /usr/share/${PN}
 	doins -r cherrypy/test
-	dosym /usr/share/doc/${P}/tutorial /usr/share/${PN}
 }
 
 src_test() {
@@ -41,9 +37,3 @@ src_test() {
 	python test.py || die "Test failed."
 }
 
-pkg_postinst() {
-	einfo ""
-	einfo "Tutorial files: /usr/share/doc/${P}/tutorial"
-	einfo "Test files    : /usr/share/${PN}/test"
-	einfo ""
-}
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
new file mode 100644
index 000000000000..8e3eea433d62
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-2.1.0-test-gentoo.patch
@@ -0,0 +1,10 @@
+--- 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.1.0_beta1-setup-gentoo.diff b/dev-python/cherrypy/files/cherrypy-2.1.0_beta1-setup-gentoo.diff
deleted file mode 100644
index 27256182d243..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.1.0_beta1-setup-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.org	2005-07-14 12:19:39.000000000 -0700
-+++ setup.py	2005-07-14 12:21:14.000000000 -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.lib.filter.sessionfilter", "cherrypy.tutorial", "cherrypy.test"],
-+      packages=["cherrypy", "cherrypy.lib", "cherrypy.lib.filter", "cherrypy.lib.filter.sessionfilter"],
-       download_url="http://www.cherrypy.org/wiki/CherryPyDownload",
- )
- 
diff --git a/dev-python/cherrypy/files/cherrypy-2.1.0_beta1-test-gentoo.diff b/dev-python/cherrypy/files/cherrypy-2.1.0_beta1-test-gentoo.diff
deleted file mode 100644
index 079d0a580134..000000000000
--- a/dev-python/cherrypy/files/cherrypy-2.1.0_beta1-test-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- cherrypy/test/test.py.org	2005-07-14 13:00:22.081731928 -0700
-+++ cherrypy/test/test.py	2005-07-14 13:00:30.142506504 -0700
-@@ -335,7 +335,6 @@
-             print "run /cherrypy/lib/covercp.py as a script to serve coverage results on port 8080"
-     
-     print
--    raw_input('hit enter')
- 
- 
- if __name__ == '__main__':
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.1.0 b/dev-python/cherrypy/files/digest-cherrypy-2.1.0
new file mode 100644
index 000000000000..4f71a38b7ebc
--- /dev/null
+++ b/dev-python/cherrypy/files/digest-cherrypy-2.1.0
@@ -0,0 +1 @@
+MD5 10bd559bdfdf783101d83335dd8acf58 CherryPy-2.1.0.tar.gz 177955
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.1.0_beta1 b/dev-python/cherrypy/files/digest-cherrypy-2.1.0_beta1
deleted file mode 100644
index d2893bccdefe..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-2.1.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 777116325f605628f98b2ea1ef5ae1e9 CherryPy-2.1.0-beta.tar.gz 71343