Version bump, removed obsolete version

(Portage version: 2.1.3.16)

5 files changed, 52 insertions, 24 deletions

diff --git a/dev-python/cheetah/ChangeLog b/dev-python/cheetah/ChangeLog
index 438d1277e98b..809253ae20e4 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.37 2007/10/12 23:46:37 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.38 2007/11/26 19:48:05 pythonhead Exp $
+
+*cheetah-2.0.1 (26 Nov 2007)
+
+  26 Nov 2007; Rob Cakebread <pythonhead@gentoo.org> -cheetah-0.9.17.ebuild,
+  +cheetah-2.0.1.ebuild:
+  Version bump, removed obsolete version
 
 *cheetah-2.0 (12 Oct 2007)
 
diff --git a/dev-python/cheetah/cheetah-0.9.17.ebuild b/dev-python/cheetah/cheetah-0.9.17.ebuild
deleted file mode 100644
index 640698587462..000000000000
--- a/dev-python/cheetah/cheetah-0.9.17.ebuild
+++ /dev/null
@@ -1,20 +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-0.9.17.ebuild,v 1.7 2007/07/19 18:06:40 grobian Exp $
-
-inherit distutils
-
-MY_P=${P/ch/Ch}
-
-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=">=dev-lang/python-2.2"
-S=${WORKDIR}/${MY_P}
-
-PYTHON_MODNAME="Cheetah"
-DOCS="README CHANGES TODO"
diff --git a/dev-python/cheetah/cheetah-2.0.1.ebuild b/dev-python/cheetah/cheetah-2.0.1.ebuild
new file mode 100644
index 000000000000..f12d4a3a66a9
--- /dev/null
+++ b/dev-python/cheetah/cheetah-2.0.1.ebuild
@@ -0,0 +1,42 @@
+# 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.1.ebuild,v 1.1 2007/11/26 19:48:05 pythonhead 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="dev-python/setuptools"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+PYTHON_MODNAME="Cheetah"
+DOCS="README CHANGES TODO"
+#Needed for Python 2.4 so setuptools-based pkgs can detect cheetah
+export CHEETAH_USE_SETUPTOOLS='true'
+
+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-0.9.17 b/dev-python/cheetah/files/digest-cheetah-0.9.17
deleted file mode 100644
index a0219f6ff03b..000000000000
--- a/dev-python/cheetah/files/digest-cheetah-0.9.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 710f1d93ee841bd4d30fcb053cd1b2de Cheetah-0.9.17.tar.gz 145745
-RMD160 e8db9880235d68b2f20ff834bf586d4335940363 Cheetah-0.9.17.tar.gz 145745
-SHA256 e25e8bda8b7e14a76672edbab68f24b464ffbe3f1fb185518ee442bde7cfa58d Cheetah-0.9.17.tar.gz 145745
diff --git a/dev-python/cheetah/files/digest-cheetah-2.0.1 b/dev-python/cheetah/files/digest-cheetah-2.0.1
new file mode 100644
index 000000000000..1e61c5177107
--- /dev/null
+++ b/dev-python/cheetah/files/digest-cheetah-2.0.1
@@ -0,0 +1,3 @@
+MD5 7845a2950ea850a13c488a26b61ac50a Cheetah-2.0.1.tar.gz 215295
+RMD160 9e8ef0afc4eabd1349e4228f5ad78551f7bddbe4 Cheetah-2.0.1.tar.gz 215295
+SHA256 70b618a03506831f59ba1ff8433907ee8d4ead5fc9f1b3f610d384e08a26938c Cheetah-2.0.1.tar.gz 215295