From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CA6E51381F3 for ; Wed, 26 Jun 2013 14:53:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE86CE095A; Wed, 26 Jun 2013 14:53:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 151A8E095A for ; Wed, 26 Jun 2013 14:53:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B9D133E75F for ; Wed, 26 Jun 2013 14:53:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5A93DE468F for ; Wed, 26 Jun 2013 14:53:18 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1372229659.84f2e60f8093d6fe3fe38552d29f44b69732df34.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/, sys-cluster/modules/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/modules/files/modules-3.2.10-errorline.patch sys-cluster/modules/modules-3.2.10.ebuild X-VCS-Directories: sys-cluster/modules/files/ sys-cluster/modules/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 84f2e60f8093d6fe3fe38552d29f44b69732df34 X-VCS-Branch: master Date: Wed, 26 Jun 2013 14:53:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5a9998e6-a185-4268-b1c1-e210158ce570 X-Archives-Hash: d9dcd5370c4a1aebcfcda7fca7ad18ca commit: 84f2e60f8093d6fe3fe38552d29f44b69732df34 Author: Andreas Schäfer gmx de> AuthorDate: Wed Jun 26 06:54:19 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jun 26 06:54:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=84f2e60f added TCL patch to modules 3.2.10 ebuild --- sys-cluster/modules/files/modules-3.2.10-errorline.patch | 15 +++++++++++++++ sys-cluster/modules/modules-3.2.10.ebuild | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys-cluster/modules/files/modules-3.2.10-errorline.patch b/sys-cluster/modules/files/modules-3.2.10-errorline.patch new file mode 100644 index 0000000..a319ac8 --- /dev/null +++ b/sys-cluster/modules/files/modules-3.2.10-errorline.patch @@ -0,0 +1,15 @@ +diff -ru modules-3.2.9-old/cmdModule.c modules-3.2.9/cmdModule.c +--- modules-3.2.9-old/cmdModule.c 2013-06-02 22:46:09.196302980 +0200 ++++ modules-3.2.9/cmdModule.c 2013-06-02 22:53:36.706298800 +0200 +@@ -640,8 +640,8 @@ + case TCL_OK: gotPartial = 0; + continue; /** while **/ + +- case TCL_ERROR: interp->errorLine = ((linenum-1)-gotPartial) + +- interp->errorLine; ++ case TCL_ERROR: Tcl_SetErrorLine(interp, ((linenum-1)-gotPartial) + ++ Tcl_GetErrorLine(interp)); + /* FALLTHROUGH */ + + case TCL_LEVEL0_RETURN: +Nur in modules-3.2.9: cmdModule.c~. diff --git a/sys-cluster/modules/modules-3.2.10.ebuild b/sys-cluster/modules/modules-3.2.10.ebuild index 8c54903..8ec69c8 100644 --- a/sys-cluster/modules/modules-3.2.10.ebuild +++ b/sys-cluster/modules/modules-3.2.10.ebuild @@ -26,9 +26,9 @@ S="${WORKDIR}/${P%[a-z]}" DOCS=(ChangeLog README NEWS TODO) -#src_prepare() { -# epatch "${FILESDIR}/${P}-errorline.patch" -#} +src_prepare() { + has_version ">=dev-lang/tcl-8.6.0" && epatch "${FILESDIR}/${P}-errorline.patch" +} src_configure() { local myeconfargs=(