sci-libs/pgplot: Add fix for tk8.6, #451614, thanks Juergen Rose for the patch

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 65 insertions, 12 deletions

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index 8df8bd0a76c7..e00cca1b1bfc 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/pgplot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.28 2013/01/13 12:40:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.29 2013/01/16 20:35:15 jlec Exp $
+
+  16 Jan 2013; Justin Lecher <jlec@gentoo.org> +files/pgplot-tk86.patch,
+  pgplot-5.2.2-r5.ebuild, metadata.xml:
+  Add fix for tk8.6, #451614, thanks Juergen Rose for the patch
 
   13 Jan 2013; Markus Meier <maekke@gentoo.org> pgplot-5.2.2-r5.ebuild:
   add ~arm, bug #449762
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index ab4d06d20499..d1e946be3bac 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pgplot-compile-setup.patch 3034 SHA256 d42ec9479298e8a4a2acb0165d457422fa484a700ac05e53b90dde786c1a044f SHA512 9ee9b1166193e3eea5568693365574bf1ba427d232fd4c09fb728e16df5675e127590dba89c1c78518c6edab791828075f7c7e904c1a3a8f6f3bf48e958ddf97 WHIRLPOOL fc20795f71a4f88a2c16a33738d4b78f2dcdbed66577dda4f7b1abb94012059d78c1b26353e6a71dc2191dc97af7a8f9c8febe2a2faf5ac6449b36394601a153
 AUX pgplot-drivers.patch 7431 SHA256 19cabb29fd05c2c44cbb0492167ee3e45ab8890390b1e98de672f2ca2588baed SHA512 a730c2cb9e555b92912a9603bb58267f2feb683f5e7313736ab85c1c8595258779125a957cec20634bfe96390770d5f8e0edabe9c0fa16eef7ced2e37b0e1e07 WHIRLPOOL 652b29fe5b0eb54cbc9d8c9b123b95a8a66486400d8a1eeb52a39d9b5ad76abbc5b052a9df69b1abcfbb54ce7141ad05a1352766f43d53a34b79ff7ef929ea45
@@ -7,14 +7,15 @@ AUX pgplot-headers.patch 2716 SHA256 e92a07e38fff278218c09b84453d5c75be663576bdb
 AUX pgplot-libpng15.patch 370 SHA256 6cc1734ed629c0d93f25509be87ed1285fd8f49e8c5e036cd870075a5de8947c SHA512 44883fb80d6a07f8746fe09cbed4f6a6ac250748033b23c7c8d8a4d86c49a6d068cd5052604878bb192c8dd607726416946ac5d023b75bb21c770ce3186d927a WHIRLPOOL be97ad1e5b3579ee5bbf869bf25a9111b1a6bb3a8fc06a24ae0c1e6350ded0ac0606ba602e9ff9541495f83eba2b91aec20a1585b01dd855a1bb6b483b89851e
 AUX pgplot-makemake.patch 7903 SHA256 7431b0820f3e784a56b6b7276af2b0ace7dbdcbc43a9432ddef3c6f6fc9601fc SHA512 c6f775003a89580ac85a10f39e695295d5ca2a68d0a0875cd680fbeafb9e8deb4e9e304cfd10490954f7aa276b8b0e60e8fdd531b5c0e72bfdffd3c461840de1 WHIRLPOOL db094a7787510991041d4c3a9788cbebc677ba195b94abd7040e4528c053044644cae72c01ec86d7249127f3bb44ae2ab51ac35e6770511509e0c43856aa29f3
 AUX pgplot-pgdisp.patch 332 SHA256 3aac6127d35f4039023a13182553b24e1902d6e1b46530fbd68e034357d0b078 SHA512 e8735c108366002da67e45a0d931c6e0dfd14ec3a6b16c6c242e041b4641acdcc257ddd0637a6ef71febf4445319cff0ac5a09acb4a96ee996d7906a27ac75ee WHIRLPOOL 51e4420194bd584897c849fb45c187797b44fdf05fed63c2e1fde8482fc6897a7982e8ee1c01b7a8e3fd9bf677abfeaa81ff6fc528f81ad1b3764e0bcc92bc66
+AUX pgplot-tk86.patch 1864 SHA256 9319b828d32fc8c61d5516655f3fd7904236b616062457b2316882b515d92c05 SHA512 f10d689783a3c56b2ae4544b00ad260cf837b2dba974da5fb501ca6dcd06c05e3e62a7645cb320c318b276e10e86404512c46db514823ab9b19509b5a43e7844 WHIRLPOOL a8eba109e624acd6ff93de88d205a5bdb29222fe97b80e651c06349c026eb5e2896cc0284fc72f2e4962ea575f3d5e46667fd5b6eaf1bba46d98a8b11c8fa0e6
 DIST pgplot522.tar.gz 1197397 SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4 SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f WHIRLPOOL ced06d5fc275530fae0ed839aaaa360a1c560a102126c8cad6936c1d6494403c97489e6f248e28e64ca5cc2950677e5b336861876cc554965bb9c05b1bf0fba9
-EBUILD pgplot-5.2.2-r5.ebuild 4398 SHA256 8a9ea51e1b1b03db4d88e8d074b39dd0c8d0978d770d4318d106d1f9e8a3771a SHA512 6f3cd8ec68ad73ff01b5e515eee8ad206cfc177c62c4c68b3a1d02f2003c15a4acf11861651be7028b36f81c0abb41120eab88c8d8368b630833105e3be865f2 WHIRLPOOL 0be09f0379ca58c0784012cc22e69580b0d76b20feda650fdabf2e5c7dee77b22799fa58062e3d0282cc48f28235a3a9e9529394a4d32e722a55607ee5521687
-MISC ChangeLog 5173 SHA256 c5556202b4883abfd56a851ef350485f94c6dc809559baa7e4cee5bc8c86a3d8 SHA512 af5daa63cdca2d02bf0185da35fdda840a08f333ce7fe09487688b26fbe6346223873b16867140ffef6b3cd8c3bec4e8c103e6263136b780dd771070e13e2a3f WHIRLPOOL 872e65021ca28292416332d5c4adec4ab71aa9105bfe62788ec413353dfdaacdaad19c03b2069e06b5b447142d9c6170ae5a5403cba759618fff1ef84450d2e6
-MISC metadata.xml 519 SHA256 041708fb011c37c9fe581d8c34bab321b432a18fc68c98eb92d69f0231975abd SHA512 d861526195f93bfdaa991aff6ed56951bfaaa04ef11d6cc6478f81b4c53c37b4e4fa9eb5e5ea4adad5e735f57e80d80479c8e9f69df168c203161cf32242ca4b WHIRLPOOL 5ae5bec5ae8be8e766ec585624e1118ddf8be45d20f542d5aeb98774da90805fe8c2f7709f2c55e3cd820aff4e6701eeb15832137bea87a096871e634c8c48d7
+EBUILD pgplot-5.2.2-r5.ebuild 4431 SHA256 1c0aba8627f8dc35c17c57a2e286bf9089ec6eb7b057111b875a5079bf5d03b4 SHA512 0c74dbae896542665bda8c6d57c7ce44dbaae0e6a23ffe6570e2fad32ddeebd05e93c806ae17ed7f9fdd409fdbc7ccb011aa0ae1ebf6f5f443dc01ba37fb2934 WHIRLPOOL 43ee2e54c4ed9ced9cd056b8cae6b3b15e72868b3eebd3ed62db566e398d32490cb667b57cbeccfe10ba078adf106b91f6c8cadcada46b484804dfa7cb06e9e4
+MISC ChangeLog 5349 SHA256 ccf9ffd201f721cfa9c2329be9319a7c4765f7e318a35f415d9539e07a05dc18 SHA512 ac1ccfdff24ebd5e867a06fb18a4be1f340dbe05122bf52b48096dbe8e04ceda5cb0397c9aeda004bd80aa415ba1fcdecd986ecda5247174579e234d88cd76f7 WHIRLPOOL c3be8602ac97c965044aa529307dfce00c7df5deba7f2850aee832abe416d49447751d8d47bbde73a8e072b656f5fe94ff6a7e7880d21ddcd3b58cefea61e022
+MISC metadata.xml 521 SHA256 21e24751d6c7f22ebd1fadadf9968876fa6fde18589ce1d5173d5fd96e318cf2 SHA512 f369976dd173c5f543b4ded4d07dfc99cd4798fec327a98cd4084b1cc9f6f1052ce764d0dc4a2fd6fde167e535c89d75019a5c2a26460eabcb947d5d04c2fd5c WHIRLPOOL bf40389340b934fd18d14ca5de16c8b75182499ef354fe0c8a09a54deb06795701a6e21b95b4b0e73eda7c6806f34d0fe8f07d1b3b3db6c0cda054002607de23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDyrFgACgkQkKaRLQcq0GIEcgCgn1LUrZhgfKiZq5GeOEba8QKc
-cy0AnAuirmpkGiMVuvPHmDxYN/wnOnlZ
-=2gcy
+iEYEAREKAAYFAlD3DwcACgkQgAnW8HDreRbPagCeOPgaKYCeLuJkNWgTQQq6hjH2
+0yAAn3YkqBYz6QUMbaEFUwZRRXFF7Zcp
+=b8Y1
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/pgplot/files/pgplot-tk86.patch b/sci-libs/pgplot/files/pgplot-tk86.patch
new file mode 100644
index 000000000000..bc0023eb90d2
--- /dev/null
+++ b/sci-libs/pgplot/files/pgplot-tk86.patch
@@ -0,0 +1,47 @@
+--- drivers/xtk/tkpgplot.c.ORIG	2000-12-13 03:16:28.000000000 +0100
++++ drivers/xtk/tkpgplot.c	2013-01-15 11:02:27.221231471 +0100
+@@ -417,7 +417,7 @@
+ /*
+  * If Tk_Init() hasn't been called, then there won't be a main window
+  * yet. In such cases, Tk_MainWindow() places a suitable error message
+- * in interp->result.
++ * in Tcl_GetStringResult(interp).
+  */
+   if(!main_w)
+     return TCL_ERROR;
+@@ -2136,7 +2136,7 @@
+     tkpg->border = bd;
+     tkpg_draw_3d_border(tkpg);
+   } else {
+-    fprintf(stderr, "Tk_Get3DBorder failed: %s\n", tkpg->interp->result);
++    fprintf(stderr, "Tk_Get3DBorder failed: %s\n", Tcl_GetStringResult(tkpg->interp));
+   };
+ }
+ 
+@@ -2261,7 +2261,7 @@
+  *  argv            char ** The array of 'argc' configuration arguments.
+  * Output:
+  *  return           int    TCL_ERROR and the context of the error
+- *                          is recorded in interp->result.
++ *                          is recorded in Tcl_GetStringResult(result).
+  */
+ static int tkpg_scrollbar_error(TkPgplot *tkpg, Tcl_Interp *interp, 
+ 			       char *widget, char *view, int argc,
+@@ -2586,7 +2586,7 @@
+  * Output:
+  *  return   Tk_Window    The top-level window of the path, or NULL if
+  *                        it doesn't exist. In the latter case an error
+- *                        message will have been appended to interp->result.
++ *                        message will have been appended to Tcl_GetStringResult(interp).
+  */
+ static Tk_Window tkpg_toplevel_of_path(Tcl_Interp *interp, Tk_Window main_w,
+ 				       char *path)
+@@ -2630,7 +2630,7 @@
+   free(first);
+ /*
+  * If the window doesn't exist, Tk_NameToWindow() is documented to place
+- * an error message in interp->result, so just return the error condition.
++ * an error message in Tcl_GetStringResult(interp), so just return the error condition.
+  */
+   if(!w)
+     return NULL;
diff --git a/sci-libs/pgplot/metadata.xml b/sci-libs/pgplot/metadata.xml
index 05a8a5d33331..7afe58a52a3f 100644
--- a/sci-libs/pgplot/metadata.xml
+++ b/sci-libs/pgplot/metadata.xml
@@ -1,8 +1,8 @@
 <?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">
   PGPLOT is a Fortran subroutine package for drawing graphs on a variety
   of display devices. The CPGPLOT library adds an intermediate level of
   wrapper functions between C programs and the PGPLOT library. These
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild
index ae93a851d83e..0287f515bab9 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild,v 1.4 2013/01/13 12:40:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r5.ebuild,v 1.5 2013/01/16 20:35:15 jlec Exp $
 
 EAPI=4
 
@@ -34,7 +34,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-makemake.patch \
 		"${FILESDIR}"/${PN}-compile-setup.patch \
 		"${FILESDIR}"/${PN}-headers.patch \
-		"${FILESDIR}"/${PN}-libpng15.patch
+		"${FILESDIR}"/${PN}-libpng15.patch \
+		"${FILESDIR}"/${PN}-tk86.patch
 
 	# gfortran < 4.3 does not compile gif, pp and wd drivers
 	if [[ $(tc-getFC) == *gfortran* ]] &&