7108059 Userland should have python2.7 version of its python modules
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Fri, 24 Feb 2012 13:30:24 -0800
changeset 706 6e61f0012046
parent 705 ea8fed4b5f65
child 707 5953149bd743
7108059 Userland should have python2.7 version of its python modules
components/git/Makefile
components/graphviz/Makefile
components/graphviz/graphviz-python-26.p5m
components/graphviz/graphviz-python-27.p5m
components/graphviz/graphviz.p5m
components/lcms/Makefile
components/lcms/lcms-py26.p5m
components/lcms/lcms-py27.p5m
components/lcms/lcms.p5m
components/libxml2/Makefile
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2-27.p5m
components/libxml2/libxml2.p5m
components/libxslt/Makefile
components/libxslt/libxsl-26.p5m
components/libxslt/libxsl-27.p5m
components/libxslt/libxslt.p5m
components/logilab-astng/logilab-astng-26.p5m
components/logilab-astng/logilab-astng-27.p5m
components/logilab-astng/logilab-astng.p5m
components/logilab-common/Makefile
components/logilab-common/logilab-common-26.p5m
components/logilab-common/logilab-common-27.p5m
components/logilab-common/logilab-common.p5m
components/mercurial/Makefile
components/mercurial/mercurial-26.p5m
components/mercurial/mercurial-27.p5m
components/mercurial/mercurial.p5m
components/meta-packages/history/SUNWpython-setuptools.p5m
components/meta-packages/history/SUNWpython26-setuptools.p5m
components/meta-packages/history/library%2Fpython-2%2Fsetuptools-24.p5m
components/pylint/pylint-26.p5m
components/pylint/pylint-27.p5m
components/pylint/pylint.p5m
components/python/cherrypy/cherrypy-26.p5m
components/python/cherrypy/cherrypy-27.p5m
components/python/cherrypy/cherrypy.p5m
components/python/coverage/Makefile
components/python/coverage/coverage-26.p5m
components/python/coverage/coverage.p5m
components/python/ldtp/ldtp-26.p5m
components/python/ldtp/ldtp-27.p5m
components/python/ldtp/ldtp.p5m
components/python/m2crypto/Makefile
components/python/m2crypto/m2crypto-26.p5m
components/python/m2crypto/m2crypto-27.p5m
components/python/m2crypto/m2crypto.p5m
components/python/mako/Makefile
components/python/mako/mako-26.p5m
components/python/mako/mako.p5m
components/python/ply/ply-26.p5m
components/python/ply/ply-27.p5m
components/python/ply/ply.p5m
components/python/pybonjour/pybonjour-26.p5m
components/python/pybonjour/pybonjour-27.p5m
components/python/pybonjour/pybonjour.p5m
components/python/pycups/Makefile
components/python/pycups/pycups-26.p5m
components/python/pycups/pycups-27.p5m
components/python/pycups/pycups.p5m
components/python/pycurl/Makefile
components/python/pycurl/pycurl-26.p5m
components/python/pycurl/pycurl-27.p5m
components/python/pycurl/pycurl.p5m
components/python/pylxml/Makefile
components/python/pylxml/pylxml-26.p5m
components/python/pylxml/pylxml-27.p5m
components/python/pylxml/pylxml.p5m
components/python/pyopenssl/Makefile
components/python/pyopenssl/pyopenssl-26.p5m
components/python/pyopenssl/pyopenssl-27.p5m
components/python/pyopenssl/pyopenssl.p5m
components/python/setuptools/Makefile
components/python/setuptools/setuptools-26.p5m
components/python/setuptools/setuptools-27.p5m
components/python/setuptools/setuptools.copyright
components/python/setuptools/setuptools.p5m
components/rdiff-backup/Makefile
make-rules/setup.py.mk
make-rules/shared-macros.mk
--- a/components/git/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/git/Makefile	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.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -44,7 +44,7 @@
 CONFIGURE_OPTIONS  +=	--without-openssl
 CONFIGURE_OPTIONS  +=	--libexecdir=/usr/lib
 CONFIGURE_OPTIONS  +=	--with-perl=$(PERL)
-CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON.32)
+CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON)
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 
 COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
--- a/components/graphviz/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/graphviz/Makefile	Fri Feb 24 13:30:24 2012 -0800
@@ -53,6 +53,7 @@
 CONFIGURE_OPTIONS +=	--without-included-ltdl
 CONFIGURE_OPTIONS +=	--enable-python=no
 CONFIGURE_OPTIONS +=	--enable-python26=yes
+CONFIGURE_OPTIONS +=	--enable-python27=yes
 CONFIGURE_OPTIONS +=	--x-libraries=$(CONFIGURE_LIBDIR.$(BITS))
 
 COMPONENT_BUILD_ARGS += 	GREP=/usr/bin/ggrep
@@ -63,6 +64,7 @@
 install:	$(INSTALL_32)
 	env LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib GVBINDIR=$(PROTO_DIR)/usr/lib/graphviz $(PROTO_DIR)/usr/bin/dot -c
 	$(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/graphviz/python26
+	$(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/graphviz/python27
 
 # The test infrastructure doesn't run in a VPATHed environment.
 COMPONENT_PRE_TEST_ACTION = \
--- a/components/graphviz/graphviz-python-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/graphviz/graphviz-python-26.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 volatile>
@@ -44,7 +44,5 @@
 link path=usr/lib/python2.6/vendor-packages/gv.py \
     target=../../graphviz/python26/gv.py
 
-depend fmri=runtime/python-26 type=require
-
 license COPYING license=EPL1.0
 license graphviz.license.extra license="Other Notices"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/graphviz/graphviz-python-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,52 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+set name=pkg.fmri \
+    value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python 2.7 bindings for Graphviz"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
+
+dir path=usr/lib/graphviz/python27
+file path=usr/lib/graphviz/python27/gv.py
+file path=usr/lib/graphviz/python27/libgv_python27.so
+link path=usr/lib/graphviz/python27/_gv.so target=libgv_python27.so
+link path=usr/lib/python2.7/vendor-packages/_gv.so \
+    target=../../graphviz/python27/libgv_python27.so
+link path=usr/lib/python2.7/vendor-packages/gv.py \
+    target=../../graphviz/python27/gv.py
+
+# force a dependency on the graphviz package
+depend fmri=__TBD pkg.debug.depend.file=libgraph.so.5 \
+       pkg.debug.depend.path=usr/lib type=require
+
+
+license COPYING license=EPL1.0
+license graphviz.license.extra license="Other Notices"
--- a/components/graphviz/graphviz.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/graphviz/graphviz.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 volatile>
@@ -461,8 +461,10 @@
     type=conditional predicate=runtime/perl-512
 depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
     type=conditional predicate=web/php-52
-depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
+depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     type=conditional predicate=runtime/python-26
+depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=conditional predicate=runtime/python-27
 depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
     type=conditional predicate=runtime/ruby-18
 depend fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
--- a/components/lcms/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/lcms/Makefile	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.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -73,11 +73,29 @@
     $(RM) -f $(SOURCE_DIR)/include/icc34.h ; \
     $(CP) -p include/icc34.h $(SOURCE_DIR)/include/ )
 
+# After we have configured, make a copy of the python bits so we
+# can build separate python 2.7 support.
+COMPONENT_POST_CONFIGURE_ACTION += ; (cd $(@D) ; cp -rp python python2.7)
+
+# After we have built/installed lcms, rebuild/install the python
+# support for python 2.7
+COMPONENT_POST_INSTALL_ACTION = \
+    (cd $(@D)/python2.7 ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) \
+                                PYTHON=$(PYTHON.2.7.$(BITS)) \
+                                PYTHON_VERSION=2.7 \
+                                LCMS_PYINCLUDE=/usr/include/python2.7 \
+                                LCMS_PYEXECDIR=$(PYTHON.2.7.VENDOR_PACKAGES) \
+                                LCMS_PYLIB=$(PYTHON.2.7.VENDOR_PACKAGES) \
+                                install)
+
 LINT_FLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
 
 build: $(BUILD_32_and_64)
 
 install: $(INSTALL_32_and_64)
+	$(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/python2.6/vendor-packages
+	$(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/python2.7/vendor-packages
+
 
 test: $(TEST_32_and_64)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/lcms-py26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,51 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="A small-footprint color management engine, with special focus on accuracy and performance"
+set name=pkg.summary value="The Little Color Management System"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/071
+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/64
+#
+file path=usr/lib/python2.6/vendor-packages/64/_lcms.so
+file path=usr/lib/python2.6/vendor-packages/_lcms.so
+file path=usr/lib/python2.6/vendor-packages/lcms.py
+#
+license lcms.license license=MIT
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/lcms-py27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,51 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="A small-footprint color management engine, with special focus on accuracy and performance"
+set name=pkg.summary value="The Little Color Management System"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/071
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
+#
+file path=usr/lib/python2.7/vendor-packages/64/_lcms.so
+file path=usr/lib/python2.7/vendor-packages/_lcms.so
+file path=usr/lib/python2.7/vendor-packages/lcms.py
+#
+license lcms.license license=MIT
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
--- a/components/lcms/lcms.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/lcms/lcms.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>
 set name=pkg.fmri \
@@ -42,9 +42,6 @@
 dir path=usr/lib/$(MACH64)
 dir path=usr/lib/$(MACH64)/pkgconfig
 dir path=usr/lib/pkgconfig
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/64
 dir path=usr/share
 dir path=usr/share/doc
 dir path=usr/share/doc/lcms
@@ -68,9 +65,6 @@
 file path=usr/lib/llib-llcms
 file path=usr/lib/llib-llcms.ln
 file path=usr/lib/pkgconfig/lcms.pc
-file path=usr/lib/python2.6/vendor-packages/64/_lcms.so
-file path=usr/lib/python2.6/vendor-packages/_lcms.so
-file path=usr/lib/python2.6/vendor-packages/lcms.py pkg.tmp.autopyc=false
 file path=usr/share/man/man1/icc2ps.1
 file path=usr/share/man/man1/icclink.1
 file samples/icctrans.1 path=usr/share/man/man1/icctrans.1
@@ -85,3 +79,10 @@
 link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
 link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
 
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/libxml2/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/libxml2/Makefile	Fri Feb 24 13:30:24 2012 -0800
@@ -53,11 +53,28 @@
 
 COMPONENT_TEST_TARGETS = tests
 
+# After we have configured, make a copy of the python bits so we
+# can build separate python 2.7 support.
+COMPONENT_POST_CONFIGURE_ACTION = (cd $(@D) ; cp -rp python python2.7)
+
+# After we have built/installed libxml2, build/install the python
+# support for python 2.7
+COMPONENT_POST_INSTALL_ACTION = \
+    (cd $(@D)/python2.7 ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) \
+                                PYTHON=$(PYTHON.2.7.$(BITS)) \
+                                PYTHON_VERSION=2.7 \
+                                PYTHON_INCLUDES=/usr/include/python2.7 \
+                                PYTHON_LIBS=$(PYTHON.2.7.VENDOR_PACKAGES) \
+                                PYTHON_SITE_PACKAGES=$(PYTHON.2.7.VENDOR_PACKAGES) \
+                                install)
+
+
 # common targets
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 	$(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/python2.6/vendor-packages
+	$(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/python2.7/vendor-packages
 
 test:		$(TEST_32_and_64)
 
--- a/components/libxml2/libxml2-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/libxml2/libxml2-26.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.
 #
 
 set name=pkg.fmri \
@@ -41,4 +41,3 @@
 file path=usr/lib/python2.6/vendor-packages/libxml2.py
 file path=usr/lib/python2.6/vendor-packages/libxml2mod.so
 license libxml2.license license="libxml license"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxml2/libxml2-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,43 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The XML library - Python 2.7 bindings"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/630
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
+file path=usr/lib/python2.7/vendor-packages/64/libxml2mod.so
+file path=usr/lib/python2.7/vendor-packages/drv_libxml2.py
+file path=usr/lib/python2.7/vendor-packages/libxml2.py
+file path=usr/lib/python2.7/vendor-packages/libxml2mod.so
+license libxml2.license license="libxml license"
--- a/components/libxml2/libxml2.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/libxml2/libxml2.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 committed>
@@ -123,3 +123,11 @@
 link path=usr/lib/libxml2.so target=./libxml2.so.2
 link path=usr/lib/libxml2.so.2 target=../../lib/libxml2.so.2
 link path=usr/lib/llib-lxml2.ln target=../../lib/llib-lxml2.ln
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/libxslt/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/libxslt/Makefile	Fri Feb 24 13:30:24 2012 -0800
@@ -61,11 +61,29 @@
 		    libtoolize --force --copy ; aclocal ; \
 		    automake --addmissing --copy ; autoconf)
 
+# After we have configured, make a copy of the python bits so we
+# can build separate python 2.7 support.
+COMPONENT_POST_CONFIGURE_ACTION = (cd $(@D) ; cp -rp python python2.7)
+
+# After we have built/installed libxslt, rebuild/install the python
+# support for python 2.7
+COMPONENT_POST_INSTALL_ACTION = \
+    (cd $(@D)/python2.7 ; $(GMAKE) $(COMPONENT_INSTALL_ARGS) \
+                                PYTHON=$(PYTHON.2.7.$(BITS)) \
+                                PYTHON_VERSION=2.7 \
+                                PYTHON_INCLUDES=/usr/include/python2.7 \
+                                PYTHON_LIBS=$(PYTHON.2.7.VENDOR_PACKAGES) \
+                                PYTHON_SITE_PACKAGES=$(PYTHON.2.7.VENDOR_PACKAGES) \
+                                install)
+
+
+
 # common targets
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 	$(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/python2.6/vendor-packages
+	$(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/python2.7/vendor-packages
 
 test:		$(TEST_32_and_64)
 
--- a/components/libxslt/libxsl-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/libxslt/libxsl-26.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.
 #
 
 set name=pkg.fmri \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/libxsl-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,42 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The XSLT library - Python 2.7 bindings"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2002/244
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
+file path=usr/lib/python2.7/vendor-packages/64/libxsltmod.so
+file path=usr/lib/python2.7/vendor-packages/libxslt.py
+file path=usr/lib/python2.7/vendor-packages/libxsltmod.so
+license xsl.license license=SUNWlxsl-python26.copyright
--- a/components/libxslt/libxslt.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/libxslt/libxslt.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>
@@ -96,3 +96,11 @@
 link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1
 link path=usr/lib/libexslt.so target=./libexslt.so.0
 link path=usr/lib/libxslt.so target=./libxslt.so.1
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/logilab-astng-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,160 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="logilab-astng provides a common base representation of python source code for projects such as pylint."
+set name=pkg.summary \
+    value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/299
+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/astng
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage
+dir path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/__init__.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/__pkginfo__.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/_exceptions.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/_nodes_ast.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/_nodes_compiler.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/builder.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/inference.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/infutils.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/inspector.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/lookup.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/manager.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/nodes.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/nodes_as_string.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/patchcomptransformer.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/protocols.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/raw_building.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/rebuilder.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/scoped_nodes.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.egg
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.zip
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/Connection1.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/__init__.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/all.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/myConnection.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/format.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module2.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/noendingnewline.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/nonregr.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/notall.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/clientmodule_test.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/suppliermodule_test.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/descriptor_crash.py pkg.tmp.autopyc=false
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/import_package_subpackage_module.py pkg.tmp.autopyc=false
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/__init__.py pkg.tmp.autopyc=false
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/__init__.py pkg.tmp.autopyc=false
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/module.py pkg.tmp.autopyc=false
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_builder.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inference.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inspector.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_lookup.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_manager.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_nodes.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_scoped_nodes.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_utils.py
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/utils.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6-nspkg.pth
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/namespace_packages.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/requires.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/top_level.txt
+license logilab-astng.license license=GPLv2
+
+# pkgdepend should have picked up the dependency on /library/python-2/logilab-common;
+# 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/logilab/common/modutils.py \
+    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/astng/manager.py \
+    type=require
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the logilab-astng package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/logilab-astng-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,120 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="logilab-astng provides a common base representation of python source code for projects such as pylint."
+set name=pkg.summary \
+    value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/299
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license logilab-astng.license license=GPLv2
+
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/logilab
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/appl
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/SSL1
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data2
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data/package
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-0.19.0-py2.7.egg-info
+#file path=usr/lib/python2.7/vendor-packages/logilab/__init__.py pkg.tmp.autopyc=false
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/__pkginfo__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/_exceptions.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/_nodes_ast.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/_nodes_compiler.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/builder.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/inference.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/infutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/inspector.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/lookup.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/manager.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/nodes_as_string.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/nodes.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/patchcomptransformer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/protocols.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/raw_building.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/rebuilder.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/scoped_nodes.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/all.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/appl/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/appl/myConnection.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/format.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/module.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/module2.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.egg
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.zip
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/noendingnewline.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/nonregr.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/notall.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/SSL1/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data/SSL1/Connection1.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data2/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data2/clientmodule_test.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/data2/suppliermodule_test.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data/descriptor_crash.py pkg.tmp.autopyc=false
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data/import_package_subpackage_module.py pkg.tmp.autopyc=false
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data/package/__init__.py pkg.tmp.autopyc=false
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/__init__.py pkg.tmp.autopyc=false
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/module.py pkg.tmp.autopyc=false
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/regrtest.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_builder.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_inference.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_inspector.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_lookup.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_manager.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_nodes.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_scoped_nodes.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/test/unittest_utils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/utils.py
+
+# pkgdepend should have picked up the dependency on /library/python-2/logilab-common;
+# 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/logilab/common/modutils.py \
+#    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/astng/manager.py \
+#    type=require
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the logilab-astng package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
--- a/components/logilab-astng/logilab-astng.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/logilab-astng/logilab-astng.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>
@@ -36,121 +36,16 @@
     value=PSARC/2009/299
 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/astng
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package
-dir \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage
-dir path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.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/astng/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/__pkginfo__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/_exceptions.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/_nodes_ast.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/_nodes_compiler.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/builder.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/inference.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/infutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/inspector.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/lookup.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/manager.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/nodes.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/nodes_as_string.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/patchcomptransformer.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/protocols.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/raw_building.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/rebuilder.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/scoped_nodes.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.egg
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.zip
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/Connection1.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/all.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/myConnection.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/format.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module2.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/noendingnewline.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/nonregr.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/notall.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/__init__.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/clientmodule_test.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/suppliermodule_test.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/descriptor_crash.py pkg.tmp.autopyc=false
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/import_package_subpackage_module.py pkg.tmp.autopyc=false
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/__init__.py pkg.tmp.autopyc=false
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/__init__.py pkg.tmp.autopyc=false
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/module.py pkg.tmp.autopyc=false
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_builder.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inference.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inspector.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_lookup.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_manager.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_nodes.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_scoped_nodes.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_utils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/utils.py
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6-nspkg.pth
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/namespace_packages.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/requires.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/top_level.txt
 file logilab-astng.3 path=usr/share/man/man3/logilab-astng.3
 license logilab-astng.license license=GPLv2
 
-# pkgdepend should have picked up the dependency on /library/python-2/logilab-common;
-# 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/logilab/common/modutils.py \
-    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/astng/manager.py \
-    type=require
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/logilab-common/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/logilab-common/Makefile	Fri Feb 24 13:30:24 2012 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -42,6 +42,9 @@
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
+	$(PYTHON.2.6.32) -m compileall $(PROTO_DIR)/usr/lib/python2.6/vendor-packages
+	$(PYTHON.2.7.32) -m compileall $(PROTO_DIR)/usr/lib/python2.7/vendor-packages
+	
 
 # Expected failures for test target:
 # 722 test cases, 17 errors, 5 failures, 56 skipped
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/logilab-common-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,310 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Modules providing low level functionality shared among various python projects."
+set name=pkg.summary value="common python libraries for logilab applications"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    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
+file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py
+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
+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
+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
+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
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the logilab-common package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/logilab-common-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,211 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Modules providing low level functionality shared among various python projects."
+set name=pkg.summary value="common python libraries for logilab applications"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/298
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+license logilab-common.license license=GPLv2
+
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/logilab
+dir path=usr/lib/python2.7/vendor-packages/logilab/common
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/content_differ_dir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/content_differ_dir/subdir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/file_differ_dir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/file_differ_dir/subdir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/sub
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/reference_dir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/reference_dir/subdir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/same_dir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/same_dir/subdir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/sub
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/subdir_differ_dir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir
+dir path=usr/lib/python2.7/vendor-packages/logilab/common/ureports
+file path=usr/lib/python2.7/vendor-packages/logilab_common-0.40.0-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/logilab/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/__pkginfo__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/adbh.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/astutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/bind.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/cache.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/changelog.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/clcommands.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/cli.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/compat.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/configuration.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/contexts.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/corbautils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/daemon.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/date.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/db.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/debugger.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/decorators.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/deprecation.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/fileutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/graph.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/html.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/interface.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/logger.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/logging_ext.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/logservice.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/modutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/monclient.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/monserver.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/optik_ext.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/optparser.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/patricia.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/pdf_ext.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/proc.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/pytest.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/shellutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/sphinxutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/sqlgen.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/table.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/tasksqueue.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/ChangeLog
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/content_differ_dir/NOTHING
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/content_differ_dir/README
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/coin
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/toto.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/file_differ_dir/NOTHING
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/file_differ_dir/README
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/file_differ_dir/subdir/toto.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo/Hello
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/foo.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/module.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/module2.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/newlines.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/noendingnewline.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/nonregr.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/normal_file.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/spam.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/sub/doc.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/sub/momo.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/test.ini
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/test1.msg
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/test2.msg
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/find_test/write_protected_file.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/foo.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/module.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/module2.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.egg
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.zip
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/newlines.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/noendingnewline.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/nonregr.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/normal_file.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/reference_dir/NOTHING
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/reference_dir/README
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/reference_dir/subdir/coin
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/reference_dir/subdir/toto.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/same_dir/NOTHING
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/same_dir/README
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/same_dir/subdir/coin
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/same_dir/subdir/toto.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/spam.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/sub/doc.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/sub/momo.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/subdir_differ_dir/NOTHING
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/subdir_differ_dir/README
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/coin
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/toto.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/test.ini
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/test1.msg
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/test2.msg
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/data/write_protected_file.txt
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/foomod.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_adbh.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_bind.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_cache.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_changelog.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_compat.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_configuration.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_date.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_db.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_decorators.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_fileutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_graph.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_interface.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_logger.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_modutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_patricia.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_pytest.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_shellutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_table.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_taskqueue.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_testlib.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_textutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_tree.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_umessage.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_ureports_html.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/unittest_ureports_text.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/test/utils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/testlib.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/textutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/tree.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/twisted_distutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/umessage.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/docbook_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/html_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/nodes.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/text_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/vcgutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/visitor.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/xmlrpcutils.py
+
+# This is commentd out until there is a 2.7 version available
+# pkgdepend should have picked up the dependency on /library/python-2/python-gnome-libs-27;
+# this explicit depend action can be removed if pkgdepend is fixed later
+#depend fmri=__TBD \
+#    pkg.debug.depend.file=usr/lib/python2.7/vendor-packages/CORBA.py \
+#    pkg.debug.reason=usr/lib/python2.7/vendor-packages/logilab/common/corbautils.py \
+#    type=require
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the logilab-common package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- 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/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/mercurial/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/mercurial/Makefile	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.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -36,7 +36,6 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
-PKG_MACROS +=		PYTHON_LIB=$(PYTHON_LIB)
 PKG_PROTO_DIRS +=	$(COMPONENT_SRC)/contrib
 PKG_PROTO_DIRS +=	$(COMPONENT_SRC)/doc
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/mercurial-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,382 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The Mercurial Source Control Management System"
+set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/417
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license mercurial.copyright license='GPLv2+'
+
+# force a dependency on the mercurial package
+depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=optional
+
+dir path=usr
+dir path=usr/bin
+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/hgext
+dir path=usr/lib/python2.6/vendor-packages/hgext/convert
+dir path=usr/lib/python2.6/vendor-packages/hgext/highlight
+dir path=usr/lib/python2.6/vendor-packages/hgext/zeroconf
+dir path=usr/lib/python2.6/vendor-packages/mercurial
+dir path=usr/lib/python2.6/vendor-packages/mercurial/help
+dir path=usr/lib/python2.6/vendor-packages/mercurial/hgweb
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/da
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/da/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/de
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/de/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/el
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/el/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/fr
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/fr/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/it
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/it/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ja
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ja/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/pt_BR
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ro
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/ro/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/sv
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/sv/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_CN
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_TW
+dir path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/coal
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan
+dir path=usr/lib/python2.6/vendor-packages/mercurial/templates/static
+
+file path=usr/bin/hg
+file path=usr/lib/python2.6/vendor-packages/hgext/__init__.py
+file path=usr/lib/python2.6/vendor-packages/hgext/acl.py
+file path=usr/lib/python2.6/vendor-packages/hgext/bugzilla.py
+file path=usr/lib/python2.6/vendor-packages/hgext/children.py
+file path=usr/lib/python2.6/vendor-packages/hgext/churn.py
+file path=usr/lib/python2.6/vendor-packages/hgext/color.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/__init__.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/bzr.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/common.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/convcmd.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/cvs.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/cvsps.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/darcs.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/filemap.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/git.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/gnuarch.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/hg.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/monotone.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/p4.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/subversion.py
+file path=usr/lib/python2.6/vendor-packages/hgext/convert/transport.py
+file path=usr/lib/python2.6/vendor-packages/hgext/eol.py
+file path=usr/lib/python2.6/vendor-packages/hgext/extdiff.py
+file path=usr/lib/python2.6/vendor-packages/hgext/fetch.py
+file path=usr/lib/python2.6/vendor-packages/hgext/gpg.py
+file path=usr/lib/python2.6/vendor-packages/hgext/graphlog.py
+file path=usr/lib/python2.6/vendor-packages/hgext/hgcia.py
+file path=usr/lib/python2.6/vendor-packages/hgext/hgk.py
+file path=usr/lib/python2.6/vendor-packages/hgext/highlight/__init__.py
+file path=usr/lib/python2.6/vendor-packages/hgext/highlight/highlight.py
+file path=usr/lib/python2.6/vendor-packages/hgext/interhg.py
+file path=usr/lib/python2.6/vendor-packages/hgext/keyword.py
+file path=usr/lib/python2.6/vendor-packages/hgext/mq.py
+file path=usr/lib/python2.6/vendor-packages/hgext/notify.py
+file path=usr/lib/python2.6/vendor-packages/hgext/pager.py
+file path=usr/lib/python2.6/vendor-packages/hgext/parentrevspec.py
+file path=usr/lib/python2.6/vendor-packages/hgext/patchbomb.py
+file path=usr/lib/python2.6/vendor-packages/hgext/progress.py
+file path=usr/lib/python2.6/vendor-packages/hgext/purge.py
+file path=usr/lib/python2.6/vendor-packages/hgext/rebase.py
+file path=usr/lib/python2.6/vendor-packages/hgext/record.py
+file path=usr/lib/python2.6/vendor-packages/hgext/relink.py
+file path=usr/lib/python2.6/vendor-packages/hgext/schemes.py
+file path=usr/lib/python2.6/vendor-packages/hgext/share.py
+file path=usr/lib/python2.6/vendor-packages/hgext/transplant.py
+file path=usr/lib/python2.6/vendor-packages/hgext/win32mbcs.py
+file path=usr/lib/python2.6/vendor-packages/hgext/win32text.py
+file path=usr/lib/python2.6/vendor-packages/hgext/zeroconf/Zeroconf.py
+file path=usr/lib/python2.6/vendor-packages/hgext/zeroconf/__init__.py
+file path=usr/lib/python2.6/vendor-packages/mercurial-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/mercurial/__init__.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/__version__.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/ancestor.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/archival.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/base85.so
+file path=usr/lib/python2.6/vendor-packages/mercurial/bdiff.so
+file path=usr/lib/python2.6/vendor-packages/mercurial/bookmarks.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/bundlerepo.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/byterange.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/changegroup.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/changelog.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/cmdutil.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/commands.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/config.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/context.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/copies.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/dagparser.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/demandimport.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/diffhelpers.so
+file path=usr/lib/python2.6/vendor-packages/mercurial/dirstate.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/discovery.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/dispatch.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/encoding.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/error.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/extensions.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/fancyopts.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/filelog.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/filemerge.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/graphmod.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hbisect.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/config.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/dates.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/diffs.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/environment.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/extensions.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/glossary.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/hgweb.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/merge-tools.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/multirevs.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/patterns.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/revisions.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/revsets.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/subrepos.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/templates.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help/urls.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/help.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hg.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/__init__.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/common.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/hgweb_mod.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/hgwebdir_mod.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/protocol.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/request.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/server.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/webcommands.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/webutil.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hgweb/wsgicgi.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/hook.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/httprepo.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/i18n.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/ignore.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/keepalive.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/el/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/fr/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/it/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/ja/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/ro/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/sv/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.6/vendor-packages/mercurial/localrepo.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/lock.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/lsprof.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/lsprofcalltree.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/mail.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/manifest.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/match.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/mdiff.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/merge.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/minirst.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/mpatch.so
+file path=usr/lib/python2.6/vendor-packages/mercurial/node.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/osutil.so
+file path=usr/lib/python2.6/vendor-packages/mercurial/parser.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/parsers.so
+file path=usr/lib/python2.6/vendor-packages/mercurial/patch.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/posix.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/pushkey.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/py3kcompat.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/repair.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/repo.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/revset.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/similar.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/sshserver.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/statichttprepo.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/store.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/strutil.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/subrepo.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/tags.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/templatefilters.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/templatekw.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/templater.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/changelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/changelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/error.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/filelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/header.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/tagentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/atom/tags.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/coal/header.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/coal/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/branches.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/changelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/changelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/changeset.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/error.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/fileannotate.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/filediff.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/filelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/filerevision.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/footer.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/graph.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/header.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/help.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/helptopics.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/index.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/manifest.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/notfound.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/search.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/shortlog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/summary.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/gitweb/tags.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.changelog
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.compact
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.default
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/map-cmdline.xml
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/branches.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/changelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/changelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/changeset.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/error.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/fileannotate.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/filediff.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/filelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/filerevision.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/footer.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/graph.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/header.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/help.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/helptopics.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/index.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/manifest.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/notfound.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/search.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/shortlog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/summary.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/monoblue/tags.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/bookmarks.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/branches.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/changeset.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/error.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/fileannotate.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filediff.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/filerevision.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/footer.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/graph.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/header.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/help.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/helptopics.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/index.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/manifest.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/notfound.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/search.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/shortlog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/shortlogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/paper/tags.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/changeset.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/error.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/fileannotate.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/filediff.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/index.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/manifest.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/raw/notfound.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/changelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/changelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/error.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/filelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/filelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/header.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/tagentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/rss/tags.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/branches.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/changelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/changelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/changeset.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/error.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/fileannotate.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filediff.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filelog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filelogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/filerevision.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/footer.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/graph.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/header.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/index.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/manifest.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/map
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/notfound.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/search.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/shortlog.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/shortlogentry.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/spartan/tags.tmpl
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/background.png
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/coal-file.png
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/coal-folder.png
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/excanvas.js
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/graph.js
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/hgicon.png
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/hglogo.png
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-coal.css
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-gitweb.css
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-monoblue.css
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style-paper.css
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/static/style.css
+file path=usr/lib/python2.6/vendor-packages/mercurial/templates/template-vars.txt
+file path=usr/lib/python2.6/vendor-packages/mercurial/transaction.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/ui.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/url.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/util.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/verify.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/win32.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/windows.py
+file path=usr/lib/python2.6/vendor-packages/mercurial/wireproto.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/mercurial-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,383 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The Mercurial Source Control Management System"
+set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/417
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license mercurial.copyright license='GPLv2+'
+
+# force a dependency on the mercurial package
+depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/hgext
+dir path=usr/lib/python2.7/vendor-packages/hgext/convert
+dir path=usr/lib/python2.7/vendor-packages/hgext/highlight
+dir path=usr/lib/python2.7/vendor-packages/hgext/zeroconf
+dir path=usr/lib/python2.7/vendor-packages/mercurial
+dir path=usr/lib/python2.7/vendor-packages/mercurial/help
+dir path=usr/lib/python2.7/vendor-packages/mercurial/hgweb
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/da
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/da/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/de
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/de/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/el
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/el/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/fr
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/fr/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/it
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/it/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ja
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ja/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/pt_BR
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ro
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/ro/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/sv
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/sv/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_CN
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_TW
+dir path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/coal
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan
+dir path=usr/lib/python2.7/vendor-packages/mercurial/templates/static
+file path=usr/lib/python2.7/vendor-packages/hgext/__init__.py
+file path=usr/lib/python2.7/vendor-packages/hgext/acl.py
+file path=usr/lib/python2.7/vendor-packages/hgext/bugzilla.py
+file path=usr/lib/python2.7/vendor-packages/hgext/children.py
+file path=usr/lib/python2.7/vendor-packages/hgext/churn.py
+file path=usr/lib/python2.7/vendor-packages/hgext/color.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/__init__.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/bzr.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/common.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/convcmd.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/cvs.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/cvsps.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/darcs.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/filemap.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/git.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/gnuarch.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/hg.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/monotone.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/p4.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/subversion.py
+file path=usr/lib/python2.7/vendor-packages/hgext/convert/transport.py
+file path=usr/lib/python2.7/vendor-packages/hgext/eol.py
+file path=usr/lib/python2.7/vendor-packages/hgext/extdiff.py
+file path=usr/lib/python2.7/vendor-packages/hgext/fetch.py
+file path=usr/lib/python2.7/vendor-packages/hgext/gpg.py
+file path=usr/lib/python2.7/vendor-packages/hgext/graphlog.py
+file path=usr/lib/python2.7/vendor-packages/hgext/hgcia.py
+file path=usr/lib/python2.7/vendor-packages/hgext/hgk.py
+file path=usr/lib/python2.7/vendor-packages/hgext/highlight/__init__.py
+file path=usr/lib/python2.7/vendor-packages/hgext/highlight/highlight.py
+file path=usr/lib/python2.7/vendor-packages/hgext/interhg.py
+file path=usr/lib/python2.7/vendor-packages/hgext/keyword.py
+file path=usr/lib/python2.7/vendor-packages/hgext/mq.py
+file path=usr/lib/python2.7/vendor-packages/hgext/notify.py
+file path=usr/lib/python2.7/vendor-packages/hgext/pager.py
+file path=usr/lib/python2.7/vendor-packages/hgext/parentrevspec.py
+file path=usr/lib/python2.7/vendor-packages/hgext/patchbomb.py
+file path=usr/lib/python2.7/vendor-packages/hgext/progress.py
+file path=usr/lib/python2.7/vendor-packages/hgext/purge.py
+file path=usr/lib/python2.7/vendor-packages/hgext/rebase.py
+file path=usr/lib/python2.7/vendor-packages/hgext/record.py
+file path=usr/lib/python2.7/vendor-packages/hgext/relink.py
+file path=usr/lib/python2.7/vendor-packages/hgext/schemes.py
+file path=usr/lib/python2.7/vendor-packages/hgext/share.py
+file path=usr/lib/python2.7/vendor-packages/hgext/transplant.py
+file path=usr/lib/python2.7/vendor-packages/hgext/win32mbcs.py
+file path=usr/lib/python2.7/vendor-packages/hgext/win32text.py
+file path=usr/lib/python2.7/vendor-packages/hgext/zeroconf/__init__.py
+file path=usr/lib/python2.7/vendor-packages/hgext/zeroconf/Zeroconf.py
+file path=usr/lib/python2.7/vendor-packages/mercurial-1.8.4-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/mercurial/__init__.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/__version__.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/ancestor.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/archival.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/base85.so
+file path=usr/lib/python2.7/vendor-packages/mercurial/bdiff.so
+file path=usr/lib/python2.7/vendor-packages/mercurial/bookmarks.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/bundlerepo.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/byterange.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/changegroup.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/changelog.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/cmdutil.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/commands.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/config.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/context.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/copies.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/dagparser.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/demandimport.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/diffhelpers.so
+file path=usr/lib/python2.7/vendor-packages/mercurial/dirstate.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/discovery.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/dispatch.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/encoding.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/error.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/extensions.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/fancyopts.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/filelog.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/filemerge.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/graphmod.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hbisect.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/help.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/config.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/dates.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/diffs.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/environment.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/extensions.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/glossary.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/hgweb.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/merge-tools.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/multirevs.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/patterns.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/revisions.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/revsets.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/subrepos.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/templates.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/help/urls.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/hg.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/__init__.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/common.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/hgweb_mod.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/hgwebdir_mod.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/protocol.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/request.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/server.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/webcommands.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/webutil.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hgweb/wsgicgi.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/hook.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/httprepo.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/i18n.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/ignore.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/keepalive.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/el/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/fr/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/it/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/ja/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/ro/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/sv/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
+file path=usr/lib/python2.7/vendor-packages/mercurial/localrepo.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/lock.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/lsprof.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/lsprofcalltree.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/mail.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/manifest.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/match.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/mdiff.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/merge.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/minirst.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/mpatch.so
+file path=usr/lib/python2.7/vendor-packages/mercurial/node.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/osutil.so
+file path=usr/lib/python2.7/vendor-packages/mercurial/parser.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/parsers.so
+file path=usr/lib/python2.7/vendor-packages/mercurial/patch.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/posix.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/pushkey.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/py3kcompat.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/repair.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/repo.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/revlog.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/revset.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/similar.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/simplemerge.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/sshrepo.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/sshserver.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/statichttprepo.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/store.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/strutil.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/subrepo.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/tags.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/templatefilters.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/templatekw.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/templater.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/bookmarkentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/bookmarks.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/changelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/changelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/error.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/filelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/header.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/tagentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/atom/tags.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/coal/header.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/coal/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/bookmarks.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/branches.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/changelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/changelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/changeset.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/error.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/fileannotate.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filediff.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/filerevision.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/footer.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/header.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/help.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/helptopics.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/index.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/manifest.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/notfound.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/search.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/shortlog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/summary.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/gitweb/tags.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.changelog
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.compact
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.default
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/map-cmdline.xml
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/bookmarks.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/branches.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/changelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/changelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/changeset.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/error.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/fileannotate.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filediff.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/filerevision.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/footer.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/header.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/help.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/helptopics.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/index.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/manifest.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/notfound.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/search.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/shortlog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/summary.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/monoblue/tags.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/bookmarks.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/branches.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/changeset.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/error.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/fileannotate.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filediff.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/filerevision.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/footer.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/header.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/help.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/helptopics.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/index.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/manifest.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/notfound.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/search.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/shortlog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/shortlogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/paper/tags.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/changeset.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/error.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/fileannotate.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/filediff.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/index.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/manifest.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/raw/notfound.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/bookmarkentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/bookmarks.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/changelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/changelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/error.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/filelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/filelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/header.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/tagentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/rss/tags.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/branches.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/changelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/changelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/changeset.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/error.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/fileannotate.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filediff.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filelog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filelogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/filerevision.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/footer.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/graph.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/header.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/index.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/manifest.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/map
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/notfound.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/search.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/shortlog.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/shortlogentry.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/spartan/tags.tmpl
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/background.png
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/coal-file.png
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/coal-folder.png
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/excanvas.js
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/graph.js
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/hgicon.png
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/hglogo.png
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-coal.css
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-gitweb.css
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-monoblue.css
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style-paper.css
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/static/style.css
+file path=usr/lib/python2.7/vendor-packages/mercurial/templates/template-vars.txt
+file path=usr/lib/python2.7/vendor-packages/mercurial/transaction.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/ui.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/url.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/util.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/verify.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/win32.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/windows.py
+file path=usr/lib/python2.7/vendor-packages/mercurial/wireproto.py
--- a/components/mercurial/mercurial.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/mercurial/mercurial.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 committed>
@@ -43,358 +43,25 @@
 
 license mercurial.copyright license='GPLv2+'
 
+depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
+
+
 dir path=usr
-dir path=usr/bin
 dir path=usr/demo
 dir path=usr/demo/mercurial
 dir path=usr/demo/mercurial/git-viz
 dir path=usr/demo/mercurial/hgsh
 dir path=usr/demo/mercurial/vim
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=$(PYTHON_LIB)
-dir path=$(PYTHON_LIB)/hgext
-dir path=$(PYTHON_LIB)/hgext/convert
-dir path=$(PYTHON_LIB)/hgext/highlight
-dir path=$(PYTHON_LIB)/hgext/zeroconf
-dir path=$(PYTHON_LIB)/mercurial
-dir path=$(PYTHON_LIB)/mercurial/help
-dir path=$(PYTHON_LIB)/mercurial/hgweb
-dir path=$(PYTHON_LIB)/mercurial/locale
-dir path=$(PYTHON_LIB)/mercurial/locale/da
-dir path=$(PYTHON_LIB)/mercurial/locale/da/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/de
-dir path=$(PYTHON_LIB)/mercurial/locale/de/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/el
-dir path=$(PYTHON_LIB)/mercurial/locale/el/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/fr
-dir path=$(PYTHON_LIB)/mercurial/locale/fr/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/it
-dir path=$(PYTHON_LIB)/mercurial/locale/it/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/ja
-dir path=$(PYTHON_LIB)/mercurial/locale/ja/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/pt_BR
-dir path=$(PYTHON_LIB)/mercurial/locale/pt_BR/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/ro
-dir path=$(PYTHON_LIB)/mercurial/locale/ro/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/sv
-dir path=$(PYTHON_LIB)/mercurial/locale/sv/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/zh_CN
-dir path=$(PYTHON_LIB)/mercurial/locale/zh_CN/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/locale/zh_TW
-dir path=$(PYTHON_LIB)/mercurial/locale/zh_TW/LC_MESSAGES
-dir path=$(PYTHON_LIB)/mercurial/templates
-dir path=$(PYTHON_LIB)/mercurial/templates/atom
-dir path=$(PYTHON_LIB)/mercurial/templates/coal
-dir path=$(PYTHON_LIB)/mercurial/templates/gitweb
-dir path=$(PYTHON_LIB)/mercurial/templates/monoblue
-dir path=$(PYTHON_LIB)/mercurial/templates/paper
-dir path=$(PYTHON_LIB)/mercurial/templates/raw
-dir path=$(PYTHON_LIB)/mercurial/templates/rss
-dir path=$(PYTHON_LIB)/mercurial/templates/spartan
-dir path=$(PYTHON_LIB)/mercurial/templates/static
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man5
-file path=usr/bin/hg
-file path=$(PYTHON_LIB)/hgext/__init__.py
-file path=$(PYTHON_LIB)/hgext/acl.py
-file path=$(PYTHON_LIB)/hgext/bugzilla.py
-file path=$(PYTHON_LIB)/hgext/children.py
-file path=$(PYTHON_LIB)/hgext/churn.py
-file path=$(PYTHON_LIB)/hgext/color.py
-file path=$(PYTHON_LIB)/hgext/convert/__init__.py
-file path=$(PYTHON_LIB)/hgext/convert/bzr.py
-file path=$(PYTHON_LIB)/hgext/convert/common.py
-file path=$(PYTHON_LIB)/hgext/convert/convcmd.py
-file path=$(PYTHON_LIB)/hgext/convert/cvs.py
-file path=$(PYTHON_LIB)/hgext/convert/cvsps.py
-file path=$(PYTHON_LIB)/hgext/convert/darcs.py
-file path=$(PYTHON_LIB)/hgext/convert/filemap.py
-file path=$(PYTHON_LIB)/hgext/convert/git.py
-file path=$(PYTHON_LIB)/hgext/convert/gnuarch.py
-file path=$(PYTHON_LIB)/hgext/convert/hg.py
-file path=$(PYTHON_LIB)/hgext/convert/monotone.py
-file path=$(PYTHON_LIB)/hgext/convert/p4.py
-file path=$(PYTHON_LIB)/hgext/convert/subversion.py
-file path=$(PYTHON_LIB)/hgext/convert/transport.py
-file path=$(PYTHON_LIB)/hgext/eol.py
-file path=$(PYTHON_LIB)/hgext/extdiff.py
-file path=$(PYTHON_LIB)/hgext/fetch.py
-file path=$(PYTHON_LIB)/hgext/gpg.py
-file path=$(PYTHON_LIB)/hgext/graphlog.py
-file path=$(PYTHON_LIB)/hgext/hgcia.py
-file path=$(PYTHON_LIB)/hgext/hgk.py
-file path=$(PYTHON_LIB)/hgext/highlight/__init__.py
-file path=$(PYTHON_LIB)/hgext/highlight/highlight.py
-file path=$(PYTHON_LIB)/hgext/interhg.py
-file path=$(PYTHON_LIB)/hgext/keyword.py
-file path=$(PYTHON_LIB)/hgext/mq.py
-file path=$(PYTHON_LIB)/hgext/notify.py
-file path=$(PYTHON_LIB)/hgext/pager.py
-file path=$(PYTHON_LIB)/hgext/parentrevspec.py
-file path=$(PYTHON_LIB)/hgext/patchbomb.py
-file path=$(PYTHON_LIB)/hgext/progress.py
-file path=$(PYTHON_LIB)/hgext/purge.py
-file path=$(PYTHON_LIB)/hgext/rebase.py
-file path=$(PYTHON_LIB)/hgext/record.py
-file path=$(PYTHON_LIB)/hgext/relink.py
-file path=$(PYTHON_LIB)/hgext/schemes.py
-file path=$(PYTHON_LIB)/hgext/share.py
-file path=$(PYTHON_LIB)/hgext/transplant.py
-file path=$(PYTHON_LIB)/hgext/win32mbcs.py
-file path=$(PYTHON_LIB)/hgext/win32text.py
-file path=$(PYTHON_LIB)/hgext/zeroconf/Zeroconf.py
-file path=$(PYTHON_LIB)/hgext/zeroconf/__init__.py
-file path=$(PYTHON_LIB)/mercurial-$(COMPONENT_VERSION)-py2.6.egg-info
-file path=$(PYTHON_LIB)/mercurial/__init__.py
-file path=$(PYTHON_LIB)/mercurial/__version__.py
-file path=$(PYTHON_LIB)/mercurial/ancestor.py
-file path=$(PYTHON_LIB)/mercurial/archival.py
-file path=$(PYTHON_LIB)/mercurial/base85.so
-file path=$(PYTHON_LIB)/mercurial/bdiff.so
-file path=$(PYTHON_LIB)/mercurial/bookmarks.py
-file path=$(PYTHON_LIB)/mercurial/bundlerepo.py
-file path=$(PYTHON_LIB)/mercurial/byterange.py
-file path=$(PYTHON_LIB)/mercurial/changegroup.py
-file path=$(PYTHON_LIB)/mercurial/changelog.py
-file path=$(PYTHON_LIB)/mercurial/cmdutil.py
-file path=$(PYTHON_LIB)/mercurial/commands.py
-file path=$(PYTHON_LIB)/mercurial/config.py
-file path=$(PYTHON_LIB)/mercurial/context.py
-file path=$(PYTHON_LIB)/mercurial/copies.py
-file path=$(PYTHON_LIB)/mercurial/dagparser.py
-file path=$(PYTHON_LIB)/mercurial/demandimport.py
-file path=$(PYTHON_LIB)/mercurial/diffhelpers.so
-file path=$(PYTHON_LIB)/mercurial/dirstate.py
-file path=$(PYTHON_LIB)/mercurial/discovery.py
-file path=$(PYTHON_LIB)/mercurial/dispatch.py
-file path=$(PYTHON_LIB)/mercurial/encoding.py
-file path=$(PYTHON_LIB)/mercurial/error.py
-file path=$(PYTHON_LIB)/mercurial/extensions.py
-file path=$(PYTHON_LIB)/mercurial/fancyopts.py
-file path=$(PYTHON_LIB)/mercurial/filelog.py
-file path=$(PYTHON_LIB)/mercurial/filemerge.py
-file path=$(PYTHON_LIB)/mercurial/graphmod.py
-file path=$(PYTHON_LIB)/mercurial/hbisect.py
-file path=$(PYTHON_LIB)/mercurial/help/config.txt
-file path=$(PYTHON_LIB)/mercurial/help/dates.txt
-file path=$(PYTHON_LIB)/mercurial/help/diffs.txt
-file path=$(PYTHON_LIB)/mercurial/help/environment.txt
-file path=$(PYTHON_LIB)/mercurial/help/extensions.txt
-file path=$(PYTHON_LIB)/mercurial/help/glossary.txt
-file path=$(PYTHON_LIB)/mercurial/help/hgweb.txt
-file path=$(PYTHON_LIB)/mercurial/help/merge-tools.txt
-file path=$(PYTHON_LIB)/mercurial/help/multirevs.txt
-file path=$(PYTHON_LIB)/mercurial/help/patterns.txt
-file path=$(PYTHON_LIB)/mercurial/help/revisions.txt
-file path=$(PYTHON_LIB)/mercurial/help/revsets.txt
-file path=$(PYTHON_LIB)/mercurial/help/subrepos.txt
-file path=$(PYTHON_LIB)/mercurial/help/templates.txt
-file path=$(PYTHON_LIB)/mercurial/help/urls.txt
-file path=$(PYTHON_LIB)/mercurial/help.py
-file path=$(PYTHON_LIB)/mercurial/hg.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/__init__.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/common.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/hgweb_mod.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/hgwebdir_mod.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/protocol.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/request.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/server.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/webcommands.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/webutil.py
-file path=$(PYTHON_LIB)/mercurial/hgweb/wsgicgi.py
-file path=$(PYTHON_LIB)/mercurial/hook.py
-file path=$(PYTHON_LIB)/mercurial/httprepo.py
-file path=$(PYTHON_LIB)/mercurial/i18n.py
-file path=$(PYTHON_LIB)/mercurial/ignore.py
-file path=$(PYTHON_LIB)/mercurial/keepalive.py
-file path=$(PYTHON_LIB)/mercurial/locale/da/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/de/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/el/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/fr/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/it/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/ja/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/ro/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/sv/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
-file path=$(PYTHON_LIB)/mercurial/localrepo.py
-file path=$(PYTHON_LIB)/mercurial/lock.py
-file path=$(PYTHON_LIB)/mercurial/lsprof.py
-file path=$(PYTHON_LIB)/mercurial/lsprofcalltree.py
-file path=$(PYTHON_LIB)/mercurial/mail.py
-file path=$(PYTHON_LIB)/mercurial/manifest.py
-file path=$(PYTHON_LIB)/mercurial/match.py
-file path=$(PYTHON_LIB)/mercurial/mdiff.py
-file path=$(PYTHON_LIB)/mercurial/merge.py
-file path=$(PYTHON_LIB)/mercurial/minirst.py
-file path=$(PYTHON_LIB)/mercurial/mpatch.so
-file path=$(PYTHON_LIB)/mercurial/node.py
-file path=$(PYTHON_LIB)/mercurial/osutil.so
-file path=$(PYTHON_LIB)/mercurial/parser.py
-file path=$(PYTHON_LIB)/mercurial/parsers.so
-file path=$(PYTHON_LIB)/mercurial/patch.py
-file path=$(PYTHON_LIB)/mercurial/posix.py
-file path=$(PYTHON_LIB)/mercurial/pushkey.py
-file path=$(PYTHON_LIB)/mercurial/py3kcompat.py
-file path=$(PYTHON_LIB)/mercurial/repair.py
-file path=$(PYTHON_LIB)/mercurial/repo.py
-file path=$(PYTHON_LIB)/mercurial/revlog.py
-file path=$(PYTHON_LIB)/mercurial/revset.py
-file path=$(PYTHON_LIB)/mercurial/similar.py
-file path=$(PYTHON_LIB)/mercurial/simplemerge.py pkg.depend.bypass-generate=.*
-file path=$(PYTHON_LIB)/mercurial/sshrepo.py
-file path=$(PYTHON_LIB)/mercurial/sshserver.py
-file path=$(PYTHON_LIB)/mercurial/statichttprepo.py
-file path=$(PYTHON_LIB)/mercurial/store.py
-file path=$(PYTHON_LIB)/mercurial/strutil.py
-file path=$(PYTHON_LIB)/mercurial/subrepo.py
-file path=$(PYTHON_LIB)/mercurial/tags.py
-file path=$(PYTHON_LIB)/mercurial/templatefilters.py
-file path=$(PYTHON_LIB)/mercurial/templatekw.py
-file path=$(PYTHON_LIB)/mercurial/templater.py
-file path=$(PYTHON_LIB)/mercurial/templates/atom/changelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/atom/changelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/atom/error.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/atom/filelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/atom/header.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/atom/map
-file path=$(PYTHON_LIB)/mercurial/templates/atom/tagentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/atom/tags.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/coal/header.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/coal/map
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/branches.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/changelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/changelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/changeset.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/error.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/fileannotate.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/filediff.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/filelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/filerevision.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/footer.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/graph.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/header.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/help.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/helptopics.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/index.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/manifest.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/map
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/notfound.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/search.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/shortlog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/summary.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/gitweb/tags.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.changelog
-file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.compact
-file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.default
-file path=$(PYTHON_LIB)/mercurial/templates/map-cmdline.xml
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/branches.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/changelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/changelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/changeset.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/error.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/fileannotate.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/filediff.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/filelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/filerevision.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/footer.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/graph.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/header.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/help.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/helptopics.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/index.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/manifest.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/map
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/notfound.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/search.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/shortlog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/summary.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/monoblue/tags.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/bookmarks.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/branches.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/changeset.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/error.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/fileannotate.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/filediff.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/filelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/filelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/filerevision.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/footer.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/graph.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/header.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/help.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/helptopics.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/index.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/manifest.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/map
-file path=$(PYTHON_LIB)/mercurial/templates/paper/notfound.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/search.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/shortlog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/shortlogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/paper/tags.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/raw/changeset.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/raw/error.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/raw/fileannotate.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/raw/filediff.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/raw/index.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/raw/manifest.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/raw/map
-file path=$(PYTHON_LIB)/mercurial/templates/raw/notfound.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/changelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/changelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/error.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/filelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/filelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/header.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/map
-file path=$(PYTHON_LIB)/mercurial/templates/rss/tagentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/rss/tags.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/branches.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/changelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/changelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/changeset.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/error.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/fileannotate.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/filediff.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/filelog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/filelogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/filerevision.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/footer.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/graph.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/header.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/index.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/manifest.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/map
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/notfound.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/search.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/shortlog.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/shortlogentry.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/spartan/tags.tmpl
-file path=$(PYTHON_LIB)/mercurial/templates/static/background.png
-file path=$(PYTHON_LIB)/mercurial/templates/static/coal-file.png
-file path=$(PYTHON_LIB)/mercurial/templates/static/coal-folder.png
-file path=$(PYTHON_LIB)/mercurial/templates/static/excanvas.js
-file path=$(PYTHON_LIB)/mercurial/templates/static/graph.js
-file path=$(PYTHON_LIB)/mercurial/templates/static/hgicon.png
-file path=$(PYTHON_LIB)/mercurial/templates/static/hglogo.png
-file path=$(PYTHON_LIB)/mercurial/templates/static/style-coal.css
-file path=$(PYTHON_LIB)/mercurial/templates/static/style-gitweb.css
-file path=$(PYTHON_LIB)/mercurial/templates/static/style-monoblue.css
-file path=$(PYTHON_LIB)/mercurial/templates/static/style-paper.css
-file path=$(PYTHON_LIB)/mercurial/templates/static/style.css
-file path=$(PYTHON_LIB)/mercurial/templates/template-vars.txt
-file path=$(PYTHON_LIB)/mercurial/transaction.py
-file path=$(PYTHON_LIB)/mercurial/ui.py
-file path=$(PYTHON_LIB)/mercurial/url.py
-file path=$(PYTHON_LIB)/mercurial/util.py
-file path=$(PYTHON_LIB)/mercurial/verify.py
-file path=$(PYTHON_LIB)/mercurial/win32.py
-file path=$(PYTHON_LIB)/mercurial/windows.py
-file path=$(PYTHON_LIB)/mercurial/wireproto.py
 
 file path=usr/demo/mercurial/bash_completion
 file path=usr/demo/mercurial/check-code.py mode=555
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWpython-setuptools.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,26 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/[email protected]
+set name=pkg.obsolete value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWpython26-setuptools.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,28 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/[email protected]
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/library%2Fpython-2%2Fsetuptools-24.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,26 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.0.0.0.0.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pylint/pylint-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,109 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
+set name=pkg.fmri value=pkg:/developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="pylint - python code static checker"
+set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/325
+
+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/pylint
+dir \
+    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info
+dir path=usr/lib/python2.6/vendor-packages/pylint/checkers
+dir path=usr/lib/python2.6/vendor-packages/pylint/pyreverse
+dir path=usr/lib/python2.6/vendor-packages/pylint/reporters
+
+file \
+    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/pylint/__init__.py
+file path=usr/lib/python2.6/vendor-packages/pylint/__pkginfo__.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/__init__.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/base.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/classes.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/design_analysis.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/exceptions.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/format.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/imports.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/misc.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/newstyle.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/raw_metrics.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/similar.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/typecheck.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/utils.py
+file path=usr/lib/python2.6/vendor-packages/pylint/checkers/variables.py
+file path=usr/lib/python2.6/vendor-packages/pylint/config.py
+file path=usr/lib/python2.6/vendor-packages/pylint/epylint.py
+file path=usr/lib/python2.6/vendor-packages/pylint/gui.py
+file path=usr/lib/python2.6/vendor-packages/pylint/interfaces.py
+file path=usr/lib/python2.6/vendor-packages/pylint/lint.py
+file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/__init__.py
+file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diadefslib.py
+file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diagrams.py
+file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/main.py
+file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/utils.py
+file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/writer.py
+file path=usr/lib/python2.6/vendor-packages/pylint/reporters/__init__.py
+file path=usr/lib/python2.6/vendor-packages/pylint/reporters/html.py
+file path=usr/lib/python2.6/vendor-packages/pylint/reporters/text.py
+file path=usr/lib/python2.6/vendor-packages/pylint/utils.py
+
+license pylint.license license="GPLv2"
+
+# pkgdepend should have picked up the dependency on 
+# /library/python-2/logilab-common and /library/python-2/logilab-astng; 
+# 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/logilab/common/textutils.py \
+    pkg.debug.reason=usr/lib/python2.6/vendor-packages/pylint/utils.py \
+    type=require
+
+depend fmri=__TBD \
+    pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/logilab/astng/nodes.py \
+    pkg.debug.reason=usr/lib/python2.6/vendor-packages/pylint/lint.py \
+    type=require
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the pylint package
+depend fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pylint/pylint-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,94 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
+set name=pkg.fmri value=pkg:/developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="pylint - python code static checker"
+set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/325
+
+license pylint.license license="GPLv2"
+
+# pkgdepend should have picked up the dependency on 
+# /library/python-2/logilab-common and /library/python-2/logilab-astng; 
+# 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/logilab/common/textutils.py \
+#    pkg.debug.reason=usr/lib/python2.6/vendor-packages/pylint/utils.py \
+#    type=require
+#depend fmri=__TBD \
+#    pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/logilab/astng/nodes.py \
+#    pkg.debug.reason=usr/lib/python2.6/vendor-packages/pylint/lint.py \
+#    type=require
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/pylint
+dir path=usr/lib/python2.7/vendor-packages/pylint/checkers
+dir path=usr/lib/python2.7/vendor-packages/pylint/pyreverse
+dir path=usr/lib/python2.7/vendor-packages/pylint/reporters
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/pylint/__init__.py
+file path=usr/lib/python2.7/vendor-packages/pylint/__pkginfo__.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/__init__.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/base.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/classes.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/design_analysis.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/exceptions.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/format.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/imports.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/misc.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/newstyle.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/raw_metrics.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/similar.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/typecheck.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/utils.py
+file path=usr/lib/python2.7/vendor-packages/pylint/checkers/variables.py
+file path=usr/lib/python2.7/vendor-packages/pylint/config.py
+file path=usr/lib/python2.7/vendor-packages/pylint/epylint.py
+file path=usr/lib/python2.7/vendor-packages/pylint/gui.py
+file path=usr/lib/python2.7/vendor-packages/pylint/interfaces.py
+file path=usr/lib/python2.7/vendor-packages/pylint/lint.py
+file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/__init__.py
+file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/diadefslib.py
+file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/diagrams.py
+file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/main.py
+file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/utils.py
+file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/writer.py
+file path=usr/lib/python2.7/vendor-packages/pylint/reporters/__init__.py
+file path=usr/lib/python2.7/vendor-packages/pylint/reporters/html.py
+file path=usr/lib/python2.7/vendor-packages/pylint/reporters/text.py
+file path=usr/lib/python2.7/vendor-packages/pylint/utils.py
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the pylint package
+depend fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
--- a/components/pylint/pylint.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/pylint/pylint.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -36,14 +36,6 @@
 dir path=usr
 dir path=usr/bin
 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/pylint
-dir \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info
-dir path=usr/lib/python2.6/vendor-packages/pylint/checkers
-dir path=usr/lib/python2.6/vendor-packages/pylint/pyreverse
-dir path=usr/lib/python2.6/vendor-packages/pylint/reporters
 dir path=usr/share
 dir path=usr/share/doc
 dir path=usr/share/doc/pylint
@@ -56,58 +48,18 @@
 file path=usr/bin/pylint-gui
 file path=usr/bin/pyreverse
 file path=usr/bin/symilar
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
-file path=usr/lib/python2.6/vendor-packages/pylint/__init__.py
-file path=usr/lib/python2.6/vendor-packages/pylint/__pkginfo__.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/__init__.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/base.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/classes.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/design_analysis.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/exceptions.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/format.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/imports.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/misc.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/newstyle.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/raw_metrics.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/similar.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/typecheck.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/utils.py
-file path=usr/lib/python2.6/vendor-packages/pylint/checkers/variables.py
-file path=usr/lib/python2.6/vendor-packages/pylint/config.py
-file path=usr/lib/python2.6/vendor-packages/pylint/epylint.py
-file path=usr/lib/python2.6/vendor-packages/pylint/gui.py
-file path=usr/lib/python2.6/vendor-packages/pylint/interfaces.py
-file path=usr/lib/python2.6/vendor-packages/pylint/lint.py
-file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/__init__.py
-file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diadefslib.py
-file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diagrams.py
-file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/main.py
-file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/utils.py
-file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/writer.py
-file path=usr/lib/python2.6/vendor-packages/pylint/reporters/__init__.py
-file path=usr/lib/python2.6/vendor-packages/pylint/reporters/html.py
-file path=usr/lib/python2.6/vendor-packages/pylint/reporters/text.py
-file path=usr/lib/python2.6/vendor-packages/pylint/utils.py
 file path=usr/share/doc/pylint/beginner_pylint_tutorial.txt
+file path=usr/share/doc/pylint/examples/custom_raw.py pkg.tmp.autopyc=false
+file path=usr/share/doc/pylint/examples/custom.py pkg.tmp.autopyc=false
+file path=usr/share/doc/pylint/examples/pylint.el
+file path=usr/share/doc/pylint/examples/pylintrc
+file path=usr/share/doc/pylint/examples/pylintrc_camelcase
 file path=usr/share/doc/pylint/FAQ.txt
 file path=usr/share/doc/pylint/features.txt
 file path=usr/share/doc/pylint/manual.txt
 file path=usr/share/doc/pylint/quickstart.txt
 file path=usr/share/doc/pylint/README
-file path=usr/share/doc/pylint/examples/custom.py pkg.tmp.autopyc=false
-file path=usr/share/doc/pylint/examples/custom_raw.py pkg.tmp.autopyc=false
-file path=usr/share/doc/pylint/examples/pylint.el
-file path=usr/share/doc/pylint/examples/pylintrc_camelcase
-file path=usr/share/doc/pylint/examples/pylintrc
+
 file manpages/epylint.1 path=usr/share/man/man1/epylint.1
 file man/pylint.1 path=usr/share/man/man1/pylint.1
 file manpages/pylint-gui.1 path=usr/share/man/man1/pylint-gui.1
@@ -116,14 +68,10 @@
 
 license pylint.license license="GPLv2"
 
-# pkgdepend should have picked up the dependency on 
-# /library/python-2/logilab-common and /library/python-2/logilab-astng; 
-# 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/logilab/common/textutils.py \
-    pkg.debug.reason=usr/lib/python2.6/vendor-packages/pylint/utils.py \
-    type=require
-depend fmri=__TBD \
-    pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/logilab/astng/nodes.py \
-    pkg.debug.reason=usr/lib/python2.6/vendor-packages/pylint/lint.py \
-    type=require
+#depend fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+#    predicate=runtime/python-26 \
+#    type=conditional
+
+depend fmri=developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/python/cherrypy/cherrypy-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/cherrypy/cherrypy-26.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -34,7 +34,13 @@
 
 license cherrypy.copyright license=BSD
 
-depend fmri=library/python-2/[email protected] type=optional
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the cherrypy package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+       type=require
 
 dir path=usr
 dir path=usr/bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/cherrypy-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,159 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
+set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream value="CherryPy Team <[email protected]>"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/259
+
+license cherrypy.copyright license=BSD
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the lcms package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) type=require
+
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/cherrypy
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/lib
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/process
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/scaffold
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/scaffold/static
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/test
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/test/static
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial
+dir path=usr/lib/python2.7/vendor-packages/cherrypy/wsgiserver
+file path=usr/lib/python2.7/vendor-packages/CherryPy-3.1.2-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/cherrypy/__init__.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpcgifs.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpchecker.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpconfig.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpdispatch.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cperror.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cplogging.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpmodpy.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cprequest.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpserver.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpthreadinglocal.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cptools.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cptree.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpwsgi_server.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/_cpwsgi.py
+# pkgdepend(1) and python 2.7 don't play well yet.
+file path=usr/lib/python2.7/vendor-packages/cherrypy/cherryd mode=0555 \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.7/vendor-packages/cherrypy/favicon.ico
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/__init__.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/auth.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/caching.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/covercp.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/cptools.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/encoding.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/http.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/httpauth.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/profiler.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/safemime.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/sessions.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/static.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/tidy.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/wsgiapp.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/lib/xmlrpc.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/LICENSE.txt
+file path=usr/lib/python2.7/vendor-packages/cherrypy/process/__init__.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/process/plugins.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/process/servers.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/process/win32.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/process/wspbus.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/scaffold/__init__.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/scaffold/example.conf
+file path=usr/lib/python2.7/vendor-packages/cherrypy/scaffold/site.conf
+file path=usr/lib/python2.7/vendor-packages/cherrypy/scaffold/static/made_with_cherrypy_small.png
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/__init__.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/benchmark.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/checkerdemo.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/helper.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/logtest.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/modfcgid.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/modpy.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/modwsgi.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/py25.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/static/dirback.jpg
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/static/index.html
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/style.css
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_caching.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_config.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_conn.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_core.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_encoding.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_etags.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_http.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_httpauth.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_httplib.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_logging.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_misc_tools.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_objectmapping.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_proxy.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_refleaks.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_routes.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_safe_multipart.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_session.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_sessionauthenticate.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_states_demo.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_states.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_static.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_tidy.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_tools.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_tutorials.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_virtualhost.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_wsgi_ns.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_wsgi_vhost.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_wsgiapps.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test_xmlrpc.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test.pem
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/test.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/test/webtest.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/__init__.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/bonus-sqlobject.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/custom_error.html
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/pdf_file.pdf
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/README.txt
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut01_helloworld.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut02_expose_methods.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut03_get_and_post.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut04_complex_site.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut05_derived_objects.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut06_default_method.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut07_sessions.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut08_generators_and_yield.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut09_files.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tut10_http_errors.py
+file path=usr/lib/python2.7/vendor-packages/cherrypy/tutorial/tutorial.conf
+file path=usr/lib/python2.7/vendor-packages/cherrypy/wsgiserver/__init__.py
--- a/components/python/cherrypy/cherrypy.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/cherrypy/cherrypy.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -30,5 +30,10 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=library/python-2/cherrypy-26 predicate=runtime/python-26 \
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/python/coverage/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/coverage/Makefile	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.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -36,6 +36,10 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+# Building for Python 2.7 requires a corresponding setuptools package, so only
+# build the Python 2.6 version for now.
+PYTHON_VERSIONS=2.6
+
 # common targets
 build:		$(BUILD_32)
 
--- a/components/python/coverage/coverage-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/coverage/coverage-26.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -39,7 +39,12 @@
 license jquery.copyright license=MIT-1
 license jquery.isonscreen.copyright license=MIT-2
 
-depend fmri=library/python-2/[email protected] type=optional
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the coverage package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) type=require
 
 dir path=usr
 dir path=usr/bin
--- a/components/python/coverage/coverage.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/coverage/coverage.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -30,6 +30,7 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=library/python-2/coverage-26 predicate=runtime/python-26 \
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
 
--- a/components/python/ldtp/ldtp-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/ldtp/ldtp-26.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.
 #
 
 set name=pkg.fmri value=pkg:/system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,7 +33,13 @@
 
 license ldtp.copyright license=LGPLv2.1
 
-depend fmri=system/desktop/[email protected] type=optional
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the ldtp package
+depend fmri=system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
 
 dir path=usr
 dir path=usr/bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ldtp/ldtp-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,79 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+#<transform file path=usr/lib/python2.7/vendor-packages/.*\.py$ -> \
+#    set pkg.tmp.autopyc true>
+
+set name=pkg.fmri value=pkg:/system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Linux Desktop Testing Project"
+set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
+set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/261
+
+license ldtp.copyright license=LGPLv2.1
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the ldtp package
+depend fmri=system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/ldtp
+dir path=usr/lib/python2.7/vendor-packages/ldtpd
+dir path=usr/lib/python2.7/vendor-packages/ldtputils
+dir path=usr/lib/python2.7/vendor-packages/ooldtp
+file path=usr/lib/python2.7/vendor-packages/ldtp-2.1.1-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/ldtp/__init__.py
+file path=usr/lib/python2.7/vendor-packages/ldtp/client_exception.py
+file path=usr/lib/python2.7/vendor-packages/ldtp/client.py
+file path=usr/lib/python2.7/vendor-packages/ldtp/log.py
+file path=usr/lib/python2.7/vendor-packages/ldtp/state.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/__init__.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/combo_box.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/constants.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/core.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/generic.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/keypress_actions.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/log.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/menu.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/mouse.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/page_tab_list.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/sequence_step.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/server_exception.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/table.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/text.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/utils.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/value.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/waiters.py
+file path=usr/lib/python2.7/vendor-packages/ldtpd/xmlrpc_daemon.py
+file path=usr/lib/python2.7/vendor-packages/ldtputils/__init__.py
+file path=usr/lib/python2.7/vendor-packages/ooldtp/__init__.py
+file path=usr/lib/python2.7/vendor-packages/ooldtp/_context.py
--- a/components/python/ldtp/ldtp.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/ldtp/ldtp.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.
 #
 
 set name=pkg.fmri value=pkg:/system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -29,5 +29,10 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=system/desktop/ldtp-26 predicate=runtime/python-26 \
+depend fmri=system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
+
+depend fmri=system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/python/m2crypto/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/m2crypto/Makefile	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.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -36,6 +36,9 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+# build modules PIC (needed for Python 2.7)
+CFLAGS += $(CC_PIC)
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/m2crypto/m2crypto-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/m2crypto/m2crypto-26.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,7 +33,9 @@
 
 license m2crypto.copyright license=BSD
 
-depend fmri=library/python-2/[email protected] type=optional
+# force a dependency on the m2crypto package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
 
 dir path=usr
 dir path=usr/lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/m2crypto-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,92 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python interface for openssl"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream value="Heikki Toivonen <[email protected]>"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/262
+
+license m2crypto.copyright license=BSD
+
+# force a dependency on the m2crypto package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
+dir path=usr
+dir path=usr/lib
+dir path=/usr/lib/python2.7
+dir path=/usr/lib/python2.7/vendor-packages
+dir path=/usr/lib/python2.7/vendor-packages/M2Crypto
+dir path=/usr/lib/python2.7/vendor-packages/M2Crypto/64
+dir path=/usr/lib/python2.7/vendor-packages/M2Crypto/PGP
+dir path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto-0.21.1-py2.7.egg-info
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/__init__.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/__m2crypto.so
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/64/__m2crypto.so
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/ASN1.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/AuthCookie.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/BIO.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/BN.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/callback.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/DH.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/DSA.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/EC.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/Engine.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/Err.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/EVP.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/ftpslib.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/httpslib.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/m2.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/m2urllib.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/m2urllib2.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/m2xmlrpclib.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/PGP/__init__.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/PGP/constants.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/PGP/packet.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/PGP/PublicKey.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/PGP/PublicKeyRing.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/PGP/RSA.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/Rand.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/RC4.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/RSA.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SMIME.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/__init__.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/cb.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/Checker.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/Cipher.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/Connection.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/Context.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/Session.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/ssl_dispatcher.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/SSLServer.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/timeout.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/SSL/TwistedProtocolWrapper.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/threading.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/util.py
+file path=/usr/lib/python2.7/vendor-packages/M2Crypto/X509.py
--- a/components/python/m2crypto/m2crypto.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/m2crypto/m2crypto.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -29,5 +29,10 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=library/python-2/m2crypto-26 predicate=runtime/python-26 \
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/python/mako/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/mako/Makefile	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.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -36,6 +36,10 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+# Building for Python 2.7 requires a corresponding setuptools package, so only
+# build the Python 2.6 version for now.
+PYTHON_VERSIONS=2.6
+
 # common targets
 build:		$(BUILD_32)
 
--- a/components/python/mako/mako-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/mako/mako-26.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -34,8 +34,13 @@
 
 license mako.copyright license=MIT
 
-depend fmri=runtime/python-26 type=require
-depend fmri=library/python-2/[email protected] type=optional
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the mako package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
 
 dir path=usr
 dir path=usr/lib
--- a/components/python/mako/mako.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/mako/mako.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -30,5 +30,6 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=library/python-2/mako-26 predicate=runtime/python-26 \
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
--- a/components/python/ply/ply-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/ply/ply-26.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -34,8 +34,13 @@
 
 license ply.copyright license=LGPLv2.1
 
-depend fmri=runtime/python-26 type=require
-depend fmri=library/python-2/[email protected] type=optional
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the ply package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
 
 dir path=usr
 dir path=usr/lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/ply-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,55 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Lex and yacc parsing tools for Python"
+set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream value="David Beazley <[email protected]>"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/264
+
+license ply.copyright license=LGPLv2.1
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the ply package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/ply
+file path=usr/lib/python2.7/vendor-packages/ply-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/ply/__init__.py
+file path=usr/lib/python2.7/vendor-packages/ply/cpp.py
+file path=usr/lib/python2.7/vendor-packages/ply/ctokens.py
+file path=usr/lib/python2.7/vendor-packages/ply/lex.py
+file path=usr/lib/python2.7/vendor-packages/ply/yacc.py
--- a/components/python/ply/ply.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/ply/ply.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -30,5 +30,10 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=library/python-2/ply-26 predicate=runtime/python-26 \
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/python/pybonjour/pybonjour-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pybonjour/pybonjour-26.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -34,9 +34,15 @@
 
 license pybonjour.copyright license=BSD
 
-depend fmri=runtime/python-26 type=require
 depend fmri=service/network/dns/mdns type=require
-depend fmri=library/python-2/[email protected] type=optional
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the pybonjour package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
 
 dir path=usr
 dir path=usr/lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/pybonjour-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,50 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for bonjour / dns-sd"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream value="Christopher Stawarz <[email protected]>"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/265
+
+license pybonjour.copyright license=BSD
+
+depend fmri=service/network/dns/mdns type=require
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the pybonjour package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+file path=usr/lib/python2.7/vendor-packages/pybonjour-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/pybonjour.py
--- a/components/python/pybonjour/pybonjour.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pybonjour/pybonjour.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -30,6 +30,11 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=library/python-2/pybonjour-26 predicate=runtime/python-26 \
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
 
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
+
--- a/components/python/pycups/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pycups/Makefile	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.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -39,6 +39,9 @@
 # pycups requires VERSION to be defined. Originally set in the package Makefile
 CFLAGS += -DVERSION=\\\"$(COMPONENT_VERSION)\\\"
 
+# build modules PIC (needed for Python 2.7)
+CFLAGS += $(CC_PIC)
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycups/pycups-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,43 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python language bindings for CUPS"
+set name=info.classification value=org.opensolaris.category.2008:System/Printing
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/273/
+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/64
+file path=usr/lib/python2.6/vendor-packages/64/cups.so
+file path=usr/lib/python2.6/vendor-packages/cups.so
+license pycups.copyright license=LGPLv2.1
+
+# force a dependency on the pycups package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycups/pycups-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,44 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python language bindings for CUPS"
+set name=info.classification value=org.opensolaris.category.2008:System/Printing
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/273/
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
+file path=usr/lib/python2.7/vendor-packages/64/cups.so
+file path=usr/lib/python2.7/vendor-packages/cups-1.0-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/cups.so
+license pycups.copyright license=LGPLv2.1
+
+# force a dependency on the pycups package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- a/components/python/pycups/pycups.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pycups/pycups.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -28,11 +28,12 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/273/
 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/64
-file path=usr/lib/python2.6/vendor-packages/64/cups.so
-file path=usr/lib/python2.6/vendor-packages/cups.so
-license pycups.copyright license=LGPLv2.1
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
+
--- a/components/python/pycurl/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pycurl/Makefile	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.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -40,6 +40,12 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+# build modules PIC (needed for Python 2.7)
+CFLAGS += $(CC_PIC)
+
+# to make sure that the docs get installed in the right place.
+PYTHON_DATA = /usr
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/pycurl/pycurl-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pycurl/pycurl-26.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,7 +33,9 @@
 
 license pycurl.copyright license=MIT
 
-depend fmri=library/python-2/[email protected] type=optional
+# force a dependency on the pycurl package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
 
 dir path=usr
 dir path=usr/lib
@@ -41,62 +43,8 @@
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/64
 dir path=usr/lib/python2.6/vendor-packages/curl
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/pycurl
-dir path=usr/share/doc/pycurl/examples
-dir path=usr/share/doc/pycurl/html
-dir path=usr/share/doc/pycurl/tests
 file path=usr/lib/python2.6/vendor-packages/64/pycurl.so
 file path=usr/lib/python2.6/vendor-packages/curl/__init__.py
 file \
     path=usr/lib/python2.6/vendor-packages/pycurl-$(COMPONENT_VERSION)-py2.6.egg-info
 file path=usr/lib/python2.6/vendor-packages/pycurl.so
-file path=usr/share/doc/pycurl/COPYING
-file path=usr/share/doc/pycurl/COPYING2
-file path=usr/share/doc/pycurl/ChangeLog
-file path=usr/share/doc/pycurl/INSTALL
-file path=usr/share/doc/pycurl/README
-file path=usr/share/doc/pycurl/TODO
-file path=usr/share/doc/pycurl/examples/basicfirst.py
-file path=usr/share/doc/pycurl/examples/file_upload.py
-file path=usr/share/doc/pycurl/examples/linksys.py
-file path=usr/share/doc/pycurl/examples/retriever-multi.py
-file path=usr/share/doc/pycurl/examples/retriever.py
-file path=usr/share/doc/pycurl/examples/sfquery.py
-file path=usr/share/doc/pycurl/examples/xmlrpc_curl.py
-file path=usr/share/doc/pycurl/html/callbacks.html
-file path=usr/share/doc/pycurl/html/curlmultiobject.html
-file path=usr/share/doc/pycurl/html/curlobject.html
-file path=usr/share/doc/pycurl/html/curlshareobject.html
-file path=usr/share/doc/pycurl/html/pycurl.html
-file path=usr/share/doc/pycurl/tests/test.py
-file path=usr/share/doc/pycurl/tests/test_cb.py
-file path=usr/share/doc/pycurl/tests/test_debug.py
-file path=usr/share/doc/pycurl/tests/test_ftp.py
-file path=usr/share/doc/pycurl/tests/test_getinfo.py
-file path=usr/share/doc/pycurl/tests/test_gtk.py
-file path=usr/share/doc/pycurl/tests/test_internals.py
-file path=usr/share/doc/pycurl/tests/test_memleak.py
-file path=usr/share/doc/pycurl/tests/test_multi.py
-file path=usr/share/doc/pycurl/tests/test_multi2.py
-file path=usr/share/doc/pycurl/tests/test_multi3.py
-file path=usr/share/doc/pycurl/tests/test_multi4.py
-file path=usr/share/doc/pycurl/tests/test_multi5.py
-file path=usr/share/doc/pycurl/tests/test_multi6.py
-file path=usr/share/doc/pycurl/tests/test_multi_socket.py
-file path=usr/share/doc/pycurl/tests/test_multi_socket_select.py
-file path=usr/share/doc/pycurl/tests/test_multi_timer.py
-file path=usr/share/doc/pycurl/tests/test_multi_vs_thread.py
-file path=usr/share/doc/pycurl/tests/test_post.py
-file path=usr/share/doc/pycurl/tests/test_post2.py
-file path=usr/share/doc/pycurl/tests/test_post3.py
-file path=usr/share/doc/pycurl/tests/test_share.py
-file path=usr/share/doc/pycurl/tests/test_socketopen.py
-file path=usr/share/doc/pycurl/tests/test_stringio.py
-file path=usr/share/doc/pycurl/tests/test_xmlrpc.py
-file path=usr/share/doc/pycurl/tests/util.py
-
-# we have to reverse the autopyc transform for stuff in /usr/share/doc
-# since there are only py files there
-<transform file path=usr/share/doc/.+\.pyc$ -> drop>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/pycurl-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,49 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for libcurl"
+set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/266
+
+license pycurl.copyright license=MIT
+
+# force a dependency on the pycurl package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
+dir path=usr/lib/python2.7/vendor-packages/curl
+file path=usr/lib/python2.7/vendor-packages/64/pycurl.so
+file path=usr/lib/python2.7/vendor-packages/curl/__init__.py
+file path=usr/lib/python2.7/vendor-packages/pycurl-7.19.0-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/pycurl.so
--- a/components/python/pycurl/pycurl.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pycurl/pycurl.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.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -28,6 +28,72 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/266
 
-depend fmri=library/python-2/pycurl-26 predicate=runtime/python-26 \
+
+license pycurl.copyright license=MIT
+
+dir path=usr
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/pycurl
+dir path=usr/share/doc/pycurl/examples
+dir path=usr/share/doc/pycurl/html
+dir path=usr/share/doc/pycurl/tests
+file path=usr/share/doc/pycurl/COPYING
+file path=usr/share/doc/pycurl/COPYING2
+file path=usr/share/doc/pycurl/ChangeLog
+file path=usr/share/doc/pycurl/INSTALL
+file path=usr/share/doc/pycurl/README
+file path=usr/share/doc/pycurl/TODO
+file path=usr/share/doc/pycurl/examples/basicfirst.py
+file path=usr/share/doc/pycurl/examples/file_upload.py
+file path=usr/share/doc/pycurl/examples/linksys.py
+file path=usr/share/doc/pycurl/examples/retriever-multi.py
+file path=usr/share/doc/pycurl/examples/retriever.py
+file path=usr/share/doc/pycurl/examples/sfquery.py
+file path=usr/share/doc/pycurl/examples/xmlrpc_curl.py
+file path=usr/share/doc/pycurl/html/callbacks.html
+file path=usr/share/doc/pycurl/html/curlmultiobject.html
+file path=usr/share/doc/pycurl/html/curlobject.html
+file path=usr/share/doc/pycurl/html/curlshareobject.html
+file path=usr/share/doc/pycurl/html/pycurl.html
+file path=usr/share/doc/pycurl/tests/test.py
+file path=usr/share/doc/pycurl/tests/test_cb.py
+file path=usr/share/doc/pycurl/tests/test_debug.py
+file path=usr/share/doc/pycurl/tests/test_ftp.py
+file path=usr/share/doc/pycurl/tests/test_getinfo.py
+file path=usr/share/doc/pycurl/tests/test_gtk.py
+file path=usr/share/doc/pycurl/tests/test_internals.py
+file path=usr/share/doc/pycurl/tests/test_memleak.py
+file path=usr/share/doc/pycurl/tests/test_multi.py
+file path=usr/share/doc/pycurl/tests/test_multi2.py
+file path=usr/share/doc/pycurl/tests/test_multi3.py
+file path=usr/share/doc/pycurl/tests/test_multi4.py
+file path=usr/share/doc/pycurl/tests/test_multi5.py
+file path=usr/share/doc/pycurl/tests/test_multi6.py
+file path=usr/share/doc/pycurl/tests/test_multi_socket.py
+file path=usr/share/doc/pycurl/tests/test_multi_socket_select.py
+file path=usr/share/doc/pycurl/tests/test_multi_timer.py
+file path=usr/share/doc/pycurl/tests/test_multi_vs_thread.py
+file path=usr/share/doc/pycurl/tests/test_post.py
+file path=usr/share/doc/pycurl/tests/test_post2.py
+file path=usr/share/doc/pycurl/tests/test_post3.py
+file path=usr/share/doc/pycurl/tests/test_share.py
+file path=usr/share/doc/pycurl/tests/test_socketopen.py
+file path=usr/share/doc/pycurl/tests/test_stringio.py
+file path=usr/share/doc/pycurl/tests/test_xmlrpc.py
+file path=usr/share/doc/pycurl/tests/util.py
+
+# we have to reverse the autopyc transform for stuff in /usr/share/doc
+# since there are only py files there
+<transform file path=usr/share/doc/.+\.pyc$ -> drop>
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
     type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/python/pylxml/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pylxml/Makefile	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.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -38,6 +38,9 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+# build modules PIC (needed for Python 2.7)
+CFLAGS += $(CC_PIC)
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylxml/pylxml-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,84 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/579
+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/lxml
+dir \
+    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info
+dir path=usr/lib/python2.6/vendor-packages/lxml/64
+dir path=usr/lib/python2.6/vendor-packages/lxml/html
+file \
+    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
+file \
+    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/lxml/64/etree.so
+file path=usr/lib/python2.6/vendor-packages/lxml/64/objectify.so
+file path=usr/lib/python2.6/vendor-packages/lxml/ElementInclude.py
+file path=usr/lib/python2.6/vendor-packages/lxml/__init__.py
+file path=usr/lib/python2.6/vendor-packages/lxml/_elementpath.py
+file path=usr/lib/python2.6/vendor-packages/lxml/builder.py
+file path=usr/lib/python2.6/vendor-packages/lxml/cssselect.py
+file path=usr/lib/python2.6/vendor-packages/lxml/doctestcompare.py
+file path=usr/lib/python2.6/vendor-packages/lxml/etree.so
+file path=usr/lib/python2.6/vendor-packages/lxml/html/ElementSoup.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/__init__.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/_dictmixin.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/_diffcommand.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/_setmixin.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/builder.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/clean.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/defs.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/diff.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/formfill.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/soupparser.py
+file path=usr/lib/python2.6/vendor-packages/lxml/html/usedoctest.py
+file path=usr/lib/python2.6/vendor-packages/lxml/objectify.so
+file path=usr/lib/python2.6/vendor-packages/lxml/pyclasslookup.py
+file path=usr/lib/python2.6/vendor-packages/lxml/sax.py
+file path=usr/lib/python2.6/vendor-packages/lxml/usedoctest.py
+license pylxml.copyright license="BSD, PSF, GPL"
+
+# force a dependency on the lxml package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylxml/pylxml-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,72 @@
+#
+# 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) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/579
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license pylxml.copyright license="BSD, PSF, GPL"
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/lxml
+dir path=usr/lib/python2.7/vendor-packages/lxml/64
+dir path=usr/lib/python2.7/vendor-packages/lxml/html
+file path=usr/lib/python2.7/vendor-packages/lxml-2.1.2-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/lxml/__init__.py
+file path=usr/lib/python2.7/vendor-packages/lxml/_elementpath.py
+file path=usr/lib/python2.7/vendor-packages/lxml/64/etree.so
+file path=usr/lib/python2.7/vendor-packages/lxml/64/objectify.so
+file path=usr/lib/python2.7/vendor-packages/lxml/builder.py
+file path=usr/lib/python2.7/vendor-packages/lxml/cssselect.py
+file path=usr/lib/python2.7/vendor-packages/lxml/doctestcompare.py
+file path=usr/lib/python2.7/vendor-packages/lxml/ElementInclude.py
+file path=usr/lib/python2.7/vendor-packages/lxml/etree.so
+file path=usr/lib/python2.7/vendor-packages/lxml/html/__init__.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/_dictmixin.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/_diffcommand.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/_setmixin.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/builder.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/clean.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/defs.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/diff.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/ElementSoup.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/formfill.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/soupparser.py
+file path=usr/lib/python2.7/vendor-packages/lxml/html/usedoctest.py
+file path=usr/lib/python2.7/vendor-packages/lxml/objectify.so
+file path=usr/lib/python2.7/vendor-packages/lxml/pyclasslookup.py
+file path=usr/lib/python2.7/vendor-packages/lxml/sax.py
+file path=usr/lib/python2.7/vendor-packages/lxml/usedoctest.py
+
+# force a dependency on the lxml package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- a/components/python/pylxml/pylxml.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pylxml/pylxml.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -18,11 +18,11 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
 set name=info.classification \
@@ -32,48 +32,11 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/579
 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/lxml
-dir \
-    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info
-dir path=usr/lib/python2.6/vendor-packages/lxml/64
-dir path=usr/lib/python2.6/vendor-packages/lxml/html
-file \
-    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
-file \
-    path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
-file path=usr/lib/python2.6/vendor-packages/lxml/64/etree.so
-file path=usr/lib/python2.6/vendor-packages/lxml/64/objectify.so
-file path=usr/lib/python2.6/vendor-packages/lxml/ElementInclude.py
-file path=usr/lib/python2.6/vendor-packages/lxml/__init__.py
-file path=usr/lib/python2.6/vendor-packages/lxml/_elementpath.py
-file path=usr/lib/python2.6/vendor-packages/lxml/builder.py
-file path=usr/lib/python2.6/vendor-packages/lxml/cssselect.py
-file path=usr/lib/python2.6/vendor-packages/lxml/doctestcompare.py
-file path=usr/lib/python2.6/vendor-packages/lxml/etree.so
-file path=usr/lib/python2.6/vendor-packages/lxml/html/ElementSoup.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/__init__.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/_dictmixin.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/_diffcommand.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/_setmixin.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/builder.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/clean.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/defs.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/diff.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/formfill.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/soupparser.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/usedoctest.py
-file path=usr/lib/python2.6/vendor-packages/lxml/objectify.so
-file path=usr/lib/python2.6/vendor-packages/lxml/pyclasslookup.py
-file path=usr/lib/python2.6/vendor-packages/lxml/sax.py
-file path=usr/lib/python2.6/vendor-packages/lxml/usedoctest.py
-license pylxml.copyright license="BSD, PSF, GPL"
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- a/components/python/pyopenssl/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pyopenssl/Makefile	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.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -36,6 +36,9 @@
 include $(WS_TOP)/make-rules/setup.py.mk
 include $(WS_TOP)/make-rules/ips.mk
 
+# build modules PIC (needed for Python 2.7)
+CFLAGS += $(CC_PIC)
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/pyopenssl/pyopenssl-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pyopenssl/pyopenssl-26.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.
 #
 
 set name=pkg.fmri \
@@ -38,9 +38,6 @@
 dir path=usr/lib/python2.6/vendor-packages/OpenSSL
 dir path=usr/lib/python2.6/vendor-packages/OpenSSL/64
 dir path=usr/lib/python2.6/vendor-packages/OpenSSL/test
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/pyOpenSSL
 file path=usr/lib/python2.6/vendor-packages/OpenSSL/64/SSL.so
 file path=usr/lib/python2.6/vendor-packages/OpenSSL/64/crypto.so
 file path=usr/lib/python2.6/vendor-packages/OpenSSL/64/rand.so
@@ -56,5 +53,9 @@
 file path=usr/lib/python2.6/vendor-packages/OpenSSL/tsafe.py
 file path=usr/lib/python2.6/vendor-packages/OpenSSL/version.py
 file path=usr/lib/python2.6/vendor-packages/pyOpenSSL-0.11-py2.6.egg-info
-file pyOpenSSL.txt path=usr/share/doc/pyOpenSSL/pyOpenSSL.txt
 license pyopenssl.copyright license=LGPLv2.1
+
+# force a dependency on the pyopenssl package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyopenssl/pyopenssl-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,61 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python interface to the OpenSSL library"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/176
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license pyopenssl.copyright license=LGPLv2.1
+
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/OpenSSL
+dir path=usr/lib/python2.7/vendor-packages/OpenSSL/64
+dir path=usr/lib/python2.7/vendor-packages/OpenSSL/test
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/__init__.py
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/64/crypto.so
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/64/rand.so
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/64/SSL.so
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/crypto.so
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/rand.so
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/SSL.so
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/test/__init__.py
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/test/test_crypto.py
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/test/test_rand.py
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/test/test_ssl.py
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/test/util.py
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/tsafe.py
+file path=usr/lib/python2.7/vendor-packages/OpenSSL/version.py
+file path=usr/lib/python2.7/vendor-packages/pyOpenSSL-0.11-py2.7.egg-info
+
+# force a dependency on the pyopenssl package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyopenssl/pyopenssl.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,50 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python interface to the OpenSSL library"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/176
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/lib
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/pyOpenSSL
+# pkg.linted needed until the reference repo is updated
+file pyOpenSSL.txt path=usr/share/doc/pyOpenSSL/pyOpenSSL.txt \
+    pkg.linted.pkglint.dupaction001.1=true 
+license pyopenssl.copyright license=LGPLv2.1
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/Makefile	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,50 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		setuptools
+COMPONENT_VERSION=	0.6
+COMPONENT_SUBVERSION=	11
+IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).$(COMPONENT_SUBVERSION)
+
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)c$(COMPONENT_SUBVERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:8d1ad6384d358c547c50c60f1bfdb3362c6c4a7d
+COMPONENT_ARCHIVE_URL=	http://pypi.python.org/packages/source/s/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/setuptools-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,96 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/084
+
+license setuptools.copyright license="PSF, ZPL"
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/bin
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info
+dir path=usr/lib/python2.6/vendor-packages/setuptools
+file path=usr/lib/python2.6/vendor-packages/easy_install.py
+file path=usr/lib/python2.6/vendor-packages/site.py
+file path=usr/lib/python2.6/vendor-packages/pkg_resources.py
+file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/zip-safe
+file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/entry_points.txt
+file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/setuptools-0.6c11-py2.6.egg-info/top_level.txt
+dir path=usr/lib/python2.6/vendor-packages/setuptools/command
+dir path=usr/lib/python2.6/vendor-packages/setuptools/tests
+file path=usr/lib/python2.6/vendor-packages/setuptools/sandbox.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/extension.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/package_index.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/depends.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/gui.exe
+file path=usr/lib/python2.6/vendor-packages/setuptools/archive_util.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/dist.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/__init__.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/cli.exe
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/register.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/setopt.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/saveopts.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/install.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/__init__.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/build_py.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/bdist_egg.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/develop.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/build_ext.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/upload.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/easy_install.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/test.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/rotate.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/sdist.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/install_lib.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/install_egg_info.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/egg_info.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/bdist_wininst.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/alias.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/bdist_rpm.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/command/install_scripts.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/tests/test_packageindex.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/tests/test_resources.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/tests/__init__.py
+file path=usr/lib/python2.6/vendor-packages/setuptools/tests/doctest.py
+file path=usr/bin/easy_install-2.6
+
+# force a dependency on the Python 2.6 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.6 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the setuptools package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/setuptools-27.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,96 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/084
+
+license setuptools.copyright license="PSF, ZPL"
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/bin
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info
+dir path=usr/lib/python2.7/vendor-packages/setuptools
+file path=usr/lib/python2.7/vendor-packages/pkg_resources.py
+file path=usr/lib/python2.7/vendor-packages/easy_install.py
+file path=usr/lib/python2.7/vendor-packages/site.py
+file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/zip-safe
+file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/top_level.txt
+file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/entry_points.txt
+file path=usr/lib/python2.7/vendor-packages/setuptools-0.6c11-py2.7.egg-info/SOURCES.txt
+dir path=usr/lib/python2.7/vendor-packages/setuptools/command
+dir path=usr/lib/python2.7/vendor-packages/setuptools/tests
+file path=usr/lib/python2.7/vendor-packages/setuptools/archive_util.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/depends.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/gui.exe
+file path=usr/lib/python2.7/vendor-packages/setuptools/__init__.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/package_index.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/sandbox.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/extension.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/cli.exe
+file path=usr/lib/python2.7/vendor-packages/setuptools/dist.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/develop.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/easy_install.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/install.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/bdist_wininst.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/egg_info.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/rotate.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/install_scripts.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/bdist_rpm.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/__init__.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/register.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/saveopts.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/upload.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/build_py.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/alias.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/test.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/install_lib.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/install_egg_info.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/setopt.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/build_ext.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/bdist_egg.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/command/sdist.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/tests/test_packageindex.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/tests/__init__.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/tests/doctest.py
+file path=usr/lib/python2.7/vendor-packages/setuptools/tests/test_resources.py pkg.depend.bypass-generate=.*
+file path=usr/bin/easy_install-2.7 pkg.depend.bypass-generate=.*
+
+# force a dependency on the Python 2.7 runtime
+depend fmri=__TBD pkg.debug.depend.file=python2.7 \
+       pkg.debug.depend.path=usr/bin type=require
+
+# force a dependency on the setuptools package
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/setuptools.copyright	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,123 @@
+Python License
+==============
+
+Open Source Initiative OSI - Python Software Foundation License:Licensing
+Submitted by nelson on Tue, 2006-10-31 04:56. ::
+
+Python Software Foundation License
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee. This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+
+Zope License
+============
+Open Source Initiative OSI - The Zope Public License Ver.2.0:Licensing
+Submitted by nelson on Tue, 2006-10-31 04:56. ::
+
+Zope Public License (ZPL) Version 2.0
+-----------------------------------------------
+
+This software is Copyright (c) Zope Corporation (tm) and
+Contributors. All rights reserved.
+
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions in source code must retain the above
+   copyright notice, this list of conditions, and the following
+   disclaimer.
+
+2. Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials
+   provided with the distribution.
+
+3. The name Zope Corporation (tm) must not be used to
+   endorse or promote products derived from this software
+   without prior written permission from Zope Corporation.
+
+4. The right to distribute this software or to use it for
+   any purpose does not give you the right to use Servicemarks
+   (sm) or Trademarks (tm) of Zope Corporation. Use of them is
+   covered in a separate agreement (see
+   http://www.zope.com/Marks).
+
+5. If any files are modified, you must cause the modified
+   files to carry prominent notices stating that you changed
+   the files and the date of any change.
+
+Disclaimer
+
+  THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
+  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+  NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+  DAMAGE.
+
+
+This software consists of contributions made by Zope
+Corporation and many individuals on behalf of Zope
+Corporation.  Specific attributions are listed in the
+accompanying credits file.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/setuptools.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -0,0 +1,44 @@
+#
+# 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) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir  path=usr
+dir  path=usr/bin
+link path=usr/bin/easy_install target=easy_install-2.7
+
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-26 \
+    type=conditional
+depend fmri=library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27 \
+    type=conditional
+
+legacy pkg=SUNWpython-setuptools \
+    desc="Download, build, install, upgrade, and uninstall Python packages easily" \
+    name="setuptools"
--- a/components/rdiff-backup/Makefile	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/rdiff-backup/Makefile	Fri Feb 24 13:30:24 2012 -0800
@@ -19,7 +19,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.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -36,6 +36,11 @@
 include $(WS_TOP)/make-rules/ips.mk
 include $(WS_TOP)/make-rules/setup.py.mk
 
+# just build a Python 2.6 version for now, when the 2.7 modules show up, we can
+# switch
+PYTHON_VERSIONS = 2.6
+PYTHON_DATA = /usr
+
 # common targets
 
 build:		$(BUILD_32)
--- a/make-rules/setup.py.mk	Thu Feb 23 15:58:00 2012 -0800
+++ b/make-rules/setup.py.mk	Fri Feb 24 13:30:24 2012 -0800
@@ -18,14 +18,16 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 $(BUILD_DIR)/%-2.6/.built:		PYTHON_VERSION=2.6
+$(BUILD_DIR)/%-2.7/.built:		PYTHON_VERSION=2.7
 $(BUILD_DIR)/$(MACH32)-%/.built:	BITS=32
 $(BUILD_DIR)/$(MACH64)-%/.built:	BITS=64
 
 $(BUILD_DIR)/%-2.6/.installed:		PYTHON_VERSION=2.6
+$(BUILD_DIR)/%-2.7/.installed:		PYTHON_VERSION=2.7
 $(BUILD_DIR)/$(MACH32)-%/.installed:	BITS=32
 $(BUILD_DIR)/$(MACH64)-%/.installed:	BITS=64
 
@@ -38,6 +40,14 @@
 PYTHON_ENV =	CC="$(CC)"
 PYTHON_ENV +=	CFLAGS="$(CFLAGS)"
 
+# if we are building python 2.7 support, build it and install it first
+# so that python 2.6 is installed last and is the canonical version.
+# when we switch to 2.7 as the default, it should go last.
+ifneq ($(findstring 2.7,$(PYTHON_VERSIONS)),)
+$(BUILD_DIR)/%-2.6/.build:	$(BUILD_DIR)/%-2.7/.build
+$(BUILD_DIR)/%-2.6/.installed:	$(BUILD_DIR)/%-2.7/.installed
+endif
+
 # build the configured source
 $(BUILD_DIR)/%/.built:	$(SOURCE_DIR)/.prep
 	$(RM) -r $(@D) ; $(MKDIR) $(@D)
@@ -51,6 +61,10 @@
 
 COMPONENT_INSTALL_ARGS +=	--root $(PROTO_DIR) 
 COMPONENT_INSTALL_ARGS +=	--install-lib=$(PYTHON_LIB)
+COMPONENT_INSTALL_ARGS +=	--install-purelib=$(PYTHON_LIB)
+COMPONENT_INSTALL_ARGS +=	--install-platlib=$(PYTHON_LIB)
+COMPONENT_INSTALL_ARGS +=	--install-data=$(PYTHON_DATA)
+COMPONENT_INSTALL_ARGS +=	--force
 
 # install the built source into a prototype area
 $(BUILD_DIR)/%/.installed:	$(BUILD_DIR)/%/.built
--- a/make-rules/shared-macros.mk	Thu Feb 23 15:58:00 2012 -0800
+++ b/make-rules/shared-macros.mk	Fri Feb 24 13:30:24 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 PATH=/usr/bin:/usr/gnu/bin
@@ -78,7 +78,7 @@
 COMPILER =		studio
 BITS =			32
 PYTHON_VERSION =	2.6
-PYTHON_VERSIONS =	2.6
+PYTHON_VERSIONS =	2.7 2.6
 
 BASS_O_MATIC =	$(WS_TOOLS)/bass-o-matic
 
@@ -239,6 +239,14 @@
 
 LD =		/usr/bin/ld
 
+PYTHON.2.6.VENDOR_PACKAGES.32 = /usr/lib/python2.6/vendor-packages
+PYTHON.2.6.VENDOR_PACKAGES.64 = /usr/lib/python2.6/vendor-packages/64
+PYTHON.2.6.VENDOR_PACKAGES = $(PYTHON.2.6.VENDOR_PACKAGES.$(BITS))
+
+PYTHON.2.7.VENDOR_PACKAGES.32 = /usr/lib/python2.7/vendor-packages
+PYTHON.2.7.VENDOR_PACKAGES.64 = /usr/lib/python2.7/vendor-packages/64
+PYTHON.2.7.VENDOR_PACKAGES = $(PYTHON.2.7.VENDOR_PACKAGES.$(BITS))
+
 PYTHON_VENDOR_PACKAGES.32 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages
 PYTHON_VENDOR_PACKAGES.64 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
 PYTHON_VENDOR_PACKAGES = $(PYTHON_VENDOR_PACKAGES.$(BITS))
@@ -246,6 +254,9 @@
 PYTHON.2.6.32 =	/usr/bin/python2.6
 PYTHON.2.6.64 =	/usr/bin/$(MACH64)/python2.6
 
+PYTHON.2.7.32 =	/usr/bin/python2.7
+PYTHON.2.7.64 =	/usr/bin/$(MACH64)/python2.7
+
 PYTHON.32 =	$(PYTHON.$(PYTHON_VERSION).$(BITS))
 PYTHON.64 =	$(PYTHON.$(PYTHON_VERSION).$(BITS))
 PYTHON =	$(PYTHON.$(PYTHON_VERSION).$(BITS))
@@ -254,6 +265,7 @@
 # Modules which are shipped by the OS but not with the core Python distribution
 # belong in vendor-packages.
 PYTHON_LIB= /usr/lib/python$(PYTHON_VERSION)/vendor-packages
+PYTHON_DATA= $(PYTHON_LIB)
 
 JAVA_HOME =	/usr/jdk/instances/jdk1.6.0