Break out of freetype/harfbuzz circular dependency

.gitlab-ci.yml

@@ -21,6 +21,10 @@
     - 'buildah bud --build-arg STAGE0_TAG="$CPU" -t "${CI_REGISTRY_IMAGE}/debug:${CPU}-${ROLE}" -f Containerfile.debug .'
     - 'buildah push "${CI_REGISTRY_IMAGE}:${CPU}-${ROLE}"'
     - 'buildah push "${CI_REGISTRY_IMAGE}/debug:${CPU}-${ROLE}"'
+  rules:
+    - if: '$BUILD && $BUILD != $CPU && $BUILD != $ROLE'
+      when: never
+    - when: always
 
 'Build haswell-server':
   <<: *template

Containerfile

@@ -16,10 +16,10 @@ RUN puppet agent --test --certname builder --environment main --tags nest::base:
 ENV LANG=en_US.UTF-8
 
 # Switch to desired profile and make the base system consistent with it,
-# breaking out of a possible circular dependency between mesa and libva.
+# while avoiding circular dependencies.
 RUN eselect profile set "nest:${PROFILE}"
 RUN emerge --info
-RUN USE='-vaapi' emerge -v --update --deep --newuse --with-bdeps=y @world
+RUN if [[ $PROFILE == *workstation* ]]; then USE="-harfbuzz -vaapi" emerge -v --oneshot media-libs/freetype media-libs/mesa; else true; fi
 RUN emerge -v --update --deep --newuse --with-bdeps=y @world
 RUN emerge --depclean