sys-cluster/torque: Add fix for tcl-8.6

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

3 files changed, 101 insertions, 2 deletions

diff --git a/sys-cluster/torque/ChangeLog b/sys-cluster/torque/ChangeLog
index e6ca1f0c5797..aec4beb69228 100644
--- a/sys-cluster/torque/ChangeLog
+++ b/sys-cluster/torque/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/torque
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.154 2013/06/01 19:49:33 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/ChangeLog,v 1.155 2013/06/12 06:53:19 jlec Exp $
+
+  12 Jun 2013; Justin Lecher <jlec@gentoo.org> torque-4.1.5.1.ebuild,
+  +files/torque-4.1.5.1-tcl8.6.patch:
+  Add fix for tcl-8.6
 
   01 Jun 2013; Justin Bronder <jsbronder@gentoo.org> torque-2.3.13.ebuild,
   torque-2.4.16.ebuild, -torque-2.5.9-r1.ebuild, torque-2.5.12.ebuild,
diff --git a/sys-cluster/torque/files/torque-4.1.5.1-tcl8.6.patch b/sys-cluster/torque/files/torque-4.1.5.1-tcl8.6.patch
new file mode 100644
index 000000000000..2e8a8ed8f359
--- /dev/null
+++ b/sys-cluster/torque/files/torque-4.1.5.1-tcl8.6.patch
@@ -0,0 +1,93 @@
+ src/cmds/qstat.c                | 18 ++++++++++++++++++
+ src/scheduler.tcl/pbs_tclWrap.c | 13 +++++++++++++
+ 2 files changed, 31 insertions(+)
+
+diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c
+index 4e1c6b6..07ed448 100644
+--- a/src/cmds/qstat.c
++++ b/src/cmds/qstat.c
+@@ -1795,8 +1795,13 @@ tcl_init(void)
+ 
+   if (Tcl_Init(interp) == TCL_ERROR)
+     {
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+     fprintf(stderr, "Tcl_Init error: %s",
+             interp->result);
++#else
++    fprintf(stderr, "Tcl_Init error: %s",
++            Tcl_GetStringResult(interp));
++#endif
+     }
+ 
+ #if TCLX
+@@ -1808,8 +1813,14 @@ tcl_init(void)
+   if (Tclx_Init(interp) == TCL_ERROR)
+     {
+ #endif
++
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+     fprintf(stderr, "Tclx_Init error: %s",
+             interp->result);
++#else
++    fprintf(stderr, "Tclx_Init error: %s",
++            Tcl_GetStringResult(interp));
++#endif
+     }
+ 
+ #endif /* TCLX */
+@@ -1920,10 +1931,17 @@ void tcl_run(
+     trace = (char *)Tcl_GetVar(interp, "errorInfo", 0);
+ 
+     if (trace == NULL)
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+       trace = interp->result;
+ 
+     fprintf(stderr, "%s: TCL error @ line %d: %s\n",
+             script, interp->errorLine, trace);
++#else
++      trace = Tcl_GetStringResult(interp);
++
++    fprintf(stderr, "%s: TCL error @ line %d: %s\n",
++            script, Tcl_GetErrorLine(interp), trace);
++#endif
+     }
+ 
+   Tcl_DeleteInterp(interp);
+diff --git a/src/scheduler.tcl/pbs_tclWrap.c b/src/scheduler.tcl/pbs_tclWrap.c
+index a85e8ff..46c1012 100644
+--- a/src/scheduler.tcl/pbs_tclWrap.c
++++ b/src/scheduler.tcl/pbs_tclWrap.c
+@@ -900,8 +900,13 @@ char *argv[];
+ 
+   if (argc != 2)
+     {
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+     sprintf(interp->result,
+             "%s: wrong # args: job_id", argv[0]);
++#else
++    sprintf(Tcl_GetStringResult(interp),
++            "%s: wrong # args: job_id", argv[0]);
++#endif
+     return TCL_ERROR;
+     }
+ 
+@@ -912,11 +917,19 @@ char *argv[];
+     return TCL_OK;
+     }
+ 
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+   interp->result = "0";
++#else
++  Tcl_SetResult(interp, "0", TCL_STATIC);
++#endif
+ 
+   if (pbs_rerunjob_err(connector, argv[1], extend, &local_errno))
+     {
++#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
+     interp->result = "-1";
++#else
++    Tcl_SetResult(interp, "-1", TCL_STATIC);
++#endif
+     msg = pbs_geterrmsg(connector);
+     sprintf(log_buffer, "%s (%d)", msg ? msg : fail, local_errno);
+     log_err(-1, argv[0], log_buffer);
diff --git a/sys-cluster/torque/torque-4.1.5.1.ebuild b/sys-cluster/torque/torque-4.1.5.1.ebuild
index bb5f4ace0e8f..487efd9dd472 100644
--- a/sys-cluster/torque/torque-4.1.5.1.ebuild
+++ b/sys-cluster/torque/torque-4.1.5.1.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/sys-cluster/torque/torque-4.1.5.1.ebuild,v 1.3 2013/06/01 19:49:33 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/torque/torque-4.1.5.1.ebuild,v 1.4 2013/06/12 06:53:19 jlec Exp $
 
 EAPI=2
 inherit flag-o-matic eutils linux-info
@@ -73,6 +73,8 @@ src_prepare() {
 	# We install to a valid location, no need to muck with ld.so.conf
 	# --without-loadlibfile is supposed to do this for us...
 	sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
+
+	epatch "${FILESDIR}"/${P}-tcl8.6.patch
 }
 
 src_configure() {