CATEGORIES+=python. Use options framework to enable user to select all

options supported by this package, with none enabled by default. Changelog:

3.0.18
======

- A typo introduced in 3.0.17 caused kombu.async.hub to crash (Issue #360).

3.0.17
======

- ``kombu[librabbitmq]`` now depends on librabbitmq 1.5.2.

- Async: Event loop now selectively removes file descriptors for the mode
  it failed in, and keeps others (e.g read vs write).

- CouchDB: Now works without userid set.

- SQLAlchemy: Now supports recovery from connection errors.

- Redis: Restore at shutdown now works when ack emulation is disabled.

- :func:`kombu.common.eventloop` accidentally swallowed socket errors.

- Adds :func:`kombu.utils.url.sanitize_url`

3 files changed, 74 insertions, 8 deletions

diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index 46221a5cce6..d7bb09f310e 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/05/18 20:36:10 rodent Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/09 00:16:23 rodent Exp $
 
-DISTNAME=	kombu-3.0.16
+DISTNAME=	kombu-3.0.18
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	net
+CATEGORIES=	net python
 MASTER_SITES=	https://pypi.python.org/packages/source/k/kombu/
 
 MAINTAINER=	rodent@NetBSD.org
@@ -10,12 +10,15 @@ HOMEPAGE=	http://kombu.readthedocs.org/
 COMMENT=	Messaging framework for Python
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-amqp>=1.4.5:../../net/py-amqp
+DEPENDS+=	${PYPKGPREFIX}-anyjson>=0.3.3:../../textproc/py-anyjson
+DEPENDS+=	${PYPKGPREFIX}-amqp>=1.4.5<2.0:../../net/py-amqp
 
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	kombu/tests/test_serialization.py
 
+.include "options.mk"
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-kombu/distinfo b/net/py-kombu/distinfo
index 2c368efce6a..1c9fff2523b 100644
--- a/net/py-kombu/distinfo
+++ b/net/py-kombu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2014/05/18 20:36:10 rodent Exp $
+$NetBSD: distinfo,v 1.8 2014/06/09 00:16:23 rodent Exp $
 
-SHA1 (kombu-3.0.16.tar.gz) = 3299ca0a01f0a529a507934d11532bf9b0e98509
-RMD160 (kombu-3.0.16.tar.gz) = 13af26a08de883efcd46885a72d997f6358a8ce4
-Size (kombu-3.0.16.tar.gz) = 342440 bytes
+SHA1 (kombu-3.0.18.tar.gz) = f86983044bbd8a049ddb67ab5bceacd9b0c37457
+RMD160 (kombu-3.0.18.tar.gz) = f530358fb97b844d796eaa127a6885cc17064ff6
+Size (kombu-3.0.18.tar.gz) = 343083 bytes
diff --git a/net/py-kombu/options.mk b/net/py-kombu/options.mk
new file mode 100644
index 00000000000..4de84ee0a79
--- /dev/null
+++ b/net/py-kombu/options.mk
@@ -0,0 +1,63 @@
+# $NetBSD: options.mk,v 1.1 2014/06/09 00:16:23 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.py-kombu
+PKG_SUPPORTED_OPTIONS=	beanstalk couchdb mongo msgpack pyro redis slmq
+PKG_SUPPORTED_OPTIONS+=	sqlalchemy sqs yaml zeromq zookeeper
+PKG_SUGGESTED_OPTIONS+=	# blank
+
+.include "../../mk/bsd.options.mk"
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(PKG_OPTIONS:Mbeanstalk)
+DEPENDS+=		${PYPKGPREFIX}-beanstalkc-[0-9]*:../../net/py-beanstalkc
+.endif
+
+.if !empty(PKG_OPTIONS:Mcouchdb)
+DEPENDS+=		${PYPKGPREFIX}-couchdb-[0-9]*:../../databases/py-couchdb
+.endif
+
+# XXX: Not packaged yet. Needs some work.
+#.if !empty(PKG_OPTIONS:Mlibrabbitmq)
+#DEPENDS+=		${PYPKGPREFIX}-librabbitmq>=1.5.2:../../net/py-librabbitmq
+#.endif
+
+.if !empty(PKG_OPTIONS:Mmongo)
+DEPENDS+=		${PYPKGPREFIX}-mongo>=2.6.2:../../databases/py-mongo
+.endif
+
+.if !empty(PKG_OPTIONS:Mmsgpack)
+DEPENDS+=		${PYPKGPREFIX}-msgpack>=0.3.0:../../devel/py-msgpack
+.endif
+
+.if !empty(PKG_OPTIONS:Mpyro)
+DEPENDS+=		${PYPKGPREFIX}-Pyro4-[0-9]*:../../devel/py-Pyro
+.endif
+
+.if !empty(PKG_OPTIONS:Mredis)
+DEPENDS+=		redis>2.8.0:../../databases/redis
+.endif
+
+.if !empty(PKG_OPTIONS:Mslmq)
+DEPENDS+=		${PYPKGPREFIX}-softlayer_messaging>=1.0.3:../../net/py-softlayer_messaging
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlalchemy)
+DEPENDS+=		${PYPKGPREFIX}-sqlalchemy-[0-9]*:../../databases/py-sqlalchemy
+.endif
+
+.if !empty(PKG_OPTIONS:Msqs)
+DEPENDS+=		${PYPKGPREFIX}-boto>=2.13.3:../../www/py-boto
+.endif
+
+.if !empty(PKG_OPTIONS:Myaml)
+DEPENDS+=		${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
+.endif
+
+.if !empty(PKG_OPTIONS:Mzeromq)
+DEPENDS+=		${PYPKGPREFIX}-zmq>=13.1.0:../../net/py-zmq
+.endif
+
+.if !empty(PKG_OPTIONS:Mzookeeper)
+DEPENDS+=		${PYPKGPREFIX}-kazoo>=1.3.1:../../sysutils/py-kazoo
+.endif