--- a/components/python/kombu/kombu-PYVER.p5m Thu Apr 16 01:36:32 2015 -0700
+++ b/components/python/kombu/kombu-PYVER.p5m Mon Apr 20 12:35:51 2015 -0700
@@ -18,23 +18,20 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
-# importlib is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/importlib-27 -> drop>
-# ordereddict is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/ordereddict-27 -> drop>
-# The test related file actions have not been included because they will fail
-# in dependency generation until the various test related modules that they
-# need are also provided.
+# pyyaml is only delivered for python 2.6
+<transform depend type=group fmri=library/python-2/pyyaml-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python-2/kombu-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Messaging framework for Python"
set name=pkg.description \
value="The aim of Kombu is to make messaging in Python as easy as possible by providing an idiomatic high-level interface for the AMQ protocol (AMQP), and also provide proven and tested solutions to common messaging problems."
set name=com.oracle.info.description value="the Python kombu module"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -42,6 +39,7 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/187
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
file path=usr/lib/python$(PYVER)/vendor-packages/kombu-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/kombu-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/kombu-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -50,6 +48,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/kombu-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/abstract.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/async/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/async/hub.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/async/semaphore.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/async/timer.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/clocks.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/common.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/compat.py
@@ -57,7 +59,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/connection.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/entity.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/five.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/log.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/message.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/messaging.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/mixins.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/pidbox.py
@@ -65,6 +69,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/serialization.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/simple.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/syn.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/SLMQ.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/SQS.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/amqplib.py
@@ -84,6 +89,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/memory.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/mongodb.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/pyamqp.py
+file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/pyro.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/redis.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/sqlalchemy/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/transport/sqlalchemy/models.py
@@ -98,13 +104,45 @@
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/debug.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/encoding.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/eventio.py
-file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/finalize.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/functional.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/limits.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/text.py
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/url.py
+#
license kombu.license license=BSD
+# force a group dependency on the optional anyjson; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python-2/anyjson-$(PYV)
+
+# force a group dependency on the optional boto; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python-2/boto-$(PYV)
+
+# force a group dependency on the optional django; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/django-$(PYV)
+
+# force a group dependency on the optional librabbitmq; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python-2/librabbitmq-$(PYV)
+
+# force a group dependency on the optional pytz; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python-2/pytz-$(PYV)
+
+# force a group dependency on the optional pyyaml; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python-2/pyyaml-$(PYV)
+
+# force a group dependency on the optional setuptools; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python-2/setuptools-$(PYV)
+
+# force a group dependency on the optional sqlalchemy; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python-2/sqlalchemy-$(PYV)
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
@@ -112,15 +150,6 @@
# force a dependency on amqp; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/amqp-$(PYV)
-# force a dependency on anyjson; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/anyjson-$(PYV)
-
-# force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/boto-$(PYV)
-
-# force a dependency on eventlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/eventlet-$(PYV)
-
# force a dependency on importlib; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/importlib-$(PYV)
@@ -128,9 +157,6 @@
depend type=require \
fmri=library/python-2/kombu@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-# force a dependency on librabbitmq; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/librabbitmq-$(PYV)
-
# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/ordereddict-$(PYV)