software/plantuml: switch to new $FONTCONFIG_FILE

software/plantuml/buildout.hash.cfg

@@ -15,12 +15,8 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = f35aa36b41cd197ab3d763dcb884e96a
+md5sum = e76887e7480dd6b9c85b63cc276cf931
 
 [tomcat-server-xml]
 filename = server.xml.in
 md5sum = fdfa7eb249082855039ca98f310324e9
-
-[font.conf]
-filename = font.conf.in
-md5sum = caa3463c9c3766ac5f2396a517d6f926

software/plantuml/font.conf.in

-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <cachedir>$${:fontcache}</cachedir>
-  <!-- installed fonts: $${:installed-fonts} -->
-  <dir>${fonts:location}</dir>
-  <dir>$${:fonts}</dir>
-  <include>${fontconfig:location}/etc/fonts/conf.d</include>
-</fontconfig>
\ No newline at end of file

software/plantuml/instance.cfg.in

@@ -10,20 +10,22 @@ offline = true
 extends = ${monitor2-template:rendered}
 
 [fontconfig-conf]
-recipe = slapos.recipe.template
-url = ${font.conf:output}
-output = $${directory:etc}/font.conf
-
-fonts = $${directory:fonts}
-fontcache = $${directory:fontcache}
-installed-fonts =
-  ${liberation-fonts:location}
-  ${ipaex-fonts:location}
-  ${ipa-fonts:location}
-  ${ocrb-fonts:location}
+recipe = slapos.recipe.template:jinja2
+template = ${template-font-conf:output}
+rendered = $${directory:etc}/font.conf
+context =
+    key cachedir directory:fontconfig-cache
+    key fonts :fonts
+fonts =
     ${android-fonts:location}
     ${dejavu-fonts:location}
-
+    ${ipa-fonts:location}
+    ${ipaex-fonts:location}
+    ${liberation-fonts:location}
+    ${ocrb-fonts:location}
+    $${directory:fonts}
+includes =
+    ${fontconfig:location}/etc/fonts/conf.d
 [tomcat-server-xml]
 recipe = slapos.recipe.template
 url = ${tomcat-server-xml:output}
@@ -59,7 +61,7 @@ environment =
   JRE_HOME=${java-re-8:location}
   CATALINA_BASE=$${directory:catalina_base}
   GRAPHVIZ_DOT=${graphviz:location}/bin/dot
-  FONTCONFIG_FILE=$${fontconfig-conf:output}
+  FONTCONFIG_FILE=$${fontconfig-conf:rendered}
   LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib
 # XXX java is still loading system fonts ... ( even with $JAVA_FONTS or -Djava.awt.fonts )
 # related links:
@@ -110,9 +112,8 @@ srv = $${buildout:directory}/srv
 bin = $${buildout:directory}/bin
 tmp = $${buildout:directory}/tmp
 services = $${:etc}/service
-
+fontconfig-cache = $${buildout:directory}/.fontconfig
 fonts = $${:srv}/fonts/
-fontcache = $${buildout:directory}/.fontcache/
 
 # tomcat directories
 catalina_base = $${:var}/tomcat