--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pygobject2/Makefile	Fri Jul 01 13:26:45 2016 +0000
@@ -0,0 +1,65 @@
+#
+# 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.
+#
+
+# gobject-introspection bindings are only built correctly for gtk when building
+# with gcc, this would otherwise build with Studio.
+COMPILER =		gcc
+BUILD_BITS =		32_and_64
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		pygobject
+COMPONENT_VERSION=	2.28.6
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Projects/PyGObject
+COMPONENT_ARCHIVE_HASH= \
+	sha256:fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
+COMPONENT_BUGDB=       gnome/libraries
+
+TPNO=			19934
+
+# Only build for 2.7 as python 3.x support is provided by ../pygobject3 instead
+PYTHON_VERSIONS= 2.7
+
+# Tests do not yet work with Userland framework - 23712631
+TEST_TARGET= $(SKIP_TEST)
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+CONFIGURE_OPTIONS += --disable-static
+
+# Disable introspection modules in this package since we ship the modern ones
+# in the ../pygobject3 packages instead, and they'd clash if we didn't disable.
+CONFIGURE_OPTIONS += --disable-introspection
+
+# The build process modifies the shebang line to use the version of Python
+# automatically found; to avoid using the current system default, one is
+# explicitly specified here.
+CONFIGURE_ENV += PYTHON=$(PYTHON)
+
+# Ensure Python modules are installed into vendor package directories.
+CONFIGURE_ENV += am_cv_python_pythondir=$(PYTHON_VENDOR_PACKAGES)
+CONFIGURE_ENV += am_cv_python_pyexecdir=$(PYTHON_VENDOR_PACKAGES)
+
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libffi
+REQUIRED_PACKAGES += runtime/python-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pygobject2/pygobject2-27.p5m	Fri Jul 01 13:26:45 2016 +0000
@@ -0,0 +1,199 @@
+#
+# 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.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/pygobject-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python 2.7 bindings for the GObject library"
+set name=com.oracle.info.description value="Python bindings for GObject"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+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/506 value=PSARC/2014/371
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/$(MACH64)/pygobject-codegen-2.0
+link path=usr/bin/$(MACH64)/pygobject27-codegen-2.0 target=pygobject-codegen-2.0
+file path=usr/bin/pygobject-codegen-2.0
+link path=usr/bin/pygobject27-codegen-2.0 target=pygobject-codegen-2.0
+file path=usr/include/pygtk-2.0/pyglib.h
+file path=usr/include/pygtk-2.0/pygobject.h
+link path=usr/lib/$(MACH64)/libpyglib-2.0-python2.7.so \
+    target=libpyglib-2.0-python2.7.so.0.0.0
+link path=usr/lib/$(MACH64)/libpyglib-2.0-python2.7.so.0 \
+    target=libpyglib-2.0-python2.7.so.0.0.0
+file path=usr/lib/$(MACH64)/libpyglib-2.0-python2.7.so.0.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/pygobject-2.0.pc
+link path=usr/lib/$(MACH64)/pkgconfig/pygobject27-2.0.pc target=pygobject-2.0.pc
+link path=usr/lib/libpyglib-2.0-python2.7.so \
+    target=libpyglib-2.0-python2.7.so.0.0.0
+link path=usr/lib/libpyglib-2.0-python2.7.so.0 \
+    target=libpyglib-2.0-python2.7.so.0.0.0
+file path=usr/lib/libpyglib-2.0-python2.7.so.0.0.0
+file path=usr/lib/pkgconfig/pygobject-2.0.pc
+link path=usr/lib/pkgconfig/pygobject27-2.0.pc target=pygobject-2.0.pc
+file path=usr/lib/python2.7/vendor-packages/64/glib/__init__.py
+file path=usr/lib/python2.7/vendor-packages/64/glib/_glib.so
+file path=usr/lib/python2.7/vendor-packages/64/glib/option.py
+file path=usr/lib/python2.7/vendor-packages/64/gobject/__init__.py
+file path=usr/lib/python2.7/vendor-packages/64/gobject/_gobject.so
+file path=usr/lib/python2.7/vendor-packages/64/gobject/constants.py
+file path=usr/lib/python2.7/vendor-packages/64/gobject/propertyhelper.py
+file path=usr/lib/python2.7/vendor-packages/64/gtk-2.0/dsextras.py
+file path=usr/lib/python2.7/vendor-packages/64/gtk-2.0/gio/__init__.py
+file path=usr/lib/python2.7/vendor-packages/64/gtk-2.0/gio/_gio.so
+file path=usr/lib/python2.7/vendor-packages/64/gtk-2.0/gio/unix.so
+file path=usr/lib/python2.7/vendor-packages/64/pygtk.pth
+file path=usr/lib/python2.7/vendor-packages/64/pygtk.py
+file path=usr/lib/python2.7/vendor-packages/glib/__init__.py
+file path=usr/lib/python2.7/vendor-packages/glib/_glib.so
+file path=usr/lib/python2.7/vendor-packages/glib/option.py
+file path=usr/lib/python2.7/vendor-packages/gobject/__init__.py
+file path=usr/lib/python2.7/vendor-packages/gobject/_gobject.so
+file path=usr/lib/python2.7/vendor-packages/gobject/constants.py
+file path=usr/lib/python2.7/vendor-packages/gobject/propertyhelper.py
+file path=usr/lib/python2.7/vendor-packages/gtk-2.0/dsextras.py
+file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gio/__init__.py
+file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gio/_gio.so
+file path=usr/lib/python2.7/vendor-packages/gtk-2.0/gio/unix.so
+file path=usr/lib/python2.7/vendor-packages/pygtk.pth
+file path=usr/lib/python2.7/vendor-packages/pygtk.py
+file path=usr/share/gtk-doc/html/pygobject/class-gioappinfo.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioapplaunchcontext.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioasyncresult.html
+file path=usr/share/gtk-doc/html/pygobject/class-giobufferedinputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giobufferedoutputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giocancellable.html
+file path=usr/share/gtk-doc/html/pygobject/class-giodatainputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giodataoutputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giodrive.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioemblem.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioemblemedicon.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofile.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofileattributeinfo.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofileenumerator.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofileicon.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofileinfo.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofileinputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofilemonitor.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofileoutputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofilterinputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giofilteroutputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioicon.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioinputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioloadableicon.html
+file path=usr/share/gtk-doc/html/pygobject/class-giomemoryinputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giomemoryoutputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giomount.html
+file path=usr/share/gtk-doc/html/pygobject/class-giomountoperation.html
+file path=usr/share/gtk-doc/html/pygobject/class-giooutputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-gioseekable.html
+file path=usr/share/gtk-doc/html/pygobject/class-giosimpleasyncresult.html
+file path=usr/share/gtk-doc/html/pygobject/class-giothemedicon.html
+file path=usr/share/gtk-doc/html/pygobject/class-giounixinputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giounixoutputstream.html
+file path=usr/share/gtk-doc/html/pygobject/class-giovolume.html
+file path=usr/share/gtk-doc/html/pygobject/class-giovolumemonitor.html
+file path=usr/share/gtk-doc/html/pygobject/class-glibmaincontext.html
+file path=usr/share/gtk-doc/html/pygobject/class-glibmainloop.html
+file path=usr/share/gtk-doc/html/pygobject/class-gobject.html
+file path=usr/share/gtk-doc/html/pygobject/class-gobjectgboxed.html
+file path=usr/share/gtk-doc/html/pygobject/class-gobjectginterface.html
+file path=usr/share/gtk-doc/html/pygobject/class-gobjectgpointer.html
+file path=usr/share/gtk-doc/html/pygobject/gio-class-reference.html
+file path=usr/share/gtk-doc/html/pygobject/gio-constants.html
+file path=usr/share/gtk-doc/html/pygobject/gio-functions.html
+file path=usr/share/gtk-doc/html/pygobject/giounix-class-reference.html
+file path=usr/share/gtk-doc/html/pygobject/glib-class-reference.html
+file path=usr/share/gtk-doc/html/pygobject/glib-constants.html
+file path=usr/share/gtk-doc/html/pygobject/glib-functions.html
+file path=usr/share/gtk-doc/html/pygobject/gobject-class-reference.html
+file path=usr/share/gtk-doc/html/pygobject/gobject-constants.html
+file path=usr/share/gtk-doc/html/pygobject/gobject-functions.html
+file path=usr/share/gtk-doc/html/pygobject/index.html
+file path=usr/share/gtk-doc/html/pygobject/index.sgml
+file path=usr/share/gtk-doc/html/pygobject/pygobject-introduction.html
+file path=usr/share/gtk-doc/html/pygobject/pygobject.devhelp
+file path=usr/share/gtk-doc/html/pygobject/style.css
+file path=usr/share/pygobject/2.0/codegen/__init__.py
+file path=usr/share/pygobject/2.0/codegen/argtypes.py
+file path=usr/share/pygobject/2.0/codegen/code-coverage.py
+file path=usr/share/pygobject/2.0/codegen/codegen.py
+file path=usr/share/pygobject/2.0/codegen/createdefs.py
+file path=usr/share/pygobject/2.0/codegen/definitions.py
+file path=usr/share/pygobject/2.0/codegen/defsconvert.py
+file path=usr/share/pygobject/2.0/codegen/defsgen.py
+file path=usr/share/pygobject/2.0/codegen/defsparser.py
+file path=usr/share/pygobject/2.0/codegen/docextract.py
+file path=usr/share/pygobject/2.0/codegen/docextract_to_xml.py
+file path=usr/share/pygobject/2.0/codegen/docgen.py
+file path=usr/share/pygobject/2.0/codegen/h2def.py
+file path=usr/share/pygobject/2.0/codegen/mergedefs.py
+file path=usr/share/pygobject/2.0/codegen/missingdefs.py
+file path=usr/share/pygobject/2.0/codegen/mkskel.py
+file path=usr/share/pygobject/2.0/codegen/override.py
+file path=usr/share/pygobject/2.0/codegen/reversewrapper.py
+file path=usr/share/pygobject/2.0/codegen/scanvirtuals.py
+file path=usr/share/pygobject/2.0/codegen/scmexpr.py
+file path=usr/share/pygobject/2.0/defs/gappinfo.override
+file path=usr/share/pygobject/2.0/defs/gapplaunchcontext.override
+file path=usr/share/pygobject/2.0/defs/gbufferedinputstream.override
+file path=usr/share/pygobject/2.0/defs/gcancellable.override
+file path=usr/share/pygobject/2.0/defs/gdatainputstream.override
+file path=usr/share/pygobject/2.0/defs/gdrive.override
+file path=usr/share/pygobject/2.0/defs/gfile.override
+file path=usr/share/pygobject/2.0/defs/gfileattribute.override
+file path=usr/share/pygobject/2.0/defs/gfileenumerator.override
+file path=usr/share/pygobject/2.0/defs/gfileinfo.override
+file path=usr/share/pygobject/2.0/defs/gfileinputstream.override
+file path=usr/share/pygobject/2.0/defs/gfileiostream.override
+file path=usr/share/pygobject/2.0/defs/gfileoutputstream.override
+file path=usr/share/pygobject/2.0/defs/gicon.override
+file path=usr/share/pygobject/2.0/defs/ginputstream.override
+file path=usr/share/pygobject/2.0/defs/gio-types.defs
+file path=usr/share/pygobject/2.0/defs/gio.defs
+file path=usr/share/pygobject/2.0/defs/gio.override
+file path=usr/share/pygobject/2.0/defs/giostream.override
+file path=usr/share/pygobject/2.0/defs/gmemoryinputstream.override
+file path=usr/share/pygobject/2.0/defs/gmemoryoutputstream.override
+file path=usr/share/pygobject/2.0/defs/gmount.override
+file path=usr/share/pygobject/2.0/defs/goutputstream.override
+file path=usr/share/pygobject/2.0/defs/gresolver.override
+file path=usr/share/pygobject/2.0/defs/gsocket.override
+file path=usr/share/pygobject/2.0/defs/gvolume.override
+file path=usr/share/pygobject/2.0/defs/gvolumemonitor.override
+file path=usr/share/pygobject/2.0/defs/unix-types.defs
+file path=usr/share/pygobject/2.0/defs/unix.defs
+file path=usr/share/pygobject/2.0/defs/unix.override
+file path=usr/share/pygobject/xsl/common.xsl
+file path=usr/share/pygobject/xsl/devhelp.xsl
+file path=usr/share/pygobject/xsl/fixxref.py
+file path=usr/share/pygobject/xsl/html.xsl
+file path=usr/share/pygobject/xsl/pdf-style.xsl
+file path=usr/share/pygobject/xsl/pdf.xsl
+file path=usr/share/pygobject/xsl/ref-html-style.xsl
+license COPYING license=LGPLv2.1
+# Require pygobject-3-27 to get the gi module formerly found in this package
+depend type=require fmri=library/python/pygobject-3-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pygobject3/Makefile	Fri Jul 01 13:26:45 2016 +0000
@@ -0,0 +1,80 @@
+#
+# 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.
+#
+
+# gobject-introspection bindings are only built correctly for gtk when building
+# with gcc, this would otherwise build with Studio.
+COMPILER =		gcc
+BUILD_BITS =		32_and_64
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		pygobject
+COMPONENT_VERSION=	3.18.2
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Projects/PyGObject
+COMPONENT_ARCHIVE_HASH= \
+	sha256:2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f
+COMPONENT_BUGDB=       gnome/libraries
+
+TPNO=			25832
+
+# Needs gobject-introspection >= 1.39.0, which is not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+# Only build for 2.7 for now as we need 32-bit and 64-bit support; all of the
+# GNOME and desktop components must be built for Python 2.7 for now.
+PYTHON_VERSIONS= 2.7
+
+# Tests do not yet work with Userland framework - 23712631
+TEST_TARGET= $(SKIP_TEST)
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Required due to patch to configure.ac.
+COMPONENT_PREP_ACTION += ( cd $(@D) ; NOCONFIGURE=1 $(CONFIG_SHELL) autogen.sh );
+
+# Needs -std=c99 at minimum for 'NAN', etc.
+CFLAGS += -std=c11
+
+CONFIGURE_OPTIONS += --disable-static
+
+# The build process modifies the shebang line to use the version of Python
+# automatically found; to avoid using the current system default, one is
+# explicitly specified here.
+CONFIGURE_OPTIONS += --with-python=$(PYTHON)
+
+# Ensure Python modules are installed into vendor package directories.
+CONFIGURE_ENV += am_cv_python_pythondir=$(PYTHON_VENDOR_PACKAGES)
+CONFIGURE_ENV += am_cv_python_pyexecdir=$(PYTHON_VENDOR_PACKAGES)
+
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libffi
+REQUIRED_PACKAGES += library/python/pycairo-27
+# Pyflakes is needed for tests, but not build or install
+REQUIRED_PACKAGES += library/python/pyflakes
+REQUIRED_PACKAGES += runtime/python-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pygobject3/patches/01-configure.patch	Fri Jul 01 13:26:45 2016 +0000
@@ -0,0 +1,28 @@
+Fix Solaris linking.
+
+Need to file an upstream bug
+
+--- pygobject-3.16.1/configure.ac	2015-04-13 19:39:58.000000000 -0700
++++ pygobject-3.16.1/configure.ac	2015-06-04 13:06:43.904168525 -0700
+@@ -51,7 +51,7 @@
+ 
+ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+-AC_MSG_CHECKING([for build time linking with Python (Darwin and Win32)])
++AC_MSG_CHECKING([for build time linking with Python (Darwin, Solaris, and Win32)])
+ case "$host" in
+   *-*-mingw*|*-*-cygwin*)
+     os_win32=yes
+@@ -63,6 +63,12 @@
+     link_python_libs=yes
+     OS_EXT=dylib
+     ;;
++  *solaris*)
++    dnl Required due to -no-undefined linking.
++    os_win32=no
++    link_python_libs=yes
++    OS_EXT=so
++    ;;
+   *)
+     os_win32=no
+     link_python_libs=no

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pygobject3/pygobject-3-GENFRAG.p5m	Fri Jul 01 13:26:45 2016 +0000
@@ -0,0 +1,33 @@
+#
+# 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>
+file path=usr/include/pygobject-3.0/pygobject.h
+file path=usr/lib/$(MACH64)/pkgconfig/pygobject-3.0.pc
+file path=usr/lib/pkgconfig/pygobject-3.0.pc
+license COPYING license=LGPLv2.1
+depend type=conditional \
+    fmri=library/python/pygobject-3-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/python-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/pygobject3/pygobject-3-PYVER.p5m	Fri Jul 01 13:26:45 2016 +0000
@@ -0,0 +1,76 @@
+#
+# 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.
+#
+set name=pkg.fmri \
+    value=pkg:/library/python/pygobject-3-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python $(PYVER) bindings for GLib/Gobject/GIO/GTK+"
+set name=pkg.description \
+    value="PyGObject is a Python extension module that gives clean and consistent access to the entire GNOME software platform through the use of GObject Introspection. PyGObject provides full support of GObject Introspection and all of its features (callbacks, GVariant support, closures, sub-classing, etc.)."
+set name=com.oracle.info.description value=pygobject
+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/2014/371 value=PSARC/2016/290
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file usr/lib/python$(PYVER)/vendor-packages/64/gi/_gi.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/gi/64/_gi.so
+file usr/lib/python$(PYVER)/vendor-packages/64/gi/_gi_cairo.so \
+    path=usr/lib/python$(PYVER)/vendor-packages/gi/64/_gi_cairo.so
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_constants.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_error.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_gi.so
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_gi_cairo.so
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_gobject/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_option.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_propertyhelper.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/_signalhelper.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/docstring.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/importer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/module.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/GIMarshallingTests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/GLib.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/GObject.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/Gdk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/Gio.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/Gtk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/Pango.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/overrides/keysyms.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/pygtkcompat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/repository/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/gi/types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygtkcompat/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygtkcompat/generictreemodel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygtkcompat/pygtkcompat.py
+license COPYING license=LGPLv2.1
+# Avoid collisions with older versions of pygobject 2.x package which
+# delivered the /vendor-packages/gi/ files now found in this package.
+depend type=optional fmri=library/python/[email protected],5.12.0.0.0.103
+# force a dependency on the pygobject-3 package
+depend type=require \
+    fmri=library/python/pygobject-3@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

--- a/components/meta-packages/incorporation-cache	Sun Jun 26 22:14:47 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Fri Jul 01 13:26:45 2016 +0000
@@ -86,7 +86,6 @@
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/[email protected]
-consolidation/desktop/gnome-incorporation:library/python/[email protected]
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
 consolidation/desktop/gnome-incorporation:library/python/[email protected]