--- a/components/emacs/README	Mon Apr 25 17:06:42 2011 -0700
+++ b/components/emacs/README	Mon Apr 25 18:31:26 2011 -0600
@@ -78,10 +78,21 @@
   simplifies packaging, and the user's view of /usr/bin/emacs*.
 
   Note that we're installing a 64-bit objects in /bin, and
-  usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR). pkglint considers
-  these to be a "32-bit path". There is an RFE to suppress lint for specific
-  attributes, but until then, we simply assert that the whole action for
-  those files is linted.
+  usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR). The userland
+  pkglint plugin considers these to be a "32-bit path". There is an
+  RFE to suppress lint for specific attributes:
+
+        Bug 17777 - it would be nice if pkglint could suppress specific
+                    messages for specific actions
+        https://defect.opensolaris.org/bz/show_bug.cgi?id=17777
+
+  Until then, we simply assert that the whole action for those files is
+  linted with
+
+        pkg.linted=True
+
+  This disables all lint checking for these items, so extra care is needed
+  not to introduce some other error.
 
 - There are three different toolkit options: None, Athena widgets
   (aka Xaw, or lucid), and gtk. It would be nice to only support gtk,
@@ -118,12 +129,9 @@
   therefore the game files are not usable. This the same decision made
   by Debian, among others.
 
-- The depend line in gnu-emacs.p5m is currently commented out, pending
+- The depend line in gnu-emacs.p5m requiring one of the three toolkit versions
+  to be installed currently has the pkg.linted=true attribute set, pending
   the resolution of
 
-	Bug 18043 - renamed packages in an image cause problems
-            with require-any dependencies
-	https://defect.opensolaris.org/bz/show_bug.cgi?id=18043
-
-  This can be reversed once the minimum build system for userland
-  is >= snv_162.
+        Bug 18202 - pkglint AttributeError when using require-any depend action
+        https://defect.opensolaris.org/bz/show_bug.cgi?id=18202

--- a/components/emacs/gnu-emacs.p5m	Mon Apr 25 17:06:42 2011 -0700
+++ b/components/emacs/gnu-emacs.p5m	Mon Apr 25 18:31:26 2011 -0600
@@ -2287,14 +2287,14 @@
 # for the case where no binary is present, that's not a useful configuration.
 # Therefore, require at least one of the binary supplying packages.
 #
-# Uncomment the following once the minimum Userland build system is at
-# snv_162 or newer. We require the fix for
+# The use of pkg.linted=true is a workaround for
+#
+#    Bug 18202 - pkglint AttributeError when using require-any depend action
+#    https://defect.opensolaris.org/bz/show_bug.cgi?id=18202
 #
-#    Bug 18043 - renamed packages in an image cause problems
-#        with require-any dependencies
-#    https://defect.opensolaris.org/bz/show_bug.cgi?id=18043
+# and can be removed when that bug is fixed.
 #
-#depend type=require-any \
-#	fmri=pkg:/editor/gnu-emacs/gnu-emacs-gtk \
-#	fmri=pkg:/editor/gnu-emacs/gnu-emacs-x11 \
-#	fmri=pkg:/editor/gnu-emacs/gnu-emacs-no-x11
+depend type=require-any pkg.linted=true \
+	fmri=pkg:/editor/gnu-emacs/gnu-emacs-gtk \
+	fmri=pkg:/editor/gnu-emacs/gnu-emacs-x11 \
+	fmri=pkg:/editor/gnu-emacs/gnu-emacs-no-x11