summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/drahnr-oregano/metadata.xml9
-rw-r--r--sci-electronics/eagle/Manifest1
-rw-r--r--sci-electronics/eagle/eagle-9.6.2-r3.ebuild100
-rw-r--r--sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild4
-rw-r--r--sci-electronics/gazebo/Manifest6
-rw-r--r--sci-electronics/gazebo/files/ffmpeg4.patch16
-rw-r--r--sci-electronics/gazebo/files/ffmpeg5.patch137
-rw-r--r--sci-electronics/gazebo/files/qwt2.patch17
-rw-r--r--sci-electronics/gazebo/gazebo-11.10.1.ebuild (renamed from sci-electronics/gazebo/gazebo-11.7.0-r1.ebuild)10
-rw-r--r--sci-electronics/gazebo/gazebo-11.10.2.ebuild (renamed from sci-electronics/gazebo/gazebo-11.5.1-r2.ebuild)8
-rw-r--r--sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild (renamed from sci-electronics/gazebo/gazebo-11.3.0-r2.ebuild)8
-rw-r--r--sci-electronics/geda/Manifest1
-rw-r--r--sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch60
-rw-r--r--sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch15
-rw-r--r--sci-electronics/geda/geda-1.10.2-r1.ebuild97
-rw-r--r--sci-electronics/geda/geda-1.10.2-r2.ebuild99
-rw-r--r--sci-electronics/gerbv/gerbv-2.7.0.ebuild4
-rw-r--r--sci-electronics/gnucap/Manifest1
-rw-r--r--sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch68
-rw-r--r--sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch208
-rw-r--r--sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild4
-rw-r--r--sci-electronics/gnucap/gnucap-20210107.ebuild21
-rw-r--r--sci-electronics/gspiceui/Manifest1
-rw-r--r--sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch56
-rw-r--r--sci-electronics/gspiceui/gspiceui-1.2.87.ebuild82
-rw-r--r--sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch67
-rw-r--r--sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch12
-rw-r--r--sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch97
-rw-r--r--sci-electronics/iverilog/files/iverilog-10.3-override-var.patch12
-rw-r--r--sci-electronics/iverilog/iverilog-10.3.ebuild23
-rw-r--r--sci-electronics/kicad-footprints/Manifest4
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild (renamed from sci-electronics/kicad-footprints/kicad-footprints-5.1.11.ebuild)2
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-6.0.4.ebuild (renamed from sci-electronics/kicad-footprints/kicad-footprints-6.0.0_rc1.ebuild)12
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild14
-rw-r--r--sci-electronics/kicad-i18n/Manifest2
-rw-r--r--sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild (renamed from sci-electronics/kicad-i18n/kicad-i18n-5.1.11.ebuild)2
-rw-r--r--sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild (renamed from sci-electronics/kicad-meta/kicad-meta-5.1.11.ebuild)2
-rw-r--r--sci-electronics/kicad-meta/kicad-meta-6.0.4.ebuild (renamed from sci-electronics/kicad-meta/kicad-meta-6.0.0_rc1.ebuild)10
-rw-r--r--sci-electronics/kicad-packages3d/Manifest4
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild (renamed from sci-electronics/kicad-packages3d/kicad-packages3d-5.1.11.ebuild)10
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-6.0.4.ebuild (renamed from sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild)14
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild9
-rw-r--r--sci-electronics/kicad-packages3d/metadata.xml3
-rw-r--r--sci-electronics/kicad-symbols/Manifest4
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild (renamed from sci-electronics/kicad-symbols/kicad-symbols-5.1.11.ebuild)2
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-6.0.4.ebuild (renamed from sci-electronics/kicad-symbols/kicad-symbols-6.0.0_rc1.ebuild)16
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild12
-rw-r--r--sci-electronics/kicad-templates/Manifest4
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild (renamed from sci-electronics/kicad-templates/kicad-templates-5.1.11.ebuild)2
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-6.0.4.ebuild (renamed from sci-electronics/kicad-templates/kicad-templates-6.0.0_rc1.ebuild)12
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-9999.ebuild12
-rw-r--r--sci-electronics/kicad/Manifest4
-rw-r--r--sci-electronics/kicad/files/kicad-scripts-install-fix.patch12
-rw-r--r--sci-electronics/kicad/kicad-5.1.12-r3.ebuild (renamed from sci-electronics/kicad/kicad-5.1.11.ebuild)41
-rw-r--r--sci-electronics/kicad/kicad-6.0.4.ebuild (renamed from sci-electronics/kicad/kicad-6.0.0_rc1.ebuild)107
-rw-r--r--sci-electronics/kicad/kicad-9999.ebuild101
-rw-r--r--sci-electronics/kicad/metadata.xml3
-rw-r--r--sci-electronics/klayout/Manifest2
-rw-r--r--sci-electronics/klayout/klayout-0.27.3.ebuild4
-rw-r--r--sci-electronics/klayout/klayout-0.27.7.ebuild (renamed from sci-electronics/klayout/klayout-0.26.11.ebuild)10
-rw-r--r--sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch38
-rw-r--r--sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch52
-rw-r--r--sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch26
-rw-r--r--sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild (renamed from sci-electronics/ktechlab/ktechlab-0.50.0-r1.ebuild)9
-rw-r--r--sci-electronics/librepcb/Manifest2
-rw-r--r--sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch28
-rw-r--r--sci-electronics/librepcb/librepcb-0.1.6.ebuild (renamed from sci-electronics/librepcb/librepcb-0.1.3.ebuild)34
-rw-r--r--sci-electronics/magic/Manifest2
-rw-r--r--sci-electronics/magic/files/magic-7.5.202-include.patch20
-rw-r--r--sci-electronics/magic/files/magic-7.5.202-install.patch15
-rw-r--r--sci-electronics/magic/files/magic-ldflags.patch40
-rw-r--r--sci-electronics/magic/magic-7.5.202-r1.ebuild70
-rw-r--r--sci-electronics/magic/magic-8.3.232.ebuild2
-rw-r--r--sci-electronics/ngspice/Manifest2
-rw-r--r--sci-electronics/ngspice/ngspice-31-r1.ebuild9
-rw-r--r--sci-electronics/ngspice/ngspice-34.ebuild9
-rw-r--r--sci-electronics/ngspice/ngspice-35.ebuild9
-rw-r--r--sci-electronics/ngspice/ngspice-36.ebuild203
-rw-r--r--sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild (renamed from sci-electronics/pulseview/pulseview-0.4.2.ebuild)16
-rw-r--r--sci-electronics/pulseview/pulseview-9999.ebuild16
-rw-r--r--sci-electronics/sigrok-cli/Manifest1
-rw-r--r--sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild (renamed from sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild)12
-rw-r--r--sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild52
-rw-r--r--sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild12
-rw-r--r--sci-electronics/spice/spice-3.5.5-r3.ebuild6
-rw-r--r--sci-electronics/systemc/systemc-2.3.4-r1.ebuild6
-rw-r--r--sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild (renamed from sci-electronics/voacapl/voacapl-0.7.6.ebuild)4
-rw-r--r--sci-electronics/xnec2c/Manifest3
-rw-r--r--sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch63
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.4.11.ebuild53
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.4.5.ebuild53
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.4.7.ebuild49
92 files changed, 2080 insertions, 516 deletions
diff --git a/sci-electronics/drahnr-oregano/metadata.xml b/sci-electronics/drahnr-oregano/metadata.xml
index 52c86d49fdb..c3c62f45ee2 100644
--- a/sci-electronics/drahnr-oregano/metadata.xml
+++ b/sci-electronics/drahnr-oregano/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>ktrace@yandex.ru</email>
- <name>Victor Kustov</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
Oregano is an application for schematic capture and simulation of electrical
circuits. The actual simulation is performed by Berkeley Spice, or GNUcap or
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 703da782c65..151cae87e0d 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,2 +1,3 @@
+DIST Autodesk_EAGLE_9.6.2_English_Linux_64bit.tar.gz 171780187 BLAKE2B 6fb627448068b8af8fb2a4117c84386a300acef769afe8524cae703afb09edf719f19fc4a5298d091667f3d4c09e8ec06a0da4a16274cb6e6c64a1ae349ed014 SHA512 4ef17dfa52b1ee0f5ba68896bc3821616a1b7d1a073a586604271cd7129e29671c480cd324cc5eadc517eb300ca4be6efa69423a306944e36732c2aa34cc59a3
DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c61891ebab7e3f59d41aaa0c6ecaea2f050ced62552656a2311542fee497dbe8fbe43c958a8e76a9b00217c430f678072 SHA512 7ebe73bcd71857c5b8087e911ebfc45507715725abab15b80c9800476128790f8e373d01c52c05a87102597d355390ca0687964eff74af1283b162fba8dbb53b
DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770
diff --git a/sci-electronics/eagle/eagle-9.6.2-r3.ebuild b/sci-electronics/eagle/eagle-9.6.2-r3.ebuild
new file mode 100644
index 00000000000..9be8ca067dd
--- /dev/null
+++ b/sci-electronics/eagle/eagle-9.6.2-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Autodesk EAGLE schematic and printed circuit board (PCB) layout editor"
+HOMEPAGE="https://www.autodesk.com/"
+SRC_URI="https://eagle-updates.circuits.io/downloads/${PV//./_}/Autodesk_EAGLE_${PV}_English_Linux_64bit.tar.gz"
+
+LICENSE="Autodesk"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="opt/${PN}/*"
+RESTRICT="mirror bindist"
+
+RDEPEND="
+ app-crypt/mit-krb5
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/libpcre
+ dev-libs/nspr
+ dev-libs/nss
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libglvnd
+ media-libs/mesa
+ net-dns/avahi
+ net-print/cups
+ sys-apps/dbus
+ sys-apps/keyutils
+ >=sys-fs/e2fsprogs-1.46.5
+ sys-libs/glibc
+ sys-libs/zlib
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libxshmfence
+ x11-libs/libXtst
+"
+
+src_prepare() {
+ default
+ # drop bundled ngpsice
+ rm -r ngspice || die
+ # drop bundled qt and other libs
+ rm qt.conf || die
+ rm -r resources plugins libexec || die
+ # this libSuits.so(?) is not packaged anywhere in Gentoo so we keep it
+ mv lib lib.back || die
+ mkdir lib || die
+ mv lib.back/libSuits.so lib/ || die
+ rm -r lib.back || die
+}
+
+src_install() {
+ dodoc doc/*.txt doc/*.pdf doc/ulp/*.pdf
+ doman doc/eagle.1
+ dodir /opt/${PN}
+
+ # copy everything in
+ cp -a "${S}/"* "${ED}/opt/${PN}/" || die
+ fperms 0755 /opt/${PN}/${PN}
+ # and make convenience symlink
+ dosym "../${PN}/${PN}" "/opt/bin/${PN}"
+
+ # Create desktop entry
+ doicon -s 128x128 bin/${PN}-logo.png
+ make_desktop_entry ${PN} "CadSoft EAGLE Layout Editor" ${PN}-logo "Graphics;Electronics"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature 'SPICE circuit simulation support (set "Simulator Path" in Options -> Directories)' sci-electronics/ngspice
+}
diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
index 04593c37fc4..8a6fb4140dd 100644
--- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
+++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,4 +11,4 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index a45f1992f39..f643396f6d4 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1,3 @@
-DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
-DIST gazebo-11.5.1.tar.bz2 56486174 BLAKE2B c1bffc5067f2739a8eb2e178bb2209d9c7b5a58d0589710cc515c4bcbbca281fb94ddf16de977f3771bc4b64fb6afe8e86327dde00d19ef62754e4d7634bb65f SHA512 7c922963881cf079e926c239f510e722fc6cabd07ef5e846a4b78772364a3aecb0b68f2b690ff451d42ceb11e88e2f831c30515e5a228f12826516ecad10e53a
-DIST gazebo-11.7.0.tar.bz2 56394312 BLAKE2B 2da58a2702113c1954f0202bb779b723ad8e59cab678f9ca6fe64908785198b996ef71c845a1a85f00e2f4eddb9ed5683f815ada850917b2af4afad214eac77d SHA512 7de40908a021655b2a200a73cf979585f4bdb245064f7e9a853998f87df329223252c73882aa1e2b705bc7de5841e2a87d67f772dfef18e5735c1b06c2663192
+DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3
+DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
+DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
diff --git a/sci-electronics/gazebo/files/ffmpeg4.patch b/sci-electronics/gazebo/files/ffmpeg4.patch
new file mode 100644
index 00000000000..7b7c8d7270f
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg4.patch
@@ -0,0 +1,16 @@
+Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc
+===================================================================
+--- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc
++++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc
+@@ -224,7 +224,10 @@ bool VideoEncoder::Start(const std::stri
+
+ // The remainder of this function handles FFMPEG initialization of a video
+ // stream
+- const AVOutputFormat *outputFormat = nullptr;
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++ const
++#endif
++ AVOutputFormat *outputFormat = nullptr;
+
+ // This 'if' and 'free' are just for safety. We chech the value of formatCtx
+ // below.
diff --git a/sci-electronics/gazebo/files/ffmpeg5.patch b/sci-electronics/gazebo/files/ffmpeg5.patch
new file mode 100644
index 00000000000..e55bab3c311
--- /dev/null
+++ b/sci-electronics/gazebo/files/ffmpeg5.patch
@@ -0,0 +1,137 @@
+Index: gazebo-11.10.1/gazebo/common/AudioDecoder.cc
+===================================================================
+--- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.cc
++++ gazebo-11.10.1/gazebo/common/AudioDecoder.cc
+@@ -113,8 +113,13 @@ bool AudioDecoder::Decode(uint8_t **_out
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+- bytesDecoded = avcodec_decode_audio4(this->codecCtx, decodedFrame,
+- &gotFrame, &packet1);
++ bytesDecoded = avcodec_send_packet(this->codecCtx, &packet1);
++ if (bytesDecoded >= 0 || bytesDecoded == AVERROR_EOF) {
++ bytesDecoded = avcodec_receive_frame(this->codecCtx, decodedFrame);
++ gotFrame = bytesDecoded >= 0;
++ if (bytesDecoded == AVERROR(EAGAIN) || bytesDecoded == AVERROR_EOF) bytesDecoded = 0;
++ }
++
+ #ifndef _WIN32
+ # pragma GCC diagnostic pop
+ #endif
+@@ -214,7 +219,7 @@ bool AudioDecoder::SetFile(const std::st
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
++ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+ #ifndef _WIN32
+ # pragma GCC diagnostic pop
+ #endif
+@@ -238,7 +243,9 @@ bool AudioDecoder::SetFile(const std::st
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+- this->codecCtx = this->formatCtx->streams[audioStream]->codec;
++ this->codecCtx = avcodec_alloc_context3(nullptr);
++ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[audioStream]->codecpar);
++
+ #ifndef _WIN32
+ # pragma GCC diagnostic pop
+ #endif
+Index: gazebo-11.10.1/gazebo/common/AudioDecoder.hh
+===================================================================
+--- gazebo-11.10.1.orig/gazebo/common/AudioDecoder.hh
++++ gazebo-11.10.1/gazebo/common/AudioDecoder.hh
+@@ -75,7 +75,7 @@ namespace gazebo
+ private: AVCodecContext *codecCtx;
+
+ /// \brief libavcodec audio codec.
+- private: AVCodec *codec;
++ private: const AVCodec *codec;
+
+ /// \brief Index of the audio stream.
+ private: int audioStream;
+Index: gazebo-11.10.1/gazebo/common/Video.cc
+===================================================================
+--- gazebo-11.10.1.orig/gazebo/common/Video.cc
++++ gazebo-11.10.1/gazebo/common/Video.cc
+@@ -77,7 +77,7 @@ void Video::Cleanup()
+ #ifdef HAVE_FFMPEG
+ bool Video::Load(const std::string &_filename)
+ {
+- AVCodec *codec = nullptr;
++ const AVCodec *codec = nullptr;
+ this->videoStream = -1;
+
+ if (this->formatCtx || this->avFrame || this->codecCtx)
+@@ -107,7 +107,7 @@ bool Video::Load(const std::string &_fil
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+- if (this->formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
++ if (this->formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
+ #ifndef _WIN32
+ # pragma GCC diagnostic pop
+ #endif
+@@ -128,13 +128,14 @@ bool Video::Load(const std::string &_fil
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+- this->codecCtx = this->formatCtx->streams[this->videoStream]->codec;
++ this->codecCtx = avcodec_alloc_context3(nullptr);
++ avcodec_parameters_to_context(this->codecCtx, this->formatCtx->streams[this->videoStream]->codecpar);
+ #ifndef _WIN32
+ # pragma GCC diagnostic pop
+ #endif
+
+ // Find the decoder for the video stream
+- codec = avcodec_find_decoder(this->codecCtx->codec_id);
++ codec = avcodec_find_decoder(this->formatCtx->streams[this->videoStream]->codecpar->codec_id);
+ if (codec == nullptr)
+ {
+ gzerr << "Codec not found\n";
+@@ -231,15 +232,19 @@ bool Video::GetNextFrame(unsigned char *
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+- int processedLength = avcodec_decode_video2(this->codecCtx, this->avFrame,
+- &frameAvailable, &tmpPacket);
++ int processedLength = avcodec_send_packet(this->codecCtx, !tmpPacket.data && !tmpPacket.size ? nullptr : &tmpPacket);
+ #ifndef _WIN32
+ # pragma GCC diagnostic pop
+ #endif
++ if (processedLength >= 0 || processedLength == AVERROR_EOF) {
++ processedLength = avcodec_receive_frame(this->codecCtx, this->avFrame);
++ frameAvailable = processedLength >= 0;
++ if (processedLength == AVERROR(EAGAIN) || processedLength == AVERROR_EOF) processedLength = 0;
++ }
+ if (processedLength < 0)
+ {
+ gzerr << "Error while processing the data\n";
+- break;
++ break;
+ }
+
+ tmpPacket.data = tmpPacket.data + processedLength;
+Index: gazebo-11.10.1/gazebo/common/VideoEncoder.cc
+===================================================================
+--- gazebo-11.10.1.orig/gazebo/common/VideoEncoder.cc
++++ gazebo-11.10.1/gazebo/common/VideoEncoder.cc
+@@ -224,7 +224,7 @@ bool VideoEncoder::Start(const std::stri
+
+ // The remainder of this function handles FFMPEG initialization of a video
+ // stream
+- AVOutputFormat *outputFormat = nullptr;
++ const AVOutputFormat *outputFormat = nullptr;
+
+ // This 'if' and 'free' are just for safety. We chech the value of formatCtx
+ // below.
+@@ -294,7 +294,7 @@ bool VideoEncoder::Start(const std::stri
+ }
+
+ // find the video encoder
+- AVCodec *encoder = avcodec_find_encoder(
++ const AVCodec *encoder = avcodec_find_encoder(
+ this->dataPtr->formatCtx->oformat->video_codec);
+ if (!encoder)
+ {
diff --git a/sci-electronics/gazebo/files/qwt2.patch b/sci-electronics/gazebo/files/qwt2.patch
new file mode 100644
index 00000000000..08e40605597
--- /dev/null
+++ b/sci-electronics/gazebo/files/qwt2.patch
@@ -0,0 +1,17 @@
+Index: gazebo-11.10.2/cmake/SearchForStuff.cmake
+===================================================================
+--- gazebo-11.10.2.orig/cmake/SearchForStuff.cmake
++++ gazebo-11.10.2/cmake/SearchForStuff.cmake
+@@ -847,10 +847,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
+ /usr/local/lib/qwt.framework/Headers
+ ${QWT_WIN_INCLUDE_DIR}
+
+- PATH_SUFFIXES qwt qwt5
++ PATH_SUFFIXES qwt qwt5 qwt6
+ )
+
+-find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
++find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt-qt5 qwt PATHS
+ /usr/local/lib
+ /usr/local/lib/qwt.framework
+ ${QWT_WIN_LIBRARY_DIR}
diff --git a/sci-electronics/gazebo/gazebo-11.7.0-r1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
index 82a828bfbcb..3291c74fa77 100644
--- a/sci-electronics/gazebo/gazebo-11.7.0-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,7 @@ RDEPEND="
dev-libs/tinyxml
>=dev-libs/tinyxml2-6:=
dev-libs/libtar
- dev-cpp/tbb:=
+ <dev-cpp/tbb-2021:=
>=dev-games/ogre-1.7.4:=[freeimage]
<dev-games/ogre-1.10
>=media-libs/freeimage-3.15.4[png]
@@ -49,7 +49,7 @@ RDEPEND="
net-libs/ignition-transport:8=
sci-libs/ignition-common:3=
sci-libs/ignition-fuel-tools:4=
- x11-libs/qwt:6=[qt5(+)]
+ <x11-libs/qwt-6.2.0:6=[qt5(+)]
"
DEPEND="${RDEPEND}
dev-qt/qttest:5
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
BDEPEND="
- app-text/ronn
+ || ( app-text/ronn-ng app-text/ronn )
app-arch/gzip
virtual/pkgconfig
"
@@ -65,6 +65,8 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
PATCHES=(
"${FILESDIR}/qwt.patch"
"${FILESDIR}/cmake.patch"
+ "${FILESDIR}/ffmpeg5.patch"
+ "${FILESDIR}/ffmpeg4.patch"
)
src_configure() {
diff --git a/sci-electronics/gazebo/gazebo-11.5.1-r2.ebuild b/sci-electronics/gazebo/gazebo-11.10.2.ebuild
index 82a828bfbcb..f009832e677 100644
--- a/sci-electronics/gazebo/gazebo-11.5.1-r2.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -57,14 +57,16 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
BDEPEND="
- app-text/ronn
+ || ( app-text/ronn-ng app-text/ronn )
app-arch/gzip
virtual/pkgconfig
"
CMAKE_BUILD_TYPE=RelWithDebInfo
PATCHES=(
- "${FILESDIR}/qwt.patch"
+ "${FILESDIR}/qwt2.patch"
"${FILESDIR}/cmake.patch"
+ "${FILESDIR}/ffmpeg5.patch"
+ "${FILESDIR}/ffmpeg4.patch"
)
src_configure() {
diff --git a/sci-electronics/gazebo/gazebo-11.3.0-r2.ebuild b/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
index 82a828bfbcb..f34484f385e 100644
--- a/sci-electronics/gazebo/gazebo-11.3.0-r2.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,7 @@ RDEPEND="
dev-libs/tinyxml
>=dev-libs/tinyxml2-6:=
dev-libs/libtar
- dev-cpp/tbb:=
+ <dev-cpp/tbb-2021:=
>=dev-games/ogre-1.7.4:=[freeimage]
<dev-games/ogre-1.10
>=media-libs/freeimage-3.15.4[png]
@@ -49,7 +49,7 @@ RDEPEND="
net-libs/ignition-transport:8=
sci-libs/ignition-common:3=
sci-libs/ignition-fuel-tools:4=
- x11-libs/qwt:6=[qt5(+)]
+ <x11-libs/qwt-6.2.0:6=[qt5(+)]
"
DEPEND="${RDEPEND}
dev-qt/qttest:5
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
BDEPEND="
- app-text/ronn
+ || ( app-text/ronn-ng app-text/ronn )
app-arch/gzip
virtual/pkgconfig
"
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index d10e265b6bb..4639d6ec822 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1 +1,2 @@
+DIST geda-gaf-1.10.2.tar.gz 14441491 BLAKE2B d6ecc4bc1390ff457396ae406fdeee909418f63d8c50e537215fa0a1131cfda91339f44ddc2c91ca0f3772f4416be1c4448fea45336c78bb601fb9b4df399b14 SHA512 c7beabf019762d9d3b4faa63f1345fb064ebbb6e0203a6c5bcab6b740d20db9f3cedf85c2f99e3ab1cb5396c06886fad1dbd5201eb7bad9e77c03511cf23b1a1
DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3
diff --git a/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch
new file mode 100644
index 00000000000..f1532677bd5
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch
@@ -0,0 +1,60 @@
+diff --git a/Makefile.am b/Makefile.am
+index 161083c..d54eded 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@ if ENABLE_GATTRIB
+ GATTRIB_DIR=gattrib
+ endif
+ SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \
+- gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn
++ gsymcheck gnetlist-legacy utils symbols docs examples contrib
+
+ ACLOCAL_AMFLAGS = -I m4
+
+diff --git a/Makefile.in b/Makefile.in
+index 31778d8..59789e6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -180,7 +180,7 @@ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+ DIST_SUBDIRS = libgeda libgedacairo gaf gschem gattrib gsymcheck \
+- gnetlist-legacy utils symbols docs examples contrib xorn
++ gnetlist-legacy utils symbols docs examples contrib
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/build-tools/ar-lib \
+ $(top_srcdir)/build-tools/compile \
+@@ -454,7 +454,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @ENABLE_GATTRIB_TRUE@GATTRIB_DIR = gattrib
+ SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \
+- gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn
++ gsymcheck gnetlist-legacy utils symbols docs examples contrib
+
+ ACLOCAL_AMFLAGS = -I m4
+
+diff --git a/autogen.sh b/autogen.sh
+index 7b82f04..4d81174 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -225,4 +225,4 @@ fi
+ run_tool "$AUTOHEADER" &&
+ run_tool "$AUTOMAKE" -Wall --copy --add-missing --gnu &&
+ run_tool "$AUTOCONF" &&
+- (cd xorn && autoreconf -if))
++ )
+
+ #####################################################################
+diff --git a/configure.ac b/configure.ac
+index 1f19064..257ee20 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,8 +197,6 @@ AX_LIBGEDACAIRO([1:3:0])
+ export GEDADATADIR
+ export GEDARCDIR
+
+-AC_CONFIG_SUBDIRS([xorn])
+-
+ #####################################################################
+ # Generate output
+ #####################################################################
diff --git a/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch
new file mode 100644
index 00000000000..d351b84b390
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/834834
+From: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
+--- a/gattrib/src/gtksheet_2_2.c
++++ b/gattrib/src/gtksheet_2_2.c
+@@ -8102,7 +8102,9 @@
+ return;
+ }
+
+- gtk_sheet_get_cell_area(sheet, row, col, &area);
++ if (!gtk_sheet_get_cell_area(sheet, row, col, &area))
++ return;
++
+ child = gtk_sheet_put(sheet, widget, area.x, area.y);
+ child->attached_to_cell = TRUE;
+ child->row = row;
diff --git a/sci-electronics/geda/geda-1.10.2-r1.ebuild b/sci-electronics/geda/geda-1.10.2-r1.ebuild
new file mode 100644
index 00000000000..314a941f9a7
--- /dev/null
+++ b/sci-electronics/geda/geda-1.10.2-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="
+ media-gfx/graphviz
+ media-gfx/imagemagick
+ virtual/latex-base
+"
+inherit autotools docs xdg
+
+MY_PN=${PN}-gaf
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
+HOMEPAGE="http://wiki.geda-project.org/geda:gaf"
+SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug examples fam nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/glib:2
+ dev-scheme/guile
+ sci-electronics/electronics-menu
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/pango
+ nls? ( virtual/libintl )
+ fam? ( app-admin/gamin )
+"
+
+DEPEND="${RDEPEND}
+ dev-util/desktop-file-utils
+ x11-misc/shared-mime-info"
+BDEPEND="
+ sys-apps/groff
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+# Xorn requires python2
+PATCHES=(
+ "${FILESDIR}/${P}-drop-xorn.patch"
+)
+
+src_prepare() {
+ default
+ rm -r xorn || die
+
+ if ! use doc ; then
+ sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
+ fi
+ if ! use examples ; then
+ sed -i -e 's/\texamples$//' Makefile.in || die
+ fi
+
+ # add missing GIO_LIB Bug #684870
+ sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \
+ gsymcheck/src/Makefile.am || die
+
+ sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \
+ gnetlist-legacy/src/Makefile.am || die
+
+ sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \
+ utils/gschlas/Makefile.am || die
+
+ sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \
+ contrib/sarlacc_schem/Makefile.am || die
+
+ # remove compressed files, compressed by portage in install phase
+ rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die
+ rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die
+ rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-rpath
+ --disable-update-xdg-database
+ $(use_enable doc doxygen)
+ $(use_enable debug assert)
+ $(use_enable nls)
+ $(use_with fam libfam)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sci-electronics/geda/geda-1.10.2-r2.ebuild b/sci-electronics/geda/geda-1.10.2-r2.ebuild
new file mode 100644
index 00000000000..a1e9c74fae8
--- /dev/null
+++ b/sci-electronics/geda/geda-1.10.2-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="
+ media-gfx/graphviz
+ media-gfx/imagemagick
+ virtual/latex-base
+"
+inherit autotools docs xdg
+
+MY_PN=${PN}-gaf
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
+HOMEPAGE="http://wiki.geda-project.org/geda:gaf"
+SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug examples fam nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/glib:2
+ dev-scheme/guile
+ sci-electronics/electronics-menu
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/pango
+ nls? ( virtual/libintl )
+ fam? ( app-admin/gamin )
+"
+
+DEPEND="${RDEPEND}
+ dev-util/desktop-file-utils
+ x11-misc/shared-mime-info"
+BDEPEND="
+ sys-apps/groff
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ # Xorn requires python2
+ "${FILESDIR}/${P}-drop-xorn.patch"
+
+ "${FILESDIR}/${PN}-1.10.2-fix-gtk-sheet.patch"
+)
+
+src_prepare() {
+ default
+ rm -r xorn || die
+
+ if ! use doc ; then
+ sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
+ fi
+ if ! use examples ; then
+ sed -i -e 's/\texamples$//' Makefile.in || die
+ fi
+
+ # add missing GIO_LIB Bug #684870
+ sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \
+ gsymcheck/src/Makefile.am || die
+
+ sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \
+ gnetlist-legacy/src/Makefile.am || die
+
+ sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \
+ utils/gschlas/Makefile.am || die
+
+ sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \
+ contrib/sarlacc_schem/Makefile.am || die
+
+ # remove compressed files, compressed by portage in install phase
+ rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die
+ rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die
+ rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-rpath
+ --disable-update-xdg-database
+ $(use_enable doc doxygen)
+ $(use_enable debug assert)
+ $(use_enable nls)
+ $(use_with fam libfam)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/sci-electronics/gerbv/gerbv-2.7.0.ebuild b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
index 82242e80810..48219cd522a 100644
--- a/sci-electronics/gerbv/gerbv-2.7.0.ebuild
+++ b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools xdg
+inherit xdg
DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer"
HOMEPAGE="http://gerbv.geda-project.org/"
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index db20d354963..0f832082136 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -3,3 +3,4 @@ DIST gnucap-2009-12-07-models-jspice3-2.5.tar.gz 502564 BLAKE2B a0c60671cb338035
DIST gnucap-2009-12-07-models-ngspice17.tar.gz 4418060 BLAKE2B b7d300cc93b870b13eab25d4b0303af647303551f2777e61cc38d18d770e9b446b9a1e4f8fd94b81c11f96eb1c6bac4ef113f69806a979ac3fe69903e0855d91 SHA512 0f26b4491531d41f18d35b8cde339e99b593794495346186dac74f72bd3632dfe4690ede50a972c47ae41b2229a62d708ecd28bb8fc04b5b7347a481bca709d5
DIST gnucap-2009-12-07-models-spice3f5.tar.gz 629424 BLAKE2B 3369374942a0b0b14dc484a6d49b9650d461112f15623f43b1140a4bddd4d23a6035c4c31294f1003828b93bc21b1c1c059acf61c2db85c9578bb8162e247234 SHA512 4c16e4bcdd3b4092bd6c89c56421ef9ca85b6aba90d9e244fee03278916c6b5ac1c56ecba62d4a5561ff3d93abc61492c0116ccc350c483128ca792b52fa7155
DIST gnucap-2009-12-07.tar.gz 545578 BLAKE2B a1ff8ed82a8ab57c455fdb96c399a5e480b1eb898d439e39380c4287d65538e9c0e1f61aef08c616aff34390a507243edc1fbb2f55b2bfc6d383264e2281e1c9 SHA512 c0e8a4f6b66eeff2cf95e9cf2050a25aa08f660de1e4b3e78011998deb93cd4e5b562cdcf5f3beb72e04cb3c7650cde6ae8c81602ffc31f5e333d84e7e3867a9
+DIST gnucap-20210107.tar.gz 801944 BLAKE2B fcef1e234710575285446c63cae85e2ef7e82e74ab65627614b8cc2bd0511427b63aa352a335c2b56c159b9129ce4cac998b86ddd29c19f9c57a63cfc2354676 SHA512 7f85a69f73808091b0826bb671174ad2515771c36e624031fb2fe79671366c57cd20ce9c973359869146a90fc568bc0ae1c354655e9d5cd75507b069f45cbfb7
diff --git a/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch b/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch
new file mode 100644
index 00000000000..455475fa7cd
--- /dev/null
+++ b/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch
@@ -0,0 +1,68 @@
+diff --git a/apps/Make1 b/apps/Make1
+index 43a2266..a29b29f 100644
+--- a/apps/Make1
++++ b/apps/Make1
+@@ -23,7 +23,7 @@ TARGET = gnucap-default-plugins
+ #------------------------------------------------------------------------
+ INSTALL_FILES = $(TARGET)$(TARGET_EXT)
+ #------------------------------------------------------------------------
+-INSTALL_DIR = $(PREFIX)/lib/gnucap
++INSTALL_DIR = $(PREFIX)/lib64/gnucap
+ #------------------------------------------------------------------------
+ DELETED =
+ #------------------------------------------------------------------------
+diff --git a/lib/Make1 b/lib/Make1
+index 27f839f..bd9fbfb 100644
+--- a/lib/Make1
++++ b/lib/Make1
+@@ -23,7 +23,7 @@ TARGET = libgnucap
+ #------------------------------------------------------------------------
+ INSTALL_FILES = $(TARGET)$(TARGET_EXT)
+ #------------------------------------------------------------------------
+-INSTALL_DIR = $(PREFIX)/lib
++INSTALL_DIR = $(PREFIX)/lib64
+ #------------------------------------------------------------------------
+ DELETED =
+ #------------------------------------------------------------------------
+diff --git a/main/Make1 b/main/Make1
+index 14d44c7..2d92c1f 100644
+--- a/main/Make1
++++ b/main/Make1
+@@ -24,7 +24,7 @@ TARGET = gnucap
+ INSTALL_DIR = $(PREFIX)/bin
+ INSTALL_FILES = $(TARGET)$(TARGET_EXT) ../gnucap-conf
+ #------------------------------------------------------------------------
+-INSTALL_SYSCONF_DIR = $(PREFIX)/etc
++INSTALL_SYSCONF_DIR = $(PREFIX)/../etc
+ INSTALL_SYSCONF_FILES = ../gnucap.conf
+ #------------------------------------------------------------------------
+ DELETED =
+diff --git a/main/configure b/main/configure
+index b68d06a..47e43a2 100755
+--- a/main/configure
++++ b/main/configure
+@@ -23,8 +23,8 @@ fi
+
+ sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile
+ #----------------------------------------------------------------
+-pkglibdir='${prefix}/lib/gnucap'
+-pkglibdir_expanded="${prefix}/lib/gnucap"
++pkglibdir='${prefix}/lib64/gnucap'
++pkglibdir_expanded="${prefix}/lib64/gnucap"
+
+ # bug. this is not implemented consistently.
+ CXX=${CXX-c++}
+@@ -32,11 +32,11 @@ CXX=${CXX-c++}
+ fill_template() {
+ sed -e "s#@prefix@#$prefix#" \
+ -e "s#@exec_prefix@#$prefix#" \
+- -e "s#@libdir@#$prefix/lib#" \
++ -e "s#@libdir@#$prefix/lib64#" \
+ -e "s#@includedir@#$\{prefix\}/include#" \
+ -e "s#@datarootdir@#$\{prefix\}/share/gnucap#" \
+ -e "s#@docdir@#$\{prefix\}/share/doc/gnucap#" \
+- -e "s#@sysconfdir@#$\{prefix\}/etc#" \
++ -e "s#@sysconfdir@#$\{prefix\}/../etc#" \
+ -e "s#@pkglibdir@#$pkglibdir#" \
+ -e "s#@pkglibdir_expanded@#$pkglibdir_expanded#" \
+ -e "s#@CXXFLAGS@#$CCFLAGS#" \
diff --git a/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch b/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch
new file mode 100644
index 00000000000..5456373cda2
--- /dev/null
+++ b/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch
@@ -0,0 +1,208 @@
+diff --git a/apps/Make2.Debug b/apps/Make2.Debug
+index b35ac81..f437b76 100644
+--- a/apps/Make2.Debug
++++ b/apps/Make2.Debug
+@@ -41,7 +41,7 @@ CCFLAGS = \
+
+ LIBS = \
+
+-LDFLAGS = -shared
++LDFLAGS += -shared
+
+ %.SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/apps/Make2.g++ b/apps/Make2.g++
+index c7581c9..443c0e8 100644
+--- a/apps/Make2.g++
++++ b/apps/Make2.g++
+@@ -32,7 +32,7 @@ CCFLAGS = \
+
+ LIBS = \
+
+-LDFLAGS = -shared
++LDFLAGS += -shared
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/apps/Make2.mingw32 b/apps/Make2.mingw32
+index 8a9345e..df5f7f6 100644
+--- a/apps/Make2.mingw32
++++ b/apps/Make2.mingw32
+@@ -30,7 +30,7 @@ CCFLAGS = \
+
+ LIBS = -lgnucap
+
+-LDFLAGS = -shared -L../../lib/MSW
++LDFLAGS += -shared -L../../lib/MSW
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/apps/configure b/apps/configure
+index 1fbb987..6b684af 100755
+--- a/apps/configure
++++ b/apps/configure
+@@ -38,7 +38,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT = .so
+
+-LDFLAGS = -shared
++LDFLAGS += -shared
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/Make2.Debug b/lib/Make2.Debug
+index b0e180a..7cfe919 100644
+--- a/lib/Make2.Debug
++++ b/lib/Make2.Debug
+@@ -43,7 +43,7 @@ LIBS = \
+ -lreadline -ltermcap \
+ -ldl
+
+-LDFLAGS = -shared
++LDFLAGS += -shared
+
+ %.SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/Make2.g++ b/lib/Make2.g++
+index 7dd1598..a240c53 100644
+--- a/lib/Make2.g++
++++ b/lib/Make2.g++
+@@ -35,7 +35,7 @@ LIBS = \
+ -lreadline -ltermcap \
+ -ldl
+
+-LDFLAGS = -shared
++LDFLAGS += -shared
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/Make2.mingw32 b/lib/Make2.mingw32
+index 27a2c51..bf7c663 100644
+--- a/lib/Make2.mingw32
++++ b/lib/Make2.mingw32
+@@ -31,7 +31,7 @@ CCFLAGS = \
+
+ LIBS =
+
+-LDFLAGS = -shared
++LDFLAGS += -shared
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/lib/configure b/lib/configure
+index a10a76e..4a07543 100755
+--- a/lib/configure
++++ b/lib/configure
+@@ -49,7 +49,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT = .so
+
+-LDFLAGS = -shared
++LDFLAGS += -shared
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/main/Make2.Debug b/main/Make2.Debug
+index e531639..31f7fa8 100644
+--- a/main/Make2.Debug
++++ b/main/Make2.Debug
+@@ -39,7 +39,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O-DEBUG
+
+ %.SUFFIXES:
+diff --git a/main/Make2.g++ b/main/Make2.g++
+index 8991962..8add8f6 100644
+--- a/main/Make2.g++
++++ b/main/Make2.g++
+@@ -31,7 +31,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+
+ .SUFFIXES:
+diff --git a/main/Make2.mingw32 b/main/Make2.mingw32
+index b6150e6..0175914 100644
+--- a/main/Make2.mingw32
++++ b/main/Make2.mingw32
+@@ -30,7 +30,7 @@ CCFLAGS = \
+
+ LIBS = -lgnucap
+
+-LDFLAGS = -L../../lib/MSW
++LDFLAGS += -L../../lib/MSW
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/main/configure b/main/configure
+index 9c43821..b68d06a 100755
+--- a/main/configure
++++ b/main/configure
+@@ -65,7 +65,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT =
+
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+
+ .SUFFIXES : .o .cc
+diff --git a/modelgen/Make2.Debug b/modelgen/Make2.Debug
+index e531639..31f7fa8 100644
+--- a/modelgen/Make2.Debug
++++ b/modelgen/Make2.Debug
+@@ -39,7 +39,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O-DEBUG
+
+ %.SUFFIXES:
+diff --git a/modelgen/Make2.g++ b/modelgen/Make2.g++
+index 8991962..8add8f6 100644
+--- a/modelgen/Make2.g++
++++ b/modelgen/Make2.g++
+@@ -31,7 +31,7 @@ CCFLAGS = \
+ LIBS = \
+ -lgnucap \
+
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+
+ .SUFFIXES:
+diff --git a/modelgen/Make2.mingw32 b/modelgen/Make2.mingw32
+index 63b9657..813c5f4 100644
+--- a/modelgen/Make2.mingw32
++++ b/modelgen/Make2.mingw32
+@@ -30,7 +30,7 @@ CCFLAGS = \
+
+ LIBS = -lgnucap
+
+-LDFLAGS = -L../../lib/MSW
++LDFLAGS += -L../../lib/MSW
+
+ .SUFFIXES:
+ .SUFFIXES: .o .cc
+diff --git a/modelgen/configure b/modelgen/configure
+index d11d07e..3193444 100755
+--- a/modelgen/configure
++++ b/modelgen/configure
+@@ -39,7 +39,7 @@ VPATH = .:..
+ CCC = c++
+ TARGET_EXT =
+
+-LDFLAGS = -rdynamic \
++LDFLAGS += -rdynamic \
+ -L../../lib/O
+
+ .SUFFIXES : .o .cc
diff --git a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
index f8588c470fa..6503c350f6f 100644
--- a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
+++ b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -61,7 +61,7 @@ src_compile() {
emake
for PLUGIN_DIR in models-* ; do
cd "${S}/${PLUGIN_DIR}"
- emake CC=$(tc-getCC) CCC=$(tc-getCXX)
+ emake CC="$(tc-getCC)" CCC="$(tc-getCXX)"
done
}
diff --git a/sci-electronics/gnucap/gnucap-20210107.ebuild b/sci-electronics/gnucap/gnucap-20210107.ebuild
new file mode 100644
index 00000000000..f898c65a2a4
--- /dev/null
+++ b/sci-electronics/gnucap/gnucap-20210107.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNUCap is the GNU Circuit Analysis Package"
+SRC_URI="https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${P}.tar.gz"
+HOMEPAGE="http://www.gnucap.org/"
+
+IUSE="examples"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-respect-ldflags.patch"
+ "${FILESDIR}/${P}-fix-paths.patch"
+)
diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index f58ffcf502a..8e067dce86d 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1 +1,2 @@
DIST gspiceui-v1.1.00.tar.gz 1048236 BLAKE2B cc3d14137517cd26687dabac7e001e7518fee91aedc74f1995ac763873345f2965c3edb4e037ecb6ac8ca874289b2e658fe3185d95b3eeaf2b349efab151f37b SHA512 46ccf3dd7a5dd9ec1cac1eb742187ecab15a6c0033467d52a44c916e239696faf7b8797e1a155191cf0ed37b04619b0666cff51e78912a06ecd2c63d377cba93
+DIST gspiceui-v1.2.87.tar.gz 1089733 BLAKE2B c1801bfebd5d42fe9c1ab26e6fd0cb06b56cac53bbad272522896325e5fd979e6fcc63d6f99262b152180f249b5b2d4aa119aa83254a2fc07256574c9ebaef10 SHA512 081d04c39f4fb96139f12fa063dfb888e036948a00a6b55de3b04a49b2b4af01b45fd9b7f903855d798a71957452550dfa8c8505c167c239e27ada29cb6fa747
diff --git a/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch b/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch
new file mode 100644
index 00000000000..c39b6a329ab
--- /dev/null
+++ b/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch
@@ -0,0 +1,56 @@
+diff --git a/src/Makefile b/src/Makefile
+index 50736fd..8dbfcfa 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -39,8 +39,8 @@ DESTDIR = /usr/local/bin
+ #***************************************************************************************************
+
+ # Which compiler and linker (eg. g++ or clang++)
+-CXX = g++
+-LD = g++
++CXX ?= g++
++LD ?= g++
+ ifneq ($(GSPICEUI_MSWIN),0)
+ LD += -static-libstdc++ -static-libgcc
+ WINDRES = windres
+@@ -91,13 +91,7 @@ BINDIR = $(ROOT)/bin
+ # -Os Optimize for size
+ # -Og Optimize debugging experience but don't break debugging
+ # -std=[C++NO] The C++ standard to use where C++NO is eg. c++98, c++03, c++11, c++14, c++17, etc.
+-ifeq ($(GSPICEUI_DEBUG),0)
+- # Options for release (not using -Wall since it's GCC specific)
+- CXXFLAGS := -O3 -std=c++17 -pipe $(shell $(WXCFG) --cxxflags)
+-else
+- # Options for development
+- CXXFLAGS := -g -Og -std=c++17 -Wall -Wextra -Wpedantic -pipe $(shell $(WXCFG) --cxxflags)
+-endif
++CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+
+ # I like to compile using the option "-Wall" etc., tests that break wxWidgets are turned off below
+ ifeq ($(GSPICEUI_DEBUG),1)
+@@ -117,6 +111,7 @@ INCLUDES = -I.
+
+ # Libraries
+ LIBS := $(shell $(WXCFG) --libs core,base,html)
++LIBS += -lm -lstdc++
+ # (The pkg-config stuff was requested by a user, somehow pangox was missing) 2019-08-07 ???
+ #ifeq ($(GSPICEUI_MSWIN),0)
+ #LIBS := $(shell $(WXCFG) --libs core,base,html) # $(shell pkg-config --libs-only-l pangox)
+@@ -181,7 +176,7 @@ $(OBJDIR)/%.o : %.cpp
+ # -o specify the output file name
+
+ $(BINDIR)/$(PROG) : $(OBJS)
+- $(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++ $(CXX) -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
+ ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
+ cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
+ endif
+@@ -223,7 +218,7 @@ tests : test_Component test_NetList test_CnvtType test_CmdNgSpiceOPT test_CmdNgS
+
+ # Compiler options
+
+-test_% : CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
++test_% : CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+ ifeq ($(GSPICEUI_WXLIB),2.8) # This suppresses spurious warnings from gcc with wxWidgets v2.8.12
+ test_% : CXXFLAGS += -Wno-unused-local-typedefs
+ endif
diff --git a/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild
new file mode 100644
index 00000000000..d5377a28828
--- /dev/null
+++ b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop optfeature wxwidgets xdg
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="GUI frontend for Ngspice and Gnucap"
+HOMEPAGE="https://sourceforge.net/projects/gspiceui/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ sci-electronics/electronics-menu
+"
+RDEPEND="
+ ${DEPEND}
+ || (
+ sci-electronics/ngspice
+ sci-electronics/gnucap
+ )
+"
+
+PATCHES=(
+ # Use Gentoo LDFLAGS and CXXFLAGS
+ "${FILESDIR}"/${P}-respect-users-flags.patch
+)
+
+src_prepare() {
+ default
+
+ # Adjusting the doc path at src/main/FrmHtmlVwr.cpp
+ sed -i -e \
+ "s:/share/gspiceui/html/User-Manual.html:/share/doc/${PF}/html/User-Manual.html:g" \
+ src/main/FrmHtmlVwr.cpp || die
+}
+
+src_configure() {
+ setup-wxwidgets
+ default
+}
+
+src_compile() {
+ emake
+}
+
+src_install() {
+ dobin bin/gspiceui
+
+ einstalldocs
+ dodoc html/*.html html/*.jpg html/*.png
+ dodoc ChangeLog ReadMe ToDo release-notes-v${PV}.txt
+ doman gspiceui.1
+
+ # installing examples and according model and symbol files
+ use examples && dodoc -r lib sch
+
+ newicon -s 32 src/icons/gspiceui-32x32.xpm gspiceui.xpm
+ newicon -s 48 src/icons/gspiceui-48x48.xpm gspiceui.xpm
+ make_desktop_entry gspiceui "GNU Spice GUI" gspiceui "Electronics"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ if use examples ; then
+ elog "If you want to use the examples, copy and extract from"
+ elog "${EROOT}/usr/share/doc/${PF} the sch and lib directory"
+ elog "side by side to your home directory to be able"
+ elog "to generate the netlists as normal user."
+ fi
+ optfeature "schematics editing" sci-electronics/geda
+ optfeature "waveform display" sci-electronics/gwave
+}
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch b/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch
new file mode 100644
index 00000000000..2261a6ada4c
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-call-nm.patch
@@ -0,0 +1,67 @@
+From f3396d502d408c1b349c378060027905a2c2a9c3 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Sat, 25 Jul 2020 12:50:49 +0800
+Subject: [PATCH 1/2] aclocal.m4: fix issue in cross-compiling
+
+The aclocal.m4 called nm directly.
+It can cause issue in cross-compiling and because is not possible
+use a different NM implementation (like llvm-nm).
+The compile error log:
+https://bugs.gentoo.org/attachment.cgi?id=648556
+
+Closes: https://bugs.gentoo.org/731906
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ aclocal.m4 | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index a47eba42c..16ef69c85 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -25,9 +25,11 @@ AC_SUBST(install_suffix)
+ # Unwarranted assumptions:
+ # - the object file produced by AC_COMPILE_IFELSE is called "conftest.$ac_objext"
+ # - the nm(1) utility is available, and its name is "nm".
++# Here use $NM because they can cause issue in cross-compiling and because is
++# not possible use a different NM implementation (like llvm-nm)
+ AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([void underscore(void){}])],
+-[AS_IF([nm conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
++[AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
+ [AC_MSG_ERROR([underscore test crashed])]
+ )])
+
+
+From d827f674cc0a37d8150c18df6112a0a895f2a584 Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+Date: Tue, 28 Jul 2020 21:15:49 +0800
+Subject: [PATCH 2/2] aclocal.m4: fix the comment contradicts the previous line
+
+Changed to "the nm(1) utility or an equivalent is available,
+and its name is defined by the $NM variable.
+
+Signed-off-by: Huang Rui <vowstar@gmail.com>
+---
+ aclocal.m4 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 16ef69c85..1b2dd6a1e 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -23,10 +23,10 @@ AC_SUBST(install_suffix)
+ # ------------------------------
+ # Sub-macro for AX_C_UNDERSCORES_LEADING and AX_C_UNDERSCORES_TRAILING.
+ # Unwarranted assumptions:
+-# - the object file produced by AC_COMPILE_IFELSE is called "conftest.$ac_objext"
+-# - the nm(1) utility is available, and its name is "nm".
+-# Here use $NM because they can cause issue in cross-compiling and because is
+-# not possible use a different NM implementation (like llvm-nm)
++# - the object file produced by AC_COMPILE_IFELSE is called
++# "conftest.$ac_objext"
++# - the nm(1) utility or an equivalent is available, and its name
++# is defined by the $NM variable.
+ AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([void underscore(void){}])],
+ [AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch b/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch
new file mode 100644
index 00000000000..b7a81d1faca
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-configure-ac.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/426262
+--- a/Makefile.in 2022-04-25 18:06:16.529673077 +0800
++++ b/Makefile.in 2022-04-25 18:13:12.134356482 +0800
+@@ -200,7 +200,7 @@
+ ./config.status _pli_types.h
+ _pli_types.h: stamp-_pli_types-h
+
+-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
++$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+ cd $(srcdir) && autoconf
+
+ config.status: $(srcdir)/configure \ No newline at end of file
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch b/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch
new file mode 100644
index 00000000000..0027184c833
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch
@@ -0,0 +1,97 @@
+From 5b699c1be73e789831db01e779a41478c0c62309 Mon Sep 17 00:00:00 2001
+From: Henner Zeller <h.zeller@acm.org>
+Date: Wed, 29 Jul 2020 15:29:08 -0700
+Subject: [PATCH] Bison includes its generated header in *.cc. Generate with
+ correct name.
+
+The current bison (3.7) generates a *.cc file that includes the header
+it generated. For parse.cc this would be parse.hh. Right now, we rename
+this header to have a common name used in other files, but this results
+in a compile error for the parse.cc file:
+
+parse.cc:462:10: fatal error: parse.hh: No such file or directory
+ 462 | #include "parse.hh"
+ | ^~~~~~~~~~
+
+Fix this by telling bison to output the header file to the correct
+filename in the first place so that we don't have to rename it.
+(using the --defines instead of -d option).
+
+This looks like a bison specific option not available in Posix yacc;
+but looks like we're requiring bison anyway.
+
+Signed-off-by: Henner Zeller <h.zeller@acm.org>
+---
+ Makefile.in | 4 +---
+ tgt-pcb/Makefile.in | 4 +---
+ vhdlpp/Makefile.in | 4 +---
+ vvp/Makefile.in | 4 +---
+ 4 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5ac5515a..cc8cac46 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -256,10 +256,8 @@ parse.o: parse.cc
+
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+- $(YACC) --verbose -t -p VL -d -o $@ $<
++ $(YACC) --verbose -t -p VL --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+- touch $@
+
+ syn-rules.cc: $(srcdir)/syn-rules.y
+ $(YACC) --verbose -t -p syn_ -o $@ $<
+diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in
+index a5f9b7d5..7345e195 100644
+--- a/tgt-pcb/Makefile.in
++++ b/tgt-pcb/Makefile.in
+@@ -89,10 +89,8 @@ fp_lex.cc: $(srcdir)/fp.lex
+ $(LEX) -s -ofp_lex.cc $(srcdir)/fp.lex
+
+ fp.cc: $(srcdir)/fp.y
+- $(YACC) --verbose -t -p fp -d -o $@ $<
++ $(YACC) --verbose -t -p fp --defines=fp.h -o $@ $<
+ fp.h: fp.cc
+- mv fp.cc.h $@ 2>/dev/null || mv fp.hh $@
+- touch $@
+
+ ifeq (@WIN32@,yes)
+ TGTLDFLAGS=-L.. -livl
+diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in
+index 53ae140a..458178bd 100644
+--- a/vhdlpp/Makefile.in
++++ b/vhdlpp/Makefile.in
+@@ -117,10 +117,8 @@ lexor.cc: $(srcdir)/lexor.lex
+
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+- $(YACC) --verbose -t -d -o $@ $<
++ $(YACC) --verbose -t --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+- touch $@
+
+ lexor_keyword.o: lexor_keyword.cc parse.h
+
+diff --git a/vvp/Makefile.in b/vvp/Makefile.in
+index 8ccdb1d2..cdd940f5 100644
+--- a/vvp/Makefile.in
++++ b/vvp/Makefile.in
+@@ -142,10 +142,8 @@ tables.o: tables.cc
+
+ # Build this in two steps to avoid parallel build issues (see pr3462585)
+ parse.cc: $(srcdir)/parse.y
+- $(YACC) --verbose -t -d -o $@ $<
++ $(YACC) --verbose -t --defines=parse.h -o $@ $<
+ parse.h: parse.cc
+- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@
+- touch $@
+
+ lexor.cc: $(srcdir)/lexor.lex
+ $(LEX) -s -olexor.cc $(srcdir)/lexor.lex
+--
+2.26.2
+
diff --git a/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch b/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch
new file mode 100644
index 00000000000..93b9a616987
--- /dev/null
+++ b/sci-electronics/iverilog/files/iverilog-10.3-override-var.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/730096
+--- a/vpi/Makefile.in 2022-04-25 18:39:03.748939186 +0800
++++ b/vpi/Makefile.in 2022-04-25 18:38:43.754679053 +0800
+@@ -71,7 +71,7 @@
+ M = sys_clog2.o v2005_math.o
+
+ # Object files for va_math.vpi
+-V = va_math.o
++override V = va_math.o
+
+ V2009 = v2009_table.o v2009_array.o v2009_enum.o v2009_string.o
+
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index 1a2a537efa4..a0e95ea74ac 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -26,23 +26,25 @@ LICENSE="LGPL-2.1"
SLOT="0"
IUSE="examples"
-# If you are building from git, you will also need gperf to generate
-# the configure scripts.
-RDEPEND="
- sys-libs/readline:0
+# 721022, should depend on sys-libs/readline:=
+DEPEND="
+ sys-libs/readline:=
sys-libs/zlib
"
-
-DEPEND="
+RDEPEND="${DEPEND}"
+BDEPEND="
dev-util/gperf
sys-devel/bison
sys-devel/flex
- ${RDEPEND}
"
PATCHES=(
"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
"${FILESDIR}"/${PN}-10.3-fno-common.patch #706366
+ "${FILESDIR}"/${PN}-10.3-gen-bison-header.patch #734760
+ "${FILESDIR}"/${PN}-10.3-call-nm.patch #731906
+ "${FILESDIR}"/${PN}-10.3-configure-ac.patch #426262
+ "${FILESDIR}"/${PN}-10.3-override-var.patch #730096
)
src_prepare() {
@@ -52,6 +54,9 @@ src_prepare() {
# Here translate the autoconf.sh, equivalent to the following code
# > sh autoconf.sh
+ # Move configure.in to configure.ac (bug #426262)
+ mv configure.in configure.ac || die
+
# Autoconf in root ...
eautoconf --force
# Precompiling lexor_keyword.gperf
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index fc5a750ef53..ce087e60188 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,2 +1,2 @@
-DIST kicad-footprints-5.1.11.tar.bz2 3382305 BLAKE2B 93f94a5e80e06dc9c399437eb3c8b22b8bf5d5e085298ddd641ff5e9892c717fab7b41d6831a78e8996b1376547dda06e095fa157189c7eff2e3795a940a2d21 SHA512 bffa832cfc38a6ce076ec4c52ad9e119e990dbdb6013350b1a6c29ed37f2cff08892acaf004ffb4a772cbaff400636986e8e735c3ee00854b99e6bafa75a6564
-DIST kicad-footprints-6.0.0_rc1.tar.gz 6147594 BLAKE2B de3d44a7fb900c64e08aa8933eb3695aa15b27caf80f7fae93f3aa8194d8301e3e5ac549287a78e0168fa3130a8e84dfbcef5789ca99c2351be6b8696eb5887e SHA512 4625b2c2cff5102accaae1883d30c9a6304a5755804dca9d3a99231901a80813e51a55fba42332355df8896dc3ea843618108f25598a08d82ae11dc42b783782
+DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9
+DIST kicad-footprints-6.0.4.tar.gz 31577380 BLAKE2B af29460794becf92f5b08494c9d7b66eb56483fcdcf4e4f526cb4f7bad5833d87bfca810bbede9c72778d11bd430b26fd0b961ece8877d795d682b63122a3c8d SHA512 15d62bdb692c236d43c979a92f49ecad04e8de3a04c74b30671a309f160347bbbb3416b95fb02db1404f9e88f16c25a71467039fc83d6889edc2a3a3e3220bf8
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.11.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild
index 01e320ed9a0..919b81b5066 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.11.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.0_rc1.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.4.ebuild
index fdde3a10a4b..e1268b9afd0 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -15,7 +15,11 @@ else
MY_PV="${PV/_rc/-rc}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ fi
+
S="${WORKDIR}/${PN}-${MY_PV}"
fi
@@ -24,7 +28,7 @@ SLOT="0"
IUSE=""
DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.99"
+RDEPEND=">=sci-electronics/kicad-6.0.0"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild
index 13975a1f3b5..995b74bb188 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -15,7 +15,11 @@ else
MY_PV="${PV/_rc/-rc}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
S="${WORKDIR}/${PN}-${MY_PV}"
fi
@@ -24,9 +28,9 @@ SLOT="0"
IUSE=""
DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.99"
+RDEPEND=">=sci-electronics/kicad-6.0.0"
if [[ ${PV} == 9999 ]] ; then
- # x11-misc-util/macros only required on live ebuilds
+# x11-misc-util/macros only required on live ebuilds
BDEPEND+=" >=x11-misc/util-macros-1.18"
fi
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index 556dba13311..5619127f9c8 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1 +1 @@
-DIST kicad-i18n-5.1.11.tar.bz2 2934804 BLAKE2B 736ce447df2cd42e96c26159211192d9c72d20ec4d0c119a78a503b1ba5a05c1baaaf4451ff2daa0a6e7365f881f9d9db0ec51444d87cb252198096691121cab SHA512 3789405bd08151ea96608e17e8968d9034224cfb791901dda5a50090016e4f432bbc3db90823aa09932222bd5bff342edfca9d655ade2629535158d38a85f7e3
+DIST kicad-i18n-5.1.12.tar.bz2 2934525 BLAKE2B 7aef8a0e5213be38e5517a539469cba41d67dc2495539c7f5722f6cf7e3a86b8eaefa341d18a621b36c100ddd89466fbf5ac9d8071e5f78587161a8c0bb430d1 SHA512 178a17919e762f284aaf1fab75d527085a2bcec8dc6e236a552c6c471aab5ca4f747d297d8f148dbe9cc80a0c4994b712b54da077029ff484006b6c42dc22916
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.11.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild
index 3a3a991dcd7..ec60fdc5945 100644
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.11.ebuild
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.12.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.11.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild
index 8ff9f5fb6d7..03f88d62d7d 100644
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.11.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.12.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
HOMEPAGE="http://www.kicad.org"
diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.0_rc1.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.4.ebuild
index a8d3fb5f049..9b332cea06f 100644
--- a/sci-electronics/kicad-meta/kicad-meta-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-6.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
HOMEPAGE="http://www.kicad.org"
@@ -9,7 +9,11 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+
+if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
IUSE="doc minimal"
RDEPEND="
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 352f9983a4e..51c6d605904 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,2 +1,2 @@
-DIST kicad-packages3d-5.1.11.tar.bz2 727201396 BLAKE2B bdc66638d6a366bde20f7dba5c3470c729d21177ce8d3ae4ee501ec43531e72dca76350dd16912d4326ef96c7269fed6728031fe870b57c2a588e4e3040b60ca SHA512 c7eea38b75c87a684e00dce0bf8436f907eeddd386dd3c36814b0452de8e6002ad3399924f9b145945fd341276619ac61961bc6e436c4233faa53f2df05cc48d
-DIST kicad-packages3d-6.0.0_rc1.tar.gz 943436657 BLAKE2B 19be6acc72969d62ed6db7ec8b7ed0899644caf494240919b79c87f2ddd299b6502fd097e22ea0b9b99a2fa3ed0ab2445461703553fc0cb611e4dc1a455c1f5f SHA512 b1b21bcbfd2fc2a7b8e18f1457109f783cb268312d9e076adf81cec38e4511b944c0bce6bd39a06f84211e8f5dd60afc4daffd07affce6199db51b9c2cd3084d
+DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2
+DIST kicad-packages3d-6.0.4.tar.gz 947035647 BLAKE2B dc7bd7b83a4616da1567e3b776bf64ca22bd66795e04cc5f92b3c305fb770c539284cd25c192be8b8c72939b030180f5a045916fafd53d8bb23bb7f53353dd08 SHA512 94f8e5ae414a254c436a14470522b70b5d65c4c6035d487025e52031a90d53e4a7d965e48afcfe3ff839b909f16c8b9f28252c34abeb4ac0ae10448e2621cc45
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.11.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild
index db1b8d147cd..d37150d3243 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.11.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit check-reqs cmake
@@ -12,11 +12,9 @@ SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kic
LICENSE="CC-BY-SA-4.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
-IUSE="occ +oce"
+IUSE="+occ"
-REQUIRED_USE="|| ( occ oce )"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce(-)=]"
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
CHECKREQS_DISK_BUILD="11G"
S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.4.ebuild
index 3a59efb71e1..aea8eca4a26 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit check-reqs cmake
@@ -15,15 +15,19 @@ else
MY_PV="${PV/_rc/-rc}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ fi
+
+ S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-6ff98426fd51d53c55bc48025d66d3d0b0c5df92"
fi
IUSE="+occ"
LICENSE="CC-BY-SA-4.0"
SLOT="0"
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
+RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
index e241c3447f5..75bc70ca864 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit check-reqs cmake
@@ -16,14 +16,17 @@ else
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" # check for directory hash
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
fi
IUSE="+occ"
LICENSE="CC-BY-SA-4.0"
SLOT="0"
-RDEPEND=">=sci-electronics/kicad-5.99[occ=]"
+RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-packages3d/metadata.xml b/sci-electronics/kicad-packages3d/metadata.xml
index 8395544a695..c3ec4ca93a1 100644
--- a/sci-electronics/kicad-packages3d/metadata.xml
+++ b/sci-electronics/kicad-packages3d/metadata.xml
@@ -19,9 +19,6 @@
<flag name="occ">
Use <pkg>sci-libs/opencascade</pkg> for data exchange
</flag>
- <flag name="oce">
- Use <pkg>sci-libs/oce</pkg> for data exchange
- </flag>
</use>
<upstream>
<remote-id type="github">kicad/kicad-packages3d</remote-id>
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 5cfb72170b4..9fbb16d5aa6 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,2 +1,2 @@
-DIST kicad-symbols-5.1.11.tar.bz2 1815207 BLAKE2B 1502115b0191794987c3cd9357ce2bf44977dfde149abcfcedf9726d7e4c6d081ca384674b93e29d0885773adfc1fcca9ad9cc835548c5f5130cd1c401df7b5a SHA512 40120c16ad73529c9aecfdd4ca53be61f1a6b99914c28064057da7280fd11732fc7e49e854b3660eaa88678088f08578cae55db49fa4d9f5e3e26bedc1509053
-DIST kicad-symbols-6.0.0_rc1.tar.gz 4738558 BLAKE2B 2fb0e50b4a088c7f3d9ba0b919eb917b322109d0f9d4c181d9d6ae4f5daa3812f117b1a6dd198e30e5e8b774015a794a1214177b14d5a07425c402f2c7c10f1d SHA512 dd1e93fad1d161718aa98a6806a9cba38dbfc6d6bde80feefb5ec709be593794670c979c849db7b386ab4cd703e2e4d385ecae20f99a2332e55869f0f4d5737e
+DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6
+DIST kicad-symbols-6.0.4.tar.gz 4818571 BLAKE2B 30bc0e05f12461feaf12842cffc3a7a9033c70e5e8b6ccffe14aec399f7de5e0fd8aa84200fa2a7d4954343becb8a0fbc547e242b35bd68fb632245ab91985de SHA512 82e399467c4e97a001db96fe60ddcd79a9afb9a292d5d2649d833bc4ba88374378da054edd1c2172f7d8141b9cf06adecef027a2ddc8f33b2707cb9ec5406a5d
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.11.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild
index 85dbde951ce..0af175056d9 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.11.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.0_rc1.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.4.ebuild
index 627567d8a4f..02943f2ff69 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -12,11 +12,11 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
inherit git-r3
else
- MY_PV="${PV/_rc/-rc}"
- MY_P="${PN}-${MY_PV}"
- SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/${PN}-${MY_PV}"
+ SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ fi
fi
LICENSE="CC-BY-SA-4.0"
@@ -24,7 +24,7 @@ SLOT="0"
IUSE=""
DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.99"
+RDEPEND=">=sci-electronics/kicad-6.0.0"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild
index 798f3432351..2fcbfb8a9bc 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -15,7 +15,11 @@ else
MY_PV="${PV/_rc/-rc}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
S="${WORKDIR}/${PN}-${MY_PV}"
fi
@@ -23,7 +27,7 @@ LICENSE="CC-BY-SA-4.0"
SLOT="0"
IUSE=""
-RDEPEND=">=sci-electronics/kicad-5.99"
+RDEPEND=">=sci-electronics/kicad-6.0.0"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 42ba3fc03b7..8909795e76f 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,2 +1,2 @@
-DIST kicad-templates-5.1.11.tar.bz2 1552348 BLAKE2B 1ca6f048c965aac6288032896fd59ec87464ebdd380149250ad0b2f54b193a83640c81f35269a65aec49dc71f27e60da1cb2c37962b17e907b9d177dc1d29c34 SHA512 029501bf53186d01dc72e2fa0a7d3b3becb4df3b00a5a52f0b68c8a0a2df87ce9ed6ddca731d6bb06cf18e9e0c8a2d337e3feee6b111ac329060d85917411972
-DIST kicad-templates-6.0.0_rc1.tar.gz 2248926 BLAKE2B 54a45a32788650f3895f91fb993768a3caea55b304c38f07c933b7765f96e30b93b6c206a49f28b0813b9739e1ecd3e48e4939d9150089d115d59a98a1308dc2 SHA512 7e7604a6aa1657f222f258c3f9d62b1175e239bbec8c5ea2a681293786d2b04b31c5b9f05da031661364017464de741fbe823fd532eeadfb0a8c220051ca7f0e
+DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430
+DIST kicad-templates-6.0.4.tar.gz 2248753 BLAKE2B b65c4f61f86dd7cee6b7dbf2df579cda15e3258bd67f010afe910dc0fe5801c95ef0682fedd88cad8a3602035b69dff117dd8b8ce008fb066488e7b7281e60fe SHA512 a5f5df986002246a230c3fad4ae497a325bff402087ce2f65fbeaaae35861b50426bf255b2adc9c6f1a006aa88ac1d026bd07c9e88b87a75aa43d86feb17d7e7
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.11.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild
index dce1272e1a7..211b692af0c 100644
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.11.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.0_rc1.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.4.ebuild
index 348280a3c4d..fcdb94bb2f1 100644
--- a/sci-electronics/kicad-templates/kicad-templates-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-6.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -14,11 +14,15 @@ else
MY_PV="${PV/_rc/-rc}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ fi
+
S="${WORKDIR}/${PN}-${MY_PV}"
fi
LICENSE="CC-BY-SA-4.0"
SLOT="0"
-RDEPEND=">=sci-electronics/kicad-5.99"
+RDEPEND=">=sci-electronics/kicad-6.0.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-9999.ebuild b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild
index 348280a3c4d..4eb6a8bdae4 100644
--- a/sci-electronics/kicad-templates/kicad-templates-9999.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -14,11 +14,15 @@ else
MY_PV="${PV/_rc/-rc}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
S="${WORKDIR}/${PN}-${MY_PV}"
fi
LICENSE="CC-BY-SA-4.0"
SLOT="0"
-RDEPEND=">=sci-electronics/kicad-5.99"
+RDEPEND=">=sci-electronics/kicad-6.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 5458d6f5731..43578893eef 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,2 +1,2 @@
-DIST kicad-5.1.11.tar.bz2 18584584 BLAKE2B 87fb940e9e766ec5685eb0c84f450d60a6e8718937545ccd7dbd3bfc5f00af193224e877ac7ce249c3e89687d8f92f08b942effee0883debc14234b7ae473e21 SHA512 d244b020e8f4aab18cc91d72412f9c093055f0bab04e250bb46db6342c38c29f68c26132c53dde699042d3440a6c680d041a16d30e5fdc8be540b1023b6ba148
-DIST kicad-6.0.0_rc1.tar.gz 44783434 BLAKE2B c19cc17666c00210f844970d8b0aad3d929470544d641f94bdfd9e521f6c954fec6098885606f72ffb75a074794358cb6632fea03fa4196dbfbcf6d6fe077c5e SHA512 75a91ea111776f879b6cee14d09bcf9caa3cdc6d8220b2b89727e4f9d57db242b6c1b4c1235035f5bb8356c8bbc3cd9b9d6d80b2529c290a3fa57d90ba4dc632
+DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
+DIST kicad-6.0.4.tar.gz 45068438 BLAKE2B d77a68de7baa472a05666159183d5d528461624dbe791f3e7b00dad6292c8134ec371c2c21cb56e01a76738dc239284188b1bee7202b8eb14cf932bb7c570169 SHA512 3134aee924bf0aab6f12a7e9663d081ec038a2ccb2e6854be8ad8b1f71b36a9f286938101adb4ca0fa56487eecffd42691bb8737113bcaffcc56a2f68f6a9908
diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
new file mode 100644
index 00000000000..d52a05d3bcf
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur kicad-6.0.2-orig/CMakeLists.txt kicad-6.0.2/CMakeLists.txt
+--- kicad-6.0.2-orig/CMakeLists.txt 2022-02-10 16:29:07.000000000 -0800
++++ kicad-6.0.2/CMakeLists.txt 2022-02-13 20:09:37.244713966 -0800
+@@ -950,7 +950,7 @@
+ ###
+ if( UNIX AND NOT APPLE )
+ install( DIRECTORY scripts
+- DESTINATION ${KICAD_DOCS}
++ DESTINATION ${KICAD_BIN}/scripts
+ COMPONENT resources
+ PATTERN "*.bat" EXCLUDE
+ )
diff --git a/sci-electronics/kicad/kicad-5.1.11.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
index 586e7c949bb..2f202db0313 100644
--- a/sci-electronics/kicad/kicad-5.1.11.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8,9} )
@@ -16,13 +16,12 @@ SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
LICENSE="GPL-2+ GPL-3+ Boost-1.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
+IUSE="doc examples github +ngspice +occ openmp +python"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
- ?? ( occ oce )
"
-
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
COMMON_DEPEND="
>=dev-libs/boost-1.61:=[context,nls,threads(+)]
media-libs/freeglut
@@ -36,8 +35,7 @@ COMMON_DEPEND="
ngspice? (
>sci-electronics/ngspice-27[shared]
)
- occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] )
- oce? ( sci-libs/oce )
+ occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] )
python? (
$(python_gen_cond_dep '
>=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_USEDEP}]
@@ -61,9 +59,14 @@ PATCHES=(
"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
use python && python-single-r1_pkg_setup
- use openmp && tc-check-openmp
setup-wxwidgets
check-reqs_pkg_setup
}
@@ -103,7 +106,6 @@ src_configure() {
-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-DKICAD_SPICE="$(usex ngspice)"
-DKICAD_USE_OCC="$(usex occ)"
- -DKICAD_USE_OCE="$(usex oce)"
-DKICAD_INSTALL_DEMOS="$(usex examples)"
-DCMAKE_SKIP_RPATH="ON"
)
@@ -114,23 +116,10 @@ src_configure() {
-DPYTHON_LIBRARY="$(python_get_library_path)"
)
if use occ; then
- if has_version "~sci-libs/opencascade-7.5.2"; then
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.2
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.2
- )
- elif has_version "~sci-libs/opencascade-7.5.1"; then
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1
- )
- else
- # <occ-7.5 uses different layout
- mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
- )
- fi
+ mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+ )
fi
cmake_src_configure
diff --git a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-6.0.4.ebuild
index eeaa25c0733..19186c4e733 100644
--- a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
WX_GTK_VER="3.0-gtk3"
inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -20,18 +19,24 @@ else
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ fi
fi
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
SLOT="0"
-IUSE="doc examples +ngspice openmp +python occ +pcm"
+IUSE="doc examples +ngspice nls openmp +occ +pcm"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
COMMON_DEPEND="
+ !sci-electronics/kicad-i18n
>=dev-libs/boost-1.61:=[context,nls]
media-libs/freeglut
media-libs/glew:0=
@@ -40,38 +45,47 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.8.8:=
>=x11-libs/pixman-0.30
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_USEDEP}]
+ dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
ngspice? (
>sci-electronics/ngspice-27[shared]
)
- occ? (
- >=sci-libs/opencascade-6.8.0:=
+ nls? (
+ sys-devel/gettext
)
- python? (
- $(python_gen_cond_dep '
- >=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_MULTI_USEDEP}]
- dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
- ')
- ${PYTHON_DEPS}
+ occ? (
+ >=sci-libs/opencascade-7.3.0:0=
)
"
-DEPEND="${COMMON_DEPEND}
- python? ( >=dev-lang/swig-3.0:0 )"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
sci-electronics/electronics-menu
"
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND=">=dev-lang/swig-3.0
+ doc? ( app-doc/doxygen )"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
BDEPEND+=" >=x11-misc/util-macros-1.18"
fi
-CHECKREQS_DISK_BUILD="800M"
-CAS_VERSION=7.5.3
+CHECKREQS_DISK_BUILD="900M"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-scripts-install-fix.patch"
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
pkg_setup() {
- use python && python-single-r1_pkg_setup
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+ python-single-r1_pkg_setup
setup-wxwidgets
check-reqs_pkg_setup
}
@@ -88,14 +102,19 @@ src_configure() {
xdg_environment_reset
local mycmakeargs=(
- -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
- -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
- -DKICAD_SCRIPTING="$(usex python)"
- -DKICAD_SCRIPTING_MODULES="$(usex python)"
- -DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
- -DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
- -DKICAD_SCRIPTING_PYTHON3="$(usex python)"
- -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+ -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+ -DKICAD_SCRIPTING_WXPYTHON=ON
+
+ # Merged from separate -i18n package, bug #830274
+ -DKICAD_BUILD_I18N="$(usex nls)"
+ -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+ -DPYTHON_DEST="$(python_get_sitedir)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+
-DKICAD_SPICE="$(usex ngspice)"
-DKICAD_PCM="$(usex pcm)"
@@ -103,19 +122,10 @@ src_configure() {
-DKICAD_INSTALL_DEMOS="$(usex examples)"
-DCMAKE_SKIP_RPATH="ON"
)
- use python && mycmakeargs+=(
- -DPYTHON_DEST="$(python_get_sitedir)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- )
- local OCC_P=$(best_version sci-libs/opencascade)
- OCC_P=${OCC_P#sci-libs/}
- OCC_P=${OCC_P%-r*}
- use occ && mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
+ use occ && mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
)
cmake_src_configure
@@ -124,7 +134,7 @@ src_configure() {
src_compile() {
cmake_src_compile
if use doc; then
- cmake_src_compile dev-docs doxygen-docs
+ cmake_src_compile doxygen-docs
fi
}
@@ -138,11 +148,12 @@ src_test() {
src_install() {
cmake_src_install
- use python && python_optimize
+ python_optimize
+
if use doc ; then
dodoc uncrustify.cfg
cd Documentation || die
- dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+ dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
fi
}
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 966cb942056..dce9bac6faa 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
WX_GTK_VER="3.0-gtk3"
inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -20,18 +19,24 @@ else
MY_P="${PN}-${MY_PV}"
SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm64 ~x86"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
fi
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
SLOT="0"
-IUSE="doc examples +ngspice openmp +python occ +pcm"
+IUSE="doc examples +ngspice nls openmp +occ +pcm"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
COMMON_DEPEND="
+ !sci-electronics/kicad-i18n
>=dev-libs/boost-1.61:=[context,nls]
media-libs/freeglut
media-libs/glew:0=
@@ -40,38 +45,43 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.8.8:=
>=x11-libs/pixman-0.30
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_USEDEP}]
+ dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
ngspice? (
>sci-electronics/ngspice-27[shared]
)
- occ? (
- >=sci-libs/opencascade-6.8.0:=
+ nls? (
+ sys-devel/gettext
)
- python? (
- $(python_gen_cond_dep '
- >=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_MULTI_USEDEP}]
- dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
- ')
- ${PYTHON_DEPS}
+ occ? (
+ >=sci-libs/opencascade-7.3.0:0=
)
"
-DEPEND="${COMMON_DEPEND}
- python? ( >=dev-lang/swig-3.0:0 )"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
sci-electronics/electronics-menu
"
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND=">=dev-lang/swig-3.0
+ doc? ( app-doc/doxygen )"
if [[ ${PV} == 9999 ]] ; then
# x11-misc-util/macros only required on live ebuilds
BDEPEND+=" >=x11-misc/util-macros-1.18"
fi
-CHECKREQS_DISK_BUILD="800M"
-CAS_VERSION=7.5.3
+CHECKREQS_DISK_BUILD="900M"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
pkg_setup() {
- use python && python-single-r1_pkg_setup
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+ python-single-r1_pkg_setup
setup-wxwidgets
check-reqs_pkg_setup
}
@@ -89,13 +99,18 @@ src_configure() {
local mycmakeargs=(
-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
- -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
- -DKICAD_SCRIPTING="$(usex python)"
- -DKICAD_SCRIPTING_MODULES="$(usex python)"
- -DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
- -DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
- -DKICAD_SCRIPTING_PYTHON3="$(usex python)"
- -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+
+ -DKICAD_SCRIPTING_WXPYTHON=ON
+
+ # Merged from separate -i18n package, bug #830274
+ -DKICAD_BUILD_I18N="$(usex nls)"
+ -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+ -DPYTHON_DEST="$(python_get_sitedir)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+
-DKICAD_SPICE="$(usex ngspice)"
-DKICAD_PCM="$(usex pcm)"
@@ -103,21 +118,10 @@ src_configure() {
-DKICAD_INSTALL_DEMOS="$(usex examples)"
-DCMAKE_SKIP_RPATH="ON"
)
- use python && mycmakeargs+=(
- -DPYTHON_DEST="$(python_get_sitedir)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- )
-
- local OCC_P=$(best_version sci-libs/opencascade)
- OCC_P=${OCC_P#sci-libs/}
- OCC_P=${OCC_P%-r*}
use occ && mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
)
cmake_src_configure
@@ -126,7 +130,7 @@ src_configure() {
src_compile() {
cmake_src_compile
if use doc; then
- cmake_src_compile dev-docs doxygen-docs
+ cmake_src_compile doxygen-docs
fi
}
@@ -140,11 +144,12 @@ src_test() {
src_install() {
cmake_src_install
- use python && python_optimize
+ python_optimize
+
if use doc ; then
dodoc uncrustify.cfg
cd Documentation || die
- dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+ dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
fi
}
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 603e4e9f966..cd956ca81c5 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -12,8 +12,7 @@
<use>
<flag name="github">Add github support into PCB editor</flag>
<flag name="ngspice">Enable circuit simulation</flag>
- <flag name="occ">Enable viewing 3D rendering of designs via opencascade</flag>
- <flag name="oce">Enable viewing 3D rendering of designs via OCE</flag>
+ <flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
<flag name="python">Enable python scripting support</flag>
<flag name="pcm">Enable plugin content manager</flag>
</use>
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 357e27945a0..8db2c7a1b65 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,3 +1,3 @@
-DIST klayout-0.26.11.tar.gz 54455860 BLAKE2B f2e988ef1a68a0d8e612199d1a930a55c9175bebb8ca4cbbedef425d6367ddd3e56999502e0fb4c38043e2f7bf2c75c3acb18c498124c5850379bbfe283cb218 SHA512 c868830494a7181bbc68f543930aaf87a189b5063d212191305a3d2e119921175ff66aa2f87f9a89e8e9e5d8bf2c47ed32b5cd1fb43b85619ee35d8a3ddc063b
DIST klayout-0.27.3.tar.gz 57274694 BLAKE2B 131791f7e978a5ffd344d1dab15d0d245d971855d34c995b4f86173f31853f71ec79d089cc2f80a10d318b108cb0f624c9610c9bf51f0bd88f2265e2d8871c97 SHA512 5f3a83cbbdc171acf200a90e4758942e7c3dd4ec66666576c6ecb041326e52a99222992e844d63f939650374a7493f542b1412ada714b6c0271103facb5acaa9
+DIST klayout-0.27.7.tar.gz 57348398 BLAKE2B c717d1041e2b2f1ec4835db3861a8c7ff15d2cd703d3424d9219cb0fab06471a6838503c882b841be45c9e1b9280d1f7a099f9824c6e286940d3b44713927974 SHA512 f4b4f3f2216307df5dca3b9c9c4eee5b45e5811a3307f36d3ad759d33beb8cd83880485284492583b891ee8bbf2866cae0ce87b5c5971478d8ad8daad315bb09
DIST klayout-0.27.tar.gz 56917189 BLAKE2B 41a66939d6d7a058f9dc1772ba152ff1c311b146f7e2b37da52447cbd7eacc35a26a5fec1516384619ab0680a145f82a120ee7ee2739a5c8e9648836afa07d13 SHA512 475e2d905bc75a13c924f6cd1d08b566ecde92a28ed6a32b1995452e0446d4c75f7856ce3af4430a3b39a3876a3817923a51f3675c5afb33f4ec749acf15e0b4
diff --git a/sci-electronics/klayout/klayout-0.27.3.ebuild b/sci-electronics/klayout/klayout-0.27.3.ebuild
index fa9d57d2fc6..01355f2e03c 100644
--- a/sci-electronics/klayout/klayout-0.27.3.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
else
SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
diff --git a/sci-electronics/klayout/klayout-0.26.11.ebuild b/sci-electronics/klayout/klayout-0.27.7.ebuild
index 6eb043c6d1b..40bfbeb1351 100644
--- a/sci-electronics/klayout/klayout-0.26.11.ebuild
+++ b/sci-electronics/klayout/klayout-0.27.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
RUBY_OPTIONAL=no
-USE_RUBY="ruby26"
+USE_RUBY="ruby27"
# note: define maximally ONE implementation here
PYTHON_COMPAT=( python3_{7,8,9} )
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
else
SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
@@ -57,12 +57,12 @@ each_ruby_configure() {
./build.sh \
-expert \
-dry-run \
- -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+ -qmake "$EPREFIX/usr/$(get_libdir)/qt5/bin/qmake" \
-ruby "${RUBY}" \
-python "${PYTHON}" \
-build . \
-bin "${T}/bin" \
- -rpath "/usr/$(get_libdir)/klayout" \
+ -rpath "$EPREFIX/usr/$(get_libdir)/klayout" \
-option "${MAKEOPTS}" \
-with-qtbinding \
-without-64bit-coord \
diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch
new file mode 100644
index 00000000000..20222c89daa
--- /dev/null
+++ b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch
@@ -0,0 +1,38 @@
+From 1b814b266f1bd25d92b701e071473f2267330933 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
+Date: Mon, 22 Mar 2021 12:49:26 +0100
+Subject: [PATCH] fix crash when looking for where connectors diverge
+
+---
+ src/electronics/ecnode.cpp | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp
+index 385844c1..28f2a556 100644
+--- a/src/electronics/ecnode.cpp
++++ b/src/electronics/ecnode.cpp
+@@ -225,10 +225,18 @@ QPoint ECNode::findConnectorDivergePoint(bool *found)
+ if (!gotP1 || !gotP2 )
+ return QPoint(0,0);
+
+- unsigned maxLength = p1.size() > p2.size() ? p1.size() : p2.size();
++ // If they are differing lengths, return the end of the shortest
++ if (p1.size() < p2.size()) {
++ *found = true;
++ return p1.last();
++ } else if (p2.size() < p1.size()) {
++ *found = true;
++ return p2.last();
++ }
++
++ Q_ASSERT(p1.size() == p2.size());
+
+- for ( unsigned i = 1; i < maxLength; ++i )
+- {
++ for (unsigned i = 1; i < qMin(p1.size(), p2.size()); ++i) {
+ if ( p1[i] != p2[i] ) {
+ *found = true;
+ return p1[i-1];
+--
+GitLab
+
diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch
new file mode 100644
index 00000000000..ec970b64ad8
--- /dev/null
+++ b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch
@@ -0,0 +1,52 @@
+From 730a5492e4780504a80db1a27dc307d8f61b4696 Mon Sep 17 00:00:00 2001
+From: Zoltan Padrah <zoltan_padrah@users.sf.net>
+Date: Fri, 18 Dec 2020 20:47:55 +0200
+Subject: [PATCH] property editor: fix crash when changing a property and
+ clicking circuit
+
+apparently Ubuntu 18.04 is affected (Qt 5.9.5)
+and Ubuntu 20.04 is not (Qt 5.12.8).
+
+to reproduce:
+
+1. place and select a resistor
+2. in the property editor click on any of its properties,
+ in order to start editing it
+3. click on the circuit, to stop editing of the properties
+3.1. Expected: property value is kept, program continues
+3.2. Actually: crash with the same stack trace from above
+
+Should fix issue on GitHub:
+https://github.com/ktechlab/ktechlab/issues/60
+---
+ src/gui/itemeditor/propertyeditor.cpp | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/gui/itemeditor/propertyeditor.cpp b/src/gui/itemeditor/propertyeditor.cpp
+index 88b86842..60821177 100644
+--- a/src/gui/itemeditor/propertyeditor.cpp
++++ b/src/gui/itemeditor/propertyeditor.cpp
+@@ -476,8 +476,19 @@ void PropertyEditor::showDefaultsButton(bool show)
+
+ void PropertyEditor::updateDefaultsButton()
+ {
+- if (!m_editItem)
++ QTableWidgetItem *currItem = currentItem();
++ if (!currItem) {
++ m_editItem = nullptr;
+ return;
++ }
++ m_editItem = dynamic_cast<PropertyEditorItem*>(currItem);
++ if (!m_editItem) {
++ qWarning() << "failed to cast current item to PropertyEditorItem, " << currItem;
++ return;
++ }
++ qDebug() << "currentItem=" << currentItem();
++ qDebug() << "m_editItem=" << m_editItem;
++ qDebug() << "m_editItem->property=" << m_editItem->property();
+ showDefaultsButton( m_editItem->property()->changed() );
+ repaint(); // m_editItem->repaint();
+ }
+--
+GitLab
+
diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch
new file mode 100644
index 00000000000..c72fdd60021
--- /dev/null
+++ b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch
@@ -0,0 +1,26 @@
+From e0bb9ff940f6eda544342c499998cf6142258629 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
+Date: Sun, 20 Dec 2020 14:43:31 +0100
+Subject: [PATCH] fix odd crash
+
+---
+ src/nodegroup.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nodegroup.cpp b/src/nodegroup.cpp
+index f4cfa2b4..94430409 100644
+--- a/src/nodegroup.cpp
++++ b/src/nodegroup.cpp
+@@ -142,8 +142,7 @@ void NodeGroup::updateRoutes()
+ Node *next = (routeIt == routeEnd) ? n2 : (Node *)*(routeIt++);
+ removeRoutedNodes(&currentList, prev, next);
+ QPointList pointList = *it;
+- if ( prev != n1 )
+- {
++ if (!pointList.isEmpty() && prev != n1) {
+ QPoint first = pointList.first();
+ prev->moveBy( first.x() - prev->x(), first.y() - prev->y() );
+ }
+--
+GitLab
+
diff --git a/sci-electronics/ktechlab/ktechlab-0.50.0-r1.ebuild b/sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild
index 47f9f7469ef..6359c002ea9 100644
--- a/sci-electronics/ktechlab/ktechlab-0.50.0-r1.ebuild
+++ b/sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
ECM_EXAMPLES="true"
ECM_HANDBOOK="forceoptional"
@@ -44,4 +44,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-deps.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-deps.patch
+ "${FILESDIR}"/${P}-crashfix{-propertyeditor,-connectors-diverging,}.patch
+)
diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index 61e8f60ff02..3089c1f2947 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,2 +1,2 @@
-DIST librepcb-0.1.3-source.zip 12148919 BLAKE2B 2be3455c9be3e60a7cb314292e2a6ffe10d98f0c647d9c79f223ee5c5ef50675685d914889f772448dba699742d3bcd5b6636d489e630c8033912f3c9f223715 SHA512 28d45800bbbbcee8d30973c1a1e1e561c0fe2c65339eda4f6170779d921a9f5b2f5fb8c1cda00477e59976b88a3c368bb4985f31331bb16f761823642138c78b
DIST librepcb-0.1.5-source.zip 13111207 BLAKE2B 3a8c5f8b310971e1a6bd5b1fa8eb8059cd1c571e9ab369bf80c946ccbd320c258d5e8c65bea3b5a5bc4d85a38cac8205d5bbfbaad6aebf0a031315b73e9b99f4 SHA512 ed8c8fc154a03082bcbfe414bdb934870d09cf137811036a3ce59d70e1ad0b582fea64c31037c84e76a939bf1d087caabb9aa349578b525bce882e853a969653
+DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e SHA512 a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7
diff --git a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
new file mode 100644
index 00000000000..2abb26b18b5
--- /dev/null
+++ b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
@@ -0,0 +1,28 @@
+diff --git a/./libs/librepcb/common/utils/mathparser.cpp.orig b/./libs/librepcb/common/utils/mathparser.cpp
+index 618de36..e0903de 100644
+--- a/./libs/librepcb/common/utils/mathparser.cpp.orig
++++ b/./libs/librepcb/common/utils/mathparser.cpp
+@@ -22,7 +22,7 @@
+ ******************************************************************************/
+ #include "mathparser.h"
+
+-#include "muparser/include/muParser.h"
++#include <muParser.h>
+
+ /*******************************************************************************
+ * Namespace
+diff --git a/./cmake/FindMuParser.cmake.orig b/./cmake/FindMuParser.cmake
+--- a/./cmake/FindMuParser.cmake.orig 2021-11-03 01:04:32.000000000 +0300
++++ b/./cmake/FindMuParser.cmake 2022-04-24 18:01:23.996260205 +0300
+@@ -37,6 +37,11 @@
+ if(muparser_FOUND)
+ message(STATUS "Using system MuParser")
+
++ # Add uppercase alias if only the lowercase target is defined
++ if(NOT TARGET MuParser::MuParser)
++ add_library(MuParser::MuParser ALIAS muparser::muparser)
++ endif()
++
+ # Stop here, we're done
+ return()
+ endif()
diff --git a/sci-electronics/librepcb/librepcb-0.1.3.ebuild b/sci-electronics/librepcb/librepcb-0.1.6.ebuild
index 610277aedbe..e8eb1533138 100644
--- a/sci-electronics/librepcb/librepcb-0.1.3.ebuild
+++ b/sci-electronics/librepcb/librepcb-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit qmake-utils xdg-utils
+inherit cmake virtualx xdg
DESCRIPTION="Free EDA software to develop printed circuit boards"
HOMEPAGE="https://librepcb.org/"
@@ -12,13 +12,14 @@ SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
BDEPEND="
app-arch/unzip
dev-qt/linguist-tools:5"
RDEPEND="
+ dev-cpp/muParser:=
+ dev-libs/quazip:=
dev-qt/qtcore:5
dev-qt/qtconcurrent:5
dev-qt/qtgui:5
@@ -26,6 +27,7 @@ RDEPEND="
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtsql:5
+ dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
sys-libs/zlib"
@@ -33,22 +35,16 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-qt/qttest:5"
-src_configure() {
- eqmake5 -r PREFIX="/usr"
-}
+PATCHES=( "${FILESDIR}"/${P}-muparser-fix.patch )
-src_install() {
- emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
+src_configure() {
+ local mycmakeargs+=(
+ -DUNBUNDLE_QUAZIP=ON
+ -DUNBUNDLE_MUPARSER=ON )
+ cmake_src_configure
}
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
+src_test() {
+ cd "${BUILD_DIR}"/tests/unittests || die
+ virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername
}
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 06e1a5b7843..e58deb09ddf 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,4 +1,2 @@
-DIST 2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
-DIST magic-7.5.202.tgz 3692294 BLAKE2B 8c484e7771b388df8a5e9df574a522f81b5ae34bfaa0db28f444f31a0f5737094d73d2f5467796df74f9230fe684e9c96b08b11812b5627ee5a1bcc74893a021 SHA512 62be6e781ab51a4129a520b91a35ff5c280e7e9cb825e5d71e4012205dd0b777ca8c2355fb071d7d716977d477bddd44e45ca2810d3f97bb63dfe46c5ad1ba80
DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc
DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
diff --git a/sci-electronics/magic/files/magic-7.5.202-include.patch b/sci-electronics/magic/files/magic-7.5.202-include.patch
deleted file mode 100644
index f1fc95a60b3..00000000000
--- a/sci-electronics/magic/files/magic-7.5.202-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- magic-7.5.202/textio/txInput.c
-+++ magic-7.5.202/textio/txInput.c
-@@ -21,6 +21,7 @@
- #endif /* not lint */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <sys/time.h>
- #include <sys/types.h>
---- magic-8.0.131/graphics/grX11su3.c
-+++ magic-8.0.131/graphics/grX11su3.c
-@@ -20,6 +20,7 @@
-
- #include <stdio.h>
- #include <string.h>
-+#include <math.h>
- #include <X11/Xlib.h>
-
- #include "utils/magic.h"
diff --git a/sci-electronics/magic/files/magic-7.5.202-install.patch b/sci-electronics/magic/files/magic-7.5.202-install.patch
deleted file mode 100644
index 6e28b950c51..00000000000
--- a/sci-electronics/magic/files/magic-7.5.202-install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- magic-7.5.202/rules.mak
-+++ magic-7.5.202/rules.mak
-@@ -43,9 +43,9 @@
- ${RM} ${MODULE}
- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS}
-
--${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT}
-- ${RM} ${BINDIR}/${MODULE}${EXEEXT}
-- ${CP} ${MODULE}${EXEEXT} ${BINDIR}
-+${DESTDIR}${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT}
-+ ${RM} ${DESTDIR}${BINDIR}/${MODULE}${EXEEXT}
-+ ${CP} ${MODULE}${EXEEXT} ${DESTDIR}${BINDIR}
-
- ../database/database.h: ../database/database.h.in
- @echo --- making header file database/database.h
diff --git a/sci-electronics/magic/files/magic-ldflags.patch b/sci-electronics/magic/files/magic-ldflags.patch
deleted file mode 100644
index 60d5891beee..00000000000
--- a/sci-electronics/magic/files/magic-ldflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r -u magic-7.5.202.orig/scripts/configure.in magic-7.5.202/scripts/configure.in
---- magic-7.5.202.orig/scripts/configure.in 2010-03-08 14:33:07.000000000 +0100
-+++ magic-7.5.202/scripts/configure.in 2010-07-02 22:15:50.814199319 +0200
-@@ -1350,7 +1350,6 @@
- if test "x${loader_run_path}" != "x" ; then
- LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}"
- fi
-- LDFLAGS=""
- EXTRA_LIB_SPECS="-ldl"
- ;;
-
-diff -r -u magic-7.5.202.orig/scripts/defs.mak.in magic-7.5.202/scripts/defs.mak.in
---- magic-7.5.202.orig/scripts/defs.mak.in 2010-03-08 14:33:07.000000000 +0100
-+++ magic-7.5.202/scripts/defs.mak.in 2010-07-02 22:15:50.814199319 +0200
-@@ -53,7 +53,7 @@
- M4 = @M4@
- RANLIB = @RANLIB@
- SHDLIB_EXT = @SHDLIB_EXT@
--LDDL_FLAGS = @LDDL_FLAGS@
-+LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@
- LD_RUN_PATH = @LD_RUN_PATH@
- LIB_SPECS = @LIB_SPECS@
- WISH_EXE = @WISH_EXE@
-diff -r -u magic-7.5.202.orig/tcltk/Makefile magic-7.5.202/tcltk/Makefile
---- magic-7.5.202.orig/tcltk/Makefile 2009-05-29 15:54:55.000000000 +0200
-+++ magic-7.5.202/tcltk/Makefile 2010-07-02 22:16:30.916202298 +0200
-@@ -41,11 +41,11 @@
- (cd $(DESTDIR)${TCLDIR}; chmod 0755 tkcon.tcl tkshell.tcl)
-
- magicexec: magicexec.c
-- ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} magicexec.c -o magicexec \
-+ ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicexec.c -o magicexec \
- ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
-
- magicdnull: magicdnull.c
-- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} magicdnull.c -o magicdnull \
-+ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicdnull.c -o magicdnull \
- ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
-
- magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak
diff --git a/sci-electronics/magic/magic-7.5.202-r1.ebuild b/sci-electronics/magic/magic-7.5.202-r1.ebuild
deleted file mode 100644
index d0de7f31671..00000000000
--- a/sci-electronics/magic/magic-7.5.202-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib epatch autotools
-
-DESCRIPTION="The VLSI design CAD tool"
-HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
-SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
- ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-
-LICENSE="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0=
- sys-libs/readline:0=
- dev-lang/tcl:0=
- dev-lang/tk:0=
- dev-tcltk/blt"
-DEPEND="${RDEPEND}
- app-shells/tcsh"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-ldflags.patch"
- epatch "${FILESDIR}/${P}-install.patch" #422687
- epatch "${FILESDIR}/${P}-include.patch"
- cd scripts
- eautoreconf
- cd ..
- sed -i -e "s: -pg : :" tcltk/Makefile || die
-
- # required for >=autoconf-2.70 (bug #775422)
- local ac_aux_file
- for ac_aux_file in install-sh config.guess config.sub ; do
- ln -s scripts/${ac_aux_file} ${ac_aux_file} || die
- done
-}
-
-src_configure() {
- # Short-circuit top-level configure script to retain CFLAGS
- # fix tcl/tk detection #447868
- cd scripts
- CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
-
- dodoc README README.Tcl TODO
-
- # Move docs from libdir to docdir and add symlink.
- mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
- rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
- dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
-
- # Move tutorial from libdir to datadir and add symlink.
- dodir /usr/share/${PN}
- mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
- dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
-
- # Install latest MOSIS tech files
- cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
-}
diff --git a/sci-electronics/magic/magic-8.3.232.ebuild b/sci-electronics/magic/magic-8.3.232.ebuild
index c21980f211a..a23b43b71b8 100644
--- a/sci-electronics/magic/magic-8.3.232.ebuild
+++ b/sci-electronics/magic/magic-8.3.232.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz
LICENSE="HPND GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="cairo debug opengl"
RDEPEND="sys-libs/ncurses:0=
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index a9fc63fa30c..e926f330962 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -4,3 +4,5 @@ DIST ngspice-34-manual.pdf 2311221 BLAKE2B e8863bab8173980a825970b90b685d3d5a597
DIST ngspice-34.tar.gz 7800546 BLAKE2B a07a7266225b8c4e478e3240718aa1fce9a77003d58477a30a6178368e7826f288007f9111797ca1c426486911d4bedd847bdf0daa69232e59333304468a4fc3 SHA512 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8
DIST ngspice-35-manual.pdf 2347261 BLAKE2B 617462615525e5335f5795e625578324d2b173a8d69438e43c4007177e7ca0fdf8d37b1553a4c836a352523c310bbf23ef492a01ac0a7541ca8ac0794b588a66 SHA512 df3239c4798746534d12a489d80056d45d9f3cda60336aaeb2dd541526340715a180780b0e2ced1857e9c5cbe716c4b3f0c496598f8a3e8aa36a8cd1b6a022c7
DIST ngspice-35.tar.gz 8050668 BLAKE2B d67475b55e1e14974a78451175a08ec91be24708030e0da8fa6811b7df880c8082741ec08d92c314c53480271cc074e35ad0eca27a3b7601e33fb240c834e530 SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b
+DIST ngspice-36-manual.pdf 2397103 BLAKE2B 09dbfe4101b8e1752509caa37ba3a323da7d7391488c3245b3f614114d1666ee32ea1391ad4f39772ed950e270f028b7513115e0c13fde052bfdb5674f021b3b SHA512 bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134
+DIST ngspice-36.tar.gz 8450071 BLAKE2B 51fa2c5998e96a05deb3764f56659ed0970d6362fcbec7367b04a5fbe76fc7dadb08e0d36b660b0e1f8e525079bedf71305877ab2de8e2ab2773c891808fb5a6 SHA512 d862097f465e92986e8d6644374d43249eebee0fb6d79b1404dbb7c11d14a058dfedd4bdb61baf5aa1ffd1d2e71167440db73eb417d4b1249a0a7b83bd39efc3
diff --git a/sci-electronics/ngspice/ngspice-31-r1.ebuild b/sci-electronics/ngspice/ngspice-31-r1.ebuild
index 7195c9e6037..603365b18c6 100644
--- a/sci-electronics/ngspice/ngspice-31-r1.ebuild
+++ b/sci-electronics/ngspice/ngspice-31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,11 +40,16 @@ DOCS=(
Stuarts_Poly_Notes
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
MULTIBUILD_VARIANTS=( "binaries" )
use shared && MULTIBUILD_VARIANTS+=( "shared" )
use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
- use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/sci-electronics/ngspice/ngspice-34.ebuild b/sci-electronics/ngspice/ngspice-34.ebuild
index 9f70865e81c..e0f41dc5b26 100644
--- a/sci-electronics/ngspice/ngspice-34.ebuild
+++ b/sci-electronics/ngspice/ngspice-34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,11 +41,16 @@ DOCS=(
Stuarts_Poly_Notes
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
MULTIBUILD_VARIANTS=( "binaries" )
use shared && MULTIBUILD_VARIANTS+=( "shared" )
use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
- use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/sci-electronics/ngspice/ngspice-35.ebuild b/sci-electronics/ngspice/ngspice-35.ebuild
index 17b7d8e3355..305f2906fb3 100644
--- a/sci-electronics/ngspice/ngspice-35.ebuild
+++ b/sci-electronics/ngspice/ngspice-35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,11 +40,16 @@ DOCS=(
Stuarts_Poly_Notes
)
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
MULTIBUILD_VARIANTS=( "binaries" )
use shared && MULTIBUILD_VARIANTS+=( "shared" )
use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
- use openmp && tc-check-openmp
}
src_prepare() {
diff --git a/sci-electronics/ngspice/ngspice-36.ebuild b/sci-electronics/ngspice/ngspice-36.ebuild
new file mode 100644
index 00000000000..8a616095f43
--- /dev/null
+++ b/sci-electronics/ngspice/ngspice-36.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild toolchain-funcs virtualx
+
+DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)"
+SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
+ doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )"
+HOMEPAGE="http://ngspice.sourceforge.net"
+LICENSE="BSD GPL-2"
+
+SLOT="0"
+IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/ncurses:0=
+ X? ( x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libX11 )
+ fftw? ( sci-libs/fftw:3.0 )
+ readline? ( sys-libs/readline:0= )
+ tcl? ( dev-lang/tcl:0
+ dev-tcltk/blt )"
+RDEPEND="${DEPEND}"
+
+DOCS=(
+ ANALYSES
+ AUTHORS
+ BUGS
+ ChangeLog
+ DEVICES
+ FAQ
+ NEWS
+ README
+ README.vdmos
+ Stuarts_Poly_Notes
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+ MULTIBUILD_VARIANTS=( "binaries" )
+ use shared && MULTIBUILD_VARIANTS+=( "shared" )
+ use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
+}
+
+src_prepare() {
+ default
+
+ if use tcl; then
+ if use examples; then
+ find examples/tclspice -type f -iname \*tcl -or -iname \*.sh |
+ while read s
+ do
+ sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \
+ -e 's@package require BLT@package require Tk\npackage require BLT@g' \
+ -e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \
+ "${s}" || die "sed failed"
+ done
+ fi
+ fi
+
+ eautoreconf
+ multibuild_copy_sources
+}
+
+src_configure() {
+ multibuild_foreach_variant ngspice_configure
+}
+
+ngspice_configure() {
+ local myeconfargs
+
+ pushd "${BUILD_DIR}" &>/dev/null || die
+
+ if use debug; then
+ myeconfargs=(
+ --enable-debug
+ --enable-ftedebug
+ --enable-cpdebug
+ --enable-sensdebug
+ --enable-asdebug
+ --enable-stepdebug
+ --enable-pzdebug
+ )
+ else
+ myeconfargs=(
+ --disable-debug
+ --disable-ftedebug
+ --disable-cpdebug
+ --disable-sensdebug
+ --disable-asdebug
+ --disable-stepdebug
+ --disable-pzdebug
+ )
+ fi
+
+ # As of March 2021, these do not compile
+ myeconfargs+=(
+ --disable-blktmsdebug
+ --disable-smltmsdebug
+ )
+
+ myeconfargs+=(
+ --enable-xspice
+ --enable-cider
+ --disable-rpath
+ $(use_enable openmp)
+ $(use_with fftw fftw3)
+ $(use_with readline)
+ )
+
+ if [[ "${MULTIBUILD_VARIANT}" == "shared" ]]; then
+ myeconfargs+=( --with-ngshared )
+ elif [[ "${MULTIBUILD_VARIANT}" == "tcl" ]]; then
+ myeconfargs+=( --with-tcl="${EPREFIX}/usr/$(get_libdir)" )
+ else
+ myeconfargs+=(
+ $(use_enable deprecated oldapps)
+ $(use_with X x)
+ )
+ fi
+
+ econf "${myeconfargs[@]}"
+
+ popd &>/dev/null || die
+}
+
+src_compile() {
+ multibuild_foreach_variant ngspice_compile
+}
+
+ngspice_compile() {
+ pushd "${BUILD_DIR}" &>/dev/null || die
+ default
+ popd &>/dev/null || die
+}
+
+src_install() {
+ multibuild_foreach_variant ngspice_install
+
+ # merge the installations of all variants
+ local v
+ for v in "${MULTIBUILD_VARIANTS[@]}" ; do
+ cp -a "${ED}/tmp/${v}"/* "${ED}" || die "Failed to combine multibuild installations"
+ done
+ rm -rf "${ED}/tmp" || die
+
+ use tcl && DOCS+=( README.tcl )
+ use shared && DOCS+=( README.shared-xspice )
+ use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf )
+
+ default
+
+ if use examples; then
+ if ! use tcl; then
+ rm -rf examples/tclspice || die
+ fi
+
+ insinto /usr/share/${PN}
+ doins -r examples
+ fi
+}
+
+ngspice_install() {
+ pushd "${BUILD_DIR}" &>/dev/null || die
+
+ emake DESTDIR="${ED}/tmp/${MULTIBUILD_VARIANT}" install
+
+ # Strip shared-library and Tcl-module builds to the bare minimum;
+ # all the support files will have been handled by the 'binaries' build.
+ if [[ "${MULTIBUILD_VARIANT}" != "binaries" ]]; then
+ rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/bin{,.debug} || die
+ rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/share || die
+ rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la || die
+ rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} || die
+ fi
+
+ popd &>/dev/null || die
+}
+
+src_test() {
+ if ! use debug; then
+ # tests can be only executed for the binaries variant
+ pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die
+ echo "set ngbehavior=mc" > "${HOME}"/.spiceinit || die "Failed to configure ${PN} for running the test suite"
+ virtx default
+ popd &>/dev/null || die
+ else
+ # https://sourceforge.net/p/ngspice/bugs/353/
+ ewarn
+ ewarn "Skipping tests because they are known to fail in debug mode"
+ ewarn
+ fi
+}
diff --git a/sci-electronics/pulseview/pulseview-0.4.2.ebuild b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
index e96be770c57..a71826cfa06 100644
--- a/sci-electronics/pulseview/pulseview-0.4.2.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.2-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 xdg-utils
+inherit cmake xdg-utils
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,7 +19,6 @@ HOMEPAGE="https://sigrok.org/wiki/PulseView"
LICENSE="GPL-3"
SLOT="0"
IUSE="+decode static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="
dev-qt/linguist-tools:5
@@ -36,10 +33,7 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
>=sci-libs/libsigrok-0.5.1:=[cxx]
- decode? (
- ${PYTHON_DEPS}
- >=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_SINGLE_USEDEP}]
- )
+ decode? ( >=sci-libs/libsigrokdecode-0.5.2:= )
"
DEPEND="${RDEPEND}"
@@ -50,10 +44,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch
)
-pkg_setup() {
- use decode && python_setup
-}
-
src_prepare() {
cmake_src_prepare
cmake_comment_add_subdirectory manual
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index 1b2ea98c17f..330e533dbf8 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 xdg-utils
+inherit cmake xdg-utils
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,7 +19,6 @@ HOMEPAGE="https://sigrok.org/wiki/PulseView"
LICENSE="GPL-3"
SLOT="0"
IUSE="+decode static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="
dev-qt/linguist-tools:5
@@ -36,19 +33,12 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
>=sci-libs/libsigrok-0.6.0:=[cxx]
- decode? (
- ${PYTHON_DEPS}
- >=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
- )
+ decode? ( >=sci-libs/libsigrokdecode-0.6.0:= )
"
DEPEND="${RDEPEND}"
DOCS=( HACKING NEWS README )
-pkg_setup() {
- use decode && python_setup
-}
-
src_prepare() {
cmake_src_prepare
cmake_comment_add_subdirectory manual
diff --git a/sci-electronics/sigrok-cli/Manifest b/sci-electronics/sigrok-cli/Manifest
index faa8d80770c..e8ccd32829c 100644
--- a/sci-electronics/sigrok-cli/Manifest
+++ b/sci-electronics/sigrok-cli/Manifest
@@ -1,2 +1 @@
-DIST sigrok-cli-0.7.1.tar.gz 221754 BLAKE2B a2edd3ef990c484660dd3fa6f8b8f2ca3eb500a39ac66da1ce9b95c7dd6bfbc5f39b7e5a28872bc8b4c6b7e6282919bbb22f71796ad8e16f3549ef2e4674f02e SHA512 a56d9439efca74f8362ed225d8fa92adfaee053470b166629ad2d8f3ebf5bea05a37782750c9321aabd3b47e634734fa5e5b0cc5353bf49dd1629cdcdb98aef5
DIST sigrok-cli-0.7.2.tar.gz 230354 BLAKE2B a026f1305391d8c29e13dd0e88ee2e4ec3f8991aad728749bf2d74a0380b994341a056e227c8762dda75a409383fba53050739fe8fc55282b925791af72dfb72 SHA512 5862aa11a586ebb3acf9bffd1d2686cb5b3c3622b436080e05e2fc826a4814cf4746f128c01764f8dc664c5fc1a1e8c6ef66e548770278cc6ea99353d2173143
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
index 98082389e4d..730463965c9 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 xdg-utils
+inherit xdg-utils
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,14 +19,10 @@ HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
LICENSE="GPL-3"
SLOT="0"
IUSE="+decode"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND=">=dev-libs/glib-2.32.0
>=sci-libs/libsigrok-0.5.0:=
- decode? (
- >=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
- ${PYTHON_DEPS}
- )"
+ decode? ( >=sci-libs/libsigrokdecode-0.5.0:= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild
deleted file mode 100644
index 7033695a668..00000000000
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="git://sigrok.org/${PN}"
- inherit git-r3 autotools
-else
- SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Command-line client for the sigrok logic analyzer software"
-HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+decode"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.32.0
- >=sci-libs/libsigrok-0.5.0:=
- decode? (
- >=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
- ${PYTHON_DEPS}
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- [[ ${PV} == "9999" ]] && eautoreconf
- eapply_user
-}
-
-src_configure() {
- econf $(use_with decode libsigrokdecode)
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
index 98082389e4d..730463965c9 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-single-r1 xdg-utils
+inherit xdg-utils
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -21,14 +19,10 @@ HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
LICENSE="GPL-3"
SLOT="0"
IUSE="+decode"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND=">=dev-libs/glib-2.32.0
>=sci-libs/libsigrok-0.5.0:=
- decode? (
- >=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
- ${PYTHON_DEPS}
- )"
+ decode? ( >=sci-libs/libsigrokdecode-0.5.0:= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/sci-electronics/spice/spice-3.5.5-r3.ebuild b/sci-electronics/spice/spice-3.5.5-r3.ebuild
index e20171071a1..ed2fa12832f 100644
--- a/sci-electronics/spice/spice-3.5.5-r3.ebuild
+++ b/sci-electronics/spice/spice-3.5.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -41,7 +41,7 @@ src_prepare() {
-e "s:/X11R6::" \
conf/linux || die
sed -i -e "s:head -1:head -n 1:" util/build || die
- epatch "${FILESDIR}"/${P}-gcc-4.1.patch
+ eapply "${FILESDIR}"/${P}-gcc-4.1.patch
# fix possible buffer overflow (bug #339539)
sed -i -e "s:fgets(buf, BSIZE_SP:fgets(buf, sizeof(buf):g" \
@@ -62,7 +62,7 @@ src_install() {
# install binaries
dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod}
newbin obj/bin/help spice.help
- dosym /usr/bin/spice3 /usr/bin/spice
+ dosym spice3 /usr/bin/spice
# install runtime stuff
rm -f lib/make*
dodir /usr/$(get_libdir)/spice
diff --git a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
index 4669cd8f6d9..1b392e0ac3e 100644
--- a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
+++ b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/accellera-official/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
S="${WORKDIR}/${PN}-${MY_PV}"
fi
@@ -34,7 +34,7 @@ src_prepare() {
}
src_configure() {
- econf CXX=$(tc-getCXX) \
+ econf CXX="$(tc-getCXX)" \
$(use_enable debug) \
$(use_enable static-libs static) \
--with-unix-layout
diff --git a/sci-electronics/voacapl/voacapl-0.7.6.ebuild b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild
index 0ae8fe6a8d6..53f2437a3ea 100644
--- a/sci-electronics/voacapl/voacapl-0.7.6.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,5 +22,5 @@ S="${WORKDIR}/${MY_P}"
src_compile() {
# bug 513766
- emake -j1 DESTDIR="${D}"
+ emake -j1
}
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 2e9161df57d..1e51c2d52d9 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1 +1,4 @@
DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
+DIST xnec2c-v4.4.11.tar.gz 1061014 BLAKE2B f7af594a1f97b0ad9d93b57235afaf04a8500768396c49608c96849b761828206f2c48afbdb067c9a4138732d4d4e6ad7f6f90a5a547487928efdfe77d3bad88 SHA512 9b5bf71ae45b4d70030eb78793d54d2aa8691afcfcb398b8b23be6508d77a510e5e8a26b6c978b9ea6031fbf5903fd765263d4b19691011187daf58feac612e2
+DIST xnec2c-v4.4.5.tar.gz 972268 BLAKE2B d68b525324ddc8a621e7b186364031b3739210aea9581347e1fa38916eefb97f7ef3d7e5b8f673d9fd514dea36815ebc3f9d17d3a6eea26af90d5981ad738828 SHA512 8edf19357d619bfc9fcf2ed29380b51d8dc5e8dd1f7fa798a01f15652e0c5c65217e1e8797be6118a655d124dcf1fe8f3d959744128d75afef5c60738864d3cc
+DIST xnec2c-v4.4.7.tar.gz 977084 BLAKE2B 1bf17da252e9a1a38613a7d0e808f190ddb704af9903b897fdd5d68f1942d0c65ac43e9daa6d10b311c866733e96d216f3f610b6d5e7f957ad0230e6e35cfb8d SHA512 d9ed8bf0eaa43fb4cf77997e71af6c70c5be120e2979ea6036af20caa1886897a543f7d7ec75df907f3f1c2adf55e1c4fa5e95f9fde034ebdfc51e932aaf674e
diff --git a/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
new file mode 100644
index 00000000000..a995463224b
--- /dev/null
+++ b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
@@ -0,0 +1,63 @@
+diff --git a/src/mathlib.c b/src/mathlib.c
+index 5354240..b28033e 100644
+--- a/src/mathlib.c
++++ b/src/mathlib.c
+@@ -155,9 +155,6 @@ int open_mathlib(mathlib_t *lib)
+ return 0;
+ }
+
+- if (dlinfo(lib->handle, RTLD_DI_LMID, &lib->lmid) == -1)
+- printf("dlinfo: %s: %s\n", lib->lib, dlerror());
+-
+ // Call the init() function if configured
+ if (lib->init != NULL)
+ lib->init(lib);
+@@ -217,14 +214,7 @@ void init_mathlib()
+ mathlibs[libidx].available = 1;
+
+ // At this point the library load was successful, provide detail:
+- if (mathlibs[libidx].handle != NULL)
+- {
+- char lpath[PATH_MAX];
+- dlinfo(mathlibs[libidx].handle, RTLD_DI_ORIGIN, lpath);
+- printf(" loaded ok: %s/%s\n", lpath, mathlibs[libidx].lib);
+- }
+- else
+- printf(" loaded ok.\n");
++ printf(" loaded ok.\n");
+
+ // Set the default to the first one we find:
+ if (current_mathlib == NULL)
+diff --git a/src/utils.c b/src/utils.c
+index b803402..1462df2 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -17,7 +17,7 @@
+ * https://www.xnec2c.org/
+ */
+
+-#include <execinfo.h>
++//#include <execinfo.h>
+
+ #include "utils.h"
+ #include "shared.h"
+@@ -736,18 +736,7 @@ void _print_backtrace(char **strings)
+ // Return an array of backtrace strings. The value returned must be free()'ed.
+ char **_get_backtrace()
+ {
+- void *array[10];
+- char **strings;
+- int size;
+-
+- size = backtrace(array, 10);
+- strings = backtrace_symbols(array, size);
+-
+- // This wastes an array entry, but allows _print_backtrace() to find
+- // the end of the list without realloc'ing space for a NULL:
+- strings[size-1] = NULL;
+-
+- return strings;
++ return NULL;
+ }
+
+ void print_backtrace(char *msg)
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
new file mode 100644
index 00000000000..3d142cf6f7a
--- /dev/null
+++ b/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="A GTK+ graphical interactive version of nec2c"
+HOMEPAGE="https://www.xnec2c.org"
+SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
+src_install() {
+ default
+ docompress -x /usr/share/man
+
+ rm -R "${D}/usr/share/doc/${P}" || die
+ dodoc AUTHORS README.md doc/*.txt
+ use doc && dodoc -r doc/*.html doc/images
+
+ if ! use examples ; then
+ rm -R "${D}/usr/share/${PN}/examples" || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
new file mode 100644
index 00000000000..6c495a7c80f
--- /dev/null
+++ b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="A GTK+ graphical interactive version of nec2c"
+HOMEPAGE="https://www.xnec2c.org"
+SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/$PN-4.4.5-musl.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ eapply_user
+ eapply ${PATCHES[@]}
+ eautoreconf
+}
+
+src_install() {
+ default
+ docompress -x /usr/share/man
+
+ rm -R "${D}/usr/share/doc/${P}" || die
+ dodoc AUTHORS README.md doc/*.txt
+ use doc && dodoc -r doc/*.html doc/images
+
+ if ! use examples ; then
+ rm -R "${D}/usr/share/${PN}/examples" || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild
new file mode 100644
index 00000000000..c9403b6d6ff
--- /dev/null
+++ b/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="A GTK+ graphical interactive version of nec2c"
+HOMEPAGE="https://www.xnec2c.org"
+SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
+src_install() {
+ default
+ docompress -x /usr/share/man
+
+ rm -R "${D}/usr/share/doc/${P}" || die
+ dodoc AUTHORS README.md doc/*.txt
+ use doc && dodoc -r doc/*.html doc/images
+
+ if ! use examples ; then
+ rm -R "${D}/usr/share/${PN}/examples" || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}