6 files changed, 11 insertions, 48 deletions
diff --git a/dev-python/cheetah/ChangeLog b/dev-python/cheetah/ChangeLog
index 80d1f0394a7e..438d1277e98b 100644
--- a/dev-python/cheetah/ChangeLog
+++ b/dev-python/cheetah/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cheetah
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.36 2007/07/19 18:06:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.37 2007/10/12 23:46:37 pythonhead Exp $
+
+*cheetah-2.0 (12 Oct 2007)
+
+  12 Oct 2007; Rob Cakebread <pythonhead@gentoo.org>
+  -cheetah-2.0_rc8.ebuild, -cheetah-2.0_rc8-r1.ebuild, +cheetah-2.0.ebuild:
+  Version bump, dropped old rc versions
 
   19 Jul 2007; Fabian Groffen <grobian@gentoo.org> cheetah-0.9.17.ebuild,
   cheetah-0.9.18.ebuild, cheetah-1.0.ebuild, cheetah-2.0_rc8.ebuild:
diff --git a/dev-python/cheetah/cheetah-2.0_rc8-r1.ebuild b/dev-python/cheetah/cheetah-2.0.ebuild
index 4c67e2d2c980..38fbe98edb20 100644
--- a/dev-python/cheetah/cheetah-2.0_rc8-r1.ebuild
+++ b/dev-python/cheetah/cheetah-2.0.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/cheetah/cheetah-2.0_rc8-r1.ebuild,v 1.1 2007/07/08 21:47:04 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-2.0.ebuild,v 1.1 2007/10/12 23:46:37 pythonhead Exp $
 
 NEED_PYTHON=2.2
 
diff --git a/dev-python/cheetah/cheetah-2.0_rc8.ebuild b/dev-python/cheetah/cheetah-2.0_rc8.ebuild
deleted file mode 100644
index eb6d461865ff..000000000000
--- a/dev-python/cheetah/cheetah-2.0_rc8.ebuild
+++ /dev/null
@@ -1,40 +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/cheetah/cheetah-2.0_rc8.ebuild,v 1.3 2007/07/19 18:06:40 grobian Exp $
-
-NEED_PYTHON=2.2
-
-inherit distutils
-
-MY_PN=Cheetah
-MY_P=${MY_PN}-${PV/_}
-
-DESCRIPTION="Python-powered template engine and code generator."
-HOMEPAGE="http://www.cheetahtemplate.org/"
-SRC_URI="mirror://sourceforge/cheetahtemplate/${MY_P}.tar.gz"
-LICENSE="PSF-2.2"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-PYTHON_MODNAME="Cheetah"
-DOCS="README CHANGES TODO"
-
-pkg_postinst() {
-	ewarn "This release requires re-compilation of all compiled templates!"
-}
-
-src_test() {
-	#We need to do the sed here because files don't exist until after src_build
-	local p="$(ls -d ${S}/build/lib.* )"
-	local s="$(ls -d ${S}/build/scripts*)"
-	sed -i \
-		-e "s:\(self\.go(\"\)\(${PN}\):\1PYTHONPATH=\'${p}\' \'${s}/\2\':" \
-		src/Tests/CheetahWrapper.py || die "sed failed"
-
-	PYTHONPATH="${p}" "${python}" src/Tests/Test.py || die "tests failed"
-}
diff --git a/dev-python/cheetah/files/digest-cheetah-2.0 b/dev-python/cheetah/files/digest-cheetah-2.0
new file mode 100644
index 000000000000..b76555cde35d
--- /dev/null
+++ b/dev-python/cheetah/files/digest-cheetah-2.0
@@ -0,0 +1,3 @@
+MD5 b2c0df48720969ce8d87c46ae99c4831 Cheetah-2.0.tar.gz 215011
+RMD160 63f82bbd5bd5033ff6f8c2d38124253abda928b0 Cheetah-2.0.tar.gz 215011
+SHA256 a7a19358706584709e7776de973e8ed337c47c6177345d71e2e3fae1252e1f8c Cheetah-2.0.tar.gz 215011
diff --git a/dev-python/cheetah/files/digest-cheetah-2.0_rc8 b/dev-python/cheetah/files/digest-cheetah-2.0_rc8
deleted file mode 100644
index a70cb070405e..000000000000
--- a/dev-python/cheetah/files/digest-cheetah-2.0_rc8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7a13092bad898ba0b0fe903865fc1faa Cheetah-2.0rc8.tar.gz 214845
-RMD160 04aeabecbfed3f49e1a5943bdc5a80f871a7a50c Cheetah-2.0rc8.tar.gz 214845
-SHA256 81f2b834faa184a5c51bd32fdd37cc47c3a92f870a387c41361a6aaf66de179c Cheetah-2.0rc8.tar.gz 214845
diff --git a/dev-python/cheetah/files/digest-cheetah-2.0_rc8-r1 b/dev-python/cheetah/files/digest-cheetah-2.0_rc8-r1
deleted file mode 100644
index a70cb070405e..000000000000
--- a/dev-python/cheetah/files/digest-cheetah-2.0_rc8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7a13092bad898ba0b0fe903865fc1faa Cheetah-2.0rc8.tar.gz 214845
-RMD160 04aeabecbfed3f49e1a5943bdc5a80f871a7a50c Cheetah-2.0rc8.tar.gz 214845
-SHA256 81f2b834faa184a5c51bd32fdd37cc47c3a92f870a387c41361a6aaf66de179c Cheetah-2.0rc8.tar.gz 214845