--- a/components/python/python27/python-27.p5m	Fri Apr 05 15:35:37 2013 -0700
+++ b/components/python/python27/python-27.p5m	Tue Apr 09 10:37:15 2013 -0700
@@ -40,78 +40,22 @@
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-# pkgdepend doesn't like python 2.7 yet
-<transform file path=.+\.py$ -> \
-    default pkg.depend.bypass-generate .* >
-
 license python27.license license=PSFv2
 
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH32)
-dir path=usr/bin/$(MACH64)
-dir path=usr/include
-dir path=usr/include/python2.7
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
 #dir path=usr/lib/$(MACH64)/python2.7
 #dir path=usr/lib/$(MACH64)/python2.7/config
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/bsddb
-dir path=usr/lib/python2.7/compiler
-dir path=usr/lib/python2.7/config
-dir path=usr/lib/python2.7/ctypes
-dir path=usr/lib/python2.7/ctypes/macholib
-dir path=usr/lib/python2.7/curses
-dir path=usr/lib/python2.7/distutils
-dir path=usr/lib/python2.7/distutils/command
-dir path=usr/lib/python2.7/email
-dir path=usr/lib/python2.7/email/mime
-dir path=usr/lib/python2.7/encodings
-dir path=usr/lib/python2.7/hotshot
-dir path=usr/lib/python2.7/idlelib
-dir path=usr/lib/python2.7/idlelib/Icons
-dir path=usr/lib/python2.7/importlib
-dir path=usr/lib/python2.7/json
-dir path=usr/lib/python2.7/lib-dynload
-dir path=usr/lib/python2.7/lib-dynload/64
-dir path=usr/lib/python2.7/lib2to3
-dir path=usr/lib/python2.7/lib2to3/fixes
-dir path=usr/lib/python2.7/lib2to3/pgen2
-dir path=usr/lib/python2.7/logging
-dir path=usr/lib/python2.7/multiprocessing
-dir path=usr/lib/python2.7/multiprocessing/dummy
-dir path=usr/lib/python2.7/plat-sunos5
-dir path=usr/lib/python2.7/pydoc_data
-dir path=usr/lib/python2.7/site-packages
-dir path=usr/lib/python2.7/sqlite3
-dir path=usr/lib/python2.7/unittest
-dir path=usr/lib/python2.7/unittest/test
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/64
-dir path=usr/lib/python2.7/wsgiref
-dir path=usr/lib/python2.7/xml
-dir path=usr/lib/python2.7/xml/dom
-dir path=usr/lib/python2.7/xml/etree
-dir path=usr/lib/python2.7/xml/parsers
-dir path=usr/lib/python2.7/xml/sax
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
 
-file usr/bin/2to3 path=usr/bin/2to3-2.7 pkg.depend.bypass-generate=.*
-file usr/bin/idle path=usr/bin/idle-2.7 pkg.depend.bypass-generate=.*
-file usr/bin/pydoc path=usr/bin/pydoc-2.7 pkg.depend.bypass-generate=.*
-#file path=usr/bin/smtpd.py pkg.depend.bypass-generate=.* pkg.tmp.autopyc=false
-#file path=usr/bin/$(MACH64)/smtpd.py pkg.depend.bypass-generate=.* pkg.tmp.autopyc=false
+file usr/bin/2to3 path=usr/bin/2to3-2.7
+file usr/bin/idle path=usr/bin/idle-2.7
+file usr/bin/pydoc path=usr/bin/pydoc-2.7
+#file path=usr/bin/smtpd.py pkg.tmp.autopyc=false
+#file path=usr/bin/$(MACH64)/smtpd.py pkg.tmp.autopyc=false
 
 file usr/bin/python2.7           path=usr/bin/$(MACH32)/isapython2.7
 file usr/bin/$(MACH64)/python2.7 path=usr/bin/$(MACH64)/isapython2.7
 
-file path=usr/bin/$(MACH64)/python2.7-config pkg.depend.bypass-generate=.*
-file path=usr/bin/python2.7-config pkg.depend.bypass-generate=.*
+file path=usr/bin/$(MACH64)/python2.7-config
+file path=usr/bin/python2.7-config
 file path=usr/include/python2.7/Python-ast.h
 file path=usr/include/python2.7/Python.h
 file path=usr/include/python2.7/abstract.h
@@ -271,7 +215,7 @@
 file path=usr/lib/python2.7/bsddb/dbshelve.py
 file path=usr/lib/python2.7/bsddb/dbtables.py
 file path=usr/lib/python2.7/bsddb/dbutils.py
-file path=usr/lib/python2.7/cProfile.py
+file path=usr/lib/python2.7/cProfile.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/calendar.py
 file path=usr/lib/python2.7/cgi.py
 file path=usr/lib/python2.7/cgitb.py
@@ -904,7 +848,7 @@
 file path=usr/lib/python2.7/os.py
 file path=usr/lib/python2.7/os2emxpath.py
 file path=usr/lib/python2.7/pdb.doc
-file path=usr/lib/python2.7/pdb.py
+file path=usr/lib/python2.7/pdb.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/pickle.py
 file path=usr/lib/python2.7/pickletools.py
 file path=usr/lib/python2.7/pipes.py
@@ -916,14 +860,14 @@
 file path=usr/lib/python2.7/plat-sunos5/SUNAUDIODEV.py
 file path=usr/lib/python2.7/plat-sunos5/TYPES.py
 file path=usr/lib/python2.7/plat-sunos5/regen mode=0555
-file path=usr/lib/python2.7/platform.py
+file path=usr/lib/python2.7/platform.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/plistlib.py
 file path=usr/lib/python2.7/popen2.py
 file path=usr/lib/python2.7/poplib.py
 file path=usr/lib/python2.7/posixfile.py
 file path=usr/lib/python2.7/posixpath.py
 file path=usr/lib/python2.7/pprint.py
-file path=usr/lib/python2.7/profile.py
+file path=usr/lib/python2.7/profile.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/pstats.py
 file path=usr/lib/python2.7/pty.py
 file path=usr/lib/python2.7/py_compile.py
@@ -950,7 +894,7 @@
 file path=usr/lib/python2.7/site-packages/README
 file path=usr/lib/python2.7/site-packages/vendor-packages.pth
 file path=usr/lib/python2.7/site.py
-file path=usr/lib/python2.7/smtpd.py
+file path=usr/lib/python2.7/smtpd.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/smtplib.py
 file path=usr/lib/python2.7/sndhdr.py
 file path=usr/lib/python2.7/socket.py
@@ -985,7 +929,7 @@
 file path=usr/lib/python2.7/toaiff.py
 file path=usr/lib/python2.7/token.py
 file path=usr/lib/python2.7/tokenize.py
-file path=usr/lib/python2.7/trace.py
+file path=usr/lib/python2.7/trace.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/traceback.py
 file path=usr/lib/python2.7/tty.py
 file path=usr/lib/python2.7/types.py
@@ -1070,20 +1014,13 @@
 link path=usr/lib/libpython2.7.so target=libpython2.7.so.1.0
 link path=usr/lib/libpython2.7_db.so target=libpython2.7_db.so.1.0
 
-link path=usr/bin/2to3 target=2to3-2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.1=true
-link path=usr/bin/idle target=idle-2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.1=true
-link path=usr/bin/pydoc target=pydoc-2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.1=true
-link path=usr/bin/python target=python2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/bin/python-config target=python2.7-config mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/bin/$(MACH64)/python target=python2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/bin/$(MACH64)/python-config target=python2.7-config mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
+link path=usr/bin/2to3 target=2to3-2.7 mediator=python mediator-version=2.7
+link path=usr/bin/idle target=idle-2.7 mediator=python mediator-version=2.7
+link path=usr/bin/pydoc target=pydoc-2.7 mediator=python mediator-version=2.7
+link path=usr/bin/python target=python2.7 mediator=python mediator-version=2.7
+link path=usr/bin/python-config target=python2.7-config mediator=python mediator-version=2.7
+link path=usr/bin/$(MACH64)/python target=python2.7 mediator=python mediator-version=2.7
+link path=usr/bin/$(MACH64)/python-config target=python2.7-config mediator=python mediator-version=2.7
 link path=usr/lib/pkgconfig/python.pc target=python-2.7.pc mediator=python mediator-version=2.7
 link path=usr/lib/$(MACH64)/pkgconfig/python.pc target=python-2.7.pc mediator=python mediator-version=2.7
 link path=usr/share/man/man1/python.1 target=python2.7.1 mediator=python mediator-version=2.7