--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/at-spi2-atk/Makefile	Fri Jun 10 13:42:39 2016 -0700
@@ -0,0 +1,63 @@
+#
+# 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 =            32_and_64
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		at-spi2-atk
+COMPONENT_VERSION=	2.18.0
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Accessibility
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:4a6db33453b6efd15fa7d84ef2a3421262a053f57f1df6e7a2536d02bacdf375
+COMPONENT_BUGDB=        gnome/a11y-libs-core
+
+TPNO=			24866
+
+# Needs updated glib2, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+# Tests do not work on Solaris yet
+TEST_TARGET= $(SKIP_TEST)
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/desktop/at-spi2-core
+REQUIRED_PACKAGES += library/desktop/atk
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/libxslt
+REQUIRED_PACKAGES += library/perl-5/xml-parser-522
+REQUIRED_PACKAGES += runtime/perl-522
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxext
+REQUIRED_PACKAGES += x11/library/libxrender
+REQUIRED_PACKAGES += x11/library/libxtst
+REQUIRED_PACKAGES += x11/server/xorg

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/at-spi2-atk/at-spi2-atk.p5m	Fri Jun 10 13:42:39 2016 -0700
@@ -0,0 +1,57 @@
+#
+# 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/desktop/at-spi2-atk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="The Assistive Technology Service Provider Interface (AT-SPI) Accessibility Toolkit"
+set name=pkg.description \
+    value="This package includes libatk-bridge, a library that bridges ATK to the new D-Bus based AT-SPI, as well as a corresponding module for gtk+ 2.x. Gtk+ 3.x now links against libatk-bridge directly rather than requiring it to be loaded as a module.  These libraries depend on the at-spi2-core code that contains the daemon for registering applications, D-Bus helper libraries and the AT-SPI D-Bus specifications."
+set name=com.oracle.info.description value=at-spi2-atk
+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/339
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/at-spi2-atk/2.0/atk-bridge.h
+file path=usr/lib/$(MACH64)/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+file path=usr/lib/$(MACH64)/gtk-2.0/modules/libatk-bridge.so
+link path=usr/lib/$(MACH64)/libatk-bridge-2.0.so \
+    target=libatk-bridge-2.0.so.0.0.0
+link path=usr/lib/$(MACH64)/libatk-bridge-2.0.so.0 \
+    target=libatk-bridge-2.0.so.0.0.0
+file path=usr/lib/$(MACH64)/libatk-bridge-2.0.so.0.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/atk-bridge-2.0.pc
+file path=usr/lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+file path=usr/lib/gtk-2.0/modules/libatk-bridge.so
+link path=usr/lib/libatk-bridge-2.0.so target=libatk-bridge-2.0.so.0.0.0
+link path=usr/lib/libatk-bridge-2.0.so.0 target=libatk-bridge-2.0.so.0.0.0
+file path=usr/lib/libatk-bridge-2.0.so.0.0.0
+file path=usr/lib/pkgconfig/atk-bridge-2.0.pc
+license COPYING license=LGPLv2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/gnome-a11y-libs.p5m	Fri Jun 10 13:42:39 2016 -0700
@@ -0,0 +1,32 @@
+#
+# 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
+set name=pkg.fmri value=pkg:/gnome/accessibility/[email protected],5.12-5.12.0.0.0.102.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation \
+    incorporate=consolidation/desktop/gnome-incorporation \
+    value=$(CONSOLIDATION)
+depend type=require fmri=pkg:/library/desktop/at-spi2-atk
+depend type=require fmri=pkg:/library/desktop/at-spi2-core
+depend type=require fmri=pkg:/library/desktop/atk