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 <zoltan@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 <alexxy@gentoo.org>

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 (file)
index 0000000..3ab6677
--- /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 8fca5ececb987055b95eba03df3bbc808e18fcef..c7eca78142e4b55fbe7e1095174d282f89ecd5bf 100644 (file)
--- 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 c739de95232cc42fe191563291a740d92deb7df9..0505a9fa4368410a05506a943c0b81dabce6b0e6 100644 (file)
--- 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() {