sci-libs/vtk: Better fix for tcl support

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 54 insertions, 8 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 7cba1ea58009..bcb146e1da6b 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.103 2013/01/14 10:10:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.104 2013/01/15 13:57:49 jlec Exp $
+
+  15 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild,
+  +files/vtk-5.10.1-tcl8.6.patch:
+  Better fix for tcl support
 
   14 Jan 2013; Justin Lecher <jlec@gentoo.org> vtk-5.10.1.ebuild:
   Solve problems with USE=examples, #447146
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 57451dd4ff9d..4dbaa613ce28 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vtk-5.10.1-tcl8.6.patch 1855 SHA256 29cda5a7f2fc0e4ec466260681e3e69e4437a3d4ba9fcb52481ef78266722e7c SHA512 bbbfa49d52bbee89b0370a44b9b59d63dda592239475222a47bee6c530787bcc21cb839701328035bdc1d36bc6ae3e22cccdd1e5da67968947deb8e68a917aa0 WHIRLPOOL c13600ac044037399cd778d6c5c4262f094bf4a840674a5486a3b274968d12ef1b30eb4df1034f0fefea7ffeadd005b621dd1123f815040558a8358094f28272
 AUX vtk-5.2.0-tcl-install.patch 580 SHA256 7373a02d9408f59546486b50efb8934fc2fa14067928e27bd46b2691b80d2fc6 SHA512 4accf428e5eecb785efd585ee3a8f45a81550b28450b0e3047be49548ad0336cfbcd5a09ccb05009603303db2c053b656b395f1cb1799c66c14f7bcf485802b7 WHIRLPOOL fd1abff4b81a8de87733b213b9bf984f95068ab4dd970dd1bb6897d10bf37fa9cb270fbc7d526949c7919e21b1c821da8097367c07c72d0b0ac8ce34112b3b56
 AUX vtk-5.4.2-boost-property_map.patch 7739 SHA256 5cbedc7afde2a3515a0bf580927c6a3a0d5b10efa39e649610b0f00a881a4119 SHA512 2e18fc8149f039db51af90e77461e9c6e50e92af98d0c50bd88012b7c688d621822c143c4f5b5d4e2e7ae9de4b320473478883e789ba56ae2e65f92579ff783d WHIRLPOOL 4bd2920895e492b47c6c2fc09bb95a1e007bad8259403252a22664124e3df090f622f66a50acd900a5a7e43f6fd81605f03e0684cb9b9f87659be038448b6e5f
 AUX vtk-5.4.2-cg-path.patch 1112 SHA256 4097db18c46e1e27b6213ef7c82af07144b5a88ac19bdcf645ad7e8264cc9e10 SHA512 e68e997f891e600529d54c56ff0f3017b921f8ab19cc9c0e19c3043b952a5090d67de21d9273166931131c07a5105d4afa0fbb8ce1eabf6527f998a2141ec059 WHIRLPOOL caa6a828b1cd84208a5b3269cc361387e318c7fd4b3f7c57a26551aa45210f4763c4f6b971bb64d152ab7e5cea756133ca9d470a42f98044412625e589a84425
@@ -24,13 +25,13 @@ DIST vtkDocHtml-5.10.1.tar.gz 178278963 SHA256 1447d7e07a615c0c6d66cce2bfc6b2f4a
 DIST vtkdata-5.10.0.tar.gz 88635192 SHA256 3b2e44feea87f57dc356e924863f8b787a42627c92838138b376b383b4915b2c
 DIST vtkdata-5.10.1.tar.gz 88642678 SHA256 c526a5eeb73693597043a89d401ef5b8f0c6f6eddb82e03ad205f013ee9edf7c SHA512 3655ecd4bd6f05e3266c19d67c59867e12d4681e159869b7673948a8ba3966f958bd1a1ef024321b66f3ad649b80fc62e5323f8bd700d34fdd95645e7fe5ef32 WHIRLPOOL b65e533dc3a092ae4944bfd1ca850ab3b7ba95c62c654e0c03ac8c689d4270eaf58ae91519200c00b94ad3108f4ce3bc16656bf62a7e10dc627dea736594831d
 EBUILD vtk-5.10.0.ebuild 7456 SHA256 0a8498310d4696e43a17ea5a10b313cdbe054cb4653fc2b49c6f6d19aa156cf4 SHA512 77084e58e99591259e745ba4f26836ae2bd22e8dc73ad69d8fbff4b2008e3e2de4ad0a751e2f4485c82ad961656a367fa2f8352b62d29613e385bebca8710f0e WHIRLPOOL 2187cb19aebe5b8eec92aac1b1a7acbd3fa3cdb04a93dffbc4badd70156ab8bf006264b08f7306e55ac1104bfb281cb14834354c65c5d71a20613851062c68c2
-EBUILD vtk-5.10.1.ebuild 7485 SHA256 40ef34a7a289beaa80c7f8942e922b219afea6ad0df08642c5fddfeebdbcf8c0 SHA512 71855abe61a05ceca819e587e1c15af3320a97b02b45254c7b203841303d4cd9e53dc28be078fc0cddef6cc193cb16b51b30f57bb34c765eb6039537838d95f0 WHIRLPOOL 6d3b42cfc32206255b792c2be236a068ebd820bb2cc1b0736df60ac95140e5eae88bb26087e2ddf3c3ad45e8f8f197693cb591ac906d30714ac9a0f75f43d8f6
-MISC ChangeLog 16937 SHA256 9bcbe7c145f890f07fe9cdb3fe61b85e28b4f198ee0bc4adcf32b7f8a7dedc15 SHA512 79dc1dc75988bdc86212f2be4026a306c06073393464b119ded1ed11f6c8bfd33d40f5fd8d55d9f5e1d9408e0845a09ae42a847e7d24ff1d6b79f2a3d2683dfa WHIRLPOOL d031a3fa6f4de1302eae3a268d641ebb6e54977f33f9ca8f9b5353acbb352b81f23bdb3cfc41fec3208e899eaee789a28409ad71b9df361dffd3721b29a76159
+EBUILD vtk-5.10.1.ebuild 7495 SHA256 701ecf45a667a816b53044ca9d35ef652d259ff988ef3e557440af1b781a4ec6 SHA512 06e399ee7e4ed467050192494d8b95db020bfc443de9e5865ed4724de2c7614fddd3c5c1dd100b68bbc793febd0a890e19224ed5908fa97696095fb693b62e14 WHIRLPOOL 64d5ca54a8267d68276d4c37cbbee3c68b4701cdc7dbda95dce9c53ff35aabbf8f933a3ab2316e73f9d49d9e412ba0b6dd711609ccf117f44e2d02e061634e20
+MISC ChangeLog 17067 SHA256 432dcea08dc7a98289ec4acf03eb7108ca85e2fe8b8421cd9f873c07f0d27b14 SHA512 16a919ab6c939f601cd9d12e59be2eb01daf494a7e4b7eaff45b24db7332eef05bcbc23b811a15333fd4321261e8010b2da466ee9cd7603af0e9fa676093881a WHIRLPOOL 523837345bdc69dc12a68fc5f22ff5bd2f4379825a2c9078b48664fb0a5a9bf4f6266ce49e1eeebbe2f544fd53015987985fc6ed7883ef82749263682d3adc50
 MISC metadata.xml 563 SHA256 2fedd09c2e8b8c709641c6490e9b4ea9190d4c98cafa958386ed957bc8687ce9 SHA512 cb5a7f2db34a3e35a7115240ad21fce20bf771613dc42fe57c8e0ea1d004ea40e06fb57970285ebcca290bb390b29c10d7aa5d20a3df7e8dfeb314db152c3152 WHIRLPOOL 2540838d0c619af440b8269a46c58045cb6c79e73525b75ea891af381f7561c106712a1881c62cd0d4de7ddd7cc6926ab7c5a7ea59adfa7ebfb312dd1712ec45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDz2YgACgkQgAnW8HDreRaRmACgoXEWb/P0zOYH4BloppR6AzkE
-U8gAnRrGl5v5J9OPkXWdybAK/soaykO/
-=Q7NW
+iEYEAREIAAYFAlD1YF4ACgkQgAnW8HDreRZAIACfRaVtxafnsmDocLbQk7gfJZMb
+k4wAoLtrU5DwoTK20f03pjdTLwAsHZLb
+=hwR9
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch b/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch
new file mode 100644
index 000000000000..85ba2b197b7f
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch
@@ -0,0 +1,40 @@
+ Common/vtkTclUtil.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Common/vtkTclUtil.cxx b/Common/vtkTclUtil.cxx
+index 390b0a4..0a925ee 100644
+--- a/Common/vtkTclUtil.cxx
++++ b/Common/vtkTclUtil.cxx
+@@ -490,13 +490,13 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg)
+       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
+                              arg2->command << endl <<
+                              Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) <<
+-                             " at line number " << arg2->interp->errorLine);
++                             " at line number " << Tcl_GetErrorLine(arg2->interp));
+       }
+     else
+       {
+       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
+                              arg2->command << endl <<
+-                             " at line number " << arg2->interp->errorLine);
++                             " at line number " << Tcl_GetErrorLine(arg2->interp));
+       }
+     }
+ }
+@@ -723,14 +723,14 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *)
+       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
+                              this->StringCommand << endl <<
+                              Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) <<
+-                             " at line number " << this->Interp->errorLine);
++                             " at line number " << Tcl_GetErrorLine(this->Interp));
+       }
+     else
+       {
+       vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" <<
+                              this->StringCommand << endl <<
+                              " at line number " << 
+-                             this->Interp->errorLine);
++                             Tcl_GetErrorLine(this->Interp));
+       }
+     }
+   else if (res == -1)
diff --git a/sci-libs/vtk/vtk-5.10.1.ebuild b/sci-libs/vtk/vtk-5.10.1.ebuild
index d267c293748f..2f20984444b8 100644
--- a/sci-libs/vtk/vtk-5.10.1.ebuild
+++ b/sci-libs/vtk/vtk-5.10.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/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.3 2013/01/14 10:10:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.4 2013/01/15 13:57:49 jlec Exp $
 
 EAPI=3
 
@@ -76,6 +76,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.6.0-odbc.patch
 	"${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch
 	"${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch
+	"${FILESDIR}"/${P}-tcl8.6.patch
 	)
 
 pkg_setup() {
@@ -88,7 +89,7 @@ pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 
 	use python && python_set_active_version 2
-	append-cppflags -D__STDC_CONSTANT_MACROS -DUSE_INTERP_ERRORLINE
+	append-cppflags -D__STDC_CONSTANT_MACROS
 }
 
 src_configure() {