- update to 2.4.0

PR:		98147
Submitted by:	maintainer (Neal Nelson)

3 files changed, 51 insertions, 103 deletions

diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 469b9cd4f33e..a4619581455a 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	twistedCore
-PORTVERSION=	2.2.0
+PORTVERSION=	2.4.0
 CATEGORIES=	devel net python
-MASTER_SITES=	http://twistedmatrix.com/downloads/Twisted/${PORTVERSION:R}/ \
-		http://tmrc.mit.edu/mirror/twisted/Twisted/${PORTVERSION:R}/
-#MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Twisted/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Twisted-${PORTVERSION}
+DISTNAME=	TwistedCore-${PORTVERSION}
 
 MAINTAINER=	neal@nelson.name
 COMMENT=	An asynchronous networking framework for Python - Core module
@@ -22,7 +20,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CONFLICTS=	py??-twisted-[0-9]*
 
-WRKSRC=		${WRKDIR}/Twisted-${PORTVERSION}
+#WRKSRC=		${WRKDIR}/Twisted-${PORTVERSION}
 
 # - Note that Twisted ships with some graphical examples and clients that
 #   require PyGNOME to run.  These are not central to the funcitoning of
@@ -30,7 +28,7 @@ WRKSRC=		${WRKDIR}/Twisted-${PORTVERSION}
 #   separately if desired.
 
 USE_BZIP2=	yes
-USE_PYTHON=	2.2+
+USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 
 PLIST_SUB+=	S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
diff --git a/devel/py-twistedCore/distinfo b/devel/py-twistedCore/distinfo
index cea45bfaf120..ee622e8b775e 100644
--- a/devel/py-twistedCore/distinfo
+++ b/devel/py-twistedCore/distinfo
@@ -1,3 +1,3 @@
-MD5 (Twisted-2.2.0.tar.bz2) = 4a9305e69cdcf01a594c4fe1ea1efc05
-SHA256 (Twisted-2.2.0.tar.bz2) = 537ec738c23ced2ec4a9b7f7124c2cd9bded1308331442ced0f3de7cd7562387
-SIZE (Twisted-2.2.0.tar.bz2) = 1285316
+MD5 (TwistedCore-2.4.0.tar.bz2) = 042a57f65fe919a9234047d7ce8c43f1
+SHA256 (TwistedCore-2.4.0.tar.bz2) = 114f8ecf2625916f6cd65099d4321243f2b56704dddb0c96b30f6b991db484d2
+SIZE (TwistedCore-2.4.0.tar.bz2) = 1213389
diff --git a/devel/py-twistedCore/pkg-plist b/devel/py-twistedCore/pkg-plist
index 0a78f1014901..80d0f86ea080 100644
--- a/devel/py-twistedCore/pkg-plist
+++ b/devel/py-twistedCore/pkg-plist
@@ -9,6 +9,9 @@ bin/twistd
 %%S%%/twisted/__init__.py
 %%S%%/twisted/__init__.pyc
 %%S%%/twisted/__init__.pyo
+%%S%%/twisted/_version.py
+%%S%%/twisted/_version.pyc
+%%S%%/twisted/_version.pyo
 %%S%%/twisted/application/__init__.py
 %%S%%/twisted/application/__init__.pyc
 %%S%%/twisted/application/__init__.pyo
@@ -304,93 +307,6 @@ bin/twistd
 %%S%%/twisted/manhole/ui/spelunk_gnome.py
 %%S%%/twisted/manhole/ui/spelunk_gnome.pyc
 %%S%%/twisted/manhole/ui/spelunk_gnome.pyo
-%%S%%/twisted/pb/__init__.py
-%%S%%/twisted/pb/__init__.pyc
-%%S%%/twisted/pb/__init__.pyo
-%%S%%/twisted/pb/banana.py
-%%S%%/twisted/pb/banana.pyc
-%%S%%/twisted/pb/banana.pyo
-%%S%%/twisted/pb/base32.py
-%%S%%/twisted/pb/base32.pyc
-%%S%%/twisted/pb/base32.pyo
-%%S%%/twisted/pb/broker.py
-%%S%%/twisted/pb/broker.pyc
-%%S%%/twisted/pb/broker.pyo
-%%S%%/twisted/pb/call.py
-%%S%%/twisted/pb/call.pyc
-%%S%%/twisted/pb/call.pyo
-%%S%%/twisted/pb/copyable.py
-%%S%%/twisted/pb/copyable.pyc
-%%S%%/twisted/pb/copyable.pyo
-%%S%%/twisted/pb/crypto.py
-%%S%%/twisted/pb/crypto.pyc
-%%S%%/twisted/pb/crypto.pyo
-%%S%%/twisted/pb/debug.py
-%%S%%/twisted/pb/debug.pyc
-%%S%%/twisted/pb/debug.pyo
-%%S%%/twisted/pb/ipb.py
-%%S%%/twisted/pb/ipb.pyc
-%%S%%/twisted/pb/ipb.pyo
-%%S%%/twisted/pb/negotiate.py
-%%S%%/twisted/pb/negotiate.pyc
-%%S%%/twisted/pb/negotiate.pyo
-%%S%%/twisted/pb/pb.py
-%%S%%/twisted/pb/pb.pyc
-%%S%%/twisted/pb/pb.pyo
-%%S%%/twisted/pb/promise.py
-%%S%%/twisted/pb/promise.pyc
-%%S%%/twisted/pb/promise.pyo
-%%S%%/twisted/pb/referenceable.py
-%%S%%/twisted/pb/referenceable.pyc
-%%S%%/twisted/pb/referenceable.pyo
-%%S%%/twisted/pb/remoteinterface.py
-%%S%%/twisted/pb/remoteinterface.pyc
-%%S%%/twisted/pb/remoteinterface.pyo
-%%S%%/twisted/pb/schema.py
-%%S%%/twisted/pb/schema.pyc
-%%S%%/twisted/pb/schema.pyo
-%%S%%/twisted/pb/slicer.py
-%%S%%/twisted/pb/slicer.pyc
-%%S%%/twisted/pb/slicer.pyo
-%%S%%/twisted/pb/sslverify.py
-%%S%%/twisted/pb/sslverify.pyc
-%%S%%/twisted/pb/sslverify.pyo
-%%S%%/twisted/pb/storage.py
-%%S%%/twisted/pb/storage.pyc
-%%S%%/twisted/pb/storage.pyo
-%%S%%/twisted/pb/test/__init__.py
-%%S%%/twisted/pb/test/__init__.pyc
-%%S%%/twisted/pb/test/__init__.pyo
-%%S%%/twisted/pb/test/common.py
-%%S%%/twisted/pb/test/common.pyc
-%%S%%/twisted/pb/test/common.pyo
-%%S%%/twisted/pb/test/test_banana.py
-%%S%%/twisted/pb/test/test_banana.pyc
-%%S%%/twisted/pb/test/test_banana.pyo
-%%S%%/twisted/pb/test/test_copyable.py
-%%S%%/twisted/pb/test/test_copyable.pyc
-%%S%%/twisted/pb/test/test_copyable.pyo
-%%S%%/twisted/pb/test/test_crypto.py
-%%S%%/twisted/pb/test/test_crypto.pyc
-%%S%%/twisted/pb/test/test_crypto.pyo
-%%S%%/twisted/pb/test/test_negotiate.py
-%%S%%/twisted/pb/test/test_negotiate.pyc
-%%S%%/twisted/pb/test/test_negotiate.pyo
-%%S%%/twisted/pb/test/test_pb.py
-%%S%%/twisted/pb/test/test_pb.pyc
-%%S%%/twisted/pb/test/test_pb.pyo
-%%S%%/twisted/pb/test/test_promise.py
-%%S%%/twisted/pb/test/test_promise.pyc
-%%S%%/twisted/pb/test/test_promise.pyo
-%%S%%/twisted/pb/test/test_schema.py
-%%S%%/twisted/pb/test/test_schema.pyc
-%%S%%/twisted/pb/test/test_schema.pyo
-%%S%%/twisted/pb/test/test_sturdyref.py
-%%S%%/twisted/pb/test/test_sturdyref.pyc
-%%S%%/twisted/pb/test/test_sturdyref.pyo
-%%S%%/twisted/pb/tokens.py
-%%S%%/twisted/pb/tokens.pyc
-%%S%%/twisted/pb/tokens.pyo
 %%S%%/twisted/persisted/__init__.py
 %%S%%/twisted/persisted/__init__.pyc
 %%S%%/twisted/persisted/__init__.pyo
@@ -680,6 +596,9 @@ bin/twistd
 %%S%%/twisted/python/util.py
 %%S%%/twisted/python/util.pyc
 %%S%%/twisted/python/util.pyo
+%%S%%/twisted/python/versions.py
+%%S%%/twisted/python/versions.pyc
+%%S%%/twisted/python/versions.pyo
 %%S%%/twisted/python/win32.py
 %%S%%/twisted/python/win32.pyc
 %%S%%/twisted/python/win32.pyo
@@ -865,6 +784,25 @@ bin/twistd
 %%S%%/twisted/test/ssl_helpers.py
 %%S%%/twisted/test/ssl_helpers.pyc
 %%S%%/twisted/test/ssl_helpers.pyo
+%%S%%/twisted/test/stdio_test_consumer.py
+%%S%%/twisted/test/stdio_test_consumer.pyc
+%%S%%/twisted/test/stdio_test_consumer.pyo
+%%S%%/twisted/test/stdio_test_halfclose.py
+%%S%%/twisted/test/stdio_test_hostpeer.py
+%%S%%/twisted/test/stdio_test_hostpeer.pyc
+%%S%%/twisted/test/stdio_test_hostpeer.pyo
+%%S%%/twisted/test/stdio_test_loseconn.py
+%%S%%/twisted/test/stdio_test_loseconn.pyc
+%%S%%/twisted/test/stdio_test_loseconn.pyo
+%%S%%/twisted/test/stdio_test_producer.py
+%%S%%/twisted/test/stdio_test_producer.pyc
+%%S%%/twisted/test/stdio_test_producer.pyo
+%%S%%/twisted/test/stdio_test_write.py
+%%S%%/twisted/test/stdio_test_write.pyc
+%%S%%/twisted/test/stdio_test_write.pyo
+%%S%%/twisted/test/stdio_test_writeseq.py
+%%S%%/twisted/test/stdio_test_writeseq.pyc
+%%S%%/twisted/test/stdio_test_writeseq.pyo
 %%S%%/twisted/test/test_adbapi.py
 %%S%%/twisted/test/test_adbapi.pyc
 %%S%%/twisted/test/test_adbapi.pyo
@@ -889,6 +827,9 @@ bin/twistd
 %%S%%/twisted/test/test_context.py
 %%S%%/twisted/test/test_context.pyc
 %%S%%/twisted/test/test_context.pyo
+%%S%%/twisted/test/test_cooperator.py
+%%S%%/twisted/test/test_cooperator.pyc
+%%S%%/twisted/test/test_cooperator.pyo
 %%S%%/twisted/test/test_cred.py
 %%S%%/twisted/test/test_cred.pyc
 %%S%%/twisted/test/test_cred.pyo
@@ -904,6 +845,9 @@ bin/twistd
 %%S%%/twisted/test/test_dirdbm.py
 %%S%%/twisted/test/test_dirdbm.pyc
 %%S%%/twisted/test/test_dirdbm.pyo
+%%S%%/twisted/test/test_dist.py
+%%S%%/twisted/test/test_dist.pyc
+%%S%%/twisted/test/test_dist.pyo
 %%S%%/twisted/test/test_doc.py
 %%S%%/twisted/test/test_doc.pyc
 %%S%%/twisted/test/test_doc.pyo
@@ -1051,6 +995,9 @@ bin/twistd
 %%S%%/twisted/test/test_stateful.py
 %%S%%/twisted/test/test_stateful.pyc
 %%S%%/twisted/test/test_stateful.pyo
+%%S%%/twisted/test/test_stdio.py
+%%S%%/twisted/test/test_stdio.pyc
+%%S%%/twisted/test/test_stdio.pyo
 %%S%%/twisted/test/test_strports.py
 %%S%%/twisted/test/test_strports.pyc
 %%S%%/twisted/test/test_strports.pyo
@@ -1090,6 +1037,9 @@ bin/twistd
 %%S%%/twisted/test/test_util.py
 %%S%%/twisted/test/test_util.pyc
 %%S%%/twisted/test/test_util.pyo
+%%S%%/twisted/test/test_versions.py
+%%S%%/twisted/test/test_versions.pyc
+%%S%%/twisted/test/test_versions.pyo
 %%S%%/twisted/test/test_zipstream.py
 %%S%%/twisted/test/test_zipstream.pyc
 %%S%%/twisted/test/test_zipstream.pyo
@@ -1102,13 +1052,9 @@ bin/twistd
 %%S%%/twisted/test/time_helpers.py
 %%S%%/twisted/test/time_helpers.pyc
 %%S%%/twisted/test/time_helpers.pyo
-%%S%%/twisted/trial/NOTES
 %%S%%/twisted/trial/__init__.py
 %%S%%/twisted/trial/__init__.pyc
 %%S%%/twisted/trial/__init__.pyo
-%%S%%/twisted/trial/assertions.py
-%%S%%/twisted/trial/assertions.pyc
-%%S%%/twisted/trial/assertions.pyo
 %%S%%/twisted/trial/itrial.py
 %%S%%/twisted/trial/itrial.pyc
 %%S%%/twisted/trial/itrial.pyo
@@ -1130,6 +1076,9 @@ bin/twistd
 %%S%%/twisted/trial/test/mockdoctest.py
 %%S%%/twisted/trial/test/mockdoctest.pyc
 %%S%%/twisted/trial/test/mockdoctest.pyo
+%%S%%/twisted/trial/test/moduleself.py
+%%S%%/twisted/trial/test/moduleself.pyc
+%%S%%/twisted/trial/test/moduleself.pyo
 %%S%%/twisted/trial/test/moduletest.py
 %%S%%/twisted/trial/test/moduletest.pyc
 %%S%%/twisted/trial/test/moduletest.pyo
@@ -1170,6 +1119,9 @@ bin/twistd
 %%S%%/twisted/trial/test/test_output.py
 %%S%%/twisted/trial/test/test_output.pyc
 %%S%%/twisted/trial/test/test_output.pyo
+%%S%%/twisted/trial/test/test_pyunitcompat.py
+%%S%%/twisted/trial/test/test_pyunitcompat.pyc
+%%S%%/twisted/trial/test/test_pyunitcompat.pyo
 %%S%%/twisted/trial/test/test_reporter.py
 %%S%%/twisted/trial/test/test_reporter.pyc
 %%S%%/twisted/trial/test/test_reporter.pyo
@@ -1209,8 +1161,6 @@ bin/twistd
 @dirrm %%S%%/twisted/plugins
 @dirrm %%S%%/twisted/persisted/journal
 @dirrm %%S%%/twisted/persisted
-@dirrm %%S%%/twisted/pb/test
-@dirrm %%S%%/twisted/pb
 @dirrm %%S%%/twisted/manhole/ui
 @dirrm %%S%%/twisted/manhole
 @dirrm %%S%%/twisted/internet/iocpreactor