Fix master rebase

component/patchelf/buildout.cfg

@@ -9,7 +9,6 @@ parts =
 
 [patchelf]
 recipe = slapos.recipe.cmmi
-<<<<<<< HEAD
 shared = true
 url = https://github.com/NixOS/patchelf/archive/0.11.tar.gz
 md5sum = 6cffb77ee7a95bd314d954a6aeb53a02

component/proviewR/buildout.cfg

@@ -48,7 +48,7 @@ configure-command =
 make-binary =
   cd build && make
 environment =
-  PATH=${gcc:location}/bin:${git:location}/bin:${cmake:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${git:location}/bin:${cmake:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
 
 [make-4]
 recipe = slapos.recipe.cmmi
@@ -384,21 +384,21 @@ 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:files}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${qt4-qmake:location}/bin:${make-4: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}
   CXXFLAGS= -std=c++11 -I${alsa:location}/include -I${fontconfig:location}/include -I${libdb:location}/include -I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui
   CFLAGS=-I${qt4-qmake:location}/include -I${qt4-qmake:location}/include/QtGui -I${libdb:location}/include
-  LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${bison:location}/lib -L${libdb:location}/lib -L${gtk-2:location}/lib -L${zlib:location}/lib -Wl,-v
+  LDFLAGS=-L${gettext:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${bison:location}/lib -L${libdb:location}/lib -L${gtk-2:location}/lib -L${zlib:location}/lib -Wl,-v
   DISPLAY=:99
   MAKEFLAGS=-j1
   ASAN_OPTIONS=detect_leaks=0
 
-ld-library-path = ${alsa:location}/lib:${qt4-qmake:location}/lib:${libdb:location}/lib:${openssl:location}/lib:${gtk-2:location}/lib:${pango:location}/lib:${cairo:location}/lib:${atk:location}/lib:${harfbuzz:location}/lib:${libXext:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${phonon-qt4:location}/lib:${pixman:location}/lib:${zlib:location}/lib:${libpng:location}/lib:${gcc:location}/lib:${gcc:location}/lib64:${fontconfig:location}/lib:${libX11:location}/lib:${freetype:location}/lib
+ld-library-path = ${alsa:location}/lib:${qt4-qmake:location}/lib:${libdb:location}/lib:${openssl:location}/lib:${gtk-2:location}/lib:${pango:location}/lib:${cairo:location}/lib:${atk:location}/lib:${harfbuzz:location}/lib:${libXext:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${phonon-qt4:location}/lib:${pixman:location}/lib:${zlib:location}/lib:${libpng:location}/lib:${fontconfig:location}/lib:${libX11:location}/lib:${freetype:location}/lib
 
 
-rpaths = -Wl,-rpath=${alsa:location}/lib -Wl,-rpath=${qt4-qmake:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${gtk-2:location}/lib -Wl,-rpath=${pango:location}/lib -Wl,-rpath=${cairo:location}/lib -Wl,-rpath=${atk:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${libXext:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${phonon-qt4:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64  -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${fontconfig:location}/lib  -Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${freetype:location}/lib
+rpaths = -Wl,-rpath=${alsa:location}/lib -Wl,-rpath=${qt4-qmake:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${gtk-2:location}/lib -Wl,-rpath=${pango:location}/lib -Wl,-rpath=${cairo:location}/lib -Wl,-rpath=${atk:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${libXext:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${phonon-qt4:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${fontconfig:location}/lib  -Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${freetype:location}/lib
 
 
 

component/qt/buildout.cfg

@@ -35,10 +35,10 @@ configure-options =
 #  -no-gtkstyle
   -no-pch
 environment =
-  PATH=${pkgconfig:location}/bin:${gcc:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
   CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${libXext:location}/include -I${zlib:location}/include -I${pcre:location}/include -I${openssl:location}/include
-  LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath=${pcre:location}/lib -L${openssl:location}/lib
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath=${pcre:location}/lib -L${openssl:location}/lib
 #make-binary = true
 make-binary= make -j4
 #make-targets = install
@@ -92,11 +92,11 @@ configure-command = ./configure --prefix=${:location} -v -no-separate-debug-info
 #post-install =
 #  cp -rt ${:location}
 environment =
-  PATH=${pkgconfig:location}/bin:${gcc:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends}
   CPPFLAGS=-I${openssl-1.0:location}/include -I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${kbproto:location}/include/ -I${inputproto:location}/include/ -I${libXi:location}/include/ -I${libXrandr:location}/include/ -I${libXcursor:location}/include/ -I${xfixes:location}/include/ -I${fixesproto:location}/include/ -I${renderproto:location}/include/ -I${glproto:location}/include/
 
-  LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib  -Wl,-rpath=${:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${libXi:location}/lib -L${libXcursor:location}/lib -L${libXrandr:location}/lib -L${xfixes:location}/lib -L${libX11:location}/lib -L${libX11:location}/lib64 -Wl,-rpath=${libX11:location}/lib64  -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib  -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib  -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib 
+  LDFLAGS=-L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib  -Wl,-rpath=${:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${libXi:location}/lib -L${libXcursor:location}/lib -L${libXrandr:location}/lib -L${xfixes:location}/lib -L${libX11:location}/lib -L${libX11:location}/lib64 -Wl,-rpath=${libX11:location}/lib64  -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib  -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib  -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib 
 
 
   LD_LIBRARY_PATH=${:location}__compile__/qt-everywhere-opensource-src-${:version}/lib