sci-libs/plplot: Add fix for tk-8.6, thanks Helmut Jarausch preparing the patch, #451294

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 653 insertions, 12 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index db2621264795..0098b8d81d3c 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/plplot
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.44 2012/10/16 20:22:07 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.45 2013/01/13 12:46:02 jlec Exp $
+
+  13 Jan 2013; Justin Lecher <jlec@gentoo.org> plplot-5.9.9-r1.ebuild,
+  +files/plplot-5.9.9-tk86.patch, metadata.xml:
+  Add fix for tk-8.6, thanks Helmut Jarausch preparing the patch, #451294
 
   16 Oct 2012; Justin Lecher <jlec@gentoo.org> plplot-5.9.9-r1.ebuild,
   metadata.xml:
diff --git a/sci-libs/plplot/files/plplot-5.9.9-tk86.patch b/sci-libs/plplot/files/plplot-5.9.9-tk86.patch
new file mode 100644
index 000000000000..5d792070b4b2
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.9-tk86.patch
@@ -0,0 +1,636 @@
+--- bindings/tk-x-plat/plplotter.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ bindings/tk-x-plat/plplotter.c	2013-01-12 16:42:48.930183645 +0100
+@@ -463,7 +463,7 @@
+     PlPlotterFirstInit( (ClientData) plPlotterPtr );
+     Tk_GeometryRequest( plPlotterPtr->tkwin, 200, 200 );
+ 
+-    interp->result = Tk_PathName( plPlotterPtr->tkwin );
++    Tcl_SetResult(interp,(char*)Tk_PathName(plPlotterPtr->tkwin) ,TCL_VOLATILE);
+ 
+     return TCL_OK;
+ }
+@@ -2018,7 +2018,7 @@
+ //
+ // Results:
+ //      The return value is a standard Tcl result.  If TCL_ERROR is
+-//      returned, then interp->result contains an error message.
++//      returned, then Tcl_GetStringResult(interp) contains an error message.
+ //
+ // Side effects:
+ //      Configuration information, such as text string, colors, font, etc.
+@@ -2469,7 +2469,7 @@
+         plr->at_bop = 0;
+         if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
+             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-                plPlotterPtr->bopCmd, interp->result );
++                plPlotterPtr->bopCmd, Tcl_GetStringResult(interp) );
+     }
+ 
+ // Signal eop if necessary
+@@ -2479,7 +2479,7 @@
+         plr->at_eop = 0;
+         if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
+             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-                plPlotterPtr->eopCmd, interp->result );
++                plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
+     }
+ 
+     return result;
+@@ -2491,7 +2491,7 @@
+     {
+         if ( Tcl_Eval( interp, plPlotterPtr->eopCmd ) != TCL_OK )
+             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-                plPlotterPtr->eopCmd, interp->result );
++                plPlotterPtr->eopCmd, Tcl_GetStringResult(interp) );
+     }
+ }
+ 
+@@ -2501,7 +2501,7 @@
+     {
+         if ( Tcl_Eval( interp, plPlotterPtr->bopCmd ) != TCL_OK )
+             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-                plPlotterPtr->bopCmd, interp->result );
++                plPlotterPtr->bopCmd, Tcl_GetStringResult(interp ) );
+     }
+ }
+ 
+@@ -2536,7 +2536,7 @@
+         {
+         #endif
+             Tcl_AppendResult( interp, "Packet receive failed:\n\t %s\n",
+-                interp->result, (char *) NULL );
++                Tcl_GetStringResult(interp), (char *) NULL );
+             return TCL_ERROR;
+         }
+ 
+@@ -3082,7 +3082,7 @@
+ 
+     if ( argc == 0 )
+     {
+-        interp->result = "report what?";
++        Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
+         return TCL_ERROR;
+     }
+ 
+@@ -3093,7 +3093,7 @@
+ 
+         if ( argc != 3 )
+         {
+-            interp->result = "Wrong # of args: report wc x y";
++            Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
+             return TCL_ERROR;
+         }
+ 
+@@ -3107,15 +3107,15 @@
+ 
+         if ( plTranslateCursor( gin ) )
+         {
+-            sprintf( interp->result, "%f %f", gin->wX, gin->wY );
++            sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
+             return TCL_OK;
+         }
+ 
+-        interp->result = "Cannot locate";
++        Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
+         return TCL_OK;
+     }
+ 
+-    interp->result = "nonsensical request.";
++    Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
+     return TCL_ERROR;
+ }
+ 
+--- bindings/tk/tkshell.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ bindings/tk/tkshell.c	2013-01-12 16:46:41.288192370 +0100
+@@ -115,7 +115,7 @@
+         if ( Tcl_ExprBoolean( interp, argv[1], &result ) )
+         {
+             fprintf( stderr, "wait_until command \"%s\" failed:\n\t %s\n",
+-                argv[1], interp->result );
++                argv[1], Tcl_GetStringResult(interp) );
+             break;
+         }
+         if ( result )
+--- bindings/tk/plserver.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ bindings/tk/plserver.c	2013-01-12 16:48:21.973196151 +0100
+@@ -126,11 +126,11 @@
+     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv,
+              argTable, TK_ARGV_NO_DEFAULTS ) != TCL_OK )
+     {
+-        fprintf( stderr, "\n(plserver) %s\n\n", interp->result );
++        fprintf( stderr, "\n(plserver) %s\n\n", Tcl_GetStringResult(interp) );
+         fprintf( stderr, "\
+ The client_<xxx> and -child options should not be used except via the\n\
+ PLplot/Tk driver.\n\n(wish) " );
+-        if ( strncmp( interp->result, helpmsg, strlen( helpmsg ) ) )
++        if ( strncmp( Tcl_GetStringResult(interp), helpmsg, strlen( helpmsg ) ) )
+             exit( 1 );
+     }
+ 
+@@ -158,7 +158,7 @@
+ //
+ // Results:
+ //	Returns a standard Tcl completion code, and leaves an error
+-//	message in interp->result if an error occurs.
++//	message in Tcl_GetStringResult(interp) if an error occurs.
+ //
+ // Side effects:
+ //	Depends on the startup script.
+@@ -257,8 +257,8 @@
+ 
+ // Print error message if one given
+ 
+-    if ( interp->result != NULL && interp->result[0] != '\0' )
+-        fprintf( stderr, "%s\n", interp->result );
++    if ( Tcl_GetStringResult(interp) != NULL && Tcl_GetStringResult(interp)[0] != '\0' )
++        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+ 
+ // Best to check the syntax before proceeding
+ 
+--- bindings/tk/tkMain.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ bindings/tk/tkMain.c	2013-01-13 08:19:02.722238116 +0100
+@@ -85,17 +85,6 @@
+ 
+ // From tclIntDecls.h
+ 
+-#ifndef Tcl_Import_TCL_DECLARED
+-EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
+-                                     Tcl_Namespace * nsPtr, char * pattern,
+-                                     int allowOverwrite ) );
+-#endif
+-
+-#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE
+-EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( (
+-                                                               Tcl_Interp * interp ) );
+-#endif
+-
+ //
+ // Declarations for various library procedures and variables (don't want
+ // to include tkInt.h or tkConfig.h here, because people might copy this
+@@ -180,7 +180,7 @@
+ pltkMain( int argc, const char **argv, char *RcFileName,
+           int ( *AppInit )( Tcl_Interp *interp ) )
+ {
+-    char       *args, *msg;
++    char       *args; const char *msg;
+     const char *p;
+     char       buf[20];
+     int        code;
+@@ -202,7 +202,7 @@
+     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
+          != TCL_OK )
+     {
+-        fprintf( stderr, "%s\n", interp->result );
++        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+         exit( 1 );
+     }
+     if ( name == NULL )
+@@ -331,7 +331,7 @@
+ 
+     if ( ( *AppInit )( interp ) != TCL_OK )
+     {
+-        fprintf( stderr, "(*AppInit) failed: %s\n", interp->result );
++        fprintf( stderr, "(*AppInit) failed: %s\n", Tcl_GetStringResult(interp) );
+     }
+ 
+     //
+@@ -343,7 +343,7 @@
+         code = Tcl_VarEval( interp, "wm geometry . ", geometry, (char *) NULL );
+         if ( code != TCL_OK )
+         {
+-            fprintf( stderr, "%s\n", interp->result );
++            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+         }
+     }
+ 
+@@ -393,7 +393,7 @@
+             fullName = Tcl_TildeSubst( interp, RcFileName, &buffer );
+             if ( fullName == NULL )
+             {
+-                fprintf( stderr, "%s\n", interp->result );
++                fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+             }
+             else
+             {
+@@ -403,7 +403,7 @@
+                     code = Tcl_EvalFile( interp, fullName );
+                     if ( code != TCL_OK )
+                     {
+-                        fprintf( stderr, "%s\n", interp->result );
++                        fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+                     }
+                     fclose( f );
+                 }
+@@ -442,7 +442,7 @@
+     msg = (char *) Tcl_GetVar( interp, "errorInfo", TCL_GLOBAL_ONLY );
+     if ( msg == NULL )
+     {
+-        msg = interp->result;
++        msg = Tcl_GetStringResult(interp);
+     }
+     fprintf( stderr, "%s\n", msg );
+     Tcl_Eval( interp, errorExitCmd );
+@@ -535,11 +535,11 @@
+     Tk_CreateFileHandler( 0, TK_READABLE, StdinProc, (ClientData) 0 );
+ #endif
+     Tcl_DStringFree( &command );
+-    if ( *interp->result != 0 )
++    if ( Tcl_GetStringResult(interp) )
+     {
+         if ( ( code != TCL_OK ) || ( tty ) )
+         {
+-            printf( "%s\n", interp->result );
++            printf( "%s\n", Tcl_GetStringResult(interp) );
+         }
+     }
+ 
+@@ -599,7 +599,7 @@
+         {
+             Tcl_AddErrorInfo( interp,
+                 "\n    (script that generates prompt)" );
+-            fprintf( stderr, "%s\n", interp->result );
++            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+             goto defaultPrompt;
+         }
+     }
+--- bindings/tk/plframe.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ bindings/tk/plframe.c	2013-01-13 08:22:04.594239896 +0100
+@@ -484,7 +484,7 @@
+         Tk_DestroyWindow( plFramePtr->tkwin );
+         return TCL_ERROR;
+     }
+-    interp->result = Tk_PathName( plFramePtr->tkwin );
++    Tcl_SetResult(interp,(char*)Tk_PathName( plFramePtr->tkwin) ,TCL_VOLATILE);
+ 
+     return TCL_OK;
+ }
+@@ -616,7 +616,7 @@
+             {
+                 bcb.cmd = PLESC_DOUBLEBUFFERING_QUERY;
+                 pl_cmd( PLESC_DOUBLEBUFFERING, &bcb );
+-                sprintf( interp->result, "%d", bcb.result );
++                sprintf( Tcl_GetStringResult(interp), "%d", bcb.result );
+             }
+         }
+ 
+@@ -2215,7 +2215,7 @@
+ //
+ // Results:
+ //	The return value is a standard Tcl result.  If TCL_ERROR is
+-//	returned, then interp->result contains an error message.
++//	returned, then Tcl_GetStringResult(interp) contains an error message.
+ //
+ // Side effects:
+ //	Configuration information, such as text string, colors, font, etc.
+@@ -2675,7 +2675,7 @@
+         plr->at_bop = 0;
+         if ( Tcl_Eval( interp, plFramePtr->bopCmd ) != TCL_OK )
+             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-                plFramePtr->bopCmd, interp->result );
++                plFramePtr->bopCmd, Tcl_GetStringResult(interp) );
+     }
+ 
+ // Signal eop if necessary
+@@ -2685,7 +2685,7 @@
+         plr->at_eop = 0;
+         if ( Tcl_Eval( interp, plFramePtr->eopCmd ) != TCL_OK )
+             fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-                plFramePtr->eopCmd, interp->result );
++                plFramePtr->eopCmd, Tcl_GetStringResult(interp) );
+     }
+ 
+     return result;
+@@ -3275,7 +3275,7 @@
+ 
+     if ( argc == 0 )
+     {
+-        interp->result = "report what?";
++        Tcl_SetResult(interp,(char*)"report what?",TCL_VOLATILE);
+         return TCL_ERROR;
+     }
+ 
+@@ -3286,7 +3286,7 @@
+ 
+         if ( argc != 3 )
+         {
+-            interp->result = "Wrong # of args: report wc x y";
++            Tcl_SetResult(interp,(char*)"Wrong # of args: report wc x y",TCL_VOLATILE);
+             return TCL_ERROR;
+         }
+ 
+@@ -3300,15 +3300,15 @@
+ 
+         if ( plTranslateCursor( gin ) )
+         {
+-            sprintf( interp->result, "%f %f", gin->wX, gin->wY );
++            sprintf( Tcl_GetStringResult(interp), "%f %f", gin->wX, gin->wY );
+             return TCL_OK;
+         }
+ 
+-        interp->result = "Cannot locate";
++        Tcl_SetResult(interp,(char*)"Cannot locate",TCL_VOLATILE);
+         return TCL_OK;
+     }
+ 
+-    interp->result = "nonsensical request.";
++    Tcl_SetResult(interp,(char*)"nonsensical request.",TCL_VOLATILE);
+     return TCL_ERROR;
+ }
+ 
+@@ -3324,7 +3324,7 @@
+ 
+     if ( Tcl_Eval( plFramePtr->interp, plFramePtr->bopCmd ) != TCL_OK )
+         fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-            plFramePtr->bopCmd, plFramePtr->interp->result );
++            plFramePtr->bopCmd, Tcl_GetStringResult(plFramePtr->interp) );
+ }
+ 
+ //--------------------------------------------------------------------------
+@@ -3339,7 +3339,7 @@
+ 
+     if ( Tcl_Eval( plFramePtr->interp, plFramePtr->eopCmd ) != TCL_OK )
+         fprintf( stderr, "Command \"%s\" failed:\n\t %s\n",
+-            plFramePtr->eopCmd, plFramePtr->interp->result );
++            plFramePtr->eopCmd, Tcl_GetStringResult(plFramePtr->interp) );
+ }
+ 
+ //--------------------------------------------------------------------------
+--- utils/pltcl.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ utils/pltcl.c	2013-01-13 08:22:33.877240182 +0100
+@@ -119,7 +119,7 @@
+ //
+ // Results:
+ //	Returns a standard Tcl completion code, and leaves an error
+-//	message in interp->result if an error occurs.
++//	message in Tcl_GetStringResult(interp) if an error occurs.
+ //
+ // Side effects:
+ //	Depends on the startup script.
+--- doc/docbook/src/plplotdoc.info-1.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ doc/docbook/src/plplotdoc.info-1	2013-01-13 08:23:13.171240567 +0100
+@@ -6435,7 +6435,7 @@
+      	if (pm->fdata[i] > max)
+      	max = pm->fdata[i];
+ 
+-     	sprintf( interp->result, "%f", max );
++     	sprintf( Tcl_GetStringResult(interp), "%f", max );
+      	return TCL_OK;
+      	}
+ 
+@@ -6448,7 +6448,7 @@
+      	if (pm->fdata[i] < min)
+      	min = pm->fdata[i];
+ 
+-     	sprintf( interp->result, "%f", min );
++     	sprintf( Tcl_GetStringResult(interp), "%f", min );
+      	return TCL_OK;
+      	}
+ 
+--- doc/docbook/src/plplotdoc.texi.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ doc/docbook/src/plplotdoc.texi	2013-01-13 08:23:38.331240813 +0100
+@@ -6722,7 +6722,7 @@
+ 	if (pm->fdata[i] > max)
+ 	max = pm->fdata[i];
+ 
+-	sprintf( interp->result, "%f", max );
++	sprintf( Tcl_GetStringResult(interp), "%f", max );
+ 	return TCL_OK;
+ 	@}
+ 
+@@ -6735,7 +6735,7 @@
+ 	if (pm->fdata[i] < min)
+ 	min = pm->fdata[i];
+ 
+-	sprintf( interp->result, "%f", min );
++	sprintf( Tcl_GetStringResult(interp), "%f", min );
+ 	return TCL_OK;
+ 	@}
+       
+--- doc/docbook/src/tcl.xml.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ doc/docbook/src/tcl.xml	2013-01-13 08:24:03.573241060 +0100
+@@ -576,7 +576,7 @@
+ 	if (pm->fdata[i] > max)
+ 	max = pm->fdata[i];
+ 
+-	sprintf( interp->result, "%f", max );
++	sprintf( Tcl_GetStringResult(interp), "%f", max );
+ 	return TCL_OK;
+ 	}
+ 
+@@ -589,7 +589,7 @@
+ 	if (pm->fdata[i] &lt; min)
+ 	min = pm->fdata[i];
+ 
+-	sprintf( interp->result, "%f", min );
++	sprintf( Tcl_GetStringResult(interp), "%f", min );
+ 	return TCL_OK;
+ 	}
+       </programlisting>
+--- drivers/ntk.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ drivers/ntk.c	2013-01-13 08:24:39.460241411 +0100
+@@ -115,7 +115,7 @@
+         //
+         sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
+         if ( Tcl_Eval( interp, scmd ) != TCL_OK )
+-            fprintf( stderr, "%s\n", interp->result );
++            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+     }
+ }
+ 
+@@ -264,7 +264,7 @@
+         sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
+         if ( Tcl_Eval( interp, cmd ) != TCL_OK )
+         {
+-            fprintf( stderr, "%s\n", interp->result );
++            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
+             plexit( "No such tk server." );
+         }
+     }
+@@ -301,7 +301,7 @@
+     // Set up device parameters
+ 
+     Tcl_Eval( interp, "tk scaling" ); // pixels per mm
+-    ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. );
++    ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
+     plP_setpxl( ppm, ppm );
+     plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
+ }
+@@ -371,11 +371,11 @@
+         {
+             tk_cmd( "update" );
+             tk_cmd( "info exists keypress" );
+-            sscanf( interp->result, "%d", &st );
++            sscanf( Tcl_GetStringResult(interp), "%d", &st );
+         }
+ 
+         tk_cmd( "set keypress" );
+-        sscanf( interp->result, "%d", &key );
++        sscanf( Tcl_GetStringResult(interp), "%d", &key );
+ //fprintf(stderr,"\n%d\n", key);fflush(stderr);
+         tk_cmd( "unset keypress" );
+         st = 0;
+@@ -433,7 +433,7 @@
+         {
+             tk_cmd( "update" );
+             tk_cmd( "winfo exists $plf.f2.c$ccanv" );
+-            sscanf( interp->result, "%d", &st );
++            sscanf( Tcl_GetStringResult(interp), "%d", &st );
+         }
+         st = 0;
+         // this give a "Segmentation fault", even after checking for the canvas!
+@@ -450,16 +450,16 @@
+     {
+         tk_cmd( "update" );
+         tk_cmd( "info exists xloc" );
+-        sscanf( interp->result, "%d", &st );
++        sscanf( Tcl_GetStringResult(interp), "%d", &st );
+     }
+     tk_cmd( "set xloc" );
+-    sscanf( interp->result, "%d", &gin.pX );
++    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
+     tk_cmd( "set yloc" );
+-    sscanf( interp->result, "%d", &gin.pY );
++    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
+     tk_cmd( "set bloc" );
+-    sscanf( interp->result, "%d", &gin.button );
++    sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
+     tk_cmd( "set sloc" );
+-    sscanf( interp->result, "%d", &gin.state );
++    sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
+ 
+     gin.dX = (PLFLT) gin.pX / xmax;
+     gin.dY = 1. - (PLFLT) gin.pY / ymax;
+--- drivers/tk.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ drivers/tk.c	2013-01-13 08:25:10.959241719 +0100
+@@ -764,7 +764,7 @@
+ 
+     if ( Tcl_Init( dev->interp ) != TCL_OK )
+     {
+-        fprintf( stderr, "%s\n", dev->interp->result );
++        fprintf( stderr, "%s\n", Tcl_GetStringResult(dev->interp) );
+         abort_session( pls, "Unable to initialize Tcl" );
+     }
+ 
+@@ -1568,7 +1568,7 @@
+                  0, 1, ( ClientData ) & iodev->file ) != TCL_OK )
+         {
+             fprintf( stderr, "Cannot get file info:\n\t %s\n",
+-                dev->interp->result );
++                Tcl_GetStringResult(dev->interp) );
+             abort_session( pls, "" );
+         }
+         iodev->fd = fileno( iodev->file );
+@@ -1673,7 +1673,7 @@
+         if ( pl_PacketSend( dev->interp, dev->iodev, pls->pdfs ) )
+         {
+             fprintf( stderr, "Packet send failed:\n\t %s\n",
+-                dev->interp->result );
++                Tcl_GetStringResult(dev->interp) );
+             abort_session( pls, "" );
+         }
+         pdfs->bp = 0;
+@@ -2131,7 +2131,7 @@
+ 
+     if ( Tk_Init( interp ) )
+     {
+-        fprintf( stderr, "tk_init:%s\n", interp->result );
++        fprintf( stderr, "tk_init:%s\n", Tcl_GetStringResult(interp) );
+         return 1;
+     }
+ 
+@@ -2165,7 +2165,7 @@
+         if ( Tcl_ExprBoolean( dev->interp, dev->cmdbuf, &result ) )
+         {
+             fprintf( stderr, "tk_wait command \"%s\" failed:\n\t %s\n",
+-                cmd, dev->interp->result );
++                cmd, Tcl_GetStringResult(dev->interp) );
+             break;
+         }
+         if ( result )
+@@ -2225,7 +2225,7 @@
+     if ( result != TCL_OK )
+     {
+         fprintf( stderr, "Server command \"%s\" failed:\n\t %s\n",
+-            cmd, dev->interp->result );
++            cmd, Tcl_GetStringResult(dev->interp) );
+         abort_session( pls, "" );
+     }
+ }
+@@ -2247,7 +2247,7 @@
+     if ( Tcl_VarEval( dev->interp, cmd, (char **) NULL ) != TCL_OK )
+     {
+         fprintf( stderr, "TCL command \"%s\" failed:\n\t %s\n",
+-            cmd, dev->interp->result );
++            cmd, Tcl_GetStringResult(dev->interp) );
+         abort_session( pls, "" );
+     }
+ }
+--- examples/tk/xtk01.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ examples/tk/xtk01.c	2013-01-13 08:25:33.757241943 +0100
+@@ -53,7 +53,7 @@
+ //
+ // Results:
+ //	Returns a standard Tcl completion code, and leaves an error
+-//	message in interp->result if an error occurs.
++//	message in Tcl_GetStringResult(interp) if an error occurs.
+ //
+ // Side effects:
+ //	Depends on the startup script.
+--- examples/tk/xtk02.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ examples/tk/xtk02.c	2013-01-13 08:26:06.804242266 +0100
+@@ -49,7 +49,7 @@
+         pm->fdata[i] = y;
+     }
+ 
+-    interp->result = "Things are cool in gumbyville.";
++    Tcl_SetResult(interp,(char*)"Things are cool in gumbyville.",TCL_VOLATILE);
+     return TCL_OK;
+ }
+ 
+@@ -82,7 +82,7 @@
+ //
+ // Results:
+ //	Returns a standard Tcl completion code, and leaves an error
+-//	message in interp->result if an error occurs.
++//	message in Tcl_GetStringResult(interp) if an error occurs.
+ //
+ // Side effects:
+ //	Depends on the startup script.
+--- examples/tk/xtk04.c.ORIG	2011-10-13 02:43:01.000000000 +0200
++++ examples/tk/xtk04.c	2013-01-13 08:26:38.853242580 +0100
+@@ -35,7 +35,7 @@
+         if ( pm->fdata[i] > max )
+             max = pm->fdata[i];
+ 
+-    sprintf( interp->result, "%f", max );
++    sprintf( Tcl_GetStringResult(interp), "%f", max );
+     return TCL_OK;
+ }
+ 
+@@ -48,7 +48,7 @@
+         if ( pm->fdata[i] < min )
+             min = pm->fdata[i];
+ 
+-    sprintf( interp->result, "%f", min );
++    sprintf( Tcl_GetStringResult(interp), "%f", min );
+     return TCL_OK;
+ }
+ 
+@@ -80,7 +80,7 @@
+ //
+ // Results:
+ //	Returns a standard Tcl completion code, and leaves an error
+-//	message in interp->result if an error occurs.
++//	message in Tcl_GetStringResult(interp) if an error occurs.
+ //
+ // Side effects:
+ //	Depends on the startup script.
+@@ -158,7 +158,7 @@
+ 
+     if ( pm->dim != 2 )
+     {
+-        interp->result = "must use 2-d matrix.";
++        Tcl_SetResult(interp,(char*)"must use 2-d matrix.",TCL_VOLATILE);
+         return TCL_ERROR;
+     }
+ 
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index fdb47c31f02e..e8c81d6b8fb7 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/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>
+  <herd>sci</herd>
+  <longdescription>
   PLplot is a library of functions that are useful for making scientific
   plots. It can be used from within compiled languages such as C, C++,
   FORTRAN and Java, as well as interactively from interpreted languages such
@@ -15,10 +15,10 @@
   support for extended characters inculding the Greek alphabet and a host of
   mathematical symbols.
 </longdescription>
-	<use>
-		<flag name="ada">Add bindings for the ADA programming language</flag>
-		<flag name="dynamic">Build with dynamic drivers</flag>
-		<flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
-		<flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
-	</use>
+  <use>
+    <flag name="ada">Add bindings for the ADA programming language</flag>
+    <flag name="dynamic">Build with dynamic drivers</flag>
+    <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
+    <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/plplot/plplot-5.9.9-r1.ebuild b/sci-libs/plplot/plplot-5.9.9-r1.ebuild
index 6a43235ae1bc..0f57b50e1314 100644
--- a/sci-libs/plplot/plplot-5.9.9-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.9.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9-r1.ebuild,v 1.6 2012/10/16 20:22:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9-r1.ebuild,v 1.7 2013/01/13 12:46:02 jlec Exp $
 
 EAPI=4
 
@@ -68,6 +68,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-tk86.patch
 	# path for python independent of python version
 	epatch "${FILESDIR}"/${PN}-5.9.6-python.patch
 	# test with pdf assumes a modified bundled libharu