build-rina: re-enable build of hellorina SR

- version up: setuptools 30.1.0
- revert commit 1d0a8073

software/build-rina/build.cfg

@@ -109,9 +109,6 @@ install =
   extends = /mnt/slapos/software/hellorina/software.cfg
   develop = /mnt/slapos
   download-cache = /mnt/download-cache
-  # Required for recent buildout.
-  extensions -=
-    buildout-versions
   [slapos-cookbook-develop]
   recipe =
   setup =
@@ -121,10 +118,8 @@ install =
   [versions]
   slapos.cookbook =
   EOF
-  :||{ # https://github.com/pypa/setuptools/pull/846
   python -S /mnt/buildout/bin/buildout bootstrap
   MAKEFLAGS=-j${:smp} bin/buildout
-  }
 
   arch=`dpkg-architecture -qDEB_HOST_ARCH`
   sudo sh -c "/mnt/slapos.package/playbook/roles/rina/gen-ipcm-conf

software/build-rina/software.cfg

@@ -79,6 +79,6 @@ packages +=
   dh-autoreconf pkg-config doxygen maven xmlto
 
 [versions]
-setuptools = 28.8.0
+setuptools = 30.1.0
 zc.buildout = 2.5.2+slapos005
 zc.recipe.egg = 2.0.3+slapos002

software/hellorina/software.cfg

@@ -6,6 +6,10 @@ parts =
     slapos-cookbook
     template
 
+# Required for recent buildout.
+extensions -=
+  buildout-versions
+
 [template]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
@@ -40,3 +44,8 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
 mode = 755
 md5sum = 78b77a6bda9958f547f7d89b747731e3
+
+[versions]
+setuptools = 30.1.0
+zc.buildout = 2.5.2+slapos005
+zc.recipe.egg = 2.0.3+slapos002