diff -r 097063f324c0 -r 4b1def16fe9b components/python/keystoneclient/keystoneclient-PYVER.p5m
--- a/components/python/keystoneclient/keystoneclient-PYVER.p5m	Thu Apr 16 01:36:32 2015 -0700
+++ b/components/python/keystoneclient/keystoneclient-PYVER.p5m	Mon Apr 20 12:35:51 2015 -0700
@@ -20,20 +20,18 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, 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/keystoneclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
-    value="Python and command-line clients for the OpenStack Keystone API"
+    value="Python and command-line clients for the OpenStack Identity API"
 set name=pkg.description \
     value="A client for the OpenStack Identity API, implemented by Keystone. There's a Python API (the 'keystoneclient' module), and a command-line script ('keystone')."
 set name=com.oracle.info.description \
     value="keystoneclient, the Python bindings to the OpenStack Identity API"
-set name=com.oracle.info.tpno value=17870
+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" \
@@ -43,17 +41,26 @@
 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/keystone target=keystone-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
 file path=usr/bin/keystone-$(PYVER)
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/_discover.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/access.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/adapter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/apiclient/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/apiclient/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/cli.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/conf.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/generic/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/generic/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/generic/password.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/generic/token.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/v2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/identity/v3.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/auth/token_endpoint.py
@@ -63,39 +70,43 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/common/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/common/cms.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/auth/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/auth/v3/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/auth/v3/saml2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/bootstrap/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/bootstrap/shell.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/ec2/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/ec2/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/revoke/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/contrib/revoke/model.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/discover.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/fixture/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/fixture/discovery.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/fixture/exception.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/fixture/v2.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/fixture/v3.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/generic/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/generic/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/generic/shell.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/httpclient.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/middleware/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/middleware/auth_token.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/middleware/memcache_crypt.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/middleware/s3_token.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/_i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/apiclient/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/apiclient/auth.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/apiclient/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/apiclient/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/apiclient/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/apiclient/fake_client.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/fixture/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/fixture/config.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/gettextutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/importutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/jsonutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/apiclient/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/memorycache.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/strutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/timeutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/openstack/common/uuidutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/service_catalog.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/session.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/shell.py
@@ -104,6 +115,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v2_0/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v2_0/ec2.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v2_0/endpoints.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v2_0/extensions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v2_0/roles.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v2_0/services.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v2_0/shell.py
@@ -114,10 +126,22 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/endpoint_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/endpoint_policy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/domains.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/identity_providers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/mappings.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/projects.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/federation/protocols.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/oauth1/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/oauth1/access_tokens.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/oauth1/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/oauth1/consumers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/oauth1/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/oauth1/request_tokens.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/oauth1/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/contrib/trusts.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/credentials.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/domains.py
@@ -125,26 +149,39 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/groups.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/policies.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/projects.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/regions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/role_assignments.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/roles.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/services.py
+file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/tokens.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystoneclient/v3/users.py
 file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_keystoneclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
 license keystoneclient.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-2/anyjson-$(PYV)
-
 # force a group dependency on the optional eventlet; pkgdepend work is needed to
 # flush this out.
 depend type=group fmri=library/python-2/eventlet-$(PYV)
 
+# force a group dependency on the optional m2crypto; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python-2/m2crypto-$(PYV)
+
+# force a group dependency on the optional oauthlib; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/oauthlib-$(PYV)
+
+# force a group dependency on the optional python-memcache; pkgdepend work is
+# needed to flush this out.
+depend type=group fmri=library/python/python-memcached-$(PYV)
+
 # 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)
@@ -152,36 +189,46 @@
 # 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 the keystoneclient package
+depend type=require \
+    fmri=library/python/keystoneclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/lxml-$(PYV)
 
 # force a dependency on netaddr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/netaddr-$(PYV)
 
+# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.config-$(PYV)
+
+# force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.i18n-$(PYV)
+
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush
+# this out.
+depend type=require fmri=library/python/oslo.serialization-$(PYV)
+
+# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.utils-$(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 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/six-$(PYV)
+
 # force a dependency on stevedore; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/stevedore-$(PYV)
 
 # force a dependency on webob; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python-2/webob-$(PYV)
-
-# 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 the keystoneclient package
-depend type=require \
-    fmri=library/python/keystoneclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/oslo.config-$(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 six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/six-$(PYV)