fix jdk install

component/java-jdk/buildout.cfg

@@ -11,16 +11,15 @@ parts =
 recipe = slapos.recipe.build:download-unpacked
 url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
 md5sum = f5da6f4dec81bdd2a096184ec1d69216
-destination = ${java-jdk:location} 
 strip-top-level-dir = true
 
 [java-jdk]
 recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+files = ${java-jdk-download:target} # well, we tried to use 'location' but it fails with new collision checks, so usual convention needs to be screwed unfortunately. 
 command =
-  for file in ${java-jdk-download:destination}/bin/*
+  for file in ${java-jdk-download:target}/bin/*
   do
 	echo appending rpath to $file
 	${patchelf:location}/bin/patchelf --set-rpath ${:rpath} $file
   done
-rpath = ${zlib:location}/lib:${java-jdk-download:destination}/lib
+rpath = ${zlib:location}/lib:${java-jdk-download:target}/lib

component/proviewR/buildout.cfg

@@ -386,7 +386,7 @@ make-targets =
 make-options =
   -j1
 environment =
-  PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${gcc:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:location}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${gcc:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:files}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
   SHELL=/bin/bash
   PKG_CONFIG_PATH=${qt4-qmake:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${phonon-qt4:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
   LD_LIBRARY_PATH=${:ld-library-path}

software/proviewR/instance.cfg

@@ -42,7 +42,7 @@ extra-context =
   raw websockify_executable_location ${buildout:directory}/bin/websockify
   raw xorg_font_util ${xorg-font-util:location}
   raw xvfb_bin ${xserver:location}/bin/Xvfb
-  raw java_location ${java-jdk:location}
+  raw java_location ${java-jdk:files}
   raw proview_directory ${pwr:location}
   raw proview_compile_dir ${pwr:compile-dir}
   raw ld_library_path ${pwr:ld-library-path}

software/proviewR/software.cfg

@@ -56,7 +56,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 04aa7533e8468182a1a76086810e1e99
+md5sum = 66ce630a6cdb37854a3ef6e0af8a8870
 
 [download-base]
 recipe = hexagonit.recipe.download