--- a/components/logilab-common/logilab-common.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/logilab-common/logilab-common.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -35,271 +35,16 @@
     value=PSARC/2009/298
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/logilab
-dir path=usr/lib/python2.6/vendor-packages/logilab/common
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdir
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/ureports
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man3
-file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py pkg.tmp.autopyc=false
-file path=usr/lib/python2.6/vendor-packages/logilab/common/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/__pkginfo__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/adbh.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/astutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/bind.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/cache.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/changelog.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/clcommands.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/cli.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/compat.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/configuration.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/contexts.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/daemon.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/date.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/db.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/debugger.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/decorators.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/deprecation.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/fileutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/graph.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/html.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/interface.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/logger.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/logging_ext.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/logservice.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/modutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/monclient.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/monserver.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/optik_ext.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/optparser.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/patricia.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/pdf_ext.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/proc.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/pytest.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/shellutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/sphinxutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/sqlgen.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/table.py owner=root
-file path=usr/lib/python2.6/vendor-packages/logilab/common/tasksqueue.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/ChangeLog
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.egg
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.zip
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/NOTHING
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/README
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/coin
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/toto.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/NOTHING
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/README
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdir/toto.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo/Hello
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/foo.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module2.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/newlines.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/noendingnewline.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/nonregr.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/normal_file.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/spam.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub/doc.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub/momo.py pkg.tmp.autopyc=false
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test.ini
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test1.msg
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test2.msg
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/write_protected_file.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/foo.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module2.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/newlines.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/noendingnewline.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/nonregr.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/normal_file.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/NOTHING
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/README
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir/coin
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir/toto.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/NOTHING
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/README
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir/coin
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir/toto.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/spam.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub/doc.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub/momo.py pkg.tmp.autopyc=false
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/NOTHING
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/README
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/coin
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/toto.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/test.ini
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/test1.msg
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/test2.msg
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/write_protected_file.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/foomod.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_adbh.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_bind.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_cache.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_changelog.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_compat.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_configuration.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_date.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_db.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_decorators.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_fileutils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_graph.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_interface.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_logger.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_modutils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_patricia.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_pytest.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_shellutils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_table.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_taskqueue.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_testlib.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_textutils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_tree.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_umessage.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_html.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_text.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/utils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/testlib.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/textutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/tree.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/twisted_distutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/umessage.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/nodes.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/vcgutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/visitor.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/xmlrpcutils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6-nspkg.pth
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/namespace_packages.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/top_level.txt
 file logilab-common.3 path=usr/share/man/man3/logilab-common.3
 license logilab-common.license license=GPLv2
 
-# pkgdepend should have picked up the dependency on /library/python-2/python-gnome-libs-26;
-# this explicit depend action can be removed if pkgdepend is fixed later
-depend fmri=__TBD \
-    pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/CORBA.py \
-    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py \
-    type=require
+depend fmri=library/python-2/logilab-common-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/logilab-common-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional