22839226 Migrate Desktop meta-packages to Userland gate s11u3-sru
authorPetr Sumbera <petr.sumbera@oracle.com>
Mon, 26 Sep 2016 08:04:04 -0700
branchs11u3-sru
changeset 7036 9bdfcd8747ba
parent 7035 4c2f26e9d5ab
child 7046 d80040c62de5
22839226 Migrate Desktop meta-packages to Userland gate 24757632 S11 needs to deliver in Desktop incorporation some intel only packages
components/Makefile
components/meta-packages/history/Makefile
components/meta-packages/history/README
components/meta-packages/history/history
components/meta-packages/incorporation-cache
doc/packaging.txt
tools/generate-history
tools/userland-incorporator
--- a/components/Makefile	Mon Sep 05 05:00:46 2016 -0700
+++ b/components/Makefile	Mon Sep 26 08:04:04 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../make-rules/shared-macros.mk
@@ -153,10 +153,14 @@
 INCORPORATE_WERROR ?= --Werror
 
 incorporation:
-	$(PKGREPO) refresh -s $(PKG_REPO)
-	$(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \
-          --version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \
-	  -c $(CONSOLIDATION) --destdir=$(WS_MACH) $(INCORPORATE_WERROR)
+	$(WS_TOOLS)/userland-incorporator \
+		--repository $(PKG_REPO) \
+		--version 0.$(OS_VERSION),$(BUILD_VERSION) \
+		--publisher $(PUBLISHER) \
+		--consolidation $(CONSOLIDATION) \
+		--destdir $(WS_MACH) \
+		--static-content-file $(WS_COMPONENTS)/meta-packages/incorporation-cache \
+		$(INCORPORATE_WERROR)
 	for incorporation in $(WS_MACH)/*.p5m ; do \
 	    $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \
 	               $${incorporation} ; \
--- a/components/meta-packages/history/Makefile	Mon Sep 05 05:00:46 2016 -0700
+++ b/components/meta-packages/history/Makefile	Mon Sep 26 08:04:04 2016 -0700
@@ -41,7 +41,7 @@
 MANIFEST_BASE =		$(BUILD_DIR)/manifest-$(MACH)
 
 CANONICAL_MANIFESTS =	$(wildcard *.p5m)
-HISTORICAL_MANIFESTS =	$(shell $(NAWK) -v FUNCTION=name -f $(GENERATE_HISTORY) < $(HISTORY))
+HISTORICAL_MANIFESTS =	$(shell $(NAWK) -v FUNCTION=name -v MACH=$(MACH) -f $(GENERATE_HISTORY) < $(HISTORY))
 ARCH_MANIFESTS =	$(wildcard *.p5m.$(MACH))
 GENERATED_ARCH_MANIFESTS =	$(ARCH_MANIFESTS:%.p5m.$(MACH)=%.p5m)
 CANONICAL_MANIFESTS +=  $(GENERATED_ARCH_MANIFESTS)
@@ -54,7 +54,7 @@
 # Rule to generate historical manifests from the $(HISTORY) file.
 define history-manifest-rule
 $(MANIFEST_BASE)-$(1): $(HISTORY) $(BUILD_DIR)
-	$(NAWK) -v FUNCTION=manifest -v TARGET=$1 -f $(GENERATE_HISTORY) < \
+	$(NAWK) -v FUNCTION=manifest -v MACH=$(MACH) -v TARGET=$1 -f $(GENERATE_HISTORY) < \
 	    $(HISTORY) > [email protected]
 endef
 $(foreach mfst,$(HISTORICAL_MANIFESTS),$(eval $(call history-manifest-rule,$(mfst))))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/README	Mon Sep 26 08:04:04 2016 -0700
@@ -0,0 +1,7 @@
+See $(WS)/doc/packaging.txt for information about the history file.
+
+To sort the history file into the canonical ordering, use:
+env LC_COLLATE=C sort -t @ -k 1,1 history
+
+The other *.p5m here are history entries more complex than the simple
+one-to-one mapping of the history file allows for.
--- a/components/meta-packages/history/history	Mon Sep 05 05:00:46 2016 -0700
+++ b/components/meta-packages/history/history	Mon Sep 26 08:04:04 2016 -0700
@@ -1,13 +1,19 @@
[email protected],5.11-0.133 system/management/[email protected]
 [email protected],5.11-0.133 system/management/visual-panels/[email protected]
 [email protected],5.11-0.133 system/management/visual-panels/[email protected]
 [email protected],5.11-0.151
 [email protected],5.11-0.130
 [email protected],5.11-0.171
 [email protected],5.11-0.171
[email protected],5.11-0.133 system/management/[email protected]
[email protected] desktop/administration/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 runtime/[email protected]
[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 runtime/[email protected]
[email protected] image/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 runtime/[email protected]
 [email protected],5.11-0.133 print/lp/filter/[email protected]
 [email protected],5.11-0.133 library/[email protected]
@@ -19,21 +25,24 @@
 [email protected],5.11-0.133 web/server/apache-22/plugin/[email protected]
 [email protected],5.11-0.133 web/server/apache-22/plugin/[email protected]
 [email protected],5.11-0.133 web/server/apache-22/plugin/[email protected]
[email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
[email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.133 web/server/apache-22/plugin/[email protected]
 [email protected],5.11-0.133 web/server/apache-22/plugin/[email protected]
 [email protected],5.11-0.133 web/server/apache-22/plugin/[email protected]
 [email protected],5.11-0.133 web/server/apache-22/plugin/[email protected]
 [email protected],5.11-0.133 web/library/apache/[email protected]
 [email protected],5.11-0.133 web/library/apache/apr-13/[email protected]
[email protected],5.11-0.133 web/library/apache/[email protected]
 [email protected],5.11-0.133 web/library/apache/apr-util-13/[email protected]
[email protected],5.11-0.133 web/library/apache/[email protected]
 [email protected],5.11-0.133 web/library/apache/apr-util-13/[email protected]
 [email protected],5.11-0.133 web/library/apache/apr-util-13/[email protected]
 [email protected],5.11-0.133 web/library/apache/apr-util-13/[email protected]
 [email protected],5.11-0.133 backup/[email protected]
 [email protected],5.11-0.133 developer/build/[email protected]
[email protected] system/network/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] image/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
 [email protected],5.11-0.133 runtime/java/[email protected]
@@ -41,53 +50,284 @@
 [email protected],5.11-0.133 network/dns/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
 [email protected],5.11-0.133 developer/parser/[email protected]
[email protected] web/editor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] library/accessibility/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 compress/[email protected]
[email protected] desktop/compiz/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] image/webcam/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] system/management/cim/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 runtime/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
 [email protected],5.11-0.133 developer/build/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/java/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/compiz/plugin/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] desktop/compiz/plugin/[email protected]  incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] desktop/compiz/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
 [email protected],5.11-0.133 shell/[email protected]
[email protected] terminal/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/xdg/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/security/pam/module/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/applet/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 text/[email protected]
[email protected],5.11-0.133 print/[email protected]
 [email protected],5.11-0.133 library/print/[email protected]
[email protected],5.11-0.133 print/[email protected]
[email protected] print/cups/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 web/[email protected]
 [email protected],5.11-0.133 developer/versioning/[email protected]
[email protected] system/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] [email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] system/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] system/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] service/gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] system/display-manager/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] editor/diagram/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] terminal/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] text/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] documentation/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/cursor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/cursor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/documentation-tool/[email protected]
[email protected] editor/blog/[email protected]  incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] media/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 web/server/[email protected]
 [email protected],5.11-0.133 web/browser/[email protected]
[email protected],5.11-0.133 runtime/[email protected]
 [email protected],5.11-0.133 runtime/erlang/[email protected]
[email protected],5.11-0.133 runtime/[email protected]
[email protected] library/speech/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] mail/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] mail/evolution/connector/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] mail/evolution/connector/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 shell/[email protected]
[email protected] developer/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 library/fastcgi/[email protected]
[email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 mail/[email protected]
 [email protected],5.11-0.133 print/lp/filter/[email protected]
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] web/browser/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] web/data/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] codec/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/lexer/[email protected]
 [email protected],5.11-0.133 system/library/[email protected]
[email protected],5.11-0.133 print/cups/filter/[email protected]
 [email protected],5.11-0.133 print/cups/filter/[email protected]
[email protected],5.11-0.133 print/cups/filter/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 print/lp/filter/[email protected]
[email protected] system/management/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] storage/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 service/network/[email protected],5.11-0.133
[email protected] library/file-monitor/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
 [email protected],5.11-0.133 system/library/[email protected]
 [email protected],5.11-0.133 system/prerequisite/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 developer/debug/[email protected]
[email protected] image/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 print/filter/[email protected],5.11-0.133
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/versioning/[email protected]
[email protected] desktop/system-monitor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/c++/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/macro/[email protected]
 [email protected],5.11-0.133 developer/build/[email protected]
[email protected] gnome/accessibility/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/accessibility/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/accessibility/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected]0.0.0.0.0 gnome/accessibility/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/speech/gnome-speech/driver/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/applet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/archive-manager/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/calculator/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/editor/gimp/plugin/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/cd-ripping/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/cd-burning/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/character-map/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/file-manager/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/crash-report/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] documentation/gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] developer/gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/disk-analyzer/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] system/display-manager/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] [email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] system/font/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] gnome/applet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] games/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] communication/im/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/editor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/editor/gimp/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/viewer/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/viewer/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/applet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/applet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] gnome/media/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] communication/conferencing/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/xdg/menu-editor/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/applet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/network/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/pdf-viewer/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] communication/pda/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/spell-checking/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] desktop/system-monitor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected]0 incorporate=consolidation/desktop/desktop-incorporation
[email protected] terminal/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] editor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] [email protected] [email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] developer/ui-designer/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] documentation/gnome/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/applet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/window-manager/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] data/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/audio/gstreamer/plugin/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/build/[email protected]
 [email protected],5.11-0.133 developer/build/[email protected]
 [email protected],5.11-0.133 file/[email protected]
 [email protected],5.11-0.133 library/database/[email protected]
 [email protected],5.11-0.133 text/[email protected]
[email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
[email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 file/[email protected]
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
@@ -95,33 +335,49 @@
 [email protected],5.11-0.133 file/[email protected]
 [email protected],5.11-0.133 library/[email protected],5.11-0.133
 [email protected],5.11-0.133 library/[email protected],5.11-0.133
[email protected] editor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 crypto/[email protected]
 [email protected],5.11-0.133 image/[email protected]
[email protected] library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] editor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 image/[email protected]
 [email protected],5.11-0.133 text/[email protected]
[email protected] image/viewer/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/java/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 text/[email protected]
 [email protected],5.11-0.130 [email protected]
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 print/filter/ghostscript/fonts/[email protected],5.11-0.133
 [email protected],5.11-0.133 print/filter/ghostscript/fonts/[email protected],5.11-0.133
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 archiver/[email protected]
[email protected] library/desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 print/filter/[email protected],5.11-0.133
 [email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 print/cups/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.133 print/filter/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 system/data/[email protected],5.11-0.133
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 image/[email protected]
 [email protected],5.11-0.133 benchmark/[email protected]
 [email protected],5.11-0.133 network/chat/[email protected]
[email protected] network/chat/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] data/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/java/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/studio/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] web/browser/firefox/plugin/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/java/[email protected]
 [email protected],5.11-0.170
 [email protected],5.11-0.133 library/[email protected]
@@ -129,41 +385,90 @@
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 network/ftp/[email protected]
[email protected] image/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/compiz/library/libcompiz[email protected]  incorporate=consolidation/desktop/desktop-incorporation arch=i386
 [email protected],5.11-0.133 library/[email protected]
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/musicbrainz/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
[email protected] image/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] system/library/security/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/desktop/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/security/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 system/library/security/[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected] library/audio/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/graphics/[email protected]
 [email protected],5.11-0.133 system/library/[email protected]
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 system/library/usb/[email protected]
 [email protected],5.11-0.133 system/library/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/desktop/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 library/samba/[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected] library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/c++/[email protected]
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] codec/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/build/[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected] library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 system/library/usb/[email protected]
 [email protected],5.11-0.133 system/library/usb/[email protected]
[email protected] library/c++/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 web/server/[email protected]
 [email protected],5.11-0.133 web/browser/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected],5.11-0.133
 [email protected],5.11-0.133 library/python-2/[email protected],5.11-0.133
[email protected] system/file/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/libtool/[email protected]
 [email protected],5.11-0.133 runtime/[email protected]
[email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected]
[email protected],5.11-0.133 library/[email protected]
[email protected],5.11-0.133 library/python-2/[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected],5.11-0.133 library/python-2/[email protected]
[email protected] web/browser/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/[email protected]
[email protected],5.11-0.133 service/[email protected]
 [email protected],5.11-0.133 library/java/[email protected]
[email protected],5.11-0.133 service/[email protected]
 [email protected],5.11-0.133 developer/versioning/[email protected]
 [email protected],5.11-0.133 media/[email protected],5.11-0.133
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] media/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/musicbrainz/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 mail/[email protected]
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/myspell/dictionary/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 database/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
 [email protected],5.11-0.133 database/[email protected]
 [email protected],5.11-0.133 database/mysql-51/[email protected]
@@ -175,20 +480,40 @@
 [email protected],5.11-0.133 system/management/snmp/[email protected]
 [email protected],5.11-0.133 system/management/snmp/net-snmp/[email protected]
 [email protected],5.11-0.132 [email protected]
[email protected] library/c++/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 games/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 service/network/[email protected]
[email protected] desktop/administration/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] text/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/c++/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+SUNWocaml[email protected] runtime/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] codec/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
[email protected] developer/documentation-tool/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
[email protected] desktop/project-management/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/background/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/background/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] release/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] developer/documentation-tool/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected],5.11-0.133 library/security/[email protected]
 [email protected],5.11-0.133 library/security/openssl/[email protected]
[email protected],5.11-0.133 library/security/[email protected]
[email protected] system/management/web/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 library/security/pam/module/[email protected]
[email protected] text/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 terminal/[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected] library/perl-5/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/perl-5/[email protected]
 [email protected],5.11-0.133 library/perl-5/[email protected]
 [email protected],5.11-0.133 library/perl-5/[email protected]
[email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
@@ -197,16 +522,20 @@
 [email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
[email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
[email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
[email protected],5.11-0.175.3.0.0.25.0
 [email protected],5.11-0.175.3.0.0.25.0
[email protected] communication/pda/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 shell/[email protected]
[email protected] desktop/project-management/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/perl-5/[email protected],5.11-0.133
[email protected] image/library/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] service/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 web/proxy/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 mail/[email protected]
 [email protected],5.11-0.133 print/[email protected]
@@ -214,86 +543,342 @@
 [email protected],5.11-0.133 crypto/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected],5.11-0.133
 [email protected],5.11-0.133 developer/python/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/python-2/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/python-2/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/python-2/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected]
 [email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/python-2/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
 [email protected],5.11-0.144 library/python-2/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected]
 [email protected] library/python-2/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
[email protected],5.11-0.175.0.0.0.1.0 library/python-2/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
[email protected],5.11-0.175.0.0.0.1.0 library/python-2/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/python-2/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/java/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 system/network/routing/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
[email protected] library/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/remote-desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 backup/[email protected]
 [email protected],5.11-0.133 package/[email protected]
[email protected] image/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/xscreensaver/hacks/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 network/[email protected]
 [email protected],5.11-0.133 network/[email protected]
 [email protected],5.11-0.175.3.0.0.24.0
 [email protected],5.11-0.133 image/scanner/xsane/[email protected]
 [email protected],5.11-0.133 image/scanner/xsane/[email protected]
[email protected] system/management/wbem/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 terminal/[email protected]
[email protected] gnome/security/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/security/seahorse/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
 [email protected],5.11-0.175.0.0.0.0.0 system/storage/[email protected]
[email protected] library/c++/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 network/nntp/[email protected]
 [email protected],5.11-0.133 service/network/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 audio/[email protected]
 [email protected],5.11-0.133 web/fastcgi/[email protected]
[email protected] codec/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 web/proxy/[email protected]
[email protected] system/desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 service/security/[email protected]
 [email protected],5.11-0.133 security/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected],5.11-0.133 developer/versioning/[email protected]
 [email protected],5.11-0.133 library/java/[email protected]
 [email protected],5.11-0.133 library/perl-5/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected]
[email protected],5.11-0.133 developer/versioning/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
[email protected] library/java/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] terminal/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected],5.11-0.133 web/java-servlet/[email protected]
 [email protected],5.11-0.133 web/java-servlet/tomcat/[email protected]
[email protected],5.11-0.133 web/java-servlet/[email protected]
 [email protected],5.11-0.133 runtime/tcl-8/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 library/[email protected],5.11-0.133
[email protected] terminal/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 text/[email protected]
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] mail/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] mail/thunderbird/plugin/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
[email protected] library/media-player/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/torrent/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] file/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/remote-desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 library/security/[email protected]
 [email protected],5.11-0.170
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 archiver/[email protected]
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 editor/[email protected]
[email protected] desktop/remote-desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
[email protected] web/browser/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 web/analytics/[email protected]
 [email protected],5.11-0.133 web/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 library/graphics/[email protected],5.11-0.133
[email protected] desktop/irc/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] gnome/theme/sound/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] image/scanner/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/xscreensaver/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] desktop/xscreensaver/hacks/[email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] [email protected] incorporate=consolidation/desktop/desktop-incorporation
[email protected] service/storage/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 web/[email protected]
+codec/install/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+data/[email protected] data/[email protected] data/docbook/[email protected] data/docbook/[email protected] data/docbook/[email protected] data/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+desktop/administration/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+desktop/media-player/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+desktop/media-player/moovida/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
+desktop/media-player/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+desktop/time-tracking/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
 developer/[email protected],5.11-0.174.0.0.0.0.0 group/feature/[email protected]
+editor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+file/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 [email protected],5.11-0.133 developer/[email protected]
+gnome/accessibility/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/desklet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/desklet/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/documentation/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/theme/background/[email protected] gnome/theme/background/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/theme/background/[email protected] gnome/theme/background/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/theme/cursor/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+gnome/trusted/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+image/editor/gimp/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/desktop/gobject/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/gnome/print/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/gnome/print/gnome-print/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] library/python/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] library/python/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] library/python/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] library/python/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] library/python/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
+library/python-2/[email protected] library/python/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
+library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+library/python-2/[email protected] library/python-2/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/evolution/connector/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+mail/thunderbird/plugin/[email protected] mail/thunderbird/plugin/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 network/[email protected],5.11-0.170
 print/lp/filter/[email protected],5.11-0.173.0.0.0.0.0 print/filter/[email protected],5.11-0.173.0.0.0.0.0
+print/lp/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/getting-started/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+release/[email protected] release/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 runtime/ocaml/[email protected],5.11-0.170
+runtime/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+runtime/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 runtime/[email protected],5.11-0.175.3.0.0.24.0
+security/[email protected],5.11-0.175.1.0.0.21.0 security/compliance/[email protected],5.11-0.175.1.0.0.21.0
 security/[email protected],5.11-0.175.1.0.0.21.0 library/perl-5/[email protected],5.11-0.175.1.0.0.21.0
 security/[email protected],5.11-0.175.1.0.0.21.0 library/python-2/[email protected],5.11-0.175.1.0.0.21.0
-security/[email protected],5.11-0.175.1.0.0.21.0 security/compliance/[email protected],5.11-0.175.1.0.0.21.0
+service/storage/[email protected] desktop/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/desktop/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+system/display-manager/[email protected] incorporate=consolidation/desktop/desktop-incorporation
 system/management/rad/module/[email protected],5.11-0.175.1.0.0.14
 system/management/visual-panels/[email protected],5.11-0.175.2.0.0.37.0
 system/management/visual-panels/[email protected],5.11-0.151
 system/management/visual-panels/[email protected],5.11-0.171
 system/management/visual-panels/[email protected],5.11-0.171
 system/trusted/[email protected],5.11-0.166 group/feature/trusted-desktop
+system/xvm/[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
 web/[email protected],5.11-0.174.0.0.0.0.0 group/feature/[email protected]
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/locale/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/plugin/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/browser/firefox/plugin/[email protected] web/browser/firefox/plugin/[email protected]  incorporate=consolidation/desktop/desktop-incorporation
+web/firefox/plugin/[email protected] incorporate=consolidation/desktop/desktop-incorporation
+web/[email protected],5.11-0.175.3.0.0.25.0
 web/php-52/[email protected],5.11-0.175.3.0.0.25.0
 web/php-52/extension/[email protected],5.11-0.175.3.0.0.25.0
 web/php-52/extension/[email protected],5.11-0.175.3.0.0.25.0
@@ -303,7 +888,7 @@
 web/php-52/extension/[email protected],5.11-0.175.3.0.0.25.0
 web/php-52/extension/[email protected],5.11-0.175.3.0.0.25.0
 web/php-52/extension/[email protected],5.11-0.175.3.0.0.25.0
-web/[email protected],5.11-0.175.3.0.0.25.0
+web/server/apache-22/module/[email protected],5.11-0.175.3.0.0.25.0
 web/server/apache-22/module/[email protected],5.11-0.175.3.0.0.25.0
-web/server/apache-22/module/[email protected],5.11-0.175.3.0.0.25.0
 web/server/apache-22/plugin/[email protected],5.11-0.175.3.0.0.25.0
[email protected] incorporate=consolidation/desktop/desktop-incorporation arch=i386
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/incorporation-cache	Mon Sep 26 08:04:04 2016 -0700
@@ -0,0 +1,284 @@
+#
+# 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.
+#
+
+#
+# This file specifies additional packages to be included when the
+# userland-incorporator runs to generate incorporations, to allow packages
+# which were not built in the Userland gate to be incorporated.
+#
+# Adding packages to this file should be a very rare occasion discussed
+# first with the gatekeepers, generally only for special cases like merging
+# consolidations or special builds that cannot be part of the main Userland
+# gate build for some reason.
+#
+# Packages should be removed from this file when they are integrated to the
+# normal Userland gate builds.
+#
+# lines are in the format:
+#    incorporation-name:[email protected]=i386
+# (=i386) is optional value and it means that the record is for i386 only
+# lines begining with hash (#) are ignored
+#
+
+#
+# The following packages are part of the Desktop consolidation merge to the
+# Userland gate, and will be removed as the packages are either integrated
+# to the build or replaced by a package rename/obsolete in the history file.
+#
+consolidation/desktop/desktop-incorporation:codec/[email protected]
+consolidation/desktop/desktop-incorporation:codec/[email protected]
+consolidation/desktop/desktop-incorporation:codec/[email protected]
+consolidation/desktop/desktop-incorporation:codec/[email protected]
+consolidation/desktop/desktop-incorporation:communication/conferencing/[email protected],5.11-0.175.3.9.0.3.0
+consolidation/desktop/desktop-incorporation:communication/im/[email protected]
+consolidation/desktop/desktop-incorporation:communication/pda/[email protected]
+consolidation/desktop/desktop-incorporation:communication/pda/[email protected]
+consolidation/desktop/desktop-incorporation:data/docbook/[email protected]
+consolidation/desktop/desktop-incorporation:data/docbook/[email protected]
+consolidation/desktop/desktop-incorporation:data/docbook/[email protected]
+consolidation/desktop/desktop-incorporation:data/[email protected]
+consolidation/desktop/desktop-incorporation:data/[email protected]
+consolidation/desktop/desktop-incorporation:data/[email protected]
+consolidation/desktop/desktop-incorporation:database/sqlite-3/[email protected],5.11-0.175.3.8.0.2.0
+consolidation/desktop/desktop-incorporation:database/[email protected],5.11-0.175.3.8.0.2.0
+consolidation/desktop/desktop-incorporation:desktop/administration/[email protected]=i386
+consolidation/desktop/desktop-incorporation:desktop/administration/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/archive-manager/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/[email protected]=i386
+consolidation/desktop/desktop-incorporation:desktop/calculator/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/cd-burning/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/cd-ripping/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/character-map/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/compiz/[email protected]=i386
+consolidation/desktop/desktop-incorporation:desktop/compiz/library/[email protected]=i386
+consolidation/desktop/desktop-incorporation:desktop/compiz/library/[email protected]=i386
+consolidation/desktop/desktop-incorporation:desktop/compiz/plugin/[email protected]=i386
+consolidation/desktop/desktop-incorporation:desktop/compiz/plugin/[email protected]=i386
+consolidation/desktop/desktop-incorporation:desktop/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/file-manager/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/irc/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/network/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/pdf-viewer/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/project-management/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/project-management/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/remote-desktop/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/remote-desktop/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/remote-desktop/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/studio/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/system-monitor/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/system-monitor/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/torrent/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/xdg/menu-editor/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/xscreensaver/hacks/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/xscreensaver/hacks/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/xscreensaver/[email protected]
+consolidation/desktop/desktop-incorporation:desktop/[email protected]
+consolidation/desktop/desktop-incorporation:developer/documentation-tool/[email protected]
+consolidation/desktop/desktop-incorporation:developer/documentation-tool/[email protected]
+consolidation/desktop/desktop-incorporation:developer/[email protected]
+consolidation/desktop/desktop-incorporation:developer/gnome/[email protected]
+consolidation/desktop/desktop-incorporation:developer/java/[email protected]
+consolidation/desktop/desktop-incorporation:developer/java/[email protected]
+consolidation/desktop/desktop-incorporation:developer/lexer/[email protected]
+consolidation/desktop/desktop-incorporation:developer/parser/[email protected]
+consolidation/desktop/desktop-incorporation:developer/parser/[email protected]
+consolidation/desktop/desktop-incorporation:developer/ui-designer/[email protected]
+consolidation/desktop/desktop-incorporation:documentation/[email protected]
+consolidation/desktop/desktop-incorporation:documentation/gnome/[email protected]
+consolidation/desktop/desktop-incorporation:documentation/gnome/[email protected]
+consolidation/desktop/desktop-incorporation:editor/blog/[email protected]=i386
+consolidation/desktop/desktop-incorporation:editor/diagram/[email protected]
+consolidation/desktop/desktop-incorporation:editor/gedit/[email protected]
+consolidation/desktop/desktop-incorporation:editor/[email protected]
+consolidation/desktop/desktop-incorporation:editor/[email protected]
+consolidation/desktop/desktop-incorporation:editor/[email protected]
+consolidation/desktop/desktop-incorporation:games/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/config/gconf/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/crash-report/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/disk-analyzer/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/file-manager/nautilus/extension/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/media/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/security/seahorse/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/security/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/speech/gnome-speech/driver/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/background/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/background/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/cursor/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/cursor/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/sound/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/window-manager/[email protected]
+consolidation/desktop/desktop-incorporation:gnome/[email protected]
+consolidation/desktop/desktop-incorporation:image/[email protected],5.11-0.175.3.7.0.2.0
+consolidation/desktop/desktop-incorporation:image/editor/gimp/[email protected]
+consolidation/desktop/desktop-incorporation:image/editor/gimp/plugin/[email protected]
+consolidation/desktop/desktop-incorporation:image/editor/[email protected]
+consolidation/desktop/desktop-incorporation:image/library/[email protected]
+consolidation/desktop/desktop-incorporation:image/library/[email protected]
+consolidation/desktop/desktop-incorporation:image/library/[email protected]
+consolidation/desktop/desktop-incorporation:image/library/[email protected]
+consolidation/desktop/desktop-incorporation:image/library/[email protected]
+consolidation/desktop/desktop-incorporation:image/library/[email protected],5.11-0.175.3.10.0.1.0
+consolidation/desktop/desktop-incorporation:image/library/[email protected]
+consolidation/desktop/desktop-incorporation:image/library/[email protected]
+consolidation/desktop/desktop-incorporation:image/[email protected]
+consolidation/desktop/desktop-incorporation:image/scanner/[email protected]
+consolidation/desktop/desktop-incorporation:image/viewer/eog/[email protected]
+consolidation/desktop/desktop-incorporation:image/viewer/[email protected]
+consolidation/desktop/desktop-incorporation:image/viewer/[email protected]
+consolidation/desktop/desktop-incorporation:image/viewer/[email protected]
+consolidation/desktop/desktop-incorporation:image/webcam/[email protected]
+consolidation/desktop/desktop-incorporation:library/accessibility/[email protected]
+consolidation/desktop/desktop-incorporation:library/audio/gstreamer/plugin/[email protected]
+consolidation/desktop/desktop-incorporation:library/audio/[email protected],5.11-0.175.3.7.0.2.0
+consolidation/desktop/desktop-incorporation:library/audio/[email protected]
+consolidation/desktop/desktop-incorporation:library/c++/[email protected]
+consolidation/desktop/desktop-incorporation:library/c++/[email protected]
+consolidation/desktop/desktop-incorporation:library/c++/[email protected]
+consolidation/desktop/desktop-incorporation:library/c++/[email protected]
+consolidation/desktop/desktop-incorporation:library/c++/[email protected]
+consolidation/desktop/desktop-incorporation:library/desktop/[email protected]
+consolidation/desktop/desktop-incorporation:library/desktop/[email protected]
+consolidation/desktop/desktop-incorporation:library/desktop/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/file-monitor/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/java/[email protected]
+consolidation/desktop/desktop-incorporation:library/java/[email protected]
+consolidation/desktop/desktop-incorporation:library/java/[email protected]
+consolidation/desktop/desktop-incorporation:library/java/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/libproxy/[email protected]
+consolidation/desktop/desktop-incorporation:library/libproxy/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/media-player/[email protected]
+consolidation/desktop/desktop-incorporation:library/musicbrainz/[email protected]
+consolidation/desktop/desktop-incorporation:library/musicbrainz/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
+consolidation/desktop/desktop-incorporation:library/python/[email protected],5.11-0.175.3.6.0.4.0
+consolidation/desktop/desktop-incorporation:library/python/[email protected],5.11-0.175.3.8.0.2.0
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:library/security/[email protected]
+consolidation/desktop/desktop-incorporation:library/security/pam/module/[email protected]
+consolidation/desktop/desktop-incorporation:library/speech/[email protected]
+consolidation/desktop/desktop-incorporation:library/spell-checking/[email protected]
+consolidation/desktop/desktop-incorporation:library/xdg/[email protected]
+consolidation/desktop/desktop-incorporation:library/[email protected]
+consolidation/desktop/desktop-incorporation:mail/evolution/connector/[email protected]
+consolidation/desktop/desktop-incorporation:mail/evolution/connector/[email protected]
+consolidation/desktop/desktop-incorporation:mail/[email protected]
+consolidation/desktop/desktop-incorporation:mail/thunderbird/plugin/[email protected]
+consolidation/desktop/desktop-incorporation:mail/[email protected],5.11-0.175.3.5.0.5.0
+consolidation/desktop/desktop-incorporation:media/[email protected]
+consolidation/desktop/desktop-incorporation:media/[email protected]
+consolidation/desktop/desktop-incorporation:network/chat/[email protected]
+consolidation/desktop/desktop-incorporation:package/[email protected]
+consolidation/desktop/desktop-incorporation:print/cups/[email protected]
+consolidation/desktop/desktop-incorporation:release/[email protected]
+consolidation/desktop/desktop-incorporation:runtime/[email protected]
+consolidation/desktop/desktop-incorporation:runtime/tcl-8/[email protected],5.11-0.175.3.8.0.2.0
+consolidation/desktop/desktop-incorporation:service/gnome/[email protected]
+consolidation/desktop/desktop-incorporation:service/[email protected]
+consolidation/desktop/desktop-incorporation:storage/[email protected]
+consolidation/desktop/desktop-incorporation:system/desktop/[email protected]
+consolidation/desktop/desktop-incorporation:system/display-manager/[email protected]
+consolidation/desktop/desktop-incorporation:system/display-manager/[email protected]
+consolidation/desktop/desktop-incorporation:system/file/[email protected]
+consolidation/desktop/desktop-incorporation:system/font/[email protected]
+consolidation/desktop/desktop-incorporation:system/library/dbus/[email protected],5.11-0.175.3.6.0.4.0
+consolidation/desktop/desktop-incorporation:system/library/[email protected],5.11-0.175.3.6.0.4.0
+consolidation/desktop/desktop-incorporation:system/library/[email protected],5.11-0.175.3.6.0.4.0
+consolidation/desktop/desktop-incorporation:system/library/[email protected],5.11-0.175.3.6.0.4.0
+consolidation/desktop/desktop-incorporation:system/library/security/[email protected]
+consolidation/desktop/desktop-incorporation:system/management/cim/[email protected]
+consolidation/desktop/desktop-incorporation:system/management/[email protected]
+consolidation/desktop/desktop-incorporation:system/management/wbem/[email protected]
+consolidation/desktop/desktop-incorporation:system/management/wbem/[email protected]
+consolidation/desktop/desktop-incorporation:system/management/web/[email protected]
+consolidation/desktop/desktop-incorporation:system/network/[email protected]
+consolidation/desktop/desktop-incorporation:terminal/[email protected]
+consolidation/desktop/desktop-incorporation:terminal/[email protected]
+consolidation/desktop/desktop-incorporation:terminal/[email protected]
+consolidation/desktop/desktop-incorporation:terminal/[email protected]
+consolidation/desktop/desktop-incorporation:terminal/[email protected]
+consolidation/desktop/desktop-incorporation:text/[email protected]
+consolidation/desktop/desktop-incorporation:text/[email protected]
+consolidation/desktop/desktop-incorporation:web/browser/firefox/[email protected]
+consolidation/desktop/desktop-incorporation:web/browser/firefox/plugin/[email protected]
+consolidation/desktop/desktop-incorporation:web/editor/[email protected]
--- a/doc/packaging.txt	Mon Sep 05 05:00:46 2016 -0700
+++ b/doc/packaging.txt	Mon Sep 26 08:04:04 2016 -0700
@@ -208,6 +208,16 @@
       Python modules, including the two mentioned above, have such files
       which can serve as examples.
 
+      By default, packages created from the history files will be part of
+      the userland-incorporation.  If a package needs to be included in a
+      different incorporation, then incorporate=INCORPORATION may be
+      placed on the end of either the rename or obsoletion line.
+      Examples with incorporate=consolidation/desktop/gnome-incorporation
+      may be found in components/meta-packages/history/history.
+
+      It's possible to specify whether the record applies to just i386 or
+      sparc by providing arch=i386 or arch=sparc.
+
     So far, not too bad.  This gets slightly more complicated when back-
     porting in that BUILD needs to be set to the back-port build (e.g.,
     "5.11-0.175.3.0.0.8.0", as was the case for tkinter-27) rather than
--- a/tools/generate-history	Mon Sep 05 05:00:46 2016 -0700
+++ b/tools/generate-history	Mon Sep 26 08:04:04 2016 -0700
@@ -5,6 +5,13 @@
   if (substr($1, 1, 1) == "#") { # Skip comments.
     continue
   }
+  if ($NF ~ /^arch=/) {
+    arch=$NF;
+    split(arch, a, "=")
+    if (a[2] != MACH)
+      continue
+    NF--;
+  }
   fmri=$1
   split(fmri, a, "@")
   gsub("/", "---", a[1])
@@ -17,12 +24,21 @@
     continue
   }
   printf "set name=pkg.fmri value=pkg:/%s\n", fmri
+  if ($NF ~ /^incorporate=/) {
+    incorporate=$NF;
+    NF--;
+  }
   if (NF == 2) {
     print "set name=pkg.renamed value=true"
     printf "depend type=require fmri=%s\n", $2
   } else {
     print "set name=pkg.obsolete value=true"
   }
-  print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)"
+  if (incorporate) {
+    printf "set name=org.opensolaris.consolidation %s value=$(CONSOLIDATION)\n",
+      incorporate
+  } else {
+    print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)"
+  }
   exit 0 # We're done; no point continuing.
 }
--- a/tools/userland-incorporator	Mon Sep 05 05:00:46 2016 -0700
+++ b/tools/userland-incorporator	Mon Sep 26 08:04:04 2016 -0700
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # incorporator - an utility to incorporate packages in a repo
@@ -84,17 +84,53 @@
 # a stable and less complicated interface to gathering information from the
 # manifests in the package repo.
 #
-def get_incorporations(repository, publisher, inc_version='5.12'):
-    tmp = subprocess.Popen(["/usr/bin/pkgrepo", "list", "-F", "json",
-                                                        "-s", repository,
-                                                        "-p", publisher],
-                           stdout=subprocess.PIPE)
+def get_incorporations(repository, publisher, inc_version='5.12',
+		       static_file=None):
+    packages = {}
     incorporations = {}
-    packages = json.load(tmp.stdout)
+    versions = {}
+
+    #
+    # if a static file was provided, prime the cache with the contents of
+    # that file.
+    #
+    if static_file:
+        with open(static_file, 'r') as fp:
+          for line in fp:
+            line = line.partition('#')[0]
+            line = line.rstrip()
 
+            try:
+                (incorporation, package, version) = re.split(':|@', line)
+            except ValueError:
+                pass
+            else:
+		if "=i386" in version:
+			if repository.rsplit('/',2)[1] == "i386":
+				version = version.split('=',1)[0]
+			else:
+				continue
+                if incorporation not in incorporations:
+                    incorporations[incorporation] = Incorporation(incorporation, inc_version)
+                # find the incorporation and add the package
+                tmp = incorporations[incorporation]
+                tmp.add_package(package, version)
+                versions[package] = version
+
+    #
+    # Load the repository for packages to incorporate.
+    #
+    if repository:
+        tmp = subprocess.Popen(["/usr/bin/pkgrepo", "list", "-F", "json",
+                                                            "-s", repository,
+                                                            "-p", publisher],
+                               stdout=subprocess.PIPE)
+        packages = json.load(tmp.stdout)
+
+    #
     # Check for multiple versions of packages in the repo, but keep track of
     # the latest one.
-    versions = {}
+    #
     for package in packages:
         pkg_name = package['name']
         pkg_version = package['version']
@@ -104,6 +140,9 @@
             pkg_version = max(pkg_version, versions[pkg_name])
         versions[pkg_name] = pkg_version
 
+    #
+    # Add published packages to the incorporation lists
+    #
     for package in packages:
         pkg_name = package['name']
         pkg_version = package['version']
@@ -122,18 +161,21 @@
             # find the incorporation and add the package
             tmp = incorporations[inc_name]
             tmp.add_package(pkg_name, pkg_version)
+
     return incorporations
 
 def main_func():
     global Werror
 
     try: 
-        opts, pargs = getopt.getopt(sys.argv[1:], "c:s:p:v:d:w",
+        opts, pargs = getopt.getopt(sys.argv[1:], "S:c:s:p:v:d:w",
                                     ["repository=", "publisher=", "version=",
-                                     "consolidation=", "destdir=", "Werror"])
+                                     "consolidation=", "destdir=", "Werror",
+				     "static-content-file="])
     except getopt.GetoptError, e:
         usage(_("illegal option: %s") % e.opt)
 
+    static_file = None
     repository = None
     publisher = None
     version = None
@@ -141,7 +183,9 @@
     consolidation = None
 
     for opt, arg in opts:
-        if opt in ("-s", "--repository"):
+        if opt in ("-S", "--static-content-file"):
+            static_file = arg
+        elif opt in ("-s", "--repository"):
             repository = arg
         elif opt in ("-p", "--publisher"):
             publisher = arg
@@ -154,7 +198,8 @@
         elif opt in ("-w", "--Werror"):
             Werror = True
 
-    incorporations = get_incorporations(repository, publisher, version)
+    incorporations = get_incorporations(repository, publisher, version,
+                                        static_file)
 
     for incorporation_name in incorporations.keys():
         filename = ''