--- a/components/desktop/colord-gtk/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/desktop/colord-gtk/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -61,35 +61,9 @@
 CONFIGURE_OPTIONS += --enable-vala
 CONFIGURE_OPTIONS += --with-pic
 
-# Delete this when build servers are installed with an updated colord
 COLORD_BASE = $(WS_COMPONENTS)/desktop/colord/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(COLORD_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(COLORD_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(COLORD_BASE)/usr/lib 
-LD_OPTIONS.64 += -L $(COLORD_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-COMPONENT_BUILD_ENV  += \
-libdir=$(COLORD_BASE)/usr/lib
-
 COMPONENT_BUILD_ENV  += \
-	XDG_DATA_DIRS="$(COLORD_BASE)/usr/share:/usr/share"
-
-CPPFLAGS += -I$(COLORD_BASE)/usr/include/colord-1
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(BUILD_DIR_32)/libcolord-gtk/.libs:$(COLORD_BASE)$(USRLIB.$(BITS))"
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(BUILD_DIR_64)/libcolord-gtk/.libs:$(COLORD_BASE)$(USRLIB.$(BITS))"
-
-# The dependency isn't installed, so add it manually since pkgdepend 
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/desktop/colord/build/manifest-$(MACH)-colord.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../colord/Makefile)
-#end Delete
-
+        XDG_DATA_DIRS="$(COLORD_BASE)/usr/share:/usr/share"
 
 REQUIRED_PACKAGES += developer/vala
 REQUIRED_PACKAGES += library/desktop/cairo

--- a/components/desktop/colord/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/desktop/colord/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -88,12 +88,6 @@
 # Tell g-ir-scanner not to cache results in homedir of user running the build
 COMPONENT_BUILD_ENV += GI_SCANNER_DISABLE_CACHE=""
 
-# Temporary until lcms2 with fix for 24494517 is installed on build machines
-# Allows running binaries during build to process profiles without bus errors
-LCMS2_LIB_DIR = $(WS_COMPONENTS)/lcms2/build/prototype/$(MACH)$(USRLIB)
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH="$(LCMS2_LIB_DIR)"
-# End temporary workaround section
-
 REQUIRED_PACKAGES += database/sqlite-3
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection

--- a/components/desktop/colord/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-desktop/colord: lcms2

--- a/components/desktop/gstreamer1/gst-plugins-good/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/desktop/gstreamer1/gst-plugins-good/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -48,49 +48,10 @@
 PYTHON_VERSIONS= 2.7
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/common.mk
 
-# Delete this when build servers are installed with an updated versions of,
-# gst-plugins-base, pulseaudio and libsoup
-GST_BASE = $(WS_COMPONENTS)/desktop/gstreamer1/gst-plugins-base/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(GST_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(GST_BASE)/usr/lib/$(MACH64)/pkgconfig/
-
-PULSE_BASE = $(WS_COMPONENTS)/desktop/pulseaudio/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(PULSE_BASE)/usr/lib/pkgconfig
-PKG_CONFIG_PATHS.64 += $(PULSE_BASE)/usr/lib/$(MACH64)/pkgconfig/
-
-SOUP_BASE = $(WS_COMPONENTS)/gnome/libsoup/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(SOUP_BASE)/usr/lib/pkgconfig
-PKG_CONFIG_PATHS.64 += $(SOUP_BASE)/usr/lib/$(MACH64)/pkgconfig/
-
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-CPPFLAGS += 	-I$(GST_BASE)/usr/include/gstreamer-1.0 \
-		-I$(PULSE_BASE)/usr/include/pulse \
-		-I$(SOUP_BASE)/usr/include/libsoup-2.4 \
-		-I$(SOUP_BASE)/usr/include/libsoup-gnome-2.4
-
-LD_OPTIONS.32 += -L $(GST_BASE)/usr/lib \
-		 -L $(PULSE_BASE)/usr/lib \
-		 -L $(SOUP_BASE)/usr/lib
-			
-LD_OPTIONS.64 += -L $(GST_BASE)/usr/lib/$(MACH64) \
-		 -L $(PULSE_BASE)/usr/lib/$(MACH64) \
-		 -L $(SOUP_BASE)/usr/lib/$(MACH64) 
-
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-DEPENDED += $(WS_TOP)/components/desktop/gstreamer1/gst-plugins-base/build/manifest-$(MACH)-gst-plugins-base.depend
-
-# end Delete
-
 CXXFLAGS += -std=c++11
 
 # configure script uses AC_CHECK_PROG erroneously; AC_CHECK_PROG looks for a

--- a/components/desktop/gstreamer1/gst-plugins-good/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-desktop/gstreamer1/gst-plugins-good: desktop/gstreamer1/gst-plugins-base gnome/libsoup desktop/pulseaudio

--- a/components/desktop/libtheora/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/desktop/libtheora/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -58,13 +58,6 @@
         '-e "/FAIL:/p" ' \
         '-e "/ERROR:/p" '
 
-
-# Replace the following with REQUIRED_PACKAGES += codec/libogg when
-# the build server is updated
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/desktop/libogg/build/manifest-$(MACH)-libogg.depend
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../libogg/Makefile)
-
+REQUIRED_PACKAGES += codec/libogg
 REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime

--- a/components/desktop/libtheora/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-desktop/libtheora: desktop/libogg

--- a/components/desktop/libvorbis/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/desktop/libvorbis/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -46,12 +46,6 @@
 
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
 
-# Replace the following with REQUIRED_PACKAGES += codec/libogg when 
-# the build server is updated
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/desktop/libogg/build/manifest-$(MACH)-libogg.depend
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../libogg/Makefile)
-
+REQUIRED_PACKAGES += codec/libogg
 REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += system/library/math

--- a/components/desktop/libvorbis/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-desktop/libvorbis: desktop/libogg

--- a/components/desktop/uhttpmock/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/desktop/uhttpmock/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -41,28 +41,11 @@
 # Enable after libsoup is installed on the build servers
 TEST_TARGET= $(SKIP_TEST)
 
-# Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+# Needs updated glib2, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/common.mk
 
-# Delete this when build servers are installed with an updated libsoup
-SOUP_BASE = $(WS_COMPONENTS)/gnome/libsoup/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(SOUP_BASE)/usr/lib/pkgconfig
-PKG_CONFIG_PATHS.64 += $(SOUP_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-CPPFLAGS += -I$(SOUP_BASE)/usr/include/libsoup-2.4 \
-	    -I$(SOUP_BASE)/usr/include/libsoup-gnome-2.4
-LD_OPTIONS.32 += -L $(SOUP_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(SOUP_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-# end Delete
-
 # Tell g-ir-scanner not to cache results in homedir of user running the build
 COMPONENT_BUILD_ENV += GI_SCANNER_DISABLE_CACHE=""
 

--- a/components/desktop/uhttpmock/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-desktop/uhttpmock: gnome/libsoup

--- a/components/gnome/clutter-gst/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/clutter-gst/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -42,11 +42,7 @@
 TEST_TARGET = $(SKIP_TEST)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -59,46 +55,6 @@
 # Required due to patches.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
 
-# Delete this when build servers are installed with an updated cogl
-COGL_BASE = $(WS_COMPONENTS)/gnome/cogl/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(COGL_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(COGL_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(COGL_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(COGL_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(COGL_BASE)/usr/include/cogl
-
-CLUTTER_BASE = $(WS_COMPONENTS)/gnome/clutter/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(CLUTTER_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(CLUTTER_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(CLUTTER_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(CLUTTER_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(CLUTTER_BASE)/usr/include/clutter-1.0
-
-COMPONENT_BUILD_ENV  += \
-        XDG_DATA_DIRS="$(COGL_BASE)/usr/share/:$(CLUTTER_BASE)/usr/share/:/usr/share/"
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(COGL_BASE)$(USRLIB.$(BITS)):$(CLUTTER_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_32)/clutter-gst/.libs"
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(COGL_BASE)$(USRLIB.$(BITS)):$(CLUTTER_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_64)/clutter-gst/.libs"
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo. - 15708323
-DEPENDED += $(WS_TOP)/components/gnome/cogl/build/manifest-$(MACH)-cogl.depend
-DEPENDED += $(WS_TOP)/components/gnome/clutter/build/manifest-$(MACH)-clutter.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../cogl/Makefile)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES +=//p' ../clutter/Makefile)
-
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/clutter
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection

--- a/components/gnome/clutter-gst/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/clutter-gst: gnome/cogl gnome/clutter

--- a/components/gnome/clutter-gst3/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/clutter-gst3/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -42,11 +42,7 @@
 TEST_TARGET = $(SKIP_TEST)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -62,47 +58,6 @@
 # Required due to patches.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
 
-# Delete this when build servers are installed with an updated cogl
-COGL_BASE = $(WS_COMPONENTS)/gnome/cogl/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(COGL_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(COGL_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(COGL_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(COGL_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(COGL_BASE)/usr/include/cogl
-
-CLUTTER_BASE = $(WS_COMPONENTS)/gnome/clutter/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(CLUTTER_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(CLUTTER_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(CLUTTER_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(CLUTTER_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(CLUTTER_BASE)/usr/include/clutter-1.0
-
-COMPONENT_BUILD_ENV  += \
-	XDG_DATA_DIRS="$(COGL_BASE)/usr/share/:$(CLUTTER_BASE)/usr/share/:/usr/share/"
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(COGL_BASE)$(USRLIB.$(BITS)):$(CLUTTER_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_32)/clutter-gst/.libs"
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(COGL_BASE)$(USRLIB.$(BITS)):$(CLUTTER_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_64)/clutter-gst/.libs"
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo. - 15708323
-DEPENDED += $(WS_TOP)/components/gnome/cogl/build/manifest-$(MACH)-cogl.depend
-DEPENDED += $(WS_TOP)/components/gnome/clutter/build/manifest-$(MACH)-clutter.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../cogl/Makefile)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES +=//p' ../clutter/Makefile)
-
-#end Delete
-
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/clutter
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf

--- a/components/gnome/clutter-gst3/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/clutter-gst3: gnome/cogl gnome/clutter

--- a/components/gnome/clutter-gtk/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/clutter-gtk/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -41,11 +41,7 @@
 TEST_TARGET = $(SKIP_TEST)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -55,46 +51,6 @@
 CONFIGURE_OPTIONS += --enable-shared
 CONFIGURE_OPTIONS += --with-pic
 
-# Delete this when build servers are installed with the dependencies
-COGL_BASE = $(WS_COMPONENTS)/gnome/cogl/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(COGL_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(COGL_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(COGL_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(COGL_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(COGL_BASE)/usr/include/cogl
-
-CLUTTER_BASE = $(WS_COMPONENTS)/gnome/clutter/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(CLUTTER_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(CLUTTER_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(CLUTTER_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(CLUTTER_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(CLUTTER_BASE)/usr/include/clutter-1.0 \
-	    -I/usr/include/json-glib-1.0
-
-COMPONENT_BUILD_ENV  += \
-	XDG_DATA_DIRS="$(COGL_BASE)/usr/share/:$(CLUTTER_BASE)/usr/share/:/usr/share/"
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(COGL_BASE)$(USRLIB.$(BITS)):$(CLUTTER_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_32)/clutter-gtk/.libs"
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(COGL_BASE)$(USRLIB.$(BITS)):$(CLUTTER_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_64)/clutter-gtk/.libs"
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo. - 15708323
-DEPENDED += $(WS_TOP)/components/gnome/cogl/build/manifest-$(MACH)-cogl.depend
-DEPENDED += $(WS_TOP)/components/gnome/clutter/build/manifest-$(MACH)-clutter.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../cogl/Makefile)
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES +=//p' ../clutter/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/cairo
 REQUIRED_PACKAGES += library/desktop/clutter

--- a/components/gnome/clutter-gtk/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/clutter-gtk: gnome/cogl gnome/clutter

--- a/components/gnome/clutter/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/clutter/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -42,11 +42,7 @@
 TEST_TARGET = $(SKIP_TEST)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -68,32 +64,6 @@
 CONFIGURE_OPTIONS += --with-pic
 CONFIGURE_OPTIONS += --with-x
 
-# Delete this when build servers are installed with an updated cogl
-COGL_BASE = $(WS_COMPONENTS)/gnome/cogl/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(COGL_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(COGL_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(COGL_BASE)/usr/lib 
-LD_OPTIONS.64 += -L $(COGL_BASE)/usr/lib/$(MACH64) 
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(COGL_BASE)/usr/include/cogl
-
-COMPONENT_BUILD_ENV  += \
-	XDG_DATA_DIRS="$(COGL_BASE)/usr/share/:/usr/share/" 
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(COGL_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_32)/clutter/.libs"
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(COGL_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_64)/clutter/.libs"
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo. - 15708323
-DEPENDED += $(WS_TOP)/components/gnome/cogl/build/manifest-$(MACH)-cogl.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../cogl/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/atk
 REQUIRED_PACKAGES += library/desktop/cairo

--- a/components/gnome/clutter/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/clutter: gnome/cogl

--- a/components/gnome/eog-plugins/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/eog-plugins/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -40,11 +40,7 @@
 TEST_TARGET = $(NO_TESTS)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_64=
-INSTALL_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -69,30 +65,10 @@
 # Requires python 3.2 or newer
 PYTHON_VERSION = 3.5
 
-# Delete this when build servers are installed with an updated eog
-EOG_BASE = $(WS_COMPONENTS)/gnome/eog/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(EOG_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L$(EOG_BASE)$(USRLIB.$(BITS))
-CPPFLAGS += -I$(EOG_BASE)/usr/include/eog-3.0
-
-LIBCHAMPLAIN_BASE = $(WS_COMPONENTS)/gnome/libchamplain/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(LIBCHAMPLAIN_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L$(LIBCHAMPLAIN_BASE)$(USRLIB.$(BITS))
-CPPFLAGS += -I$(LIBCHAMPLAIN_BASE)/usr/include/libchamplain-0.12 -I$(LIBCHAMPLAIN_BASE)/usr/include/libchamplain-gtk-0.12
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo.
-DEPENDED += $(WS_TOP)/components/gnome/eog/build/manifest-$(MACH)-eog.depend
-DEPENDED += $(WS_TOP)/components/gnome/libchamplain/build/manifest-$(MACH)-libchamplain.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../eog/Makefile)
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../libchamplain/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += image/library/libexif
 REQUIRED_PACKAGES += image/library/libjpeg
 REQUIRED_PACKAGES += image/library/librsvg
+REQUIRED_PACKAGES += image/viewer/eog
 REQUIRED_PACKAGES += library/desktop/atk
 REQUIRED_PACKAGES += library/desktop/cairo
 REQUIRED_PACKAGES += library/desktop/clutter

--- a/components/gnome/eog-plugins/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/eog-plugins: gnome/eog gnome/libchamplain

--- a/components/gnome/gedit-plugins/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/gedit-plugins/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -41,27 +41,14 @@
 TEST_TARGET = $(NO_TESTS)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_64=
-INSTALL_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
 COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
 
-# Delete this when build servers are installed with an updated gedit
-GEDIT_BASE = $(WS_COMPONENTS)/gnome/gedit/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(GEDIT_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L$(GEDIT_BASE)$(USRLIB.$(BITS))
-CPPFLAGS += -I$(GEDIT_BASE)/usr/include/gedit-3.14
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../gedit/Makefile)
-#end Delete
-
+REQUIRED_PACKAGES += editor/gedit
 REQUIRED_PACKAGES += library/desktop/gtk3
 REQUIRED_PACKAGES += library/desktop/gtksourceview3
 REQUIRED_PACKAGES += library/desktop/libpeas

--- a/components/gnome/gedit-plugins/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gedit-plugins: gnome/gedit

--- a/components/gnome/geocode-glib/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/geocode-glib/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -41,23 +41,10 @@
 TEST_TARGET = $(SKIP_TEST)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
-# Delete this when build servers are installed with an updated libsoup
-LIBSOUP_ROOT = $(WS_COMPONENTS)/gnome/libsoup/build/prototype/$(MACH)
-CPPFLAGS += -I$(LIBSOUP_ROOT)/usr/include/libsoup-2.4
-LD_OPTIONS.32 += -L $(LIBSOUP_ROOT)/usr/lib 
-LD_OPTIONS.64 += -L $(LIBSOUP_ROOT)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-# end Delete
-
 CONFIGURE_OPTIONS += --disable-static
 # Required for other components.
 CONFIGURE_OPTIONS += --enable-introspection

--- a/components/gnome/geocode-glib/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/geocode-glib: gnome/libsoup

--- a/components/gnome/grilo/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/grilo/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -41,11 +41,7 @@
 TEST_TARGET = $(SKIP_TEST)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -64,27 +60,6 @@
 CONFIGURE_OPTIONS += --enable-vala
 CONFIGURE_OPTIONS += --with-pic
 
-# Delete when build servers are installed with an updated totem-pl-parser
-TPP_BASE = $(WS_COMPONENTS)/gnome/totem-pl-parser/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(TPP_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(TPP_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(TPP_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(TPP_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CONFIGURE_ENV += TOTEM_PL_PARSER_CFLAGS="-I$(TPP_BASE)/usr/include/totem-pl-parser/1/plparser"
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo.
-DEPENDED += $(WS_TOP)/components/gnome/totem-pl-parser/build/manifest-$(MACH)-totem-pl-parser.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../totem-pl-parser/Makefile)
-#end Delete
-
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += developer/vala
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf

--- a/components/gnome/grilo/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/grilo: gnome/totem-pl-parser

--- a/components/gnome/gtkmm/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/gtkmm/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -40,29 +40,12 @@
 TEST_TARGET = $(NO_TESTS)
 
 # Needs updated gtk, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
 CXXFLAGS += -std=c++11
 
-# Delete this when build servers are installed with atkmm
-ATKMM_BASE = $(WS_COMPONENTS)/gnome/atkmm/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(ATKMM_BASE)$(PKG_CONFIG_PATH.$(BITS))
-
-LD_OPTIONS += -L $(ATKMM_BASE)$(USRLIB.$(BITS))
-
-CPPFLAGS += -I$(ATKMM_BASE)$(USRINCDIR)/atkmm-1.6
-
-DEPENDED += $(WS_TOP)/components/gnome/atkmm/build/manifest-$(MACH)-atkmm.depend
-
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e 's%\$$(PERL_PKG)%$(PERL_PKG)%' -e 's/REQUIRED_PACKAGES +=//p' ../atkmm/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += image/graphviz
 REQUIRED_PACKAGES += library/c++/glibmm

--- a/components/gnome/gtkmm/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gtkmm: gnome/atkmm

--- a/components/gnome/gtkmm3/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/gtkmm3/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -40,29 +40,12 @@
 TEST_TARGET = $(NO_TESTS)
 
 # Needs updated gtk3, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
 CXXFLAGS += -std=c++11
 
-# Delete this when build servers are installed with atkmm
-ATKMM_BASE = $(WS_COMPONENTS)/gnome/atkmm/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(ATKMM_BASE)$(PKG_CONFIG_PATH.$(BITS))
-
-LD_OPTIONS += -L $(ATKMM_BASE)$(USRLIB.$(BITS))
-
-CPPFLAGS += -I$(ATKMM_BASE)$(USRINCDIR)/atkmm-1.6
-
-DEPENDED += $(WS_TOP)/components/gnome/atkmm/build/manifest-$(MACH)-atkmm.depend
-
-REQUIRED_PACKAGES += $(shell $(GSED) -n -e 's%\$$(PERL_PKG)%$(PERL_PKG)%' -e 's/REQUIRED_PACKAGES +=//p' ../atkmm/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/doxygen
 REQUIRED_PACKAGES += image/graphviz
 REQUIRED_PACKAGES += library/c++/glibmm

--- a/components/gnome/gtkmm3/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gtkmm3: gnome/atkmm

--- a/components/gnome/gupnp-igd/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/gupnp-igd/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -46,11 +46,7 @@
 TEST_TARGET = $(SKIP_TEST)
 
 # Needs gupnp, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -65,26 +61,6 @@
 # Ancient configure script needs regeneration.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
 
-# Delete this when build servers are installed with gupnp
-GUPNP_BASE = $(WS_COMPONENTS)/gnome/gupnp/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(GUPNP_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(GUPNP_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(GUPNP_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(GUPNP_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(GUPNP_BASE)/usr/include/gupnp-1.0
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo.
-DEPENDED += $(WS_TOP)/components/gnome/gupnp/build/manifest-$(MACH)-gupnp.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../gupnp/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
 REQUIRED_PACKAGES += library/glib2

--- a/components/gnome/gupnp-igd/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gupnp-igd: gnome/gupnp

--- a/components/gnome/libgdata/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/libgdata/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -57,27 +57,6 @@
 
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
 
-# Delete once builds servers have goa installed
-GOA_BASE = $(WS_COMPONENTS)/gnome/gnome-online-accounts/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(GOA_BASE)/usr/lib/$(MACH64)/pkgconfig
-
-LD_OPTIONS += -L $(GOA_BASE)$(USRLIB.$(BITS))
-
-CONFIGURE_ENV += GNOME_CFLAGS="-D_REENTRANT -I$(GOA_BASE)/usr/include/goa-1.0 -I$(GOA_BASE)/usr/lib/$(MACH64)/goa-1.0/include -I/usr/include/gcr-3 -I/usr/include/gck-1 -I/usr/include/p11-kit-1 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/$(MACH64)/glib-2.0/include"
-
-COMPONENT_BUILD_ENV  += \
-	XDG_DATA_DIRS="$(GOA_BASE)/usr/share/:/usr/share/"
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(GOA_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_64)/gdata/.libs"
-
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/gnome/gnome-online-accounts/build/manifest-$(MACH)-gnome-online-accounts.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../gnome-online-accounts/Makefile)
-#end Delete
-
 # for the tests
 unexport SHELLOPTS
 COMPONENT_TEST_ARGS =   -k -i

--- a/components/gnome/libgdata/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/libgdata: gnome/gnome-online-accounts

--- a/components/gnome/libpeas/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/libpeas/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -39,11 +39,7 @@
 TPNO=			25272
 
 # Needs pygobject3, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_32_and_64=
-INSTALL_32_and_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -81,15 +77,6 @@
         '-e "/PASS:/p" ' \
         '-e "/FAIL:/p" '
 
-# Delete this when build servers are installed with pygobject3
-PYGOBJ_BASE = $(WS_COMPONENTS)/gnome/pygobject3/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(PYGOBJ_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(PYGOBJ_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-CONFIGURE_OPTIONS += PYGOBJECT_CFLAGS=-I$(PYGOBJ_BASE)/usr/include/pygobject-3.0
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += developer/documentation-tool/xmlto
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
@@ -97,5 +84,6 @@
 REQUIRED_PACKAGES += library/desktop/gtk3
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/lua/lgi-52
+REQUIRED_PACKAGES += library/python/pygobject-3
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += runtime/python-27

--- a/components/gnome/libpeas/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/libpeas: gnome/pygobject3

--- a/components/gnome/libzapojit/Makefile	Wed Nov 02 11:00:37 2016 -0700
+++ b/components/gnome/libzapojit/Makefile	Fri Nov 04 09:22:37 2016 -0700
@@ -41,11 +41,7 @@
 TEST_TARGET = $(NO_TESTS)
 
 # Needs gobject-introspection, not available on S11.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_64=
-INSTALL_64=
-PUBLISH_STAMP=
-endif
+include $(WS_MAKE_RULES)/no-evaluation.mk
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
@@ -59,26 +55,6 @@
 CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
 COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
 
-# Delete once builds servers have goa installed
-GOA_BASE = $(WS_COMPONENTS)/gnome/gnome-online-accounts/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(GOA_BASE)/usr/lib/$(MACH64)/pkgconfig
-
-LD_OPTIONS += -L $(GOA_BASE)$(USRLIB.$(BITS))
-
-CPPFLAGS +=  \
-	-I$(GOA_BASE)/usr/include/goa-1.0 \
-	-I$(GOA_BASE)/usr/lib/$(MACH64)/goa-1.0/include
-
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(GOA_BASE)/$(USRLIB.$(BITS)):$(BUILD_DIR_64)/src/.libs"
-
-# The dependency isn't installed, so add it manually since pkgdepend
-# can't resolve them yet: 15708323
-DEPENDED += $(WS_TOP)/components/gnome/gnome-online-accounts/build/manifest-$(MACH)-gnome-online-accounts.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../gnome-online-accounts/Makefile)
-#end Delete
-
 REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
 REQUIRED_PACKAGES += library/desktop/librest

--- a/components/gnome/libzapojit/depend.mk	Wed Nov 02 11:00:37 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/libzapojit: gnome/gnome-online-accounts