diff -r 097063f324c0 -r 4b1def16fe9b components/python/saharaclient/saharaclient-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/saharaclient/saharaclient-PYVER.p5m	Mon Apr 20 12:35:51 2015 -0700
@@ -0,0 +1,123 @@
+#
+# 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, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/saharaclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python and command-line clients for the OpenStack Data Processing API"
+set name=pkg.description \
+    value="A client for the OpenStack Data Processing API. There's a Python API (the 'saharaclient' module), and a command-line script ('sahara'). Each implements 100% of the OpenStack Data Processing API."
+set name=com.oracle.info.description \
+    value="saharaclient, the Python bindings to the OpenStack Data Processing API"
+set name=com.oracle.info.tpno value=$(TPNO)
+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/2015/066
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+link path=usr/bin/sahara target=sahara-$(PYVER) mediator=python \
+    mediator-version=$(PYVER)
+file path=usr/bin/sahara-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/python_saharaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/python_saharaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_saharaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_saharaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_saharaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_saharaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_saharaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/cluster_templates.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/clusters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/data_sources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/helpers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/httpclient.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/images.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/job_binaries.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/job_binary_internals.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/job_executions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/jobs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/node_group_templates.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/parameters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/plugins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/api/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/apiclient/fake_client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/cliutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/gettextutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/importutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/strutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/openstack/common/uuidutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/saharaclient/version.py
+#
+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-2/simplejson-$(PYV)
+
+# 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 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-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 the saharaclient package
+depend type=require \
+    fmri=library/python/saharaclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# 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-2/stevedore-$(PYV)