Fix intercomponent paths.

component/apache/buildout.cfg

@@ -4,14 +4,14 @@ parts =
   apache-antiloris
 
 extends =
-  libexpat.cfg
-  libuuid.cfg
-  gdbm.cfg
-  openssl.cfg
-  pcre.cfg
-  pkgconfig.cfg
-  sqlite3.cfg
-  zlib.cfg
+  ../libexpat/buildout.cfg
+  ../libuuid/buildout.cfg
+  ../gdbm/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../sqlite3/buildout.cfg
+  ../zlib/buildout.cfg
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/

component/autoconf/buildout.cfg

 [buildout]
 extends =
-  m4.cfg
-  perl.cfg
+  ../m4/buildout.cfg
+  ../perl/buildout.cfg
 parts =
   autoconf
 

component/automake/buildout.cfg

 [buildout]
 extends =
-  autoconf.cfg
-  perl.cfg
+  ../autoconf/buildout.cfg
+  ../perl/buildout.cfg
 parts =
   automake-1.11
 

component/bison/buildout.cfg

 [buildout]
 extends =
-  m4.cfg
+  ../m4/buildout.cfg
 parts =
   bison
 

component/cloudooo-development/buildout.cfg

 [buildout]
 
 extends =
-  cloudooo.cfg
+  ../cloudooo/buildout.cfg
 
 extensions = mr.developer
 sources = sources

component/cloudooo/buildout.cfg

@@ -5,14 +5,14 @@ extends =
   ../profiles/versions-common.cfg
   ../profiles/software-definition.cfg
   ../profiles/common.cfg
-  xpdf.cfg
-  imagemagick.cfg
-  file.cfg
-  pdftk.cfg
-  ffmpeg.cfg
-  python-2.6.cfg
-  libreoffice-bin.cfg
-  lxml-python.cfg
+  ../xpdf/buildout.cfg
+  ../imagemagick/buildout.cfg
+  ../file/buildout.cfg
+  ../pdftk/buildout.cfg
+  ../ffmpeg/buildout.cfg
+  ../python-2.6/buildout.cfg
+  ../libreoffice-bin/buildout.cfg
+  ../lxml-python/buildout.cfg
 
 python = software_definition
 versions = versions

component/cuneiform/buildout.cfg

 [buildout]
 extends =
-  cmake.cfg
-  imagemagick.cfg
+  ../cmake/buildout.cfg
+  ../imagemagick/buildout.cfg
 parts = cuneiform
 
 [cuneiform]

component/curl/buildout.cfg

@@ -3,9 +3,9 @@
 
 [buildout]
 extends =
-  openssl.cfg
-  pkgconfig.cfg
-  zlib.cfg
+  ../openssl/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
   curl
 

component/cyrus-sasl/buildout.cfg

@@ -2,7 +2,7 @@
 parts =
   cyrus-sasl
 extends =
-  zlib.cfg
+  ../zlib/buildout.cfg
 
 [cyrus-sasl-gcc4.4-patch]
 # patch available thanks to Gentoo packagers

component/erp5/buildout.cfg

 [buildout]
 extends =
-  mysql-tritonn-5.0.cfg
-  python-2.4.cfg
-  lxml-python.cfg
-  mysql-python.cfg
-  subversion.cfg
-  pysvn-python.cfg
-  python-ldap-python.cfg
-  glib.cfg
+  ../mysql-tritonn-5.0/buildout.cfg
+  ../python-2.4/buildout.cfg
+  ../lxml-python/buildout.cfg
+  ../mysql-python/buildout.cfg
+  ../subversion/buildout.cfg
+  ../pysvn-python/buildout.cfg
+  ../python-ldap-python/buildout.cfg
+  ../glib/buildout.cfg
 
 parts =
   cmf15

component/fastjar/buildout.cfg

 [buildout]
 parts = fastjar
 extends =
-  zlib.cfg
+  ../zlib/buildout.cfg
 
 [fastjar]
 recipe = hexagonit.recipe.cmmi

component/ffmpeg/buildout.cfg

 [buildout]
 extends = 
-  bzip2.cfg
-  libpng.cfg
-  pkgconfig.cfg
-  zlib.cfg
+  ../bzip2/buildout.cfg
+  ../libpng/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts = 
   ffmpeg

component/file/buildout.cfg

 [buildout]
 parts = file
 extends =
-  zlib.cfg
+  ../zlib/buildout.cfg
 
 
 [file]

component/flare/buildout.cfg

 [buildout]
 extends =
-  boost-lib.cfg
-  tokyocabinet.cfg
+  ../boost-lib/buildout.cfg
+  ../tokyocabinet/buildout.cfg
 
 parts =
   flare

component/flex/buildout.cfg

 [buildout]
 extends =
-  m4.cfg
+  ../m4/buildout.cfg
 parts =
   flex
 

component/fontconfig/buildout.cfg

 [buildout]
 extends =
-  fonts.cfg
-  freetype.cfg
-  libxml2.cfg
-  pkgconfig.cfg
-  zlib.cfg
+  ../fonts/buildout.cfg
+  ../freetype/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   fontconfig

component/freetype/buildout.cfg

@@ -3,7 +3,7 @@
 
 [buildout]
 extends =
-  zlib.cfg
+  ../zlib/buildout.cfg
 
 parts =
   freetype

component/gcc/buildout.cfg

@@ -2,8 +2,8 @@
 # Mostly required to support languages different then C or C++
 [buildout]
 extends =
-  m4.cfg
-  zip.cfg
+  ../m4/buildout.cfg
+  ../zip/buildout.cfg
 
 parts =
   gcc-java

component/gettext/buildout.cfg

@@ -2,9 +2,9 @@
 parts =
   gettext
 extends =
-  ncurses.cfg
-  libxml2.cfg
-  zlib.cfg
+  ../ncurses/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
 
 [gettext]
 recipe = hexagonit.recipe.cmmi

component/ghostscript/buildout.cfg

 [buildout]
 extends =
-  fontconfig.cfg
-  libjpeg.cfg
-  libtiff.cfg
-  pkgconfig.cfg
+  ../fontconfig/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../pkgconfig/buildout.cfg
 
 parts = ghostscript
 

component/git/buildout.cfg

@@ -3,11 +3,11 @@
 
 [buildout]
 extends =
-  curl.cfg
-  libexpat.cfg
-  openssl.cfg
-  perl.cfg
-  zlib.cfg
+  ../curl/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../openssl/buildout.cfg
+  ../perl/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
   git
 

component/glib/buildout.cfg

 [buildout]
 extends =
-  gettext.cfg
-  zlib.cfg
+  ../gettext/buildout.cfg
+  ../zlib/buildout.cfg
 
 [glib]
 recipe = hexagonit.recipe.cmmi

component/graphviz/buildout.cfg

@@ -5,12 +5,12 @@
 parts =
   graphviz
 extends =
-  fontconfig.cfg
-  freetype.cfg
-  libpng.cfg
-  libtool.cfg
-  pkgconfig.cfg
-  zlib.cfg
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
 
 [graphviz]
 recipe = hexagonit.recipe.cmmi

component/grep/buildout.cfg

 [buildout]
 extends =
-  pcre.cfg
+  ../pcre/buildout.cfg
 parts =
   grep
 

component/handlersocket/buildout.cfg

@@ -3,10 +3,10 @@
 
 [buildout]
 extends =
-  autoconf.cfg
-  automake.cfg
-  libtool.cfg
-  mariadb.cfg
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../mariadb/buildout.cfg
 
 parts =
   handlersocket

component/imagemagick/buildout.cfg

@@ -4,18 +4,18 @@
 [buildout]
 parts = imagemagick
 extends =
-  bzip2.cfg
-  fontconfig.cfg
-  freetype.cfg
-  ghostscript.cfg
-  libjpeg.cfg
-  libpng.cfg
-  libtiff.cfg
-  libtool.cfg
-  jasper.cfg
-  jbigkit.cfg
-  pkgconfig.cfg
-  zlib.cfg
+  ../bzip2/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
+  ../ghostscript/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../libtool/buildout.cfg
+  ../jasper/buildout.cfg
+  ../jbigkit/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
 
 [imagemagick-6.6.6-1-no-gsx-gsc-probe.patch]
 recipe = hexagonit.recipe.download

component/jasper/buildout.cfg

 [buildout]
 extends =
-  libjpeg.cfg
+  ../libjpeg/buildout.cfg
 parts =
   jasper
 

component/kumo/buildout.cfg

 [buildout]
 extends =
-  tokyocabinet.cfg
-  messagepack.cfg
-  openssl.cfg
-  zlib.cfg
+  ../tokyocabinet/buildout.cfg
+  ../messagepack/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts = kumo
 find-links = http://www.nexedi.org/static/packages/source/

component/libpng/buildout.cfg

 [buildout]
 extends =
-  zlib.cfg
+  ../zlib/buildout.cfg
 
 parts =
   libpng12

component/libreoffice-bin/buildout.cfg

 [buildout]
-extends = cpio.cfg
+extends = ../cpio/buildout.cfg
 parts =
   libreoffice-bin
 

component/librsync/buildout.cfg

 [buildout]
 extends =
-  bzip2.cfg
-  popt.cfg
-  zlib.cfg
+  ../bzip2/buildout.cfg
+  ../popt/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
   librsync
 

component/libtiff/buildout.cfg

 [buildout]
 extends =
-  libjpeg.cfg
-  jbigkit.cfg
-  zlib.cfg
+  ../libjpeg/buildout.cfg
+  ../jbigkit/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   libtiff

component/libxml2/buildout.cfg

@@ -2,7 +2,7 @@
 # http://xmlsoft.org/
 
 [buildout]
-extends = zlib.cfg
+extends = ../zlib/buildout.cfg
 parts =
   libxml2
 

component/libxslt/buildout.cfg

 [buildout]
 extends =
-  libxml2.cfg
-  pkgconfig.cfg
-  zlib.cfg
+  ../libxml2/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   libxslt

component/logrotate/buildout.cfg

 [buildout]
 extends =
-  popt.cfg
+  ../popt/buildout.cfg
 parts = logrotate
 
 [logrotate]

component/lxml-python/buildout.cfg

 [buildout]
 extends =
-  libxml2.cfg
-  libxslt.cfg
-  zlib.cfg
+  ../libxml2/buildout.cfg
+  ../libxslt/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   lxml-python

component/m2crypto/buildout.cfg

@@ -3,8 +3,8 @@
 
 [buildout]
 extends =
-  openssl.cfg
-  swig.cfg
+  ../openssl/buildout.cfg
+  ../swig/buildout.cfg
 parts =
   M2Crypto
 

component/mariadb/buildout.cfg

@@ -3,9 +3,9 @@
 
 [buildout]
 extends =
-  zlib.cfg
-  ncurses.cfg
-  readline.cfg
+  ../zlib/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../readline/buildout.cfg
 
 parts =
   mariadb

component/memcached/buildout.cfg

 [buildout]
 parts = memcached
-extends = libevent.cfg
+extends = ../libevent/buildout.cfg
 
 [memcached-strict-aliasing-patch]
 # on some platforms original memcached refuses to build:

component/mroonga/buildout.cfg

@@ -6,8 +6,8 @@
 parts =
   mroonga
 extends =
-  mariadb.cfg
-  pkgconfig.cfg
+  ../mariadb/buildout.cfg
+  ../pkgconfig/buildout.cfg
 
 [groonga]
 recipe = hexagonit.recipe.cmmi

component/mysql-5.1/buildout.cfg

 [buildout]
 extends =
-  autoconf.cfg
-  automake.cfg
-  zlib.cfg
-  bison.cfg
-  flex.cfg
-  libtool.cfg
-  ncurses.cfg
-  readline.cfg
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../zlib/buildout.cfg
+  ../bison/buildout.cfg
+  ../flex/buildout.cfg
+  ../libtool/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../readline/buildout.cfg
 
 parts =
     mysql-5.1

component/mysql-python/buildout.cfg

 [buildout]
 extends =
-  mariadb.cfg
-  openssl.cfg
-  zlib.cfg
+  ../mariadb/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   mysql-python

component/mysql-tritonn-5.0/buildout.cfg

@@ -4,15 +4,15 @@
 
 [buildout]
 extends =
-  autoconf.cfg
-  automake.cfg
-  zlib.cfg
-  bison.cfg
-  flex.cfg
-  libtool.cfg
-  ncurses.cfg
-  openssl.cfg
-  readline.cfg
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../zlib/buildout.cfg
+  ../bison/buildout.cfg
+  ../flex/buildout.cfg
+  ../libtool/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../openssl/buildout.cfg
+  ../readline/buildout.cfg
 
 parts =
     mysql-tritonn-5.0

component/neon/buildout.cfg

@@ -2,10 +2,10 @@
 parts =
   neon
 extends =
-  libxml2.cfg
-  openssl.cfg
-  pkgconfig.cfg
-  zlib.cfg
+  ../libxml2/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
 
 [neon]
 recipe = hexagonit.recipe.cmmi

component/oood/buildout.cfg

 # OpenOffice.org daemon software buildout
 [buildout]
-extends = openoffice-bin.cfg
+extends = ../openoffice-bin/buildout.cfg
 parts +=
   oood
 

component/openldap/buildout.cfg

@@ -2,8 +2,8 @@
 parts =
   openldap
 extends =
-  openssl.cfg
-  cyrus-sasl.cfg
+  ../openssl/buildout.cfg
+  ../cyrus-sasl/buildout.cfg
 
 [openldap]
 recipe = hexagonit.recipe.cmmi

component/openssl/buildout.cfg

@@ -5,7 +5,7 @@
 
 [buildout]
 extends =
-  zlib.cfg
+  ../zlib/buildout.cfg
 
 parts =
   openssl

component/pdftk/buildout.cfg

@@ -4,8 +4,8 @@
 # Because of this the only way to have portable pdftk profile it is required
 # to provide working gcj and then have it used for pdftk compilation.
 extends =
-  fastjar.cfg
-  gcc.cfg
+  ../fastjar/buildout.cfg
+  ../gcc/buildout.cfg
 
 parts = pdftk
 

component/perl-Class-Accessor/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-Class-Accessor
 

component/perl-Config-General/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-Config-General
 

component/perl-Encode-HanExtra/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-Encode-HanExtra
 

component/perl-HTML-Encoding/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-HTML-Encoding
 

component/perl-HTML-Parser/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
-  perl-HTML-Tagset.cfg
+  ../perl/buildout.cfg
+  ../perl-HTML-Tagset/buildout.cfg
 parts =
   perl-HTML-Parser
 

component/perl-HTML-Tagset/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-HTML-Tagset
 

component/perl-HTML-Template/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-HTML-Template
 

component/perl-JSON/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-JSON
 

component/perl-Net-IP/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-Net-IP
 

component/perl-SGML-Parser-OpenSP/buildout.cfg

 [buildout]
 extends =
-  opensp.cfg
-  perl.cfg
-  perl-Class-Accessor.cfg
+  ../opensp/buildout.cfg
+  ../perl/buildout.cfg
+  ../perl-Class-Accessor/buildout.cfg
 parts =
   perl-SGML-Parser-OpenSP
 

component/perl-URI/buildout.cfg

 [buildout]
 extends =
-  perl.cfg
+  ../perl/buildout.cfg
 parts =
   perl-URI
 

component/perl-XML-LibXML/buildout.cfg

 [buildout]
 extends =
-  libxml2.cfg
-  perl.cfg