summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Cakebread <pythonhead@gentoo.org>2007-05-01 18:50:07 +0000
committerRob Cakebread <pythonhead@gentoo.org>2007-05-01 18:50:07 +0000
commitd51e91c6fd73a1e92a8cfe358b808dc33d6de4fa (patch)
tree0d0ea90b8f625b4e2650c8b4359eef17db67cd42 /dev-python
parentInitial commit of sjsxp. (diff)
downloadgentoo-2-d51e91c6fd73a1e92a8cfe358b808dc33d6de4fa.tar.gz
gentoo-2-d51e91c6fd73a1e92a8cfe358b808dc33d6de4fa.tar.bz2
gentoo-2-d51e91c6fd73a1e92a8cfe358b808dc33d6de4fa.zip
Fixed src_test. bug #176683 Thanks Thomas A. <gentoofan23@gmail.com> for reporting and Ali Polatel <polatel@gmail.com> for the patch. Removed old version.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/cheetah/ChangeLog8
-rw-r--r--dev-python/cheetah/cheetah-2.0_rc7.ebuild33
-rw-r--r--dev-python/cheetah/cheetah-2.0_rc8.ebuild11
-rw-r--r--dev-python/cheetah/files/digest-cheetah-2.0_rc73
4 files changed, 16 insertions, 39 deletions
diff --git a/dev-python/cheetah/ChangeLog b/dev-python/cheetah/ChangeLog
index 21e5d0a7fa71..e017cbf03af7 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.33 2007/04/12 16:29:42 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.34 2007/05/01 18:50:07 pythonhead Exp $
+
+ 01 May 2007; Rob Cakebread <pythonhead@gentoo.org>
+ -cheetah-2.0_rc7.ebuild, cheetah-2.0_rc8.ebuild:
+ Fixed src_test. bug #176683 Thanks Thomas A. <gentoofan23@gmail.com> for
+ reporting and Ali Polatel <polatel@gmail.com> for the patch. Removed old
+ version.
*cheetah-2.0_rc8 (12 Apr 2007)
diff --git a/dev-python/cheetah/cheetah-2.0_rc7.ebuild b/dev-python/cheetah/cheetah-2.0_rc7.ebuild
deleted file mode 100644
index 2aff726cb256..000000000000
--- a/dev-python/cheetah/cheetah-2.0_rc7.ebuild
+++ /dev/null
@@ -1,33 +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_rc7.ebuild,v 1.2 2007/02/05 18:16:36 dev-zero 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 ~ppc-macos ~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() {
- PYTHONPATH=$(ls -d ./build/lib.*) "${python}" src/Tests/Test.py || die "tests failed"
-}
diff --git a/dev-python/cheetah/cheetah-2.0_rc8.ebuild b/dev-python/cheetah/cheetah-2.0_rc8.ebuild
index 7b607336f2d3..c580316bf6f5 100644
--- a/dev-python/cheetah/cheetah-2.0_rc8.ebuild
+++ b/dev-python/cheetah/cheetah-2.0_rc8.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.ebuild,v 1.1 2007/04/12 16:29:42 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-2.0_rc8.ebuild,v 1.2 2007/05/01 18:50:07 pythonhead Exp $
NEED_PYTHON=2.2
@@ -29,5 +29,12 @@ pkg_postinst() {
}
src_test() {
- PYTHONPATH=$(ls -d ./build/lib.*) "${python}" src/Tests/Test.py || die "tests failed"
+ #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_rc7 b/dev-python/cheetah/files/digest-cheetah-2.0_rc7
deleted file mode 100644
index 7efbb0190111..000000000000
--- a/dev-python/cheetah/files/digest-cheetah-2.0_rc7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94f83679cf4ebd658143faa339bbf134 Cheetah-2.0rc7.tar.gz 213718
-RMD160 5decfd4c4cede060dd8da20b9ed3c5001dffad00 Cheetah-2.0rc7.tar.gz 213718
-SHA256 6b910438ebda5869583967c3d7c6908b9a7e26e8b8bc5efa240f5bd08a794a8f Cheetah-2.0rc7.tar.gz 213718