23245477 Move libexif 0.6.21 to Userland
authorJay Cotton <Jay.Cotton@Oracle.COM>
Wed, 07 Sep 2016 09:33:36 -0700
changeset 6743 0c5bcd51f10d
parent 6742 576afa66a459
child 6744 17542fb7b399
23245477 Move libexif 0.6.21 to Userland PSARC/2011/319 Upgrade libexif to 0.6.19 in Solaris 10
components/desktop/libexif/Makefile
components/desktop/libexif/libexif.p5m
components/desktop/libexif/patches/0001-doc-makefile.patch
components/desktop/libexif/test/results-all.master
components/meta-packages/incorporation-cache
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libexif/Makefile	Wed Sep 07 09:33:36 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) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=		32_and_64
+COMPILER=		gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		libexif
+COMPONENT_VERSION=	0.6.21
+COMPONENT_PROJECT_URL=  https://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE_HASH= \
+	sha256:16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	library/libexif
+
+TPNO=			9321
+
+# Depends on newer cairo, which cannot be updated in S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/common.mk
+
+CONFIGURE_OPTIONS += --disable-static
+
+unexport SHELLOPTS
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+COMPONENT_TEST_ARGS =   -k -i
+COMPONENT_TEST_TRANSFORMS += \
+        '-n ' \
+        '-e "/TOTAL:/p" ' \
+        '-e "/PASS:/p" ' \
+        '-e "/FAIL:/p" '
+
+REQUIRED_PACKAGES += developer/documentation-tool/doxygen
+REQUIRED_PACKAGES += system/library/math
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libexif/libexif.p5m	Wed Sep 07 09:33:36 2016 -0700
@@ -0,0 +1,211 @@
+#
+# 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 "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/image/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="An EXIF tag parsing library for digital cameras"
+set name=com.oracle.info.description value=libexif
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Multimedia 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/2011/319
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/libexif/_stdint.h
+file path=usr/include/libexif/exif-byte-order.h
+file path=usr/include/libexif/exif-content.h
+file path=usr/include/libexif/exif-data-type.h
+file path=usr/include/libexif/exif-data.h
+file path=usr/include/libexif/exif-entry.h
+file path=usr/include/libexif/exif-format.h
+file path=usr/include/libexif/exif-ifd.h
+file path=usr/include/libexif/exif-loader.h
+file path=usr/include/libexif/exif-log.h
+file path=usr/include/libexif/exif-mem.h
+file path=usr/include/libexif/exif-mnote-data.h
+file path=usr/include/libexif/exif-tag.h
+file path=usr/include/libexif/exif-utils.h
+link path=usr/lib/$(MACH64)/libexif.so target=libexif.so.12.3.3
+link path=usr/lib/$(MACH64)/libexif.so.12 target=libexif.so.12.3.3
+file path=usr/lib/$(MACH64)/libexif.so.12.3.3
+file path=usr/lib/$(MACH64)/pkgconfig/libexif.pc
+link path=usr/lib/libexif.so target=libexif.so.12.3.3
+link path=usr/lib/libexif.so.12 target=libexif.so.12.3.3
+file path=usr/lib/libexif.so.12.3.3
+file path=usr/lib/pkgconfig/libexif.pc
+file path=usr/share/doc/libexif/ABOUT-NLS
+file path=usr/share/doc/libexif/AUTHORS
+file path=usr/share/doc/libexif/COPYING
+file path=usr/share/doc/libexif/ChangeLog
+file path=usr/share/doc/libexif/NEWS
+file path=usr/share/doc/libexif/README
+file path=usr/share/doc/libexif/libexif-api.html/__stdint_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/annotated.html
+file path=usr/share/doc/libexif/libexif-api.html/annotated_dup.js
+file path=usr/share/doc/libexif/libexif-api.html/arrowdown.png
+file path=usr/share/doc/libexif/libexif-api.html/arrowright.png
+file path=usr/share/doc/libexif/libexif-api.html/bc_s.png
+file path=usr/share/doc/libexif/libexif-api.html/bdwn.png
+file path=usr/share/doc/libexif/libexif-api.html/bug.html
+file path=usr/share/doc/libexif/libexif-api.html/classes.html
+file path=usr/share/doc/libexif/libexif-api.html/closed.png
+file path=usr/share/doc/libexif/libexif-api.html/deprecated.html
+file path=usr/share/doc/libexif/libexif-api.html/doc.png
+file path=usr/share/doc/libexif/libexif-api.html/doxygen.css
+file path=usr/share/doc/libexif/libexif-api.html/doxygen.png
+file path=usr/share/doc/libexif/libexif-api.html/dynsections.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-byte-order_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-byte-order_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-byte-order_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-content_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-content_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-content_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-data-type_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-data_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-data_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-data_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-entry_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-entry_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-entry_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-format_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-format_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-format_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-ifd_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-loader_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-loader_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-loader_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-log_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-log_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-log_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-mem_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-mem_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-mem_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-mnote-data-priv_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-mnote-data_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-mnote-data_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-mnote-data_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-system_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-system_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-system_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-tag_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-tag_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-tag_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-utils_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif-utils_8h.js
+file path=usr/share/doc/libexif/libexif-api.html/exif-utils_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/exif_8h.html
+file path=usr/share/doc/libexif/libexif-api.html/exif_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/files.html
+file path=usr/share/doc/libexif/libexif-api.html/files.js
+file path=usr/share/doc/libexif/libexif-api.html/folderclosed.png
+file path=usr/share/doc/libexif/libexif-api.html/folderopen.png
+file path=usr/share/doc/libexif/libexif-api.html/functions.html
+file path=usr/share/doc/libexif/libexif-api.html/functions_vars.html
+file path=usr/share/doc/libexif/libexif-api.html/globals.html
+file path=usr/share/doc/libexif/libexif-api.html/globals_defs.html
+file path=usr/share/doc/libexif/libexif-api.html/globals_enum.html
+file path=usr/share/doc/libexif/libexif-api.html/globals_eval.html
+file path=usr/share/doc/libexif/libexif-api.html/globals_func.html
+file path=usr/share/doc/libexif/libexif-api.html/globals_type.html
+file path=usr/share/doc/libexif/libexif-api.html/graph_legend.html
+file path=usr/share/doc/libexif/libexif-api.html/graph_legend.md5
+file path=usr/share/doc/libexif/libexif-api.html/graph_legend.png
+file path=usr/share/doc/libexif/libexif-api.html/i18n_8h_source.html
+file path=usr/share/doc/libexif/libexif-api.html/index.html
+file path=usr/share/doc/libexif/libexif-api.html/jquery.js
+file path=usr/share/doc/libexif/libexif-api.html/nav_f.png
+file path=usr/share/doc/libexif/libexif-api.html/nav_g.png
+file path=usr/share/doc/libexif/libexif-api.html/nav_h.png
+file path=usr/share/doc/libexif/libexif-api.html/navtree.css
+file path=usr/share/doc/libexif/libexif-api.html/navtree.js
+file path=usr/share/doc/libexif/libexif-api.html/navtreedata.js
+file path=usr/share/doc/libexif/libexif-api.html/navtreeindex0.js
+file path=usr/share/doc/libexif/libexif-api.html/navtreeindex1.js
+file path=usr/share/doc/libexif/libexif-api.html/open.png
+file path=usr/share/doc/libexif/libexif-api.html/pages.html
+file path=usr/share/doc/libexif/libexif-api.html/resize.js
+file path=usr/share/doc/libexif/libexif-api.html/splitbar.png
+file path=usr/share/doc/libexif/libexif-api.html/structExifRational.html
+file path=usr/share/doc/libexif/libexif-api.html/structExifRational.js
+file path=usr/share/doc/libexif/libexif-api.html/structExifSRational.html
+file path=usr/share/doc/libexif/libexif-api.html/structExifSRational.js
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifContent.html
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifContent.js
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifContent__coll__graph.map
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifContent__coll__graph.md5
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifContent__coll__graph.png
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifData.html
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifData.js
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifData__coll__graph.map
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifData__coll__graph.md5
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifData__coll__graph.png
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifEntry.html
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifEntry.js
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifEntry__coll__graph.map
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifEntry__coll__graph.md5
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifEntry__coll__graph.png
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifMnoteData.html
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifMnoteData.js
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifMnoteDataMethods.html
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifMnoteDataMethods.js
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifMnoteData__coll__graph.map
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifMnoteData__coll__graph.md5
+file path=usr/share/doc/libexif/libexif-api.html/struct__ExifMnoteData__coll__graph.png
+file path=usr/share/doc/libexif/libexif-api.html/sync_off.png
+file path=usr/share/doc/libexif/libexif-api.html/sync_on.png
+file path=usr/share/doc/libexif/libexif-api.html/tab_a.png
+file path=usr/share/doc/libexif/libexif-api.html/tab_b.png
+file path=usr/share/doc/libexif/libexif-api.html/tab_h.png
+file path=usr/share/doc/libexif/libexif-api.html/tab_s.png
+file path=usr/share/doc/libexif/libexif-api.html/tabs.css
+file path=usr/share/locale/be/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/bs/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/cs/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/da/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/de/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/en_AU/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/es/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/fr/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/it/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/ja/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/nl/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/pl/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/pt/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/ru/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/sk/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/sq/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/sr/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/sv/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/tr/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/uk/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/vi/LC_MESSAGES/libexif-12.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/libexif-12.mo
+license COPYING license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libexif/patches/0001-doc-makefile.patch	Wed Sep 07 09:33:36 2016 -0700
@@ -0,0 +1,47 @@
+# Existing set of patches from the desktop gate
+# Not suitable for upstream
+
+*** a/doc/Makefile.in	Thu Jul 12 11:36:45 2012
+--- b/doc/Makefile.in	Wed Apr 27 13:37:38 2016
+***************
+*** 502,508 ****
+  @[email protected]@[email protected]@[email protected]	rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_INTERNALS_DIR)"
+  @[email protected]@[email protected]: $(HTML_APIDOC_DIR).stamp
+  @[email protected]@[email protected]	mkdir -p "$(DESTDIR)$(docdir)"
+! @[email protected]@[email protected]	find "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)" \
+  @[email protected]@[email protected]		\( -type d -exec chmod 0755 {} \; \) -or \
+  @[email protected]@[email protected]		\( -type f -exec chmod 0644 {} \; \)
+  @[email protected]@[email protected]	(unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_DIR)") \
+--- 502,508 ----
+  @[email protected]@[email protected]@[email protected]	rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_INTERNALS_DIR)"
+  @[email protected]@[email protected]: $(HTML_APIDOC_DIR).stamp
+  @[email protected]@[email protected]	mkdir -p "$(DESTDIR)$(docdir)"
+! @[email protected]@[email protected]	gfind "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)" \
+  @[email protected]@[email protected]		\( -type d -exec chmod 0755 {} \; \) -or \
+  @[email protected]@[email protected]		\( -type f -exec chmod 0644 {} \; \)
+  @[email protected]@[email protected]	(unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_DIR)") \
+***************
+*** 514,524 ****
+  @[email protected]@[email protected]	rm -f $(HTML_APIDOC_DIR).tar.gz $(HTML_APIDOC_INTERNALS_DIR).tar.gz
+  
+  @[email protected]@[email protected]$(DOXYGEN_UPLOAD): $(DOXYGEN_STAMPS)
+! @[email protected]@[email protected]	find $(DOXYGEN_OUTPUT_DIR) \( -type d -exec chmod a+rx,go-w,g+s {} \; \) \
+  @[email protected]@[email protected]		-or \( -type f -exec chmod a+r {} \; \)
+  @[email protected]@[email protected]	rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/api/
+  @[email protected]@[email protected]@[email protected]	rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/internals/
+! @[email protected]@[email protected]	ssh "sf" "find /home/groups/l/li/libexif/htdocs/internals /home/groups/l/li/libexif/htdocs/api \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' -or -name '*.css' -name '*.dot' -name '*.map' \) -exec chmod a+r {} \; \)"
+  
+  all-local: $(DOXYGEN_STAMPS)
+  
+--- 514,524 ----
+  @[email protected]@[email protected]	rm -f $(HTML_APIDOC_DIR).tar.gz $(HTML_APIDOC_INTERNALS_DIR).tar.gz
+  
+  @[email protected]@[email protected]$(DOXYGEN_UPLOAD): $(DOXYGEN_STAMPS)
+! @[email protected]@[email protected]	gfind $(DOXYGEN_OUTPUT_DIR) \( -type d -exec chmod a+rx,go-w,g+s {} \; \) \
+  @[email protected]@[email protected]		-or \( -type f -exec chmod a+r {} \; \)
+  @[email protected]@[email protected]	rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/api/
+  @[email protected]@[email protected]@[email protected]	rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/internals/
+! @[email protected]@[email protected]	ssh "sf" "gfind /home/groups/l/li/libexif/htdocs/internals /home/groups/l/li/libexif/htdocs/api \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' -or -name '*.css' -name '*.dot' -name '*.map' \) -exec chmod a+r {} \; \)"
+  
+  all-local: $(DOXYGEN_STAMPS)
+  
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libexif/test/results-all.master	Wed Sep 07 09:33:36 2016 -0700
@@ -0,0 +1,7 @@
+PASS: check-localedir.sh
+PASS: test-mem
+PASS: test-value
+PASS: test-integers
+PASS: test-parse
+PASS: test-tagtable
+PASS: test-sorted
--- a/components/meta-packages/incorporation-cache	Tue Sep 06 20:07:16 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Wed Sep 07 09:33:36 2016 -0700
@@ -54,7 +54,6 @@
 consolidation/desktop/gnome-incorporation:gnome/preferences/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/speech/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
-consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
 consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
 consolidation/desktop/gnome-incorporation:library/audio/[email protected]
@@ -78,8 +77,6 @@
 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/userland/userland-incorporation:codec/[email protected]
-consolidation/userland/userland-incorporation:codec/[email protected]
 consolidation/userland/userland-incorporation:data/docbook/[email protected]
 consolidation/userland/userland-incorporation:data/docbook/[email protected]
 consolidation/userland/userland-incorporation:data/docbook/[email protected]
@@ -128,7 +125,6 @@
 consolidation/userland/userland-incorporation:gnome/theme/[email protected]
 consolidation/userland/userland-incorporation:gnome/window-manager/[email protected]
 consolidation/userland/userland-incorporation:image/library/[email protected]
-consolidation/userland/userland-incorporation:image/library/[email protected]
 consolidation/userland/userland-incorporation:library/accessibility/[email protected]
 consolidation/userland/userland-incorporation:library/desktop/[email protected]
 consolidation/userland/userland-incorporation:library/desktop/[email protected]
@@ -146,7 +142,6 @@
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/security/pam/module/[email protected]
 consolidation/userland/userland-incorporation:library/speech/[email protected]
-consolidation/userland/userland-incorporation:library/spell-checking/[email protected]
 consolidation/userland/userland-incorporation:library/xdg/[email protected]
 consolidation/userland/userland-incorporation:service/[email protected]
 consolidation/userland/userland-incorporation:system/display-manager/[email protected]