--- a/components/python/cliff/cliff-PYVER.p5m	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/python/cliff/cliff-PYVER.p5m	Tue Apr 07 13:31:20 2015 -0700
@@ -18,12 +18,11 @@
 #
 # CDDL HEADER END
 #
+
+#
 # 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/argparse-27 -> drop>
-#
 set name=pkg.fmri \
     value=pkg:/library/python/cliff-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Command Line Interface Formulation Framework"
@@ -42,7 +41,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
@@ -50,18 +48,24 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/app.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/command.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/commandmanager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cliff/complete.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/display.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/commaseparated.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/shell.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cliff/formatters/value.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/help.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/interactive.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/lister.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cliff/show.py
 license cliff.license license="Apache v2.0, MIT"
 
+# force a group dependency on the optional prettytable; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/prettytable-$(PYV)
+
 # force the rename with an optional dependency on the old name
 depend type=optional \
     fmri=library/python-2/cliff-$(PYV)@1.4.5,5.11-0.175.3.0.0.16.0
@@ -80,5 +84,17 @@
 # force a dependency on cmd2; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/cmd2-$(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 pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
+# force a dependency on pyparsing; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyparsing-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/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/stevedore-$(PYV)