From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 429E7138334 for ; Sat, 3 Aug 2019 09:28:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 717DBE0831; Sat, 3 Aug 2019 09:28:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 467EDE0831 for ; Sat, 3 Aug 2019 09:28:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6AB28349393 for ; Sat, 3 Aug 2019 09:28:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E20D4738 for ; Sat, 3 Aug 2019 09:28:21 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1564824487.8b9a5153b00803bc29cd6809f3d7725d0589f3c0.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch sci-electronics/kicad/kicad-5.1.0-r1.ebuild sci-electronics/kicad/kicad-5.1.0.ebuild sci-electronics/kicad/kicad-5.1.2-r1.ebuild sci-electronics/kicad/kicad-5.1.2.ebuild X-VCS-Directories: sci-electronics/kicad/ sci-electronics/kicad/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 8b9a5153b00803bc29cd6809f3d7725d0589f3c0 X-VCS-Branch: master Date: Sat, 3 Aug 2019 09:28:21 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1924a4e8-9da1-4d06-9574-312448df2ab0 X-Archives-Hash: b84e8e5a0772033c58420eccd316eefa commit: 8b9a5153b00803bc29cd6809f3d7725d0589f3c0 Author: Zoltan Puskas sinustrom info> AuthorDate: Mon Jul 29 06:58:00 2019 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Sat Aug 3 09:28:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9a5153 sci-electronics/kicad: Fix 5.1.x build issues with swig-4.0.0 Closes: https://bugs.gentoo.org/690146 Signed-off-by: Zoltan Puskas sinustrom.info> Package-Manager: Portage-2.3.69, Repoman-2.3.16 Closes: https://github.com/gentoo/gentoo/pull/12568 Signed-off-by: Alexey Shvetsov gentoo.org> sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 ++++++++++++ .../kicad/{kicad-5.1.0.ebuild => kicad-5.1.0-r1.ebuild} | 1 + .../kicad/{kicad-5.1.2.ebuild => kicad-5.1.2-r1.ebuild} | 1 + 3 files changed, 14 insertions(+) diff --git a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch new file mode 100644 index 00000000000..3ab6677e5e1 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch @@ -0,0 +1,12 @@ +--- a/scripting/build_tools/fix_swig_imports.py 2019-04-22 23:14:54.000000000 +0200 ++++ b/scripting/build_tools/fix_swig_imports.py 2019-07-18 15:44:24.255754237 +0200 +@@ -40,6 +40,9 @@ + txt = b"" + + for l in lines: ++ if l.startswith(b"if _swig_python_version_info < (2, 7, 0):"): # ok with swig version >= 4.0.0 ++ l = l.replace(b"_swig_python_version_info < (2, 7, 0)", b"False") ++ doneOk = True + if l.startswith(b"if _swig_python_version_info >= (2, 7, 0):"): # ok with swig version >= 3.0.10 + l = l.replace(b"_swig_python_version_info >= (2, 7, 0)", b"False") + doneOk = True diff --git a/sci-electronics/kicad/kicad-5.1.0.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild similarity index 98% rename from sci-electronics/kicad/kicad-5.1.0.ebuild rename to sci-electronics/kicad/kicad-5.1.0-r1.ebuild index 8fca5ececb9..c7eca78142e 100644 --- a/sci-electronics/kicad/kicad-5.1.0.ebuild +++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild @@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M" PATCHES=( "${FILESDIR}"/"${PN}-5.1.0-help.patch" + "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch" ) pkg_setup() { diff --git a/sci-electronics/kicad/kicad-5.1.2.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild similarity index 98% rename from sci-electronics/kicad/kicad-5.1.2.ebuild rename to sci-electronics/kicad/kicad-5.1.2-r1.ebuild index c739de95232..0505a9fa436 100644 --- a/sci-electronics/kicad/kicad-5.1.2.ebuild +++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild @@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M" PATCHES=( "${FILESDIR}"/"${PN}-5.1.0-help.patch" + "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch" ) pkg_setup() {