dev-tcltk/blt: Add correct fix for compatibility to tcl-8.6, 464650

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

4 files changed, 99 insertions, 7 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index c80e80244dfe..a7b9175ce61b 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/blt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.67 2013/04/04 18:24:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.68 2013/04/05 07:01:52 jlec Exp $
+
+  05 Apr 2013; Justin Lecher <jlec@gentoo.org> blt-2.4z-r12.ebuild,
+  +files/blt-2.4z-tcl8.6.patch:
+  Add correct fix for compatibility to tcl-8.6, 464650
 
 *blt-2.4z-r12 (04 Apr 2013)
 
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 1d4f6b1e44b1..e320b4800f9c 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -9,6 +9,7 @@ AUX blt-2.4z-linking.patch 684 SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6
 AUX blt-2.4z-r4-fix-makefile.patch 817 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8 SHA512 c3b9aedc9c0557a10f66f0d1f9e61a028367e190fcb49ae0af8acdacc5a466168f4a1f26012a8b4f6aceb644adc532bcf0e1348cd0231efd821b66107cf5c7b9 WHIRLPOOL 2f54db3233eb62e805d072448d31c5dd7c69d8fb15aec902a1f12c8b7e82aa6ff9604504b1b021a4dbaf3b00cc2ee0974bb0f5bd0f176f475b41c8a6a3fc0e70
 AUX blt-2.4z-r4-fix-makefile2.patch 728 SHA256 aece52e1771d097498cf88bb1fe286ac698a46af0d07163c4b9d184440ab7d39 SHA512 5f9b5ab26101bf89bb7161bd4bfb4974144c61ae692f67b7598fe0c42929f84b14ac459fdfc29a1436b64924085b8047c90a84501c031f9d8575d4dc38c22681 WHIRLPOOL d76b7c2e350e562401a4b247b6f29e4286c35c2ca100e8b28892d63bf5874bfe1e3d8ef817bde66a43c3b2c2d81d6af8b08a87622d97d783c1e1480bb472ce87
 AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 SHA256 a44ed43bbb946d8fc11bb8f416680a536ffc7c0d78faf33030ec378d67d3d287 SHA512 036cc9672c6c5f7554ab883d89602f8ead92c7533fb45742a082b97162f32d6442ac52e1e4f7154d669d917915b840cc6191ae544e1261e430222e0a293c0f41 WHIRLPOOL b3089b7ca520990ebd7fd1160342538e086a5414a049f6affa8a67020df889579ef4d0c5c683b75e0cbfc99deb7ca823c96396ddaac024f4ffde8c3ddc02b5c4
+AUX blt-2.4z-tcl8.6.patch 3281 SHA256 efbda5f49d61ac0cc7c03f9fc6990015bfea696e8a50189b9e8ef2b00d6f251f SHA512 38aa7a7f38e4ae98adda97948b3a0adb0747e4b8966b493efb87268717636c47a79ccd31caa73f44fb7e673e3d51b4552a23ad1b1a0360327fb678327814840c WHIRLPOOL 49e578f8a385c3ab7330cf646f8e8609334399063acbb0ea4b670e8a9de1cca10e638f9aa813007ecffd481e1adcb6dd34c5988a90596a6fd1042525277942a5
 AUX blt-2.4z-tk8.6.patch 781 SHA256 3d9b1c70c1b347dd9406993fe99c371c95dae42848ab8f9ec573e585545070da SHA512 429d24edf55668827e638647e51131083b879d068d65c6d5d4f4665b42d7e02b26760bc78b8aaee5e089fa48b674a81d8cf861220493a7390aadba814a789602 WHIRLPOOL 898235c52cb2dab35ece7930d9f8339941cde63e76aca8fb10a4667d1a6d6c5d518aa736e03b75d46d6f47b1bf89aa9d73aeb8d7ef9b6128cc0ee009c6153880
 AUX blt2.4z-64bit.patch 891 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b7e460435408000ca2f5 SHA512 fee84b20e3cf8491567c11ed1cff3955963b68deda2d4d8a91b48691aa50d83db45a6aa4d86f80f8dd38b0b6bb1f68a1324e9f6805cc10fde2bcfb45f03f71e4 WHIRLPOOL 0140bbb6431cc958eb053d1483ede5a8599fb25c2cc6e7fa6674821eeb3e327b3082933c225b62c9d5f29090cc8f0602bc21068f51f9f447b9cf410b2416346f
 AUX blt2.4z-install.diff 1057 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8 SHA512 2786eb7d59ef4f3e0b2e846f906e6f92cece13b8003ed220ddcdd22b42b761fa6aa31905a3a62af54e02db96bda37e21fae2361589d8c393586c37bcd33ef842 WHIRLPOOL a0db9fdc9d2199ac0e217015826a0ffe7b70c619e55e85a13a941202be3a325356cde627714d16d315f1647b5f95d16a6219720048b14560fdf7445c170995b2
@@ -16,13 +17,13 @@ AUX pkgIndex.tcl 146 SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef
 DIST blt2.4z-8.5.2.tar.gz 2326234 SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16 SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a WHIRLPOOL a00a029e075916dd7656ca85acb308a48e6d80563a91ada9e9e7df7518ef0d4de2200b54e5d9c8a9602520c03472e73968956c0df30afb8ef7f7b364fdd5524f
 EBUILD blt-2.4z-r10.ebuild 3762 SHA256 cbbde88fb8433295982c6e22d6fdb6d81ead24555ca743943bbc79376a7eba4d SHA512 ab8231ee769828d8784bbb14c62a2ae64efc38d06b7e2fbdb5e35fc882daf90a41c17826b678f1d21ec9bb03ea7fc04f41b0dbd98a413bde6fbb2617d0a70864 WHIRLPOOL dd5f7126b224c74800aa7348889d145acd36022123371d2bde1908a12642f25bbadcc8285924f1de0e2fd13183e703bd35fd8e3203007f6ca5194130b2d568a5
 EBUILD blt-2.4z-r11.ebuild 3770 SHA256 abd399d6c34c203c6b49e70b3f6d05d475efac75d595ad4f9838fec6eb11d741 SHA512 b5b73db01da09ccdff31681fdab37ddbaf7c6c7f3564ea43a86c30c6d4ff7a3ec4d74c8705086116d5acebb0f470a71f80b2323293fc9e46c9a9becf0a027f6a WHIRLPOOL 6f4ab1b230846b4ac3d3f2d61c30932d44007aca3af5f1c0b69a7c4abf82988a9d3e9fee98b1c29e5f5c8dcc55f708fccfc125a778480751c7cb1e608011ddeb
-EBUILD blt-2.4z-r12.ebuild 3808 SHA256 e205c4712e30854d08027b2260d8ccc219d6b9e009291d42f623a9632683bd51 SHA512 1fb72493717c1f4caefceefef3be42edd5a7a22c22e22b6199bdf61c3ce321b43de1625cd934f6d049f01dcd777edfca9a768a204fef4619ac18677b659e32b5 WHIRLPOOL b9e15d53bcf58841d2cd3250888cde96637fde821b379528653aeaf7179abca5d27784838f2a0137146d19d93d0ab9dc33230202993fafae6676c7e7671ee686
-MISC ChangeLog 8947 SHA256 1d7ee491e227c9dc2a6d6b7429e6fa459a9639ecbfdb599a4eb81ec8fa096256 SHA512 d7c20f40595c243a0a88e743aa6438479fb19702fc4b78e6be8edfac145a73b71161d63fdb90199911562e8827a2ae9793c6beb395a324a2fa89f781a4263f1d WHIRLPOOL 89c05473b10eaf854ab8b1e49728506ae2c8447fcbe2391b76086396046e88a4188eaeaf70d8968c15e9e4ca450020ae3ad0c4ead88bca34ac8db4ab18bfa5e9
+EBUILD blt-2.4z-r12.ebuild 3844 SHA256 2dfc467a455c23522941a402ad371bb5259d8fae29e11b7adfcbe66bbfc0e8c4 SHA512 0c8215ada84c5a03edf234ef6e44f2bf7aa55e9794d84fe797f1eaae3b477e07cbdcba44e564f279938f62f7d0a850b69282322dbd6337244dce367bc9dafa6e WHIRLPOOL 26f9d73d700f0ad105f8e39ea78d7186ec9b11c1e652bfb0b3c962aec54b25c07da0a7d371320f25cf6739b94f6aea2b2b071cb049d5cf8565c04c1d7003f055
+MISC ChangeLog 9103 SHA256 a0c8bf63e3325dbfc6ac1c0c18b6499c02c3739720ccfe19096a38ca5647b122 SHA512 0997e28c1b3f9a166ba6c94baba7a1e1aa043901251b83d8dd42edbe9d21b7ffe8a19d3a1f555c55f2a8959239c4d3b3fb1693598610428516e7742171fc61e2 WHIRLPOOL 10be00d2671bfade334975ce2405b8eac227aa88c0843fe7bc17fc47b7dfa715166ef58d602d3bd519079c86fd863aa1d5d199cd3875b793018869368239630c
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFdxWkACgkQgAnW8HDreRaGuwCdF8Q1Qq5CgVpXCsfokEJgBgwy
-YiIAoMuyqky3QW6syNxWJPKwggCXxpGR
-=U661
+iEYEAREKAAYFAlFeduIACgkQgAnW8HDreRZJaACguU1jS4MZyHOCnSlEn3u+b9D1
+G3UAn1FkUBf7KHImdrAYDuveQso53jib
+=zUMc
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r12.ebuild b/dev-tcltk/blt/blt-2.4z-r12.ebuild
index 78c4f1a8e5ca..81dabdf2f778 100644
--- a/dev-tcltk/blt/blt-2.4z-r12.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r12.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/blt/blt-2.4z-r12.ebuild,v 1.1 2013/04/04 18:24:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r12.ebuild,v 1.2 2013/04/05 07:01:52 jlec Exp $
 
 EAPI=5
 
@@ -61,6 +61,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-darwin.patch \
 		"${FILESDIR}"/${P}-gbsd.patch \
 		"${FILESDIR}"/${P}-tk8.6.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch \
 		"${FILESDIR}"/${P}-aclocal.patch
 
 	append-cflags -fPIC
diff --git a/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch
new file mode 100644
index 000000000000..8721940af2c3
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-tcl8.6.patch
@@ -0,0 +1,86 @@
+ src/bltScrollbar.c | 2 +-
+ src/bltTed.c       | 6 +++---
+ src/bltVecMath.c   | 8 ++++----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/bltScrollbar.c b/src/bltScrollbar.c
+index 69662de..731e37b 100644
+--- a/src/bltScrollbar.c
++++ b/src/bltScrollbar.c
+@@ -534,7 +534,7 @@ ScrollbarWidgetCmd(clientData, interp, argc, argv)
+ 	} else {
+ 	    fraction = ((double)pixels / (double)barWidth);
+ 	}
+-	sprintf(interp->result, "%g", fraction);
++	sprintf(Tcl_GetStringResult(interp), "%g", fraction);
+     } else if ((c == 'f') && (strncmp(argv[1], "fraction", length) == 0)) {
+ 	int x, y, pos, barWidth;
+ 	double fraction;
+diff --git a/src/bltTed.c b/src/bltTed.c
+index 64c43e8..832ef9c 100644
+--- a/src/bltTed.c
++++ b/src/bltTed.c
+@@ -1504,7 +1504,7 @@ EditOp(dataPtr, interp, argc, argv)
+ 	tablePtr->flags |= ARRANGE_PENDING;
+ 	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
+     }
+-    interp->result = Tk_PathName(tedPtr->tkwin);
++    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
+     tedPtr->flags |= LAYOUT_PENDING;
+     EventuallyRedraw(tedPtr);
+     return TCL_OK;
+@@ -1678,7 +1678,7 @@ SelectOp(dataPtr, interp, argc, argv)
+ 	    tedPtr->activeRectArr[4].width = grip - 1;
+ 	    tedPtr->activeRectArr[4].height = grip - 1;
+ 
+-	    interp->result = Tk_PathName(entryPtr->tkwin);
++	    Tcl_SetResult(interp, (char*)Tk_PathName(entryPtr->tkwin), TCL_VOLATILE);
+ 	    active = 1;
+ 	    break;
+ 	}
+@@ -1751,7 +1751,7 @@ RepOp(dataPtr, interp, argc, argv)
+ 	tablePtr->flags |= ARRANGE_PENDING;
+ 	Tcl_DoWhenIdle(tablePtr->arrangeProc, tablePtr);
+     }
+-    interp->result = Tk_PathName(tedPtr->tkwin);
++    Tcl_SetResult(interp, (char*)Tk_PathName(tedPtr->tkwin), TCL_VOLATILE);
+     tedPtr->flags |= LAYOUT_PENDING;
+     EventuallyRedraw(tedPtr);
+     return TCL_OK;
+diff --git a/src/bltVecMath.c b/src/bltVecMath.c
+index dc37af8..5117f63 100644
+--- a/src/bltVecMath.c
++++ b/src/bltVecMath.c
+@@ -764,20 +764,20 @@ MathError(interp, value)
+     if ((errno == EDOM) || (value != value)) {
+ 	Tcl_AppendResult(interp, "domain error: argument not in valid range",
+ 	    (char *)NULL);
+-	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", interp->result,
++	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", Tcl_GetStringResult(interp),
+ 	    (char *)NULL);
+     } else if ((errno == ERANGE) || IS_INF(value)) {
+ 	if (value == 0.0) {
+ 	    Tcl_AppendResult(interp, 
+ 			     "floating-point value too small to represent",
+ 		(char *)NULL);
+-	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", interp->result,
++	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", Tcl_GetStringResult(interp),
+ 		(char *)NULL);
+ 	} else {
+ 	    Tcl_AppendResult(interp, 
+ 			     "floating-point value too large to represent",
+ 		(char *)NULL);
+-	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", interp->result,
++	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", Tcl_GetStringResult(interp),
+ 		(char *)NULL);
+ 	}
+     } else {
+@@ -786,7 +786,7 @@ MathError(interp, value)
+ 	sprintf(buf, "%d", errno);
+ 	Tcl_AppendResult(interp, "unknown floating-point error, ",
+ 	    "errno = ", buf, (char *)NULL);
+-	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", interp->result,
++	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", Tcl_GetStringResult(interp),
+ 	    (char *)NULL);
+     }
+ }