Merge branch 'tempbranch'

component/geos/buildout.cfg

@@ -4,9 +4,9 @@ parts =
 
 [geos]
 recipe = slapos.recipe.cmmi
-version = 3.4.2
+version = 3.6.2
 url = http://download.osgeo.org/geos/geos-${:version}.tar.bz2
-md5sum = fc5df2d926eb7e67f988a43a92683bae
+md5sum = a32142343c93d3bf151f73db3baa651f
 configure-options =
   --disable-dependency-tracking
   --disable-static

component/polyline/buildout.cfg

+[buildout]
+parts =
+  polyline
+
+[polyline]
+recipe = zc.recipe.egg:custom
+egg = polyline
\ No newline at end of file

component/psycopg2/buildout.cfg

+[buildout]
+extends =
+  ../postgresql/buildout.cfg
+
+parts =
+  psycopg2
+
+
+[psycopg2-env]
+PATH = ${postgresql:location}/bin:%(PATH)s
+
+[psycopg2]
+recipe = zc.recipe.egg:custom
+egg = psycopg2
+define = PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,PSYCOPG_NEW_BOOLEAN,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3
+environment = psycopg2-env
+include-dirs =
+    ${postgresql:location}/include
+library-dirs =
+    ${postgresql:location}/lib
+rpath =
+    ${postgresql:location}/lib
\ No newline at end of file

component/shapely/buildout.cfg

+[buildout]
+extends =
+  ../geos/buildout.cfg
+  ../gcc/buildout.cfg
+
+parts =
+  shapely
+
+[shapely-env]
+GEOS_CONFIG = ${geos:location}/bin/geos-config
+
+[shapely]
+environment = shapely-env
+recipe = zc.recipe.egg:custom
+egg = shapely
+rpath =
+  ${gcc:location}/lib
+  ${gcc:location}/lib64