3 files changed, 73 insertions, 51 deletions

diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index 092045275a67..c61adcbe052c 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.0.b
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	CherryPy-${PORTVERSION}
+DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
 
 MAINTAINER=	nivit@email.it
 COMMENT=	A pythonic, object-oriented web development framework
diff --git a/www/py-cherrypy/distinfo b/www/py-cherrypy/distinfo
index 1dc0fcb1e7b7..5648b162c499 100644
--- a/www/py-cherrypy/distinfo
+++ b/www/py-cherrypy/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-2.1.1.tar.gz) = f36d73a8c38c1444285b37c3451dce86
-SHA256 (CherryPy-2.1.1.tar.gz) = 2edb7213b030c116c53bbe5bc72c85e2978ed2aa515b6ba9560c8a8ce8968cf0
-SIZE (CherryPy-2.1.1.tar.gz) = 177839
+MD5 (CherryPy-2.2.0beta.tar.gz) = 58c14f2f3a3f1fe0f11d30f5c09b1f5c
+SHA256 (CherryPy-2.2.0beta.tar.gz) = c46548ba484f15c950d4a2e57798faecd67fee66bc440a1e9f93f5b19169f854
+SIZE (CherryPy-2.2.0beta.tar.gz) = 190251
diff --git a/www/py-cherrypy/pkg-plist b/www/py-cherrypy/pkg-plist
index 61351af4f93d..68b27b879042 100644
--- a/www/py-cherrypy/pkg-plist
+++ b/www/py-cherrypy/pkg-plist
@@ -20,6 +20,9 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptree.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cputil.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyo
@@ -33,12 +36,57 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/config.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/config.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/favicon.ico
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/aspect.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/aspect.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/aspect.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyo
@@ -48,54 +96,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/csauthenticate.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/csauthenticate.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/csauthenticate.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/basefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/basefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/basefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/baseurlfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/baseurlfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/baseurlfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/cachefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/cachefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/cachefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/decodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/decodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/decodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/encodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/encodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/encodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/gzipfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/gzipfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/gzipfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/logdebuginfofilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/logdebuginfofilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/logdebuginfofilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/nsgmlsfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/nsgmlsfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/nsgmlsfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionauthenticatefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionauthenticatefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionauthenticatefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/sessionfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/staticfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/staticfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/staticfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/tidyfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/tidyfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/tidyfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/xmlrpcfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/xmlrpcfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/xmlrpcfilter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/form.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyo
@@ -126,9 +132,15 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyo
@@ -144,6 +156,12 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyo
@@ -159,6 +177,9 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyo
@@ -206,9 +227,10 @@
 %%EXAMPLESDIR%%/tut10_http_errors.pyc
 %%EXAMPLESDIR%%/tut10_http_errors.pyo
 %%EXAMPLESDIR%%/tutorial.conf
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/filters
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test
-@dirrm %%EXAMPLESDIR%%/
+@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy