sysutils/py-kazoo: update to 2.4.0

Changes 2.4.0:

PYTHON SUPPORTED VERSIONS CHANGE: Please note that Kazoo no longer tests
on Python 2.6 or 3.3. Tested versions are 2.7, 3.4, 3.5, 3.6, and PyPy. The
multiple endpoint support for KazooClient may not work correctly on 2.6.

Bug Fixes
*   add missed parens to LockingQueue function call.
* **core:**  revert 305 SetWatches which caused RuntimeError

Features
*   pep8 all the thingsloses
*   drop Python 2.6/3.3 official support, add 3.5/3.6 testingloses
* **core:**
  *  allow multiple endpoints in KazooClient hosts arg
  *  use epoll when available to support fds > 1023
* **recipe:**  Add TreeCache recipe

4 files changed, 46 insertions, 31 deletions

diff --git a/sysutils/py-kazoo/Makefile b/sysutils/py-kazoo/Makefile
index 2005493e6fb..6781203af08 100644
--- a/sysutils/py-kazoo/Makefile
+++ b/sysutils/py-kazoo/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/12 14:55:19 adam Exp $
 
-DISTNAME=	kazoo-2.0
+DISTNAME=	kazoo-2.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	python sysutils
+CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=k/kazoo/}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	https://kazoo.readthedocs.org/
 COMMENT=	Higher level Zookeeper client
 LICENSE=	apache-2.0
 
-USE_LANGUAGES=	# none
-
-.include "options.mk"
+DEPENDS+=		${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+BUILD_DEPENDS+=		${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
+BUILD_DEPENDS+=		${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
+BUILD_DEPENDS+=		${PYPKGPREFIX}-gevent-[0-9]*:../../net/py-gevent
+BUILD_DEPENDS+=		${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+BUILD_DEPENDS+=		${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
-pre-install:
-	${CHMOD} -x ${WRKSRC}/kazoo.egg-info/*
+USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-kazoo/PLIST b/sysutils/py-kazoo/PLIST
index 9f25f491af7..2d14fd75a8b 100644
--- a/sysutils/py-kazoo/PLIST
+++ b/sysutils/py-kazoo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/06/08 22:51:04 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/09/12 14:55:19 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -17,6 +17,9 @@ ${PYSITELIB}/kazoo/exceptions.pyo
 ${PYSITELIB}/kazoo/handlers/__init__.py
 ${PYSITELIB}/kazoo/handlers/__init__.pyc
 ${PYSITELIB}/kazoo/handlers/__init__.pyo
+${PYSITELIB}/kazoo/handlers/eventlet.py
+${PYSITELIB}/kazoo/handlers/eventlet.pyc
+${PYSITELIB}/kazoo/handlers/eventlet.pyo
 ${PYSITELIB}/kazoo/handlers/gevent.py
 ${PYSITELIB}/kazoo/handlers/gevent.pyc
 ${PYSITELIB}/kazoo/handlers/gevent.pyo
@@ -50,18 +53,27 @@ ${PYSITELIB}/kazoo/protocol/serialization.pyo
 ${PYSITELIB}/kazoo/protocol/states.py
 ${PYSITELIB}/kazoo/protocol/states.pyc
 ${PYSITELIB}/kazoo/protocol/states.pyo
+${PYSITELIB}/kazoo/python2atexit.py
+${PYSITELIB}/kazoo/python2atexit.pyc
+${PYSITELIB}/kazoo/python2atexit.pyo
 ${PYSITELIB}/kazoo/recipe/__init__.py
 ${PYSITELIB}/kazoo/recipe/__init__.pyc
 ${PYSITELIB}/kazoo/recipe/__init__.pyo
 ${PYSITELIB}/kazoo/recipe/barrier.py
 ${PYSITELIB}/kazoo/recipe/barrier.pyc
 ${PYSITELIB}/kazoo/recipe/barrier.pyo
+${PYSITELIB}/kazoo/recipe/cache.py
+${PYSITELIB}/kazoo/recipe/cache.pyc
+${PYSITELIB}/kazoo/recipe/cache.pyo
 ${PYSITELIB}/kazoo/recipe/counter.py
 ${PYSITELIB}/kazoo/recipe/counter.pyc
 ${PYSITELIB}/kazoo/recipe/counter.pyo
 ${PYSITELIB}/kazoo/recipe/election.py
 ${PYSITELIB}/kazoo/recipe/election.pyc
 ${PYSITELIB}/kazoo/recipe/election.pyo
+${PYSITELIB}/kazoo/recipe/lease.py
+${PYSITELIB}/kazoo/recipe/lease.pyc
+${PYSITELIB}/kazoo/recipe/lease.pyo
 ${PYSITELIB}/kazoo/recipe/lock.py
 ${PYSITELIB}/kazoo/recipe/lock.pyc
 ${PYSITELIB}/kazoo/recipe/lock.pyo
@@ -101,6 +113,9 @@ ${PYSITELIB}/kazoo/tests/test_barrier.pyo
 ${PYSITELIB}/kazoo/tests/test_build.py
 ${PYSITELIB}/kazoo/tests/test_build.pyc
 ${PYSITELIB}/kazoo/tests/test_build.pyo
+${PYSITELIB}/kazoo/tests/test_cache.py
+${PYSITELIB}/kazoo/tests/test_cache.pyc
+${PYSITELIB}/kazoo/tests/test_cache.pyo
 ${PYSITELIB}/kazoo/tests/test_client.py
 ${PYSITELIB}/kazoo/tests/test_client.pyc
 ${PYSITELIB}/kazoo/tests/test_client.pyo
@@ -113,12 +128,24 @@ ${PYSITELIB}/kazoo/tests/test_counter.pyo
 ${PYSITELIB}/kazoo/tests/test_election.py
 ${PYSITELIB}/kazoo/tests/test_election.pyc
 ${PYSITELIB}/kazoo/tests/test_election.pyo
+${PYSITELIB}/kazoo/tests/test_eventlet_handler.py
+${PYSITELIB}/kazoo/tests/test_eventlet_handler.pyc
+${PYSITELIB}/kazoo/tests/test_eventlet_handler.pyo
 ${PYSITELIB}/kazoo/tests/test_exceptions.py
 ${PYSITELIB}/kazoo/tests/test_exceptions.pyc
 ${PYSITELIB}/kazoo/tests/test_exceptions.pyo
 ${PYSITELIB}/kazoo/tests/test_gevent_handler.py
 ${PYSITELIB}/kazoo/tests/test_gevent_handler.pyc
 ${PYSITELIB}/kazoo/tests/test_gevent_handler.pyo
+${PYSITELIB}/kazoo/tests/test_hosts.py
+${PYSITELIB}/kazoo/tests/test_hosts.pyc
+${PYSITELIB}/kazoo/tests/test_hosts.pyo
+${PYSITELIB}/kazoo/tests/test_interrupt.py
+${PYSITELIB}/kazoo/tests/test_interrupt.pyc
+${PYSITELIB}/kazoo/tests/test_interrupt.pyo
+${PYSITELIB}/kazoo/tests/test_lease.py
+${PYSITELIB}/kazoo/tests/test_lease.pyc
+${PYSITELIB}/kazoo/tests/test_lease.pyo
 ${PYSITELIB}/kazoo/tests/test_lock.py
 ${PYSITELIB}/kazoo/tests/test_lock.pyc
 ${PYSITELIB}/kazoo/tests/test_lock.pyo
@@ -149,3 +176,6 @@ ${PYSITELIB}/kazoo/tests/test_watchers.pyo
 ${PYSITELIB}/kazoo/tests/util.py
 ${PYSITELIB}/kazoo/tests/util.pyc
 ${PYSITELIB}/kazoo/tests/util.pyo
+${PYSITELIB}/kazoo/version.py
+${PYSITELIB}/kazoo/version.pyc
+${PYSITELIB}/kazoo/version.pyo
diff --git a/sysutils/py-kazoo/distinfo b/sysutils/py-kazoo/distinfo
index 26405c585bd..8937c801698 100644
--- a/sysutils/py-kazoo/distinfo
+++ b/sysutils/py-kazoo/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:32:27 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/09/12 14:55:19 adam Exp $
 
-SHA1 (kazoo-2.0.zip) = 66f749aaeb774c34edd004c1901d58904dac716e
-RMD160 (kazoo-2.0.zip) = 55d81ebabe11b2354ae8344b49bdb7223d5ac21b
-SHA512 (kazoo-2.0.zip) = 99ea48e5c763adc18f579a6066a63b55b615e5bf0350e60b8e2ec1e6bb8608cbf0acf67fe7937ff6d68cb79ace765806fed38ecaf8ace600a0c20166be8d8ef4
-Size (kazoo-2.0.zip) = 145663 bytes
+SHA1 (kazoo-2.4.0.tar.gz) = c6366c20e2fa4208e3d11b563178ea2c6198c371
+RMD160 (kazoo-2.4.0.tar.gz) = 64ce177d380a4a1da25cae735f4ee0b20ffadaca
+SHA512 (kazoo-2.4.0.tar.gz) = 85d0b23b6709ec14ff9156ceb589c52fa8ae48234bc0cfe7a686adc7959e7696d84412cb249839a912bbca1702855c022264a6404b90b0ef8c408c592466a3c1
+Size (kazoo-2.4.0.tar.gz) = 142830 bytes
diff --git a/sysutils/py-kazoo/options.mk b/sysutils/py-kazoo/options.mk
deleted file mode 100644
index 81631e9505a..00000000000
--- a/sysutils/py-kazoo/options.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2014/06/08 22:51:04 rodent Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.py-kazoo
-PKG_SUPPORTED_OPTIONS=	tests
-PKG_SUGGESTED_OPTIONS+=	# blank
-
-.include "../../mk/bsd.options.mk"
-
-.include "../../lang/python/pyversion.mk"
-
-.if !empty(PKG_OPTIONS:Mtests)
-DEPENDS+=		${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
-DEPENDS+=		${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-DEPENDS+=		${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-DEPENDS+=		${PYPKGPREFIX}-gevent-[0-9]*:../../net/py-gevent
-.endif