Update net/py-twisted to 22.1.0rc1

Too many releases were skipped, please consult upstream for changes.

4 files changed, 89 insertions, 154 deletions

diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index 4a9f00e4ffe..5c8b69c89a1 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.44 2020/02/06 15:46:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.45 2022/02/05 13:16:13 js Exp $
 #
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-DISTNAME=	Twisted-19.10.0
+DISTNAME=	Twisted-22.1.0rc1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=T/Twisted/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.twistedmatrix.com/
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index a42433cd04d..dbf95d569ff 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2020/02/06 15:44:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.33 2022/02/05 13:16:13 js Exp $
 bin/cftp-${PYVERSSUFFIX}
 bin/ckeygen-${PYVERSSUFFIX}
 bin/conch-${PYVERSSUFFIX}
@@ -558,13 +558,13 @@ ${PYSITELIB}/twisted/internet/iocpreactor/const.pyo
 ${PYSITELIB}/twisted/internet/iocpreactor/interfaces.py
 ${PYSITELIB}/twisted/internet/iocpreactor/interfaces.pyc
 ${PYSITELIB}/twisted/internet/iocpreactor/interfaces.pyo
+${PYSITELIB}/twisted/internet/iocpreactor/iocpsupport.py
+${PYSITELIB}/twisted/internet/iocpreactor/iocpsupport.pyc
+${PYSITELIB}/twisted/internet/iocpreactor/iocpsupport.pyo
 ${PYSITELIB}/twisted/internet/iocpreactor/notes.txt
 ${PYSITELIB}/twisted/internet/iocpreactor/reactor.py
 ${PYSITELIB}/twisted/internet/iocpreactor/reactor.pyc
 ${PYSITELIB}/twisted/internet/iocpreactor/reactor.pyo
-${PYSITELIB}/twisted/internet/iocpreactor/setup.py
-${PYSITELIB}/twisted/internet/iocpreactor/setup.pyc
-${PYSITELIB}/twisted/internet/iocpreactor/setup.pyo
 ${PYSITELIB}/twisted/internet/iocpreactor/tcp.py
 ${PYSITELIB}/twisted/internet/iocpreactor/tcp.pyc
 ${PYSITELIB}/twisted/internet/iocpreactor/tcp.pyo
@@ -616,14 +616,12 @@ ${PYSITELIB}/twisted/internet/tcp.pyo
 ${PYSITELIB}/twisted/internet/test/__init__.py
 ${PYSITELIB}/twisted/internet/test/__init__.pyc
 ${PYSITELIB}/twisted/internet/test/__init__.pyo
-${PYSITELIB}/twisted/internet/test/_awaittests.py.3only
 ${PYSITELIB}/twisted/internet/test/_posixifaces.py
 ${PYSITELIB}/twisted/internet/test/_posixifaces.pyc
 ${PYSITELIB}/twisted/internet/test/_posixifaces.pyo
 ${PYSITELIB}/twisted/internet/test/_win32ifaces.py
 ${PYSITELIB}/twisted/internet/test/_win32ifaces.pyc
 ${PYSITELIB}/twisted/internet/test/_win32ifaces.pyo
-${PYSITELIB}/twisted/internet/test/_yieldfromtests.py.3only
 ${PYSITELIB}/twisted/internet/test/connectionmixins.py
 ${PYSITELIB}/twisted/internet/test/connectionmixins.pyc
 ${PYSITELIB}/twisted/internet/test/connectionmixins.pyo
@@ -671,12 +669,15 @@ ${PYSITELIB}/twisted/internet/test/test_baseprocess.pyo
 ${PYSITELIB}/twisted/internet/test/test_core.py
 ${PYSITELIB}/twisted/internet/test/test_core.pyc
 ${PYSITELIB}/twisted/internet/test/test_core.pyo
-${PYSITELIB}/twisted/internet/test/test_coroutines.py
-${PYSITELIB}/twisted/internet/test/test_coroutines.pyc
-${PYSITELIB}/twisted/internet/test/test_coroutines.pyo
 ${PYSITELIB}/twisted/internet/test/test_default.py
 ${PYSITELIB}/twisted/internet/test/test_default.pyc
 ${PYSITELIB}/twisted/internet/test/test_default.pyo
+${PYSITELIB}/twisted/internet/test/test_defer_await.py
+${PYSITELIB}/twisted/internet/test/test_defer_await.pyc
+${PYSITELIB}/twisted/internet/test/test_defer_await.pyo
+${PYSITELIB}/twisted/internet/test/test_defer_yieldfrom.py
+${PYSITELIB}/twisted/internet/test/test_defer_yieldfrom.pyc
+${PYSITELIB}/twisted/internet/test/test_defer_yieldfrom.pyo
 ${PYSITELIB}/twisted/internet/test/test_endpoints.py
 ${PYSITELIB}/twisted/internet/test/test_endpoints.pyc
 ${PYSITELIB}/twisted/internet/test/test_endpoints.pyo
@@ -827,6 +828,9 @@ ${PYSITELIB}/twisted/logger/_format.pyo
 ${PYSITELIB}/twisted/logger/_global.py
 ${PYSITELIB}/twisted/logger/_global.pyc
 ${PYSITELIB}/twisted/logger/_global.pyo
+${PYSITELIB}/twisted/logger/_interfaces.py
+${PYSITELIB}/twisted/logger/_interfaces.pyc
+${PYSITELIB}/twisted/logger/_interfaces.pyo
 ${PYSITELIB}/twisted/logger/_io.py
 ${PYSITELIB}/twisted/logger/_io.pyc
 ${PYSITELIB}/twisted/logger/_io.pyo
@@ -908,27 +912,30 @@ ${PYSITELIB}/twisted/mail/_cred.pyo
 ${PYSITELIB}/twisted/mail/_except.py
 ${PYSITELIB}/twisted/mail/_except.pyc
 ${PYSITELIB}/twisted/mail/_except.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/alias.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/alias.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/alias.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/bounce.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/bounce.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/bounce.pyo
+${PYSITELIB}/twisted/mail/_pop3client.py
+${PYSITELIB}/twisted/mail/_pop3client.pyc
+${PYSITELIB}/twisted/mail/_pop3client.pyo
+${PYSITELIB}/twisted/mail/alias.py
+${PYSITELIB}/twisted/mail/alias.pyc
+${PYSITELIB}/twisted/mail/alias.pyo
+${PYSITELIB}/twisted/mail/bounce.py
+${PYSITELIB}/twisted/mail/bounce.pyc
+${PYSITELIB}/twisted/mail/bounce.pyo
 ${PYSITELIB}/twisted/mail/imap4.py
 ${PYSITELIB}/twisted/mail/imap4.pyc
 ${PYSITELIB}/twisted/mail/imap4.pyo
 ${PYSITELIB}/twisted/mail/interfaces.py
 ${PYSITELIB}/twisted/mail/interfaces.pyc
 ${PYSITELIB}/twisted/mail/interfaces.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/mail.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/mail.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/mail.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/maildir.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/maildir.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/maildir.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/pb.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/pb.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/pb.pyo
+${PYSITELIB}/twisted/mail/mail.py
+${PYSITELIB}/twisted/mail/mail.pyc
+${PYSITELIB}/twisted/mail/mail.pyo
+${PYSITELIB}/twisted/mail/maildir.py
+${PYSITELIB}/twisted/mail/maildir.pyc
+${PYSITELIB}/twisted/mail/maildir.pyo
+${PYSITELIB}/twisted/mail/pb.py
+${PYSITELIB}/twisted/mail/pb.pyc
+${PYSITELIB}/twisted/mail/pb.pyo
 ${PYSITELIB}/twisted/mail/pop3.py
 ${PYSITELIB}/twisted/mail/pop3.pyc
 ${PYSITELIB}/twisted/mail/pop3.pyo
@@ -941,21 +948,21 @@ ${PYSITELIB}/twisted/mail/protocols.pyo
 ${PYSITELIB}/twisted/mail/relay.py
 ${PYSITELIB}/twisted/mail/relay.pyc
 ${PYSITELIB}/twisted/mail/relay.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/relaymanager.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/relaymanager.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/relaymanager.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/__init__.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/scripts/__init__.pyo
+${PYSITELIB}/twisted/mail/relaymanager.py
+${PYSITELIB}/twisted/mail/relaymanager.pyc
+${PYSITELIB}/twisted/mail/relaymanager.pyo
+${PYSITELIB}/twisted/mail/scripts/__init__.py
+${PYSITELIB}/twisted/mail/scripts/__init__.pyc
+${PYSITELIB}/twisted/mail/scripts/__init__.pyo
 ${PYSITELIB}/twisted/mail/scripts/mailmail.py
 ${PYSITELIB}/twisted/mail/scripts/mailmail.pyc
 ${PYSITELIB}/twisted/mail/scripts/mailmail.pyo
 ${PYSITELIB}/twisted/mail/smtp.py
 ${PYSITELIB}/twisted/mail/smtp.pyc
 ${PYSITELIB}/twisted/mail/smtp.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/tap.pyo
+${PYSITELIB}/twisted/mail/tap.py
+${PYSITELIB}/twisted/mail/tap.pyc
+${PYSITELIB}/twisted/mail/tap.pyo
 ${PYSITELIB}/twisted/mail/test/__init__.py
 ${PYSITELIB}/twisted/mail/test/__init__.pyc
 ${PYSITELIB}/twisted/mail/test/__init__.pyo
@@ -963,30 +970,30 @@ ${PYSITELIB}/twisted/mail/test/pop3testserver.py
 ${PYSITELIB}/twisted/mail/test/pop3testserver.pyc
 ${PYSITELIB}/twisted/mail/test/pop3testserver.pyo
 ${PYSITELIB}/twisted/mail/test/rfc822.message
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_bounce.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_bounce.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_bounce.pyo
+${PYSITELIB}/twisted/mail/test/test_bounce.py
+${PYSITELIB}/twisted/mail/test/test_bounce.pyc
+${PYSITELIB}/twisted/mail/test/test_bounce.pyo
 ${PYSITELIB}/twisted/mail/test/test_imap.py
 ${PYSITELIB}/twisted/mail/test/test_imap.pyc
 ${PYSITELIB}/twisted/mail/test/test_imap.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mail.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mail.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_mail.pyo
+${PYSITELIB}/twisted/mail/test/test_mail.py
+${PYSITELIB}/twisted/mail/test/test_mail.pyc
+${PYSITELIB}/twisted/mail/test/test_mail.pyo
 ${PYSITELIB}/twisted/mail/test/test_mailmail.py
 ${PYSITELIB}/twisted/mail/test/test_mailmail.pyc
 ${PYSITELIB}/twisted/mail/test/test_mailmail.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_options.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_options.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_options.pyo
+${PYSITELIB}/twisted/mail/test/test_options.py
+${PYSITELIB}/twisted/mail/test/test_options.pyc
+${PYSITELIB}/twisted/mail/test/test_options.pyo
 ${PYSITELIB}/twisted/mail/test/test_pop3.py
 ${PYSITELIB}/twisted/mail/test/test_pop3.pyc
 ${PYSITELIB}/twisted/mail/test/test_pop3.pyo
 ${PYSITELIB}/twisted/mail/test/test_pop3client.py
 ${PYSITELIB}/twisted/mail/test/test_pop3client.pyc
 ${PYSITELIB}/twisted/mail/test/test_pop3client.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.py
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/mail/test/test_scripts.pyo
+${PYSITELIB}/twisted/mail/test/test_scripts.py
+${PYSITELIB}/twisted/mail/test/test_scripts.pyc
+${PYSITELIB}/twisted/mail/test/test_scripts.pyo
 ${PYSITELIB}/twisted/mail/test/test_smtp.py
 ${PYSITELIB}/twisted/mail/test/test_smtp.pyc
 ${PYSITELIB}/twisted/mail/test/test_smtp.pyo
@@ -1080,33 +1087,6 @@ ${PYSITELIB}/twisted/names/test/test_tap.pyo
 ${PYSITELIB}/twisted/names/test/test_util.py
 ${PYSITELIB}/twisted/names/test/test_util.pyc
 ${PYSITELIB}/twisted/names/test/test_util.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/__init__.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/database.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/database.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/database.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/news.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/news.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/news.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/nntp.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/nntp.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/nntp.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/tap.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/tap.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/tap.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/__init__.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/__init__.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/__init__.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_database.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_database.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_database.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_news.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_news.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_news.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_nntp.py
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_nntp.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/news/test/test_nntp.pyo
 ${PYSITELIB}/twisted/pair/__init__.py
 ${PYSITELIB}/twisted/pair/__init__.pyc
 ${PYSITELIB}/twisted/pair/__init__.pyo
@@ -1200,15 +1180,12 @@ ${PYSITELIB}/twisted/plugins/twisted_ftp.pyo
 ${PYSITELIB}/twisted/plugins/twisted_inet.py
 ${PYSITELIB}/twisted/plugins/twisted_inet.pyc
 ${PYSITELIB}/twisted/plugins/twisted_inet.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_mail.py
-${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_mail.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_mail.pyo
+${PYSITELIB}/twisted/plugins/twisted_mail.py
+${PYSITELIB}/twisted/plugins/twisted_mail.pyc
+${PYSITELIB}/twisted/plugins/twisted_mail.pyo
 ${PYSITELIB}/twisted/plugins/twisted_names.py
 ${PYSITELIB}/twisted/plugins/twisted_names.pyc
 ${PYSITELIB}/twisted/plugins/twisted_names.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_news.py
-${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_news.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/plugins/twisted_news.pyo
 ${PYSITELIB}/twisted/plugins/twisted_portforward.py
 ${PYSITELIB}/twisted/plugins/twisted_portforward.pyc
 ${PYSITELIB}/twisted/plugins/twisted_portforward.pyo
@@ -1341,9 +1318,9 @@ ${PYSITELIB}/twisted/protocols/portforward.pyo
 ${PYSITELIB}/twisted/protocols/postfix.py
 ${PYSITELIB}/twisted/protocols/postfix.pyc
 ${PYSITELIB}/twisted/protocols/postfix.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/protocols/shoutcast.py
-${PLIST.py2x}${PYSITELIB}/twisted/protocols/shoutcast.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/protocols/shoutcast.pyo
+${PYSITELIB}/twisted/protocols/shoutcast.py
+${PYSITELIB}/twisted/protocols/shoutcast.pyc
+${PYSITELIB}/twisted/protocols/shoutcast.pyo
 ${PYSITELIB}/twisted/protocols/sip.py
 ${PYSITELIB}/twisted/protocols/sip.pyc
 ${PYSITELIB}/twisted/protocols/sip.pyo
@@ -1368,6 +1345,7 @@ ${PYSITELIB}/twisted/protocols/tls.pyo
 ${PYSITELIB}/twisted/protocols/wire.py
 ${PYSITELIB}/twisted/protocols/wire.pyc
 ${PYSITELIB}/twisted/protocols/wire.pyo
+${PYSITELIB}/twisted/py.typed
 ${PYSITELIB}/twisted/python/__init__.py
 ${PYSITELIB}/twisted/python/__init__.pyc
 ${PYSITELIB}/twisted/python/__init__.pyo
@@ -1377,22 +1355,15 @@ ${PYSITELIB}/twisted/python/_appdirs.pyo
 ${PYSITELIB}/twisted/python/_inotify.py
 ${PYSITELIB}/twisted/python/_inotify.pyc
 ${PYSITELIB}/twisted/python/_inotify.pyo
-${PYSITELIB}/twisted/python/_oldstyle.py
-${PYSITELIB}/twisted/python/_oldstyle.pyc
-${PYSITELIB}/twisted/python/_oldstyle.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/python/_pydoctor.py
-${PLIST.py2x}${PYSITELIB}/twisted/python/_pydoctor.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/python/_pydoctor.pyo
+${PYSITELIB}/twisted/python/_pydoctor.py
+${PYSITELIB}/twisted/python/_pydoctor.pyc
+${PYSITELIB}/twisted/python/_pydoctor.pyo
 ${PYSITELIB}/twisted/python/_pydoctortemplates/common.html
-${PYSITELIB}/twisted/python/_pydoctortemplates/index.html
-${PYSITELIB}/twisted/python/_pydoctortemplates/summary.html
+${PYSITELIB}/twisted/python/_pydoctortemplates/footer.html
+${PYSITELIB}/twisted/python/_pydoctortemplates/header.html
 ${PYSITELIB}/twisted/python/_release.py
 ${PYSITELIB}/twisted/python/_release.pyc
 ${PYSITELIB}/twisted/python/_release.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/python/_sendmsg.so
-${PYSITELIB}/twisted/python/_setup.py
-${PYSITELIB}/twisted/python/_setup.pyc
-${PYSITELIB}/twisted/python/_setup.pyo
 ${PYSITELIB}/twisted/python/_shellcomp.py
 ${PYSITELIB}/twisted/python/_shellcomp.pyc
 ${PYSITELIB}/twisted/python/_shellcomp.pyo
@@ -1429,15 +1400,9 @@ ${PYSITELIB}/twisted/python/fakepwd.pyo
 ${PYSITELIB}/twisted/python/filepath.py
 ${PYSITELIB}/twisted/python/filepath.pyc
 ${PYSITELIB}/twisted/python/filepath.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/python/finalize.py
-${PLIST.py2x}${PYSITELIB}/twisted/python/finalize.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/python/finalize.pyo
 ${PYSITELIB}/twisted/python/formmethod.py
 ${PYSITELIB}/twisted/python/formmethod.pyc
 ${PYSITELIB}/twisted/python/formmethod.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/python/hook.py
-${PLIST.py2x}${PYSITELIB}/twisted/python/hook.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/python/hook.pyo
 ${PYSITELIB}/twisted/python/htmlizer.py
 ${PYSITELIB}/twisted/python/htmlizer.pyc
 ${PYSITELIB}/twisted/python/htmlizer.pyo
@@ -1492,10 +1457,6 @@ ${PYSITELIB}/twisted/python/systemd.pyo
 ${PYSITELIB}/twisted/python/test/__init__.py
 ${PYSITELIB}/twisted/python/test/__init__.pyc
 ${PYSITELIB}/twisted/python/test/__init__.pyo
-${PYSITELIB}/twisted/python/test/_deprecatetests.py.3only
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.py
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/cmodulepullpipe.pyo
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.py
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.pyc
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.pyo
@@ -1517,9 +1478,6 @@ ${PYSITELIB}/twisted/python/test/test_constants.pyo
 ${PYSITELIB}/twisted/python/test/test_deprecate.py
 ${PYSITELIB}/twisted/python/test/test_deprecate.pyc
 ${PYSITELIB}/twisted/python/test/test_deprecate.pyo
-${PYSITELIB}/twisted/python/test/test_dist3.py
-${PYSITELIB}/twisted/python/test/test_dist3.pyc
-${PYSITELIB}/twisted/python/test/test_dist3.pyo
 ${PYSITELIB}/twisted/python/test/test_fakepwd.py
 ${PYSITELIB}/twisted/python/test/test_fakepwd.pyc
 ${PYSITELIB}/twisted/python/test/test_fakepwd.pyo
@@ -1529,9 +1487,9 @@ ${PYSITELIB}/twisted/python/test/test_htmlizer.pyo
 ${PYSITELIB}/twisted/python/test/test_inotify.py
 ${PYSITELIB}/twisted/python/test/test_inotify.pyc
 ${PYSITELIB}/twisted/python/test/test_inotify.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_pydoctor.py
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_pydoctor.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_pydoctor.pyo
+${PYSITELIB}/twisted/python/test/test_pydoctor.py
+${PYSITELIB}/twisted/python/test/test_pydoctor.pyc
+${PYSITELIB}/twisted/python/test/test_pydoctor.pyo
 ${PYSITELIB}/twisted/python/test/test_release.py
 ${PYSITELIB}/twisted/python/test/test_release.pyc
 ${PYSITELIB}/twisted/python/test/test_release.pyo
@@ -1541,9 +1499,6 @@ ${PYSITELIB}/twisted/python/test/test_runtime.pyo
 ${PYSITELIB}/twisted/python/test/test_sendmsg.py
 ${PYSITELIB}/twisted/python/test/test_sendmsg.pyc
 ${PYSITELIB}/twisted/python/test/test_sendmsg.pyo
-${PYSITELIB}/twisted/python/test/test_setup.py
-${PYSITELIB}/twisted/python/test/test_setup.pyc
-${PYSITELIB}/twisted/python/test/test_setup.pyo
 ${PYSITELIB}/twisted/python/test/test_shellcomp.py
 ${PYSITELIB}/twisted/python/test/test_shellcomp.pyc
 ${PYSITELIB}/twisted/python/test/test_shellcomp.pyo
@@ -1571,9 +1526,9 @@ ${PYSITELIB}/twisted/python/test/test_util.pyo
 ${PYSITELIB}/twisted/python/test/test_versions.py
 ${PYSITELIB}/twisted/python/test/test_versions.pyc
 ${PYSITELIB}/twisted/python/test/test_versions.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_win32.py
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_win32.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/python/test/test_win32.pyo
+${PYSITELIB}/twisted/python/test/test_win32.py
+${PYSITELIB}/twisted/python/test/test_win32.pyc
+${PYSITELIB}/twisted/python/test/test_win32.pyo
 ${PYSITELIB}/twisted/python/test/test_zippath.py
 ${PYSITELIB}/twisted/python/test/test_zippath.pyc
 ${PYSITELIB}/twisted/python/test/test_zippath.pyo
@@ -1787,7 +1742,6 @@ ${PYSITELIB}/twisted/test/process_twisted.pyo
 ${PYSITELIB}/twisted/test/proto_helpers.py
 ${PYSITELIB}/twisted/test/proto_helpers.pyc
 ${PYSITELIB}/twisted/test/proto_helpers.pyo
-${PYSITELIB}/twisted/test/raiser.so
 ${PYSITELIB}/twisted/test/reflect_helper_IE.py
 ${PYSITELIB}/twisted/test/reflect_helper_IE.pyc
 ${PYSITELIB}/twisted/test/reflect_helper_IE.pyo
@@ -1847,7 +1801,6 @@ ${PYSITELIB}/twisted/test/test_cooperator.py
 ${PYSITELIB}/twisted/test/test_cooperator.pyc
 ${PYSITELIB}/twisted/test/test_cooperator.pyo
 ${PYSITELIB}/twisted/test/test_defer.py
-${PYSITELIB}/twisted/test/test_defer.py.3only
 ${PYSITELIB}/twisted/test/test_defer.pyc
 ${PYSITELIB}/twisted/test/test_defer.pyo
 ${PYSITELIB}/twisted/test/test_defgen.py
@@ -1883,9 +1836,6 @@ ${PYSITELIB}/twisted/test/test_ftp.pyo
 ${PYSITELIB}/twisted/test/test_ftp_options.py
 ${PYSITELIB}/twisted/test/test_ftp_options.pyc
 ${PYSITELIB}/twisted/test/test_ftp_options.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/test/test_hook.py
-${PLIST.py2x}${PYSITELIB}/twisted/test/test_hook.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/test/test_hook.pyo
 ${PYSITELIB}/twisted/test/test_htb.py
 ${PYSITELIB}/twisted/test/test_htb.pyc
 ${PYSITELIB}/twisted/test/test_htb.pyo
@@ -1925,9 +1875,6 @@ ${PYSITELIB}/twisted/test/test_modules.pyo
 ${PYSITELIB}/twisted/test/test_monkey.py
 ${PYSITELIB}/twisted/test/test_monkey.pyc
 ${PYSITELIB}/twisted/test/test_monkey.pyo
-${PYSITELIB}/twisted/test/test_nooldstyle.py
-${PYSITELIB}/twisted/test/test_nooldstyle.pyc
-${PYSITELIB}/twisted/test/test_nooldstyle.pyo
 ${PYSITELIB}/twisted/test/test_paths.py
 ${PYSITELIB}/twisted/test/test_paths.pyc
 ${PYSITELIB}/twisted/test/test_paths.pyo
@@ -2111,7 +2058,6 @@ ${PYSITELIB}/twisted/trial/runner.pyo
 ${PYSITELIB}/twisted/trial/test/__init__.py
 ${PYSITELIB}/twisted/trial/test/__init__.pyc
 ${PYSITELIB}/twisted/trial/test/__init__.pyo
-${PYSITELIB}/twisted/trial/test/_assertiontests.py.3only
 ${PYSITELIB}/twisted/trial/test/detests.py
 ${PYSITELIB}/twisted/trial/test/detests.pyc
 ${PYSITELIB}/twisted/trial/test/detests.pyo
@@ -2196,6 +2142,9 @@ ${PYSITELIB}/twisted/trial/test/test_runner.pyo
 ${PYSITELIB}/twisted/trial/test/test_script.py
 ${PYSITELIB}/twisted/trial/test/test_script.pyc
 ${PYSITELIB}/twisted/trial/test/test_script.pyo
+${PYSITELIB}/twisted/trial/test/test_skip.py
+${PYSITELIB}/twisted/trial/test/test_skip.pyc
+${PYSITELIB}/twisted/trial/test/test_skip.pyo
 ${PYSITELIB}/twisted/trial/test/test_suppression.py
 ${PYSITELIB}/twisted/trial/test/test_suppression.pyc
 ${PYSITELIB}/twisted/trial/test/test_suppression.pyo
@@ -2253,6 +2202,9 @@ ${PYSITELIB}/twisted/web/_responses.pyo
 ${PYSITELIB}/twisted/web/_stan.py
 ${PYSITELIB}/twisted/web/_stan.pyc
 ${PYSITELIB}/twisted/web/_stan.pyo
+${PYSITELIB}/twisted/web/_template_util.py
+${PYSITELIB}/twisted/web/_template_util.pyc
+${PYSITELIB}/twisted/web/_template_util.pyo
 ${PYSITELIB}/twisted/web/client.py
 ${PYSITELIB}/twisted/web/client.pyc
 ${PYSITELIB}/twisted/web/client.pyo
@@ -2301,9 +2253,9 @@ ${PYSITELIB}/twisted/web/script.pyo
 ${PYSITELIB}/twisted/web/server.py
 ${PYSITELIB}/twisted/web/server.pyc
 ${PYSITELIB}/twisted/web/server.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/web/soap.py
-${PLIST.py2x}${PYSITELIB}/twisted/web/soap.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/web/soap.pyo
+${PYSITELIB}/twisted/web/soap.py
+${PYSITELIB}/twisted/web/soap.pyc
+${PYSITELIB}/twisted/web/soap.pyo
 ${PYSITELIB}/twisted/web/static.py
 ${PYSITELIB}/twisted/web/static.pyc
 ${PYSITELIB}/twisted/web/static.pyo
@@ -2376,9 +2328,9 @@ ${PYSITELIB}/twisted/web/test/test_resource.pyo
 ${PYSITELIB}/twisted/web/test/test_script.py
 ${PYSITELIB}/twisted/web/test/test_script.pyc
 ${PYSITELIB}/twisted/web/test/test_script.pyo
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_soap.py
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_soap.pyc
-${PLIST.py2x}${PYSITELIB}/twisted/web/test/test_soap.pyo
+${PYSITELIB}/twisted/web/test/test_soap.py
+${PYSITELIB}/twisted/web/test/test_soap.pyc
+${PYSITELIB}/twisted/web/test/test_soap.pyo
 ${PYSITELIB}/twisted/web/test/test_stan.py
 ${PYSITELIB}/twisted/web/test/test_stan.pyc
 ${PYSITELIB}/twisted/web/test/test_stan.pyo
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index 6ecc1dd8b60..8b1f62c719d 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.40 2021/10/26 11:06:45 nia Exp $
+$NetBSD: distinfo,v 1.41 2022/02/05 13:16:13 js Exp $
 
-BLAKE2s (Twisted-19.10.0.tar.bz2) = f95c24cdc967cc543a3de66e2df20d8b4cf920bf281cc9817bd02213c067de0b
-SHA512 (Twisted-19.10.0.tar.bz2) = de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
-Size (Twisted-19.10.0.tar.bz2) = 3118485 bytes
-SHA1 (patch-src_twisted_python___setup.py) = 3094320805707f13c64e0f9b4e2e67b5b26dac37
+BLAKE2s (Twisted-22.1.0rc1.tar.gz) = d773054ca8ba8b2e0a04d931b721e40935284a01274026f25d919ed7f4ae0931
+SHA512 (Twisted-22.1.0rc1.tar.gz) = 08e0fc9f973f79a3592cbd9a741b5a7f44df76dd98129818da3200d19290bfb2ee288506ed901ccd96ed5dcb8a1789654c20da8c022c7bbd52329374b7d0c996
+Size (Twisted-22.1.0rc1.tar.gz) = 3730403 bytes
diff --git a/net/py-twisted/patches/patch-src_twisted_python___setup.py b/net/py-twisted/patches/patch-src_twisted_python___setup.py
deleted file mode 100644
index db2ee406b64..00000000000
--- a/net/py-twisted/patches/patch-src_twisted_python___setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_twisted_python___setup.py,v 1.3 2020/02/06 15:44:58 adam Exp $
-
-Allow building with a c99 compiler on SunOS
-
---- src/twisted/python/_setup.py.orig	2019-11-02 16:29:27.000000000 +0000
-+++ src/twisted/python/_setup.py
-@@ -355,8 +355,7 @@ class build_ext_twisted(build_ext.build_
-         # https://stackoverflow.com/questions/1034587).  See the documentation
-         # of X/Open CAE in the standards(5) man page of Solaris.
-         if sys.platform.startswith('sunos'):
--            self.define_macros.append(('_XOPEN_SOURCE', 1))
--            self.define_macros.append(('_XOPEN_SOURCE_EXTENDED', 1))
-+            self.define_macros.append(('_XOPEN_SOURCE', 600))
- 
-         self.extensions = [
-             x for x in self.conditionalExtensions if x.condition(self)