r-language, rpy2: build with readline instead of readline5.

component/r-language/buildout.cfg

@@ -31,5 +31,5 @@ configure-options =
   --without-x
 environment =
   PATH=${gcc-fortran:location}/bin:%(PATH)s
-  CPPFLAGS=-I${bzip2:location}/include  -I${pcre:location}/include -I${readline5: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${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${bzip2: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${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

@@ -24,11 +24,11 @@ rpath =
   ${gcc-fortran:location}/lib
   ${gcc-fortran:location}/lib64
   ${pcre:location}/lib
-  ${readline5:location}/lib
+  ${readline:location}/lib
   ${xz-utils:location}/lib
 library-dirs =
   ${pcre:location}/lib
-  ${readline5:location}/lib
+  ${readline:location}/lib
   ${xz-utils:location}/lib
 include-dirs =
-  ${readline5:location}/include
+  ${readline:location}/include