Delete older ebuild.

2 files changed, 14 insertions, 77 deletions

diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index c83dfced149d..fc31d24d08c0 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -4,18 +4,25 @@ Hash: SHA1
 DIST CherryPy-2.3.0.tar.gz 241999 RMD160 4c95735b17d58c431f1dbf685500d2a1ca8e38d8 SHA1 067121c5f31442519ac07138ffe8af6f7c7465d2 SHA256 a41e1b31ab723f50223b303991bb4e1a420a05deb2f4ab923a2ceadece4854cf
 DIST CherryPy-3.1.2.tar.gz 319196 RMD160 43a34bc7454da21b597c60124ff0fc61b8dc3e31 SHA1 a94aedfd0e675858dbcc32dd250c23d285ee9b88 SHA256 0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6
 DIST CherryPy-3.2.0.tar.gz 921937 RMD160 8cb2fda2acfc2a9ae84025f541a8d2d8776474cd SHA1 fd05b4f975f848dc5f5116b8f504b9bd31e93969 SHA256 0a70d163ee33b892df064ab70d097d0fc125c74fc0c6da418b2964bb1d6d18fe
-DIST CherryPy-3.2.0rc1-py3.tar.gz 349587 RMD160 6f0fa517d8c379826ec914746e7e4c5fca5ff05d SHA1 a4547703f27ec9ca5ea8fb0c2b16be76f640e035 SHA256 76c46210675426af59b37f0b3bbdce23eb4f40fbac089c5c76d663befd2fbd18
-DIST CherryPy-3.2.0rc1.tar.gz 423315 RMD160 efb6829d4a5123b8e507ef041794f80135e8d504 SHA1 1fa5c71f77bae7c305932e6f73a011a338fc38f7 SHA256 332009c2c74c17fe039c63000a30271adebfc78cec11e3217a74449c0150cfbc
 EBUILD cherrypy-2.3.0.ebuild 1326 RMD160 361f650d381de97ede5266a6595fc064e114e648 SHA1 2b3a76ee0943c47c617c793bddcf16d9cd4bd575 SHA256 0dcc334799ffd8cd418c115c08b1351cc3e76f8a4e258cbc1fdb3b644e1f72d4
 EBUILD cherrypy-3.1.2.ebuild 1106 RMD160 2833ab7a8e54a799644c6f27d2c02f1026bd05b7 SHA1 1ba673e0385ed5b06a26096202277d883f7ab67b SHA256 71021a809633d279034d3235c29e5f0c98e6f7de698fcd879f836abfc443e799
 EBUILD cherrypy-3.2.0.ebuild 1504 RMD160 f9bacdca87d333a185cec4f304354ef8d23cb538 SHA1 df075dad35b29c8401c7935487159d4a2ee26853 SHA256 b79ffc0ddf8b6d7f47bf615db1fee128241ccc4100d5c792674a7619072cadf5
-EBUILD cherrypy-3.2.0_rc1.ebuild 1786 RMD160 e7fca3c18330cd870453f83cae756cc40c7e5a7b SHA1 6554ec07e753950a782437dd756a1b298025e9e6 SHA256 9c84f27f87cd0655e8b7efcbff395ae1f7348d5a8f838b87b9b7a13395b585b8
 MISC ChangeLog 7441 RMD160 755dab00e160efc23e30cab047932aee02b9bb63 SHA1 c46b21c1adbabd7d73e780e10c3d972d665c3898 SHA256 1784d3d745fcee2eab13fdd108080b11e253844831341a1b84c7c7c18737999b
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2zF2kACgkQuQc30/atMkAGzQCbBrWysiUB6jvz85ZuwyJR438J
-vLoAnRUIBP+RdtvmKZ3vbor91QSJCfB5
-=4V6A
+iQIcBAEBAgAGBQJNsxf1AAoJENgZr6v6gHY0QxsP/3zKEqjrOEFdBChvTvCGgW+c
+RgI8SpnnMv/dC2cw3g0mpj/9/zj05UAAYoQgoR91jjgIjqAlXR0G5CZqqNhRgK5R
+MwfFyirqjO/WDzjxd8L+Kv1+IEOyFA2KEZnSD/YNO8vDi1Gyq7FFpVYfngFj0fw5
+1kwKB/plnQgewe4NsdclL9APUjeAWXMe2HZk8josVH/rRtxnprUselaRZNcdAYkJ
+s/n/SJsQDnKl/Nz6Xxk75O63VxEsbVaMjRPec+/Tk9ayUidn0g8zdc/YItT1SEsY
+J9OecGpFca5/sZPK0LU6p90WdtL6EBu7+H5F6TS2y0CvHuSfbU2+VYzsS2IyyZV8
+H3i+8f2kxRaiUuNGoT4It0nhiz71LXIIlbefialLieZEBNoZCvyjdaUbsLBQDrEp
+NOxVg61Jd3julaIWFoncNPlyRLcEv7Re4pPa+Cay5Nh6tHASJ6jw7qGj7qto67B7
+/3/zZM/eFkuP5dSNry/s42/Ij1sE1/7vUoMmHb36MgzRbzXSRbInIPyinkMbUz22
+ghU1djzKdFYRfVxTISqswmfqxg3wvPe7vxlscLKIHe9BIGj0YB+K+Vr7C7OLbQ8K
+dPIvSEM+HJTrT0d+1mOrGHEqMbZPTTAgz5q3oBKg5wu3wc/txY89Z7XZ7j8DeWA1
+KTAe6QrKbdIV+3clxqH6
+=W2p4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cherrypy/cherrypy-3.2.0_rc1.ebuild b/dev-python/cherrypy/cherrypy-3.2.0_rc1.ebuild
deleted file mode 100644
index 83b8f6e2dbc5..000000000000
--- a/dev-python/cherrypy/cherrypy-3.2.0_rc1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.0_rc1.ebuild,v 1.1 2010/11/14 21:08:12 arfrever Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-MY_PV="${PV/_/}"
-MY_P="CherryPy-${MY_PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy"
-SRC_URI="http://download.cherrypy.org/${PN}/${MY_PV}/${MY_P}.tar.gz
-	http://download.cherrypy.org/${PN}/${MY_PV}/${MY_P}-py3.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-src_unpack() {
-	unpack ${MY_P}-py3.tar.gz
-	mv "${S}" "${S}-py3"
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	preparation() {
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			pushd "${S}-py3" > /dev/null
-			sed -e "s/except cherrypy.InternalRedirect, ir:/except cherrypy.InternalRedirect as ir:/" -i cherrypy/_cpnative_server.py
-			popd > /dev/null
-
-			cp -pr "${S}-py3" "${S}-${PYTHON_ABI}" || return 1
-		else
-			cp -pr "${S}" "${S}-${PYTHON_ABI}" || return 1
-		fi
-	}
-	python_execute_function preparation
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build/lib" "$(PYTHON)" cherrypy/test/test.py --dumb
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r cherrypy/tutorial || die "Installation of documentation failed"
-	fi
-
-	delete_documentation_and_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/cherrypy/"{test,tutorial}
-	}
-	python_execute_function -q delete_documentation_and_tests
-}