app-dicts/wordnet: Fix compilation gainst tcl-8.6, #451400

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

5 files changed, 159 insertions, 9 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index 93353a7f53d4..e4746887bee1 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/wordnet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.23 2012/05/31 03:36:03 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.24 2013/03/01 13:15:19 jlec Exp $
+
+  01 Mar 2013; Justin Lecher <jlec@gentoo.org> wordnet-3.0-r3.ebuild,
+  +files/wordnet-3.0-tcl8.6.patch, metadata.xml:
+  Fix compilation gainst tcl-8.6, #451400
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> wordnet-3.0-r2.ebuild,
   wordnet-3.0-r3.ebuild:
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index c2fdec51f865..7ea638a85585 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX wordnet-3.0-dict-location.patch 1542 SHA256 8eaae12a77610e10003d26ac6e10b394bbaab2aefc56ceb843e4f65d65b125c2 SHA512 4ebcf63d0492744aa7b0e061362a5fa386e7c3b36a9451b1235e813c56259f7ef52b1e7028ebd95ba4414c67cc8c26aae11e62109e2ffa682c09c37b28596f1c WHIRLPOOL 78607a0861b9281a14c4d65eb176da47a1a2e43bb8f39ce2a8b6038fbe37ff16604b9aa0f01ae3fe3626b8f50d011c1290c8f345ed66a2e54264ccceca576ecf
 AUX wordnet-3.0-docs-path.patch 2832 SHA256 26130edeadc7c6993faa8a1471c5cac87c533d3e1c927eb5d59716f5b47a808d SHA512 10dec6da3f6853bdf0b6cbbcf47540ae2d682007d145eaab81fd5e532f8ff96067957b5225f82302114adb806f0a2d8a7bf0a8ae95a091473059c96028d7d1a1 WHIRLPOOL 6e6c3d8268a7dc3e08b3d9ee20681f9ab947cd3341868c150a2a2cc53e1d7b94b20667c0fdb1f181e8e6a6a6928b63ae749f22d788fe17ab9e44dd59fc855c5d
 AUX wordnet-3.0-shared-lib.patch 921 SHA256 bcca076ec3581a88f7a221dd419e0e69e88d896018776cde5d56019a020d9cc1 SHA512 a06ca1a855a5cfd74f2dad2c90c09eb463bbc20992f17626aefacc0e7d6b435a93c56002735267c57911cae6af50bdfbacc3966c96ee129099d65dcb53782359 WHIRLPOOL 8a5c66e6c2ddb5f3c4ccef76748cb5c6753a269dce2feabef9097dd4305f248b08746cd64d344e962dfcb19d6a8ee6414d85d837542df32799852d012e2b01e1
+AUX wordnet-3.0-tcl8.6.patch 4974 SHA256 97d551b2a7766de8c9f113f94e768a52d450e07c974dbac20bf7ea8df04b35d3 SHA512 2dafc6a6cd332d387fa15b63a7c5cad222e611906582232f7bd6f2522773336e7b632775e73fcd1a8587bd95eabaf70ec1c9ea4b8a81a7c147360a836be0a90c WHIRLPOOL 5416b325ec5abac95d5b0802b8994e6e5d2db8b2b28241155402fca21e88f373785d94cd57506485fa6c890d0a0ee99d9cf2ca9f887720be0a7ae1e80e2d6a8b
 DIST WordNet-3.0.tar.gz 11537227 SHA256 b4d8b1feeb22defe686cf1c5062d723bd854997614da9547fa135e5137843531 SHA512 d39c008cec41de8f1b2aeacb4ad818f9997a13b30a992fda100b6dcc9c11c253530b00a1909b55ff7b564bafc33f7763c1ce9b0a6ae3e591695db2083e9ead7a WHIRLPOOL cfba84209b4366b1ab381957f82cc2a32039d073baf8fbd44252c829c9291be76f05b214e014157f3ec03a354aaec68a14e20103dde37d11f13b846056aa90f4
 DIST wordnet-3.0-patchset-1.tar.bz2 8076 SHA256 d8333b107f53e188981e9ec0e1e53890c8bd7155924ae140c777c3f443d8aba7 SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb WHIRLPOOL 30e3820c2679148206bc14d5acf8eb7a2bde422f13ce2e9b0a90145e510667d70b1c1ef5d3486c85eddf6492c72b2243672683164f917f8ff5910370e30bd0f8
 EBUILD wordnet-3.0-r2.ebuild 1873 SHA256 43b78cb37ff85a741abf9d30b6bac073364e3791f21397b3c8fd9af3089e91c4 SHA512 e599eb729f8ab56d6e16426010824db41ae370ce42968638f300a4b9515c89658455fd3ddbbbf9995191b967f2212d277737aec911764949bde41a32357bfd20 WHIRLPOOL 7bb70ea76fa44c6512c96d413e3c0f5c1226161270eebe6ea7f1b391bd8814283982ccb14f40d7c2c9d82e898aa62d3f5000a9b8fdc02cb744468e3f9d228efb
-EBUILD wordnet-3.0-r3.ebuild 2227 SHA256 cbbaea8a1c4a262d40105093994eef734b0a3a0dc74febcc848a7e0b15c62fac SHA512 0b4434620d7c8825df4d9c4e72d7b7104d5f855881994a9c55fcb3887aecb3e25fd06eb6d8927b83e1145205bb650731d2441d59957e84345a9f53ec783e44d9 WHIRLPOOL 1c77750b2613962c81bb202d2bb132a5a8e1eed4c9162d457a3eee9cfb482fae3a6d4a2edafd27f102f772c568b7cc57cd61ddcd96aba4202eb2e75721cb904a
-MISC ChangeLog 4141 SHA256 afad3c3a371b73feba9f94e515f35e3b2201a691847975e075adc49677f7b24f SHA512 93a722c0b03b3cf43e5ee154213c157ce3f719769da60912bbe61ea20809ccc09f8c13b100848f1d0de34f778495e086435bbb2de3555f45f8ab17cb4f6c4988 WHIRLPOOL 2e5f095b753170232f2c9f84dcd839fedc959639eb05fc38b98cb9246856a82181aa30fb4ab60a4fb004be10fdb7b3f15686291eb5c89706040a8bc642d63c9c
-MISC metadata.xml 162 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22 SHA512 1105ff6ba8380eeed2f0e7616ad463a9b0ee4ed8737faeb51778f6c2b5ab194a9bebc1819c23d7f71d8de56528da2fa4b1500ee284e3ad3f6ed3b074aedff219 WHIRLPOOL 2c31ba5d72bf1aacce8951224a017c676c28d93d62f7d8dd67c5d1c647ed2bab0842c8654544b18ddb9e9db22778e67c9b3674f541ec238e678c95097ae92435
+EBUILD wordnet-3.0-r3.ebuild 2268 SHA256 c88f52c246d3654b55c5ca658d60b285ea691aa28832bd8ade943f92bedefea9 SHA512 f2b2ddbfff2a8dd48c4413989170fd2b645e1c29d428e3f8a7f84c1823b99fbaa8da54583f00573c97b1b0b94d448990d288c49c4a766c9d712029933982da56 WHIRLPOOL 92e5f7dcc64bdc3bf7170fcb70e250467ea27d76001689be83f5f29d1ee5f4a8ada8d350d9a0b5cd7085bccb0d515b1e216d698cf89e3f6ecf345e6dc4c68f29
+MISC ChangeLog 4300 SHA256 dae2e5aa6c46530579b60f0d9ff64db425c121f49a2f1254f119c2aec3be0ee5 SHA512 0866e39b9de9110b880b9a92a3990095e3fec804e8d995256552e9f0454b63f0d510907f57268f35727420d8d9e7e89ee5fd6301909c8a7f0c3af8db73801c21 WHIRLPOOL 6df759e56b6b9769bc2d84c2227ffe5d8261ce7de3963d835974a0116c1675f5841f23356f6d26c85d848a0f74cb6ab51456a42d6d0ea5bb8046fee1b28b7862
+MISC metadata.xml 164 SHA256 75ae6541b1d5c0835d670d7a6c327ca16d2540e113d0c3398dd4e8db7da25002 SHA512 4b513c2584adb4cca42b833ace70fd6bef92d63402aa4a02c19b10073db47480cb88298379358a04dc17296f109325b0573155bce8962e1164950f382dc9621f WHIRLPOOL 2b03aaf2717667c0676308927aa5fed539d7a0aad8b87f201b88db7c2c23bab160e1c3b41bdf4cdeb343b981c43609ec34dc09a03f3ad94654bc8021d84fd79b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEwqekACgkQgAnW8HDreRZX3QCgwvPxbjtSGIHcZ6zO4Z7Llnw0
+AlkAnjLQkkZVHpZczQWDw5Xig+2CzFft
+=yML5
+-----END PGP SIGNATURE-----
diff --git a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch b/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
new file mode 100644
index 000000000000..110ffc2110b8
--- /dev/null
+++ b/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
@@ -0,0 +1,133 @@
+ src/stubs.c | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/src/stubs.c b/src/stubs.c
+index 794485c..cec2c04 100644
+--- a/src/stubs.c
++++ b/src/stubs.c
+@@ -40,8 +40,8 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
+    char *morph;
+    int pos;
+    if (argc != 3) {
+-      interp -> result = 
+-         "usage: findvalidsearches searchword partofspeechnum";
++      Tcl_SetResult(interp,
++         "usage: findvalidsearches searchword partofspeechnum", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    pos = atoi (argv[2]);
+@@ -52,7 +52,7 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
+       } while ((morph = morphstr (NULL, pos)) != NULL);
+    }
+    sprintf (bitfieldstr, "%u", bitfield);
+-   interp -> result = bitfieldstr;
++   Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
+    return TCL_OK;
+ }
+ 
+@@ -69,13 +69,13 @@ int wn_bit (ClientData clientData, Tcl_Interp *interp,
+    static char bitfieldstr[32];
+    int whichbit;
+    if (argc != 2) {
+-      interp -> result = "usage: bit bitnum";
++      Tcl_SetResult(interp, "usage: bit bitnum", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    whichbit = atoi (argv[1]);
+    bitfield = bit (whichbit);
+    sprintf (bitfieldstr, "%u", bitfield);
+-   interp -> result = bitfieldstr;
++   Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
+    return TCL_OK;
+ } 
+ 
+@@ -89,8 +89,8 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
+    int pos, searchtype, sense;
+    char *morph;
+    if (argc != 5) {
+-      interp -> result = 
+-         "usage: search searchword partofspeechnum searchtypenum sensenum";
++      Tcl_SetResult(interp,
++         "usage: search searchword partofspeechnum searchtypenum sensenum", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    pos = atoi (argv[2]);
+@@ -102,7 +102,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
+          strcat (resultbuf, findtheinfo (morph, pos, searchtype, sense));
+       } while ((morph = morphstr (NULL, pos)) != NULL);
+    }
+-   interp -> result = resultbuf;
++   Tcl_SetResult(interp, resultbuf, TCL_STATIC);
+    return TCL_OK;
+ }
+ 
+@@ -114,7 +114,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
+ int wn_glosses (ClientData clientData, Tcl_Interp *interp,
+    int argc, char *argv[]) {
+    if (argc != 2) {
+-      interp -> result = "usage: glosses [1 | 0]";
++      Tcl_SetResult(interp, "usage: glosses [1 | 0]", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    dflag = atoi (argv[1]);
+@@ -129,7 +129,7 @@ int wn_glosses (ClientData clientData, Tcl_Interp *interp,
+ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
+    int argc, char *argv[]) {
+    if (argc != 2) {
+-      interp -> result = "usage: fileinfo [1 | 0]";
++      Tcl_SetResult(interp, "usage: fileinfo [1 | 0]", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    fileinfoflag = atoi (argv[1]);
+@@ -144,7 +144,7 @@ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
+ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
+    int argc, char *argv[]) {
+    if (argc != 2) {
+-      interp -> result = "usage: byteoffset [1 | 0]";
++      Tcl_SetResult(interp, "usage: byteoffset [1 | 0]", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    offsetflag = atoi (argv[1]);
+@@ -159,7 +159,7 @@ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
+ int wn_senseflag (ClientData clientData, Tcl_Interp *interp,
+    int argc, char *argv[]) {
+    if (argc != 2) {
+-      interp -> result = "usage: senseflag [1 | 0]";
++      Tcl_SetResult(interp, "usage: senseflag [1 | 0]", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    wnsnsflag = atoi (argv[1]);
+@@ -175,12 +175,13 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
+    int argc, char *argv[]) {
+    int pos, searchtype;
+    if (argc != 3) {
+-      interp -> result = "usage: contextualhelp partofspeechnum searchtypenum";
++      Tcl_SetResult(interp,
++            "usage: contextualhelp partofspeechnum searchtypenum", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    pos = atoi (argv[1]);
+    searchtype = atoi (argv[2]);
+-   interp -> result = helptext[pos][searchtype];
++   Tcl_SetResult(interp, helptext[pos][searchtype], TCL_STATIC);
+    return TCL_OK;
+ }
+ 
+@@ -190,7 +191,7 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
+ int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
+    int argc, char *argv[]) {
+    if (argc != 1) {
+-      interp -> result = "usage: reopendb";
++      Tcl_SetResult(interp, "usage: reopendb", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    re_wninit ();
+@@ -204,7 +205,7 @@ int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
+ int wn_abortsearch (ClientData clientData, Tcl_Interp *interp,
+    int argc, char *argv[]) {
+    if (argc != 1) {
+-      interp -> result = "usage: abortsearch";
++      Tcl_SetResult(interp, "usage: abortsearch", TCL_STATIC);
+       return TCL_ERROR;
+    }
+    abortsearch = 1;
diff --git a/app-dicts/wordnet/metadata.xml b/app-dicts/wordnet/metadata.xml
index 8f9450df306e..9ba4ed3f5685 100644
--- a/app-dicts/wordnet/metadata.xml
+++ b/app-dicts/wordnet/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>app-dicts</herd>
+  <herd>app-dicts</herd>
 </pkgmetadata>
diff --git a/app-dicts/wordnet/wordnet-3.0-r3.ebuild b/app-dicts/wordnet/wordnet-3.0-r3.ebuild
index 9b84c9198bf5..0368285827fe 100644
--- a/app-dicts/wordnet/wordnet-3.0-r3.ebuild
+++ b/app-dicts/wordnet/wordnet-3.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r3.ebuild,v 1.5 2012/05/31 03:36:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r3.ebuild,v 1.6 2013/03/01 13:15:19 jlec Exp $
 
 EAPI="3"
 
@@ -34,6 +34,8 @@ src_prepare() {
 	epatch "${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
 	epatch "${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
 
+	epatch "${FILESDIR}"/${P}-tcl8.6.patch
+
 	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
 	use doc || sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am
 
@@ -47,7 +49,7 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags -DUNIX -I"${T}"/usr/include
+	append-cppflags -DUNIX -I"${T}"/usr/include
 
 	PLATFORM=linux WN_ROOT="${T}/usr" \
 	WN_DICTDIR="${T}/usr/share/wordnet/dict" \