--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-menus/Makefile	Sun Oct 23 21:19:26 2016 -0700
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =            64_and_32
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		gnome-menus
+COMPONENT_VERSION=	3.13.3
+COMPONENT_ARCHIVE_HASH= \
+	sha256:7c446eb8ff381df52b8ba04e5886497595e84d1bc46caf7af764d894736c654e
+COMPONENT_BUGDB=        gnome/menus
+
+TPNO=			24752
+
+TEST_TARGET = $(NO_TESTS)
+
+# Needs updated glib2, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --with-pic
+
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-menus/gnome-menus.p5m	Sun Oct 23 21:19:26 2016 -0700
@@ -0,0 +1,178 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/library/gnome/gnome-menus@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The GNOME Menu Library"
+set name=com.oracle.info.description value=$(COMPONENT_NAME)
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/396
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=etc/xdg/menus/gnome-applications.menu
+file path=usr/include/gnome-menus-3.0/gmenu-tree.h
+file path=usr/lib/$(MACH64)/girepository-1.0/GMenu-3.0.typelib
+link path=usr/lib/$(MACH64)/libgnome-menu-3.so target=libgnome-menu-3.so.0.0.1
+link path=usr/lib/$(MACH64)/libgnome-menu-3.so.0 target=libgnome-menu-3.so.0.0.1
+file path=usr/lib/$(MACH64)/libgnome-menu-3.so.0.0.1
+file path=usr/lib/$(MACH64)/pkgconfig/libgnome-menu-3.0.pc
+file path=usr/lib/girepository-1.0/GMenu-3.0.typelib
+link path=usr/lib/libgnome-menu-3.so target=libgnome-menu-3.so.0.0.1
+link path=usr/lib/libgnome-menu-3.so.0 target=libgnome-menu-3.so.0.0.1
+file path=usr/lib/libgnome-menu-3.so.0.0.1
+file path=usr/lib/pkgconfig/libgnome-menu-3.0.pc
+file path=usr/share/desktop-directories/AudioVideo.directory
+file path=usr/share/desktop-directories/Development.directory
+file path=usr/share/desktop-directories/Education.directory
+file path=usr/share/desktop-directories/Game.directory
+file path=usr/share/desktop-directories/Graphics.directory
+file path=usr/share/desktop-directories/Network.directory
+file path=usr/share/desktop-directories/Office.directory
+file path=usr/share/desktop-directories/System-Tools.directory
+file path=usr/share/desktop-directories/Utility-Accessibility.directory
+file path=usr/share/desktop-directories/Utility.directory
+file path=usr/share/desktop-directories/X-GNOME-Menu-Applications.directory
+file path=usr/share/desktop-directories/X-GNOME-Other.directory
+file path=usr/share/desktop-directories/X-GNOME-Sundry.directory
+file path=usr/share/desktop-directories/X-GNOME-SystemSettings.directory
+file path=usr/share/desktop-directories/X-GNOME-Utilities.directory
+file path=usr/share/desktop-directories/X-GNOME-WebApplications.directory
+file path=usr/share/gir-1.0/GMenu-3.0.gir
+file path=usr/share/locale/af/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/an/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ar/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/as/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ast/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/be/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/be@latin/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/bg/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/bn/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/br/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ca/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/crh/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/cs/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/csb/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/cy/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/da/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/de/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/dv/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/dz/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/el/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/en@shaw/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/eo/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/es/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/et/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/eu/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/fa/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/fi/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/fr/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/fur/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/fy/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ga/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/gd/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/gl/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/gn/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/gu/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/gv/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ha/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/he/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/hi/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/hr/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/hu/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/hy/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ia/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/id/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ig/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/io/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/is/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/it/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ja/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ka/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/kg/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/kk/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/km/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/kn/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ko/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ku/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ky/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/lo/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/lt/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/lv/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/mai/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/mg/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/mk/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ml/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/mn/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/mr/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ms/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/nb/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/nds/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ne/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/nl/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/nn/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/oc/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/or/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/pa/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/pl/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ps/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/pt/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ro/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ru/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/rw/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/si/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/sk/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/sl/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/sq/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/sr/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/sv/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/szl/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ta/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/te/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/tg/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/th/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/tr/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/ug/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/uk/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/vi/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/xh/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/yo/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/gnome-menus-3.0.mo
+file path=usr/share/locale/zu/LC_MESSAGES/gnome-menus-3.0.mo
+license COPYING license=GPLv2
+license COPYING.LIB license=LGPLv2
+# The usr/share/desktop-directories files in this package were previously
+# delivered in the gnome-panel package, so we avoid conflicts with this:
+depend type=optional fmri=pkg:/gnome/[email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/gnome-panel.p5m	Sun Oct 23 21:19:26 2016 -0700
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# Package split to match upstream components in GNOME 2->3 migration
+# notification-daemon & gnome-panel itself is replaced by gnome-shell
+set name=pkg.fmri value=pkg:/gnome/[email protected]
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation \
+    incorporate=consolidation/desktop/gnome-incorporation \
+    value=$(CONSOLIDATION)
+depend type=require fmri=pkg:/gnome/gnome-shell
+depend type=require fmri=pkg:/library/desktop/libwnck3
+depend type=require fmri=pkg:/library/gnome/gnome-desktop
+depend type=require fmri=pkg:/library/gnome/gnome-menus

--- a/components/meta-packages/incorporation-cache	Mon Oct 24 19:13:20 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Sun Oct 23 21:19:26 2016 -0700
@@ -47,7 +47,6 @@
 consolidation/desktop/gnome-incorporation:gnome/config/gconf/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/config/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/file-manager/[email protected]
-consolidation/desktop/gnome-incorporation:gnome/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/speech/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]