diff --git a/cherrypy/.footprint b/cherrypy/.footprint
deleted file mode 100644
index 2a972eedc..000000000
--- a/cherrypy/.footprint
+++ /dev/null
@@ -1,163 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python2.5/
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/__init__.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpcgifs.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpcgifs.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpchecker.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpchecker.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpconfig.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpconfig.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpdispatch.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpdispatch.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cperror.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cperror.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cplogging.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cplogging.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpmodpy.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpmodpy.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cprequest.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cprequest.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpserver.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpserver.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpthreadinglocal.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpthreadinglocal.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cptools.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cptools.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cptree.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cptree.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpwsgi.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/_cpwsgi.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/cherryd
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/favicon.ico
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/__init__.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/auth.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/auth.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/caching.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/caching.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/covercp.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/covercp.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/cptools.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/cptools.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/encoding.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/encoding.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/http.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/http.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/httpauth.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/httpauth.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/profiler.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/profiler.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/safemime.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/safemime.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/sessions.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/sessions.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/static.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/static.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/tidy.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/tidy.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/wsgiapp.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/wsgiapp.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/xmlrpc.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/lib/xmlrpc.pyc
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/process/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/__init__.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/plugins.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/plugins.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/servers.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/servers.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/win32.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/win32.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/wspbus.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/process/wspbus.pyc
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/scaffold/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/scaffold/example.conf
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/scaffold/site.conf
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/scaffold/static/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/scaffold/static/made_with_cherrypy_small.png
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/test/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/__init__.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/benchmark.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/benchmark.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/checkerdemo.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/checkerdemo.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/helper.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/helper.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/modpy.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/modpy.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/modwsgi.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/modwsgi.pyc
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/test/static/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/static/dirback.jpg
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/static/index.html
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/style.css
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test.pem
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_caching.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_caching.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_config.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_config.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_conn.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_conn.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_core.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_core.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_encoding.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_encoding.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_etags.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_etags.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_http.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_http.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_httpauth.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_httpauth.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_httplib.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_httplib.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_misc_tools.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_misc_tools.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_objectmapping.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_objectmapping.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_proxy.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_proxy.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_refleaks.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_refleaks.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_routes.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_routes.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_safe_multipart.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_safe_multipart.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_session.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_session.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_sessionauthenticate.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_sessionauthenticate.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_states.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_states.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_states_demo.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_states_demo.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_static.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_static.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_tidy.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_tidy.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_tools.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_tools.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_tutorials.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_tutorials.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_virtualhost.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_virtualhost.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_wsgi_ns.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_wsgi_ns.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_wsgi_vhost.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_wsgi_vhost.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_wsgiapps.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_wsgiapps.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_xmlrpc.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/test_xmlrpc.pyc
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/webtest.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/test/webtest.pyc
-drwxr-xr-x	root/root	usr/lib/python2.5/site-packages/cherrypy/wsgiserver/
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/wsgiserver/__init__.py
--rw-r--r--	root/root	usr/lib/python2.5/site-packages/cherrypy/wsgiserver/__init__.pyc
diff --git a/cherrypy/.md5sum b/cherrypy/.md5sum
deleted file mode 100644
index c23226ef1..000000000
--- a/cherrypy/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-b538afbdb0e44c448cabbbb76fb3b47e  CherryPy-3.1.0rc1.tar.gz
diff --git a/cherrypy/Pkgfile b/cherrypy/Pkgfile
deleted file mode 100644
index 3ff839b3d..000000000
--- a/cherrypy/Pkgfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description: Pythonic, object-oriented web development framework.
-# URL: http://www.cherrypy.org/
-# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
-# Packager: James Mills, prologic at shortcircuit dot net dot au
-# Depends on: python
-
-name=cherrypy
-version=3.1.0rc1
-release=1
-source=(http://download.cherrypy.org/cherrypy/$version/CherryPy-$version.tar.gz)
-
-build() {
-	cd CherryPy-$version
-	python setup.py install --root=$PKG
-	rm -r $PKG/usr/lib/python*/site-packages/cherrypy/tutorial
-	rm $PKG/usr/lib/python*/site-packages/CherryPy-$version-py2.5.egg-info
-	rm $PKG/usr/lib/python*/site-packages/cherrypy/LICENSE.txt
-}
-