Fix build with tcl-8.6, bug #452034. Drop old.

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

5 files changed, 33 insertions, 65 deletions

diff --git a/sci-electronics/gnetman/ChangeLog b/sci-electronics/gnetman/ChangeLog
index 544c5a60746c..4fd2dac01e51 100644
--- a/sci-electronics/gnetman/ChangeLog
+++ b/sci-electronics/gnetman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/gnetman
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/ChangeLog,v 1.14 2015/03/25 16:54:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/ChangeLog,v 1.15 2015/04/06 11:14:48 mgorny Exp $
+
+  06 Apr 2015; Michał Górny <mgorny@gentoo.org>
+  +files/gnetman-0.0.1_pre20110124-tcl86.patch,
+  -gnetman-0.0.1_pre20041222.ebuild, -gnetman-0.0.1_pre20060522-r2.ebuild,
+  gnetman-0.0.1_pre20110124.ebuild:
+  Fix build with tcl-8.6, bug #452034. Drop old.
 
   25 Mar 2015; Justin Lecher <jlec@gentoo.org> gnetman-0.0.1_pre20041222.ebuild,
   gnetman-0.0.1_pre20060522-r2.ebuild, gnetman-0.0.1_pre20110124.ebuild:
diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch
new file mode 100644
index 000000000000..fdb6573990f4
--- /dev/null
+++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch
@@ -0,0 +1,20 @@
+--- gnetman-0.0.1_pre20110124_orig/src/tcl/tclwrap.c	2012-05-25 07:44:51.000000000 +0200
++++ gnetman-0.0.1_pre20110124/src/tcl/tclwrap.c	2013-02-24 12:58:51.000000000 +0100
+@@ -46,7 +46,7 @@
+    result = Tcl_EvalFile(interp, (char *)fileName) == TCL_OK;
+    if (!result) {
+       utWarning("Tcl error in file %s, line %d: %s", fileName,
+-         interp->errorLine, interp->result);
++         Tcl_GetErrorLine(interp), Tcl_GetStringResult(interp));
+    }
+    return result;
+ }
+@@ -75,7 +75,7 @@
+       commandLine[xChar] = '\0';
+       result = Tcl_Eval(interp, commandLine);
+       if (result == TCL_ERROR) {
+-        utWarning("Tcl error: %s", interp->result);
++        utWarning("Tcl error: %s", Tcl_GetStringResult(interp));
+       }
+    } while (result != TCL_RETURN);
+    return true;
diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild
deleted file mode 100644
index e8ca7a8ceaa0..000000000000
--- a/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20041222.ebuild,v 1.5 2015/03/25 16:54:29 jlec Exp $
-
-EAPI=4
-
-MY_PV="22Dec04"
-
-DESCRIPTION="A GNU Netlist Manipulation Library"
-HOMEPAGE="http://www.viasic.com/opensource/"
-SRC_URI="http://www.viasic.com/opensource/gnetman-${MY_PV}.tar.gz"
-
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ppc ~x86"
-
-DEPEND="dev-lang/tk:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild
deleted file mode 100644
index 76604e77e5d0..000000000000
--- a/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20060522-r2.ebuild,v 1.4 2015/03/25 16:54:29 jlec Exp $
-
-EAPI=4
-
-MY_P="${PN}-22May06"
-
-DESCRIPTION="A GNU Netlist Manipulation Library"
-HOMEPAGE="http://sourceforge.net/projects/gnetman/
-	http://www.viasic.com/opensource/"
-SRC_URI="http://www.viasic.com/opensource/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc examples"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="
-	dev-lang/tk:0
-	sci-electronics/geda"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/ sym / /' Makefile.in || die "sed failed"
-	if use examples ; then
-		sed -i -e "s:gEDA/sch/gnetman:doc/${PF}/examples:" \
-			sch/Makefile.in || die "sed failed"
-		sed -i -e "s:gEDA/examples/gnetman:doc/${PF}/examples:" \
-			test/Makefile.in || die "sed failed"
-	else
-		sed -i -e 's/ sch test//' Makefile.in || die "sed failed"
-	fi
-}
-
-src_install () {
-	default
-	use doc && dodoc doc/*.{html,jpg}
-}
diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild
index 4fa8b8f7d537..6394b7c09a9f 100644
--- a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild
+++ b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild,v 1.2 2015/03/25 16:54:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild,v 1.3 2015/04/06 11:14:48 mgorny Exp $
 
 EAPI=4
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A GNU Netlist Manipulation Library"
 HOMEPAGE="http://sourceforge.net/projects/gnetman/"
@@ -30,6 +30,10 @@ src_prepare() {
 		-e '/^$(TARGET):/,+3s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
 		-i configure || die
 	tc-export CC
+
+	cd ../.. || die
+	# fix build issues with tcl-8.6, #452034
+	epatch "${FILESDIR}/${P}-tcl86.patch"
 }
 
 src_install () {