--- a/components/python/python34/python-34.p5m	Thu Oct 01 15:00:59 2015 -0700
+++ b/components/python/python34/python-34.p5m	Tue Sep 29 14:11:08 2015 -0700
@@ -20,17 +20,6 @@
 #
 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
-
-# bootstrap: pkgdepend doesn't like python 3.4 yet;
-# remove this block once it is installed on build machine
-# also look for other "XXX bootstrap" comments
-<transform file path=.+\.py$ -> \
-    default pkg.depend.bypass-generate .* >
-<transform file path=.+\.pyc$ -> \
-    default pkg.depend.bypass-generate .* >
-<transform file path=usr/bin.*$ -> \
-    default pkg.depend.bypass-generate .* >
-
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=.*/(idle_)?tests?/.* -> default facet.optional.test true>
 set name=pkg.fmri \
@@ -1001,17 +990,14 @@
 file path=usr/lib/python3.4/plat-sunos5/STROPTS.py
 file path=usr/lib/python3.4/plat-sunos5/TYPES.py
 file path=usr/lib/python3.4/plat-sunos5/regen
-# XXX bootstrap
-#file path=usr/lib/python3.4/platform.py
-#    pkg.depend.bypass-generate=.*/MacOS.*
-#    pkg.depend.bypass-generate=.*/_gestalt.*
-#    pkg.depend.bypass-generate=.*/java/__init__.py
-#    pkg.depend.bypass-generate=.*/lang.*
-#    pkg.depend.bypass-generate=.*/vms_lib.*
-#    pkg.depend.bypass-generate=.*/win32api.*
-#    pkg.depend.bypass-generate=.*/win32con.*
-#    pkg.depend.bypass-generate=.*/winreg.*
-file path=usr/lib/python3.4/platform.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python3.4/platform.py pkg.depend.bypass-generate=.*/MacOS.* \
+    pkg.depend.bypass-generate=.*/_gestalt.* \
+    pkg.depend.bypass-generate=.*/java/__init__.py \
+    pkg.depend.bypass-generate=.*/lang.* \
+    pkg.depend.bypass-generate=.*/vms_lib.* \
+    pkg.depend.bypass-generate=.*/win32api.* \
+    pkg.depend.bypass-generate=.*/win32con.* \
+    pkg.depend.bypass-generate=.*/winreg.*
 file path=usr/lib/python3.4/plistlib.py
 file path=usr/lib/python3.4/poplib.py
 file path=usr/lib/python3.4/posixpath.py
@@ -1368,10 +1354,8 @@
 file path=usr/lib/python3.4/test/randv2_64.pck
 file path=usr/lib/python3.4/test/randv3.pck
 file path=usr/lib/python3.4/test/re_tests.py
-# XXX bootstrap
-# file path=usr/lib/python3.4/test/regrtest.py
-#    pkg.depend.bypass-generate=.*/msvcrt.*
-file path=usr/lib/python3.4/test/regrtest.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python3.4/test/regrtest.py \
+    pkg.depend.bypass-generate=.*/msvcrt.*
 file path=usr/lib/python3.4/test/relimport.py
 file path=usr/lib/python3.4/test/reperf.py
 file path=usr/lib/python3.4/test/revocation.crl