Security bump. Removed vulnerable versions. bug# 92926

(Portage version: 2.0.51.21-r1)

9 files changed, 19 insertions, 75 deletions

diff --git a/dev-python/cheetah/ChangeLog b/dev-python/cheetah/ChangeLog
index b651ecdafc49..7c43dde063d3 100644
--- a/dev-python/cheetah/ChangeLog
+++ b/dev-python/cheetah/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/cheetah
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.13 2005/05/05 21:22:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.14 2005/05/17 21:09:00 pythonhead Exp $
+
+*cheetah-0.9.17_rc1 (17 May 2005)
+
+  17 May 2005; Rob Cakebread <pythonhead@gentoo.org> -cheetah-0.9.15.ebuild,
+  -cheetah-0.9.16_alpha2.ebuild, -cheetah-0.9.16.ebuild,
+  +cheetah-0.9.17_rc1.ebuild:
+  Security bump. Removed vulnerable versions. bug#  92926
 
 *cheetah-0.9.16 (05 May 2005)
 
diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest
index bc9dc7ceaa46..f5ca95f15842 100644
--- a/dev-python/cheetah/Manifest
+++ b/dev-python/cheetah/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c860db00cbc8250f4561976974d04c24 cheetah-0.9.15.ebuild 751
+MD5 2dd2c69c7a83a50e1cfffb6a408708f2 ChangeLog 2924
+MD5 09e82993b92fd19e44afe17334911b51 cheetah-0.9.17_rc1.ebuild 767
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 3c08e336029e89c1a4ffd3acbd732834 cheetah-0.9.16_alpha2.ebuild 784
-MD5 0bafede818e84c431164278ca46bacec cheetah-0.9.16.ebuild 756
-MD5 f2b3ed69215f43e7b21c9c32a294b612 ChangeLog 2666
-MD5 346125593cce81eee8da56f014122de2 files/digest-cheetah-0.9.15 66
-MD5 db119b9663708f756e782ad47daa2d72 files/digest-cheetah-0.9.16_alpha2 68
-MD5 e6f1d31e733d1aedb738c786c46dc6e7 files/digest-cheetah-0.9.16 66
+MD5 2fc02e7deb9c33fabf917c836a4e0aef files/digest-cheetah-0.9.17_rc1 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCeo6gTM53OX+9xmMRAp1oAJ45k1z7nvpyP2xYYgJRGmVIoeUXXgCgoUta
-efZBOoyARt7Nvd2dujU4Fy4=
-=E1xt
+iD8DBQFCil1GHOCQyz1WCXYRAoqBAJ433/nSNXZb8oJSNz/q3KQhACYnMQCeJznE
+1GTvn+84x3g9nV7yHz+Ig1w=
+=INbI
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cheetah/cheetah-0.9.16.ebuild b/dev-python/cheetah/cheetah-0.9.16.ebuild
deleted file mode 100644
index 9d1251af83b6..000000000000
--- a/dev-python/cheetah/cheetah-0.9.16.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-0.9.16.ebuild,v 1.1 2005/05/05 21:22:32 liquidx Exp $
-
-inherit distutils
-
-MY_P=${P/ch/Ch}
-
-S=${WORKDIR}/${MY_P}
-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="~x86 ~sparc ~alpha ~ppc ~ppc-macos"
-SLOT="0"
-
-DEPEND=">=dev-lang/python-2.2"
-
-PYTHON_MODNAME="Cheetah"
-
-src_install() {
-	DOCS="README CHANGES LICENSE TODO"
-	distutils_src_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/webware_examples/cheetahSite/*
-}
diff --git a/dev-python/cheetah/cheetah-0.9.16_alpha2.ebuild b/dev-python/cheetah/cheetah-0.9.16_alpha2.ebuild
deleted file mode 100644
index fe01c186a7c0..000000000000
--- a/dev-python/cheetah/cheetah-0.9.16_alpha2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-0.9.16_alpha2.ebuild,v 1.2 2005/02/19 06:20:31 gongloo Exp $
-
-inherit distutils
-
-MY_P=${P/ch/Ch}
-MY_P=${MY_P/_alpha/a}
-
-S=${WORKDIR}/${MY_P}
-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="~x86 ~sparc ~alpha ~ppc ppc-macos"
-SLOT="0"
-
-DEPEND=">=dev-lang/python-2.2"
-
-PYTHON_MODNAME="Cheetah"
-
-src_install() {
-	DOCS="README CHANGES LICENSE TODO"
-	distutils_src_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/webware_examples/cheetahSite/*
-}
diff --git a/dev-python/cheetah/cheetah-0.9.15.ebuild b/dev-python/cheetah/cheetah-0.9.17_rc1.ebuild
index 38ee875054e6..d76074f12dfc 100644
--- a/dev-python/cheetah/cheetah-0.9.15.ebuild
+++ b/dev-python/cheetah/cheetah-0.9.17_rc1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-0.9.15.ebuild,v 1.9 2005/04/24 03:09:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-0.9.17_rc1.ebuild,v 1.1 2005/05/17 21:09:00 pythonhead Exp $
 
 inherit distutils
 
-MY_P="${P/ch/Ch}"
+MY_P=${P/ch/Ch}
+MY_P=${MY_P/_/}
+
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Python-powered template engine and code generator."
 HOMEPAGE="http://www.cheetahtemplate.org/"
diff --git a/dev-python/cheetah/files/digest-cheetah-0.9.15 b/dev-python/cheetah/files/digest-cheetah-0.9.15
deleted file mode 100644
index 4fad3be6e901..000000000000
--- a/dev-python/cheetah/files/digest-cheetah-0.9.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 319ec904e002da97061d58eadd72fa5c Cheetah-0.9.15.tar.gz 621628
diff --git a/dev-python/cheetah/files/digest-cheetah-0.9.16 b/dev-python/cheetah/files/digest-cheetah-0.9.16
deleted file mode 100644
index 630f0f8a8f20..000000000000
--- a/dev-python/cheetah/files/digest-cheetah-0.9.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26427c4087e052c627ce226591d6e030 Cheetah-0.9.16.tar.gz 143466
diff --git a/dev-python/cheetah/files/digest-cheetah-0.9.16_alpha2 b/dev-python/cheetah/files/digest-cheetah-0.9.16_alpha2
deleted file mode 100644
index 2b1416397b0a..000000000000
--- a/dev-python/cheetah/files/digest-cheetah-0.9.16_alpha2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e744fe28971a847f2ea56525e65e4896 Cheetah-0.9.16a2.tar.gz 239212
diff --git a/dev-python/cheetah/files/digest-cheetah-0.9.17_rc1 b/dev-python/cheetah/files/digest-cheetah-0.9.17_rc1
new file mode 100644
index 000000000000..28060fc26a16
--- /dev/null
+++ b/dev-python/cheetah/files/digest-cheetah-0.9.17_rc1
@@ -0,0 +1 @@
+MD5 cbaa7983ee086a834f306d181caa7219 Cheetah-0.9.17rc1.tar.gz 145785