Fix for tcltk8.6, bug #460006; fix correct usage of python eclasses, bug #541796

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 100 insertions, 21 deletions

diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index 5cff223878c7..f48616c8d50a 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/metakit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.64 2015/03/20 09:15:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.65 2015/03/20 09:48:50 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/metakit-2.4.9.7-tcltk86.patch, metakit-2.4.9.7-r2.ebuild:
+  Fix for tcltk8.6, bug #460006; fix correct usage of python eclasses, bug
+  #541796
 
   20 Mar 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
   metakit-2.4.9.7-r1.ebuild, metakit-2.4.9.7-r2.ebuild:
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest
index e304ae80e7d5..669974a8aa86 100644
--- a/dev-db/metakit/Manifest
+++ b/dev-db/metakit/Manifest
@@ -2,27 +2,28 @@
 Hash: SHA512
 
 AUX metakit-2.4.9.7-linking.patch 1802 SHA256 4fe2e50a0901ec599322887a381430cf4a44c71a0e7f85e0541f2a756b6318b3 SHA512 911675e8ed060ba662df4bed55a9357bcbebaecb5bf4abe37218f8030aa057c36ed01a851c6d266d8d8fdb94a81ee78d547d86b99f96f8e81809dc4d94209f37 WHIRLPOOL 9533ecbc25a9f7014490a609ce52c71c7d5ba3c5e2b3890a69b0aba4088f58711a4d6d260d3e23bfa6861729e3f24a17d9bdb02515ccc510488e93c157b1b47e
+AUX metakit-2.4.9.7-tcltk86.patch 2449 SHA256 81ce36495df6cfd4d0d212ef5d7423f4576c13cd22c147057357a6dbb81554b6 SHA512 1d17157ea8e384bb9094ab937b1ac6854c5a140feb574fa53adf6fcc0dab4060a0f6da9008509f3d924bc1e0e84d6663778605ca506fdec99af39610f1f509b7 WHIRLPOOL cba2bfac2c9e7003215e16e16aa927770c7dc1b46874d3fce461beca741d500c31a7417b5c1771492cbd8850c2d1ea122d65502b7f35dba3aa36ad502bf7f617
 DIST metakit-2.4.9.7.tar.gz 868310 SHA256 d1ba361d2d8517925cff5c23e8602822da9c8c347a75a15c225ec656ff7ca94d SHA512 94be6ae8ae5f1f24d255a427b0c01eccd2543cd49c5620df7c47f5bf09854ed464a01c52fc8441f7a8e9d5bdc8b966dc77ed34c15cbf9cdfe75a3063572cb8b9 WHIRLPOOL 2736564da532bf50982c9a529fcb50cf95c1e27192bba15ac19606eba98a9c97408ca8888f9ddd38b2a07496e1ee020e2fcd3de77142267b27148cae3ed1a5d9
 EBUILD metakit-2.4.9.7-r1.ebuild 2184 SHA256 6e75467662519748ce1fc2be5fcfe97ef0fb142eb81da4e2a98bd2893b608bcb SHA512 41b7bd160ca85a7c7ef2a2b083ef1a3bd1b687d055a4dae6861cc7ad81bcc53260dcf91dc83fe7f2bc4ce2a0c368661bac8f9579df2f372ba7fe07dfbb6791be WHIRLPOOL f0dfbda3747b325ac286792046a24da62d7c1a730df61677a8a6e48b70475044c77d1d660da8165de248b80d22a40dc3ed28f4c064036fe727ea3eb94d71043a
-EBUILD metakit-2.4.9.7-r2.ebuild 1914 SHA256 96383d459b5dd847040ce09e7665e7666e6e3ca6357e30d614586fec5aafa6db SHA512 eb871376250304d9590976525910fced0e8b30520c9220132b66a4987c2ada3440e1c56d45879b1e9fb61d1ab86a63017b21b01f6f81ff654ea890592e00d71d WHIRLPOOL bce5b12856c13cd5a12f0d4a7dbd0fefbdcdd5ca443375fcce04e1c2f75297daaa33d32d7abb8a3801b6f398dc9a97dd44f91e49e385f976d0533eda9b5efbda
-MISC ChangeLog 7944 SHA256 40b17ee31c9b58912dac00f9cc878971c00352cdad5174bf1da1f5bb4ebe2bec SHA512 060d420478b7a2e6b647e74f6f91f376881aa0effd44c539e282330804198a3b0d9e53a0c40a42a917351fd6461e93b2136798e7fff94bf0aa3d369275a7f240 WHIRLPOOL 64a8f27ae2e811d1ae5086c2ac3def3f50a5b7413dde1cd295fb2897f1986b316b9dab8ea0ff01f9324c7fce204c67a9d0ce82cbe1432c82bafbbafafb9559a8
+EBUILD metakit-2.4.9.7-r2.ebuild 1948 SHA256 d618b567127d97604b42645c769982d208e3db041ac98f15c78459a627fc3425 SHA512 7e23aacbd1b1bbda6f57538065311fb7fae0546c013d80bd3df0444cb3bd01674a3361ce8da23b08cc9558d3d8700a52be8059ccce3d4e1c8fd37cba6a26738e WHIRLPOOL 6598c9d44015a7be83bd4d1aa4b402a39d78b135c83e89a6582a8e12536c9361923b40ad339f69f92b55aa3cd94c050f13242fab42ee0a84b2cdceeb388d8e45
+MISC ChangeLog 8144 SHA256 f37b2a4b5d025fa0774f91c3c39220b6afd677f5ac7497868de6337495fe09e8 SHA512 c2c9de04558e86648a1f7689862546947ae9c04de202b8e79c9fa125ee462a0142b4102c4503294f1ed607f0ce6c24d42c899a2d8353329a42a55b180254c9d6 WHIRLPOOL 76b567e388cb16ee6fccdada48fb973d778734fc49e38a1899f22e24f5717961d8d595a73dbf38884aada9a24806fa2f0fea514eea247c6be66b22ba992c8c73
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVC+VEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVC+0DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirYA4P/izDEv1JhuH72k324CmuNNOj
-HNiGH53xaGpT7WGmjoFiiU9kbIzYuQDk3/eVvYozeLARK/1rMSs9FZmQGpYdmRSa
-5BsWu+a5qnxYJctPwHYcCyWpu3oGQqMllw6lCmQUozkCiiAG7MHhIFeYc1Om5Ieb
-xAMzLXGJyHkssXtx17GVXjQsbZVE7o3r41iEPVr615D7UUvJlowrOAl6GU31Q9BT
-oDBTpj2b3fcy6lqDzD5wwI7+XrOn7Z2MJq5UuyGiagZtfBGEReSZgHCHkcohRv7u
-z/UbhaZk7RLmaHKtJ6NICNbaHU2/b4ciNgq98AhPsB3tQSWWlu/6FUXjzR3K6GuX
-C4ZbVvp83uVN8NSXEx6mEJazmuy/vv++OBbfZkTYUvQiuKABptZaYnQGrulQ+m0f
-u7VqQJ52jDJ0xGZC1meTetdnCXe3P6r/QUDg6/kKp3Zx7WmEGRQ3vpG01EsETZI4
-7VAQEKFFaW2WrwnGjFkPwgg1wcTFwUcBRBOpJ39Sg4SYPMBIpYtk57AS1r5q2x6j
-zGDxQLjGv6AGJZbTtw8/JiMzJIXGdfCzCOny2xfeCde/bikWXbEvKC4m+obhcchZ
-huehxjhpUl55rEIYDi1ZqShPPvzmQ6CSNOSCW3qWxbFgLELBTc8B6OV/od/SYgxC
-UfnVJQkginTkg/quPM6J
-=92Gm
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirVBoQAJPsaZzr5ZEydqeNg3f+cPrv
+pAZc0eE+n0HuJaY0SRMEUAvJIvc1XrL+vE8+JiMRy/Ap8M1pdHbOJBIQp923PFEY
+UhjVeiizNk8fRYEmQtx3orYnpZX/Uu4JCbImnBRfrp0zlM92zvWC0e1L+GszoLnQ
+MBipaKhy2i9cFqTRixjPlgb9cjMCfa0GaU2TzGeV/HhKwPkFu5HSE6UdkgwpfaBK
+KywdZRbvrIdpyi/QseVpDYPESJ9OdiGteS3/g3/MWXV28CMfSiocnbOQFfSNmDfV
+30H5OgWGsgcWXg8OSQn9zUvQI21WphLo6EoXDZR8kQrSQ+CssM9dWIVmV5utARK8
+4uKY2HqWJ4KI/3cm9KA0+mr9z1P4vNhfbqN7zde+KUQ5IQJFBML6PDpsO1oqR+gX
+KD6Ov1VISH68Vf0O5T3cRGfR9ZO+fedOyj0mckE5uBs93rktmfSPQm14MLBiogFz
++IQIJdr8+qb+WMAu+P9ZIrP9dc7+89lxbLm9KlTeTA67oIq73lIDJDEGHNyBjbwD
+0Zte/y9sqR5xj8F+NObJsV/6ee/7qbaBsuN1O9uRtM7XCK5Txu710SMduqeM2Fq6
+povMQI/XIs54rPPfk8pMJ0Flt7QSKQpdjst+ShYe3DhJU1SkCe/52/olmowq/SdU
+VACHsC0sR6aIsKOK1own
+=xwMH
 -----END PGP SIGNATURE-----
diff --git a/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch b/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch
new file mode 100644
index 000000000000..cbf4ce3549f6
--- /dev/null
+++ b/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch
@@ -0,0 +1,70 @@
+ tcl/mk4tcl.cpp | 10 +++++++---
+ tcl/mk4too.cpp |  6 +++++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/tcl/mk4tcl.cpp b/tcl/mk4tcl.cpp
+index 049bf8e..8d2249e 100755
+--- a/tcl/mk4tcl.cpp
++++ b/tcl/mk4tcl.cpp
+@@ -28,6 +28,10 @@
+ #define MyInitStubs(x) 1
+ #endif 
+ 
++#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
++#define Tcl_GetErrorLine(interp) (interp)->errorLine
++#endif
++
+ // definition of valid property name - alpha numerics, underscore, percent,
+ // or any extended utf-8 character
+ #define ISNAME(c)       (isalnum((c)) || (c) == '_' || (c) == '%' || (c) & 0x80)
+@@ -979,7 +983,7 @@ const c4_Property &AsProperty(Tcl_Obj *objPtr, const c4_View &view_) {
+   void *tag = (&view_[0])._seq; // horrific hack to get at c4_Sequence pointer
+   if (objPtr->typePtr !=  &mkPropertyType || objPtr
+     ->internalRep.twoPtrValue.ptr1 != tag) {
+-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
++    CONST86 Tcl_ObjType *oldTypePtr = objPtr->typePtr;
+ 
+     char type = 'S';
+ 
+@@ -1083,7 +1087,7 @@ int SetCursorFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr) {
+   }
+ 
+   if (objPtr->typePtr !=  &mkCursorType) {
+-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
++    CONST86 Tcl_ObjType *oldTypePtr = objPtr->typePtr;
+ 
+     const char *string = Tcl_GetStringFromObj(objPtr, 0);
+ 
+@@ -2156,7 +2160,7 @@ int MkTcl::LoopCmd() {
+         _error = TCL_OK;
+       else if (_error == TCL_ERROR) {
+         char msg[100];
+-        sprintf(msg, "\n  (\"mk::loop\" body line %d)", interp->errorLine);
++        sprintf(msg, "\n  (\"mk::loop\" body line %d)", Tcl_GetErrorLine(interp));
+         Tcl_AddObjErrorInfo(interp, msg,  - 1);
+       }
+       break;
+diff --git a/tcl/mk4too.cpp b/tcl/mk4too.cpp
+index 7c845c0..ffcbc4e 100644
+--- a/tcl/mk4too.cpp
++++ b/tcl/mk4too.cpp
+@@ -7,6 +7,10 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
++#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
++#define Tcl_GetErrorLine(interp) (interp)->errorLine
++#endif
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // Defined in this file:
+ 
+@@ -612,7 +616,7 @@ int MkView::LoopCmd() {
+           _error = TCL_OK;
+         else if (_error == TCL_ERROR) {
+           char msg[100];
+-          sprintf(msg, "\n  (\"mk::loop\" body line %d)", interp->errorLine);
++          sprintf(msg, "\n  (\"mk::loop\" body line %d)", Tcl_GetErrorLine(interp));
+           Tcl_AddObjErrorInfo(interp, msg,  - 1);
+         }
+         break;
diff --git a/dev-db/metakit/metakit-2.4.9.7-r2.ebuild b/dev-db/metakit/metakit-2.4.9.7-r2.ebuild
index 0f12df253226..111e4486f5a1 100644
--- a/dev-db/metakit/metakit-2.4.9.7-r2.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7-r2.ebuild,v 1.2 2015/03/20 09:15:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7-r2.ebuild,v 1.3 2015/03/20 09:48:50 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="python static tcl"
 
-DEPEND="python? ( ${PYTHON_DEPS} )
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
 	tcl? ( dev-lang/tcl:0= )"
 RDEPEND="${DEPEND}"
 
@@ -30,7 +31,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-linking.patch"
+	epatch \
+		"${FILESDIR}"/${P}-linking.patch \
+		"${FILESDIR}"/${P}-tcltk86.patch
 }
 
 src_configure() {
@@ -55,7 +58,7 @@ src_compile() {
 		emake \
 			SHLIB_LD="$(tc-getCXX) -shared" \
 			pyincludedir="$(python_get_includedir)" \
-			PYTHON_LIB="$(python_get_library)" \
+			PYTHON_LIB="-l${EPYTHON}" \
 			python
 	fi
 }