summaryrefslogtreecommitdiff
path: root/sci-electronics
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
commit0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree037df795519468a25d9362b4e95cdaeb84eb1cf9 /sci-electronics
parent752d6256e5204b958b0ef7905675a940b5e9172f (diff)
gentoo resync : 29.12.2022
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/Manifest.gzbin8708 -> 8875 bytes
-rw-r--r--sci-electronics/NanoVNA-QT/Manifest4
-rw-r--r--sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild74
-rw-r--r--sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch20
-rw-r--r--sci-electronics/NanoVNA-QT/metadata.xml11
-rw-r--r--sci-electronics/gazebo/Manifest8
-rw-r--r--sci-electronics/gazebo/files/gv.patch13
-rw-r--r--sci-electronics/gazebo/files/qwt.patch17
-rw-r--r--sci-electronics/gazebo/gazebo-11.10.1.ebuild85
-rw-r--r--sci-electronics/gazebo/gazebo-11.11.0.ebuild (renamed from sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild)11
-rw-r--r--sci-electronics/kicad-footprints/Manifest4
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-6.0.6.ebuild (renamed from sci-electronics/kicad-footprints/kicad-footprints-6.0.4.ebuild)0
-rw-r--r--sci-electronics/kicad-meta/Manifest2
-rw-r--r--sci-electronics/kicad-meta/kicad-meta-6.0.6.ebuild (renamed from sci-electronics/kicad-meta/kicad-meta-6.0.4.ebuild)0
-rw-r--r--sci-electronics/kicad-packages3d/Manifest4
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-6.0.6.ebuild (renamed from sci-electronics/kicad-packages3d/kicad-packages3d-6.0.4.ebuild)4
-rw-r--r--sci-electronics/kicad-symbols/Manifest4
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-6.0.6.ebuild (renamed from sci-electronics/kicad-symbols/kicad-symbols-6.0.4.ebuild)0
-rw-r--r--sci-electronics/kicad-templates/Manifest4
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-6.0.6.ebuild (renamed from sci-electronics/kicad-templates/kicad-templates-6.0.4.ebuild)0
-rw-r--r--sci-electronics/kicad/Manifest9
-rw-r--r--sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch12
-rw-r--r--sci-electronics/kicad/kicad-5.1.12-r3.ebuild7
-rw-r--r--sci-electronics/kicad/kicad-6.0.6.ebuild (renamed from sci-electronics/kicad/kicad-6.0.4.ebuild)3
-rw-r--r--sci-electronics/kicad/kicad-9999.ebuild8
-rw-r--r--sci-electronics/magic/Manifest3
-rw-r--r--sci-electronics/magic/magic-8.3.309-r1.ebuild96
-rw-r--r--sci-electronics/magic/magic-8.3.309.ebuild92
-rw-r--r--sci-electronics/ngspice/Manifest8
-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.ebuild7
-rw-r--r--sci-electronics/systemc/Manifest1
-rw-r--r--sci-electronics/systemc/systemc-2.3.4-r2.ebuild57
-rw-r--r--sci-electronics/xnec2c/Manifest9
-rw-r--r--sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch63
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.1.1.ebuild41
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.4.11.ebuild2
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.4.5.ebuild53
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.4.7.ebuild49
41 files changed, 454 insertions, 358 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 69fc8eaf685e..ffe6e3b5ce12 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
Binary files differ
diff --git a/sci-electronics/NanoVNA-QT/Manifest b/sci-electronics/NanoVNA-QT/Manifest
new file mode 100644
index 000000000000..16ec2949c5d6
--- /dev/null
+++ b/sci-electronics/NanoVNA-QT/Manifest
@@ -0,0 +1,4 @@
+AUX NanoVNA-QT-20200507-missing_headers.patch 513 BLAKE2B 541d4a6e9ca4db5735c96c73bc8999c57db892cf808025917e8e7670b864a10477092cfe64f790998e08d3d778e4159d81f36b9d7c78cb46cfec787ca4fb9b81 SHA512 1c756605fb1f813862d32823ad085b7a9642771c9870eaca54e22375b11ff1129a4a9a1f5c93eeddfc5d3acbc2eca332dbe3306c234e86fb1fd99477f81ad921
+DIST NanoVNA-QT-20200507.tar.gz 876476 BLAKE2B bda4424b0dfb8b977a3e4227393d477f7c6d6518b34887fb4104deb805768f1466d3a01f4b5949c80c0177151b6660158296a1eff24f6f6614ee53e185e2df38 SHA512 7b465c06cdff8cdc9c13ab4e6d6c4502849a2ef42e81de3f3d47bcf49008761307ea57e6572d316a96993aa547ce7f8185bab742d11139e313c33161d2324a21
+EBUILD NanoVNA-QT-20200507.ebuild 1416 BLAKE2B fcf58a1acef4b868407432fb8bee111d38078052e8cb7012957e476355c1f600700d304b40c5ec021a2a191fdaa3b083fd46186b66b2c08d3002ccf2327ca146 SHA512 5a1bb9c1ca297a78b0f3a58b608f1120e785265c6aabf5466f8afc5bf35a2b8dc938a5b98146c2ccf081e0f663e61ec3c664429f938db87f8be2be55c9bb996b
+MISC metadata.xml 332 BLAKE2B 0df01b9398bb0f96090d0742dba0320ff3e389ee4b795ce19f39924146b91408bcfe04ea38287228879785df135b51b8d0ebf7c56b8a99def323c59c85228829 SHA512 42897e30597f019edfb1c444e56e4f7226e0acd481aef7ac9e96a6e5f777bb849b31458b598c53a1556c5f48f7d12dab8da8069cfede5178f40698ccbec48926
diff --git a/sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild b/sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild
new file mode 100644
index 000000000000..30d703f63aa8
--- /dev/null
+++ b/sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools qmake-utils
+
+DESCRIPTION="Library and GUI software for NanoVNA V2"
+HOMEPAGE="https://github.com/nanovna-v2/NanoVNA-QT"
+SRC_URI="https://github.com/nanovna-v2/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-cpp/eigen:3=
+ dev-qt/qtcharts:5=
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtsvg:5=
+ dev-qt/qtwidgets:5=
+ sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20200507-missing_headers.patch
+)
+
+DOCS=( README.md ug1101.pdf )
+
+src_prepare() {
+ default
+ eautoreconf
+ sed -i -e "s|/usr/lib|/usr/$(get_libdir)|" libxavna/xavna_mock_ui/xavna_mock_ui.pro || die
+}
+
+src_configure() {
+ default
+
+ pushd libxavna/xavna_mock_ui > /dev/null || die
+ eqmake5
+ popd > /dev/null || die
+
+ pushd vna_qt > /dev/null || die
+ eqmake5
+ popd > /dev/null || die
+}
+
+src_compile() {
+ default
+
+ pushd libxavna/xavna_mock_ui > /dev/null || die
+ emake
+ popd > /dev/null || die
+
+ pushd vna_qt > /dev/null || die
+ emake
+ popd > /dev/null || die
+}
+
+src_install() {
+ default
+
+ pushd libxavna/xavna_mock_ui > /dev/null || die
+ emake INSTALL_ROOT="${D}" install
+ popd > /dev/null || die
+
+ pushd vna_qt > /dev/null || die
+ dobin vna_qt
+ popd > /dev/null || die
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch
new file mode 100644
index 000000000000..cebe3c5239fa
--- /dev/null
+++ b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch
@@ -0,0 +1,20 @@
+--- a/libxavna/xavna_mock_ui/xavna_mock_ui.H
++++ b/libxavna/xavna_mock_ui/xavna_mock_ui.H
+@@ -2,6 +2,7 @@
+ #define XAVNA_MOCK_UI_H
+
+ #include <functional>
++#include <string>
+ using namespace std;
+ typedef function<void(string dut_name, double cableLen1, double cableLen2)> xavna_ui_changed_cb;
+
+--- a/vna_qt/polarview.C
++++ b/vna_qt/polarview.C
+@@ -3,6 +3,7 @@
+ #include <cmath>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ PolarView::PolarView(QWidget *parent) : QWidget(parent)
+ {
+
diff --git a/sci-electronics/NanoVNA-QT/metadata.xml b/sci-electronics/NanoVNA-QT/metadata.xml
new file mode 100644
index 000000000000..84af1563757c
--- /dev/null
+++ b/sci-electronics/NanoVNA-QT/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nanovna-v2/NanoVNA-QT</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index d60e5fbcab11..f54717ce7ba0 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,12 +1,10 @@
AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
AUX ffmpeg4.patch 619 BLAKE2B 365911baabf0c5a0788e1a964aea75d04749bc6874a696104ed47f7d9c017cb31d0c11294481768ceb3f0c8c139256b0876d5266594cf780954533395ead7034 SHA512 3055895af8a651dc7cac24c4a7258adbd29586a1411178ca7eb7420b8a0897cb6fc9d89dd42a41221b12a79e34757d82071c2841d77ecfeeeb42d60b9a4e8210
AUX ffmpeg5.patch 5512 BLAKE2B 8bdd4e447fb825cd0a5cd1b2d56503803fc6cda2c8cab568caa604d6f9acaaae3b998b61cacfb275ff8ddb9c484b4ac3d40409b0f56f878437a1332477b6be75 SHA512 bf927c2eec9a6cbc373355c5535bce63618fa29def46c1357172fd45e8229eb122e680e3f7ca01012cc4b9eb49d9c254e302ea42350d3c79a4d44b4ac802235c
-AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8
+AUX gv.patch 511 BLAKE2B 85011a38aa5f749a152ab725469d96a4cf3560fa655f69af55de0ac9b4a2125efaa3cdaacf7ec5c99351e345c90686dee0ee7dcfa8ea8d4ba8c39c8a764bb33d SHA512 7b3a8fea65ec47ba0d159435c73eb69b12835394c614bf37f95e183a450b446cf93a834dd3cecb28b6571d974ebfb8ac2dcff29b33ce5c454325ecacca030a26
AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792
-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
-EBUILD gazebo-11.10.1.ebuild 1970 BLAKE2B 36e71e0bf16f643a997d56d8a83235e33d336b70cd1951fe4b14c3a8ec80109f2ea61b25ddb3c1f2c368e1cda088c161d7bd5d968fc962523e935dd2f33ac57c SHA512 d889a779064d00ba0ad9e8070ee7946a4086be50689e95218ed2ed6037084218d011f3d49ea0e2ed6d7815c10fa48204b9e46b8afb8014107c70cafdf4337625
+DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882
EBUILD gazebo-11.10.2.ebuild 1958 BLAKE2B 98a891f8f0b9e1cbee1591f4077fa363b09bd85551eafac5d10ea7f6d191efb823bcb7dfbde5ae8a64752ffb4da9eb3b134296f7b96861bc69fb7fa3883128e3 SHA512 d3996a65b59ce87b1aa970219a76b7c70602ceb76ff9caf45b4d276de812bd6b2e1056354036e51cce2bcd8927b0906bd68516f0951baee25a06967b359a31ec
-EBUILD gazebo-11.9.1-r1.ebuild 1912 BLAKE2B ab1806c0767335f5d3d51f9bf1832cb7e75c44c9ad47560153867167451019d1b296fce5a7c66cb4d1db7379b59970f3612f2b180ecb2a3a963b64e2389b152f SHA512 77e581310235fcba1f4e140d44b0525ba2fd5a29aa0810c9013937defe94cf75cb9a1560544f86a8c35db8de1bb01c29ed75931d6e2a46a387a7b756fdd58b56
+EBUILD gazebo-11.11.0.ebuild 1928 BLAKE2B 48f11a9bea7cf6cfcbbab65ab77119c1654a8b344e6519046b471bbd0c98428a85ecd205f6b72fa77800c4ba12ec4b6f7ceb492eb89975076f1068a9b19b7ab8 SHA512 3898a68d523092af1d174ae2c889b669a7d028940df35c0dfd767537c439a261b503c5436657225e623ff48da67688a361d65be2073984b3c8b80f3868ef90f9
MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/sci-electronics/gazebo/files/gv.patch b/sci-electronics/gazebo/files/gv.patch
new file mode 100644
index 000000000000..7afa786f4774
--- /dev/null
+++ b/sci-electronics/gazebo/files/gv.patch
@@ -0,0 +1,13 @@
+Index: gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
+===================================================================
+--- gazebo-11.11.0.orig/gazebo/gui/qgv/private/QGVCore.h
++++ gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
+@@ -96,7 +96,7 @@ class QGVCore
+ Agiodisc_t memIoDisc;
+
+ memIoDisc.afread = memiofread;
+- memIoDisc.putstr = AgIoDisc.putstr;
++ memIoDisc.printf = AgIoDisc.printf;
+ memIoDisc.flush = AgIoDisc.flush;
+ rdr.data = cp;
+ rdr.len = strlen(cp);
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
deleted file mode 100644
index d4f1538900bc..000000000000
--- a/sci-electronics/gazebo/files/qwt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
-===================================================================
---- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake
-+++ gazebo-8.0.0/cmake/SearchForStuff.cmake
-@@ -758,10 +758,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 qwt6
- )
-
--find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
-+find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS
- /usr/lib
- /usr/local/lib
- /usr/local/lib/qwt.framework
diff --git a/sci-electronics/gazebo/gazebo-11.10.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
deleted file mode 100644
index 3291c74fa777..000000000000
--- a/sci-electronics/gazebo/gazebo-11.10.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/protobuf-2:=
- virtual/opengl
- media-libs/openal
- net-misc/curl
- dev-libs/tinyxml
- >=dev-libs/tinyxml2-6:=
- dev-libs/libtar
- <dev-cpp/tbb-2021:=
- >=dev-games/ogre-1.7.4:=[freeimage]
- <dev-games/ogre-1.10
- >=media-libs/freeimage-3.15.4[png]
- sci-libs/libccd
- >=media-video/ffmpeg-2.6:0=
- sci-libs/gts
- >=sci-physics/bullet-2.82:=
- >=dev-libs/sdformat-9.1:=
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-libs/boost:=[threads(+)]
- sci-libs/gdal:=
- virtual/libusb:1
- dev-libs/libspnav
- media-libs/freeimage
- sci-libs/hdf5:=[cxx]
- sys-apps/util-linux
- media-gfx/graphviz
- net-libs/ignition-msgs:5=
- sci-libs/ignition-math:6=
- net-libs/ignition-transport:8=
- sci-libs/ignition-common:3=
- sci-libs/ignition-fuel-tools:4=
- <x11-libs/qwt-6.2.0:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- x11-apps/mesa-progs
- test? ( dev-libs/libxslt )
-"
-BDEPEND="
- || ( app-text/ronn-ng app-text/ronn )
- app-arch/gzip
- virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}/qwt.patch"
- "${FILESDIR}/cmake.patch"
- "${FILESDIR}/ffmpeg5.patch"
- "${FILESDIR}/ffmpeg4.patch"
-)
-
-src_configure() {
- # find OGRE properly
- sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
-
- local mycmakeargs=(
- "-DUSE_UPSTREAM_CFLAGS=OFF"
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
- "-DUSE_HOST_CFLAGS=FALSE"
- "-DBUILD_TESTING=$(usex test TRUE FALSE)"
- "-DENABLE_SCREEN_TESTS=FALSE"
- "-DUSE_EXTERNAL_TINYXML2=TRUE"
- )
- cmake_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
index f34484f385e7..27daf4976fd8 100644
--- a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
dev-libs/tinyxml
>=dev-libs/tinyxml2-6:=
dev-libs/libtar
- <dev-cpp/tbb-2021:=
+ dev-cpp/tbb:=
>=dev-games/ogre-1.7.4:=[freeimage]
<dev-games/ogre-1.10
>=media-libs/freeimage-3.15.4[png]
@@ -32,7 +32,7 @@ RDEPEND="
>=media-video/ffmpeg-2.6:0=
sci-libs/gts
>=sci-physics/bullet-2.82:=
- >=dev-libs/sdformat-9.1:=
+ >=dev-libs/sdformat-9.8:=
dev-qt/qtwidgets:5
dev-qt/qtcore:5
dev-qt/qtopengl:5
@@ -43,13 +43,13 @@ RDEPEND="
media-libs/freeimage
sci-libs/hdf5:=[cxx]
sys-apps/util-linux
- media-gfx/graphviz
+ >=media-gfx/graphviz-4
net-libs/ignition-msgs:5=
sci-libs/ignition-math:6=
net-libs/ignition-transport:8=
sci-libs/ignition-common:3=
sci-libs/ignition-fuel-tools:4=
- <x11-libs/qwt-6.2.0:6=[qt5(+)]
+ x11-libs/qwt:6=[qt5(+)]
"
DEPEND="${RDEPEND}
dev-qt/qttest:5
@@ -63,8 +63,9 @@ BDEPEND="
"
CMAKE_BUILD_TYPE=RelWithDebInfo
PATCHES=(
- "${FILESDIR}/qwt.patch"
+ "${FILESDIR}/qwt2.patch"
"${FILESDIR}/cmake.patch"
+ "${FILESDIR}/gv.patch"
)
src_configure() {
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index dca95516044b..633b5f878b47 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,6 +1,6 @@
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
+DIST kicad-footprints-6.0.6.tar.gz 31647789 BLAKE2B 3af7027987b25c4a3ee19925acaa539cea643656e1662f0b80ec76c807aca9ef7433228fc88cdd0c34b80e7bbb886abd5c11765983e9adc5b347ce01bd4b51c4 SHA512 6d93a90bfc0b246c70b336aa9265a051a33d8b490a81271fb85ab73cd19184a031f3429ce8ae9e1650ece475a30f0f283c43c5bb2d1f427b4129d4ed61480ac0
EBUILD kicad-footprints-5.1.12.ebuild 435 BLAKE2B f8452914dfffb5c899cbf8e0112318f96f3833628f90ca48c208c26b6a558ce69eb1e90f390f686c88b51ecc194abcf1bbc87aaa1457ded6980af0b0e49ee5c4 SHA512 9945e466d7812e9c44f4481a077cb19162a7d2ce73425a12b5e6bd51a1ae7cf7fa8d7f91cde116d55665cb49585e4936f8a2d141f1f8a612f49c0b8a1c8a736d
-EBUILD kicad-footprints-6.0.4.ebuild 870 BLAKE2B 5ba8eda9374024ba6293409b98a89035b74ed2b2e5de5cce90045edac7cfdc54c8fd7669804a55796c53954e1d503a03ea94cfc1053cb76d440268cafc427a93 SHA512 561c2bb63e31558701f619373be2fcc8490ce0294300733014506b344934e5d7a5c7ff50bb6242860ec51d755569640cbe4f2328d6766e0559b7558ec10aaae6
+EBUILD kicad-footprints-6.0.6.ebuild 870 BLAKE2B 5ba8eda9374024ba6293409b98a89035b74ed2b2e5de5cce90045edac7cfdc54c8fd7669804a55796c53954e1d503a03ea94cfc1053cb76d440268cafc427a93 SHA512 561c2bb63e31558701f619373be2fcc8490ce0294300733014506b344934e5d7a5c7ff50bb6242860ec51d755569640cbe4f2328d6766e0559b7558ec10aaae6
EBUILD kicad-footprints-9999.ebuild 863 BLAKE2B e7abdc6cc61b2fda88acd5618a0263bc8991dae6042b02172e1a31b559714fbff03b9b15846c99079ee9ba03a05d27d537983727baf9ffea3c8aa128904d5ccb SHA512 5ee5c0fce8ae9a38b51ca01bf7d4cd49ffb92d7230aa31b05a9e4c48a91734ec24c85669feb6b1ac675b8a5fc55e8c89944722b8f223abd2815800de828f0cd3
MISC metadata.xml 766 BLAKE2B cba91a16d3b205f5f36dff3aba3afad956d98d23ac08ecb26bf3ef5471e5fdb7698c86cc1e245a34069f73a052eebdd37594941194b7f3f5d9c57a88718d7de0 SHA512 8d24ac5ad64aec5939be1244e417c2299353d6d618bea63ef949f6c82a865cee98ab11a3dd8c57e447e13203abc3a40da7070f585379c1ec54b0bd46c214d0ec
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.4.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.6.ebuild
index e1268b9afd0d..e1268b9afd0d 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.4.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.6.ebuild
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 9288163eaa41..87805428c583 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,3 +1,3 @@
EBUILD kicad-meta-5.1.12.ebuild 620 BLAKE2B a4c802e020999a16be0b615bb2bb18d11330b041822a283f541f98d17b6d247c9ca835c5d177928fce26a638412c94de6fdf122f5eb3c5afdc8dd7365ff6a0f2 SHA512 aa7ff651a6cc3761f88b87462b91d3e125e69c8155a95676d77013a0a9824f454cc3fa276ea88e1ef2a2c7a5cccc89e0085b698354d145e3ce38a451018d50f0
-EBUILD kicad-meta-6.0.4.ebuild 617 BLAKE2B 586b8fa96d7345fbc8976f0cac98c8357ac316d90f74433d4e48d759ae4613150e05f5caa5e0da83c4ca0f680edf8cf46370346bad694f941f5c12959effd9ce SHA512 0ccb2e1737e9b0b1589905e78818d7b5ccd7221ec329cb21c95902da32a59fa67400fb038edc05447d0632aaab0f6f3f265ba07b067f523ffa1f1ed16968e53d
+EBUILD kicad-meta-6.0.6.ebuild 617 BLAKE2B 586b8fa96d7345fbc8976f0cac98c8357ac316d90f74433d4e48d759ae4613150e05f5caa5e0da83c4ca0f680edf8cf46370346bad694f941f5c12959effd9ce SHA512 0ccb2e1737e9b0b1589905e78818d7b5ccd7221ec329cb21c95902da32a59fa67400fb038edc05447d0632aaab0f6f3f265ba07b067f523ffa1f1ed16968e53d
MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6
diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.4.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.6.ebuild
index 9b332cea06f2..9b332cea06f2 100644
--- a/sci-electronics/kicad-meta/kicad-meta-6.0.4.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-6.0.6.ebuild
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 7b30f0db66c8..d2a777d17af9 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,6 +1,6 @@
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
+DIST kicad-packages3d-6.0.6.tar.gz 951710688 BLAKE2B 16176514519897167807b9c2d6659b16d38574484bc09fd871c97ea943531f8726a8173b5a3d143818397eb1086db0d6bda43add357c95e92bffac05560ec9f2 SHA512 f8231c4ce508eb379ceb397cf6e9f963411a0a5cee5d1fa9a9e929c964662d391ab12555c4d3e8bca1b9507338571f3036af7f24e6a4d093f8f2aa3ba93e9345
EBUILD kicad-packages3d-5.1.12-r1.ebuild 559 BLAKE2B 698bb6c1eeb4f63d69f29095bd17b00d5b420c1dd16faec9910e2b5a13e8be124d9c087dc1678ca3d516d1a8f143e8b15e68244d150955f37f23a5d7b1f8a617 SHA512 0475814185604358e047f864a847b273cbe032cbb0a5997f49a3afdc77c66c7fdb15b762b6f5337016f737f857b036bd37b64d5315858fc082dc87156871b691
-EBUILD kicad-packages3d-6.0.4.ebuild 955 BLAKE2B 4c79fd1efb743ccd3fbe6196798976177fa8aa04faa01da07d91b289bf19f7efde63e8e7dd1fa433eb219911002fa599ace2bb04efc19f09f8b6a50f2c969caa SHA512 e95a41ed544167bd18a13342ec781301c15b0d6c865062d4a73843eeccb96619525b4cbc0a4373fc4cd90c880dc1927a33874677fa92e6d70baf85c4414a8777
+EBUILD kicad-packages3d-6.0.6.ebuild 1067 BLAKE2B 6a9c4bfebbb81976910fb949368c2d91aa4dee3702ad2a7b42ab61ad27cfa2ef0983eb4aadab845eec3a24375ccbc047efa8987c4537f551196f4b486ce974c7 SHA512 eca0a099b83ac1c6e3aae83ffd9ad9c4871b157ca15fb43611fc5f667e02a58fe01c74c412e15225000578cc092de9c38b72c40f94989dc084a165662fe93d7d
EBUILD kicad-packages3d-9999.ebuild 933 BLAKE2B 7c56da88187d74ceb63e88691e124a9083e61e7703650d63689e256eb4c7b456cf48dac4f958d92a2ff8128d930ee1c1b4dda22e9fcf5cfba3d78212c05fda12 SHA512 038c920d7cf33eaf085ab5b0859c7ff8c4b6e0306b09ec65c09e0e1d4502a8a055f32056be171092f68245828be1f61e640fd386449e93b42b82669e7d867613
MISC metadata.xml 897 BLAKE2B c306e73c992f4b4c6099176ed71b232aa196ff07c0ea2833b14d465a96f8db4623a17d629c66533d7a8dd5032dee74aaaf7ebacd3ed7c72359ad7b9b9746e348 SHA512 796a2eb49ff7d7f65d473217b2534a4ef811354828defb76005f694f37f7b638bb65be304de74507e89b99c0e97026503e74222fa972c389d638d2ef3ea059b1
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.4.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.6.ebuild
index aea8eca4a26f..1c1cdb3541fd 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.4.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.6.ebuild
@@ -14,13 +14,15 @@ if [[ ${PV} == 9999 ]]; then
else
MY_PV="${PV/_rc/-rc}"
MY_P="${PN}-${MY_PV}"
+ # Source directory for this package always has the repository hash in the directory name
+ MY_HASH="6bfd8dfa3adc6ac316b9857977c87f22282c6e24"
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
fi
- S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-6ff98426fd51d53c55bc48025d66d3d0b0c5df92"
+ S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-${MY_HASH}"
fi
IUSE="+occ"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index ba795f66a1ae..9ad65ab32d25 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,6 +1,6 @@
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
+DIST kicad-symbols-6.0.6.tar.gz 4845755 BLAKE2B 32bf6a03f5f06be09b571e0d5470059bc799d662aefd40554e6d9603f29862af3d75f600218f715026349216bbc1a6ea3000eff5a3a5ef8c66a8643f83872090 SHA512 edd8f2d2d34c0431bd23a8ae0433f2ce311aebecef4672ddf7b5d1bfaf71bf4cd8f98f3dcaa9e1662f5a928e204aff834b5e19cea77a31d2e3a23373f760406c
EBUILD kicad-symbols-5.1.12.ebuild 429 BLAKE2B f05364cdfb4fc1e8e6a79722c374d2f260ab46c6e35c09d209e1121cb6f188177073c2ef05283dae3700f8c3c6767216666f9460044e6c9b1525766b0898b98f SHA512 7cf1cff346c6ce05516825d89d08c25a7af0903464e92cd0003fe212bb58fb870c26692dbcc932ef1a552729e6927ed08e291ff0a022dcd4403ddb632f02ccee
-EBUILD kicad-symbols-6.0.4.ebuild 762 BLAKE2B fd144c2c48d52163f6fff0528bb0e5becab560e9405ec4f37d19a9b355c6e46f288d2eeed8dcf226083aac028862bc5275a91ec5491518e13bc5ecf752aeecda SHA512 07d48e69e2dbc8e5a3987bfcd3f4887fa134ed8c886b2635aff46d3bf542229365be05f8cb5f9ece27d3aedd03d6ec688b08dfaa8dc33b689bc50ed653e844de
+EBUILD kicad-symbols-6.0.6.ebuild 762 BLAKE2B fd144c2c48d52163f6fff0528bb0e5becab560e9405ec4f37d19a9b355c6e46f288d2eeed8dcf226083aac028862bc5275a91ec5491518e13bc5ecf752aeecda SHA512 07d48e69e2dbc8e5a3987bfcd3f4887fa134ed8c886b2635aff46d3bf542229365be05f8cb5f9ece27d3aedd03d6ec688b08dfaa8dc33b689bc50ed653e844de
EBUILD kicad-symbols-9999.ebuild 844 BLAKE2B 0105cb6e28b9f3b7426ddc4ffbacff06646d1c84d66a89d9dfc328511dd7c7339799ebadd24527e1120e6c4588fb7ff2b898749d19747088b3b722de36bd4a94 SHA512 90345c12a573d46121238ecb54678f86b5ce93cc1f80d66b137a9f220ed4865b550ceda56bf6b6eaca36e9b0fb8750fdb53c4837e02ef09a17f17e55ea1d4e72
MISC metadata.xml 724 BLAKE2B 10eccd33b4ca07e25e2b3ce44d30583671b33836f7fb7a9c68b063bb267529fb0e2988b71bc57d0d92967f583ae3ac4e0cdf0762da687a834f51620f45df5411 SHA512 76569f2955cf1db93bbac820d513aa4d58f4bf27089736a9adc98e1df4d21c0c80be6c894dc2eb024b2cb0271e37a479b15ce68d377bd028df2becf5166958a2
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.4.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.6.ebuild
index 02943f2ff696..02943f2ff696 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.4.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.6.ebuild
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 566294989b26..13a338ff88fa 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,6 +1,6 @@
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
+DIST kicad-templates-6.0.6.tar.gz 1057646 BLAKE2B 3bca2c6557ea8879d53a24a9a97872235c7d6289259936744a098745d0aaca9c2e397d471aa738d0007813c77e8a299c2975393bc0c0e62212be293cd210c049 SHA512 b9c4df8b7da9f5e3405a942c3afb09f5c387e311927042889211fb3c3a2a4610a1ccdc94ca2c1e1ae06e351617b15882adf5899f6dbfb392611feb5711e5be92
EBUILD kicad-templates-5.1.12.ebuild 438 BLAKE2B 245672d11e479bd59d83eae963c7606addb45d8202a7212034dc9d92f8eb27b2809844848722dccc2777dd4126e67b48049934a1077774f598a8ed9e1c1fc638 SHA512 e9e21e3a0b429a9f1d267f6d0f9dde8405ababdfb5cd81c8e3d8f6f7e1f136490c88238fbc699b296631cc75359f8c2205bd0f10f160cd15fcd1dcdce777c122
-EBUILD kicad-templates-6.0.4.ebuild 698 BLAKE2B fcfe2e16a5b2864d82ec552ffdb3dc3600fe618575c1af65ebd2ee1db71e9d55081abd85c22648692dc1523ebefae42618bf35e1645644d48472111e1c0d05d7 SHA512 d6cbe3de9d0efe622e84d779652826169a2ad4f75e6f3855df57aba9947be776d0b856e6e4e759423345437bda0c8e4e1e48c7789e19e078f82305be00be66fd
+EBUILD kicad-templates-6.0.6.ebuild 698 BLAKE2B fcfe2e16a5b2864d82ec552ffdb3dc3600fe618575c1af65ebd2ee1db71e9d55081abd85c22648692dc1523ebefae42618bf35e1645644d48472111e1c0d05d7 SHA512 d6cbe3de9d0efe622e84d779652826169a2ad4f75e6f3855df57aba9947be776d0b856e6e4e759423345437bda0c8e4e1e48c7789e19e078f82305be00be66fd
EBUILD kicad-templates-9999.ebuild 691 BLAKE2B 44322a26e224d77803cc24cb73723e52c8abf5c0887b7c30504c5b9530ff2e38d134fece90cba308ea4c4105759ef1ac06fb5a212409f06f73ec938bf4ed74b3 SHA512 395279ec620a31c789dae437e192b13347a32dbb8b637a5c2aa8e9615842d9f51ba0ccc5426cc2c65bc23dae09984c9a4e4bdcae3ba9ba588f6729c3e20be5ed
MISC metadata.xml 484 BLAKE2B 3542f585439e05e86fc86e11f524c15f10f835fe5419141b6361ae4503dc6dff5d0c9d7bb24134c3722e4ab11d6cad6d450625f7e5edc822b3d0ee82fd8bde48 SHA512 03468e0fa2d56c7241219eb07b1cddc225b5e18f6800a513005f76cd19110b4ad9d8f9b2895107695b6c62c8f276b38bbf544a7651b61f3e83878c94a40b8886
diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.4.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.6.ebuild
index fcdb94bb2f13..fcdb94bb2f13 100644
--- a/sci-electronics/kicad-templates/kicad-templates-6.0.4.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-6.0.6.ebuild
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 5c18fb6f67fb..e2a79eb27bf2 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,10 +2,11 @@ AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d33
AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
+AUX kicad-6.0.6-unitialized-variable-fix.patch 592 BLAKE2B b26757a1e9d4115616a721fdba7527cb72d489ae75976f9967f24cd12735b6f090a71bdb0c7d632d33ada0b3dc77f0d7f9370d02c34d83bd0afebb608621b85d SHA512 2f1e81132e87858f789833bd05fdda2309fc344c1535295c6308e3058bed85edbfd9900a0529e1489eb6f87bb27146a7dec2893a10d311c43b7117c00beba948
AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
-DIST kicad-6.0.4.tar.gz 45068438 BLAKE2B d77a68de7baa472a05666159183d5d528461624dbe791f3e7b00dad6292c8134ec371c2c21cb56e01a76738dc239284188b1bee7202b8eb14cf932bb7c570169 SHA512 3134aee924bf0aab6f12a7e9663d081ec038a2ccb2e6854be8ad8b1f71b36a9f286938101adb4ca0fa56487eecffd42691bb8737113bcaffcc56a2f68f6a9908
-EBUILD kicad-5.1.12-r3.ebuild 4761 BLAKE2B 284b69c45c30f57275dee607d934030d97bc5c5491099db8eb13278524f61a61911ef540d805a4fc5d4f4361764c8268aa3f3a44004527962ce950cb2b873c2d SHA512 cd7faedd477a30d332b858aad0d1d2a4ef015642ec6a4165d2f03413954119ed4ce68fad6e1a6380d5be7a4a5fcdda6834ada1782137a7b1b7bdd7c0eab2aadd
-EBUILD kicad-6.0.4.ebuild 4367 BLAKE2B 198b6840fbb86a4c7b383140e14fe711549e2173f6c852b97344bedf31645c1a7ed018a8c093fa6637aab808395ba8b221149b3110a12dfc8b633274115fb303 SHA512 3341e6b7cca53ba4f5ebf39387c37eda9930181b2a50e41f0e7d7f1fa59bac8312cffdef7c2ccab60dc037a1e4334203359a8bb55953ca32a3bb9f4beda579f3
-EBUILD kicad-9999.ebuild 4289 BLAKE2B d24c59bc753b5f43a8910c4ba9c3b0ca581dc375f0569fa06ac91aaded39b0b49042f70bcaa588804d72b4622c51579261a3491f54005150a585fd4b9c488e4a SHA512 0c6245c921d40bd8a93788e9dd56c89fd9c950477f9cb5ff4b17070ce1b3212fe2f195c12b2cb921e972b710bef3463924af5091fc3e953e228d157e5dae1602
+DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
+EBUILD kicad-5.1.12-r3.ebuild 4878 BLAKE2B 46088b473674383cdea1d115b2cb4ecf330ddc97de3a682f3bac1a64caabeda609a5281424f797bad7915b28b66e317b5ef90303d61ed601a1e6b3d04363cc49 SHA512 c4027c46fad93d3b4666a997fc2565835aebe9d94e8cf16118ab8df5d484e5a0b9f217a849b0a0f33533e12ada6b1f622c39510bc3999ddcfd2366aa0a2e59ef
+EBUILD kicad-6.0.6.ebuild 4451 BLAKE2B 23d9aa7e34b9e70de5c137c5eccdd24a4c8e79a7d6eaa76e67766e769722f9fcff9c24426a1f6032ef762a923df0ac0a1c9d11e95e5a920378866dc71cd8e166 SHA512 1a907249ec0cbb006ce103999dc6a11c0f660167ebb0e8c6c8730e6e5b805bdda3cd08b96f550d57bd6b4cb0b8170e0313e30880a0cdd58d7119a3b3ad7a6ea8
+EBUILD kicad-9999.ebuild 4340 BLAKE2B f9d3fe50b5a477750824032145289c6bc09a59edc6a2a48b2297d8870701acadb6e5645a2bee8e4a4776a0fd2a62399e591b88a61f2981259bb50fa6e3f99719 SHA512 e42510ab53632121e177e92a030f6f4c081fd92af35501fb0c05088da5fbb86f22825cfdbd7961579ccaf6005cb865ccf5a54611589ad605e4d3efae9939e409
MISC metadata.xml 1047 BLAKE2B 1ed5807dc4f194f6f66e6e0743fe186dd046128bfec2fd3e2a72919e4cf714b0ac6d1ba7da0764ce0b4202eb0a068e5c3e261dfcccf309198400e8be009b7845 SHA512 dc7b727047452b1398fe4029c3b7e70826074733be7c1f2c6c2d485948380da208561a738427d0a5f8a67dbec07593c529b4f8b6690b8a5de7b3bb291576ab59
diff --git a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
new file mode 100644
index 000000000000..cce508c1e888
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp kicad-6.0.6-new/common/tool/tool_manager.cpp
+--- kicad-6.0.6/common/tool/tool_manager.cpp 2022-06-17 18:11:16.000000000 -0700
++++ kicad-6.0.6-new/common/tool/tool_manager.cpp 2022-06-20 00:17:13.548239632 -0700
+@@ -902,7 +902,7 @@
+ m_menuOwner = -1;
+
+ // Restore cursor settings
+- for( auto cursorSetting : m_cursorSettings )
++ for( auto const& cursorSetting : m_cursorSettings )
+ {
+ auto it = m_toolIdIndex.find( cursorSetting.first );
+ wxASSERT( it != m_toolIdIndex.end() );
diff --git a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
index 34fef8a30277..2f202db0313a 100644
--- a/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild
@@ -59,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
}
diff --git a/sci-electronics/kicad/kicad-6.0.4.ebuild b/sci-electronics/kicad/kicad-6.0.6.ebuild
index 37b4352cf709..c152b8099cd1 100644
--- a/sci-electronics/kicad/kicad-6.0.4.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.6.ebuild
@@ -76,10 +76,11 @@ CHECKREQS_DISK_BUILD="900M"
PATCHES=(
"${FILESDIR}/${PN}-scripts-install-fix.patch"
+ "${FILESDIR}/${P}-unitialized-variable-fix.patch"
)
pkg_setup() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
python-single-r1_pkg_setup
setup-wxwidgets
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 1e6d93af9eae..2105a3f3d542 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
WX_GTK_VER="3.0-gtk3"
inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -21,7 +21,7 @@ else
S="${WORKDIR}/${PN}-${MY_PV}"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
fi
fi
@@ -75,7 +75,7 @@ fi
CHECKREQS_DISK_BUILD="900M"
pkg_setup() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
python-single-r1_pkg_setup
setup-wxwidgets
@@ -94,7 +94,7 @@ src_configure() {
xdg_environment_reset
local mycmakeargs=(
- -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
+ -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-DKICAD_SCRIPTING_WXPYTHON=ON
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index a2323360dfa8..21fbc20bd4f4 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,6 +1,9 @@
AUX magic-8.3.232-libdir.patch 525 BLAKE2B 5b85f02031d18299ae098b5ff45163d1c6d16f6bbd09996df6c669571ea82820175356c41b308f5055af874effa946f91baae90c43212e8e7adf40800799c8c3 SHA512 9b7018e05ab50db82996df57891642dfe4f00b74edd8f942912f750be91017a7d204fd0bf2271cee8082cfef9c903bdb4d8606979f6b2ef201b9d7ab1cdc523a
AUX magic-8.3.232-verbose-build.patch 1041 BLAKE2B 80ab96d751ff2294e6d82f75e997ecc1ccc00588eae3a6c0d63d49a134567eae864f3a42c46c6a6e0f6b1a53473df30afefbc9a7e48385a4ea9b780523ee0ca0 SHA512 19f3b6c371efccebadb6fa85f479ec4fa32fb7a4e11af58630e7265f19f598fdfb6c0008cf500de601246a6316ccf173f96dafdcca28bbef4e09658989d67a3a
DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc
+DIST magic-8.3.309.tgz 4175194 BLAKE2B dc63e74abf1a0fee75b1b018f58f73f0ed4ba7acb244aa0f427af1d4051a3344892ee8514a5f99827bd10c8ff44eac907a70150855db48fb97d0e4d436273893 SHA512 1abfd843f3d123bf532672c5e8c58d2c0f50e29ab017c21e4895810163eec430ba07c3b0dd8c571e47f1ce3bacfd37aa4cc667e4cecb3d53b3b7dd1c8205d8c2
DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
EBUILD magic-8.3.232.ebuild 2253 BLAKE2B c8bb1c559fc0e7eaf88dd5a7b7cca4cecf8d4f10e0c81390b9522eba17e17965ff6a3328554effcc80e4559ad6a9525f124a593a819b0277943301ac0b97c058 SHA512 bc078bf38985541a28aa0e9b229b9042eda5fad39d8091710541f26b8dc260a5ed0c7bc5a54b58ab6c30f6cf354233f0d872ba59d5a5fb2e4ffe182c6fb83dc1
+EBUILD magic-8.3.309-r1.ebuild 2541 BLAKE2B d14a52c6108a8ad70bc56b9f1f2789e58709492de57a75bd7632fa7718cbdda97d689df438e96eab33d9a9723757c2a4f38b41d5e02d1d2a252e71d2a32dd872 SHA512 048603aa13e7a9feb7c5c307fa0af07a6cf65b4e9ce9dfe0c4f7278a3b330bdf73a8830011342e774207f88ce16b9d3eb981889a5d231799c47ed93780af6e2c
+EBUILD magic-8.3.309.ebuild 2430 BLAKE2B 4d8421734e34e0a6fe853ecdc20a45b59d10515b14f3e04e8b5a932e75b98533c06305ba7f6aa53d5c95be447ff99d52272b003b83b5db98a98b5f20c20c051c SHA512 08187300ad4193b2ded096859ea524fca2bf0c277863e075db646a350447251fa843ab4f6ae350a2ad96927c510ad05c8581c43c49edb4747b51d76cf16a51a5
MISC metadata.xml 1381 BLAKE2B 7f9458b2f3e6c1f511b1f5a0f8f31e58114e29216eaf3927a6570f16bfab24fb357a82b432414a28a16fde8f02a00fafa5b5d915681a68c621b11202dbfc3d32 SHA512 b9cd12c6e4704bde2aa963880e9321fd64239b7f9333a7daa74be6707001ed18ac61bc48dc8f85cfeac9a427e07a3bcfe07607662d206d0f5d75753e333d2632
diff --git a/sci-electronics/magic/magic-8.3.309-r1.ebuild b/sci-electronics/magic/magic-8.3.309-r1.ebuild
new file mode 100644
index 000000000000..daeca5ef9e93
--- /dev/null
+++ b/sci-electronics/magic/magic-8.3.309-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1
+
+TECH_MOSIS_VER="2002a"
+
+DESCRIPTION="The VLSI design CAD tool"
+HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
+SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz
+ http://opencircuitdesign.com/~tim/programs/${PN}/archive/${TECH_MOSIS_VER}.tar.gz \
+ -> ${PN}-tech-mosis-${TECH_MOSIS_VER}.tar.gz"
+
+LICENSE="HPND GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cairo debug opengl"
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ dev-lang/tcl:0=
+ dev-lang/tk:0=
+ dev-tcltk/blt
+ cairo? ( x11-libs/cairo[opengl?] )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh
+ ${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.3.232-libdir.patch
+)
+
+DOCS=( README.md README.Tcl TODO )
+
+src_prepare() {
+ default
+
+ # Don't embed MAGIC_COMMIT
+ sed -i 's/git rev-parse HEAD//' scripts/defs.mak.in || die
+
+ pushd scripts &>/dev/null || die
+ mv configure.in configure.ac || die
+ popd &>/dev/null || 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, bug #447868
+ cd scripts || die
+ econf \
+ --with-tcl="/usr/$(get_libdir)" \
+ --with-tk="/usr/$(get_libdir)" \
+ --with-tcllibs="/usr/$(get_libdir)" \
+ --with-tklibs="/usr/$(get_libdir)" \
+ --disable-modular \
+ $(use_enable debug memdebug) \
+ $(use_enable cairo cairo-offscreen) \
+ $(use_with cairo) \
+ $(use_with opengl)
+}
+
+src_install() {
+ # Make does not always install required .tech files with parallel make install
+ emake DESTDIR="${ED}" install -j1
+ einstalldocs
+
+ # Move docs from libdir to docdir and add symlink.
+ mv "${ED}/usr/$(get_libdir)/magic/doc"/* "${ED}/usr/share/doc/${PF}/" || die
+ rmdir "${ED}/usr/$(get_libdir)/magic/doc" || die
+ dosym -r "${EPREFIX}/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
+
+ # Move tutorial from libdir to datadir and add symlink.
+ dodir /usr/share/${PN}
+ mv "${ED}/usr/$(get_libdir)/magic/tutorial" "${ED}/usr/share/${PN}/" || die
+ dosym -r "${EPREFIX}/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
+
+ # Install latest MOSIS tech files
+ cp -pPR "${WORKDIR}"/${TECH_MOSIS_VER} "${ED}"/usr/$(get_libdir)/magic/sys/current || die
+}
diff --git a/sci-electronics/magic/magic-8.3.309.ebuild b/sci-electronics/magic/magic-8.3.309.ebuild
new file mode 100644
index 000000000000..2f0d828f97bb
--- /dev/null
+++ b/sci-electronics/magic/magic-8.3.309.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1
+
+TECH_MOSIS_VER="2002a"
+
+DESCRIPTION="The VLSI design CAD tool"
+HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
+SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz
+ http://opencircuitdesign.com/~tim/programs/${PN}/archive/${TECH_MOSIS_VER}.tar.gz \
+ -> ${PN}-tech-mosis-${TECH_MOSIS_VER}.tar.gz"
+
+LICENSE="HPND GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cairo debug opengl"
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ sys-libs/zlib:=
+ dev-lang/tcl:0=
+ dev-lang/tk:0=
+ dev-tcltk/blt
+ cairo? ( x11-libs/cairo[opengl?] )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh
+ ${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.3.232-libdir.patch
+)
+
+DOCS=( README.md README.Tcl TODO )
+
+src_prepare() {
+ default
+
+ pushd scripts &>/dev/null || die
+ mv configure.in configure.ac || die
+ popd &>/dev/null || 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, bug #447868
+ cd scripts || die
+ econf \
+ --with-tcl="/usr/$(get_libdir)" \
+ --with-tk="/usr/$(get_libdir)" \
+ --with-tcllibs="/usr/$(get_libdir)" \
+ --with-tklibs="/usr/$(get_libdir)" \
+ --disable-modular \
+ $(use_enable debug memdebug) \
+ $(use_enable cairo cairo-offscreen) \
+ $(use_with opengl)
+}
+
+src_install() {
+ # Make does not always install required .tech files with parallel make install
+ emake DESTDIR="${ED}" install -j1
+ einstalldocs
+
+ # Move docs from libdir to docdir and add symlink.
+ mv "${ED}/usr/$(get_libdir)/magic/doc"/* "${ED}/usr/share/doc/${PF}/" || die
+ rmdir "${ED}/usr/$(get_libdir)/magic/doc" || die
+ dosym -r "${EPREFIX}/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
+
+ # Move tutorial from libdir to datadir and add symlink.
+ dodir /usr/share/${PN}
+ mv "${ED}/usr/$(get_libdir)/magic/tutorial" "${ED}/usr/share/${PN}/" || die
+ dosym -r "${EPREFIX}/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
+
+ # Install latest MOSIS tech files
+ cp -pPR "${WORKDIR}"/${TECH_MOSIS_VER} "${ED}"/usr/$(get_libdir)/magic/sys/current || die
+}
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index 88a15337d75b..f8c53c681aee 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -6,8 +6,8 @@ DIST ngspice-35-manual.pdf 2347261 BLAKE2B 617462615525e5335f5795e625578324d2b17
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
-EBUILD ngspice-31-r1.ebuild 4393 BLAKE2B 97d73472447291f088d3a742781010a7dd40b0674c6a0059b15c592f4cb9f9919868b93486c2fd11f8896a0e8719b3378ff80a54ed2aa93b2b6fb67d13c7bcc5 SHA512 f450f605ee8630ce1c2f190ecbc287ef4a6b60ab72ba44e686670cf8a779b83e80d3e839434df9a4c88334907284d046d9e685aaf9ac45ed727ff5da54efca24
-EBUILD ngspice-34.ebuild 4503 BLAKE2B 8b039ded83223c8945abb3868e7030bdfd577bffe37d17334daf21b51272ce86d23df64cc2b2dcc59d7c67237054131e34e9f4122d4ef27fa2aa803d5d904f15 SHA512 a5708e8de8b54cfad67ab1851b7e137c77d7719e4bf4128b943c3f103008405a9c1f14ba8669e0501dcfc2f2dc7afab878e5d94320f8b1a9dbf8b80ee6f8f9d2
-EBUILD ngspice-35.ebuild 4470 BLAKE2B 6851ebc6600db725f58fa3ced540ea88fe807cb8b15b6d69735a74407bdc746686d7ba7b12e1fe0a1aa5601dd3109e89917c110f718ed3f10e6d8697da4c9b1b SHA512 949e38987af0b6ad157d20c71b8e0fdc6b533f6c5e24fc43b10e756ac8ece85a7d7d7d09b05b8a1bffb7d977dfb571d2e97b4fd927f93cd81be90b8ba49cc9bd
-EBUILD ngspice-36.ebuild 4477 BLAKE2B cf8dcce5584b77c211bb7b9790a6b2d2f44cd446da73c317966ce31d200d717024fb00ab4270a3ed59bf6303cd77e76cfc044de6d58f5c7022586eeb0067e6b0 SHA512 759239bb68562346512f7ca541793a0afb79801c60fa311d0fe6aa85e7dd476916b31214453abee19e1521775fda63dc228c244071d627c5a29a890c81a975df
+EBUILD ngspice-31-r1.ebuild 4510 BLAKE2B 88b9e231cf3a19bd83f554ba235c86e081df699b5fb0b9d481eb5ab60a5c421202fe56dc5a2bafd5e82ff54ab1b7e2ac77f06eafdfc7f12284165636afd794d5 SHA512 b8ef7664e175d802dc9ec284cd0f40e2ead1810c78cde01f5a9d7d793f488d5f686603e8817f4fea6be1476af5ba3dd73a00735a9b0fa89df7225615a7ea0a60
+EBUILD ngspice-34.ebuild 4620 BLAKE2B 781dd445ce1e14499d3f1fa2aaae4026520e6c8194f5e7a9525c61d067537cc59ba774b914c131553aad8d9e18e5b2904809a76c01a35bc7dc9d082dfda9f906 SHA512 79e036d956bf02f544f833a35ec229dacf37e851ba76c3e931fcb3edd52a8e79f3d2e9d3ca30fb05f103caf94954954a8412ef10b0ae1839979b0c1572c83836
+EBUILD ngspice-35.ebuild 4587 BLAKE2B 450987f87ab81dccd90bf79e3a470ac54fedd47dc9b4c1b78bef07cfc39b22ef088cc110e5303f399e9e0b2e83b7d2a5247dd8d98d040a82d2b751db6ac7dd3a SHA512 02c78a4f942ce452ce19e6a2773f8a790be8fcd9a035df9a43cabbc3ec6c1bc79bd3593b40935ec141423c61dc0d9f06344190bff437bfe2c6722c8a11cfa11f
+EBUILD ngspice-36.ebuild 4594 BLAKE2B 69bddf5ccbcc3fbee10b3257818a499e2276c0a0e1a0874291e9dde1fd2b1af38a54f4f76e6b877ded16a5b757109accd70be6a6adfc9a635f41ee0cf9ef4d0a SHA512 b77c84159811a900addf0924146ff3c08784898d3c05736a678706c09b5be9ab2b2e61f36259a1b88ef0c07ff80404fac55277f5d1246991bdb63a1ce286433f
MISC metadata.xml 677 BLAKE2B 541ff3e8439b8e222916341bb9f973ea2189a5b2aceeb1bd83ca7a73af7161f38e272a93fdbab51aba4f14be53f556c10a5c10be2a807ef07bca9e39fa73b6ed SHA512 b439de3838f17c9c21e50cd80d74b733d0061f79a7e736c82295c3db433bb786cdab8dc73ca1b40f6a486288f29f82b677723ea1e13ca583b0456fcfa82de206
diff --git a/sci-electronics/ngspice/ngspice-31-r1.ebuild b/sci-electronics/ngspice/ngspice-31-r1.ebuild
index 7195c9e60379..603365b18c66 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 9f70865e81ca..e0f41dc5b269 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 17b7d8e33554..305f2906fb38 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
index ded8f7f1d8ce..8a616095f439 100644
--- a/sci-electronics/ngspice/ngspice-36.ebuild
+++ b/sci-electronics/ngspice/ngspice-36.ebuild
@@ -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/systemc/Manifest b/sci-electronics/systemc/Manifest
index f022cdd88b99..4f6df16d8649 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,3 +1,4 @@
DIST systemc-2.3.4.tar.gz 7142529 BLAKE2B 8a7e7e9f49b0131c1536d217dcc4fc420bc72ed962736a457cdaf3e40390be2a5051010317a62ba1eca17ee7ee4a171950979d2f07cb7fecc7286d028675540f SHA512 77fd1810fafeaa639cb21fcd77c7132c0ba3cf42309d3e09953c62c92f83b18e6de2e26620cee267683ca851503e5a8419523e7c9161f2ae33aea372af0be966
EBUILD systemc-2.3.4-r1.ebuild 1181 BLAKE2B 06a618a1bd4c1951989b47b564cc6de6b29ef7be1483a0c934fa0db6caeba00bdbfd6afaa93e73e2e31c3268d2cd97a081e7142b73092686d20eea000e12727e SHA512 f21eed02ca3405c4dcd6715da92897f113baf6d16fe882626c31f5f3a5ce2be086320cf8b50edd6f46361724fc3a0a4895fdf8bb36f8799d550d0a071448c046
+EBUILD systemc-2.3.4-r2.ebuild 1223 BLAKE2B 8b15e91d089f634c838eb52e5dd413a7b10870680f4dd1fed4e50570fcfd7fb7cc0707248752d55348bf0373b1c623fea3f138151b05a81ca14579949b872009 SHA512 a2250d479f35b6e3cb6d41cf19a81e5c87799db4027daba948d91ca66f25cfb6b6b29d94d4143af80e7c1d3cb56208c86db9abdc559b7ac2125a34265ec2a194
MISC metadata.xml 1094 BLAKE2B 8edeeea6726686d80ea047a7829ffdb313c8e31b80dd6b8c7e6da98102f66635807d4049da38a74197b270f67f25cf875a36234c7cddbe25649039f4fe5a5364 SHA512 e41a951f37b22345d5991e588d9a038df08fa379d7bfaf2b9860aeb2c6dd4795413d9d411a70bdce6f71a624c9b24c329dafd18aee9f2ee1d4368ff72376cd1c
diff --git a/sci-electronics/systemc/systemc-2.3.4-r2.ebuild b/sci-electronics/systemc/systemc-2.3.4-r2.ebuild
new file mode 100644
index 000000000000..9e61f04f5519
--- /dev/null
+++ b/sci-electronics/systemc/systemc-2.3.4-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV}_pub_rev_20190614"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
+HOMEPAGE="
+ https://systemc.org
+ https://github.com/accellera-official/systemc
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/accellera-official/${PN}.git"
+ 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"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug doc examples static-libs"
+REQUIRED_USE="examples? ( doc )"
+
+src_prepare() {
+ default
+ eautoconf --force
+}
+
+src_configure() {
+ econf CXX="$(tc-getCXX)" \
+ $(use_enable debug) \
+ $(use_enable static-libs static) \
+ --with-unix-layout
+}
+
+src_install() {
+ default
+ if use doc; then
+ if use examples; then
+ docompress -x /usr/share/doc/"${PF}"/examples
+ else
+ rm -r "${ED}"/usr/share/doc/"${PF}"/examples || die
+ fi
+ else
+ rm -r "${ED}"/usr/share/doc/"${PF}" || die
+ fi
+
+ if ! use static-libs; then
+ find "${ED}" -name "*.la" -delete || die
+ fi
+}
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 8f1ade7e53a6..da14461ca1ff 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,10 +1,3 @@
-AUX xnec2c-4.4.5-musl.patch 1665 BLAKE2B ffae40f94d3cc185fab213182741fc6c4175a60838e15aa4ce1efdbf13168352b47b64955ec461625a69c37f16028350cfd11d132ed5b28797d322f5f5ccc273 SHA512 48aa6ca3abfd1aa7c8866adaae262d115bfd0836e4de71fc0367e55d8f98395ff6940cd21eaf0d423726c49e9b49c8c57f8c069bae3b6a38bfda6cd11a5d4827
-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
-EBUILD xnec2c-4.1.1.ebuild 785 BLAKE2B 525e838b9b4b95226960ad3b63d4b0d3287e22d8bc95e0071afc0f3fb9b8fe049a4ee0b71ba42f75faab02521629df012825768d0f052c1de4aa97c2f5adc954 SHA512 e350dba8b64219dbd4ddbccd31c135b97bf2c62133d6d6a7dec1b4eeb06df2ab86851dd4aed32555b6a3ca53850f0b115c73d94df697449b6463c89e56c9b584
-EBUILD xnec2c-4.4.11.ebuild 989 BLAKE2B 7eb5ba8d638b81fc4058228bd1c8eb17037d2b0ca869e28dd6d4f9b46d558be996427d46d3b2c242ebc5a319c0619aafab0d7cd0e30cdc3b6ad73a1c143d830f SHA512 f9af501ed02ed7ec26d16cef9b4d7e7811eb04eb08107ebee0efde9f8b3403ec09fa4d8bea9407dc963bb95c854da4a9f98a637fada1fbc8c5b04544d9df3dc8
-EBUILD xnec2c-4.4.5.ebuild 942 BLAKE2B 359d6b68c87dea093bc8018b155ff5fdbec8e35a1ec87b56c9747711a902cd1a31bb6cc320418155bba8c8c7df71f649e75114d730d75d172109bc99b99a3487 SHA512 9e25b2180fa198e078e52a171ce5cc87fe43eb275975d4b61736187e71004b2d0bdd7f2146357a247ceacd6f2fdafd545ab265370f427b40a74c8de9d494610f
-EBUILD xnec2c-4.4.7.ebuild 871 BLAKE2B f923008332242221b146c06e7ab9154c47f3751f6b0ad3c2e18da9e9b2eb5766301fe61dc84908d9e7e66d6ababad6a23610c7229cfda290a15d4b4837a273e5 SHA512 e4350e264abbfa90a71132a85cb5df9dbe132f3cef6403d04103ead85e37ab7557193d56ac769c61b4f265dac2803a1965392d806b33f1514ed0994459a63e01
+EBUILD xnec2c-4.4.11.ebuild 987 BLAKE2B 8dd5bc27a43fc5fec236d579e288cc7eac8b067ddd7c4335d2c48c47e1fd3403eb878cda75ac3fd8e01173cf8f85e62786c416c26379a0bf933102c67354a88b SHA512 6e206d36ffdefe3879316477eb324dbb11c7d2e098f2bc96040cdc750ff9728e7049c9f28ac3d0db6729ff1e2117c12a4ec53624bd35ae31571ddd08d74dc18c
MISC metadata.xml 1635 BLAKE2B 97a6599a38ecf5914360b4e5376fcb6be56890a91e0274027c327d69fd41459a740a5ad4e2255e48c676bfabbc60a5fc3abd13fa7f9157ac3572e24fa11752a3 SHA512 7564946c202c11ab3be96071962e07870fe97433fae5a9998dbf0cc62de0c83885fadb71741a824aa45e643641baa77bb887ea70687fa15559119fd22d83eed3
diff --git a/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
deleted file mode 100644
index a995463224b0..000000000000
--- a/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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.1.1.ebuild b/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
deleted file mode 100644
index caca0d5d56eb..000000000000
--- a/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A GTK+ graphical interactive version of nec2c"
-HOMEPAGE="https://www.qsl.net/5b4az/pages/nec2.html"
-SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
-
-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"
-
-src_install() {
- default
- rm -R "${D}/usr/share/doc/${PN}" || die
-
- docompress -x /usr/share/man
- dodoc AUTHORS README doc/*.txt
- use doc && dodoc -r doc/*.html doc/images
- if use examples ; then
- docinto examples
- dodoc examples/*
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
index 3d142cf6f7a4..edc8563c6bd0 100644
--- a/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc examples"
RDEPEND="dev-libs/glib:2
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
deleted file mode 100644
index 6c495a7c80f8..000000000000
--- a/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
deleted file mode 100644
index c9403b6d6ff4..000000000000
--- a/sci-electronics/xnec2c/xnec2c-4.4.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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
-}