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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 83 insertions, 5 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/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
 }