Added patch for plplot-5.9 support (fixes bug #217361).

Package-Manager: portage-2.1.5_rc2

4 files changed, 43 insertions, 4 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 883c8caf2865..58eaffee74c3 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.5 2008/03/21 20:43:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.6 2008/04/13 18:31:51 markusle Exp $
+
+  13 Apr 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/gdl-0.9_pre6-plplot-5.9.patch, gdl-0.9_pre6.ebuild:
+  Added patch for plplot-5.9 support (fixes bug #217361).
 
   21 Mar 2008; Markus Dittrich <markusle@gentoo.org>
   +files/gdl-0.9_pre6-magick.patch, gdl-0.9_pre5.ebuild,
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 6d21c486ec58..5e27fea10b42 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,12 +1,13 @@
 AUX gdl-0.8.11-gcc4-gentoo.patch 1402 RMD160 2cb002f9cc60e5910a106dfeb0ab079dcb2f212d SHA1 4b22d29098141a26fc089dbd98b5ae0190731f7b SHA256 42765b45b82bd56c46d7d2aa1726b97f47a95f3eee37a934ac600ba2e5fba0a1
 AUX gdl-0.9_pre5-proj4.patch 1215 RMD160 d82806674601555145d6b2e3deb3bd637f8d52ec SHA1 85cecd68c965ede96615ba6ca3e3ce9d87ce5600 SHA256 6767956f44e1c3d8bf2d137e6348d06bbcd8ee5f340ca3ab1c3d6b881b050931
 AUX gdl-0.9_pre6-magick.patch 886 RMD160 a22e6c3e65dc044785130b90a07c5ed0ff7dfc94 SHA1 a2f6c0e8dbad4742c3a571a279c54a1f677b1fa2 SHA256 b6b6f57d708167232173020d5edc94a8aee6949ec75406b6d80d887fa2f06633
+AUX gdl-0.9_pre6-plplot-5.9.patch 1025 RMD160 bbab8e93af80c3efe6e2ce43575350119f566237 SHA1 e3dbc4145f649cc0a18b53bddfc765fe5ad5f786 SHA256 94a92bc41e401db50c2c8f5da13a99c2bd76c479577da165d28a079cf8808eb2
 AUX gdl-0.9_pre6-proj4.patch 1205 RMD160 0a486ea0e669d682b49416f2a78611b074e4279d SHA1 f9a4cbaceb7d16adb8d33bbb6e34ded20eab039e SHA256 dd4c6749297d80c84f63426d374659d84e2941f65fa193e1a4820f8e6a299707
 DIST gdl-0.8.11.tar.gz 827194 RMD160 f392dea396bc6ab56a2360bfda02ea684aa2ce3f SHA1 8904075d9297ea54cfbdf66cc69d55c472d784c1 SHA256 3872fdbf5ec76632cad1fe1a488728592d72244c9c0553c96f265bdc78bb5906
 DIST gdl-0.9pre5.tar.gz 1131751 RMD160 458bf014c909e43bfe6bdf5f5c834bcbbd48dd52 SHA1 2df7c0fd619b78c8c59052306348dfd665f9e0e7 SHA256 81121a4e7e217dc986b4827ce690a8650f264dd648108ffde8f1eb77633d41cb
 DIST gdl-0.9pre6.tar.gz 1183644 RMD160 b8d59a06adba8be864d0cdbd00eb8bf677a2093b SHA1 d05835c066bc3f0e35c1fbaee0415c57f817af1e SHA256 a6a597f2cb5fea889b32f99fba595c3535e47ee219a334fd274ab704133e35ea
 EBUILD gdl-0.8.11.ebuild 1525 RMD160 15c6dbe3c0923b2ababd3b9c0366f69da9ed1a4c SHA1 eaaf5b5eaae8a14ac7050c2c036edeb8bc096e66 SHA256 e9299b0b74d3ca0ec01318db64e357721cdc8f214e7a7fc4727504a7fa67ddd7
 EBUILD gdl-0.9_pre5.ebuild 1739 RMD160 4eb98f3ba51c35a6392eacfcdf4b9fce45629017 SHA1 06694e44bbf7e050dca058e35e53b7fe538ab8ec SHA256 1055923f9070ca0609f7ea75eb7f9723eb74ea0fb19588ac8dc2afddf4517d10
-EBUILD gdl-0.9_pre6.ebuild 1823 RMD160 9d67aa8194196b23e8f55b25e2c3ad4962181475 SHA1 d13c36066a8c93497fd5ae7a47b7caec6fc1f41a SHA256 7bd651866729efde9eb178aeea44f1273b03a8e50883b3adc20fa74e1b0ff3b9
-MISC ChangeLog 1283 RMD160 6109db7dfadf82005a71523935143147631714d2 SHA1 7878940bd96ad3049206496f2d65edb208e5fc28 SHA256 f40aaaac60609103747d9fe046a8ee2b91d1fd489af287aa084eb3e096afae86
+EBUILD gdl-0.9_pre6.ebuild 1921 RMD160 0eda7822bf1cbbbb42e3e3cda22602cfb1ca91ff SHA1 55c9a7b42d0eee8f3b5ca8c307c70ab3be912c00 SHA256 a0fcc0f23501ecb4bdf887463a09487f2e623b98b91fd9d1840f78140674cd8b
+MISC ChangeLog 1456 RMD160 a81aedf693b0209f0c043d8a30e1da54cbcdc310 SHA1 3946839eb75f4a2723613e14b2c8c9eb895248ab SHA256 52acd7fb3600af636891111e21456519d7fce6006772a017793f31a34d16741c
 MISC metadata.xml 465 RMD160 6a916eadbb20bfec9af5dd276967d236e946b87e SHA1 5ae91cde758c6a9ec3532914fd63a2584aa42060 SHA256 3922d11656f03d422639ae3bfbcc74eb47044292687d63c2a80379b994a083bb
diff --git a/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch b/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch
new file mode 100644
index 000000000000..24e88eb0f2f8
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch
@@ -0,0 +1,30 @@
+diff -Naur gdl-0.9pre6/src/gdlgstream.cpp gdl-0.9pre6.new/src/gdlgstream.cpp
+--- gdl-0.9pre6/src/gdlgstream.cpp	2007-10-29 19:10:47.000000000 -0400
++++ gdl-0.9pre6.new/src/gdlgstream.cpp	2008-04-13 12:45:19.000000000 -0400
+@@ -25,12 +25,12 @@
+ 
+ using namespace std;
+ 
+-void PLPlotAbortHandler(char *c)
++void PLPlotAbortHandler(const char *c)
+ {
+   cout << "PLPlot abort handler: " << c << endl;
+ }
+ 
+-int PLPlotExitHandler(char *c)
++int PLPlotExitHandler(const char *c)
+ {
+   cout << "PLPlot exit handler: " << c << endl;
+   return 0;
+diff -Naur gdl-0.9pre6/src/plot3d_nr.cpp gdl-0.9pre6.new/src/plot3d_nr.cpp
+--- gdl-0.9pre6/src/plot3d_nr.cpp	2007-10-29 19:10:47.000000000 -0400
++++ gdl-0.9pre6.new/src/plot3d_nr.cpp	2008-04-13 13:01:38.000000000 -0400
+@@ -217,7 +217,7 @@
+     zmin = (zmax_in > zmin_in) ? zmin_in: zmax_in;
+     zmax = (zmax_in > zmin_in) ? zmax_in: zmin_in;
+ 
+-    pldtik(zmin, zmax, &tick, &nsub);
++    pldtik(zmin, zmax, &tick, &nsub, 0);
+     tp = tick * floor(zmin / tick) + tick;
+     pl3upv = 0;
+ 
diff --git a/dev-lang/gdl/gdl-0.9_pre6.ebuild b/dev-lang/gdl/gdl-0.9_pre6.ebuild
index 01cb0a94e182..e09d8c7155e0 100644
--- a/dev-lang/gdl/gdl-0.9_pre6.ebuild
+++ b/dev-lang/gdl/gdl-0.9_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre6.ebuild,v 1.2 2008/03/21 20:43:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre6.ebuild,v 1.3 2008/04/13 18:31:51 markusle Exp $
 
 inherit eutils flag-o-matic
 
@@ -37,6 +37,10 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-proj4.patch
 	epatch "${FILESDIR}"/${P}-magick.patch
+
+	if has_version ">=sci-libs/plplot-5.9.0"; then
+		epatch "${FILESDIR}"/${P}-plplot-5.9.patch
+	fi
 }
 
 src_compile() {