update to 4.22

changes:
-added IPv6 support
-added Python3 support
-bugfixes

4 files changed, 29 insertions, 18 deletions

diff --git a/devel/py-Pyro/Makefile b/devel/py-Pyro/Makefile
index dd5b4fb2af9..53304dc2a18 100644
--- a/devel/py-Pyro/Makefile
+++ b/devel/py-Pyro/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:19:27 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/12/04 16:41:01 drochner Exp $
 #
 
-DISTNAME=		Pyro4-4.12
+DISTNAME=		Pyro4-4.22
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		devel
 MASTER_SITES=		http://pypi.python.org/packages/source/P/Pyro4/
@@ -11,8 +11,12 @@ HOMEPAGE=		http://pyro.sourceforge.net/
 COMMENT=		Distributed Object Technology system in Python
 LICENSE=		mit
 
+PYTHON_VERSIONS_INCLUDE_3X= yes
+DEPENDS+= ${PYPKGPREFIX}-serpent-[0-9]*:../../devel/py-serpent
+
 # only needed for test
 #DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+#DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
 #DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
 do-test:
 	cd ${WRKSRC}/tests; ${PYTHONBIN} run_suite.py
diff --git a/devel/py-Pyro/PLIST b/devel/py-Pyro/PLIST
index caf529b9621..d05f76a7326 100644
--- a/devel/py-Pyro/PLIST
+++ b/devel/py-Pyro/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2012/02/17 18:32:57 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/12/04 16:41:01 drochner Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/Pyro4/__init__.py
 ${PYSITELIB}/Pyro4/__init__.pyc
@@ -18,6 +19,12 @@ ${PYSITELIB}/Pyro4/core.pyo
 ${PYSITELIB}/Pyro4/errors.py
 ${PYSITELIB}/Pyro4/errors.pyc
 ${PYSITELIB}/Pyro4/errors.pyo
+${PYSITELIB}/Pyro4/futures.py
+${PYSITELIB}/Pyro4/futures.pyc
+${PYSITELIB}/Pyro4/futures.pyo
+${PYSITELIB}/Pyro4/message.py
+${PYSITELIB}/Pyro4/message.pyc
+${PYSITELIB}/Pyro4/message.pyo
 ${PYSITELIB}/Pyro4/naming.py
 ${PYSITELIB}/Pyro4/naming.pyc
 ${PYSITELIB}/Pyro4/naming.pyo
@@ -42,12 +49,12 @@ ${PYSITELIB}/Pyro4/test/__init__.pyo
 ${PYSITELIB}/Pyro4/test/echoserver.py
 ${PYSITELIB}/Pyro4/test/echoserver.pyc
 ${PYSITELIB}/Pyro4/test/echoserver.pyo
-${PYSITELIB}/Pyro4/threadpool.py
-${PYSITELIB}/Pyro4/threadpool.pyc
-${PYSITELIB}/Pyro4/threadpool.pyo
 ${PYSITELIB}/Pyro4/threadutil.py
 ${PYSITELIB}/Pyro4/threadutil.pyc
 ${PYSITELIB}/Pyro4/threadutil.pyo
+${PYSITELIB}/Pyro4/tpjobqueue.py
+${PYSITELIB}/Pyro4/tpjobqueue.pyc
+${PYSITELIB}/Pyro4/tpjobqueue.pyo
 ${PYSITELIB}/Pyro4/util.py
 ${PYSITELIB}/Pyro4/util.pyc
 ${PYSITELIB}/Pyro4/util.pyo
diff --git a/devel/py-Pyro/distinfo b/devel/py-Pyro/distinfo
index 790e169f6e1..c86ec0dbc64 100644
--- a/devel/py-Pyro/distinfo
+++ b/devel/py-Pyro/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2012/02/17 18:32:57 drochner Exp $
+$NetBSD: distinfo,v 1.5 2013/12/04 16:41:01 drochner Exp $
 
-SHA1 (Pyro4-4.12.tar.gz) = f24d9a72acadbd9c7a88d95da4384872759af0c9
-RMD160 (Pyro4-4.12.tar.gz) = c7aa27de1df635d192a6c96ed7d89140c9ae9a8e
-Size (Pyro4-4.12.tar.gz) = 264398 bytes
-SHA1 (patch-ab) = 6f0e0a83926e3a849a2021999eada2207387e660
+SHA1 (Pyro4-4.22.tar.gz) = f03da84c8d86357db6c17c62cf9d22be6613ebee
+RMD160 (Pyro4-4.22.tar.gz) = 8c2a8896d30bdb44bd0ca21135b64c53d76ec55c
+Size (Pyro4-4.22.tar.gz) = 291287 bytes
+SHA1 (patch-ab) = 03bc0ffcaf8963cb7ab177c021460facaff890ad
diff --git a/devel/py-Pyro/patches/patch-ab b/devel/py-Pyro/patches/patch-ab
index 6eb395b9719..b23023049ad 100644
--- a/devel/py-Pyro/patches/patch-ab
+++ b/devel/py-Pyro/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2012/02/17 18:32:58 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2013/12/04 16:41:01 drochner Exp $
 
 avoid sender block
 
---- tests/PyroTests/test_socket.py.orig	2011-11-05 16:22:00.000000000 +0000
+--- tests/PyroTests/test_socket.py.orig	2013-08-26 18:54:16.000000000 +0000
 +++ tests/PyroTests/test_socket.py
-@@ -140,8 +140,10 @@ class TestSocketutil(unittest.TestCase):
+@@ -268,8 +268,10 @@ class TestSocketutil(unittest.TestCase):
          

      def testMsgWaitallProblems(self):

-         ss=SU.createSocket(bind=("localhost",0), timeout=0.5)

-+	ss.setsockopt(SU.socket.SOL_SOCKET, SU.socket.SO_SNDBUF, 100000)
+         ss=SU.createSocket(bind=("localhost",0), timeout=2)

++        ss.setsockopt(SU.socket.SOL_SOCKET, SU.socket.SO_SNDBUF, 100000)

          port=ss.getsockname()[1]

-         cs=SU.createSocket(connect=("localhost",port), timeout=0.5)

-+	cs.setsockopt(SU.socket.SOL_SOCKET, SU.socket.SO_SNDBUF, 100000)
+         cs=SU.createSocket(connect=("localhost",port), timeout=2)

++        cs.setsockopt(SU.socket.SOL_SOCKET, SU.socket.SO_SNDBUF, 100000)

          a=ss.accept()

          # test some sizes that might be problematic with MSG_WAITALL

          for size in [1000,10000,32000,32768,32780,41950,41952,42000,65000,65535,65600,80000]: