bundler built gems ok; retrying with clean environment - to catch what is not needed

.gitignore

@@ -4,3 +4,6 @@
 /bin/
 /.mr.developer.cfg
 /.installed.cfg
+
+.*.swp
+*.egg-info/

buildout.cfg

@@ -7,19 +7,14 @@ extends =
     slapos/component/icu/buildout.cfg
     slapos/component/pkgconfig/buildout.cfg
 
-# NOTE kerberos can be --without'ed in 7.11
-    slapos/component/kerberos/buildout.cfg
-
 
 parts =
     python2.7
     ruby2.1
-#   ruby
     git
     postgresql
     cmake
     icu
-    kerberos
     pkgconfig
 
 
@@ -50,43 +45,47 @@ eggs    = ${ktest:egg}
 
 [gems]
 recipe  = rubygemsrecipe
-#ruby-executable = ${ruby:location}/bin/ruby
 ruby-executable = ${ruby2.1:location}/bin/ruby
 
 # XXX vvv does not work
 # location= ${buildout:gems-directory}
 
-gems    = fluentd
+gems    = fluentd fluent-plugin-wendelin
 
 
 
+# bundler, that we'll use to
+# - install gems for gitlab
+# - run gitlan services / jobs  (via `bundle exec ...`)
+#
+# TODO say how this bundler/gitlab differ from usual slapos installation
 [bundler-4gitlab]
 recipe  = rubygemsrecipe
 ruby-executable = ${ruby2.1:location}/bin/ruby
-#ruby-executable = ${ruby:location}/bin/ruby
 gems    = bundler
 
 # bin installed here
 bundle  = ${buildout:bin-directory}/bundle
 
-# install together with all dependencies of gitlab
-# ( reason: rubygemsrecipe hardcodes PATH inside generated bin/* and it is
-#   impossible to adjust it later )
-environment =
-  PATH    = ${postgresql:location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS= -I${postgresql:location}/include -I${icu:location}/include -I${kerberos:location}/include
-  LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib -L${kerberos:location}/lib -Wl,-rpath=${kerberos:location}/lib
+# # install together with all dependencies of gitlab
+# # ( reason: rubygemsrecipe hardcodes PATH inside generated bin/* and it is
+# #   impossible to adjust it later )
+#environment =
+#  PATH    = ${postgresql:location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+#  CPPFLAGS= -I${postgresql:location}/include -I${icu:location}/include
+#  LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib
+
 
 
 
+# gitlab & gitlab shell checked out as git repositories pinned to exact commit
 [gitlab-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://gitlab.com/gitlab-org/gitlab-ce.git
-revision  = v7.10.4-0-g337225a4fcfa9674e2528cb6d41c46556bba9dfa
+revision  = v7.11.2-0-gdac18e7728013a77410e926a1e64225703754a2d
 location = ${buildout:parts-directory}/gitlab
 git-executable = ${git:location}/bin/git
 
-
 [gitlab-shell-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://gitlab.com/gitlab-org/gitlab-shell.git
@@ -104,21 +103,24 @@ git-executable = ${git:location}/bin/git
 # libpq (pg)
 # libssh2 (rugged)
 # libgpg-error (rugged) ?
-# krb5 (ominauth-kerberos -> timfel-krb5-auth)
+# # krb5 (ominauth-kerberos -> timfel-krb5-auth)
 # [gitlab-build-env]
 # PATH    = ${postgresql:location}/bin:%(PATH)s
 # CPPFLAGS= -I${postgresql:location}/include
 # LDFLAGS = -L${postgresql:location}/lib -Wl,-rpath=${postgresql:location}/lib
 
-# FIXME installed(gitlab) is registered as parts/gitlab-shell  (not parts/gitlab-shell/vendor/bundle)
+# ??? still true ? -> FIXME installed(gitlab) is registered as parts/gitlab-shell  (not parts/gitlab-shell/vendor/bundle)
 [gitlab/vendor/bundle]
 recipe  = slapos.recipe.cmmi
 path    = ${gitlab-repository:location}
-bundle  = cd ${:path} && ${bundler-4gitlab:bundle}
+#bundle  = cd ${:path} && ${bundler-4gitlab:bundle}
+bundle  = ${bundler-4gitlab:bundle}
 
 configure-command = true
 make-binary =
-make-targets= ${:bundle} install --deployment --without mysql development test
+make-targets= cd ${:path} &&
+    ${:bundle} config --local build.charlock_holmes --with-icu-dir=${icu:location}  &&
+    ${:bundle} install --deployment --without mysql kerberos development test
 
 # # propagate location
 # location = ${gitlab-repository:location}
@@ -146,7 +148,7 @@ make-targets= echo PATH: $PATH && ${:bundle} install --deployment
 # XXX ok?
 #location = ${gitlab-shell-repository:location}/vendor/bundle
 
-environment-section = gitlab-build-env
+# environment-section = gitlab-build-env