fixup! version up: gnutls 3.5.13 and dependencies

component/gnutls/buildout.cfg

@@ -10,17 +10,19 @@ parts = gnutls
 [gpg-common]
 recipe = slapos.recipe.cmmi
 url = http://www.gnupg.org/ftp/gcrypt/${:_buildout_section_name_}/${:_buildout_section_name_}-${:version}.tar.bz2
-configure-options =
+# we'd like to combine <= and +=
+configure-options = ${:configure-options-extra}
   --enable-option-checking=fatal
   --disable-dependency-tracking
-environment =
+environment = ${:environment-extra}
   PATH=${gettext:location}/bin:%(PATH)s
+environment-extra =
 
 [libgpg-error]
 <= gpg-common
 version = 1.27
 md5sum = 5217ef3e76a7275a2a3b569a12ddc989
-configure-options +=
+configure-options-extra =
   --disable-doc
   --disable-tests
 
@@ -28,18 +30,17 @@ configure-options +=
 <= gpg-common
 version = 1.7.7
 md5sum = d1769481b1b506a632fd66c5e5f62e41
-configure-options +=
-  --disable-doc
-configure-options +=
+configure-options-extra =
   --with-gpg-error-prefix=${libgpg-error:location}
-environment +=
+  --disable-doc
+environment-extra =
   LDFLAGS=-Wl,-rpath=${libgpg-error:location}/lib
 
 [gnutls]
 <= gpg-common
 url = http://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.13.tar.xz
 md5sum = 4fd41ad86572933c2379b4cc321a0959
-configure-options +=
+configure-options-extra =
   --disable-doc
   --disable-static
   --disable-libdane