--- a/components/python/rjsmin/Makefile	Thu Sep 08 11:59:52 2016 -0700
+++ b/components/python/rjsmin/Makefile	Thu Sep 08 09:45:54 2016 -0700
@@ -39,14 +39,6 @@
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
-
-# Requires fix for 19510349 which is in 12 but not 11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
-
 include $(WS_MAKE_RULES)/ips.mk
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)

--- a/components/python/rjsmin/rjsmin-PYVER.p5m	Thu Sep 08 11:59:52 2016 -0700
+++ b/components/python/rjsmin/rjsmin-PYVER.p5m	Thu Sep 08 09:45:54 2016 -0700
@@ -41,7 +41,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/64/_rjsmin.so
 file path=usr/lib/python$(PYVER)/vendor-packages/_rjsmin.so
 file path=usr/lib/python$(PYVER)/vendor-packages/rjsmin-$(COMPONENT_VERSION)-py$(PYVER).egg-info
-file path=usr/lib/python$(PYVER)/vendor-packages/rjsmin.py
+# pkgdepend on S11 doesn't grok new PEP 3149 syntax
+file path=usr/lib/python$(PYVER)/vendor-packages/rjsmin.py \
+    pkg.depend.bypass-generate=.*_rjsmin.*
 #
 license rjsmin.license license="Apache 2.0"