Version bump. Rewrote from scratch and switched to cmake since the configure scripts are not well maintained. Added a few patches to allow projections from gshhs and proj. Added a few more use flags. Fix bug #380323, bug #391667, and bug #393193.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

17 files changed, 423 insertions, 581 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 6f6ca5a188a5..e7197462932d 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.25 2011/07/20 16:52:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.26 2011/12/27 08:01:38 bicatali Exp $
+
+*gdl-0.9.2 (27 Dec 2011)
+
+  27 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/0.9.2-antlr.patch, -files/gdl-0.9_rc2-gcc4.4.patch,
+  +files/0.9.2-include.patch, -files/gdl-0.9_rc4-gcc4.3.patch,
+  +files/0.9.2-numpy.patch, -gdl-0.9-r1.ebuild, +gdl-0.9.2.ebuild,
+  +files/0.9.2-proj4.patch, -files/gdl-0.9_rc4-gcc4.5.patch, -gdl-0.9.1.ebuild,
+  +files/0.9.2-tests.patch, -files/gdl-0.9.1-antlr.patch,
+  -files/gdl-0.9-configure.patch, -files/gdl-0.9-numpy.patch, metadata.xml:
+  Version bump. Rewrote from scratch and switched to cmake since the configure
+  scripts are not well maintained. Added a few patches to allow projections
+  from gshhs and proj. Added a few more use flags. Fix bug #380323, bug
+  #391667, and bug #393193.
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #105599
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index cd80fd2927a8..8571b60edddd 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gdl-0.9-configure.patch 1678 RMD160 d766294518e0ff3b5f59743d28315efec1002637 SHA1 a5e1f020bc9a45b6c5c3e955bb4460b4b8d0531a SHA256 6c41bafe4a04cd3405b7998bafd8ddc93edaac50ae3260a295c1a7d1c2a80e68
-AUX gdl-0.9-numpy.patch 7734 RMD160 d77c4793e7e43ce38db234f84079b893b1281707 SHA1 aac5d20d82f26281658de9f997555e1bc3e0d81c SHA256 feb1653341a0e04350197a449ef2ae779ca4aea3e0aa302f0b41f8c7650e853e
-AUX gdl-0.9.1-antlr.patch 1510 RMD160 848f5e81c75e7fae84b4db52119bdae006d9d5c2 SHA1 a63ae60e868fbf175adf21f217ce87d081a58d9c SHA256 e236b512cbf512061150e2740f7d433302a9ec7e1e153ab864de3ba8c0cff85a
-AUX gdl-0.9_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6
-AUX gdl-0.9_rc4-gcc4.3.patch 377 RMD160 b32e74d24fde6c37292b5a70450ad892a8ebbe46 SHA1 223bfc83e74f3ef788fd8e0c78f3cc82019834b4 SHA256 81d769b09bead8a103b85ff17083d3a8aac1b68b06db8d7cf2d2330787dd5f1c
-AUX gdl-0.9_rc4-gcc4.5.patch 756 RMD160 e9129082b199bf69e0ac06fbad268e4ffa02bb35 SHA1 98c2cfcf10d5bd38d4869ef13e78b2a484507b4f SHA256 4cf2cec2310285e76b563684f282f2cd6358e8942395170b051b64217ef3ff6b
-DIST gdl-0.9.1.tar.gz 1528008 RMD160 9ce6dce6f32d0fbf3140b26699c8eca436907b00 SHA1 97c71a70672ae82f052ffa5906fc2415f4cf7b9d SHA256 873e235a4ec7c16ecec05b42f3e3e2cc9fedbd6ccb9e13d167336fdaec3ca197
-DIST gdl-0.9.tar.gz 1454786 RMD160 5d25e1b899a072fcd23aadd7fd1b701a26c4ba0f SHA1 93a71bad8ad0c16a6e79edaae0489c372f442bcf SHA256 def5bc2887d506d3f7b14c47bb6ccbd59532e535ab333b38456955b00a3f5da6
-EBUILD gdl-0.9-r1.ebuild 2503 RMD160 cb7add51e3707ebabf85cb3a1ce9585076646725 SHA1 c92a268f3c3c410e7caf5bdfa8450bb2f2afebcf SHA256 5353b595d683e821c4984d024b8a314c4216a1ccaf5206a1ddc1da0a9940c16b
-EBUILD gdl-0.9.1.ebuild 2475 RMD160 991c89d3b977ed148dce48355ed2bb4d36b6d57c SHA1 ff3415811e5fc0d7abcfa0b7d7be1bc5e0a298f9 SHA256 ef2b442248868003ce9a4b7cabf3ab2d0b03420a9acd5e3ebf7ee88d6ced59c4
-MISC ChangeLog 5649 RMD160 fd8de514f33c3bb0e07e5709f3aacdeddbd7fb7b SHA1 424e8a6da7a456b6fb1e0852fbc2cbf4f8e89614 SHA256 5d22009b743554dcd96b4e71c4d573a0a0fa845418928280ea5e23d7f39cbd27
-MISC metadata.xml 617 RMD160 e017b99c86ce4259d598f1386a48373206410b1e SHA1 718a84032afc9da2def4c515d72fd604fdb358b5 SHA256 93ee73f15979437e7201f1dab764e03abbf3dea1e14ec1b81b159191a08fd96f
+AUX 0.9.2-antlr.patch 2795 RMD160 4ccee6f6f3cc2ca585efe26308c3470882dc2abe SHA1 52aedb42f910b8e6b85208c99954640eddcf8b5c SHA256 9649cb996e771b7259cb81af75e3e1f555a003c3da0e2a21f4c7171e399703b9
+AUX 0.9.2-include.patch 300 RMD160 51f78d4f28104889f0377d37f45ee1b84fbcfccd SHA1 f7b2db56b4f407b7e13ac287fca3fe31a54d8ebf SHA256 d82f1b8c16037b16e38a2ba2688fa16b6a5d6a3fc62abe387c49d2d96f167c39
+AUX 0.9.2-numpy.patch 557 RMD160 1906110caec6913f5fb691708ead513715927ff2 SHA1 529a142f40bc27e24a187e74b95affd03e8f2033 SHA256 a7c2f55cb652a711375c5b427112bc2fb5c6383e6350f5c05b3664827c545789
+AUX 0.9.2-proj4.patch 1185 RMD160 920acf7a98a53415a16701c2326c380b176dc7e9 SHA1 759c3c2745fa7ddcbba6cfd3bbdb0d5c0fe3d0bf SHA256 4c6b4d97823ddeebae4c3170dc80c14bb68681117de599077ce6a845fb2ae26f
+AUX 0.9.2-tests.patch 8519 RMD160 9328f1d39dd42301812fad3085fdb4fb5b329f4d SHA1 18a2574b9e996acb5dc6c875e544faceeb3078bf SHA256 43d1094a7c47840910b4320626185f92be5a05ace4e80d424f474655d2ba1eb2
+DIST gdl-0.9.2.tar.gz 2436946 RMD160 6913b358de01550256ad38c920cc461e8ef94512 SHA1 0d6fe86e2971637310c6298379616b02f773e956 SHA256 59907d941877327e9653a9cda5d801ea0b45f67af4c7da22acfcdd7cad291acf
+EBUILD gdl-0.9.2.ebuild 3295 RMD160 a41511a26b4017b12c7bcd061cb2597e7d55f616 SHA1 99673e774c757935a28d076f323eaa5e54e53c58 SHA256 d4127a3c301f3b27fb0e6d73e16acb1eef9c17455de7b3b474ae205fc75e4ba1
+MISC ChangeLog 6394 RMD160 9a8e2e72807c31209969b5ad2975542815e0abc6 SHA1 eb59807f8c2cf34fe56fde5423bd38f68262c06a SHA256 908935de0ffc7ab7d06e6ad2c125cd6a6dccf4e94450f990c4367df635177664
+MISC metadata.xml 951 RMD160 8567f5c98a1e2d1b86def839d49e2133f4ac3659 SHA1 2f7a1454d98f7cfd20671165bd38257f64499eb6 SHA256 e5702927a29b2011f866221e84c5c3ecd5d161db41881c90f0de7fe07c6f0277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4nB8kACgkQCaWpQKGI+9T6rgCeJgkJ4bdPsg7n2RvNqXJeBWnW
-QpMAnRyOz5w6f1CovRZRX405TEFkzJOw
-=jYH8
+iEYEARECAAYFAk75e2kACgkQ1ycZbhPLE2DecQCcC06ubP5kRoplFoXe+qyiXc9S
+ct0An3Xcue5a7B0W/av43HejRxUockyB
+=jyEr
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/0.9.2-antlr.patch b/dev-lang/gdl/files/0.9.2-antlr.patch
new file mode 100644
index 000000000000..9c8e6abb2358
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.2-antlr.patch
@@ -0,0 +1,76 @@
+diff -Nur gdl-0.9.2.orig/CMakeLists.txt gdl-0.9.2/CMakeLists.txt
+--- gdl-0.9.2.orig/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
++++ gdl-0.9.2/CMakeLists.txt	2011-12-22 20:32:20.000000000 +0000
+@@ -94,6 +94,8 @@
+ 
+ set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "Choose data install directory relative to CMAKE_INSTALL_PREFIX")
+ 
++set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
++set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
+ 
+ # check for 64-bit OS
+ if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
+@@ -143,9 +145,15 @@
+ # mpi
+ check_include_file(mpi.h HAVE_MPI_H)
+ 
+-# SA: whithout it compilation of antlr fails if there's a conflicting 
+-#     version of antlr in system-wide directories
+-include_directories(src)
++if(BUNDLED_ANTLR)
++  # SA: whithout it compilation of antlr fails if there's a conflicting 
++  #     version of antlr in system-wide directories
++  include_directories(src)
++else(BUNDLED_ANTLR)
++  find_package(ANTLR QUIET)
++  set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
++  include_directories(${ANTLR_INCLUDE_DIR})
++endif(BUNDLED_ANTLR)
+ 
+ # Ncurses MANDATORY
+ # -DNCURSESDIR=DIR
+diff -Nur gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake gdl-0.9.2/CMakeModules/FindANTLR.cmake
+--- gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake	1970-01-01 01:00:00.000000000 +0100
++++ gdl-0.9.2/CMakeModules/FindANTLR.cmake	2011-12-22 21:03:34.000000000 +0000
+@@ -0,0 +1,11 @@
++
++
++find_library(ANTLR_LIBRARIES NAMES antlr)
++find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR)
++
++mark_as_advanced(
++ANTLR_LIBRARIES
++ANTLR_INCLUDE_DIR
++)
+diff -Nur gdl-0.9.2.orig/src/CMakeLists.txt gdl-0.9.2/src/CMakeLists.txt
+--- gdl-0.9.2.orig/src/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
++++ gdl-0.9.2/src/CMakeLists.txt	2011-12-22 20:31:27.000000000 +0000
+@@ -224,9 +224,8 @@
+ widget.cpp
+ )
+ 
+-add_subdirectory(antlr)
+ 
+-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
+ link_directories(${LINK_DIRECTORIES})
+ 
+ if(PYTHON_MODULE) #libgdl
+@@ -237,8 +236,13 @@
+ 	add_executable(gdl ${SOURCES})
+ endif(PYTHON_MODULE)
+ 
+-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
+-target_link_libraries(gdl antlr) # link antlr against gdl
++if(BUNDLED_ANTLR)
++  add_subdirectory(antlr)
++  include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
++  add_dependencies(gdl antlr) # be sure that antlr is built before gdl
++  target_link_libraries(gdl antlr) # link antlr against gdl
++endif(BUNDLED_ANTLR)
++
+ target_link_libraries(gdl ${LIBRARIES})
+ add_definitions(-DHAVE_CONFIG_H)
+ 
diff --git a/dev-lang/gdl/files/0.9.2-include.patch b/dev-lang/gdl/files/0.9.2-include.patch
new file mode 100644
index 000000000000..0462b0a170ed
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.2-include.patch
@@ -0,0 +1,9 @@
+--- gdl-0.9.2.orig/src/CFMTLexer.cpp	2011-12-22 20:18:17.000000000 +0000
++++ gdl-0.9.2/src/CFMTLexer.cpp	2011-12-24 06:35:24.000000000 +0000
+@@ -1,5 +1,6 @@
+ /* $ANTLR 2.7.7 (20091222): "cformat.g" -> "CFMTLexer.cpp"$ */
+ 
++#include <cstdlib>
+ #include "includefirst.hpp"
+ 
+ #include "CFMTLexer.hpp"
diff --git a/dev-lang/gdl/files/0.9.2-numpy.patch b/dev-lang/gdl/files/0.9.2-numpy.patch
new file mode 100644
index 000000000000..3d0a88e2852b
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.2-numpy.patch
@@ -0,0 +1,11 @@
+--- gdl-0.9.2.orig/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
++++ gdl-0.9.2/CMakeLists.txt	2011-12-24 05:39:10.000000000 +0000
+@@ -476,7 +484,7 @@
+ 			"${PYTHONMSG} ${PYTHON_MODULEMSG}")
+ 		endif(NOT PYTHON_NUMPY_FOUND)
+ 		set(LIBRARIES ${LIBRARIES} ${PYTHON_LIBRARIES})
+-		include_directories(${PYTHON_INCLUDE_DIRS})	
++		include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_NUMPY_INCLUDE_DIR})
+ 	else(PYTHONLIBS_FOUND)
+ 		message(FATAL_ERROR "Python is required but was not found.\n"
+ 		"Use -DPYTHONDIR=DIR to specify the Python directory tree.\n"
diff --git a/dev-lang/gdl/files/0.9.2-proj4.patch b/dev-lang/gdl/files/0.9.2-proj4.patch
new file mode 100644
index 000000000000..594b6d5cbae8
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.2-proj4.patch
@@ -0,0 +1,27 @@
+--- gdl-0.9.2.orig/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
++++ gdl-0.9.2/CMakeLists.txt	2011-12-24 06:12:08.000000000 +0000
+@@ -412,17 +420,17 @@
+ 	find_package(Libproj4 QUIET)
+ 	if(LIBPROJ4_FOUND)	
+ 		set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
+-		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
+-		if(USE_LIBPROJ4_NEW)
++		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
++		if(USE_LIBPROJ4)
+ 			set(USE_LIBPROJ4 1)
+-		else(USE_LIBPROJ4_NEW)
+-			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
+-			if(NOT USE_LIBPROJ4)
++		else(USE_LIBPROJ4)
++			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
++			if(NOT USE_LIBPROJ4_NEW)
+ 				message(FATAL_ERROR "Libproj4 is required but was not found.\n"
+ 				"Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n"
+ 				"Use -DLIBPRJ4=OFF to not use it.")
+-			endif(NOT USE_LIBPROJ4)
+-		endif(USE_LIBPROJ4_NEW)
++			endif(NOT USE_LIBPROJ4_NEW)
++		endif(USE_LIBPROJ4)
+ 		include_directories(${LIBPROJ4_INCLUDE_DIR})
+ 		set(LIBRARIES ${LIBRARIES} ${LIBPROJ4_LIBRARIES})
+ 		set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/dev-lang/gdl/files/0.9.2-tests.patch b/dev-lang/gdl/files/0.9.2-tests.patch
new file mode 100644
index 000000000000..9e898883c7cf
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.2-tests.patch
@@ -0,0 +1,136 @@
+diff -Nur gdl-0.9.2.orig/testsuite/CMakeLists.txt gdl-0.9.2/testsuite/CMakeLists.txt
+--- gdl-0.9.2.orig/testsuite/CMakeLists.txt	2011-12-22 20:18:17.000000000 +0000
++++ gdl-0.9.2/testsuite/CMakeLists.txt	2011-12-25 00:40:51.000000000 +0000
+@@ -13,6 +13,7 @@
+ *(p-4)=0;
+ setenv(\"LC_COLLATE\",\"C\",1);
+ setenv(\"GDL_PATH\",\"+${BASE_SOURCE}/testsuite/:+${BASE_SOURCE}/src/pro/\",1);
++setenv(\"LD_LIBRARY_PATH\",\"+${BASE_BINARY}/testsuite\",1);
+ execl(\"${BASE_BINARY}/src/gdl\",\"-quiet\",\"-e\",v[1],(char*)0);
+ }
+ ")
+@@ -21,10 +22,117 @@
+ add_library(test_ce SHARED EXCLUDE_FROM_ALL libtest_ce.cpp)
+ add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test DEPENDS launchtest test_ce)
+ get_target_property(LAUNCHTESTLOCATION launchtest LOCATION)
+-execute_process(
+-  COMMAND "fgrep" ".pro" "${BASE_SOURCE}/testsuite/Makefile.am" 
+-  COMMAND "awk" "{printf(\"%s;\",$1)}" 
+-  OUTPUT_VARIABLE TESTS)
+-foreach(TEST ${TESTS})
+-	add_test(${TEST} ${LAUNCHTESTLOCATION} ${TEST})
+-endforeach(TEST TESTS)
++
++add_test(test_angles.pro ${LAUNCHTESTLOCATION} test_angles.pro)
++add_test(test_base64.pro ${LAUNCHTESTLOCATION} test_base64.pro)
++add_test(test_binfmt.pro ${LAUNCHTESTLOCATION} test_binfmt.pro)
++add_test(test_bug_1779553.pro ${LAUNCHTESTLOCATION} test_bug_1779553.pro)
++add_test(test_bug_2555865.pro ${LAUNCHTESTLOCATION} test_bug_2555865.pro)
++add_test(test_bug_2610174.pro ${LAUNCHTESTLOCATION} test_bug_2610174.pro)
++add_test(test_bug_2846561.pro ${LAUNCHTESTLOCATION} test_bug_2846561.pro)
++add_test(test_bug_2876150.pro ${LAUNCHTESTLOCATION} test_bug_2876150.pro)
++add_test(test_bug_2876161.pro ${LAUNCHTESTLOCATION} test_bug_2876161.pro)
++# these two need display
++if(X11)
++  add_test(test_bug_2974380.pro ${LAUNCHTESTLOCATION} test_bug_2974380.pro)
++  add_test(test_bug_3275334.pro ${LAUNCHTESTLOCATION} test_bug_3275334.pro)
++  add_test(test_get_screen_size.pro ${LAUNCHTESTLOCATION} test_get_screen_size.pro)
++endif(X11)
++add_test(test_bug_3033108.pro ${LAUNCHTESTLOCATION} test_bug_3033108.pro)
++add_test(test_bug_3054361.pro ${LAUNCHTESTLOCATION} test_bug_3054361.pro)
++add_test(test_bug_3055720.pro ${LAUNCHTESTLOCATION} test_bug_3055720.pro)
++add_test(test_bug_3057511.pro ${LAUNCHTESTLOCATION} test_bug_3057511.pro)
++add_test(test_bug_3057520.pro ${LAUNCHTESTLOCATION} test_bug_3057520.pro)
++add_test(test_bug_3061072.pro ${LAUNCHTESTLOCATION} test_bug_3061072.pro)
++add_test(test_bug_3081887.pro ${LAUNCHTESTLOCATION} test_bug_3081887.pro)
++add_test(test_bug_3085858.pro ${LAUNCHTESTLOCATION} test_bug_3085858.pro)
++add_test(test_bug_3086851.pro ${LAUNCHTESTLOCATION} test_bug_3086851.pro)
++add_test(test_bug_3091599.pro ${LAUNCHTESTLOCATION} test_bug_3091599.pro)
++add_test(test_bug_3091610.pro ${LAUNCHTESTLOCATION} test_bug_3091610.pro)
++add_test(test_bug_3100945.pro ${LAUNCHTESTLOCATION} test_bug_3100945.pro)
++add_test(test_bug_3104209.pro ${LAUNCHTESTLOCATION} test_bug_3104209.pro)
++add_test(test_bug_3104214.pro ${LAUNCHTESTLOCATION} test_bug_3104214.pro)
++add_test(test_bug_3104326.pro ${LAUNCHTESTLOCATION} test_bug_3104326.pro)
++add_test(test_bug_3104349.pro ${LAUNCHTESTLOCATION} test_bug_3104349.pro)
++add_test(test_bug_3147181.pro ${LAUNCHTESTLOCATION} test_bug_3147181.pro)
++add_test(test_bug_3147733.pro ${LAUNCHTESTLOCATION} test_bug_3147733.pro)
++add_test(test_bug_3151760.pro ${LAUNCHTESTLOCATION} test_bug_3151760.pro)
++add_test(test_bug_3152899.pro ${LAUNCHTESTLOCATION} test_bug_3152899.pro)
++add_test(test_bug_3189072.pro ${LAUNCHTESTLOCATION} test_bug_3189072.pro)
++add_test(test_bug_3199465.pro ${LAUNCHTESTLOCATION} test_bug_3199465.pro)
++add_test(test_bug_3244840.pro ${LAUNCHTESTLOCATION} test_bug_3244840.pro)
++add_test(test_bug_3286031.pro ${LAUNCHTESTLOCATION} test_bug_3286031.pro)
++add_test(test_bug_3288652.pro ${LAUNCHTESTLOCATION} test_bug_3288652.pro)
++add_test(test_bug_3290532.pro ${LAUNCHTESTLOCATION} test_bug_3290532.pro)
++add_test(test_bug_3296360.pro ${LAUNCHTESTLOCATION} test_bug_3296360.pro)
++add_test(test_bug_3298378.pro ${LAUNCHTESTLOCATION} test_bug_3298378.pro)
++add_test(test_bug_3300626.pro ${LAUNCHTESTLOCATION} test_bug_3300626.pro)
++add_test(test_bug_3313522.pro ${LAUNCHTESTLOCATION} test_bug_3313522.pro)
++add_test(test_bug_3376577.pro ${LAUNCHTESTLOCATION} test_bug_3376577.pro)
++add_test(test_ce.pro ${LAUNCHTESTLOCATION} test_ce.pro)
++add_test(test_clip.pro ${LAUNCHTESTLOCATION} test_clip.pro)
++add_test(test_common.pro ${LAUNCHTESTLOCATION} test_common.pro)
++add_test(test_constants.pro ${LAUNCHTESTLOCATION} test_constants.pro)
++add_test(test_correlate.pro ${LAUNCHTESTLOCATION} test_correlate.pro)
++add_test(test_deriv.pro ${LAUNCHTESTLOCATION} test_deriv.pro)
++add_test(test_device.pro ${LAUNCHTESTLOCATION} test_device.pro)
++add_test(test_dicom.pro ${LAUNCHTESTLOCATION} test_dicom.pro)
++add_test(test_erfinv.pro ${LAUNCHTESTLOCATION} test_erfinv.pro)
++add_test(test_execute.pro ${LAUNCHTESTLOCATION} test_execute.pro)
++add_test(test_fft.pro ${LAUNCHTESTLOCATION} test_fft.pro)
++add_test(test_file_basename.pro ${LAUNCHTESTLOCATION} test_file_basename.pro)
++add_test(test_file_copy.pro ${LAUNCHTESTLOCATION} test_file_copy.pro)
++add_test(test_file_delete.pro ${LAUNCHTESTLOCATION} test_file_delete.pro)
++add_test(test_file_dirname.pro ${LAUNCHTESTLOCATION} test_file_dirname.pro)
++add_test(test_file_search.pro ${LAUNCHTESTLOCATION} test_file_search.pro)
++add_test(test_file_which.pro ${LAUNCHTESTLOCATION} test_file_which.pro)
++add_test(test_fix.pro ${LAUNCHTESTLOCATION} test_fix.pro)
++add_test(test_fixprint.pro ${LAUNCHTESTLOCATION} test_fixprint.pro)
++add_test(test_gc.pro ${LAUNCHTESTLOCATION} test_gc.pro)
++if(GRIB)
++  add_test(test_grib.pro ${LAUNCHTESTLOCATION} test_grib.pro)
++endif(GRIB)
++add_test(test_hist_2d.pro ${LAUNCHTESTLOCATION} test_hist_2d.pro)
++add_test(test_idl8.pro ${LAUNCHTESTLOCATION} test_idl8.pro)
++add_test(test_idl_validname.pro ${LAUNCHTESTLOCATION} test_idl_validname.pro)
++add_test(test_interpol.pro ${LAUNCHTESTLOCATION} test_interpol.pro)
++add_test(test_interpolate_missing.pro ${LAUNCHTESTLOCATION} test_interpolate_missing.pro)
++# Needs MEMORY(), not working on Linux
++# add_test(test_memory.pro ${LAUNCHTESTLOCATION} test_memory.pro)
++# add_test(test_fft_leak.pro ${LAUNCHTESTLOCATION} test_fft_leak.pro) 
++add_test(test_moment.pro ${LAUNCHTESTLOCATION} test_moment.pro)
++# mpfit disabled because needs external non required library
++# add_test(test_mpfit.pro ${LAUNCHTESTLOCATION} test_mpfit.pro)
++add_test(test_multiroots.pro ${LAUNCHTESTLOCATION} test_multiroots.pro)
++add_test(test_nestedloop.pro ${LAUNCHTESTLOCATION} test_nestedloop.pro)
++add_test(test_plotting_ranges.pro ${LAUNCHTESTLOCATION} test_plotting_ranges.pro)
++add_test(test_pmulti.pro ${LAUNCHTESTLOCATION} test_pmulti.pro)
++add_test(test_product.pro ${LAUNCHTESTLOCATION} test_product.pro)
++add_test(test_ps_decomposed.pro ${LAUNCHTESTLOCATION} test_ps_decomposed.pro)
++if(PYTHON)
++  add_test(test_python.pro ${LAUNCHTESTLOCATION} test_python.pro)
++endif(PYTHON)
++if(PYTHON_MODULE)
++  add_test(test_python_module_0.pro ${LAUNCHTESTLOCATION} test_python_module_0.pro)
++  add_test(test_python_module_1.pro ${LAUNCHTESTLOCATION} test_python_module_1.pro)
++  add_test(test_python_module_2.pro ${LAUNCHTESTLOCATION} test_python_module_2.pro)
++endif(PYTHON_MODULE)
++add_test(test_readf.pro ${LAUNCHTESTLOCATION} test_readf.pro)
++add_test(test_rebin.pro ${LAUNCHTESTLOCATION} test_rebin.pro)
++add_test(test_rk4.pro ${LAUNCHTESTLOCATION} test_rk4.pro)
++add_test(test_scope_varfetch.pro ${LAUNCHTESTLOCATION} test_scope_varfetch.pro)
++add_test(test_sem.pro ${LAUNCHTESTLOCATION} test_sem.pro)
++add_test(test_spawn_unit.pro ${LAUNCHTESTLOCATION} test_spawn_unit.pro)
++add_test(test_spher_harm.pro ${LAUNCHTESTLOCATION} test_spher_harm.pro)
++add_test(test_spl_init.pro ${LAUNCHTESTLOCATION} test_spl_init.pro)
++add_test(test_step.pro ${LAUNCHTESTLOCATION} test_step.pro)
++add_test(test_str_functions.pro ${LAUNCHTESTLOCATION} test_str_functions.pro)
++add_test(test_str_sep.pro ${LAUNCHTESTLOCATION} test_str_sep.pro)
++add_test(test_stregex.pro ${LAUNCHTESTLOCATION} test_stregex.pro)
++add_test(test_strsplit.pro ${LAUNCHTESTLOCATION} test_strsplit.pro)
++add_test(test_suite.pro ${LAUNCHTESTLOCATION} test_suite.pro)
++add_test(test_systime.pro ${LAUNCHTESTLOCATION} test_systime.pro)
++add_test(test_url.pro ${LAUNCHTESTLOCATION} test_url.pro)
++add_test(test_wavelet.pro ${LAUNCHTESTLOCATION} test_wavelet.pro)
++add_test(test_zeropoly.pro ${LAUNCHTESTLOCATION} test_zeropoly.pro)
++add_test(test_zip.pro ${LAUNCHTESTLOCATION} test_zip.pro)
diff --git a/dev-lang/gdl/files/gdl-0.9-configure.patch b/dev-lang/gdl/files/gdl-0.9-configure.patch
deleted file mode 100644
index e3b6d221fa6e..000000000000
--- a/dev-lang/gdl/files/gdl-0.9-configure.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nu gdl-0.9.orig/configure.in gdl-0.9/configure.in
---- gdl-0.9.orig/configure.in	2010-10-05 17:45:00.000000000 +0100
-+++ gdl-0.9/configure.in	2010-12-21 18:17:14.000000000 +0000
-@@ -693,7 +693,7 @@
- 	[with_python="$withval" ])
- 
- if test "x$with_python" != "xno"; then
--
-+   AM_PATH_PYTHON
-   dnl  PYTHON_VERSION="2.3"
-   AC_ARG_ENABLE(python_version,	
-  	[  --enable-python_version set explicit python version to use (eg. 2.4)],
-@@ -724,7 +724,6 @@
- dnl    LIBS="$LIBS -lpython2.3"
-     PYTHON_INCLUDES="/usr/include/python$PYTHON_VERSION"
-   fi
--  INCLUDES="$INCLUDES -I$PYTHON_INCLUDES"
- 
-   AC_CHECK_LIB(python$PYTHON_VERSION, Py_Initialize, 
-   [AC_DEFINE([USE_PYTHON],[1],[Define if you want to use python])], 
-@@ -752,17 +751,21 @@
-     exit -1
-   ])
- 
--  OLDCXXFLAGS=$CXXFLAGS
--  CXXFLAGS="$CXXFLAGS -I$PYTHON_INCLUDES"
--  AC_CHECK_HEADER($PYTHON_INCLUDES/numarray/libnumarray.h, [], [
-+  OLDCPPFLAGS=$CPPFLAGS
-+  AC_MSG_CHECKING([for Numpy include directory])
-+  pinc=`echo "import numpy; print numpy.get_include()" | $PYTHON - 2>/dev/null`
-+  AC_MSG_RESULT([${pinc:-unknown}])
-+  test -n "$pinc" && PYTHON_INCLUDES="-I$PYTHON_INCLUDES -I$pinc"
-+  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-+  AC_CHECK_HEADER([numpy/arrayobject.h], [], [
-     echo ""
--    echo "Error! Python numarray package was not found"
-+    echo "Error! Python numpy package was not found"
-     echo "  Use --with-python=no to disable Python support"
-     exit -1
-   ], [#include <Python.h>])
--  CXXFLAGS=$OLDCXXFLAGS
--  unset OLDCXXFLAGS
--
-+  CPPFLAGS=$OLDCPPFLAGS
-+  unset OLDCPPFLAGS
-+  INCLUDES="$INCLUDES $PYTHON_INCLUDES"
- fi
- 
- dnl == UDUNITS-2 ===========================================
diff --git a/dev-lang/gdl/files/gdl-0.9-numpy.patch b/dev-lang/gdl/files/gdl-0.9-numpy.patch
deleted file mode 100644
index a8845f83c60b..000000000000
--- a/dev-lang/gdl/files/gdl-0.9-numpy.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -up gdl-0.9.orig/src/basic_fun.cpp gdl-0.9/src/basic_fun.cpp
---- gdl-0.9.orig/src/basic_fun.cpp	2010-08-23 15:47:44.771403710 -0600
-+++ gdl-0.9/src/basic_fun.cpp	2010-08-23 16:25:25.183341935 -0600
-@@ -6165,6 +6165,7 @@ BaseGDL* transpose( EnvT* e)
- #endif
-   }
- 
-+#ifndef PYTHON_MODULE
-   // SA: relies on the contents of the lib::command_line_args vector
-   //     defined and filled with data (pointers) in gdl.cpp
-   BaseGDL* command_line_args_fun(EnvT* e)
-@@ -6189,6 +6190,7 @@ BaseGDL* transpose( EnvT* e)
-       return ret;
-     }
-   }
-+#endif
- 
-   // SA: relies in the uname() from libc (must be there if POSIX)
-   BaseGDL* get_login_info( EnvT* e)
-diff -up gdl-0.9.orig/src/datatypes.cpp gdl-0.9/src/datatypes.cpp
---- gdl-0.9.orig/src/datatypes.cpp	2010-08-23 15:47:44.801403511 -0600
-+++ gdl-0.9/src/datatypes.cpp	2010-08-23 15:47:45.211342292 -0600
-@@ -18,11 +18,7 @@
- #include "includefirst.hpp"
- 
- #if defined(USE_PYTHON) || defined(PYTHON_MODULE)
--#if defined(USE_NUMPY)
--#include <numpy/libnumarray.h>
--#else
--#include <numarray/libnumarray.h>
--#endif
-+#include <numpy/arrayobject.h>
- #endif
- 
- #include <iomanip>
-diff -up gdl-0.9.orig/src/gdlpython.cpp gdl-0.9/src/gdlpython.cpp
---- gdl-0.9.orig/src/gdlpython.cpp	2010-08-23 15:47:44.937406250 -0600
-+++ gdl-0.9/src/gdlpython.cpp	2010-08-23 15:47:45.214343155 -0600
-@@ -43,8 +43,6 @@ void PythonInit()
-   static char* arg0 = "./py/python.exe";
-   static char* argv[] = {arg0};
-   PySys_SetArgv(argc, argv);
--
--  import_libnumarray();
- }
- 
- // don't use, as numarray cannot be restarted
-@@ -60,7 +58,7 @@ T* NewFromPyArrayObject( const dimension
-   T* res = new T( dim, BaseGDL::NOZERO);
-   SizeT nEl = res->N_Elements();
-   typename T::Ty* dPtr = 
--    reinterpret_cast<typename T::Ty*>( NA_OFFSETDATA(array));
-+    reinterpret_cast<typename T::Ty*>( PyArray_DATA(array));
-   for( SizeT i=0; i<nEl; ++i) (*res)[i] = dPtr[i];
-   Py_DECREF(array); // must be decremented
-   return res;
-@@ -68,8 +66,7 @@ T* NewFromPyArrayObject( const dimension
- 
- BaseGDL* FromPython( PyObject* pyObj)
- {
--  int isArray = NA_NumArrayCheck( pyObj);
--  if( !isArray)
-+  if( !PyArray_Check( pyObj))
-     {
-       if( PyString_Check( pyObj))
- 	{
-@@ -97,11 +94,9 @@ BaseGDL* FromPython( PyObject* pyObj)
-       throw GDLException( "Cannot convert python scalar.") ;
-     }
- 
--  PyArrayObject* array = reinterpret_cast< PyArrayObject*>( pyObj); 
--  NumarrayType item_type = static_cast< NumarrayType>( array->descr->type_num);
--
-   // make array contiguous
--  array = NA_InputArray( pyObj, item_type, C_ARRAY);
-+  PyArrayObject* array = PyArray_GETCONTIGUOUS( reinterpret_cast< PyArrayObject *>( pyObj));
-+
-   if( array == NULL)
-     throw GDLException( "Error getting python array.") ;
-   
-@@ -125,35 +120,26 @@ BaseGDL* FromPython( PyObject* pyObj)
-     }
-   dimension dim( dimArr, nDim);
- 
--  switch( item_type) 
-+  switch( array->descr->type_num) 
-     {
--      // case tAny:  //UNDEF***
--    case tUInt8:   //BYTE
-+    case NPY_UINT8:   //BYTE
-       return NewFromPyArrayObject< DByteGDL>( dim, array);
--    case tInt16:   //INT
-+    case NPY_INT16:   //INT
-       return NewFromPyArrayObject< DIntGDL>( dim, array);
--    case tInt32:     //LONG	
-+    case NPY_INT32:     //LONG	
-       return NewFromPyArrayObject< DLongGDL>( dim, array);
--    case tFloat32:   //FLOAT	
-+    case NPY_FLOAT32:   //FLOAT	
-       return NewFromPyArrayObject< DFloatGDL>( dim, array);
--    case tFloat64:  //DOUBLE	
-+    case NPY_FLOAT64:  //DOUBLE	
-       return NewFromPyArrayObject< DDoubleGDL>( dim, array);
--    case tComplex32:  //COMPLEX	
-+    case NPY_COMPLEX64:  //COMPLEX	
-       return NewFromPyArrayObject< DComplexGDL>( dim, array);
--      // case tAny:  //STRING***	
--      // case tAny:  //STRUCT***	
--    case tComplex64: //COMPLEXDBL	
-+    case NPY_COMPLEX128: //COMPLEXDBL	
-       return NewFromPyArrayObject< DComplexDblGDL>( dim, array);
--      // case tAny:  //PTR***		
--      // case tAny:  //OBJECT***
--    case tUInt16:         //UINT*
-+    case NPY_UINT16:         //UINT*
-       return NewFromPyArrayObject< DUIntGDL>( dim, array);
--    case tUInt32:         //ULONG*
-+    case NPY_UINT32:         //ULONG*
-       return NewFromPyArrayObject< DULongGDL>( dim, array);
--//     case tLong64:          //LONG64*
--//       return NewFromPyArrayObject< DLong64GDL>( dim, array);
--//     case tULong64:         //ULONG64*
--//       return NewFromPyArrayObject< DULong64GDL>( dim, array);
-     default:
-       Py_DECREF(array); // must be decremented
-       throw GDLException( "FromPython: Unknown array type.") ;
-diff -up gdl-0.9.orig/src/libinit.cpp gdl-0.9/src/libinit.cpp
---- gdl-0.9.orig/src/libinit.cpp	2010-08-23 15:47:45.008404687 -0600
-+++ gdl-0.9/src/libinit.cpp	2010-08-23 16:25:06.318403703 -0600
-@@ -761,8 +761,10 @@ void LibInit()
-   const string ll_arc_distanceKey[] = {"DEGREES", KLISTEND };
-   new DLibFun(lib::ll_arc_distance, string("LL_ARC_DISTANCE"), 3, ll_arc_distanceKey);
- 
-+#ifndef PYTHON_MODULE
-   const string command_line_argsKey[] = {"COUNT", KLISTEND };
-   new DLibFun(lib::command_line_args_fun, string("COMMAND_LINE_ARGS"), 0, command_line_argsKey);
-+#endif
- 
-   const string pmKey[] = {"FORMAT", "TITLE", KLISTEND };
-   new DLibPro(lib::pm, string("PM"), -1, pmKey);
-diff -up gdl-0.9.orig/src/pythongdl.cpp gdl-0.9/src/pythongdl.cpp
---- gdl-0.9.orig/src/pythongdl.cpp	2010-08-23 15:47:45.105342921 -0600
-+++ gdl-0.9/src/pythongdl.cpp	2010-08-23 15:47:45.215342738 -0600
-@@ -537,8 +537,6 @@ extern "C" {
-     Py_INCREF(gdlError);
-     PyModule_AddObject(m, "error", gdlError);
- 
--    import_libnumarray(); // obligatory with GDL
--
-     // GDL event handling
-     oldInputHook = PyOS_InputHook;
-     PyOS_InputHook = GDLEventHandlerPy;
-diff -up gdl-0.9.orig/src/topython.cpp gdl-0.9/src/topython.cpp
---- gdl-0.9.orig/src/topython.cpp	2010-02-02 11:13:51.000000000 -0700
-+++ gdl-0.9/src/topython.cpp	2010-08-23 15:47:45.217342044 -0600
-@@ -58,23 +58,23 @@ using namespace std;
- // 	char *         wptr;   /* working pointer for getitem/setitem MACROS */
- // };       
- 
--const NumarrayType pyType[] = {
--  tAny,     //UNDEF***
--  tUInt8,   //BYTE
--  tInt16,   //INT
--  tInt32,   //LONG,	
--  tFloat32, //FLOAT,	
--  tFloat64, //DOUBLE,	
--  tComplex32,  //COMPLEX,	
--  tAny,        //STRING***	
--  tAny,        //STRUCT***	
--  tComplex64,  //COMPLEXDBL,	
--  tAny,        //PTR***		
--  tAny,        //OBJECT***
--  tUInt16,     //UINT*
--  tUInt32,     //ULONG*
--  tInt64,      //LONG64*
--  tUInt64      //ULONG64*
-+const int pyType[] = {
-+  NPY_NOTYPE,     //UNDEF***
-+  NPY_UINT8,   //BYTE
-+  NPY_INT16,   //INT
-+  NPY_INT32,   //LONG,	
-+  NPY_FLOAT32, //FLOAT,	
-+  NPY_FLOAT64, //DOUBLE,	
-+  NPY_COMPLEX64,  //COMPLEX,	
-+  NPY_NOTYPE,        //STRING***	
-+  NPY_NOTYPE,        //STRUCT***	
-+  NPY_COMPLEX128,  //COMPLEXDBL,	
-+  NPY_NOTYPE,        //PTR***		
-+  NPY_NOTYPE,        //OBJECT***
-+  NPY_UINT32,     //UINT*
-+  NPY_UINT32,     //ULONG*
-+  NPY_INT64,      //LONG64*
-+  NPY_UINT64      //ULONG64*
- };	
- 
- template < typename Sp>
-@@ -87,16 +87,17 @@ PyObject* Data_<Sp>::ToPython()
-       return ToPythonScalar();
-     }
- 
--  const NumarrayType item_type = pyType[ Sp::t];
--  if( item_type == tAny)
-+  const int item_type = pyType[ Sp::t];
-+  if( item_type == NPY_NOTYPE)
-     throw GDLException("Cannot convert "+this->TypeStr()+" array to python.");
- 
-   int n_dim = this->Rank();
--  maybelong dimArr[ MAXRANK];
-+  npy_intp dimArr[MAXRANK];
-   for( int i=0; i<n_dim; ++i) dimArr[i]=this->dim[i];
- 
--  return reinterpret_cast< PyObject*>
--    (NA_vNewArray( DataAddr(), item_type, n_dim, dimArr));
-+  return 
-+//reinterpret_cast< PyObject*>
-+    (PyArray_SimpleNewFromData( n_dim, dimArr, item_type, DataAddr()));
- }
- 
- template < typename Sp>
diff --git a/dev-lang/gdl/files/gdl-0.9.1-antlr.patch b/dev-lang/gdl/files/gdl-0.9.1-antlr.patch
deleted file mode 100644
index 24e69e51dc77..000000000000
--- a/dev-lang/gdl/files/gdl-0.9.1-antlr.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- gnudatalanguage-0.9.1.orig/src/Makefile.am
-+++ gnudatalanguage-0.9.1/src/Makefile.am
-@@ -1,6 +1,6 @@
- # set the include path found by configure
- INCLUDES = $(EXT_INCLUDES) $(all_includes)
--SUBDIRS = antlr pro
-+SUBDIRS = pro
- noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
- 
- cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
-@@ -57,7 +57,7 @@ gdl_SOURCES = $(cpp_hpp_files) gdl.cpp l
- gdl_CXXFLAGS = $(AM_CXXFLAGS)
- # the library search path.
- gdl_LDFLAGS = $(all_libraries)
--gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
- endif
- 
- # build as library (for python module)
-@@ -73,6 +73,6 @@ else
- libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
- endif 
- 
--libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
- endif
- 
---- gnudatalanguage-0.9.orig/configure.in
-+++ gnudatalanguage-0.9/configure.in
-@@ -1074,7 +1074,7 @@ dnl AC_CHECK_FUNCS(strdup strtod strtol
- dnl perform program name transformation
- dnl AC_ARG_PROGRAM
- 
--AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
-+AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
- AC_OUTPUT
- 
- dnl == summary table =======================================
diff --git a/dev-lang/gdl/files/gdl-0.9_rc2-gcc4.4.patch b/dev-lang/gdl/files/gdl-0.9_rc2-gcc4.4.patch
deleted file mode 100644
index 1acd9cf58f7c..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc2-gcc4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gdl-0.9rc2/src/envt.hpp gdl-0.9rc2.new/src/envt.hpp
---- gdl-0.9rc2/src/envt.hpp	2009-01-20 14:33:56.000000000 -0500
-+++ gdl-0.9rc2.new/src/envt.hpp	2009-08-25 22:18:44.000000000 -0400
-@@ -508,6 +508,8 @@
-   void AssureStringScalarPar( SizeT ix, DString& scalar);
- 
-   // to be extended on demand for other data types  
-+  
-+  friend class DInterpreter;
- };
- 
- 
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.3.patch b/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.3.patch
deleted file mode 100644
index bccb73c994f3..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdl-0.9rc4.orig/src/CFMTLexer.cpp	2010-02-02 18:13:51.000000000 +0000
-+++ gdl-0.9rc4/src/CFMTLexer.cpp	2010-02-22 19:38:12.118389285 +0000
-@@ -11,6 +11,8 @@
- #include <antlr/CharStreamIOException.hpp>
- #include <antlr/NoViableAltForCharException.hpp>
- 
-+#include <cstdlib>
-+
- CFMTLexer::CFMTLexer(std::istream& in)
- 	: antlr::CharScanner(new antlr::CharBuffer(in),true)
- {
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch b/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch
deleted file mode 100644
index 845f2dff1bf1..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc4-gcc4.5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix build with GCC-4.5
-
-http://gnudatalanguage.cvs.sourceforge.net/viewvc/gnudatalanguage/gdl/src/math_utl.hpp?r1=1.4&r2=1.5&view=patch
-http://bugs.gentoo.org/show_bug.cgi?id=334415
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564994
-
---- src/math_utl.hpp
-+++ src/math_utl.hpp
-@@ -22,11 +22,12 @@
- 
- //#define ABS(xxx) (( xxx > -xxx)?(xxx):(-xxx))
- 
--template< typename T>
--inline T abs( T a) { return (a>=T(0))?a:-a;}
--
- namespace lib {
- 
-+  // SA: needs to be inside a namespace for GCC 4.5
-+  template< typename T>
-+  inline T abs( T a) { return (a>=T(0))?a:-a;}
-+
- //   int trans513(char *, int, int, int, DType);
- //   int transpose(char *, SizeT, SizeT [], SizeT, DType);
- //   int transpose_perm(char *, SizeT, SizeT [], SizeT, DType, long []);
diff --git a/dev-lang/gdl/gdl-0.9-r1.ebuild b/dev-lang/gdl/gdl-0.9-r1.ebuild
deleted file mode 100644
index 71bda1b75bb7..000000000000
--- a/dev-lang/gdl/gdl-0.9-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9-r1.ebuild,v 1.2 2011/04/08 21:37:21 bicatali Exp $
-
-EAPI=3
-
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit autotools eutils wxwidgets python
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-DESCRIPTION="An Interactive Data Language compatible incremental compiler"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw grib hdf hdf5 imagemagick netcdf openmp python udunits wxwidgets X"
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	sci-libs/gsl
-	sci-libs/plplot
-	fftw? ( >=sci-libs/fftw-3 )
-	grib? ( sci-libs/grib_api )
-	hdf? ( sci-libs/hdf )
-	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( media-gfx/imagemagick )
-	netcdf? ( sci-libs/netcdf )
-	python? ( dev-python/matplotlib )
-	udunits? ( >=sci-libs/udunits-2 )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
-
-DEPEND="${RDEPEND}
-	dev-java/antlr:0"
-
-pkg_setup() {
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_prepare() {
-	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch \
-		"${FILESDIR}"/${PN}-0.9_rc4-gcc4.3.patch \
-		"${FILESDIR}"/${PN}-0.9-numpy.patch \
-		"${FILESDIR}"/${PN}-0.9-configure.patch
-
-	# adjust the *.pro file install path
-	sed -i \
-		-e "s:datasubdir=.*$:datasubdir=\"${PN}\":" \
-		configure.in || die "Failed to fix *.pro install patch."
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		econf \
-			$(use_with X x) \
-			$(use_with fftw) \
-			$(use_with grib) \
-			$(use_with hdf) \
-			$(use_with hdf5) \
-			$(use_with netcdf) \
-			$(use_with imagemagick Magick) \
-			$(use_with openmp) \
-			$(use_with udunits) \
-			$(use_with wxwidgets wxWidgets) \
-			$@
-	}
-	configuration --disable-python_module
-	if use python; then
-		python_execute_function -s configuration --enable-python_module
-	fi
-}
-
-src_compile() {
-	default
-	if use python; then
-		python_src_compile
-	fi
-}
-
-src_test() {
-	cd "${S}"/testsuite
-	echo ".r test_suite" | ../src/gdl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use python; then
-		installation() {
-			exeinto $(python_get_sitedir)
-			newexe src/.libs/libgdl.so.0.0.0 GDL.so || die
-		}
-		python_execute_function -s installation
-	fi
-	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING
-}
diff --git a/dev-lang/gdl/gdl-0.9.1.ebuild b/dev-lang/gdl/gdl-0.9.1.ebuild
deleted file mode 100644
index 67cc73d7cb9e..000000000000
--- a/dev-lang/gdl/gdl-0.9.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.1.ebuild,v 1.1 2011/04/08 21:37:21 bicatali Exp $
-
-EAPI=3
-
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit autotools eutils wxwidgets python
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-DESCRIPTION="An Interactive Data Language compatible incremental compiler"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw grib hdf hdf5 imagemagick netcdf openmp python udunits wxwidgets X"
-
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	sci-libs/gsl
-	sci-libs/plplot
-	fftw? ( >=sci-libs/fftw-3 )
-	grib? ( sci-libs/grib_api )
-	hdf? ( sci-libs/hdf )
-	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( media-gfx/imagemagick )
-	netcdf? ( sci-libs/netcdf )
-	python? ( dev-python/matplotlib )
-	udunits? ( >=sci-libs/udunits-2 )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
-
-DEPEND="${RDEPEND}
-	>=dev-java/antlr-2.7.7-r2:0[cxx]"
-
-pkg_setup() {
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_prepare() {
-	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch \
-		"${FILESDIR}"/${PN}-0.9_rc4-gcc4.3.patch \
-		"${FILESDIR}"/${PN}-0.9.1-antlr.patch
-
-	rm -rf src/antlr
-	# adjust the *.pro file install path
-	sed -i \
-		-e "s:datasubdir=.*$:datasubdir=\"${PN}\":" \
-		configure.in || die "Failed to fix *.pro install patch."
-	eautoreconf
-	use python && python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		econf \
-			$(use_with X x) \
-			$(use_with fftw) \
-			$(use_with grib) \
-			$(use_with hdf) \
-			$(use_with hdf5) \
-			$(use_with netcdf) \
-			$(use_with imagemagick Magick) \
-			$(use_with openmp) \
-			$(use_with udunits) \
-			$(use_with wxwidgets wxWidgets) \
-			$@
-	}
-	configuration --disable-python_module
-	use python && \
-		python_execute_function -s configuration --enable-python_module
-}
-
-src_compile() {
-	default
-	use python && python_src_compile
-}
-
-src_test() {
-	cd "${S}"/testsuite
-	echo ".r test_suite" | ../src/gdl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use python; then
-		installation() {
-			exeinto $(python_get_sitedir)
-			newexe src/.libs/libgdl.so.0.0.0 GDL.so
-		}
-		python_execute_function -s installation
-		dodoc PYTHON.txt
-	fi
-	dodoc README AUTHORS ChangeLog NEWS TODO HACKING
-}
diff --git a/dev-lang/gdl/gdl-0.9.2.ebuild b/dev-lang/gdl/gdl-0.9.2.ebuild
new file mode 100644
index 000000000000..72ae8f9c56d4
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2.ebuild,v 1.1 2011/12/27 08:01:38 bicatali Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit cmake-utils eutils wxwidgets python virtualx
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+DESCRIPTION="Interactive Data Language compatible incremental compiler"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fftw grib gshhs hdf hdf5 imagemagick netcdf openmp proj ps python
+	static-libs udunits wxwidgets X"
+
+RDEPEND="sci-libs/gsl
+	sci-libs/plplot
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	fftw? ( >=sci-libs/fftw-3 )
+	grib? ( sci-libs/grib_api )
+	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( sci-libs/hdf5 )
+	imagemagick? ( media-gfx/imagemagick )
+	netcdf? ( sci-libs/netcdf )
+	proj? ( sci-libs/proj )
+	ps? ( dev-libs/pslib )
+	python? ( dev-python/numpy )
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
+
+DEPEND="${RDEPEND}
+	>=dev-java/antlr-2.7.7-r5:0[cxx]"
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+	epatch "${FILESDIR}"/${PV}-{antlr,numpy,proj4,include,tests}.patch
+	# make sure antlr includes are from system
+	rm -rf src/antlr
+	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
+	sed -i \
+		-e 's:proj4:proj:' \
+		-e 's:lib_proj\.h:proj_api\.h:g' \
+		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
+	# gentoo: avoid install files in datadir directory
+	sed -i \
+		-e '/AUTHORS/d' \
+		CMakeLists.txt || die
+
+	if use python; then
+		local abi
+		for abi in ${PYTHON_ABIS}; do
+			mkdir "${S}"-${abi}
+		done
+	fi
+}
+
+src_configure() {
+	# MPI is still very buggy
+	mycmakeargs+=(
+		-DMPICH=OFF
+		-DBUNDLED_ANTLR=OFF
+		-DGDL_DATA_DIR=share/gdl/pro/gdl
+		$(cmake-utils_use fftw)
+		$(cmake-utils_use grib)
+		$(cmake-utils_use gshhs)
+		$(cmake-utils_use hdf)
+		$(cmake-utils_use hdf5)
+		$(cmake-utils_use imagemagick MAGICK)
+		$(cmake-utils_use netcdf)
+		$(cmake-utils_use openmp)
+		$(cmake-utils_use proj LIBPROJ4)
+		$(cmake-utils_use ps PSLIB)
+		$(cmake-utils_use udunits)
+		$(cmake-utils_use wxwidgets)
+		$(cmake-utils_use X X11)
+	)
+	configuration() {
+		mycmakeargs+=( $@ )
+		CMAKE_BUILD_DIR="${BUILDDIR:-${S}_build}" cmake-utils_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && \
+		python_execute_function -s configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && python_src_compile
+}
+
+src_test() {
+	# defines a check target instead of the ctest to define some LDPATH
+	if use X; then
+		Xemake -j1 -C ${CMAKE_BUILD_DIR} check
+	else
+		emake -j1 -C ${CMAKE_BUILD_DIR} check
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		installation() {
+			exeinto $(python_get_sitedir)
+			newexe "${S}"-${PYTHON_ABI}/src/libgdl.so GDL.so
+		}
+		python_execute_function -s installation
+		dodoc PYTHON.txt
+	fi
+	echo "GDL_PATH=\"+${EPREFIX}/usr/share/gdl/pro\"" > 50gdl
+	doenvd 50gdl
+}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index bf25090517c8..52d8a227d21e 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -8,8 +8,12 @@
   Information Solutions.
 </longdescription>
 <use>
-  <flag name='hdf'>Adds support for the Hierarchical Data Format</flag>
-  <flag name='grib'>Adds support for the meteorological GRIB format</flag>
-  <flag name='udunits'>Support for manipulating units of physical quantities</flag>
+  <flag name='hdf'>Add support for the Hierarchical Data Format v.4</flag>
+  <flag name='gshhs'>Add support for projection adn continent maps with <pkg>sci-geosciences/gshhs-data</pkg></flag>
+
+  <flag name='grib'>Add support for the meteorological GRIB format with <pkg>sci-libs/grib_api</pkg></flag>
+  <flag name="proj">Add support for <pkg>sci-libs/proj</pkg> (geographic projections)</flag>
+  <flag name="ps">Add support for Postscript with <pkg>dev-libs/pslib</pkg></flag>
+  <flag name='udunits'>Add support for manipulating units of physical quantities</flag>
 </use>
 </pkgmetadata>