# HG changeset patch
# User david.comay@oracle.com
# Date 1402003631 25200
# Node ID 0603d23a9e17ea516093b27a3ee2d640744bb094
# Parent  185320167a36a8e42e59eabb13bbc5ea5aa79508
18802343 Request to integrate jinja2 2.7.2
18855562 Request to integrate heatclient 0.2.9
18855610 Request to integrate troveclient 0.1.4
18855621 Request to integrate ceilometerclient 1.0.10
18855628 Request to integrate dogpile.core 0.4.1
18855636 Request to integrate dogpile.cache 0.5.3
18855655 Request to integrate dnspython 1.11.1
18855661 Request to integrate python-memcached 1.53
PSARC 2014/163 OpenStack client for Heat (Orchestration Service)
PSARC 2014/165 OpenStack client for Trove (Database as a Service)
PSARC 2014/177 Dogpile
PSARC 2014/179 Jinja2
PSARC 2014/185 dnspython
PSARC 2014/186 python-memcached
PSARC 2014/187 OpenStack client for Ceilometer (Telemetry Service)

diff -r 185320167a36 -r 0603d23a9e17 components/python/ceilometerclient/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ceilometerclient/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		python-ceilometerclient
+COMPONENT_VERSION=	1.0.10
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:bbe29a6c85af3ec0bcbb7df1863bb3c3c620fa0423c67f25bd089e0ab7b33059
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	http://launchpad.net/python-cinderclient
+COMPONENT_BUGDB=	service/ceilometer
+
+# Depends on keystoneclient which is not Python 3 ready. 
+PYTHON_VERSIONS=	2.7 2.6
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_POST_INSTALL_ACTION = \
+	(cd $(PROTO_DIR)/usr/bin ; \
+	 $(MV) -f ceilometer ceilometer-$(PYTHON_VERSION))
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# tests require:
+# hacking, discover, fixtures, python-subunit, sphinx, testrepository
+# and testtools, some of which have not been integrated.
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/ceilometerclient/ceilometerclient-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ceilometerclient/ceilometerclient-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,124 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/ceilometerclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python and command-line clients for the OpenStack Ceilomter API"
+set name=pkg.description \
+    value="A client for the OpenStack Telemetry API. There's a Python API (the 'ceilometerclient' module), and a command-line script ('ceilometer'). Each implements 100% of the OpenStack Telemetry API."
+set name=com.oracle.info.description \
+    value="ceilometerclient, the Python bindings to the OpenStack Telemetry API"
+set name=com.oracle.info.tpno value=17306
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="OpenStack <openstack-dev@lists.openstack.org>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/XXX
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/ceilometer target=ceilometer-$(PYVER) mediator=python \
+    mediator-version=$(PYVER)
+file path=usr/bin/ceilometer-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/common/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/common/http.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/common/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/exc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/apiclient/fake_client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/cliutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/gettextutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/importutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/openstack/common/strutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/meters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v1/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/alarms.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/event_types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/events.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/meters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/options.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/query.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/samples.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/statistics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/trait_descriptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/ceilometerclient/v2/traits.py
+file path=usr/lib/python$(PYVER)/vendor-packages/python_ceilometerclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/python_ceilometerclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_ceilometerclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_ceilometerclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_ceilometerclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_ceilometerclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_ceilometerclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+license LICENSE license="Apache v2.0"
+
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/simplejson-$(PYV)
+
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/argparse-$(PYV)
+
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
+
+# force a dependency on the ceilometerclient package
+depend type=require \
+    fmri=library/python/ceilometerclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on keystoneclient; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/keystoneclient-$(PYV)
+
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)
diff -r 185320167a36 -r 0603d23a9e17 components/python/ceilometerclient/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ceilometerclient/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,2 @@
+runtime/python-26
+runtime/python-27
diff -r 185320167a36 -r 0603d23a9e17 components/python/dnspython/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dnspython/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		dnspython
+COMPONENT_VERSION=	1.11.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).zip
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:fd0fc7a656679a6fd1f83d980fc05776c76e70d66f6ee2aab12a3558fa10a206
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/dnspython
+COMPONENT_BUGDB=	python-mod/dnspython
+
+# dnspython is not Python3 ready.  dnspython3 should be used for
+# Python3
+PYTHON_VERSIONS=	2.7 2.6
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_DIR=	$(SOURCE_DIR)/tests
+COMPONENT_TEST_CMD=	$(GMAKE)
+COMPONENT_TEST_ARGS=
+COMPONENT_TEST_ENV=	PYTHONPATH="../"
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/dnspython/dnspython-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dnspython/dnspython-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,127 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/dnspython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="dnspython is a DNS toolkit for Python"
+set name=pkg.description \
+    value="dnspython provides both high and low level access to DNS. The high level classes perform queries for data of a given name, type, and class, and return an answer set. The low level classes allow direct manipulation of DNS zones, messages, names, and records."
+set name=com.oracle.info.description value="the Python dnspython module"
+set name=com.oracle.info.tpno value=17630
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="dnspython-dev <dnspython-dev@googlegroups.com>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/XXX
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/dnssec.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/e164.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/edns.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/entropy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/exception.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/flags.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/grange.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/hash.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/inet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/ipv4.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/ipv6.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/message.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/name.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/namedict.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/node.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/opcode.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/query.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rcode.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdataclass.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdataset.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdatatype.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/AFSDB.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/CERT.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/CNAME.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/DLV.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/DNAME.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/DNSKEY.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/DS.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/GPOS.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/HINFO.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/HIP.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/ISDN.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/LOC.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/MX.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/NS.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/NSEC.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/NSEC3.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/NSEC3PARAM.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/PTR.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/RP.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/RRSIG.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/RT.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/SOA.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/SPF.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/SSHFP.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/TLSA.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/TXT.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/X25.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/ANY/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/A.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/AAAA.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/APL.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/DHCID.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/IPSECKEY.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/KX.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/NAPTR.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/NSAP.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/NSAP_PTR.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/PX.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/SRV.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/WKS.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/IN/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/dsbase.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/mxbase.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/nsbase.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rdtypes/txtbase.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/renderer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/resolver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/reversename.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/rrset.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/set.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/tokenizer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/tsig.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/tsigkeyring.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/ttl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/update.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/wiredata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dns/zone.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dnspython-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+license LICENSE license=BSD-like
+
+# force a dependency on the dnspython package
+depend type=require \
+    fmri=library/python/dnspython@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r 185320167a36 -r 0603d23a9e17 components/python/dnspython/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dnspython/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,2 @@
+runtime/python-26
+runtime/python-27
diff -r 185320167a36 -r 0603d23a9e17 components/python/dogpile.cache/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dogpile.cache/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		dogpile.cache
+COMPONENT_VERSION=	0.5.3
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:2fe8c1a329830a9ada865a69cc5ebb2c2e6f2dbda3a6d4dbf5155c7d5194344b
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://bitbucket.org/zzzeek/dogpile.cache
+COMPONENT_BUGDB=	python-mod/dogpile.cache
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# tests require dogpile.core.  Revisit this when dogpile.core is part
+# of the CBE
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/dogpile.cache/dogpile.cache-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dogpile.cache/dogpile.cache-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,79 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/dogpile.cache-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A 'dogpile lock' based caching API"
+set name=pkg.description \
+    value="dogpile.cache is a caching API built around the concept of a 'dogpile lock', which allows continued access to an expiring data value while a single thread generates a new value. dogpile.cache builds on the 'dogpile.core' locking system, which implements the idea of 'allow one creator to write while others read' in the abstract."
+set name=com.oracle.info.description value="the Python dogpile.cache module"
+set name=com.oracle.info.tpno value=17712
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Mike Bayer https://bitbucket.org/zzzeek"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/177
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.cache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/backends/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/backends/file.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/backends/memcached.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/backends/memory.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/backends/redis.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/exception.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/plugins/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/plugins/mako_cache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/proxy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/region.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/cache/util.py
+license LICENSE license=BSD
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the dogpile.cache package
+depend type=require \
+    fmri=library/python/dogpile.cache@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on dogpile.core; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/dogpile.core-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
diff -r 185320167a36 -r 0603d23a9e17 components/python/dogpile.cache/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dogpile.cache/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,3 @@
+runtime/python-26
+runtime/python-27
+runtime/python-34
diff -r 185320167a36 -r 0603d23a9e17 components/python/dogpile.core/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dogpile.core/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		dogpile.core
+COMPONENT_VERSION=	0.4.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://bitbucket.org/zzzeek/dogpile.core
+COMPONENT_BUGDB=	python-mod/dogpile.core
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_CMD=	$(PYTHON)
+COMPONENT_TEST_ARGS=	setup.py test
+COMPONENT_TEST_DIR=	$(SOURCE_DIR)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# tests exit with a TypeError but they seem to complete ok
+test:		$(TEST_NO_ARCH)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/dogpile.core/dogpile.core-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dogpile.core/dogpile.core-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/dogpile.core-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A 'dogpile lock' based locking API"
+set name=pkg.description \
+    value="dogpile.core implements 'dogpile locks' which allows a single thread to generate an expensive resource while other threads use the 'old' value, until the 'new' value is ready."
+set name=com.oracle.info.description value="the Python dogpile.core module"
+set name=com.oracle.info.tpno value=17259
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Mike Bayer https://bitbucket.org/zzzeek"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/177
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.core-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.core-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.core-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.core-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.core-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.core-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile.core-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/core/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/core/dogpile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/core/legacy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/core/nameregistry.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/core/readwrite_lock.py
+file path=usr/lib/python$(PYVER)/vendor-packages/dogpile/core/util.py
+license LICENSE license=BSD
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the dogpile.core package
+depend type=require \
+    fmri=library/python/dogpile.core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r 185320167a36 -r 0603d23a9e17 components/python/dogpile.core/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/dogpile.core/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,3 @@
+runtime/python-26
+runtime/python-27
+runtime/python-34
diff -r 185320167a36 -r 0603d23a9e17 components/python/heatclient/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/heatclient/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		python-heatclient
+COMPONENT_VERSION=	0.2.9
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:8cc6d99f86529633b8b5d99417358fd7c023223572f190ae3e1da09ff435420f
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	http://launchpad.net/python-heatclient
+COMPONENT_BUGDB=	service/heat
+
+# Depends on pyyaml which is not Python 3 ready. 
+PYTHON_VERSIONS=	2.7 2.6
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_POST_INSTALL_ACTION = \
+	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f heat heat-$(PYTHON_VERSION))
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# tests require:
+# hacking, discover, fixtures, sphinx, testrepository, testtools,
+# testscenarios, and mox3 some of which have not been integrated.
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/heatclient/heatclient-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/heatclient/heatclient-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,124 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+# pyyaml is only delivered for python 2.6
+<transform depend type=require fmri=library/python-2/pyyaml-27 -> drop>
+set name=pkg.fmri \
+    value=pkg:/library/python/heatclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python and command-line clients for the OpenStack Heat API"
+set name=pkg.description \
+    value="A client for the OpenStack Orchestration API. There's a Python API (the 'heatclient' module), and a command-line script ('heat'). Each implements 100% of the OpenStack Orchestration API."
+set name=com.oracle.info.description \
+    value="heatclient, the Python bindings to the OpenStack Orchestration API"
+set name=com.oracle.info.tpno value=17303
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="OpenStack <openstack-dev@lists.openstack.org>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/163
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/heat target=heat-$(PYVER) mediator=python \
+    mediator-version=$(PYVER)
+file path=usr/bin/heat-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/common/environment_format.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/common/http.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/common/template_format.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/common/template_utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/common/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/exc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/apiclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/cliutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/gettextutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/importutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/jsonutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/strutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/timeutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/openstack/common/uuidutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/actions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/build_info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/events.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/resource_types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/software_configs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/software_deployments.py
+file path=usr/lib/python$(PYVER)/vendor-packages/heatclient/v1/stacks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_heatclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+license LICENSE license="Apache v2.0"
+
+# force a group dependency on the optional anyjson; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/anyjson-$(PYV)
+
+# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/pyyaml-$(PYV)
+
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/argparse-$(PYV)
+
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
+
+# force a dependency on the heatclient package
+depend type=require \
+    fmri=library/python/heatclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on iso8601; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/iso8601-$(PYV)
+
+# force a dependency on keystoneclient; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/keystoneclient-$(PYV)
+
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)
diff -r 185320167a36 -r 0603d23a9e17 components/python/heatclient/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/heatclient/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,2 @@
+runtime/python-26
+runtime/python-27
diff -r 185320167a36 -r 0603d23a9e17 components/python/jinja2/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jinja2/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		Jinja2
+COMPONENT_VERSION=	2.7.2
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:310a35fbccac3af13ebf927297f871ac656b9da1d248b1fe6765affa71b53235
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	http://jinja.pocoo.org/
+COMPONENT_BUGDB=	python-mod/jinja2
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_ARGS=	run-tests.py
+COMPONENT_TEST_DIR=	$(SOURCE_DIR)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/jinja2/jinja2-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jinja2/jinja2-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/jinja2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Full featured template engine for Python"
+set name=pkg.description \
+    value="Jinja2 is one of the most used template engines for Python. It is inspired by Django's templating system but extends it with an expressive language that gives template authors a more powerful set of tools. On top of that it adds sandboxed execution and optional automatic escaping for applications where security is important. It is internally based on Unicode and runs on a wide range of Python versions."
+set name=com.oracle.info.description \
+    value="Jinja2, the template engine for Python"
+set name=com.oracle.info.tpno value=17235
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Armin Ronacher <armin.ronacher@active-4.com>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/179
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/Jinja2-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/Jinja2-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/Jinja2-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/Jinja2-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/Jinja2-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/Jinja2-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/Jinja2-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/_compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/_stringdefs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/bccache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/compiler.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/constants.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/debug.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/defaults.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/environment.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/ext.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/filters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/lexer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/loaders.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/meta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/optimizer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/parser.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/runtime.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/sandbox.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jinja2/visitor.py
+#
+license LICENSE license=BSD
+
+# force a group dependency on the optional babel; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/babel-$(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
+
+# force a dependency on the jinja2 package
+depend type=require \
+    fmri=library/python/jinja2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on markupsafe; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/markupsafe-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
diff -r 185320167a36 -r 0603d23a9e17 components/python/jinja2/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jinja2/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,3 @@
+runtime/python-26
+runtime/python-27
+runtime/python-34
diff -r 185320167a36 -r 0603d23a9e17 components/python/python-memcached/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-memcached/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,67 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		python-memcached
+COMPONENT_VERSION=	1.53
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:7ae92b948d9a53d8d522fed1551eeb191f25879e34d533a59e7736ffaf2a7c14
+COMPONENT_ARCHIVE_URL=	https://github.com/linsomniac/$(COMPONENT_NAME)/archive/release-$(COMPONENT_VERSION).tar.gz
+COMPONENT_PROJECT_URL=	https://github.com/linsomniac/python-memcached
+COMPONENT_BUGDB=	python-mod/memcached
+
+# Syntax errors: not Python 3 ready
+PYTHON_VERSIONS=	2.7 2.6
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_POST_UNPACK_ACTION = \
+	$(MV) python-memcached-release-1.53 \
+	    $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+
+COMPONENT_TEST_ARGS=	test
+COMPONENT_TEST_CMD=	$(MAKE)
+COMPONENT_TEST_DIR=	$(COMPONENT_SRC)
+# "make test" expects GNU Make as make(1)
+COMPONENT_TEST_ENV=	PATH=/usr/gnu/bin:/usr/bin
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# tests require local, online svc:/application/database/memcached:default
+test:		$(TEST_NO_ARCH)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/python-memcached/python-memcached-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-memcached/python-memcached-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/python-memcached-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A Python memcached client library"
+set name=pkg.description \
+    value="The Python memcache module provides an interface to the memcached(1M) memory cache daemon. It is the client side software which allows storing values in one or more, possibly remote, memcached servers."
+set name=com.oracle.info.description value="the Python memcached client library"
+set name=com.oracle.info.tpno value=17839
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Sean Reifschneider <jafo@tummy.com>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/186
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/memcache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/python_memcached-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/python_memcached-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_memcached-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_memcached-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
+license PSF.LICENSE license=PSVv2
+
+# force a dependency on the python-memcached package
+depend type=require \
+    fmri=library/python/python-memcached@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r 185320167a36 -r 0603d23a9e17 components/python/python-memcached/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-memcached/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,2 @@
+runtime/python-26
+runtime/python-27
diff -r 185320167a36 -r 0603d23a9e17 components/python/troveclient/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/troveclient/Makefile	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,63 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		python-troveclient
+COMPONENT_VERSION=	0.1.4
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:745057a1a1dd2a58f3e638cf506f5b21a6bf8a42bf678adb17a58d6799a10141
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	http://launchpad.net/python-troveclient
+COMPONENT_BUGDB=	service/trove
+
+# Syntax errors: not Python 3 ready
+PYTHON_VERSIONS=        2.7 2.6
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_POST_INSTALL_ACTION = \
+	(cd $(PROTO_DIR)/usr/bin ; \
+	 $(MV) -f trove-cli trove-cli-$(PYTHON_VERSION) ; \
+	 $(MV) -f trove-mgmt-cli trove-mgmt-cli-$(PYTHON_VERSION))
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# tests require:
+# hacking, discover, sphinx, testrepository and testtools, 
+# some of which have not been integrated.
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r 185320167a36 -r 0603d23a9e17 components/python/troveclient/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/troveclient/resolve.deps	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,2 @@
+runtime/python-26
+runtime/python-27
diff -r 185320167a36 -r 0603d23a9e17 components/python/troveclient/troveclient-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/troveclient/troveclient-PYVER.p5m	Thu Jun 05 14:27:11 2014 -0700
@@ -0,0 +1,96 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/troveclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python and command-line clients for the OpenStack Trove API"
+set name=pkg.description \
+    value="A client for the OpenStack DBaaS API. There's a Python API (the 'troveclient' module), and a command-line script ('trove'). Each implements 100% of the OpenStack DBaaS API."
+set name=com.oracle.info.description \
+    value="troveclient, the Python bindings to the OpenStack DBaaS API"
+set name=com.oracle.info.tpno value=17305
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="OpenStack <openstack-dev@lists.openstack.org>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/165
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/trove-cli target=trove-cli-$(PYVER) mediator=python \
+    mediator-version=$(PYVER)
+file path=usr/bin/trove-cli-$(PYVER)
+link path=usr/bin/trove-mgmt-cli target=trove-mgmt-cli-$(PYVER) \
+    mediator=python mediator-version=$(PYVER)
+file path=usr/bin/trove-mgmt-cli-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/accounts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/backups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/cli.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/databases.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/diagnostics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/flavors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/hosts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/instances.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/limits.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/management.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/mcli.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/quota.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/root.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/security_groups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/storage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/users.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/versions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/xml.py
+license LICENSE license="Apache v2.0"
+
+# force a group dependency on simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/simplejson-$(PYV)
+
+# force a dependency on httplib2; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/httplib2-$(PYV)
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-$(PYV)
+
+# force a dependency on the troveclient package
+depend type=require \
+    fmri=library/python/troveclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)