From aeb0809587b75fd6b460302e2ff63b36148ccfec Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Tue, 1 May 2007 18:50:07 +0000 Subject: [PATCH] Fixed src_test. bug #176683 Thanks Thomas A. for reporting and Ali Polatel for the patch. Removed old version. Package-Manager: portage-2.1.2.5 --- dev-python/cheetah/ChangeLog | 8 ++++- dev-python/cheetah/Manifest | 30 +++++++---------- dev-python/cheetah/cheetah-2.0_rc7.ebuild | 33 ------------------- dev-python/cheetah/cheetah-2.0_rc8.ebuild | 11 +++++-- .../cheetah/files/digest-cheetah-2.0_rc7 | 3 -- 5 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 dev-python/cheetah/cheetah-2.0_rc7.ebuild delete mode 100644 dev-python/cheetah/files/digest-cheetah-2.0_rc7 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 + -cheetah-2.0_rc7.ebuild, cheetah-2.0_rc8.ebuild: + Fixed src_test. bug #176683 Thanks Thomas A. for + reporting and Ali Polatel for the patch. Removed old + version. *cheetah-2.0_rc8 (12 Apr 2007) diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest index 11785ddf14eb..192625164284 100644 --- a/dev-python/cheetah/Manifest +++ b/dev-python/cheetah/Manifest @@ -4,7 +4,6 @@ Hash: SHA1 DIST Cheetah-0.9.17.tar.gz 145745 RMD160 e8db9880235d68b2f20ff834bf586d4335940363 SHA1 de3b3895e0aea8cb10cf8cbb7285b2969524256f SHA256 e25e8bda8b7e14a76672edbab68f24b464ffbe3f1fb185518ee442bde7cfa58d DIST Cheetah-0.9.18.tar.gz 147525 RMD160 03d46c26beecfcd11e9b7ea2f1b8caf9636f9c78 SHA1 be3d1ee3549788d3004eeb8a82cec38c14020390 SHA256 dc7e549a8b7e43542d8878c454bd76f211c0b28269f5fcd996c59f2c1624556a DIST Cheetah-1.0.tar.gz 149837 RMD160 9b9f0bf6b35fbad38dfdc01ed12be06b3f55b781 SHA1 cb08f61ca7977ce7dacff782f7301fa992bb422b SHA256 ec27eff76846ec95cea4e156fbeac951946b6eb1d1b3e590e48c03904a625893 -DIST Cheetah-2.0rc7.tar.gz 213718 RMD160 5decfd4c4cede060dd8da20b9ed3c5001dffad00 SHA1 0aa42fda5659ca7a5210a77c981bc585939d4ca4 SHA256 6b910438ebda5869583967c3d7c6908b9a7e26e8b8bc5efa240f5bd08a794a8f DIST Cheetah-2.0rc8.tar.gz 214845 RMD160 04aeabecbfed3f49e1a5943bdc5a80f871a7a50c SHA1 fce22621e3ad493be632ea36d8dfeddb01a9879f SHA256 81f2b834faa184a5c51bd32fdd37cc47c3a92f870a387c41361a6aaf66de179c EBUILD cheetah-0.9.17.ebuild 625 RMD160 b2017d6a448101a4b81369ca41c7655c121466a4 SHA1 8c2a7c71c1d30b7d3adf76f242786190e455fa5c SHA256 e8745391897b224ba4bbf15cc406e6eb57112c1355ca157563d4c698c042a7ae MD5 476df8108995ab80c9a7f211f285b6b2 cheetah-0.9.17.ebuild 625 @@ -18,18 +17,14 @@ EBUILD cheetah-1.0.ebuild 773 RMD160 f0af3adec62afd40dd25f1d9cbb4fe4a47206ce7 SH MD5 1077a5b1770ff63c7a30f9e7b0e8e8e8 cheetah-1.0.ebuild 773 RMD160 f0af3adec62afd40dd25f1d9cbb4fe4a47206ce7 cheetah-1.0.ebuild 773 SHA256 bf09b49e2c186c727469c771b435f89a08a6a9eacecb3b5e7aa2ed03797ee924 cheetah-1.0.ebuild 773 -EBUILD cheetah-2.0_rc7.ebuild 855 RMD160 7fa7280d47d4d2771ec536fcfec9bba4f2654750 SHA1 3c0f1dbd7c9fb8b3009d9ebc11fd932f525ef6c0 SHA256 18df910929eebea6915a0fcd7738115416dedf0c60169cf546886e0065b2b936 -MD5 ecc65e3b59856a48b6d6c4331485ab0f cheetah-2.0_rc7.ebuild 855 -RMD160 7fa7280d47d4d2771ec536fcfec9bba4f2654750 cheetah-2.0_rc7.ebuild 855 -SHA256 18df910929eebea6915a0fcd7738115416dedf0c60169cf546886e0065b2b936 cheetah-2.0_rc7.ebuild 855 -EBUILD cheetah-2.0_rc8.ebuild 857 RMD160 43982ed36d0361638d94f842e5e889882ec4c12a SHA1 d8da07d199f027edca2b3e642e5b14dd1f890886 SHA256 d9ada1ca62ce45842442f081385ad084594ce40a1fea385b1d7be1a0632a1a49 -MD5 d8a4c7fdf5bdb510b55b65fb01865616 cheetah-2.0_rc8.ebuild 857 -RMD160 43982ed36d0361638d94f842e5e889882ec4c12a cheetah-2.0_rc8.ebuild 857 -SHA256 d9ada1ca62ce45842442f081385ad084594ce40a1fea385b1d7be1a0632a1a49 cheetah-2.0_rc8.ebuild 857 -MISC ChangeLog 5402 RMD160 7667b41be3d40cf4fa85897c5e889411c1c7a6bf SHA1 2da606853bb6d7bbb8214d1a5c872b910eb3e518 SHA256 bc801858e325bb154ad7ee581b67a7b72130604a66a6dc626cfc7b114b8ceca5 -MD5 ee1f1a400a8b6ec56b470e64bda80ed9 ChangeLog 5402 -RMD160 7667b41be3d40cf4fa85897c5e889411c1c7a6bf ChangeLog 5402 -SHA256 bc801858e325bb154ad7ee581b67a7b72130604a66a6dc626cfc7b114b8ceca5 ChangeLog 5402 +EBUILD cheetah-2.0_rc8.ebuild 1128 RMD160 3ff8b1e5ade4c73a0d34def71274e748f8ef6ca5 SHA1 f6350b7a6ed4a884f73ba49407dfef49310f1564 SHA256 909314a7aa35712b3a624d3c0dbd43cf337cdef5ce91c8811075449f7efa6078 +MD5 3ac87ea8a98d9c6dbbf4c4b32c2731b7 cheetah-2.0_rc8.ebuild 1128 +RMD160 3ff8b1e5ade4c73a0d34def71274e748f8ef6ca5 cheetah-2.0_rc8.ebuild 1128 +SHA256 909314a7aa35712b3a624d3c0dbd43cf337cdef5ce91c8811075449f7efa6078 cheetah-2.0_rc8.ebuild 1128 +MISC ChangeLog 5668 RMD160 e15922e55f06ea709ed0a0fe97e5b83abb4e79e3 SHA1 94ff93ab9de3164684b46ba3719e4f3ce98c1bb1 SHA256 114fcb3d30a77ec7fd4c7a615fc3f11e529d87529b058712e4dfaaed06de3fa8 +MD5 3c3820b134d497d46af295dc2682d84c ChangeLog 5668 +RMD160 e15922e55f06ea709ed0a0fe97e5b83abb4e79e3 ChangeLog 5668 +SHA256 114fcb3d30a77ec7fd4c7a615fc3f11e529d87529b058712e4dfaaed06de3fa8 ChangeLog 5668 MISC metadata.xml 511 RMD160 848dfb25d7e09596c6b2e1e1e9655298bfad05a4 SHA1 67878b57ed0ddb00268c7f16ada335350466dfe7 SHA256 39f6f995b4f17bc77c039967c900cd431f4cfd771ce89c300df470dd9eaa679e MD5 90a229d23d3ba2246a050ec40e4d3720 metadata.xml 511 RMD160 848dfb25d7e09596c6b2e1e1e9655298bfad05a4 metadata.xml 511 @@ -43,16 +38,13 @@ SHA256 a3e1701a156d37a0716401dc61cbfaae8669bed5989db25fa59724ca9b4feb00 files/di MD5 bab5d5eab85bfbb03acabb7c3e16c29d files/digest-cheetah-1.0 235 RMD160 0966a4954bba3d3b73228be4090b38b38476d928 files/digest-cheetah-1.0 235 SHA256 7b5f4d6c5f800bb33d1d65afcddc19b999eef368c9adfc80df5b6093b6be0912 files/digest-cheetah-1.0 235 -MD5 b3ae387f6fffdd3ca2803cbba173d044 files/digest-cheetah-2.0_rc7 244 -RMD160 a16538735cf05adf55b7114832b7f57a9a9f3ccd files/digest-cheetah-2.0_rc7 244 -SHA256 5e5d98dfe1fb5113c7a19f7e33e87ddb9257c34d316e6f08c09872257baec8da files/digest-cheetah-2.0_rc7 244 MD5 f773ac7377ef3023ce0947bae40aaa83 files/digest-cheetah-2.0_rc8 244 RMD160 c3896de9ae94350728453bbfde0b1acf9f999ed8 files/digest-cheetah-2.0_rc8 244 SHA256 fde734c2922b21273f86e233679b2c6cc34be504da6fcdf738966170a117a86f files/digest-cheetah-2.0_rc8 244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGHl7396cFzIajWwkRAgY2AKC9WIm+jcmW9MAhDDG+MRvsnTFFzQCgzL+q -n2/OUOg0kQCBO4vMd5T//YI= -=4lio +iD8DBQFGN4vr96cFzIajWwkRAo0VAKCmdssxiRhmFd5Xqqp9bbmVW/0JQQCg9g0A +Qd8Qcbb+OYYqLxAF29Lsn3Q= +=AbRx -----END PGP SIGNATURE----- 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 -- 2.26.2