New patches to gcl-2.6.10 for compatibility with readline-6.3 and gmp-6

Package-Manager: portage-2.2.10/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

8 files changed, 158 insertions, 222 deletions

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index d103ca1266b4..f295225a73f3 100644
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/gcl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.62 2014/02/04 16:24:08 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.63 2014/03/30 09:00:59 grozin Exp $
+
+  30 Mar 2014; Andrey Grozin <grozin@gentoo.org> -gcl-2.6.8_pre20130314.ebuild,
+  gcl-2.6.10.ebuild, +files/gcl-readline-6.3.patch, +files/gcl-gmp-6.patch,
+  +files/gcl-tcl-8.6.patch, -files/tcl.patch:
+  New patches to gcl-2.6.10 for compatibility with readline-6.3 and gmp-6
 
 *gcl-2.6.10 (04 Feb 2014)
 
diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest
index 0c50444fef73..48067c87131d 100644
--- a/dev-lisp/gcl/Manifest
+++ b/dev-lisp/gcl/Manifest
@@ -4,34 +4,34 @@ Hash: SHA256
 AUX 64gcl-gentoo.el 184 SHA256 97842389c5509c45ebaf7020a72410ec6fc59ebcf539c782d4247b7252e8c633 SHA512 06749b0c4ec7a34a7fdbb591d40106fe00a794e6db0950cc7187293d4c495d5c908235a2ba38236132618442924a7feae08496356fcd4b0139477cd89121e3cf WHIRLPOOL e0d266f96e5383f1e231dafabe6ba422f40a149a9f94b66b81685109ea66f18692525715c1faebd3eb1c49fe4efcd7de677b1268cb83af996759972c3fdcacdb
 AUX bootstrap-gcl 336 SHA256 4d9f19e461b5bfc3e570b6812cf35dcf8ae98788b7eb4d4e04368a2f801f4244 SHA512 481a9ffa1102534c36a1a2084dda4b1ecd822888fafac4e6f0691b73ce0cc60e5328f628998ccef38bf75a26f3b79b24adf59562dc7cad23c3033a22d9593d0f WHIRLPOOL 9981d0e045775de0188ff75d82f8d0a78364323ffacfa690fa516ea95fbac95d69fc7ce657bbc020f8fed264103b9b3c32f643b992f6b5408b3a0a782bc4ffc9
 AUX flex-configure-LANG.patch 1686 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea SHA512 6b097d9406f0faf5d0332c48a72d5654063fe29e37ec2d3bc2f425e98f26d117d39769c43ae39ee731f094a47912bf1dd24259fcc4a5b5326b1e2c4313c89c56 WHIRLPOOL 40cf52a3a9c97012be36a6e11054c3c418c692cb9292350baefecee621ecbff12b65f7b0edcde86e14600aea4c43daf607806c374b650d3f82142870b0da4da2
-AUX tcl.patch 2240 SHA256 956f973718c5f325fb1c947be32d320f838734d314c7fe626e1fc37306ab4bba SHA512 d4867e4142f8f424c75f1020531306aee26b01a5e9b74b8d8fb1f5b7cfe8d7ba459396dd7866a141836406a6c238c6c39bcaa4b00d15cace3e9387d965eb0c83 WHIRLPOOL faf7be48b0cfb34d4f1376aa648237cbc70990b24a6d3ce9306c8b27fd5fce30b5ca289ec4939312c99965ec5a41221ece57f311b838dabc5fb1653d1b2de198
+AUX gcl-gmp-6.patch 363 SHA256 2a2929e93e498f9537c6575d32cba0b778f278527486d97ee006e5b697626ce6 SHA512 cc578a915d154e94cf992f79e5a0130d294f506da13315bef060e19b08af3390942b2ebd5b4989acb37582315f3396fe605b56e9e441755728f54cf693be0ef1 WHIRLPOOL b656ae78fbd3819cc7b54922a64e6410ef70d96e990a259b56fb43588e4cceb6970289a9c196f9f29e3275db6b8c31b718c3ce6096e662063bf18d3a21b7395f
+AUX gcl-readline-6.3.patch 656 SHA256 ef91a0c7743d4773a285d4e61e264ea3d94d6d74ca4c1a17b7b6934a755eff75 SHA512 d88e59a0082d01b7ae8bca1dd9870400b7e0b0e39eeb4fdce564bccfd615fadee6235c3cf1e3ef8074f74c17188144c93380cd499b215b5025304b0b2d272501 WHIRLPOOL 111e3be4bb82c2bfb8f2b7ed3ae6f1a36a90c63029000a4f5a1edf304911a3626d4adab6a231c17dc0020613c1892f30b711cfd9baf1c9eedb6f2cf727189cdd
+AUX gcl-tcl-8.6.patch 3331 SHA256 1a2a267b2bf993dde577686190ef3757c7a25f69bbe88811385074de987c8338 SHA512 108835fd285d6198935c6c1d20c96bc405f3c47dec66fc30201e01cd163734933cc0107b9a9035f728a594f1280a0c1bbfde2087ba5149d46c3b55ca066e3ca4 WHIRLPOOL 5a4cb6c43769de29def6b95a0a72fa4e9fc226e9f0827f5460a46f8bf74f9bbe60b7d57c4034149e4035f9d5f17925ea1b81e47343f8ae2866216d134c299ca6
 DIST gcl-2.6.10-fedora.tar.bz2 695718 SHA256 629da9f8288585d088017140da96de09d82a12ed0cf2f139f4fe9d9b5957ad96 SHA512 3e0ffaec859783443a8941a29302c7a17c9538ef2177d449ad34e24292c174de7bb8760a6d327e08f012773032f0d0a5230b79c7e4b4f5bad8354bf10a28af4c WHIRLPOOL 35dd9239ac27f99b98e8b1eb822f39e18b0ea1edcb991ff7b1b441408475148ac684a96ae2df6ea83e979297269c10520fdbdbf4f5b4377a26e7b071d6c26fd1
 DIST gcl-2.6.10.tar.gz 5490689 SHA256 79a1fb2f92b5e86f24988448db3e34116ab6ef7c93ad839848edd01ad06651ef SHA512 bbaacce712f15130550bcdf7e53edf4df9ab955e84ec701087034115df1c1e657d956853d5db85d7e88709981f9b7fd4c9df7acf6c8588a8ccf5f05e4e666aed WHIRLPOOL 8253507a02bd3adcf313e359fb346b19a2cc207c5a137b461addc117f00516cdd6ca28e0a7b5c0f3a48b72ba8f0bf2a3d6098297875db3281c0ef53ece474dfa
-DIST gcl-2.6.8_pre20130314.tar.bz2 4428151 SHA256 1aa08fe2d1aad5313daa8895f0986e5e19ddef58a865470b1d9fb6449caa6adf SHA512 909a9b0b73230c67ac06953162daa72b4cae8903e5adcc3c6863ff2306f89ad35d74ac645fdc0515eace53b9b6a635bbfc6b37cb4b8eac656fed5465247b3641 WHIRLPOOL 5d16c165f598c8aadc8659e9324c1d6bd60ba5eef56f7d9ff35c137a0d07ac6b0d813d664622b765ecae506ff52f9267237f6602c9ba83ead78ef7ec5e5f8df7
 DIST gcl.info.tgz 678468 SHA256 06e60fcc99b09ffb66364569d0331b1f2549804d5d09582c6e18fd27f29bcb57 SHA512 ebeb293f12db145e9a3a0802946314cd3e3bdeaefb53ca66ee69423417f7a93e3a84571d9f6c65f019ce09c93559d229da642feb722d193952f462402973bab8 WHIRLPOOL dd1ed04c312a995a6818d934220e025c80a12c05c01b8f2124d809157f0bd9d52db145021602736e4cdd3dde623098ef28b7eda5b9912819514397d5dd71a649
 DIST gcl_2.6.7-34.diff.gz 14493530 SHA256 f8b57b98348e8c8f303756dea1e02fd9ff6aa2d4308e4e7189ab6fab5f216e65 SHA512 5e96c9498c532cd095ae320db06f5accb1173dd4bade552e1a1b9eecf2f4848bf7064a3b7a77019eefc5cb58ea42082a5c8da2fad0eb8b150567b233fc4d2305 WHIRLPOOL 694860592a6504e4ed40e0f32a67d5d9cb0128a391ff3440b1196ff21a685faff5b55298168ac42089abf4f83f0fa4d950d98e984aa57a9795b171fac59061fa
 DIST gcl_2.6.7.orig.tar.gz 8193901 SHA256 2aa134bc03f12ad03f40666ad00db78b8b9c195cf2cf0b3db4d176158f722c06 SHA512 6af54cebae121c482fd465214d3959041df447139eea6a6a3547a6fdddb28ff4c426fbf185f118085a179235e75a790f769bb4da167620c9db87f9b7a8670247 WHIRLPOOL 5470dc588a2cf5638db4c0a25e6a3b237feb7b29937468dc9da2f1e2eb3f7fab44e9708bf303f194b59f603d74806181beced3abbd67c29dd062ab1acbb6c082
-EBUILD gcl-2.6.10.ebuild 3925 SHA256 9955493137b1c9b982da9571b45dcf6e80a723e70a5bf7dcd5348f32ffb508c8 SHA512 caaa788480201b9333b80549cd43ce9b00fc4650384cae04679327705e6d2c5b2f04d00fe0cd0c8ab9344dccc3f19b108982e8e669684f40d3425d84faf20da9 WHIRLPOOL 7893e37c9bf8b29627c14b61bc5e8f153935aab01c84541af8e1547cf1207e0b0e59acf4f601990e1b5baf540c37fa9c6ddb3fcf17ce74c93af77824153dd119
+EBUILD gcl-2.6.10.ebuild 4022 SHA256 5cd2f58189a05c92656d5e79482c71db3026d3b30827a31b7cf39165899c0200 SHA512 01a25c69f65e44b87e5047963c51c9aa5f6376a844cf03701d9c4683377bcd1900601d86f3cf0a25b878006ecd6d4e2806faea0b3f1661a287cb49485b3ffc7c WHIRLPOOL 7d3c0e37387618a9f71f9771b9ea5dcc3c279ab68117f38bc564991e7169f09ac9c32e9b26315035f0e0f3ab9fdead09e71d4b3afb8c4370cad9aa23e77b634d
 EBUILD gcl-2.6.7-r3.ebuild 3046 SHA256 0f00f57221f3b1c75529c89327faae08417fa1867ee4899ba4b873bae39001b9 SHA512 ca807f728d1c63c8865e85b8911b06d8f4cea402306c3f69020f046344a3bae570d4d4fe6e49d8f00c1c5acbf8c34be0a3f20214a05cca80e2866e24cb3f818a WHIRLPOOL c99597e0dadaff85995b0f8b81a992b906e80fc03f78e8a1df389b707dc8219e4a3a81ef3899db32d45dbf0f21819d03b9e739272db2f7bd55fdf0e29e7a72ec
-EBUILD gcl-2.6.8_pre20130314.ebuild 3360 SHA256 266f7ec02b496624cb14f1225fe492c2eba1e35cda2c63dfae624e9632e98c30 SHA512 9768d09d59282c36e70dbc9fdab53cd385fb7737bb88854269f6e1f9f4170b414d97404b2b719328cf4537849837673103bf4a596eaf50a763db623ec314bd8c WHIRLPOOL 56bf76a15e4e843ec817573647af1cce82ecb8479100df1003d75d7289603dab7547b77945eeb4a64a8fc8c580ff5e48ccbb281ac38cf2d6ea0e5df6bceef234
-MISC ChangeLog 10024 SHA256 0d1196579d6c4ad316a796875fbf9e12ede6e9b9bce67a301bff7638d1ba75f5 SHA512 133583e679a1ffcf8813f30e5e62498cd40c5f2b3de7049da573dfa455cf97c683b45cb38b6ef6baef2da3b6a8bd4a65a7eed3cb0726d5a9dd840771e44dd821 WHIRLPOOL 01eb5dab395cd281c269645ad7aa73f182379d44b06e6769036884dcee4f0d60d64003eecab901fa631132b36e85023480c3ae57fb8a896cc8aabde34b82c8cd
+MISC ChangeLog 10301 SHA256 da8e96464d4e6bc0ba5895de25a9545dc5aee60f493a0d6bd4a0ac787f83617d SHA512 0dab096e71eeb469c1160436d093a4d4fb577e34ae2b6b2c2cb0a78d0e48b086a4ac0443956a27cab4b461713ac2b44f587c4140bd6fcd5873425454dacaa3ee WHIRLPOOL 3d535c81bbfbef03e12026603bc4cc15cf1644c08e9ceae0f8f60c25038ddb2eaa61b795795c101f402306cd387a0c18ee15927ade836fbe867731eb60b3f41f
 MISC metadata.xml 616 SHA256 550dedf2a1befda92ff1494243767f117b6f86d6ab4aa097c1b010399aa1f8ff SHA512 7438b640af57715de10b636101d415b90aaa9b1a7cd505d95bc353768f51185560f31e458dde68d0f24ef9c703c6ea7d2801d29d68e3bd657bc30deb578c0387 WHIRLPOOL e80174fa22fff24d50a554a4871cfc2adaa2cd5748987fa13aa75a0b3b7323c2bf010a5cb2723ac14e2eabb4d0d1577550e6245da93555765fcc8f47588fa29d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJS8RJQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTN9uAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MsmAP/0RiJZxs2Ksez6QuhzxomOyX
-NcKY2CztALHZqucL7ztYzUA1G/b0w6ABkULNUrcTUtWAhta32nRrcOs6zWA2Tll6
-ziTk3DBzmV+Ez0oGk7jBSWkTCvUf+74/Dxa7IdKcWGrZgC+e3/7I/nhDqIzbKDPh
-jA7kJ8YiYsvzMgrzKffn+AR9JCIDlFt0Fpiwp8DuLof3TARxMUuqBCCLHn0w7Aeu
-s8Tn+WhJ1aJ3oFqlJj6PF7GMytmrDX1MlRt9btmGPAnj26qWxVNJM44sinRnf6M0
-nJns/oM/FY4ILCZ7+GpmCSE2q+J9ObKFO1WuJKVzuix/JSAjAiZ66kRdgAQCmT/N
-2NUqP45fPlJmml7XCBtHywp4OjGptVZF9l1obYP7Tkne977vzoByPfXwZZuinDkA
-BA95V2h9ebPAZBK8MIOvTF7ZE+M38Lac+CCi0YcKIj5C5rGeJvM72UCanQ8WfQAL
-v4FM9LbUk5PjdhBpPcTsPTkAmtguMSh/4jQzjBQak7yCwsxckjiM+Gk/JiZHq+st
-hlWq+1hFBrNmyLPwsjzDc6INgCROVU7qSEguaeZq3LY8dEU7W/zt0RRm0NWp9paD
-VP0atgY9I6G8h2p36HiqPgEc1XBYYWVorutyzLFvl6w2eMA9qZpjN5qzBIA2qyEe
-LXyJKt8bUqq9UahR5Xcn
-=WdA3
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MYZEP/21dCxXCoAs8PE5E42GIU5u7
+yllCz1dBNmmLYBsdJOepaSGjba5/nYsKHVL7qu3PHsP+q0V07VsEhMHKBQomjOKw
+AF1CKkH3xErxHiWcDvmnYPT7Q1D/HpTfoCILV0K5ZYhnXhSVVTT6rlh/f1BSPj/d
+ujfpWJy6RBFNw3iRjjeRd8/TYYrxHb0lPFGQuulQi6yMCf+TRg7rMEu+MRIc6ya2
+uSNABA3x03LmGNilime3AyrLI0/Ufvx+VWMnUKZ/P7BW3Ur5k1qZ33KOn/035fi/
+zjaMUzVCAVg7yADTfWMo7B9lXip/Z6DxLyrXXjF+2XTsnYIAYMjODTq35FYA8u0u
+D7naM5vlZshNFutjm0JLOSTxeBLcInK6F0W2VXDp8x1E4v7sm3OiwiD5f5Sm49wv
+QDZRYcOPuObVmSCklVK2Ucm+NfF33E+2PH9l9ZZmgxog88Jsfo/95vFNCPb3VlWd
+j/TWvh9PN2SqeUHEfWeyWG5E/BxSTG4iTzgHV6rQSbxVZie8kfMaFHhU1L97cy61
+5E76X4T5sSTDXbua9wMYdIIxa9u/CIhQeDQ8mMn2crHZy2MjHZ2gebbPTun1+z1r
+Bq5eERoVGncVdtnxt39ue+FGrZFZl1bshALZanQj3pEvxK45LKAyBmxR6ooIhWOC
+sBHMA8QuD8iHE1/z8fDl
+=fYmD
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/gcl/files/gcl-gmp-6.patch b/dev-lisp/gcl/files/gcl-gmp-6.patch
new file mode 100644
index 000000000000..f66638478af1
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-gmp-6.patch
@@ -0,0 +1,8 @@
+diff -r -U1 gcl.orig/configure gcl/configure
+--- gcl.orig/configure	2013-11-11 21:55:48.000000000 +0700
++++ gcl/configure	2014-03-30 17:25:04.874994142 +0700
+@@ -5027,3 +5027,3 @@
+ 				    int main() {
+-				    #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5
++				    #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5 || __GNU_MP_VERSION == 6
+ 					return 0;
diff --git a/dev-lisp/gcl/files/gcl-readline-6.3.patch b/dev-lisp/gcl/files/gcl-readline-6.3.patch
new file mode 100644
index 000000000000..063c772f1051
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-readline-6.3.patch
@@ -0,0 +1,18 @@
+diff -r -U1 gcl.orig/o/gcl_readline.d gcl/o/gcl_readline.d
+--- gcl.orig/o/gcl_readline.d	2013-11-11 21:55:48.000000000 +0700
++++ gcl/o/gcl_readline.d	2014-03-30 18:29:42.131967005 +0700
+@@ -53,2 +53,9 @@
+ 
++/* Deprecated CPPFunction disappeared in libreadline-6.3 */
++#if defined(_RL_FUNCTION_TYPEDEF)
++#define RL_COMPLETION_FUNC_T rl_completion_func_t
++#else
++#define RL_COMPLETION_FUNC_T CPPFunction
++#endif
++
+ int readline_on = 0;		/* On (1) or off (0) */
+@@ -471,3 +478,3 @@
+ #ifdef RL_COMPLETION
+-  rl_attempted_completion_function = (CPPFunction *)rl_completion;
++  rl_attempted_completion_function = (RL_COMPLETION_FUNC_T *)rl_completion;
+ #endif		
diff --git a/dev-lisp/gcl/files/gcl-tcl-8.6.patch b/dev-lisp/gcl/files/gcl-tcl-8.6.patch
new file mode 100644
index 000000000000..cfbf82e32899
--- /dev/null
+++ b/dev-lisp/gcl/files/gcl-tcl-8.6.patch
@@ -0,0 +1,103 @@
+diff --git a/gcl/gcl-tk/tkMain.c b/gcl/gcl-tk/tkMain.c
+index 74475cc..21c6c59 100755
+--- a/gcl/gcl-tk/tkMain.c
++++ b/gcl/gcl-tk/tkMain.c
+@@ -42,6 +42,11 @@
+ #if (TK_MINOR_VERSION==0 && TK_MAJOR_VERSION==4)
+ #define TkCreateMainWindow Tk_CreateMainWindow
+ #endif
++#if TCL_MAJOR_VERSION >= 8
++#define INTERP_RESULT(interp) Tcl_GetStringResult(interp)
++#else
++#define INTERP_RESULT(interp) (interp)->result
++#endif
+ 
+ 
+ /*-------------------------------------------------------------------*/
+@@ -276,7 +281,7 @@ TkX_Wish (argc, argv)
+ 
+     if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (void *)argv, argTable, 0)
+ 	    != TCL_OK) {
+-	fprintf(stderr, "%s\n", interp->result);
++	fprintf(stderr, "%s\n", INTERP_RESULT(interp));
+ 	exit(1);
+     }
+     if (name == NULL) {
+@@ -309,7 +314,7 @@ TkX_Wish (argc, argv)
+ 
+ /*     mainWindow = TkCreateMainWindow(interp, display, name/\*  , "Tk" *\/);  */
+ /*     if (mainWindow == NULL) { */
+-/* 	fprintf(stderr, "%s\n", interp->result); */
++/* 	fprintf(stderr, "%s\n", INTERP_RESULT(interp)); */
+ /* 	exit(1); */
+ /*     } */
+ /* #ifndef __MINGW32__     */
+@@ -362,7 +367,7 @@ TkX_Wish (argc, argv)
+     Tcl_FindExecutable ( argv[0] ); 
+ #else
+     if (Tcl_AppInit(interp) != TCL_OK) {
+-	fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result);
++	fprintf(stderr, "Tcl_AppInit failed: %s\n", INTERP_RESULT(interp));
+     }
+ #endif
+     /*
+@@ -372,7 +377,7 @@ TkX_Wish (argc, argv)
+     if (geometry != NULL) {
+ 	code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
+ 	if (code != TCL_OK) {
+-	    fprintf(stderr, "%s\n", interp->result);
++	    fprintf(stderr, "%s\n", INTERP_RESULT(interp));
+ 	}
+     }
+ 
+@@ -402,13 +407,13 @@ TkX_Wish (argc, argv)
+     
+ 	    fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer);
+ 	    if (fullName == NULL) {
+-		fprintf(stderr, "%s\n", interp->result);
++		fprintf(stderr, "%s\n", INTERP_RESULT(interp));
+ 	    } else {
+ 		f = fopen(fullName, "r");
+ 		if (f != NULL) {
+ 		    code = Tcl_EvalFile(interp, fullName);
+ 		    if (code != TCL_OK) {
+-			fprintf(stderr, "%s\n", interp->result);
++			fprintf(stderr, "%s\n", INTERP_RESULT(interp));
+ 		    }
+ 		    fclose(f);
+ 		}
+@@ -443,7 +448,7 @@ TkX_Wish (argc, argv)
+ error:
+     msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
+     if (msg == NULL) {
+-	msg = interp->result;
++	msg = INTERP_RESULT(interp);
+     }
+     dfprintf(stderr, "%s\n", msg);
+     Tcl_Eval(interp, errorExitCmd);
+@@ -566,13 +571,13 @@ StdinProc(clientData, mask)
+ 	      || code)
+ 	    {
+ 	      char buf[4];
+-	      char *p = buf;
++	      char *p = buf, *string;
+ 	      /*header */
+ 	      *p++ = (code ? '1' : '0');
+ 	      bcopy(msg->msg_id,p,3);
+ 	      /* end header */
+-	      if(sock_write_str2(dsfd, m_reply, buf, 4 ,
+-				 interp->result, strlen(interp->result))
++	      string = INTERP_RESULT(interp);
++	      if(sock_write_str2(dsfd, m_reply, buf, 4, string, strlen(string))
+ 		 < 0)
+ 		{		/* what do we want to do if the write failed */}
+ 	      
+@@ -752,7 +757,7 @@ guiBindCallback(char *szNameCmdProc, char *szTclObject, char *szModifier,char* a
+   code = Tcl_Eval(interp, szCmd);
+   if (code != TCL_OK)
+     {
+-      dfprintf(stderr, "TCL Error int bind : %s\n", interp->result);
++      dfprintf(stderr, "TCL Error int bind : %s\n", INTERP_RESULT(interp));
+ 
+     }
+   return code;
diff --git a/dev-lisp/gcl/files/tcl.patch b/dev-lisp/gcl/files/tcl.patch
deleted file mode 100644
index 1f3972500861..000000000000
--- a/dev-lisp/gcl/files/tcl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -r -U2 gcl.orig/gcl-tk/tkMain.c gcl/gcl-tk/tkMain.c
---- gcl.orig/gcl-tk/tkMain.c	2013-11-11 21:55:48.000000000 +0700
-+++ gcl/gcl-tk/tkMain.c	2014-02-05 00:09:38.821981358 +0700
-@@ -122,5 +122,5 @@
-      char *x;
- {char buf[300] ;
-- sprintf("error %s",x);
-+ snprintf(buf,300,"error %s",x);
-  Tcl_Eval(interp,buf);
-  dfprintf(stderr,x);
-@@ -207,5 +207,5 @@
-     if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (const char **)argv, argTable, 0)
- 	    != TCL_OK) {
--	fprintf(stderr, "%s\n", interp->result);
-+	fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- 	exit(1);
-     }
-@@ -291,5 +291,5 @@
- 
-     if (Tcl_AppInit(interp) != TCL_OK) {
--	fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result);
-+	fprintf(stderr, "Tcl_AppInit failed: %s\n", Tcl_GetStringResult(interp));
-     }
- 
-@@ -301,5 +301,5 @@
- 	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));
- 	}
-     }
-@@ -331,5 +331,5 @@
- 	    fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer);
- 	    if (fullName == NULL) {
--		fprintf(stderr, "%s\n", interp->result);
-+		fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- 	    } else {
- 		f = fopen(fullName, "r");
-@@ -337,5 +337,5 @@
- 		    code = Tcl_EvalFile(interp, fullName);
- 		    if (code != TCL_OK) {
--			fprintf(stderr, "%s\n", interp->result);
-+			fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- 		    }
- 		    fclose(f);
-@@ -372,5 +372,5 @@
-     msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-     if (msg == NULL) {
--	msg = interp->result;
-+	msg = Tcl_GetStringResult(interp);
-     }
-     dfprintf(stderr, "%s\n", msg);
-@@ -497,12 +497,11 @@
- 	    {
- 	      char buf[4];
--	      char *p = buf;
-+	      char *p = buf, *string;
- 	      /*header */
- 	      *p++ = (code ? '1' : '0');
- 	      bcopy(msg->msg_id,p,3);
- 	      /* end header */
--	      if(sock_write_str2(dsfd, m_reply, buf, 4 ,
--				 interp->result, strlen(interp->result))
--		 < 0)
-+	      string = Tcl_GetStringResult(interp);
-+	      if(sock_write_str2(dsfd, m_reply, buf, 4, string, strlen(string)) < 0)
- 		{		/* what do we want to do if the write failed */}
- 	      
diff --git a/dev-lisp/gcl/gcl-2.6.10.ebuild b/dev-lisp/gcl/gcl-2.6.10.ebuild
index 44a48d9b8e09..2fc055c0e8c9 100644
--- a/dev-lisp/gcl/gcl-2.6.10.ebuild
+++ b/dev-lisp/gcl/gcl-2.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.10.ebuild,v 1.1 2014/02/04 16:24:08 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.10.ebuild,v 1.2 2014/03/30 09:00:59 grozin Exp $
 
 EAPI=5
 inherit elisp-common eutils flag-o-matic
@@ -56,7 +56,9 @@ src_prepare() {
 	epatch "${WORKDIR}"/fedora/reloc-type.patch
 	epatch "${WORKDIR}"/fedora/largefile.patch
 
-	epatch "${FILESDIR}"/tcl.patch
+	epatch "${FILESDIR}"/${PN}-tcl-8.6.patch
+	epatch "${FILESDIR}"/${PN}-gmp-6.patch
+	epatch "${FILESDIR}"/${PN}-readline-6.3.patch
 
 	sed -e 's|"-fomit-frame-pointer"|""|' -i configure
 	sed -e 's|@EXT@||g' debian/in.gcl.1 > gcl.1
diff --git a/dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild b/dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild
deleted file mode 100644
index 54c66b8dd6a9..000000000000
--- a/dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20130314.ebuild,v 1.1 2013/03/14 12:06:29 grozin Exp $
-
-EAPI=5
-
-#removing flag-o-matic results in make install failing due to a segfault
-inherit elisp-common eutils flag-o-matic
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="http://dev.gentoo.org/~grozin/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ansi debug doc emacs +readline tk X"
-
-# See bug #205803
-RESTRICT="strip"
-
-RDEPEND="emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
-	virtual/latex-base"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )
-	>=app-text/texi2html-1.64
-	>=sys-devel/autoconf-2.52"
-
-src_configure() {
-	local myconfig=""
-	if use tk; then
-		myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib"
-	fi
-	myconfig="${myconfig} \
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
-		--enable-dynsysgmp \
-		--disable-xdr
-		$(use_enable readline) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable ansi)"
-
-	einfo "Configuring with the following:
-${myconfig}"
-	econf ${myconfig}
-}
-
-src_compile() {
-	make || die "make failed"
-	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
-}
-
-src_test() {
-	local make_ansi_tests_clean="rm -f test.out *.fasl *.o \
-	*.so *~ *.fn *.x86f *.fasl *.ufsl"
-	if use ansi; then
-		cd ansi-tests
-
-		( make clean && make test-unixport ) \
-		|| die "make ansi-tests failed!"
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| ../unixport/saved_ansi_gcl
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		|sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \
-		| ./bootstrapped_ansi_gcl
-
-		( ${make_ansi_tests_clean} && \
-		echo "(load \"gclload.lsp\")" \
-		| ./bootstrapped_r_ansi_gcl ) \
-		|| die "Phase 2, bootstraped compiler failed in tests"
-
-	else
-
-		ewarn "Upstream provides tests only for ansi-gcl."
-		ewarn "Please emerge with ansi USE flag enabled"
-		ewarn "if you wnat to run the ansi tests."
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| sed s/bootstrapped_ansi_gcl/bootstrapped_gcl/g \
-		| unixport/saved_gcl
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| sed s/bootstrapped_ansi_gcl/bootstrapped_r_gcl/g \
-		| ./bootstrapped_gcl
-
-		for x in "./bootstrapped_r_gcl" "unixport/saved_gcl" ; do
-			echo "(compiler::emit-fn t)" \
-				| ${x} \
-				|| die "Phase 2, bootstraped compiler failed in tests"
-		done
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -rf "${D}"usr/share/doc/${PN}-si "${D}"usr/share/doc/${PN}-tk
-
-	fperms 0755 /usr/bin/gcl
-
-	dodoc readme* RELEASE* ChangeLog* doc/*
-	doman gcl.1
-	doinfo info/*.info*
-
-	if use emacs; then
-		mv "${D}"usr/share/emacs/site-lisp/${PN}/add-default.el "${T}"/50${PN}-gentoo.el
-		elisp-site-file-install "${T}"/50${PN}-gentoo.el
-		elisp-install ${PN} elisp/*
-		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
-	else
-		rm -rf "${D}"usr/share/emacs
-	fi
-
-	if use doc; then
-		mv "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc* "${D}"usr/share/doc/${PF}/
-	else
-		rm -rf "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}