security cleanup (#140496)

(Portage version: 2.1-r1)
 (Signed Manifest commit)

5 files changed, 14 insertions, 107 deletions

diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 60b25d365726..c3e8eb6d5d46 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cherrypy-2.0.0-setup-gentoo.diff 471 RMD160 1bde9a6a712a11df1da9ec831f104d88f4ebf171 SHA1 dafb179ae3548668f4fee229cbfb001d10e3a63a SHA256 f8f2a9ac6bf99a779b228544b759e26e31842734eecd0415738ef6779cf26ca3
 MD5 c885c6173e005c060a73ecf836011132 files/cherrypy-2.0.0-setup-gentoo.diff 471
 RMD160 1bde9a6a712a11df1da9ec831f104d88f4ebf171 files/cherrypy-2.0.0-setup-gentoo.diff 471
@@ -22,19 +25,9 @@ AUX cherrypy-2.2.1-test-gentoo.patch 264 RMD160 edd3b6cd2b36084bac82d2457220449b
 MD5 b3fc3562ac3395e91d2ef362002140d5 files/cherrypy-2.2.1-test-gentoo.patch 264
 RMD160 edd3b6cd2b36084bac82d2457220449b5fa3d48e files/cherrypy-2.2.1-test-gentoo.patch 264
 SHA256 5a92d9a85bfe0a01f1143d600042065e93dcfb9bcff98aad8412d6acfed0b6d9 files/cherrypy-2.2.1-test-gentoo.patch 264
-DIST CherryPy-2.0.0.tar.gz 46218
-DIST CherryPy-2.1.0.tar.gz 177955
 DIST CherryPy-2.1.1.tar.gz 177839 RMD160 9f310f96fe6f8046a6e05fef6b855e66018d48be SHA1 fde88381b93b58ade3275d8c73eea49cc4f2098c SHA256 2edb7213b030c116c53bbe5bc72c85e2978ed2aa515b6ba9560c8a8ce8968cf0
 DIST CherryPy-2.2.0.tar.gz 221662 RMD160 bd7f9f60e5a9a7fda21bb295d61e93714dc4eac8 SHA256 3dd0e0dc2cdd0900d8f4a27fdb80fcdd98634f34aa00ad78b96e8e229f1f2b9b
 DIST CherryPy-2.2.1.tar.gz 219932 RMD160 c8f406c5eaedb6f710dc746528b8474df48cb3c8 SHA256 af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
-EBUILD cherrypy-2.0.0.ebuild 1144 RMD160 1afe3c2eaaa25389ddbcff87dc490f1c5aa81673 SHA1 fe07dccdc798d7ba8c20b86df940a8120e6db450 SHA256 0340f97eb67ad6caa9a40ffcbad70472c5a823b3fd677ab560bf1d2b4aa29a66
-MD5 0f5c2b2e82673db6c01ba3e74a22858c cherrypy-2.0.0.ebuild 1144
-RMD160 1afe3c2eaaa25389ddbcff87dc490f1c5aa81673 cherrypy-2.0.0.ebuild 1144
-SHA256 0340f97eb67ad6caa9a40ffcbad70472c5a823b3fd677ab560bf1d2b4aa29a66 cherrypy-2.0.0.ebuild 1144
-EBUILD cherrypy-2.1.0.ebuild 914 RMD160 6d171823d0d4f025adb7a55e9098017a06cb55d6 SHA1 122a024fe346e5959186006bac440db544c99a7d SHA256 6db6fdb43343f063cf59cbe8182a0db52314cdf117fac14199b2aeef0bc6547c
-MD5 d890e6d863cbc8bf1e143cdd17f5f2c6 cherrypy-2.1.0.ebuild 914
-RMD160 6d171823d0d4f025adb7a55e9098017a06cb55d6 cherrypy-2.1.0.ebuild 914
-SHA256 6db6fdb43343f063cf59cbe8182a0db52314cdf117fac14199b2aeef0bc6547c cherrypy-2.1.0.ebuild 914
 EBUILD cherrypy-2.1.1.ebuild 919 RMD160 264f6cd68aaff2f9dfaf423045cd2241461925b8 SHA1 cc07b01c681e7642e775457efb21aba755bbad91 SHA256 9992bd112bacf4de1d8342f5448540a311119729c51cfee192202a23b0de086c
 MD5 891f28e74476f31afe88fde6d41c3eab cherrypy-2.1.1.ebuild 919
 RMD160 264f6cd68aaff2f9dfaf423045cd2241461925b8 cherrypy-2.1.1.ebuild 919
@@ -47,20 +40,14 @@ EBUILD cherrypy-2.2.1.ebuild 923 RMD160 b7a5ffcfbe6f9ea021061ae67bb7e655c430c98c
 MD5 b70d5bf70e8040e1ac575c647e0e8090 cherrypy-2.2.1.ebuild 923
 RMD160 b7a5ffcfbe6f9ea021061ae67bb7e655c430c98c cherrypy-2.2.1.ebuild 923
 SHA256 b5888006178a005d022c443953486c5353e53365fba380281a1c0bac20da3c64 cherrypy-2.2.1.ebuild 923
-MISC ChangeLog 2738 RMD160 7a3b4d521bbc2b3b6e138fc1baac6334397ae239 SHA1 122d0e64b4d321f20d73f8c801ea625e8fda7c40 SHA256 047abd686ac5aa205401b949c3e989389203c4051be21b111a806df58634d64f
-MD5 37bc75a9ef9730bb04c6dd879dc03b09 ChangeLog 2738
-RMD160 7a3b4d521bbc2b3b6e138fc1baac6334397ae239 ChangeLog 2738
-SHA256 047abd686ac5aa205401b949c3e989389203c4051be21b111a806df58634d64f ChangeLog 2738
+MISC ChangeLog 2866 RMD160 677e7d976d1fe8c2a1f99e0841d7de162f8cd6bb SHA1 e4e0f68a32664868945866b215103b3c69869193 SHA256 a439ca3dd59b4266e11ce1bca868665abf2730f527ffa4105c5f7b74d9dda281
+MD5 8dcfa6ae065099b5154b78930924f742 ChangeLog 2866
+RMD160 677e7d976d1fe8c2a1f99e0841d7de162f8cd6bb ChangeLog 2866
+SHA256 a439ca3dd59b4266e11ce1bca868665abf2730f527ffa4105c5f7b74d9dda281 ChangeLog 2866
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a metadata.xml 160
-MD5 4991e5ddb5d31fb149fdadc26b75f551 files/digest-cherrypy-2.0.0 65
-RMD160 453d2941693fee6564200c340c57d7200efbb1ad files/digest-cherrypy-2.0.0 65
-SHA256 4e1fd606df517eca492f16461bcd50080ded009e8bc0cd592e3d8e2418cd6809 files/digest-cherrypy-2.0.0 65
-MD5 a2ab81d963b17955e9d2eaeff314679c files/digest-cherrypy-2.1.0 66
-RMD160 59d5edbd26348ebb34365a00faf331979da0ed15 files/digest-cherrypy-2.1.0 66
-SHA256 e29726658e4c5112dbb20310f1efcf320f43333cce75cddef92ed41644dbd5d3 files/digest-cherrypy-2.1.0 66
 MD5 60fdc3b8837e88c0d4ac74d2ce1b3591 files/digest-cherrypy-2.1.1 244
 RMD160 b579fa30e7340b80a2b8ea4f2127b055a2f49531 files/digest-cherrypy-2.1.1 244
 SHA256 69e3beefa9d475acf89944a830b82220be1d12bf140772ab5af8a48ac67bd45d files/digest-cherrypy-2.1.1 244
@@ -70,3 +57,10 @@ SHA256 4b2a26660a9476e737b976359213c6fb0b825fea61b9ca87b614ec945e7661bf files/di
 MD5 0d16822fb4c8746436069f025091810b files/digest-cherrypy-2.2.1 244
 RMD160 8c70bb340dc185f091b8d5f6ec057174629a076f files/digest-cherrypy-2.2.1 244
 SHA256 8f63ac22513c6bc4d84d9cbf6b62befefc3e8bcee201d8f1d0a62ee866584699 files/digest-cherrypy-2.2.1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEuSySuB6ZT1m7QRERAp2XAKCWJXY5hlXEfVTOgdwb3U4gikdRZQCfR9zh
+/hqvo+cj2nziHlcebJHmJbI=
+=GxPH
+-----END PGP SIGNATURE-----
diff --git a/dev-python/cherrypy/cherrypy-2.0.0.ebuild b/dev-python/cherrypy/cherrypy-2.0.0.ebuild
deleted file mode 100644
index 40ea65c81ee9..000000000000
--- a/dev-python/cherrypy/cherrypy-2.0.0.ebuild
+++ /dev/null
@@ -1,46 +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/cherrypy/cherrypy-2.0.0.ebuild,v 1.4 2005/11/28 11:25:24 marienz Exp $
-
-inherit distutils eutils
-
-MY_P=${P/c/C}
-MY_P=${MY_P/p/P}
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
-SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.cherrypy.org/"
-DEPEND=">=dev-lang/python-2.3"
-IUSE=""
-SLOT="0"
-KEYWORDS="~ppc x86"
-LICENSE="BSD"
-S=${WORKDIR}/${MY_P}
-
-DOCS="CHANGELOG.txt CHERRYPYTEAM.txt"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-	epatch ${FILESDIR}/${P}-setup-gentoo.diff
-	epatch ${FILESDIR}/${P}-test-gentoo.diff
-}
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/doc/${P}; doins -r cherrypy/tutorial
-	insinto /usr/share/${PN}; doins -r cherrypy/test
-	dosym /usr/share/doc/${P}/tutorial /usr/share/${PN}
-}
-
-src_test() {
-	cd cherrypy/test
-	python test.py || die "Test failed."
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Tutorial files: /usr/share/doc/${P}/tutorial"
-	einfo "Test files    : /usr/share/${PN}/test"
-	einfo ""
-}
diff --git a/dev-python/cherrypy/cherrypy-2.1.0.ebuild b/dev-python/cherrypy/cherrypy-2.1.0.ebuild
deleted file mode 100644
index 393342a5c574..000000000000
--- a/dev-python/cherrypy/cherrypy-2.1.0.ebuild
+++ /dev/null
@@ -1,39 +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/cherrypy/cherrypy-2.1.0.ebuild,v 1.2 2005/11/28 11:25:24 marienz Exp $
-
-inherit distutils eutils
-
-MY_P=${P/cherrypy/CherryPy}
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented web development framework."
-SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.cherrypy.org/"
-DEPEND=">=dev-lang/python-2.3"
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="BSD"
-S=${WORKDIR}/${MY_P}
-
-DOCS="CHANGELOG.txt CHERRYPYTEAM.txt"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-	epatch ${FILESDIR}/${P}-test-gentoo.patch
-}
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/doc/${P}
-	doins -r cherrypy/tutorial
-	insinto /usr/share/${PN}
-	doins -r cherrypy/test
-}
-
-src_test() {
-	cd cherrypy/test
-	python test.py || die "Test failed."
-}
-
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.0.0 b/dev-python/cherrypy/files/digest-cherrypy-2.0.0
deleted file mode 100644
index fe1e6f10a940..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e244a9728717199418f8a24a78a3a3e CherryPy-2.0.0.tar.gz 46218
diff --git a/dev-python/cherrypy/files/digest-cherrypy-2.1.0 b/dev-python/cherrypy/files/digest-cherrypy-2.1.0
deleted file mode 100644
index 4f71a38b7ebc..000000000000
--- a/dev-python/cherrypy/files/digest-cherrypy-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10bd559bdfdf783101d83335dd8acf58 CherryPy-2.1.0.tar.gz 177955