Version Bump; fix compatibility with latest plplot, bug #547380; fix python support bug #530774

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

11 files changed, 410 insertions, 55 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 5e9702bc5371..a24c6f4f8691 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.47 2015/04/08 08:22:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.48 2015/05/07 15:33:32 jlec Exp $
+
+*gdl-0.9.5 (07 May 2015)
+
+  07 May 2015; Justin Lecher <jlec@gentoo.org> +files/0.9.4-plplot.patch,
+  +files/0.9.4-python2.patch, +files/0.9.5-antlr.patch, +files/0.9.5-png.patch,
+  +files/0.9.5-proj4.patch, +files/0.9.5-testsuite.patch, +gdl-0.9.5.ebuild,
+  gdl-0.9.4.ebuild, metadata.xml:
+  Version Bump; fix compatibility with latest plplot, bug #547380; fix python
+  support bug #530774
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> gdl-0.9.4.ebuild:
   Drop old Python implementations
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index cdccff02f475..091f69f2cd7f 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,34 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.9.2-antlr.patch 2795 SHA256 9649cb996e771b7259cb81af75e3e1f555a003c3da0e2a21f4c7171e399703b9 SHA512 67bccd977def9b5581aca18a33dcfde6c563ecf404ddd31e2f306bd29801db9a47dcb78490bd7123f2c0179135d04fb0fa380b2d2f0161724827687a00c8f286 WHIRLPOOL 193e94b19365b1974f8a4fa858eceb766b9748a6c792b3b25c9becb19e9f8d018e05b8373dcc33127ecbfcf724c2327daf71d473be642e13dbc2bfbfe0046e0c
 AUX 0.9.2-include.patch 314 SHA256 6f9c9aaac6f9ee526c1cdd5eb107bfa28eecefa9f4a7f947e5f80cf6bb7591c7 SHA512 3dc426de776f004b9c9840f37af0002907036b6f9d370535c51a2ed6916156d34d640214bec2dba58c9553917c16b996b61194bf15bb3e1c6f2b6f81edb13a4c WHIRLPOOL f56a8f64ca50578f12b66b40687b074a37731c5e08422a4d30e9b96ae4e4cd3ee07e2672fb06ad14b1a37a197b915a9e09992ad56b20cb3b16e673160e042124
 AUX 0.9.2-proj4.patch 1185 SHA256 4c6b4d97823ddeebae4c3170dc80c14bb68681117de599077ce6a845fb2ae26f SHA512 15ac5f961217cd9067c1872d53f7399c4a4f93db5912c2c7e0de489922f83bc75c0720d6679474d003a5bf8617cccb85600f17f10c1ab80615a290c17893693a WHIRLPOOL 5c9b6bb3449513728a9071185e5194e561229a83010ffb35b483839322d42674621ebeabf47cc666c57aef21636b04032a8f97139df5abd3f9d3100d9f9330e1
 AUX 0.9.2-semaphore.patch 770 SHA256 cbdfe65ddd23a62f04b2beee46f9f6e80bd12ff55a3563ea7059a7e2c083aac4 SHA512 6f921539e3dc09af453403f3b4137fc3e7d6fd4b81f05cb3214b4ab6a2feecbe2f3aeae1cdf03d92db13e60f7562825fa1a9bebfd75ac47fc6625b88f367b5ac WHIRLPOOL e1b8a55f0ce9d2626b53882528d0ee7056ad28ea5bbf746a7d77b4074d63977c1940bba478eb6b54a56d1b64e843a55106f53a21fb166d6566197828aef16208
 AUX 0.9.3-plwidth.patch 6795 SHA256 fe8e5c9e9d3aeaa424f775af099fda3fb2d7188a390eb053a26ec96a5e6a66de SHA512 3976743ce90397356134003bf07ddb8f7acb9269a5bbf0d75adae18e94eb5edceefa2a85b6c649d0a2c721a15be7a5b4dda7d6b7fdcb0deed63ef563d5a271af WHIRLPOOL cf093049b18453268bf26a78955f3238cc152577e089ec5a748a2cd0caece6a583f25314de8f6b31dfa3633a8539c6b4bd4df99f976da5fa0ea446ed5827068d
 AUX 0.9.4-gsl.patch 2263 SHA256 a3fe0744cfd6082d1fa7170a0df0a466024baa7bb8c2825d5ce7e988851641eb SHA512 6dd7cdd5d69cd3aa8948e0b1b40c95ddb5c8932f200a28653a08d9222e21a06158e3fab40f7a12d7c4d510f1b59db01ec851e7f89ec2fe6dde93c37e016b5468 WHIRLPOOL a15e13a9e53d49e6fe6c65d5d82e2fcc14be40a8354badf923a02f50fd1e24617d89f9bb26c2d9bf1488812ec5925477120b6fbc3c6c4716ff94b9d7d6311ce4
+AUX 0.9.4-plplot.patch 650 SHA256 48739e26ded982f020685a58ebac6d5f79e77eab19292ad6ccc8e798b059e832 SHA512 cba3aecd8bfef2bd044e1cd7aa9324ba0f8b25b3ec5994c2ba8af8f54c05ee1173199c73fbe9c117ba75e8a189bf56531aa8550371b256df1c4630840f82bb29 WHIRLPOOL a920cfb85497400f326d3f39f7cb354ab92d18cef8f101f3abb836bea545dfa66cdf6ac06f9921380daa30000d642cbc8621a32cdee50b1c8a73c0c7a4dad556
 AUX 0.9.4-python.patch 468 SHA256 2d5e4b886a848d739a0e88a3db4bc9046a34dff7ae61e6ddfcf7911d39cc7e4f SHA512 06da99316bfb77661fe2a6cbf7268c9c503a0684433d00375350bce5eef5f759a82006346fb37c80276acf4b358dd6cd348d30a622a6b0234c0a23247666ea4b WHIRLPOOL 6ba1f8df2082c6c40733b5228886d75f2df590339efc829048ca405124d048ad1ea218e6ed89c9ef53db28d4ef184772004272ef451480b3c0eedbef9df67c09
+AUX 0.9.4-python2.patch 448 SHA256 0460da490bd57fe54cbd318d8bc9e34efa7b6ef039985b380ee37400c4be256d SHA512 fb3089eda97cbad04b1a44c3e6b9c360b007d5c33953fe021d2b42c8609ce40db8cd19d3b83d55b82ce8d63fb86f547ca82eeb32a07f0fa2625a17a2f97a07c6 WHIRLPOOL 15996fba7aaac172900e1b49e211781f3751ba8f5e18321549213fbc10d6df8bea2bd8b5c8da29ea2bded5982edc21fd8d5f07f17d25eeaa25716baaaeb9529c
 AUX 0.9.4-reorder.patch 12680 SHA256 089680e37fcec56533d53953867a342e18cdb1d097a44603416bd3876c5f3c71 SHA512 ab3c41d808b91e1b1b854e0f96caf1e005f3ba229d6e3b34901505aef7d9df652611890e5646492e65d79bb377993c79e595ec3db2fb63bf6f8eca4d6013ba6b WHIRLPOOL 2b0ca937101d7a4f420d158d04cd9e0672b742b7a4d7becfda6f02bcf3f1f46b1ba5b13531b7808c772d8355e1519e0774d08978b29ff0640d2e87df60cb9663
+AUX 0.9.5-antlr.patch 3059 SHA256 ab44e0e5274c6e38fa1d37141b2c3426373ff97d3897e4e6f2cd0a191f0affe0 SHA512 2d8d47162fc0179319b728041421a72c965657023e396285de5ec2849b667e21117a587c771b88eb84c54f983747cb1635b7bfb0955762af1912efa88128593c WHIRLPOOL c0d183397164e37e038b97d7cd8f0a5096d120b2e5c0839afeac720d1e0516ea4a159f12cecf01ecd94a753c162aed5d590ef061341e121e1ec2e1ffdb46efcc
+AUX 0.9.5-png.patch 489 SHA256 4c582ca1bcb7ec85d71d6f43f1c56f3d3635ef404f1ccab3e745a6cc7c77054d SHA512 6a7b09286fb62ad18b57434804260a6155c1f4739d72a9ed440c6efe1d682b126a297885d092fbf0cb1e2809a663cb9c7755507c807613199b317f981df7cfc1 WHIRLPOOL c47297b93144f16d7a5c11af1752d3634e2188a4043e1576c74154e6c38962c2169f574a5f16d2d2851ce479db4e591161ee77e8e0ea55c90853c2d216f46258
+AUX 0.9.5-proj4.patch 1421 SHA256 e0a52acf35420f58d42d65fc9f2fb85a6b203d8cd32063a05ad358f2207927ab SHA512 33bb23d83583c20ef4a89972171a73c64510505be8fa298c1ce4c7efdc64b8dc9b25ae24150a6b49665f0f256767d89d50df9936f01185220fe4fbe70aecea20 WHIRLPOOL c36db28a071d6bdbc882f4e65fd5c59408d5c1597fa8790ec75391c707bd850ab624fc5d35009945e282ec644415691fe849ce44f9c0a6babaa00b54c3c749ed
+AUX 0.9.5-testsuite.patch 731 SHA256 7eb903639270c184b46b3d21e49eee9e3e2921f8a60b67785df032b2ae4cd736 SHA512 9112da38afe71d92a8d265a1d479f10c829f5c9132b687c63a330f5ccb4e3c1412a931924dc860b3538cd03190b0ef51646b9d130dc9689501649e6dd821f9ea WHIRLPOOL 378b76617802c17b2865f8646bcdd52fa9693c6b9b1ac127943425b22187cc990da88c415ec435c475a2bd4ea5597ae8c273cd7accf645d04f3bfee356206ded
 DIST gdl-0.9.4.tar.gz 2191342 SHA256 e18010cd874cad7b1fd8c752e9386571156e1fb066f2d27ecbcc15bbfc9514fa SHA512 46921eb3333a6b890187a6c75f71758e5e234b76d61a194e17de81ace10760659a4a676060490a5ef7374fd1acadf47c7f565133c19ea165e04c54a577b3c723 WHIRLPOOL a760fcf37e47235e3d21c8c852b65560894e29cfe3684bfee6e83f2d1d060dcaa41a2f9e60e41cbae55d9e5a2036518a5aad22cfd6f07b951a978e1ba2446eae
-EBUILD gdl-0.9.4.ebuild 4191 SHA256 d9fe0997c9610b4913f8e975bf6f9db07893f8d2295c2c42488ff09c9ecd3169 SHA512 9a148326a6a3139021950e07c870c57ddc2cc6460049279dc1b7d52360c898e99e759a0187f4b8a102bae92256fc77f89bb11805824a288199fd9e31ac8dabec WHIRLPOOL b043cf8ec03181da999278d7e3d3b0bfd49a8388e73405796dddfb8968bb619acc848471f2a0169e4612ee0a2dde8f11d6c76d6304a16f7307b90452b953d4ae
-MISC ChangeLog 10225 SHA256 0e2638e4fb580066652bf7f49d2c1d026de3ade98a7b7bfc676c17119cd1fca2 SHA512 da0c734dfb4eb14c680553610b0d28dfb420f89901924dea5320ddc2f6e1018891976fc5dd4f3c3ba39ff49f53eac5ced124df59b2c3117876b360020ee6ec8d WHIRLPOOL 0c76271df142230ea92f96ccc71e2801b5476966aaa5ec7a68f23a1f4c02ff55e0ef1e2d8d3eb38808f49fb248cf8779c4d758f0afa3cde4ae8eb2adb40aa361
-MISC metadata.xml 952 SHA256 8e1c35a5c232463a120bcd5c3f4c8b3784318f62a8c13b9435d0eb13825c21dc SHA512 1646950b73a83efe3602afe206f8f27204dfd072d5f2a3842d3966459b75c290d86920a10c9e0826a365d5d8faa8135002fb068dcac1b6dc4f971951b86f55ab WHIRLPOOL 05a2a3e9877ebba83e7c3e6d76de82b34da7d1b9bb930553fedead85e1373687297805cb2c63e59f3b15edd623143fb76c16af57f76e218fb0fb9231faf89ee7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVJOU3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+xIQALw/ohQpozY/XkyTPlrLIkiO
-ajBJC4eHIyHdNL0hwAvj9kJ9jS8gDnx8JBwFTdSRJV5cq5QILYVjIIWAmYT9og+e
-9brOIC3BgQ8K7y39mPhqmBpBUA5443IZDxnrsQ6AA6M2ahjPiNmVQEkaS0p80eJM
-edBNvnq4/1sItfEc5C+Eca3thzm1/XrQFreuYVGasYSEH4cn1VdlD+jIXKUHhDqY
-gi593CQhHTJyE1BQ0k99u4Vhitcnv0AcjpcVwxY1iywgxZSWg9fjbyc8VPhEt1TF
-Olo4Ai+Y3QMFIynBzYC+tlraJ9DxP0Ot7iYjTxfUqBcXw87GRggNKO1zHxjUbbLm
-BEaNIySUQpIPyz6r1ECI6C7AdPUnCWR/e/DIqNZhtNfd1by5pz6WueNbl1K+U609
-GIaMv6mntZkKoZE6xF3NsSfUhula6tFgrEC1V9dPn0sMahvON/hqMNctYtMar0DN
-jDAyDMi5RlL195SC3W2YsXWAYDx4DmJqNcNSSt0MdTRAW2OCKn9inMNYLwBdJxSQ
-plKhbG9uSPgwtc6t7z72xAhbEklDlvvIiXcTdnvnvL3n9A9rZ20F06ghKBuuL4lr
-c2yGg+gjJ20LWek7SmC4Sgeki9HWgRfHxQ5XV17YHS2/hUYSqAha2zYPJXX7uPCr
-6hmx+PtvESG7r0KABxvw
-=lLvy
------END PGP SIGNATURE-----
+DIST gdl-0.9.5.tar.gz 2341992 SHA256 cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a WHIRLPOOL 6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b
+EBUILD gdl-0.9.4.ebuild 4199 SHA256 6165bc0121aadc17daaa031c6481a382aadce4d6a95d4f828abae99831000440 SHA512 d57f9b6b52209d20793e4a9868e0fd545ffec70d82eb4c7337f79be54530a6574b0dba00e32873544ccf0cc4e62668ae18b343ebe39a3df70228afce2d70ff65 WHIRLPOOL e145771d9043e434b323984db187b491fda649d857e2e2ab795fc8b2103b0dade1ac88055b2ab8fb513409cf50817d956f53f82417f1ce02700cdde2fcbc9bec
+EBUILD gdl-0.9.5.ebuild 4064 SHA256 2abccc43fd9d382c5d03e7d19bc2996c85d93669644248d6b40a756c8a0d6064 SHA512 eb316b7e99f86f86491a8ae590b0c008f41c27f74a0c0c0363e3c9105331c0fc00b4dcde8aab594d553819c7ffc58a36ffaacd66b52b68b3a4487369391eeb75 WHIRLPOOL 3f15c8f045b7dc7f37348525cf4eb151813f6677b6fb3beaf99ba7657066d3b9c24398b3742e192b9b515db559be54c814260e226e6a296baac7f762dc82a581
+MISC ChangeLog 10615 SHA256 c7ae430ebb6bed70d39a1b9b81094d2d02823a09cda2f7c229877afb21b20883 SHA512 adc67335a608447feac28bbf82fc0e4bf23be0a24af53a27c8c5dc019178e539aebe41613b82f0ea7a29116bc28ded4751e0cb0c25ecfe053b629377ddccadaa WHIRLPOOL 0e0365b87f5453746e36f4ba5a7dd6f27fda2cb5ce372c87a47e9fce4f49031662e978fa4221aec389e19b2da7c3a0c6cfb9227cf1dc1606b870d8ca1b79b09a
+MISC metadata.xml 971 SHA256 e2b37399db0cd7047cf2032cdce4e27f0dbb2c4725cf963953f036226cc8854f SHA512 7f72d034d322946160a853aa8c5ba7bf8100219bcd387b933a5740445c85486885b8c24bbc6479129b230be32fd15ee721bac7ae75c1615c4d9139c997c27101 WHIRLPOOL cadcca6eef6c5387901c555c53e7e8278931a4c9d6ad0b9b0f7c9c03b1c9fe32341c247e73644586291bf04fda8be0a1055430c1eceec5b50957b74b6646809d
diff --git a/dev-lang/gdl/files/0.9.4-plplot.patch b/dev-lang/gdl/files/0.9.4-plplot.patch
new file mode 100644
index 000000000000..fac18ec5e699
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.4-plplot.patch
@@ -0,0 +1,18 @@
+ CMakeModules/FindPlplot.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeModules/FindPlplot.cmake b/CMakeModules/FindPlplot.cmake
+index a503f8c..cdaeb24 100644
+--- a/CMakeModules/FindPlplot.cmake
++++ b/CMakeModules/FindPlplot.cmake
+@@ -9,8 +9,8 @@
+ #
+ 
+ 
+-find_library(PLPLOT_LIBRARY NAMES plplotd)
+-find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
++find_library(PLPLOT_LIBRARY NAMES plplotd plplot)
++find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd plplotcxx)
+ set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY})
+ find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h)
+ include(FindPackageHandleStandardArgs)
diff --git a/dev-lang/gdl/files/0.9.4-python2.patch b/dev-lang/gdl/files/0.9.4-python2.patch
new file mode 100644
index 000000000000..8dc92324a581
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.4-python2.patch
@@ -0,0 +1,17 @@
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fda8ee..e2170b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -615,8 +615,8 @@ if(PYTHON OR PYTHON_MODULE)
+ 		else()
+ 			set(PythonLibs_FIND_VERSION 2)
+ 		endif()
+-		find_package(PythonLibs)
+ 		include(FindPythonInterp)
++		find_package(PythonLibs)
+ 	endif()
+ 	set(USE_PYTHON ${PYTHONLIBS_FOUND})
+ 	if(PYTHONLIBS_FOUND)
diff --git a/dev-lang/gdl/files/0.9.5-antlr.patch b/dev-lang/gdl/files/0.9.5-antlr.patch
new file mode 100644
index 000000000000..f5b627ab444e
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.5-antlr.patch
@@ -0,0 +1,91 @@
+ CMakeLists.txt               | 14 +++++++++++---
+ CMakeModules/FindANTLR.cmake | 11 +++++++++++
+ src/CMakeLists.txt           | 18 +++++++++++-------
+ 3 files changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 407e39a..c4b3278 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,6 +111,8 @@ set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory tree")
+ 
+ set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data 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)
+@@ -174,9 +176,15 @@ check_library_exists(m nexttoward "" HAVE_NEXTTOWARD)
+ # 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)
+ 
+ if(WIN32 AND NOT CYGWIN)
+ 	# For Win32 find Pdcureses instead of (N)Curses
+diff --git a/CMakeModules/FindANTLR.cmake b/CMakeModules/FindANTLR.cmake
+new file mode 100644
+index 0000000..b61cc5b
+--- /dev/null
++++ b/CMakeModules/FindANTLR.cmake
+@@ -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 --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1f7ffec..776a1fd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -262,9 +262,8 @@ widget.cpp
+ widget.hpp
+ )
+ 
+-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
+@@ -275,11 +274,16 @@ else(PYTHON_MODULE) #gdl
+ 	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 (MINGW)
+-target_link_libraries(gdl ws2_32)
+-endif (MINGW)
++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
++  if (MINGW)
++    target_link_libraries(gdl ws2_32)
++  endif (MINGW)
++endif(BUNDLED_ANTLR)
++
+ target_link_libraries(gdl ${LIBRARIES})
+ add_definitions(-DHAVE_CONFIG_H)
+ 
diff --git a/dev-lang/gdl/files/0.9.5-png.patch b/dev-lang/gdl/files/0.9.5-png.patch
new file mode 100644
index 000000000000..1140fcc9ac75
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.5-png.patch
@@ -0,0 +1,15 @@
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 407e39a..f24a087 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -270,7 +270,6 @@ if(PNGLIB)
+ 	set(USE_PNGLIB ${PNG_FOUND})
+ 	if(PNG_FOUND)
+ 		set(LIBRARIES ${LIBRARIES} ${PNG_LIBRARIES})
+-		set(LINK_DIRECTORIES ${LINK_DIRECTORIES} ${PNG_LIBRARY_DIRS})
+ 		include_directories(${PNG_INCLUDE_DIRS})
+ 	else(PNG_FOUND)
+ 		message(FATAL_ERROR "libpng is required but was not found.\n"
diff --git a/dev-lang/gdl/files/0.9.5-proj4.patch b/dev-lang/gdl/files/0.9.5-proj4.patch
new file mode 100644
index 000000000000..4b2ebcca0a02
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.5-proj4.patch
@@ -0,0 +1,41 @@
+ CMakeLists.txt | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c4b3278..f9ed49d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -637,17 +637,17 @@ if(LIBPROJ4)
+ 	if(LIBPROJ4_FOUND)	
+ 		set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
+ 
+-		check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
+-		if(USE_LIBPROJ4_NEW)
++		check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
++		if(USE_LIBPROJ4)
+ #		check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
+ #		if(USE_LIBPROJ4)
+ 
+                         # define USE_LIB_PROJ4 in any case
+ 			set(USE_LIBPROJ4 1)
+ 
+-		else(USE_LIBPROJ4_NEW)
+-			check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
+-			if(NOT USE_LIBPROJ4)
++		else(USE_LIBPROJ4)
++			check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
++			if(NOT USE_LIBPROJ4_NEW)
+ #		else(USE_LIBPROJ4)
+ #			check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
+ #			if(NOT USE_LIBPROJ4_NEW)
+@@ -656,8 +656,8 @@ if(LIBPROJ4)
+ 				"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)
+ #			endif(NOT USE_LIBPROJ4_NEW)
+ #		endif(USE_LIBPROJ4)
+ 
diff --git a/dev-lang/gdl/files/0.9.5-testsuite.patch b/dev-lang/gdl/files/0.9.5-testsuite.patch
new file mode 100644
index 000000000000..0ba7083ed818
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.5-testsuite.patch
@@ -0,0 +1,15 @@
+ testsuite/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/testsuite/CMakeLists.txt b/testsuite/CMakeLists.txt
+index 31506e4..287f352 100644
+--- a/testsuite/CMakeLists.txt
++++ b/testsuite/CMakeLists.txt
+@@ -47,7 +47,6 @@ file(WRITE ${CMAKE_SOURCE_DIR}/testsuite/launchtest.c "${LAUNCH}")
+ add_executable(launchtest EXCLUDE_FROM_ALL ${CMAKE_SOURCE_DIR}/testsuite/launchtest.c)
+ add_library(test_ce SHARED EXCLUDE_FROM_ALL libtest_ce.cpp)
+ add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test DEPENDS launchtest test_ce gdl)
+-get_target_property(LAUNCHTESTLOCATION launchtest LOCATION)
+ execute_process(
+   COMMAND "fgrep" ".pro" "${BASE_SOURCE}/testsuite/Makefile.am" 
+   COMMAND "awk" "{printf(\"%s;\",$1)}" 
diff --git a/dev-lang/gdl/gdl-0.9.4.ebuild b/dev-lang/gdl/gdl-0.9.4.ebuild
index 7b3f5b4dd342..a4af4471b4c9 100644
--- a/dev-lang/gdl/gdl-0.9.4.ebuild
+++ b/dev-lang/gdl/gdl-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild,v 1.3 2015/04/08 08:22:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild,v 1.4 2015/05/07 15:33:32 jlec Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
 
-DESCRIPTION="Interactive Data Language compatible incremental compiler"
+DESCRIPTION="GNU Data Language"
 HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
 
@@ -21,7 +21,7 @@ IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
 
 RDEPEND="
 	sci-libs/gsl:0=
-	sci-libs/plplot:0=
+	sci-libs/plplot:0=[-dynamic]
 	sys-libs/ncurses:5=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
@@ -31,13 +31,19 @@ RDEPEND="
 	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
 	hdf? ( sci-libs/hdf:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
+	imagemagick? (
+		|| (
 			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+			media-gfx/imagemagick[cxx]
+			)
+	)
 	netcdf? ( sci-libs/netcdf )
 	proj? ( sci-libs/proj )
 	postscript? ( dev-libs/pslib )
-	python? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 	udunits? ( sci-libs/udunits )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
 
@@ -49,14 +55,16 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-		"${FILESDIR}"/0.9.2-antlr.patch
-		"${FILESDIR}"/0.9.2-include.patch
-		"${FILESDIR}"/0.9.2-proj4.patch
-		"${FILESDIR}"/0.9.2-semaphore.patch
-		"${FILESDIR}"/0.9.3-plwidth.patch
-		"${FILESDIR}"/0.9.4-gsl.patch
-		"${FILESDIR}"/0.9.4-python.patch
-		"${FILESDIR}"/0.9.4-reorder.patch
+	"${FILESDIR}"/0.9.2-antlr.patch
+	"${FILESDIR}"/0.9.2-include.patch
+	"${FILESDIR}"/0.9.2-proj4.patch
+	"${FILESDIR}"/0.9.2-semaphore.patch
+	"${FILESDIR}"/0.9.3-plwidth.patch
+	"${FILESDIR}"/0.9.4-gsl.patch
+	"${FILESDIR}"/0.9.4-python.patch
+	"${FILESDIR}"/0.9.4-reorder.patch
+	"${FILESDIR}"/0.9.4-plplot.patch
+	"${FILESDIR}"/0.9.4-python2.patch
 )
 
 pkg_setup() {
@@ -117,7 +125,7 @@ src_configure() {
 			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
 		fi
 	else
-		mycmakeargs+=( "-DGRAPHICSMAGICK=OFF -DMAGICK=OFF" )
+		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
 	fi
 	configuration() {
 		mycmakeargs+=( $@ )
@@ -141,9 +149,8 @@ src_install() {
 	cmake-utils_src_install
 	if use python; then
 		installation() {
-			python_export PYTHON_SITEDIR
-			exeinto "${PYTHON_SITEDIR#${EPREFIX}}"
-			newexe src/libgdl.so GDL.so
+			mv src/libgdl.so GDL.so || die
+			python_domodule GDL.so
 		}
 		python_foreach_impl run_in_build_dir installation
 		dodoc PYTHON.txt
diff --git a/dev-lang/gdl/gdl-0.9.5.ebuild b/dev-lang/gdl/gdl-0.9.5.ebuild
new file mode 100644
index 000000000000..b3c68c9bb4cc
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.5.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.5.ebuild,v 1.1 2015/05/07 15:33:32 jlec Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
+	png proj postscript	python static-libs udunits wxwidgets"
+
+RDEPEND="
+	sci-libs/gsl:0=
+	sci-libs/plplot:0=[-dynamic]
+	sys-libs/ncurses:5=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	x11-libs/libX11:0=
+	fftw? ( sci-libs/fftw:3.0= )
+	grib? ( sci-libs/grib_api:0= )
+	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
+	hdf? ( sci-libs/hdf:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? (
+		|| (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx]
+			)
+	)
+	netcdf? ( sci-libs/netcdf )
+	proj? ( sci-libs/proj )
+	postscript? ( dev-libs/pslib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
+
+DEPEND="${RDEPEND}
+	>=dev-java/antlr-2.7.7-r5:0[cxx,java,script]
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/0.9.5-antlr.patch
+	"${FILESDIR}"/0.9.2-include.patch
+	"${FILESDIR}"/0.9.4-plplot.patch
+	#"${FILESDIR}"/0.9.5-testsuite.patch
+	"${FILESDIR}"/0.9.5-png.patch
+)
+
+pkg_setup() {
+	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
+		die "You have openmp enabled but your current g++ does not support it"
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+	# make sure antlr includes are from system and rebuild the sources with it
+	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
+	rm -r src/antlr || die
+	einfo "Regenerating grammar"
+	pushd src > /dev/null
+	local i
+	for i in *.g; do antlr ${i} || die ; done
+	popd > /dev/null
+
+	# 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
+}
+
+src_configure() {
+	# MPI is still very buggy
+	# x11=off does not compile
+	local mycmakeargs=(
+		-DMPICH=OFF
+		-DBUNDLED_ANTLR=OFF
+		-DX11=ON
+		$(cmake-utils_use fftw)
+		$(cmake-utils_use eigen EIGEN3)
+		$(cmake-utils_use grib)
+		$(cmake-utils_use gshhs)
+		$(cmake-utils_use hdf)
+		$(cmake-utils_use hdf5)
+		$(cmake-utils_use netcdf)
+		$(cmake-utils_use openmp)
+		$(cmake-utils_use png PNGLIB)
+		$(cmake-utils_use proj LIBPROJ4)
+		$(cmake-utils_use postscript PSLIB)
+		$(cmake-utils_use udunits)
+		$(cmake-utils_use wxwidgets)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
+		else
+			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
+		fi
+	else
+		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
+	fi
+	configuration() {
+		mycmakeargs+=( $@ )
+		cmake-utils_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+	# there is check target instead of the ctest to define some LDPATH
+	Xemake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		installation() {
+			mv src/libgdl.so GDL.so || die
+			python_domodule GDL.so
+		}
+		python_foreach_impl run_in_build_dir installation
+		dodoc PYTHON.txt
+	fi
+
+	echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
+	doenvd 50gdl
+}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index fc025047c585..81b730a5dd40 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   A free IDL (Interactive Data Language) compatible incremental compiler
   (ie. runs IDL programs). IDL is a registered trademark of ITT Visual 
   Information Solutions.
 </longdescription>
-<use>
-  <flag name='eigen'>Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></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='udunits'>Add support for manipulating units of physical quantities</flag>
-</use>
+  <use>
+    <flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></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="udunits">Add support for manipulating units of physical quantities</flag>
+  </use>
 </pkgmetadata>