--- a/components/hplip/hplip-core.p5m	Fri Nov 04 02:29:54 2016 -0700
+++ b/components/hplip/hplip-core.p5m	Thu Nov 03 12:28:50 2016 -0700
@@ -39,10 +39,10 @@
 <transform file path=usr/lib/cups/filter/hpps -> default pkg.linted.userland.action001.3 true>
 
 # depend on pygobject
-<transform file path=usr/share/hplip/base/pkit\.py.* -> drop>
-<transform file path=usr/share/hplip/hpssd\.py.* -> drop>
-<transform file path=usr/share/hplip/installer/pluginhandler\.py.* -> drop>
-<transform file path=usr/share/hplip/toolbox\.py.* -> drop>
+<transform file path=usr/share/hplip/base/pkit\.py(c)?$ -> drop>
+<transform file path=usr/share/hplip/hpssd\.py(c)?$ -> drop>
+<transform file path=usr/share/hplip/installer/pluginhandler\.py(c)?$ -> drop>
+<transform file path=usr/share/hplip/toolbox\.py(c)?$ -> drop>
 
 # do not deliver general dirs
 <transform dir path=etc$ -> drop>

--- a/components/hplip/hplip.p5m	Fri Nov 04 02:29:54 2016 -0700
+++ b/components/hplip/hplip.p5m	Thu Nov 03 12:28:50 2016 -0700
@@ -21,33 +21,11 @@
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-# HPLIP support for CUPS
-<transform file path=usr/lib/cups/backend/.* -> default mode 0555>
-<transform file path=usr/lib/cups/filter/.* -> default mode 0555>
-<transform dir file path=usr/lib/lp/? -> default group lp>
-<transform dir file path=usr/share/ppd/? -> default group lp>
-
 # hplip install its PYTHON modules into usr/share/hplip so it brings problems:
-<transform file path=usr/share/hplip/.+\.py$ -> default mode 0555>
+<transform file path=usr/share/hplip/.*\.py$ -> emit file path=%(path)c>
+<transform file path=usr/share/hplip/.+\.py(c)?$ -> default mode 0555>
 <transform file path=usr/share/hplip/.+\.py$ -> default pkg.depend.bypass-generate .*>
 <transform file path=usr/share/hplip/.+\.py$ -> default pkg.linted.userland.action001.3 true>
-<transform file path=usr/share/hplip/.+\.pyc$ -> default mode 0555>
-
-<transform file path=usr/lib/cups/backend/hpfax -> default pkg.depend.bypass-generate .*>
-<transform file path=usr/lib/cups/backend/hpfax -> default pkg.linted.userland.action001.3 true>
-<transform file path=usr/lib/cups/filter/hpps -> default pkg.depend.bypass-generate .*>
-<transform file path=usr/lib/cups/filter/hpps -> default pkg.linted.userland.action001.3 true>
-
-# do not deliver general dirs
-<transform dir path=etc$ -> drop>
-<transform dir path=usr.* -> drop>
-<transform dir path=var$ -> drop>
-
-# Objects defined in "proto-objects" are generated by:
-#  "gmake sample-manifest METADATA_TEMPLATE="
-# all special attributes should be set by "<transform ...> actions
-# Please do not edit the "proto-objects" manually use the tranform actions above to change it.
-<include hplip.proto-objects>
 
 # package metadata
 set name=pkg.fmri \
@@ -62,7 +40,15 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2004/262
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+# the following objects depend on pygobject
+file path=usr/share/hplip/base/pkit.py
+file path=usr/share/hplip/hpssd.py
+file path=usr/share/hplip/installer/pluginhandler.py
+file path=usr/share/hplip/toolbox.py
+#
 legacy pkg=SUNWhpijs desc="hpijs - HP InkJet Server" \
     name="hpijs - HP InkJet Server"
 license COPYING license="GPLv2 BSD MIT"
 depend type=require fmri=pkg:/library/python/pygobject-27
+depend type=require fmri=pkg:/print/filter/hplip-core