--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/intltool/Makefile	Mon Apr 25 23:38:11 2016 -0700
@@ -0,0 +1,48 @@
+#
+# 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.
+#
+
+BUILD_BITS= 		NO_ARCH
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		intltool
+COMPONENT_VERSION=	0.51.0
+COMPONENT_PROJECT_URL=	http://freedesktop.org/wiki/Software/intltool/
+COMPONENT_ARCHIVE_HASH= \
+    sha256:67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd
+COMPONENT_ARCHIVE_URL=	https://launchpad.net/$(COMPONENT_NAME)/trunk/$(COMPONENT_VERSION)/+download/$(COMPONENT_ARCHIVE)
+
+TPNO=			25211
+
+include $(WS_MAKE_RULES)/common.mk
+
+CONFIGURE_ENV += PERL="$(PERL)"
+PKG_MACROS += PERLVER="$(PERL_VERSION)"
+
+PERL_XML_PARSER_PKG = $(PERL_VERSION:5.%=library/perl-5/xml-parser-5%) 
+
+REQUIRED_PACKAGES += $(PERL_PKG)
+REQUIRED_PACKAGES += $(PERL_XML_PARSER_PKG)
+REQUIRED_PACKAGES += text/gnu-gettext
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/intltool/intltool.p5m	Mon Apr 25 23:38:11 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) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/developer/intltool@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="intltool source message translation tools"
+set name=pkg.description \
+    value="Tools to extract translatable strings from various source files, collect the extracted strings together with messages from traditional source files, and merge the translations back in at build time."
+set name=com.oracle.info.description value=intltool
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Text Tools"
+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=LSARC/2003/030
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/bin/intltool-extract
+file path=usr/bin/intltool-merge
+file path=usr/bin/intltool-prepare
+file path=usr/bin/intltool-update
+file path=usr/bin/intltoolize
+file path=usr/share/aclocal/intltool.m4
+file path=usr/share/intltool/Makefile.in.in
+file path=usr/share/man/man8/intltool-extract.8
+file path=usr/share/man/man8/intltool-merge.8
+file path=usr/share/man/man8/intltool-prepare.8
+file path=usr/share/man/man8/intltool-update.8
+file path=usr/share/man/man8/intltoolize.8
+license COPYING license=GPLv2
+#
+depend type=require fmri=__TBD pkg.debug.depend.file=Parser.pm \
+    pkg.debug.depend.path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/XML \
+    pkg.debug.depend.path=usr/perl5/vendor_perl/$(PERLVER)/XML
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/xgettext

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/intltool/test/results-32.master	Mon Apr 25 23:38:11 2016 -0700
@@ -0,0 +1,52 @@
+make[1]: Entering directory '$(@D)'
+Making check in tests
+make[2]: Entering directory '$(@D)/tests'
+Making check in cases
+make[3]: Entering directory '$(@D)/tests/cases'
+make[3]: Nothing to be done for 'check'.
+make[3]: Leaving directory '$(@D)/tests/cases'
+Making check in results
+make[3]: Entering directory '$(@D)/tests/results'
+make[3]: Nothing to be done for 'check'.
+make[3]: Leaving directory '$(@D)/tests/results'
+make[3]: Entering directory '$(@D)/tests'
+/usr/gnu/bin/make  check-TESTS
+make[4]: Entering directory '$(@D)/tests'
+make[5]: Entering directory '$(@D)/tests'
+PASS: selftest
+make[6]: Entering directory '$(@D)/tests'
+Making all in cases
+make[7]: Entering directory '$(@D)/tests/cases'
+make[7]: Nothing to be done for 'all'.
+make[7]: Leaving directory '$(@D)/tests/cases'
+Making all in results
+make[7]: Entering directory '$(@D)/tests/results'
+make[7]: Nothing to be done for 'all'.
+make[7]: Leaving directory '$(@D)/tests/results'
+make[7]: Entering directory '$(@D)/tests'
+make[7]: Nothing to be done for 'all-am'.
+make[7]: Leaving directory '$(@D)/tests'
+make[6]: Leaving directory '$(@D)/tests'
+============================================================================
+Testsuite summary for intltool 0.51.0
+============================================================================
+# TOTAL: 1
+# PASS:  1
+# SKIP:  0
+# XFAIL: 0
+# FAIL:  0
+# XPASS: 0
+# ERROR: 0
+============================================================================
+make[5]: Leaving directory '$(@D)/tests'
+make[4]: Leaving directory '$(@D)/tests'
+make[3]: Leaving directory '$(@D)/tests'
+make[2]: Leaving directory '$(@D)/tests'
+Making check in doc
+make[2]: Entering directory '$(@D)/doc'
+make[2]: Nothing to be done for 'check'.
+make[2]: Leaving directory '$(@D)/doc'
+make[2]: Entering directory '$(@D)'
+make[2]: Nothing to be done for 'check-am'.
+make[2]: Leaving directory '$(@D)'
+make[1]: Leaving directory '$(@D)'

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-common/Makefile	Mon Apr 25 23:38:11 2016 -0700
@@ -0,0 +1,43 @@
+#
+# 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.
+#
+
+BUILD_BITS=		NO_ARCH
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		gnome-common
+COMPONENT_VERSION=	3.18.0
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Projects/GnomeCommon
+COMPONENT_ARCHIVE_HASH= \
+    sha256:22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf
+
+TPNO=			25944
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+REQUIRED_PACKAGES += developer/build/automake-115
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += developer/gnome/gettext
+REQUIRED_PACKAGES += developer/intltool
+REQUIRED_PACKAGES += library/glib2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gnome-common/gnome-common.p5m	Mon Apr 25 23:38:11 2016 -0700
@@ -0,0 +1,56 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/gnome/gnome-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Build infrastructure and utilities shared among the GNOME C++ binding libraries"
+set name=com.oracle.info.description value=mm-common
+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=LSARC/2005/734
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/bin/gnome-autogen.sh
+file path=usr/share/aclocal/ax_check_enable_debug.m4
+file path=usr/share/aclocal/ax_code_coverage.m4
+file path=usr/share/aclocal/gnome-code-coverage.m4
+file path=usr/share/aclocal/gnome-common.m4
+file path=usr/share/aclocal/gnome-compiler-flags.m4
+#
+license COPYING license=GPLv2
+#
+# Programs called from gnome-autogen.sh script
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/automake
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/autoreconf
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/glib-gettextize
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gtkdocize
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/intltoolize
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/pkg-config

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/gnome-gettext.p5m	Mon Apr 25 23:38:11 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:/developer/gnome/[email protected],5.12-5.12.0.0.0.99.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation \
+    incorporate=consolidation/desktop/gnome-incorporation \
+    value=$(CONSOLIDATION)
+depend type=require fmri=pkg:/developer/intltool
+depend type=require fmri=pkg:/library/gnome/gnome-common
+depend type=require fmri=pkg:/text/gnu-gettext

--- a/components/meta-packages/incorporation-cache	Thu Apr 28 14:40:42 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Mon Apr 25 23:38:11 2016 -0700
@@ -46,7 +46,6 @@
 #
 consolidation/desktop/gnome-incorporation:desktop/xdg/[email protected]
 consolidation/desktop/gnome-incorporation:developer/documentation-tool/[email protected]
-consolidation/desktop/gnome-incorporation:developer/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:developer/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:developer/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/accessibility/[email protected]