Depend on py-amqp>=1.3.3. Only accept python versions 33, 27, 26. Both as

per documentation. Updated to latest release, 3.0.8. From Changelog:

3.0.8
=====
- Serializer: loads and dumps now wraps exceptions raised into
  :exc:`~kombu.exceptions.DecodeError` and
  :exc:`kombu.exceptions.EncodeError` respectively.
- Redis: Would attempt to read from the wrong connection if a
  select/epoll/kqueue exception event happened.
- Redis: Disabling ack emulation now works properly.
- Redis: :exc:`IOError` and :exc:`OSError` are now treated as recoverable
  connection errors.
- SQS: Improved performance by reading messages in bulk.
- Connection Pool: Attempting to acquire from a closed pool will now
  raise :class:`RuntimeError`.

3.0.7
=====
- Fixes Python 2.6 compatibility.
- Redis: Fixes 'bad file descriptor' issue.

3.0.6
=====
- Timer: No longer attempts to hash keyword arguments (Issue #275).
- Async: Did not account for the long type for file descriptors.
- PyPy: kqueue support was broken.
- Redis: Bad pub/sub payloads no longer crashes the consumer.
- Redis: Unix socket URLs can now specify a virtual host by including
  it as a query parameter.
- ``kombu.VERSION`` is now a named tuple.

3.0.5
=====
- Now depends on :mod:`amqp` 1.3.3.
- Redis: Fixed Python 3 compatibility problem (Issue #270).
- MongoDB: Fixed problem with URL parsing when authentication used.
- pyamqp: Fixed small issue when publishing the message and
  the property dictionary was set to None.
- Fixed problem in ``repr(LaxBoundedSemaphore)``.
- Tests now passing on Python 3.3.

3.0.4
=====
- common.QoS: ``decrement_eventually`` now makes sure the value
  does not go below 1 if a prefetch count is enabled.

3.0.3
=====
- SQS: Properly reverted patch that caused delays between messages.
- select: Clear all registerd fds on poller.cloe
- Eventloop: unregister if EBADF raised.

3.0.2
=====
- Now depends on :mod:`amqp` version 1.3.2.
- select: Fixed problem where unregister did not properly remove
  the fd.

3.0.1
=====
- Now depends on :mod:`amqp` version 1.3.1.
- Redis: New option ``fanout_keyprefix``
    This transport option is recommended for all users as it ensures
    that broadcast (fanout) messages sent is only seen by the current
    virtual host:

        Connection('redis://', transport_options={'fanout_keyprefix': True})

    However, enabling this means that you cannot send or receive messages
    from older Kombu versions so make sure all of your participants
    are upgraded and have the transport option enabled.

    This will be the default behavior in Kombu 4.0.
- Distribution: Removed file ``requirements/py25.txt``.
- MongoDB: Now disables ``auto_start_request``.
- MongoDB: Enables ``use_greenlets`` if eventlet/gevent used.
- Pidbox: Fixes problem where expires header was None,
  which is a value not supported by the amq protocol.
- ConsumerMixin: New ``consumer_context`` method for starting
  the consumer without draining events.

3.0.0
=====

- Now depends on :mod:`amqp` version 1.3.
- No longer supports Python 2.5
    The minimum Python version supported is now Python 2.6.0 for Python2,
    and Python 3.3 for Python3.
- Dual codebase supporting both Python 2 and 3.
    No longer using ``2to3``, making it easier to maintain support for
    both versions.
- pickle, yaml and msgpack deserialization is now disabled by default.
    This means that Kombu will by default refuse to handle any content type
    other than json.
- kombu.async: Experimental event loop implementation.
- Utility function ``kombu.common.ipublish`` has been removed.
    Use ``Producer(..., retry=True)`` instead.
- Utility function ``kombu.common.isend_reply`` has been removed
    Use ``send_reply(..., retry=True)`` instead.
- ``kombu.common.entry_to_queue`` and ``kombu.messaging.entry_to_queue``
  has been removed.
    Use ``Queue.from_dict(name, **options)`` instead.
- Redis: Messages are now restored at the end of the list.
- ``StdConnectionError`` and ``StdChannelError`` is removed
    and :exc:`amqp.ConnectionError` and :exc:`amqp.ChannelError` is used
    instead.
- Message object implementation has moved to :class:`kombu.message.Message`.
- Serailization: Renamed functions encode/decode to
  :func:`~kombu.serialization.dumps` and :func:`~kombu.serialization.loads`.
    For backward compatibility the old names are still available as aliases.
- The ``kombu.log.anon_logger`` function has been removed.
    Use :func:`~kombu.log.get_logger` instead.
- ``queue_declare`` now returns namedtuple with ``queue``, ``message_count``,
  and ``consumer_count`` fields.
- LamportClock: Can now set lock class
- :mod:`kombu.utils.clock`: Utilities for ordering events added.
- :class:`~kombu.simple.SimpleQueue` now allows you to override
  the exchange type used.
- Zookeeper transport updated to support new changes in the :mod:`kazoo`
  library.
- pyamqp/librabbitmq: Transport options are now forwarded as keyword arguments
    to the underlying connection (Issue #214).
- Transports may now distinguish between recoverable and irrecoverable
  connection and channel errors.
- ``kombu.utils.Finalize`` has been removed: Use
  :mod:`multiprocessing.util.Finalize` instead.
- Memory transport now supports the fanout exchange type.
- Experimental new `Pyro`_ transport (:mod:`kombu.transport.pyro`).
.. _`Pyro`: http://pythonhosted.org/Pyro
- Experimental new `SoftLayer MQ`_ transport (:mod:`kombu.transport.SLMQ`).
.. _`SoftLayer MQ`: http://www.softlayer.com/services/additional/message-queue
- Eventio: Kqueue breaks in subtle ways so select is now used instead.
- SQLAlchemy transport: Can now specify table names using the
  ``queue_tablename`` and ``message_tablename`` transport options.
Redis transport: Now supports using local UNIX sockets to communicate with the
  Redis server (Issue #1283)
    To connect using a UNIX socket you have to use the ``redis+socket``
    URL-prefix: ``redis+socket:///tmp/redis.sock``.
    This functionality was merged from the `celery-redis-unixsocket`_ project.
    Contributed by Maxime Rouyrre.
ZeroMQ transport: drain_events now supports timeout.
.. _`celery-redis-unixsocket`:
    https://github.com/piquadrat/celery-redis-unixsocket

2.5.16
======

- Python3: Fixed problem with dependencies not being installed.

2.5.15
======
- Declaration cache: Now only keeps hash of declaration
  so that it does not keep a reference to the channel.
- Declaration cache: Now respects ``entity.can_cache_declaration``
  attribute.
- Fixes Python 2.5 compatibility.
- Fixes tests after python-msgpack changes.
- ``Queue.get``: Now supports ``accept`` argument.

2.5.14
======

- safe_str did not work properly resulting in
  :exc:`UnicodeDecodeError` (Issue #248).

2.5.13
======
- Now depends on :mod:`amqp` 1.0.13
- Fixed typo in Django functional tests.
- safe_str now returns Unicode in Python 2.x
- amqp: Transport options are now merged with arguments
  supplied to the connection.
- Tests no longer depends on distribute, which was deprecated
  and merged back into setuptools.
- ConsumerMixin now also restarts on channel related errors.

3 files changed, 74 insertions, 35 deletions

diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile
index fec5fc54cb6..8673da3f6e9 100644
--- a/net/py-kombu/Makefile
+++ b/net/py-kombu/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2013/07/02 11:05:21 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2013/12/31 14:12:17 rodent Exp $
 #
 
-DISTNAME=	kombu-2.5.12
+DISTNAME=	kombu-3.0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net
-MASTER_SITES=	http://pypi.python.org/packages/source/k/kombu/
+MASTER_SITES=	https://pypi.python.org/packages/source/k/kombu/
+FETCH_USING=	curl
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://kombu.readthedocs.org/
@@ -13,8 +14,10 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_ACCEPTED=	33 27 26
 REPLACE_PYTHON+=	kombu/tests/test_serialization.py
 
+DEPENDS+=	${PYPKGPREFIX}-amqp>=1.3.3:../../net/py-amqp
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-kombu/PLIST b/net/py-kombu/PLIST
index c00cf9c0e75..5e85d491be1 100644
--- a/net/py-kombu/PLIST
+++ b/net/py-kombu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/02 11:05:21 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/12/31 14:12:17 rodent Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -11,6 +11,18 @@ ${PYSITELIB}/kombu/__init__.pyo
 ${PYSITELIB}/kombu/abstract.py
 ${PYSITELIB}/kombu/abstract.pyc
 ${PYSITELIB}/kombu/abstract.pyo
+${PYSITELIB}/kombu/async/__init__.py
+${PYSITELIB}/kombu/async/__init__.pyc
+${PYSITELIB}/kombu/async/__init__.pyo
+${PYSITELIB}/kombu/async/hub.py
+${PYSITELIB}/kombu/async/hub.pyc
+${PYSITELIB}/kombu/async/hub.pyo
+${PYSITELIB}/kombu/async/semaphore.py
+${PYSITELIB}/kombu/async/semaphore.pyc
+${PYSITELIB}/kombu/async/semaphore.pyo
+${PYSITELIB}/kombu/async/timer.py
+${PYSITELIB}/kombu/async/timer.pyc
+${PYSITELIB}/kombu/async/timer.pyo
 ${PYSITELIB}/kombu/clocks.py
 ${PYSITELIB}/kombu/clocks.pyc
 ${PYSITELIB}/kombu/clocks.pyo
@@ -32,9 +44,15 @@ ${PYSITELIB}/kombu/entity.pyo
 ${PYSITELIB}/kombu/exceptions.py
 ${PYSITELIB}/kombu/exceptions.pyc
 ${PYSITELIB}/kombu/exceptions.pyo
+${PYSITELIB}/kombu/five.py
+${PYSITELIB}/kombu/five.pyc
+${PYSITELIB}/kombu/five.pyo
 ${PYSITELIB}/kombu/log.py
 ${PYSITELIB}/kombu/log.pyc
 ${PYSITELIB}/kombu/log.pyo
+${PYSITELIB}/kombu/message.py
+${PYSITELIB}/kombu/message.pyc
+${PYSITELIB}/kombu/message.pyo
 ${PYSITELIB}/kombu/messaging.py
 ${PYSITELIB}/kombu/messaging.pyc
 ${PYSITELIB}/kombu/messaging.pyo
@@ -59,9 +77,15 @@ ${PYSITELIB}/kombu/syn.pyo
 ${PYSITELIB}/kombu/tests/__init__.py
 ${PYSITELIB}/kombu/tests/__init__.pyc
 ${PYSITELIB}/kombu/tests/__init__.pyo
-${PYSITELIB}/kombu/tests/compat.py
-${PYSITELIB}/kombu/tests/compat.pyc
-${PYSITELIB}/kombu/tests/compat.pyo
+${PYSITELIB}/kombu/tests/async/__init__.py
+${PYSITELIB}/kombu/tests/async/__init__.pyc
+${PYSITELIB}/kombu/tests/async/__init__.pyo
+${PYSITELIB}/kombu/tests/async/test_hub.py
+${PYSITELIB}/kombu/tests/async/test_hub.pyc
+${PYSITELIB}/kombu/tests/async/test_hub.pyo
+${PYSITELIB}/kombu/tests/case.py
+${PYSITELIB}/kombu/tests/case.pyc
+${PYSITELIB}/kombu/tests/case.pyo
 ${PYSITELIB}/kombu/tests/mocks.py
 ${PYSITELIB}/kombu/tests/mocks.pyc
 ${PYSITELIB}/kombu/tests/mocks.pyo
@@ -89,6 +113,9 @@ ${PYSITELIB}/kombu/tests/test_log.pyo
 ${PYSITELIB}/kombu/tests/test_messaging.py
 ${PYSITELIB}/kombu/tests/test_messaging.pyc
 ${PYSITELIB}/kombu/tests/test_messaging.pyo
+${PYSITELIB}/kombu/tests/test_mixins.py
+${PYSITELIB}/kombu/tests/test_mixins.pyc
+${PYSITELIB}/kombu/tests/test_mixins.pyo
 ${PYSITELIB}/kombu/tests/test_pidbox.py
 ${PYSITELIB}/kombu/tests/test_pidbox.pyc
 ${PYSITELIB}/kombu/tests/test_pidbox.pyo
@@ -101,12 +128,15 @@ ${PYSITELIB}/kombu/tests/test_serialization.pyo
 ${PYSITELIB}/kombu/tests/test_simple.py
 ${PYSITELIB}/kombu/tests/test_simple.pyc
 ${PYSITELIB}/kombu/tests/test_simple.pyo
-${PYSITELIB}/kombu/tests/test_utils.py
-${PYSITELIB}/kombu/tests/test_utils.pyc
-${PYSITELIB}/kombu/tests/test_utils.pyo
+${PYSITELIB}/kombu/tests/test_syn.py
+${PYSITELIB}/kombu/tests/test_syn.pyc
+${PYSITELIB}/kombu/tests/test_syn.pyo
 ${PYSITELIB}/kombu/tests/transport/__init__.py
 ${PYSITELIB}/kombu/tests/transport/__init__.pyc
 ${PYSITELIB}/kombu/tests/transport/__init__.pyo
+${PYSITELIB}/kombu/tests/transport/test_SQS.py
+${PYSITELIB}/kombu/tests/transport/test_SQS.pyc
+${PYSITELIB}/kombu/tests/transport/test_SQS.pyo
 ${PYSITELIB}/kombu/tests/transport/test_amqplib.py
 ${PYSITELIB}/kombu/tests/transport/test_amqplib.pyc
 ${PYSITELIB}/kombu/tests/transport/test_amqplib.pyo
@@ -116,6 +146,9 @@ ${PYSITELIB}/kombu/tests/transport/test_base.pyo
 ${PYSITELIB}/kombu/tests/transport/test_filesystem.py
 ${PYSITELIB}/kombu/tests/transport/test_filesystem.pyc
 ${PYSITELIB}/kombu/tests/transport/test_filesystem.pyo
+${PYSITELIB}/kombu/tests/transport/test_librabbitmq.py
+${PYSITELIB}/kombu/tests/transport/test_librabbitmq.pyc
+${PYSITELIB}/kombu/tests/transport/test_librabbitmq.pyo
 ${PYSITELIB}/kombu/tests/transport/test_memory.py
 ${PYSITELIB}/kombu/tests/transport/test_memory.pyc
 ${PYSITELIB}/kombu/tests/transport/test_memory.pyo
@@ -146,24 +179,27 @@ ${PYSITELIB}/kombu/tests/transport/virtual/test_exchange.pyo
 ${PYSITELIB}/kombu/tests/transport/virtual/test_scheduling.py
 ${PYSITELIB}/kombu/tests/transport/virtual/test_scheduling.pyc
 ${PYSITELIB}/kombu/tests/transport/virtual/test_scheduling.pyo
-${PYSITELIB}/kombu/tests/utilities/__init__.py
-${PYSITELIB}/kombu/tests/utilities/__init__.pyc
-${PYSITELIB}/kombu/tests/utilities/__init__.pyo
-${PYSITELIB}/kombu/tests/utilities/test_amq_manager.py
-${PYSITELIB}/kombu/tests/utilities/test_amq_manager.pyc
-${PYSITELIB}/kombu/tests/utilities/test_amq_manager.pyo
-${PYSITELIB}/kombu/tests/utilities/test_debug.py
-${PYSITELIB}/kombu/tests/utilities/test_debug.pyc
-${PYSITELIB}/kombu/tests/utilities/test_debug.pyo
-${PYSITELIB}/kombu/tests/utilities/test_encoding.py
-${PYSITELIB}/kombu/tests/utilities/test_encoding.pyc
-${PYSITELIB}/kombu/tests/utilities/test_encoding.pyo
-${PYSITELIB}/kombu/tests/utilities/test_functional.py
-${PYSITELIB}/kombu/tests/utilities/test_functional.pyc
-${PYSITELIB}/kombu/tests/utilities/test_functional.pyo
-${PYSITELIB}/kombu/tests/utils.py
-${PYSITELIB}/kombu/tests/utils.pyc
-${PYSITELIB}/kombu/tests/utils.pyo
+${PYSITELIB}/kombu/tests/utils/__init__.py
+${PYSITELIB}/kombu/tests/utils/__init__.pyc
+${PYSITELIB}/kombu/tests/utils/__init__.pyo
+${PYSITELIB}/kombu/tests/utils/test_amq_manager.py
+${PYSITELIB}/kombu/tests/utils/test_amq_manager.pyc
+${PYSITELIB}/kombu/tests/utils/test_amq_manager.pyo
+${PYSITELIB}/kombu/tests/utils/test_debug.py
+${PYSITELIB}/kombu/tests/utils/test_debug.pyc
+${PYSITELIB}/kombu/tests/utils/test_debug.pyo
+${PYSITELIB}/kombu/tests/utils/test_encoding.py
+${PYSITELIB}/kombu/tests/utils/test_encoding.pyc
+${PYSITELIB}/kombu/tests/utils/test_encoding.pyo
+${PYSITELIB}/kombu/tests/utils/test_functional.py
+${PYSITELIB}/kombu/tests/utils/test_functional.pyc
+${PYSITELIB}/kombu/tests/utils/test_functional.pyo
+${PYSITELIB}/kombu/tests/utils/test_utils.py
+${PYSITELIB}/kombu/tests/utils/test_utils.pyc
+${PYSITELIB}/kombu/tests/utils/test_utils.pyo
+${PYSITELIB}/kombu/transport/SLMQ.py
+${PYSITELIB}/kombu/transport/SLMQ.pyc
+${PYSITELIB}/kombu/transport/SLMQ.pyo
 ${PYSITELIB}/kombu/transport/SQS.py
 ${PYSITELIB}/kombu/transport/SQS.pyc
 ${PYSITELIB}/kombu/transport/SQS.pyo
@@ -221,6 +257,9 @@ ${PYSITELIB}/kombu/transport/mongodb.pyo
 ${PYSITELIB}/kombu/transport/pyamqp.py
 ${PYSITELIB}/kombu/transport/pyamqp.pyc
 ${PYSITELIB}/kombu/transport/pyamqp.pyo
+${PYSITELIB}/kombu/transport/pyro.py
+${PYSITELIB}/kombu/transport/pyro.pyc
+${PYSITELIB}/kombu/transport/pyro.pyo
 ${PYSITELIB}/kombu/transport/redis.py
 ${PYSITELIB}/kombu/transport/redis.pyc
 ${PYSITELIB}/kombu/transport/redis.pyo
@@ -263,9 +302,6 @@ ${PYSITELIB}/kombu/utils/encoding.pyo
 ${PYSITELIB}/kombu/utils/eventio.py
 ${PYSITELIB}/kombu/utils/eventio.pyc
 ${PYSITELIB}/kombu/utils/eventio.pyo
-${PYSITELIB}/kombu/utils/finalize.py
-${PYSITELIB}/kombu/utils/finalize.pyc
-${PYSITELIB}/kombu/utils/finalize.pyo
 ${PYSITELIB}/kombu/utils/functional.py
 ${PYSITELIB}/kombu/utils/functional.pyc
 ${PYSITELIB}/kombu/utils/functional.pyo
diff --git a/net/py-kombu/distinfo b/net/py-kombu/distinfo
index 0b3526b099a..b49f0f7e27e 100644
--- a/net/py-kombu/distinfo
+++ b/net/py-kombu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2013/07/02 11:05:21 rodent Exp $
+$NetBSD: distinfo,v 1.2 2013/12/31 14:12:17 rodent Exp $
 
-SHA1 (kombu-2.5.12.tar.gz) = 92f72efe29a738e0ea34288ec306165357275e5f
-RMD160 (kombu-2.5.12.tar.gz) = 012da143f3b5804f80fc3bd18d80cb6d8a9a7680
-Size (kombu-2.5.12.tar.gz) = 306807 bytes
+SHA1 (kombu-3.0.8.tar.gz) = 485e1bf9dd34a249895f256ee92e6f7294ad2d22
+RMD160 (kombu-3.0.8.tar.gz) = 529c9349f1a2e28bc270bd36e0c803c3231fd583
+Size (kombu-3.0.8.tar.gz) = 335226 bytes