diff -r 3bcf7d43558b -r 5e73a3a3f66a components/python/novaclient/novaclient-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/novaclient/novaclient-PYVER.p5m	Mon Mar 31 16:44:02 2014 -0700
@@ -0,0 +1,151 @@
+#
+# 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.
+#
+
+# argparse is part of python 2.7, but separate in 2.6
+<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+set name=pkg.fmri \
+    value=pkg:/library/python/novaclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python and command-line clients for the OpenStack Nova API"
+set name=pkg.description \
+    value="A client for the OpenStack Compute API. There's a Python API (the 'novaclient' module) and a command-line script ('nova'). Each implements 100% of the OpenStack Compute API."
+set name=com.oracle.info.description \
+    value="novaclient, the Python bindings to the OpenStack Compute API"
+set name=com.oracle.info.tpno value=16352
+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/007
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/nova target=nova-$(PYVER) mediator=python \
+    mediator-version=$(PYVER)
+file path=usr/bin/nova-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/auth_plugin.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/crypto.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/extension.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/gettextutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/py3kcompat/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/py3kcompat/urlutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/strutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/timeutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/uuidutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/service_catalog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/agents.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/aggregates.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/availability_zones.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/certs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/cloudpipe.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/assisted_volume_snapshots.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/baremetal.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/cells.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/deferred_delete.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/host_evacuate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/host_servers_migrate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/instance_action.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/list_extensions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/metadata_extensions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/migrations.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/tenant_networks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/coverage_ext.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/fixed_ips.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/flavor_access.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/flavors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ip_dns.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ip_pools.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ips.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ips_bulk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/fping.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/hosts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/hypervisors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/images.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/keypairs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/limits.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/networks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/quota_classes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/quotas.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/security_group_rules.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/security_groups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/servers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/services.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/usage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/virtual_interfaces.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/volume_snapshots.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/volume_types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/volumes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+license novaclient.license license="Apache v2.0"
+
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/argparse-$(PYV)
+
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/babel-$(PYV)
+
+# force a dependency on iso8601; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/iso8601-$(PYV)
+
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/pbr-$(PYV)
+
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/requests-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/setuptools-$(PYV)
+
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/six-$(PYV)
+
+# force a dependency on the novaclient package
+depend type=require \
+    fmri=library/python/novaclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)