proview-r: move to python3

component/proviewR/buildout.cfg

@@ -13,6 +13,9 @@ extends =
   ../../component/git/buildout.cfg
   ../../component/fontconfig/buildout.cfg
   
+  ../../component/meson/buildout.cfg
+  ../../component/ninja/buildout.cfg
+
   ../glib/buildout.cfg
   ../xorg/buildout.cfg
 
@@ -28,6 +31,7 @@ extends =
   ../freetype/buildout.cfg
 
 parts =
+  meson 
   pwr
 
 #[java-jdk]
@@ -137,29 +141,6 @@ md5sum = 6f489c199cb5be8a4b84c6bd7ad6e051
 filename = get-pip.py
 mode = 0755
 
-[intall-pip]
-recipe = plone.recipe.command
-command = ${python3.5:location}/bin/python3.5 ${get-pip:target}
-stop-on-error = true
-
-[meson]
-recipe = slapos.recipe.cmmi
-url = https://github.com/mesonbuild/meson/releases/download/0.52.0/meson-0.52.0.tar.gz
-configure-command = true
-make-binary = ${python3.5:location}/bin/pip3 install meson --prefix=${:location}
-make-targets =
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-depends = ${intall-pip:recipe}
-
-[ninja]
-recipe = slapos.recipe.cmmi
-url = https://github.com/mesonbuild/meson/releases/download/0.52.0/meson-0.52.0.tar.gz
-configure-command = true
-make-binary = ${python3.5:location}/bin/pip3 install ninja --prefix=${:location}
-make-targets =
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-depends = ${intall-pip:recipe}
-
 [libepoxy]
 recipe = slapos.recipe.cmmi
 shared = true
@@ -171,17 +152,20 @@ configure-command =
   echo "current working directory is `pwd`" &&\
   sed -i '20s/value: true/value: false/' meson_options.txt &&\
   mkdir build && cd build && \
-  ${meson:location}/bin/meson --prefix=%(prefix)s \
+   ${buildout:directory}/bin/${meson:egg} --prefix=%(prefix)s \
   #$${meson:location}/bin/meson --prefix=$${:location} \
     
-make-binary = cd build && ${ninja:location}/bin/ninja
+make-binary = cd build && ${ninja:location}/ninja
 environment =
-  PATH=${ninja:location}/bin:${pkgconfig:location}/bin:${cmake:location}/bin:%(PATH)s
+  PATH=${ninja:location}:${pkgconfig:location}/bin:${cmake:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${mesa:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig
-  PYTHONPATH=${ninja:location}/lib/python3.5/site-packages/:${meson:location}/lib/python3.5/site-packages/
   CFLAGS=-I${mesa:location}/include -I${libX11:location}/include -I${xproto:location}/include -I${glu:location}/include
   LDFLAGS=-L${libX11:location}/lib -L${mesa:location}/lib -Wl,-rpath=${mesa:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib
 
+
+#  PYTHONPATH=${ninja:location}/lib/python3.5/site-packages/:${meson:location}/lib/python3.5/site-packages/
+
+
 [libdrm]
 recipe = slapos.recipe.cmmi
 url = https://dri.freedesktop.org/libdrm/libdrm-2.4.100.tar.bz2

software/proviewR/software.cfg

@@ -2,6 +2,7 @@
 
 extends =
   ../../stack/slapos.cfg
+  ../../component/python3/buildout.cfg
   ../../component/proviewR/buildout.cfg
   ../../component/open62541/buildout.cfg
   ../../component/noVNC/buildout.cfg
@@ -29,6 +30,8 @@ parts +=
   android-fonts
   dejavu-fonts
 
+python = python3
+
 allow-picked-versions = true
 
 [eggs]