component/gcc: merge gcc-fortran into gcc.

component/gcc/buildout.cfg

@@ -58,7 +58,7 @@ configure-options =
   --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
-  --enable-languages="c,c++"
+  --enable-languages="c,c++,fortran"
   --with-isl=${isl:location}
   --with-ld=${binutils:location}/bin/ld
   --with-nm=${binutils:location}/bin/nm
@@ -81,17 +81,3 @@ configure-options =
 environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
   PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s
-
-[gcc-fortran]
-<= gcc-common
-configure-options =
-  --disable-bootstrap
-  --disable-multilib
-  --with-gmp=${gmp:location}
-  --with-mpfr=${mpfr:location}
-  --with-mpc=${mpc:location}
-  --enable-languages="c,c++,fortran"
-  --with-isl=${isl:location}
-environment =
-  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
-  PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s

component/kumo/buildout.cfg

@@ -25,6 +25,6 @@ configure-options =
 
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
-  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64
-  LDFLAGS=-Wl,-rpath=${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib64 -L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
-  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PATH=${gcc:location}/bin:${patch:location}/bin:%(PATH)s

component/libatlas/buildout.cfg

@@ -39,5 +39,5 @@ configure-options =
 make-options =
   -C build
 environment =
-  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:%(PATH)s
-  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64
+  PATH=${gcc:location}/bin:${patch:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64

component/numpy/openblas.cfg

@@ -6,7 +6,7 @@ extends =
   ../openblas/buildout.cfg
 
 [numpy-env]
-PATH = ${gcc-fortran:location}/bin:%(PATH)s
+PATH = ${gcc:location}/bin:%(PATH)s
 OPENBLAS = ${openblas:location}/lib/libopenblas.so
 LAPACK = ${openblas:location}/lib/libopenblas.so
 ATLAS = ${openblas:location}/lib/libopenblas.so
@@ -14,6 +14,6 @@ ATLAS = ${openblas:location}/lib/libopenblas.so
 [numpy]
 environment = numpy-env
 rpath =
-  ${gcc-fortran:location}/lib
-  ${gcc-fortran:location}/lib64
+  ${gcc:location}/lib
+  ${gcc:location}/lib64
   ${openblas:location}/lib

component/openblas/buildout.cfg

@@ -36,6 +36,6 @@ make-options =
 make-targets =
   PREFIX="${buildout:parts-directory}/${:_buildout_section_name_}" install
 environment =
-  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:${perl:location}/bin:%(PATH)s
-  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64
-  LDFLAGS=-Wl,-rpath=${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib64
+  PATH=${gcc:location}/bin:${patch:location}/bin:${perl:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc:location}/lib:${gcc:location}/lib64
+  LDFLAGS=-Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64

component/r-language/buildout.cfg

@@ -33,6 +33,6 @@ configure-options =
   --without-ICU
   --without-x
 environment =
-  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  PATH=${gcc:location}/bin:%(PATH)s
   CPPFLAGS=-I${bzip2:location}/include -I${openblas:location}/include -I${pcre:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib -L${gcc-fortran:location}/lib64 -Wl,-rpath=${gcc-fortran:location}/lib64 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openblas:location}/lib -Wl,-rpath=${openblas:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/rpy2/buildout.cfg

@@ -10,7 +10,7 @@ extends =
 # see ../manpy/buildout.cfg as an example
 
 [rpy2_env]
-PATH = ${gcc-fortran:location}/bin:${r-language:location}/bin:%(PATH)s
+PATH = ${gcc:location}/bin:${r-language:location}/bin:%(PATH)s
 
 [rpy2]
 recipe = zc.recipe.egg:custom
@@ -21,8 +21,8 @@ initialization =
   import os
   os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ.get('PATH', '')
 rpath =
-  ${gcc-fortran:location}/lib
-  ${gcc-fortran:location}/lib64
+  ${gcc:location}/lib
+  ${gcc:location}/lib64
   ${pcre:location}/lib
   ${readline:location}/lib
   ${xz-utils:location}/lib

component/scikit-learn/buildout.cfg

@@ -17,6 +17,6 @@ setup-eggs =
   ${numpy:egg}
   ${scipy:egg}
 rpath =
-  ${gcc-fortran:location}/lib
-  ${gcc-fortran:location}/lib64
+  ${gcc:location}/lib
+  ${gcc:location}/lib64
   ${openblas:location}/lib

software/wendelin/software.cfg

@@ -36,7 +36,7 @@ initialization =
   import struct, os
   arch = 8 * struct.calcsize("P")
   rerun = not os.getenv('LD_PRELOAD')
-  if rerun: os.environ['LD_PRELOAD'] = '''${gcc-fortran:location}/lib%s/libstdc++.so''' % arch
+  if rerun: os.environ['LD_PRELOAD'] = '''${gcc:location}/lib%s/libstdc++.so''' % arch
   if rerun: os.execve(os.path.realpath(__file__), sys.argv, os.environ)
   
 [wendelin_test_suite_runner]