25 files changed, 188 insertions, 251 deletions

diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index d48862a61939..fc38ed36d985 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	devel net python
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 49e422241627..619b427b04ea 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedCore
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	devel net python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Core/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twistedCore/distinfo b/devel/py-twistedCore/distinfo
index 7a692cc58329..b8fe0e996214 100644
--- a/devel/py-twistedCore/distinfo
+++ b/devel/py-twistedCore/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedCore-8.2.0.tar.bz2) = 46f7a6b3e29ef48c4035c22d78f69196
-SHA256 (TwistedCore-8.2.0.tar.bz2) = 481e8ea4b05b482aa1396ca3ad09fac6086acddfd57eed7bb63e1385717adde4
-SIZE (TwistedCore-8.2.0.tar.bz2) = 1205654
+MD5 (TwistedCore-9.0.0.tar.bz2) = bd1fd44a73916f050b6d96f098f3c532
+SHA256 (TwistedCore-9.0.0.tar.bz2) = 6e71eeecf5c4fa5fd4ae1b2a3f907da69d62897eda02d23135ccf0ea36a2958e
+SIZE (TwistedCore-9.0.0.tar.bz2) = 1270053
diff --git a/devel/py-twistedCore/pkg-plist b/devel/py-twistedCore/pkg-plist
index 60d000570d9f..01f509178ab1 100644
--- a/devel/py-twistedCore/pkg-plist
+++ b/devel/py-twistedCore/pkg-plist
@@ -36,6 +36,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/cred/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/cred/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/cred/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/cred/_digest.py
+%%PYTHON_SITELIBDIR%%/twisted/cred/_digest.pyc
+%%PYTHON_SITELIBDIR%%/twisted/cred/_digest.pyo
 %%PYTHON_SITELIBDIR%%/twisted/cred/checkers.py
 %%PYTHON_SITELIBDIR%%/twisted/cred/checkers.pyc
 %%PYTHON_SITELIBDIR%%/twisted/cred/checkers.pyo
@@ -75,9 +78,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/enterprise/util.py
 %%PYTHON_SITELIBDIR%%/twisted/enterprise/util.pyc
 %%PYTHON_SITELIBDIR%%/twisted/enterprise/util.pyo
-%%PYTHON_SITELIBDIR%%/twisted/im.py
-%%PYTHON_SITELIBDIR%%/twisted/im.pyc
-%%PYTHON_SITELIBDIR%%/twisted/im.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/__init__.pyo
@@ -245,21 +245,36 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/reactormixins.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/reactormixins.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/reactormixins.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_base.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_base.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_base.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_baseprocess.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_baseprocess.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_baseprocess.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_core.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_core.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_core.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_fdset.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_fdset.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_fdset.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_pollingfile.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_pollingfile.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_pollingfile.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixbase.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixbase.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixbase.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tcp.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tcp.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tcp.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_threads.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_threads.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_threads.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_time.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_time.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_time.pyo
@@ -321,16 +336,12 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/manhole/ui/gtk2manhole.py
 %%PYTHON_SITELIBDIR%%/twisted/manhole/ui/gtk2manhole.pyc
 %%PYTHON_SITELIBDIR%%/twisted/manhole/ui/gtk2manhole.pyo
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/gtkmanhole.py
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/gtkmanhole.pyc
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/gtkmanhole.pyo
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/gtkrc
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/pywidgets.py
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/pywidgets.pyc
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/pywidgets.pyo
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/spelunk_gnome.py
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/spelunk_gnome.pyc
-%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/spelunk_gnome.pyo
+%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test/test_gtk2manhole.py
+%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test/test_gtk2manhole.pyc
+%%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test/test_gtk2manhole.pyo
 %%PYTHON_SITELIBDIR%%/twisted/persisted/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/persisted/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/persisted/__init__.pyo
@@ -355,9 +366,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/persisted/journal/rowjournal.py
 %%PYTHON_SITELIBDIR%%/twisted/persisted/journal/rowjournal.pyc
 %%PYTHON_SITELIBDIR%%/twisted/persisted/journal/rowjournal.pyo
-%%PYTHON_SITELIBDIR%%/twisted/persisted/marmalade.py
-%%PYTHON_SITELIBDIR%%/twisted/persisted/marmalade.pyc
-%%PYTHON_SITELIBDIR%%/twisted/persisted/marmalade.pyo
 %%PYTHON_SITELIBDIR%%/twisted/persisted/sob.py
 %%PYTHON_SITELIBDIR%%/twisted/persisted/sob.pyc
 %%PYTHON_SITELIBDIR%%/twisted/persisted/sob.pyo
@@ -423,12 +431,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/protocols/dict.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/dict.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/dict.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/dns.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/dns.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/dns.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/ethernet.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/ethernet.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/ethernet.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/finger.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/finger.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/finger.pyo
@@ -447,24 +449,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/protocols/htb.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/htb.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/htb.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/http.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/http.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/http.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/ident.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/ident.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/ident.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/imap4.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/imap4.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/imap4.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/ip.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/ip.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/ip.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/irc.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/irc.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/irc.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/jabber.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/jabber.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/jabber.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/loopback.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/loopback.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/loopback.pyo
@@ -477,66 +464,45 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/protocols/mice/mouseman.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/mice/mouseman.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/mice/mouseman.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/msn.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/msn.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/msn.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/nntp.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/nntp.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/nntp.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/oscar.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/oscar.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/oscar.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/pcp.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/pcp.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/pcp.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/policies.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/policies.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/policies.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/pop3.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/pop3.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/pop3.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/portforward.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/portforward.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/portforward.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/postfix.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/postfix.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/postfix.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/raw.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/raw.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/raw.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/rawudp.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/rawudp.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/rawudp.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/shoutcast.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/shoutcast.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/shoutcast.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/sip.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/sip.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/sip.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/smtp.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/smtp.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/smtp.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/socks.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/socks.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/socks.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/stateful.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/stateful.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/stateful.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/sux.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/sux.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/sux.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/telnet.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/telnet.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/telnet.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/toc.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/toc.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/toc.pyo
+%%PYTHON_SITELIBDIR%%/twisted/protocols/test/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/protocols/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/protocols/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/protocols/test/test_tls.py
+%%PYTHON_SITELIBDIR%%/twisted/protocols/test/test_tls.pyc
+%%PYTHON_SITELIBDIR%%/twisted/protocols/test/test_tls.pyo
+%%PYTHON_SITELIBDIR%%/twisted/protocols/tls.py
+%%PYTHON_SITELIBDIR%%/twisted/protocols/tls.pyc
+%%PYTHON_SITELIBDIR%%/twisted/protocols/tls.pyo
 %%PYTHON_SITELIBDIR%%/twisted/protocols/wire.py
 %%PYTHON_SITELIBDIR%%/twisted/protocols/wire.pyc
 %%PYTHON_SITELIBDIR%%/twisted/protocols/wire.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/xmlstream.py
-%%PYTHON_SITELIBDIR%%/twisted/protocols/xmlstream.pyc
-%%PYTHON_SITELIBDIR%%/twisted/protocols/xmlstream.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/python/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/__init__.pyo
@@ -570,6 +536,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/failure.py
 %%PYTHON_SITELIBDIR%%/twisted/python/failure.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/failure.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/fakepwd.py
+%%PYTHON_SITELIBDIR%%/twisted/python/fakepwd.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/fakepwd.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/filepath.py
 %%PYTHON_SITELIBDIR%%/twisted/python/filepath.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/filepath.pyo
@@ -579,6 +548,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/formmethod.py
 %%PYTHON_SITELIBDIR%%/twisted/python/formmethod.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/formmethod.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/hashlib.py
+%%PYTHON_SITELIBDIR%%/twisted/python/hashlib.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/hashlib.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/hook.py
 %%PYTHON_SITELIBDIR%%/twisted/python/hook.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/hook.pyo
@@ -603,9 +575,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/otp.py
 %%PYTHON_SITELIBDIR%%/twisted/python/otp.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/otp.pyo
-%%PYTHON_SITELIBDIR%%/twisted/python/plugin.py
-%%PYTHON_SITELIBDIR%%/twisted/python/plugin.pyc
-%%PYTHON_SITELIBDIR%%/twisted/python/plugin.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/procutils.py
 %%PYTHON_SITELIBDIR%%/twisted/python/procutils.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/procutils.pyo
@@ -636,6 +605,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/test/deprecatedattributes.py
+%%PYTHON_SITELIBDIR%%/twisted/python/test/deprecatedattributes.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/test/deprecatedattributes.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_components.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_components.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_components.pyo
@@ -645,12 +617,24 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_dist.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_dist.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_dist.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_fakepwd.py
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_fakepwd.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_fakepwd.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_hashlib.py
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_hashlib.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_hashlib.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_htmlizer.py
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_htmlizer.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_htmlizer.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_release.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_release.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_release.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_runtime.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_runtime.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_runtime.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_syslog.py
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_syslog.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_syslog.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_util.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_util.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_util.pyo
@@ -784,9 +768,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/spread/ui/gtk2util.py
 %%PYTHON_SITELIBDIR%%/twisted/spread/ui/gtk2util.pyc
 %%PYTHON_SITELIBDIR%%/twisted/spread/ui/gtk2util.pyo
-%%PYTHON_SITELIBDIR%%/twisted/spread/ui/gtkutil.py
-%%PYTHON_SITELIBDIR%%/twisted/spread/ui/gtkutil.pyc
-%%PYTHON_SITELIBDIR%%/twisted/spread/ui/gtkutil.pyo
 %%PYTHON_SITELIBDIR%%/twisted/spread/ui/login2.glade
 %%PYTHON_SITELIBDIR%%/twisted/spread/ui/tktree.py
 %%PYTHON_SITELIBDIR%%/twisted/spread/ui/tktree.pyc
@@ -954,6 +935,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/test_dict.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_dict.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_dict.pyo
+%%PYTHON_SITELIBDIR%%/twisted/test/test_digestauth.py
+%%PYTHON_SITELIBDIR%%/twisted/test/test_digestauth.pyc
+%%PYTHON_SITELIBDIR%%/twisted/test/test_digestauth.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/test_dirdbm.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_dirdbm.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_dirdbm.pyo
@@ -1104,9 +1088,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/test_socks.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_socks.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_socks.pyo
-%%PYTHON_SITELIBDIR%%/twisted/test/test_split_compat.py
-%%PYTHON_SITELIBDIR%%/twisted/test/test_split_compat.pyc
-%%PYTHON_SITELIBDIR%%/twisted/test/test_split_compat.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/test_ssl.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_ssl.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_ssl.pyo
@@ -1125,6 +1106,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/test_strerror.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_strerror.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_strerror.pyo
+%%PYTHON_SITELIBDIR%%/twisted/test/test_stringtransport.py
+%%PYTHON_SITELIBDIR%%/twisted/test/test_stringtransport.pyc
+%%PYTHON_SITELIBDIR%%/twisted/test/test_stringtransport.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/test_strports.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_strports.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_strports.pyo
@@ -1173,9 +1157,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/testutils.py
 %%PYTHON_SITELIBDIR%%/twisted/test/testutils.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/testutils.pyo
-%%PYTHON_SITELIBDIR%%/twisted/test/threading_latency.py
-%%PYTHON_SITELIBDIR%%/twisted/test/threading_latency.pyc
-%%PYTHON_SITELIBDIR%%/twisted/test/threading_latency.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/time_helpers.py
 %%PYTHON_SITELIBDIR%%/twisted/test/time_helpers.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/time_helpers.pyo
@@ -1291,31 +1272,33 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/trial/util.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/util.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/tap
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread/ui
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/zsh
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/python
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/mice
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/gps
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted/journal
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole/ui
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/application
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/cred
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/enterprise
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/iocpreactor/iocpsupport
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/iocpreactor
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/test
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/internet
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/enterprise
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/cred
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/application
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole/ui
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted/journal
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/gps
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/mice
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/zsh
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/python
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread/ui
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/tap
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial
 @dirrm %%PYTHON_SITELIBDIR%%/twisted
diff --git a/devel/py-twistedRunner/Makefile b/devel/py-twistedRunner/Makefile
index 43bab31474a6..8bc3784f8646 100644
--- a/devel/py-twistedRunner/Makefile
+++ b/devel/py-twistedRunner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedRunner
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	devel net python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Runner/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twistedRunner/distinfo b/devel/py-twistedRunner/distinfo
index af949d9ba588..25fde0720524 100644
--- a/devel/py-twistedRunner/distinfo
+++ b/devel/py-twistedRunner/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedRunner-8.2.0.tar.bz2) = 88aab66663bcc1b984d3edeb789d4f1c
-SHA256 (TwistedRunner-8.2.0.tar.bz2) = 10e9bba2c960bdbb1b46d09c1e19eaf420450ae3e203857a8acb3438b4d9ca28
-SIZE (TwistedRunner-8.2.0.tar.bz2) = 8328
+MD5 (TwistedRunner-9.0.0.tar.bz2) = 717be087cf0aef1d72767c9d9c7e4600
+SHA256 (TwistedRunner-9.0.0.tar.bz2) = 7613889bd8332a71fc32c868c89a1464a237779498827f7d9e386be65fda86d8
+SIZE (TwistedRunner-9.0.0.tar.bz2) = 9167
diff --git a/devel/py-twistedRunner/pkg-plist b/devel/py-twistedRunner/pkg-plist
index 7548e874a7a3..8808b966428f 100644
--- a/devel/py-twistedRunner/pkg-plist
+++ b/devel/py-twistedRunner/pkg-plist
@@ -21,4 +21,11 @@
 %%PYTHON_SITELIBDIR%%/twisted/runner/procutils.py
 %%PYTHON_SITELIBDIR%%/twisted/runner/procutils.pyc
 %%PYTHON_SITELIBDIR%%/twisted/runner/procutils.pyo
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmon.py
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmon.pyc
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmon.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/runner/test
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/runner
diff --git a/dns/py-twistedNames/Makefile b/dns/py-twistedNames/Makefile
index 639ca3b15f29..445cce110029 100644
--- a/dns/py-twistedNames/Makefile
+++ b/dns/py-twistedNames/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedNames
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	dns devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Names/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/dns/py-twistedNames/distinfo b/dns/py-twistedNames/distinfo
index 1f15713f727a..8ebdc157d165 100644
--- a/dns/py-twistedNames/distinfo
+++ b/dns/py-twistedNames/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedNames-8.2.0.tar.bz2) = c056c996cbaeb27078bba214e6bf5872
-SHA256 (TwistedNames-8.2.0.tar.bz2) = b5a37122f8b9217fdd65933ca678e6752277e940be96e13bb94baa9f0e7f8138
-SIZE (TwistedNames-8.2.0.tar.bz2) = 43881
+MD5 (TwistedNames-9.0.0.tar.bz2) = b0f27585dc50a7288762c7efa44897be
+SHA256 (TwistedNames-9.0.0.tar.bz2) = 3245d83b2bf6aa4f2b7b81fcceed46514f81b4e82fc53890e702f1010652b45b
+SIZE (TwistedNames-9.0.0.tar.bz2) = 44237
diff --git a/mail/py-twistedMail/Makefile b/mail/py-twistedMail/Makefile
index 60a56bd56303..3099a6eae277 100644
--- a/mail/py-twistedMail/Makefile
+++ b/mail/py-twistedMail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedMail
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	mail devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Mail/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/mail/py-twistedMail/distinfo b/mail/py-twistedMail/distinfo
index 7627049590c7..f434b88c6b8e 100644
--- a/mail/py-twistedMail/distinfo
+++ b/mail/py-twistedMail/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedMail-8.2.0.tar.bz2) = 5a7b469d79087ce8973d1f43c1203cd3
-SHA256 (TwistedMail-8.2.0.tar.bz2) = 1ac8517feb4be92655d7c5b9ba652b279657d3c7b205e6fb267b094c87074eae
-SIZE (TwistedMail-8.2.0.tar.bz2) = 130035
+MD5 (TwistedMail-9.0.0.tar.bz2) = 2f226725928552f2abb2ff9b22b781d4
+SHA256 (TwistedMail-9.0.0.tar.bz2) = 6320829595e0a9a84b9059cf2b93027d048e739b873f037a6e94366ec5e76656
+SIZE (TwistedMail-9.0.0.tar.bz2) = 139721
diff --git a/net-im/py-twistedWords/Makefile b/net-im/py-twistedWords/Makefile
index e4816b500ba4..af7f4f66995e 100644
--- a/net-im/py-twistedWords/Makefile
+++ b/net-im/py-twistedWords/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedWords
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	net-im devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Words/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net-im/py-twistedWords/distinfo b/net-im/py-twistedWords/distinfo
index 5a99a393b070..81a49f662f68 100644
--- a/net-im/py-twistedWords/distinfo
+++ b/net-im/py-twistedWords/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedWords-8.2.0.tar.bz2) = 7067b9e66f8fb85657e9044ffbd28e17
-SHA256 (TwistedWords-8.2.0.tar.bz2) = 19000070b0c38bacc4a74dc315531973b2bc0ecf559575c908e7f023ce2bab9b
-SIZE (TwistedWords-8.2.0.tar.bz2) = 174475
+MD5 (TwistedWords-9.0.0.tar.bz2) = 5fb53c7c9ba53cfa6f2c1915dcb4460a
+SHA256 (TwistedWords-9.0.0.tar.bz2) = 481fc9c6255a29a4e10b06bc0506d262d25098f0a2de1350d2b0c588d27e4790
+SIZE (TwistedWords-9.0.0.tar.bz2) = 177228
diff --git a/net-im/py-twistedWords/pkg-plist b/net-im/py-twistedWords/pkg-plist
index 1474db437626..94895895628a 100644
--- a/net-im/py-twistedWords/pkg-plist
+++ b/net-im/py-twistedWords/pkg-plist
@@ -1,4 +1,3 @@
-bin/im
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_words.py
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_words.pyc
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_words.pyo
@@ -23,15 +22,6 @@ bin/im
 %%PYTHON_SITELIBDIR%%/twisted/words/im/basesupport.py
 %%PYTHON_SITELIBDIR%%/twisted/words/im/basesupport.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/im/basesupport.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkaccount.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkaccount.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkaccount.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkchat.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkchat.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkchat.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkcommon.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkcommon.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/gtkcommon.pyo
 %%PYTHON_SITELIBDIR%%/twisted/words/im/instancemessenger.glade
 %%PYTHON_SITELIBDIR%%/twisted/words/im/interfaces.py
 %%PYTHON_SITELIBDIR%%/twisted/words/im/interfaces.pyc
@@ -39,12 +29,6 @@ bin/im
 %%PYTHON_SITELIBDIR%%/twisted/words/im/ircsupport.py
 %%PYTHON_SITELIBDIR%%/twisted/words/im/ircsupport.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/im/ircsupport.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/jyaccount.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/jyaccount.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/jyaccount.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/jychat.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/jychat.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/jychat.pyo
 %%PYTHON_SITELIBDIR%%/twisted/words/im/locals.py
 %%PYTHON_SITELIBDIR%%/twisted/words/im/locals.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/im/locals.pyo
@@ -111,12 +95,6 @@ bin/im
 %%PYTHON_SITELIBDIR%%/twisted/words/protocols/toc.py
 %%PYTHON_SITELIBDIR%%/twisted/words/protocols/toc.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/protocols/toc.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/scripts/__init__.py
-%%PYTHON_SITELIBDIR%%/twisted/words/scripts/__init__.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/scripts/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/scripts/im.py
-%%PYTHON_SITELIBDIR%%/twisted/words/scripts/im.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/scripts/im.pyo
 %%PYTHON_SITELIBDIR%%/twisted/words/service.py
 %%PYTHON_SITELIBDIR%%/twisted/words/service.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/service.pyo
@@ -135,6 +113,9 @@ bin/im
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc.py
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc.pyo
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc_service.py
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc_service.pyc
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc_service.pyo
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberclient.py
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberclient.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberclient.pyo
@@ -162,6 +143,9 @@ bin/im
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_msn.py
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_msn.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_msn.pyo
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_oscar.py
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_oscar.pyc
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_oscar.pyo
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_service.py
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_service.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_service.pyo
@@ -210,7 +194,6 @@ bin/im
 %%PYTHON_SITELIBDIR%%/twisted/words/xmpproutertap.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/words/xish
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/words/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/words/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/words/protocols/jabber
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/words/protocols
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/words/im
diff --git a/news/py-twistedNews/Makefile b/news/py-twistedNews/Makefile
index b5a1fdadd2c3..097041c88b8e 100644
--- a/news/py-twistedNews/Makefile
+++ b/news/py-twistedNews/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedNews
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	news devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/News/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/news/py-twistedNews/distinfo b/news/py-twistedNews/distinfo
index ddcffe810247..fd5822895ef0 100644
--- a/news/py-twistedNews/distinfo
+++ b/news/py-twistedNews/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedNews-8.2.0.tar.bz2) = 46deb8f062635d1a95ef4ee3b2e382bf
-SHA256 (TwistedNews-8.2.0.tar.bz2) = 1f58c96a51ea17e1ff94d14f1b18b005cf5e67ca7d993a0eef01fa31963191c9
-SIZE (TwistedNews-8.2.0.tar.bz2) = 17082
+MD5 (TwistedNews-9.0.0.tar.bz2) = 24609c1c4f48347e6ef95950f0d7d797
+SHA256 (TwistedNews-9.0.0.tar.bz2) = 0855a03ee5de4b772a97f8224f733e21feb66d4ab1fbd95e8f2072faefb404a1
+SIZE (TwistedNews-9.0.0.tar.bz2) = 17074
diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index 79e4155d34d6..a3e6693d1a9a 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedConch
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	security devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Conch/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-twistedConch/distinfo b/security/py-twistedConch/distinfo
index 03121ac85784..4367a140a9c1 100644
--- a/security/py-twistedConch/distinfo
+++ b/security/py-twistedConch/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedConch-8.2.0.tar.bz2) = 1e17cef8a0108acc09fc2f9fa26be3f1
-SHA256 (TwistedConch-8.2.0.tar.bz2) = b0a668a258078b6cccceac283e07d3d04cfd85bd50074964f4399fae04eba974
-SIZE (TwistedConch-8.2.0.tar.bz2) = 186761
+MD5 (TwistedConch-9.0.0.tar.bz2) = 13e9132589a6f4f4545fc208effd4b16
+SHA256 (TwistedConch-9.0.0.tar.bz2) = 5d13ac104244ce007555c42af85864bac54a2327cff3fa9745cab88c8c9fcd30
+SIZE (TwistedConch-9.0.0.tar.bz2) = 205096
diff --git a/security/py-twistedConch/pkg-plist b/security/py-twistedConch/pkg-plist
index 33aa429eca8a..6e24c823720e 100644
--- a/security/py-twistedConch/pkg-plist
+++ b/security/py-twistedConch/pkg-plist
@@ -35,9 +35,6 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/options.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/options.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/options.pyo
-%%PYTHON_SITELIBDIR%%/twisted/conch/client/unix.py
-%%PYTHON_SITELIBDIR%%/twisted/conch/client/unix.pyc
-%%PYTHON_SITELIBDIR%%/twisted/conch/client/unix.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/error.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/error.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/error.pyo
@@ -230,6 +227,18 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.pyo
diff --git a/textproc/py-twistedLore/Makefile b/textproc/py-twistedLore/Makefile
index efb6224fe23e..aa25dd99f6bd 100644
--- a/textproc/py-twistedLore/Makefile
+++ b/textproc/py-twistedLore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedLore
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	textproc python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Lore/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-twistedLore/distinfo b/textproc/py-twistedLore/distinfo
index 5b8de854164f..8527d4acc4d0 100644
--- a/textproc/py-twistedLore/distinfo
+++ b/textproc/py-twistedLore/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedLore-8.2.0.tar.bz2) = e21b44e6c3d923cfbe543aa637641c32
-SHA256 (TwistedLore-8.2.0.tar.bz2) = 5c263a84f1dc02562d5ab6bf511e807126be1f00225fed364067ba4ef1603284
-SIZE (TwistedLore-8.2.0.tar.bz2) = 64172
+MD5 (TwistedLore-9.0.0.tar.bz2) = 0c054504da9c986af7a28a25ed130ea0
+SHA256 (TwistedLore-9.0.0.tar.bz2) = ec55e037b7ea02c184ac92ccced2c39faf228916fcaa37465d0c53a94e79568f
+SIZE (TwistedLore-9.0.0.tar.bz2) = 87119
diff --git a/textproc/py-twistedLore/pkg-plist b/textproc/py-twistedLore/pkg-plist
index 4e50effca442..23c776642691 100644
--- a/textproc/py-twistedLore/pkg-plist
+++ b/textproc/py-twistedLore/pkg-plist
@@ -29,9 +29,6 @@ bin/lore
 %%PYTHON_SITELIBDIR%%/twisted/lore/man2lore.py
 %%PYTHON_SITELIBDIR%%/twisted/lore/man2lore.pyc
 %%PYTHON_SITELIBDIR%%/twisted/lore/man2lore.pyo
-%%PYTHON_SITELIBDIR%%/twisted/lore/nevowlore.py
-%%PYTHON_SITELIBDIR%%/twisted/lore/nevowlore.pyc
-%%PYTHON_SITELIBDIR%%/twisted/lore/nevowlore.pyo
 %%PYTHON_SITELIBDIR%%/twisted/lore/numberer.py
 %%PYTHON_SITELIBDIR%%/twisted/lore/numberer.pyc
 %%PYTHON_SITELIBDIR%%/twisted/lore/numberer.pyo
@@ -51,29 +48,16 @@ bin/lore
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/good_internal.xhtml
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/good_simple.xhtml
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_out.html
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_out_multiple.html
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_unnumbered_multiple_out.html
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_unnumbered_out.html
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test.xhtml
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test2.xhtml
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test3.xhtml
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test_out.html
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test_out2.html
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_numbering_test.xhtml
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_numbering_test_out.html
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_numbering_test_out2.html
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/simple.html
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple.xhtml
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple1.xhtml
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple2.xhtml
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/simple3.html
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple3.xhtml
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/simple4.html
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple4.xhtml
-%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple4foo.xhtml
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/template.tpl
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lore.py
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lore.pyc
@@ -81,12 +65,32 @@ bin/lore
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/test_man2lore.py
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/test_man2lore.pyc
 %%PYTHON_SITELIBDIR%%/twisted/lore/test/test_man2lore.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_slides.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lmath.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lint.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_latex.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_docbook.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_slides.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lmath.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lint.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_latex.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_docbook.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_slides.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lmath.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lint.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_latex.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_docbook.pyo
 %%PYTHON_SITELIBDIR%%/twisted/lore/texi.py
 %%PYTHON_SITELIBDIR%%/twisted/lore/texi.pyc
 %%PYTHON_SITELIBDIR%%/twisted/lore/texi.pyo
 %%PYTHON_SITELIBDIR%%/twisted/lore/tree.py
 %%PYTHON_SITELIBDIR%%/twisted/lore/tree.pyc
 %%PYTHON_SITELIBDIR%%/twisted/lore/tree.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/xhtml1-transitional.dtd
+%%PYTHON_SITELIBDIR%%/twisted/lore/xhtml-symbol.ent
+%%PYTHON_SITELIBDIR%%/twisted/lore/xhtml-lat1.ent
+%%PYTHON_SITELIBDIR%%/twisted/lore/xhtml-special.ent
+%%PYTHON_SITELIBDIR%%/twisted/lore/xhtml1-strict.dtd
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_lore.py
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_lore.pyc
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_lore.pyo
diff --git a/www/py-twistedWeb/Makefile b/www/py-twistedWeb/Makefile
index bb866fec7d18..7be1d65838a6 100644
--- a/www/py-twistedWeb/Makefile
+++ b/www/py-twistedWeb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedWeb
-PORTVERSION=	8.2.0
+PORTVERSION=	9.0.0
 CATEGORIES=	www devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Web/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-twistedWeb/distinfo b/www/py-twistedWeb/distinfo
index bc754eb2830c..8ef26bb7136f 100644
--- a/www/py-twistedWeb/distinfo
+++ b/www/py-twistedWeb/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedWeb-8.2.0.tar.bz2) = e2e301cdfedbe82025361269051e7f65
-SHA256 (TwistedWeb-8.2.0.tar.bz2) = f30aba803a9b18a17e0d2b58ace6e53269781e8bc1161b2e90d4527b85109f6f
-SIZE (TwistedWeb-8.2.0.tar.bz2) = 332055
+MD5 (TwistedWeb-9.0.0.tar.bz2) = 40b1a2f158b615b2fcfe288c341beac7
+SHA256 (TwistedWeb-9.0.0.tar.bz2) = 953c85334929fad46e602a53cbb5308731079b26ae1f4c1d42a151f0d3b658e0
+SIZE (TwistedWeb-9.0.0.tar.bz2) = 292173
diff --git a/www/py-twistedWeb/pkg-plist b/www/py-twistedWeb/pkg-plist
index fb04d5bfb292..eadf38877ae2 100644
--- a/www/py-twistedWeb/pkg-plist
+++ b/www/py-twistedWeb/pkg-plist
@@ -16,6 +16,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/_auth/wrapper.py
 %%PYTHON_SITELIBDIR%%/twisted/web/_auth/wrapper.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/_auth/wrapper.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/_newclient.py
+%%PYTHON_SITELIBDIR%%/twisted/web/_newclient.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/_newclient.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/_version.py
 %%PYTHON_SITELIBDIR%%/twisted/web/_version.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/_version.pyo
@@ -55,9 +58,6 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/microdom.py
 %%PYTHON_SITELIBDIR%%/twisted/web/microdom.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/microdom.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/monitor.py
-%%PYTHON_SITELIBDIR%%/twisted/web/monitor.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/monitor.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/proxy.py
 %%PYTHON_SITELIBDIR%%/twisted/web/proxy.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/proxy.pyo
@@ -88,6 +88,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/_util.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/_util.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/_util.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_cgi.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_cgi.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_cgi.pyo
@@ -106,12 +109,18 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_httpauth.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_httpauth.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_httpauth.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/test/test_mvc.py
-%%PYTHON_SITELIBDIR%%/twisted/web/test/test_mvc.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/test/test_mvc.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_newclient.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_newclient.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_newclient.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_proxy.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_proxy.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_proxy.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_resource.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_resource.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_resource.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_script.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_script.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_script.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_soap.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_soap.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_soap.pyo
@@ -121,15 +130,15 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_tap.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_tap.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_tap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_vhost.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_vhost.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_vhost.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_web.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_web.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_web.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_webclient.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_webclient.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_webclient.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/test/test_woven.py
-%%PYTHON_SITELIBDIR%%/twisted/web/test/test_woven.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/test/test_woven.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_wsgi.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_wsgi.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_wsgi.pyo
@@ -151,70 +160,12 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/vhost.py
 %%PYTHON_SITELIBDIR%%/twisted/web/vhost.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/vhost.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/widgets.py
-%%PYTHON_SITELIBDIR%%/twisted/web/widgets.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/widgets.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/FlashConduit.fla
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/FlashConduit.swf
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/FlashConduitGlue.html
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/WebConduit2_mozilla.js
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/WebConduit2_msie.js
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/WebConduitGlue.html
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/__init__.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/__init__.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/controller.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/controller.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/controller.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/dirlist.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/dirlist.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/dirlist.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/flashconduit.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/flashconduit.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/flashconduit.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/form.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/form.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/form.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/guard.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/guard.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/guard.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/input.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/input.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/input.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/interfaces.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/model.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/model.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/model.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/page.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/page.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/page.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/simpleguard.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/simpleguard.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/simpleguard.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/tapestry.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/tapestry.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/tapestry.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/template.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/template.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/template.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/utils.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/utils.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/utils.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/view.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/view.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/view.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/widgets.py
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/widgets.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/woven/widgets.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/wsgi.py
 %%PYTHON_SITELIBDIR%%/twisted/web/wsgi.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/wsgi.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/xmlrpc.py
 %%PYTHON_SITELIBDIR%%/twisted/web/xmlrpc.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/xmlrpc.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/woven
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/test
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/web/_auth
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/