--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/totem-pl-parser/Makefile	Thu Jun 30 16:13:25 2016 +0000
@@ -0,0 +1,74 @@
+#
+# 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
+# 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=		totem-pl-parser
+COMPONENT_VERSION=	3.10.5
+COMPONENT_PROJECT_URL=  https://github.com/GNOME/totem-pl-parser
+COMPONENT_ARCHIVE_HASH= \
+	sha256:a746580f61b678029dadaa824a6923445afd944d12c40c5fccb27159799c8137
+COMPONENT_BUGDB=        gnome/multimedia
+
+TPNO=			25833
+
+TEST_TARGET  = $(NO_TESTS)
+
+# Needs gobject-introspection, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Assumes GNU xgettext in PATH
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+# Required so that configure can find and use 64-bit version of config program.
+CONFIGURE_ENV.64 += ac_cv_path_LIBGCRYPT_CONFIG=$(USRBINDIR64)/libgcrypt-config
+
+CONFIGURE_OPTIONS += --disable-quvi
+CONFIGURE_OPTIONS += --disable-static
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --enable-libarchive
+CONFIGURE_OPTIONS += --enable-libgcrypt
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --with-pic
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gmime
+REQUIRED_PACKAGES += library/libarchive
+REQUIRED_PACKAGES += library/libsoup
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += system/library/security/libgcrypt

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/totem-pl-parser/patches/01-obsolete-exports.patch	Thu Jun 30 16:13:25 2016 +0000
@@ -0,0 +1,21 @@
+The first symbol no longer exists; the second is now private.
+
+XXX file upstream bug
+--- totem-pl-parser-3.10.5/plparse/plparser.symbols	2011-09-18 03:33:29.000000000 -0700
++++ totem-pl-parser-3.10.5/plparse/plparser.symbols	2015-07-05 19:59:07.454489580 -0700
+@@ -4,7 +4,6 @@
+ totem_cd_get_human_readable_name
+ totem_cd_has_medium
+ totem_cd_mrl_from_type
+-totem_disc_media_type_get_type
+ totem_disc_media_type_quark
+ totem_pl_parser_add_ignored_mimetype
+ totem_pl_parser_add_ignored_scheme
+@@ -14,7 +13,6 @@
+ totem_pl_parser_error_get_type
+ totem_pl_parser_error_quark
+ totem_pl_parser_get_type
+-totemplparser_marshal_VOID__STRING_STRING_STRING
+ totem_pl_parser_new
+ totem_pl_parser_parse
+ totem_pl_parser_parse_async

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/totem-pl-parser/totem-pl-parser.p5m	Thu Jun 30 16:13:25 2016 +0000
@@ -0,0 +1,174 @@
+#
+# 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/media-player/totem-pl-parser@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A GObject-based library to parse and write a variety of playlist formats"
+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=TBD
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/totem-pl-parser/1/plparser/totem-pl-parser-builtins.h
+file path=usr/include/totem-pl-parser/1/plparser/totem-pl-parser-features.h
+file path=usr/include/totem-pl-parser/1/plparser/totem-pl-parser-mini.h
+file path=usr/include/totem-pl-parser/1/plparser/totem-pl-parser.h
+file path=usr/include/totem-pl-parser/1/plparser/totem-pl-playlist.h
+file path=usr/lib/$(MACH64)/girepository-1.0/TotemPlParser-1.0.typelib
+link path=usr/lib/$(MACH64)/libtotem-plparser-mini.so \
+    target=libtotem-plparser-mini.so.18.1.0
+link path=usr/lib/$(MACH64)/libtotem-plparser-mini.so.17 \
+    target=libtotem-plparser-mini.so.18.1.0
+link path=usr/lib/$(MACH64)/libtotem-plparser-mini.so.18 \
+    target=libtotem-plparser-mini.so.18.1.0
+file path=usr/lib/$(MACH64)/libtotem-plparser-mini.so.18.1.0
+link path=usr/lib/$(MACH64)/libtotem-plparser.so \
+    target=libtotem-plparser.so.18.1.0
+# symlinks to temporarily allow rhythmbox and totem to work
+link path=usr/lib/$(MACH64)/libtotem-plparser.so.17 \
+    target=libtotem-plparser.so.18.1.0
+link path=usr/lib/$(MACH64)/libtotem-plparser.so.18 \
+    target=libtotem-plparser.so.18.1.0
+file path=usr/lib/$(MACH64)/libtotem-plparser.so.18.1.0
+file path=usr/lib/$(MACH64)/pkgconfig/totem-plparser-mini.pc
+file path=usr/lib/$(MACH64)/pkgconfig/totem-plparser.pc
+file path=usr/lib/girepository-1.0/TotemPlParser-1.0.typelib
+link path=usr/lib/libtotem-plparser-mini.so \
+    target=libtotem-plparser-mini.so.18.1.0
+link path=usr/lib/libtotem-plparser-mini.so.17 \
+    target=libtotem-plparser-mini.so.18.1.0
+link path=usr/lib/libtotem-plparser-mini.so.18 \
+    target=libtotem-plparser-mini.so.18.1.0
+file path=usr/lib/libtotem-plparser-mini.so.18.1.0
+link path=usr/lib/libtotem-plparser.so target=libtotem-plparser.so.18.1.0
+link path=usr/lib/libtotem-plparser.so.17 target=libtotem-plparser.so.18.1.0
+link path=usr/lib/libtotem-plparser.so.18 target=libtotem-plparser.so.18.1.0
+file path=usr/lib/libtotem-plparser.so.18.1.0
+file path=usr/lib/pkgconfig/totem-plparser-mini.pc
+file path=usr/lib/pkgconfig/totem-plparser.pc
+file path=usr/share/gir-1.0/TotemPlParser-1.0.gir
+file path=usr/share/locale/af/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/am/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/an/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ar/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/as/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ast/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/az/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/be/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/be@latin/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/bg/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/bn/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/br/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/bs/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ca/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/cs/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/cy/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/da/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/de/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/dz/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/el/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/en@shaw/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/eo/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/es/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/et/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/eu/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/fa/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/fi/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/fr/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/fur/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ga/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/gd/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/gl/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/gu/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/he/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/hi/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/hr/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/hu/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/id/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/is/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/it/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ja/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ka/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/kk/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/km/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/kn/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ko/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ku/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/lt/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/lv/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/mai/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/mg/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/mk/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ml/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/mn/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/mr/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ms/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/nb/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/nds/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ne/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/nl/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/nn/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/oc/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/or/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/pa/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/pl/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ps/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/pt/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ro/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ru/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/rw/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/si/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/sk/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/sl/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/sq/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/sr/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/sv/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ta/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/te/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/tg/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/th/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/tr/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/ug/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/uk/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/uz@cyrillic/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/vi/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/wa/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/xh/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/totem-pl-parser.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo
+license COPYING.LIB license=LGPLv2

--- a/components/meta-packages/incorporation-cache	Fri Jul 01 13:03:40 2016 +0000
+++ b/components/meta-packages/incorporation-cache	Thu Jun 30 16:13:25 2016 +0000
@@ -168,7 +168,6 @@
 consolidation/userland/userland-incorporation:library/libproxy/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
-consolidation/userland/userland-incorporation:library/media-player/[email protected]
 consolidation/userland/userland-incorporation:library/musicbrainz/[email protected]
 consolidation/userland/userland-incorporation:library/musicbrainz/[email protected]
 consolidation/userland/userland-incorporation:library/python/[email protected]