--- a/components/gnome/evolution-data-server/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/evolution-data-server/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS=		64
 # All components using gobject-introspection must be built with gcc as
@@ -95,30 +95,6 @@
 # Required due to patches.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
 
-# Delete once builds servers have libgweather installed
-WEATHER_BASE = $(WS_COMPONENTS)/gnome/libgweather/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(WEATHER_BASE)$(PKG_CONFIG_PATH.$(BITS))
-
-LD_OPTIONS += -L $(WEATHER_BASE)$(USRLIB.$(BITS))
-
-CONFIGURE_ENV+= LIBGWEATHER_CFLAGS="-DMESA_EGL_NO_X11_HEADERS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -I$(WEATHER_BASE)/usr/include/libgweather-3.0 -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/$(MACH64)/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng14 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng14 -I/usr/include/glib-2.0 -I/usr/lib/$(MACH64)/glib-2.0/include"
-
-# Delete this when build servers are installed with libical
-ICAL_BASE = $(WS_COMPONENTS)/desktop/libical/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(ICAL_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L $(ICAL_BASE)$(USRLIB)
-CPPFLAGS += -I$(ICAL_BASE)$(USRINCDIR)/libical
-
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/gnome/libgweather/build/manifest-$(MACH)-libgweather.depend
-DEPENDED += $(WS_TOP)/components/desktop/libical/build/manifest-$(MACH)-libical.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES +=//p' ../libgweather/Makefile)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES +=//p' ../../desktop/libical/Makefile)
-#end Delete
-
 # for the tests
 unexport SHELLOPTS
 COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));

--- a/components/gnome/evolution-data-server/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/evolution-data-server: gnome/libgweather desktop/libical

--- a/components/gnome/glib-networking/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-glib-networking: gsettings-desktop-schemas

--- a/components/gnome/gnome-calendar/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/gnome-calendar/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=		64
@@ -44,17 +44,6 @@
 # Assumes GNU msgfmt in PATH.
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
 
-# Delete this when build servers are installed with libical
-ICAL_BASE = $(WS_COMPONENTS)/desktop/libical/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(ICAL_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L $(ICAL_BASE)$(USRLIB)
-CPPFLAGS += -I$(ICAL_BASE)$(USRINCDIR)/libical
-
-DEPENDED += $(WS_TOP)/components/desktop/libical/build/manifest-$(MACH)-libical.depend
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e 's/REQUIRED_PACKAGES += //p' ../../desktop/libical/Makefile)
-# end Delete
-
-
 # evolution-data-server requires nss/nspr, but Solaris doesn't include a 64-bit
 # pkg-config file for it, so we workaround this by using the one-off copy in the
 # evolution-data-server component directory

--- a/components/gnome/gnome-calendar/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gnome-calendar: desktop/libical

--- a/components/gnome/gnome-clocks/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/gnome-clocks/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=             64
@@ -49,23 +49,6 @@
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
 COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
 
-# Delete when libgweather is installed on the build server
-WEATHER_BASE = $(WS_COMPONENTS)/gnome/libgweather/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(WEATHER_BASE)$(PKG_CONFIG_PATH.$(BITS))
-
-LD_OPTIONS += -L $(WEATHER_BASE)$(USRLIB.$(BITS))
-
-CPPFLAGS += -I$(WEATHER_BASE)/usr/include/libgweather-3.0
-
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/gnome/libgweather/build/manifest-$(MACH)-libgweather.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES +=//p' ../libgweather/Makefile)
-#end Delete
-
-
 REQUIRED_PACKAGES += developer/vala
 REQUIRED_PACKAGES += gnome/gsettings-desktop-schemas
 REQUIRED_PACKAGES += library/desktop/cairo

--- a/components/gnome/gnome-clocks/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gnome-clocks: gnome/libgweather

--- a/components/gnome/gnome-control-center/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/gnome-control-center/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS =            64
@@ -63,18 +63,6 @@
 # Needed due to patch to configure.ac.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
 
-# Delete this when build servers are installed with gnome-settings-daemon
-GSD_BASE = $(WS_COMPONENTS)/gnome/gnome-settings-daemon/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(GSD_BASE)$(PKG_CONFIG_PATH.$(BITS))
-CPPFLAGS += -I$(GSD_BASE)/usr/include/gnome-settings-daemon-3.0
-LD_OPTIONS += -L $(GSD_BASE)$(USRLIB.$(BITS))
-
-UNINSTALLED_DEPS = gnome-settings-daemon libgweather
-DEPENDED += $(UNINSTALLED_DEPS:%=../%/build/manifest-$(MACH)-*.depend)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES += //p' $(UNINSTALLED_DEPS:%=../%/Makefile))
-#end Delete
-
-
 # Use the GNOME 3 libnotify even though the GNOME 2 one is still the default
 PKG_CONFIG_PATHS.32 += /usr/lib/pkgconfig/libnotify-4
 PKG_CONFIG_PATHS.64 += /usr/lib/$(MACH64)/pkgconfig/libnotify-4
@@ -95,6 +83,7 @@
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
 REQUIRED_PACKAGES += library/desktop/grilo
 REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/libgweather
 REQUIRED_PACKAGES += library/desktop/pango
 REQUIRED_PACKAGES += library/desktop/xdg/libcanberra
 REQUIRED_PACKAGES += library/glib2

--- a/components/gnome/gnome-control-center/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gnome-control-center: gnome/gnome-settings-daemon

--- a/components/gnome/gnome-settings-daemon/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/gnome-settings-daemon/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS =            64
@@ -72,33 +72,16 @@
 # Required due to patches.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
 
-# Delete this when build servers are installed with an updated libgweather
-WEATHER_BASE = $(WS_COMPONENTS)/gnome/libgweather/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(WEATHER_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(WEATHER_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(WEATHER_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(WEATHER_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(WEATHER_BASE)/usr/include/libgweather-3.0
-
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/gnome/libgweather/build/manifest-$(MACH)-libgweather.depend
-
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../libgweather/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += gnome/gsettings-desktop-schemas
 REQUIRED_PACKAGES += library/audio/pulseaudio
 REQUIRED_PACKAGES += library/desktop/cairo
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/desktop/geoclue
+REQUIRED_PACKAGES += library/desktop/geocode-glib
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
 REQUIRED_PACKAGES += library/desktop/gtk3
 REQUIRED_PACKAGES += library/desktop/libnotify
+REQUIRED_PACKAGES += library/desktop/libgweather
 REQUIRED_PACKAGES += library/desktop/xdg/libcanberra
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/gnome/gnome-desktop

--- a/components/gnome/gnome-settings-daemon/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gnome-settings-daemon: gnome/libgweather

--- a/components/gnome/gnome-shell-extensions/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/gnome-shell-extensions/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 
@@ -44,11 +44,6 @@
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
-# Delete this when build servers are installed with required packages
-DEPENDED += ../gnome-menus/build/manifest-$(MACH)-*.depend
-# end Delete
-
-
 CONFIGURE_OPTIONS += --enable-extensions=all
 
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"

--- a/components/gnome/gnome-shell-extensions/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gnome-shell-extensions: gnome/gnome-menus

--- a/components/gnome/gnome-shell/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/gnome-shell/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=		64
@@ -68,40 +68,6 @@
 ADIHEAP_MODE = $(ADIHEAP_DISABLE)
 ADISTACK_MODE =	$(ADISTACK_DISABLE)
 
-# Delete this when build servers are installed with required packages
-SN_TOP = $(WS_COMPONENTS)/desktop/startup-notification
-SN_BASE = $(SN_TOP)/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(SN_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L $(SN_BASE)$(USRLIB)
-CPPFLAGS += -I$(SN_BASE)$(USRINCDIR)/startup-notification-1.0
-DEPENDED += $(SN_TOP)/build/manifest-$(MACH)-startup-notification.depend
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e 's/REQUIRED_PACKAGES +=//p' $(SN_TOP)/Makefile)
-
-MUTTER_BASE = $(WS_COMPONENTS)/gnome/mutter/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(MUTTER_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L $(MUTTER_BASE)$(USRLIB)
-CPPFLAGS += -I$(MUTTER_BASE)$(USRINCDIR)/mutter
-CONFIGURE_ENV += INTROSPECTION_GIRDIR="$(MUTTER_BASE)/usr/lib/$(MACH64)/mutter"
-MUTTER_GIRDIR=$(MUTTER_BASE)$(USRLIB)/mutter
-
-EDS_BASE = $(WS_COMPONENTS)/gnome/evolution-data-server/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(EDS_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L $(EDS_BASE)$(USRLIB)
-CPPFLAGS += -I$(EDS_BASE)$(USRINCDIR)/evolution-data-server
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(GOA_BASE)/$(USRLIB):$(EDS_BASE)/$(USRLIB)/evolution-data-server:$(MUTTER_BASE)/$(USRLIB):$(BUILD_DIR_64)/src/.libs"
-
-XDG_DATA_DIRS="$(MUTTER_GIR_DIR):$(CLUTTER_BASE)/usr/share/:/usr/share/"
-
-COMPONENT_BUILD_ENV += XDG_DATA_DIRS="$(MUTTER_GIR_DIR):$(CLUTTER_BASE)/usr/share/:/usr/share/"
-COMPONENT_BUILD_ENV += MUTTER_GIR_DIR="$(MUTTER_GIR_DIR):$(CLUTTER_BASE)/usr/share/:/usr/share/"
-
-# Dependencies on other packages in this build not yet on build machines
-UNINSTALLED_DEPS = gdm gnome-clocks gnome-settings-daemon libgweather
-DEPENDED += $(UNINSTALLED_DEPS:%=../%/build/manifest-$(MACH)-*.depend)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES += //p' $(UNINSTALLED_DEPS:%=../%/Makefile))
-# end Delete
-
 # evolution-data-server requires nss/nspr, but Solaris doesn't include a 64-bit
 # pkg-config file for it, so we workaround this by using the one-off copy in the
 # evolution-data-server component directory

--- a/components/gnome/gnome-shell/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gnome-shell: desktop/startup-notification gnome/gdm gnome/gnome-clocks gnome/gnome-settings-daemon

--- a/components/gnome/gnome-tweak-tool/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/gnome-tweak-tool/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=		NO_ARCH
@@ -64,12 +64,6 @@
 PYTHON_SCRIPTS += $(PROTOUSRBINDIR)/gnome-tweak-tool
 PYTHON_SCRIPTS += $(PROTOUSRLIBDIR)/gnome-tweak-tool-lid-inhibitor
 
-# Delete this when build servers are installed with gnome-settings-daemon
-UNINSTALLED_DEPS = gnome-settings-daemon libgweather
-DEPENDED += $(UNINSTALLED_DEPS:%=../%/build/manifest-$(MACH)-*.depend.res)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES += //p' $(UNINSTALLED_DEPS:%=../%/Makefile))
-#end Delete
-
 REQUIRED_PACKAGES += gnome/file-manager/nautilus
 REQUIRED_PACKAGES += gnome/gnome-settings-daemon
 REQUIRED_PACKAGES += gnome/gnome-shell
@@ -77,6 +71,7 @@
 REQUIRED_PACKAGES += gnome/window-manager/mutter
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
 REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/libgweather
 REQUIRED_PACKAGES += library/desktop/libnotify
 REQUIRED_PACKAGES += library/desktop/pango
 REQUIRED_PACKAGES += library/gnome/gnome-desktop

--- a/components/gnome/gnome-tweak-tool/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gnome-tweak-tool: gnome/gnome-settings-daemon

--- a/components/gnome/mutter/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/mutter/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS =            64_and_32
@@ -72,12 +72,6 @@
 
 CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
 
-# Delete this when build servers are installed with gnome-settings-daemon
-UNINSTALLED_DEPS = gnome-settings-daemon libgweather
-DEPENDED += $(UNINSTALLED_DEPS:%=../%/build/manifest-$(MACH)-*.depend)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES += //p' $(UNINSTALLED_DEPS:%=../%/Makefile))
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += gnome/gnome-settings-daemon
 REQUIRED_PACKAGES += gnome/gsettings-desktop-schemas
@@ -86,6 +80,7 @@
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
 REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/libgweather
 REQUIRED_PACKAGES += library/desktop/pango
 REQUIRED_PACKAGES += library/desktop/startup-notification
 REQUIRED_PACKAGES += library/desktop/xdg/libcanberra

--- a/components/gnome/mutter/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/mutter: gnome/gnome-settings-daemon

--- a/components/gnome/orca/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/orca/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=		64
@@ -56,20 +56,6 @@
 # intltool may or may not be run depending on previous state of build dir
 COMPONENT_TEST_TRANSFORMS += "-e '/\/usr\/bin\/intltool-update/d'"
 
-# Delete once build servers have new versions of brltty & liblouis installed
-UNINSTALLED_DEPS = desktop/brltty desktop/liblouis
-DEPEND_BASES =	$(UNINSTALLED_DEPS:%=$(WS_COMPONENTS)/%/build/prototype/$(MACH))
-PYTHON_PATHS =	$(DEPEND_BASES:%=%/usr/lib/python$(PYTHON_VERSION)/vendor-packages)
-LIBRARY_PATHS = $(DEPEND_BASES:%=%$(USRLIBDIR64))
-
-CONFIGURE_ENV += \
-    PYTHONPATH=$(subst $(space),:,$(strip $(PYTHON_PATHS))) \
-    LD_LIBRARY_PATH_64=$(subst $(space),:,$(strip $(LIBRARY_PATHS)))
-
-DEPENDED += $(UNINSTALLED_DEPS:%=$(WS_COMPONENTS)/%/build/manifest-$(MACH)-*.depend)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES += //p' $(UNINSTALLED_DEPS:%=$(WS_COMPONENTS)/%/Makefile))
-#end Delete
-
 REQUIRED_PACKAGES += gnome/gsettings-desktop-schemas
 REQUIRED_PACKAGES += library/accessibility/brltty
 REQUIRED_PACKAGES += library/desktop/at-spi2-core

--- a/components/gnome/orca/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/orca: desktop/brltty desktop/liblouis

--- a/components/gnome/totem/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/totem/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS =            64_and_32
@@ -75,20 +75,6 @@
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
 COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
 
-# Delete once builds servers have nautilus installed
-NAUTILUS_BASE = $(WS_COMPONENTS)/gnome/nautilus/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(NAUTILUS_BASE)$(PKG_CONFIG_PATH.$(BITS))
-
-LD_OPTIONS += -L $(NAUTILUS_BASE)$(USRLIB.$(BITS))
-
-CPPFLAGS += -I$(NAUTILUS_BASE)$(USRINCDIR)/nautilus
-
-DEPENDED += $(WS_TOP)/components/gnome/nautilus/build/manifest-$(MACH)-nautilus.depend
-
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e 's%\$$(PERL_PKG)%$(PERL_PKG)%' -e 's/REQUIRED_PACKAGES +=//p' ../nautilus/Makefile)
-#end Delete
-
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += developer/python/pylint-27
 REQUIRED_PACKAGES += developer/vala

--- a/components/gnome/totem/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/totem: gnome/nautilus

--- a/components/gnome/tracker/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/tracker/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=		64_and_32
@@ -95,19 +95,6 @@
 # Required due to patches.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
 
-# Delete once builds servers have nautilus installed
-NAUTILUS_BASE = $(WS_COMPONENTS)/gnome/nautilus/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(NAUTILUS_BASE)$(PKG_CONFIG_PATH.$(BITS))
-
-LD_OPTIONS += -L $(NAUTILUS_BASE)$(USRLIB.$(BITS))
-
-CPPFLAGS += -I$(NAUTILUS_BASE)$(USRINCDIR)/nautilus
-
-DEPENDED += $(WS_TOP)/components/gnome/nautilus/build/manifest-$(MACH)-nautilus.depend
-
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e 's/REQUIRED_PACKAGES +=//p' ../nautilus/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += codec/flac
 REQUIRED_PACKAGES += codec/libogg
 REQUIRED_PACKAGES += codec/libvorbis

--- a/components/gnome/tracker/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/tracker: gnome/nautilus

--- a/components/gnome/vinagre/Makefile	Fri Jan 27 14:37:26 2017 -0800
+++ b/components/gnome/vinagre/Makefile	Mon Jan 30 17:47:32 2017 +0000
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=	    	64
@@ -50,22 +50,6 @@
 CONFIGURE_OPTIONS += --disable-rdp
 CONFIGURE_OPTIONS += --with-telepathy=yes
 
-# Delete this when build servers are installed with an updated gtk-vnc
-GTKVNC_BASE = $(WS_COMPONENTS)/gnome/gtk-vnc/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(GTKVNC_BASE)$(PKG_CONFIG_PATH.$(BITS))
-
-LD_OPTIONS += -L $(GTKVNC_BASE)$(USRLIB.$(BITS))
-
-CONFIGURE_ENV += VNC_CFLAGS="-DMESA_EGL_NO_X11_HEADERS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -I$(GTKVNC_BASE)/usr/include/gtk-vnc-2.0 -I$(GTKVNC_BASE)/usr/include/gvnc-1.0 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/$(MACH64)/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng14 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng14 -I/usr/include/glib-2.0 -I/usr/lib/$(MACH64)/glib-2.0/include -I/usr/include/libxml2"
-
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/gnome/gtk-vnc/build/manifest-$(MACH)-gtk-vnc.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../gtk-vnc/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += library/desktop/cairo
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/desktop/gtk-vnc

--- a/components/gnome/vinagre/depend.mk	Fri Jan 27 14:37:26 2017 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/vinagre: gnome/gtk-vnc