dev-tcltk/tdom: Conditionally use Tcl_GetErrorLine, #473314

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 24 insertions, 13 deletions

diff --git a/dev-tcltk/tdom/ChangeLog b/dev-tcltk/tdom/ChangeLog
index 7af673add212..5d5d0d90529d 100644
--- a/dev-tcltk/tdom/ChangeLog
+++ b/dev-tcltk/tdom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tdom
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.21 2013/05/21 06:09:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.22 2013/06/15 16:12:27 jlec Exp $
+
+*tdom-0.8.3-r4 (15 Jun 2013)
+
+  15 Jun 2013; Justin Lecher <jlec@gentoo.org> -tdom-0.8.3-r3.ebuild,
+  +tdom-0.8.3-r4.ebuild, files/tdom-0.8.3-tcl8.6.patch:
+  Conditionally use Tcl_GetErrorLine, #473314
 
   21 May 2013; Justin Lecher <jlec@gentoo.org> -tdom-0.8.3-r1.ebuild,
   -tdom-0.8.3-r2.ebuild:
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 25a675ab68fe..a6fc3aff5812 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -7,15 +7,15 @@ AUX tdom-0.8.2-tnc.patch 2806 SHA256 f220162108eaf974a5f06b59de0ec130dc0703014cd
 AUX tdom-0.8.2.patch 2036 SHA256 523967222cf5d72fe84924b40f371831a10875599df9dd8d0c80ab2f5aa78472 SHA512 f86d07835de0274072243ff347123edba075d46e0e3da246d75f378d9dfcff3cc4e338f6d26449f15610db4bf1256b5e3890ac9b5f2b3d3c5edd24dcfd8120b5 WHIRLPOOL c850094d2317027871d90bb54e2951edd1be3aa488f7e59ddafcca07745f35b4931bdb7d825fb942719cba24964e363c01fd6771e3ce8794a2fb0e12f47edb6e
 AUX tdom-0.8.3-expat.patch 2512 SHA256 875a7d35aa920d971733d5319f713b4c3dbe0928e7e373bcddd9573d4249589c SHA512 110c07c55b2793152819c8da486a72440096876ff871b045d1a4b1d4a0a9e62bac4ccaf02bc83786f309b85f84e9311b6af31b6f4b5e8fb4f8294e6435f6be15 WHIRLPOOL 32fb0c84601b96a53fe254b1f41e4fe9870cf698796a981ecbde758dfa416a0389b72dc229cd1f919a7900900e5e5305d49efcfa520df6037770ab738ed74e55
 AUX tdom-0.8.3-soname.patch 963 SHA256 69126d56273b87599baf3aa58c7d016f4d32ffdced42fc9599c6abba94d3fa10 SHA512 ea7f689f3b979fc565947a6b5e2ef6dfd422eee83c98749c4f9f0a213f0a44f3beba211e5c8e1b251e4bc2bbd77a5e4e75476661de5ffeb9d01e8f7bbba05990 WHIRLPOOL 02c0ad62fe3ebbac97844743ed33d910cd25863ffb7f3a60e27cb2b6ff1c8e5d4b92e586de18347860eb48d4619fc529f420842c3c035dab94c701de91627ecf
-AUX tdom-0.8.3-tcl8.6.patch 574 SHA256 2475d1bc3440f7fe3bef712884c203da5e129576b3736a79f8386cfe256942be SHA512 eb9b307d14e7c50c865e6c4bdc6b24cb34248b142dcb2b5163225f6bce4bcfdbf0e6e19124b87fec09eb8c7ba1dd4ce65dc15d91bc63bad0bf65ad0cb84f8b43 WHIRLPOOL febdbf3c150474fffcc504f82427ec4e2f7d623a7f6f2124d0b1eb0d479cafd440a40a164de85193db95f76c80d28c3a0d4bcaaceb774f5a4220698fbcb4bdc9
+AUX tdom-0.8.3-tcl8.6.patch 764 SHA256 741a4347ba77f5b4ef3c645eb9ea227d34e0abd48277392a6d140d0993905d36 SHA512 4af4a3d712a9f6b57a7a9c6641c7fbef9c1ffd278c2507c067dc43d15102dc2bcc8df8eafc205973c7d7db8f7f9914f98d881877c863b32184c68c6313a466b6 WHIRLPOOL c466274533fd63f077fa11ef2e1ff08b25babc3a2234a5676024032b0817c9cb77f05242edb4aed518981ce25928894b89bb6b86a585bd02ad068a76c44a561e
 DIST tDOM-0.8.3.tgz 990367 SHA256 496d5950907dd70db61bc20c55a05a5521363ce3c076e2fdd97270181bc720b9 SHA512 aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20 WHIRLPOOL cec84152b636c3ea13a6daaa9681fe28c36a3e358e28382a439ee855206566b08c1f7427ca733cfbb806f2fdb1e2e10c96c8410005fe56e84f17e873168697ee
-EBUILD tdom-0.8.3-r3.ebuild 1984 SHA256 433872b82334de330a94140d103562ea9ec6f0fae66a06d35473bf55b7998f6e SHA512 140ae66eee4c180617538ea38d9826bce2e8d4601532a424db69b674044fe004e3af3963bad3c25a121323fdcc9fb3860e2bb2688181870754e66786977b5cb4 WHIRLPOOL 2d23736a039bcebc950996497921ed91c4c8bef3312272eb05a83545af4e5f045dad6fb7a192a8be77f60e7e2fce59ed20bd28e8f8b9bd57d282b89ad1694552
-MISC ChangeLog 3111 SHA256 c4ada1ed5e636ffeb80adcafb0ac772a6fbf1b47c3a5a427f65d932230936edd SHA512 5d89f3203321a9fa256642d620045ced15083c79c4e7a8fcc8a29bf81275d92c534171f9d2f4dfdea8e8a51d927d40cf8e0f18fdca8e70f57ace27c7aff0d703 WHIRLPOOL 6a3d3ccc223c795ec507d9e27a7fff388fde40962d863e63320d348060c032a6df7823077393e82c8c3556020729bbd87b693263770870141b44f367c3b0ca45
+EBUILD tdom-0.8.3-r4.ebuild 1985 SHA256 3a2a9ac2c367a1ecf12c68e75946684a8a088fe3541972365215ebe9034e4878 SHA512 459d7d1f2c3feff7e2813e4579d3727268d4e9ceb407e4062a051e56bfdf2234990ccd29913943228406586ca3bdf3e7082c0aabb7f4d39894f6ef4a09759156 WHIRLPOOL a9e90d3e3a04220b6a0a9ab5a74b72659b2182aba3964c120aa682709b2929181a5fc2d4cdb9ccf489164a33c3f166bc806b4ed9a9505079981c56ba6d14b2d6
+MISC ChangeLog 3314 SHA256 907c5744dda7c24dbb0ab97b03284a63cf16dda42ca6044490f7dcdb990806b3 SHA512 444795ec34ca7a1207f4a0976b606ac4bf9f979257803da24aa6c4c0acfa23595dcc32750d9b48771baa7a343e90eae5c8fee0eda2b94d9b9ba538c56c2d2821 WHIRLPOOL 93a08f78c77534466c8552af3f85bc7e8ed38119ffcf9b255366b6ee67223ca3c3341026cf1518a370f0fed194c1782bc56acb552e52dd5ae538bbc0f8e5ea52
 MISC metadata.xml 510 SHA256 1d72535b12492cdec99a7c0be3bda4dd79d82385486660b9b2417fa08b0a586f SHA512 72963bb5edfe5917e8c635f6e62b0112def4003262d732c04c170c002d65b154134f4db19e85749fde45796ecf7249f024f365cb3a95dc3a5670ccf975435461 WHIRLPOOL 0b0fab1bcf15725e058effcbe8ebf42b413b42704ff48a4661d7525ca7c6a210bef235d38386d95ea32c4f17ca254815014aea664432a6b458281ed3989f3b35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGbD7MACgkQgAnW8HDreRbq7gCgz89aqcpT/nHpstV7Kn5Aor0W
-lDMAn2N/HtCARo1cfAgLLqT03FPONkfL
-=5ZC/
+iEYEAREKAAYFAlG8km0ACgkQgAnW8HDreRYbjgCfUGQWdOS4oPesApIHT3FJ31av
+QaMAn2xEmmyrbxBhz9XY+/0IerJczUA9
+=rswg
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
index b61ec8c5d449..5a805931ca31 100644
--- a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
+++ b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
@@ -1,16 +1,21 @@
- generic/tcldom.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ generic/tcldom.c | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/generic/tcldom.c b/generic/tcldom.c
-index 91d98c9..ae6d413 100644
+index 91d98c9..0f024b3 100644
 --- a/generic/tcldom.c
 +++ b/generic/tcldom.c
-@@ -5934,7 +5934,7 @@ int tcldom_EvalLocked (
+@@ -5933,8 +5933,13 @@ int tcldom_EvalLocked (
+     ret = Tcl_EvalObj(interp, objv[2]);
      if (ret == TCL_ERROR) {
          char msg[64 + TCL_INTEGER_SPACE];
++    #if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
          sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
--                Tcl_GetString(objv[1]), interp->errorLine);
+                 Tcl_GetString(objv[1]), interp->errorLine);
++    #else
++        sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
 +                Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp));
++    #endif
          Tcl_AddErrorInfo(interp, msg);
      }
  
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r3.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
index f5516ceb98f6..6b5fff381c4a 100644
--- a/dev-tcltk/tdom/tdom-0.8.3-r3.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3-r4.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/dev-tcltk/tdom/tdom-0.8.3-r3.ebuild,v 1.3 2013/05/20 08:22:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild,v 1.1 2013/06/15 16:12:27 jlec Exp $
 
 EAPI=5