summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild2
-rw-r--r--sci-electronics/gazebo/Manifest1
-rw-r--r--sci-electronics/gazebo/gazebo-11.3.0-r3.ebuild (renamed from sci-electronics/gazebo/gazebo-11.3.0-r1.ebuild)2
-rw-r--r--sci-electronics/gazebo/gazebo-11.5.1-r3.ebuild (renamed from sci-electronics/gazebo/gazebo-11.5.1-r1.ebuild)2
-rw-r--r--sci-electronics/gazebo/gazebo-11.7.0-r2.ebuild (renamed from sci-electronics/gazebo/gazebo-11.7.0.ebuild)2
-rw-r--r--sci-electronics/gazebo/gazebo-11.9.1.ebuild83
-rw-r--r--sci-electronics/geda/geda-1.9.2-r1.ebuild4
-rw-r--r--sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild2
-rw-r--r--sci-electronics/iverilog/iverilog-10.3.ebuild4
-rw-r--r--sci-electronics/iverilog/iverilog-11.0.ebuild2
-rw-r--r--sci-electronics/kicad-footprints/Manifest3
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-5.1.12.ebuild (renamed from sci-electronics/kicad-footprints/kicad-footprints-5.1.10.ebuild)2
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild36
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild36
-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.10.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.10.ebuild)2
-rw-r--r--sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild30
-rw-r--r--sci-electronics/kicad-packages3d/Manifest3
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild (renamed from sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild)4
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild37
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild36
-rw-r--r--sci-electronics/kicad-symbols/Manifest3
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-5.1.12.ebuild (renamed from sci-electronics/kicad-symbols/kicad-symbols-5.1.10.ebuild)2
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild36
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild35
-rw-r--r--sci-electronics/kicad-templates/Manifest3
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-5.1.12.ebuild (renamed from sci-electronics/kicad-templates/kicad-templates-5.1.10.ebuild)2
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild28
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-9999.ebuild28
-rw-r--r--sci-electronics/kicad/Manifest3
-rw-r--r--sci-electronics/kicad/kicad-5.1.12.ebuild (renamed from sci-electronics/kicad/kicad-5.1.10-r1.ebuild)2
-rw-r--r--sci-electronics/kicad/kicad-6.0.1.ebuild169
-rw-r--r--sci-electronics/kicad/kicad-9999.ebuild169
-rw-r--r--sci-electronics/kicad/metadata.xml5
-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/labone/Manifest2
-rw-r--r--sci-electronics/labone/files/hf2-data-server11
-rw-r--r--sci-electronics/labone/files/hf2-data-server.conf4
-rw-r--r--sci-electronics/labone/files/labone-data-server13
-rw-r--r--sci-electronics/labone/files/labone-data-server.conf4
-rw-r--r--sci-electronics/labone/labone-16.12.42529.ebuild74
-rw-r--r--sci-electronics/labone/labone-21.08.20515-r1.ebuild85
-rw-r--r--sci-electronics/magic/Manifest5
-rw-r--r--sci-electronics/magic/files/magic-8.3.232-libdir.patch13
-rw-r--r--sci-electronics/magic/files/magic-8.3.232-verbose-build.patch (renamed from sci-electronics/magic/files/magic-7.5.231-verbose-build.patch)16
-rw-r--r--sci-electronics/magic/magic-7.5.202-r1.ebuild70
-rw-r--r--sci-electronics/magic/magic-8.0.207.ebuild79
-rw-r--r--sci-electronics/magic/magic-8.3.232.ebuild84
-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/quartus-prime-lite/Manifest2
-rw-r--r--sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-qenv-lib32.patch11
-rw-r--r--sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-vso-launcher.patch19
-rw-r--r--sci-electronics/quartus-prime-lite/metadata.xml8
-rw-r--r--sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild48
-rw-r--r--sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild76
-rw-r--r--sci-electronics/sigrok-cli/Manifest1
-rw-r--r--sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild52
-rw-r--r--sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild (renamed from sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild)12
-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/vbs/vbs-1.4.0.ebuild4
-rw-r--r--sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild26
-rw-r--r--sci-electronics/xcircuit/xcircuit-3.9.73.ebuild4
-rw-r--r--sci-electronics/xnec2c/Manifest2
-rw-r--r--sci-electronics/xnec2c/files/xnec2c-template.patch28
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.2.ebuild46
-rw-r--r--sci-electronics/xnec2c/xnec2c-4.3.4.ebuild50
72 files changed, 1274 insertions, 532 deletions
diff --git a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
index d07c379b648..494f5778347 100644
--- a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
+++ b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/drahnr/oregano/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
S="${WORKDIR}/oregano-${PV}"
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index a45f1992f39..6ec5847ce80 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,3 +1,4 @@
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.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
diff --git a/sci-electronics/gazebo/gazebo-11.3.0-r1.ebuild b/sci-electronics/gazebo/gazebo-11.3.0-r3.ebuild
index d2074820693..dd11acd611a 100644
--- a/sci-electronics/gazebo/gazebo-11.3.0-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.3.0-r3.ebuild
@@ -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]
diff --git a/sci-electronics/gazebo/gazebo-11.5.1-r1.ebuild b/sci-electronics/gazebo/gazebo-11.5.1-r3.ebuild
index d2074820693..dd11acd611a 100644
--- a/sci-electronics/gazebo/gazebo-11.5.1-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.5.1-r3.ebuild
@@ -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]
diff --git a/sci-electronics/gazebo/gazebo-11.7.0.ebuild b/sci-electronics/gazebo/gazebo-11.7.0-r2.ebuild
index d2074820693..dd11acd611a 100644
--- a/sci-electronics/gazebo/gazebo-11.7.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.7.0-r2.ebuild
@@ -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]
diff --git a/sci-electronics/gazebo/gazebo-11.9.1.ebuild b/sci-electronics/gazebo/gazebo-11.9.1.ebuild
new file mode 100644
index 00000000000..c6602d9de1c
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.9.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 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
+ app-arch/gzip
+ virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+ "${FILESDIR}/qwt.patch"
+ "${FILESDIR}/cmake.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/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
index c85d6f34977..e4657a2c3ee 100644
--- a/sci-electronics/geda/geda-1.9.2-r1.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.geda-project.org/${MY_PN}/unstable/v$(ver_cut 1-2)/${PV}/${M
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="debug doc examples nls stroke threads"
RDEPEND="
diff --git a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
index 0c524c10d33..f8588c470fa 100644
--- a/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
+++ b/sci-electronics/gnucap/gnucap-0.35.20091207-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.gnucap.org/"
IUSE="examples"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
# NOTE: readline could be made optional, but I don't see a point for now.
RDEPEND="sys-libs/readline:="
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index a2dea488d4f..1a2a537efa4 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
else
SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
S="${WORKDIR}/${PN}-${GITHUB_PV}"
fi
diff --git a/sci-electronics/iverilog/iverilog-11.0.ebuild b/sci-electronics/iverilog/iverilog-11.0.ebuild
index bf530fda830..c8842e156a9 100644
--- a/sci-electronics/iverilog/iverilog-11.0.ebuild
+++ b/sci-electronics/iverilog/iverilog-11.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
else
SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
S="${WORKDIR}/${PN}-${GITHUB_PV}"
fi
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 0a65165cb9d..09c17b3589e 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1 +1,2 @@
-DIST kicad-footprints-5.1.10.tar.bz2 3382220 BLAKE2B c2725a83e1d817cbf748dcf173383a53ee00c917d50c00368feb29150d14d1172df8e2b87fa0b8a2f3921658baae833048889c16d45469c7e888002fc63e9fc7 SHA512 624f5bf4a7e9b30ca1f7f8aa4d8270baf59667c91e65b8beb3c36b546fc4fbabd6221cb408458eb166e0364c7b8c77923b5809d94aea3ec65ae58c65055b6eb7
+DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9
+DIST kicad-footprints-6.0.1.tar.gz 31372634 BLAKE2B 5cb451a9a69c926af1aa8e0b180a244b8e195a450c83c960d62125d3bfc35d6a8c0a07e1a54c207fe851198b83bbdc7e3a26d06bdd92afbb1637733898661159 SHA512 dbe8689a0f32a9b448c7aa37c673736d97163f8e3f23b1e5119a732926cfd635aaa7927f0bf77327ab824353fe431523ca10f4035a37ca4fa364c8a7e2e2805d
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.10.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.10.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.1.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild
new file mode 100644
index 00000000000..995b74bb188
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.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"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+# x11-misc-util/macros only required on live ebuilds
+ BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild
new file mode 100644
index 00000000000..995b74bb188
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.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"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+# 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 5e311827dd0..5619127f9c8 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1 +1 @@
-DIST kicad-i18n-5.1.10.tar.bz2 2934783 BLAKE2B b836c12d5265d9da36a4647b8f8e956c7a7a1ebc8a9467f0c4b1ae6d3deaddaddd6c42811bfa6d89440015f1273bb2356bbd91b43ed62e25b402f4b203f598bc SHA512 c40d170ae247f376da03159eeddafbbb1828612ce274714f6111f1be16d122808e7ecdbd3d79dcf90f13f43ed55d603055eafcaf69cab7323367db711631f789
+DIST kicad-i18n-5.1.12.tar.bz2 2934525 BLAKE2B 7aef8a0e5213be38e5517a539469cba41d67dc2495539c7f5722f6cf7e3a86b8eaefa341d18a621b36c100ddd89466fbf5ac9d8071e5f78587161a8c0bb430d1 SHA512 178a17919e762f284aaf1fab75d527085a2bcec8dc6e236a552c6c471aab5ca4f747d297d8f148dbe9cc80a0c4994b712b54da077029ff484006b6c42dc22916
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.10.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.10.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.10.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.10.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.1.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild
new file mode 100644
index 00000000000..570479b87ec
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+
+if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+IUSE="doc minimal"
+
+RDEPEND="
+ >=sci-electronics/kicad-${PV}
+ >=sci-electronics/kicad-symbols-${PV}
+ >=sci-electronics/kicad-footprints-${PV}
+ doc? (
+ >=app-doc/kicad-doc-${PV}
+ )
+ !minimal? (
+ >=sci-electronics/kicad-packages3d-${PV}
+ >=sci-electronics/kicad-templates-${PV}
+ )
+"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index ef902329079..b89d1ca3c48 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1 +1,2 @@
-DIST kicad-packages3d-5.1.10.tar.bz2 727194444 BLAKE2B 87d210be8e32e84f29d67f861962f869f62ba1828a6557f75642c652e81239543bbe4d3a2ae8dc34767266d16cb2a51dfb8c79062b9bb90ae359001f39b7684f SHA512 95c25fe94f3e198208f073c121d234508aa8e67a621d17bc1737d14fe860c9a8cece6e7b66037f9a9c7f1a06f104b942dc2ff59f318e8b6854bdddb1d238faf4
+DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2
+DIST kicad-packages3d-6.0.1.tar.gz 943455043 BLAKE2B 7d26b3f6eb9fe279343d9c43dfff875ba2f56b56ff1fe868a07fa43f9abe476f7b6c8e3e9122adf2bf5546b571f45573926055452bac9b5dc03618dd8ace245a SHA512 326ad5d3b4fea482921af2f69b21e7f36ad462632804c24c160b824e722d79050a2e7d81b499fad09c7e03381026a9d3d292a85ace79d7a7cc3a976454e8bb83
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.12.ebuild
index ce0d62fefa1..594ef53b2fc 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-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 check-reqs cmake
@@ -16,7 +16,7 @@ IUSE="occ +oce"
REQUIRED_USE="|| ( occ oce )"
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
+RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce(-)=]"
CHECKREQS_DISK_BUILD="11G"
S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild
new file mode 100644
index 00000000000..5bf36a30f65
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.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"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
+ S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-530926da52f5226de6fc3167cf2e0671fb7f0cec"
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
+
+if [[ ${PV} == 9999 ]] ; then
+ # x11-misc-util/macros only required on live ebuilds
+ BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
new file mode 100644
index 00000000000..75bc70ca864
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.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"
+ S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" # check for directory hash
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
+
+if [[ ${PV} == 9999 ]] ; then
+ # x11-misc-util/macros only required on live ebuilds
+ BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index de2924caf87..777cdb0aa48 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1 +1,2 @@
-DIST kicad-symbols-5.1.10.tar.bz2 1815573 BLAKE2B 030847bef5b0420fcbc0d77adcf14f5e08b738ef7c547fae9da70fb70ad1f94149eaf482d1d3da667b369bad6e08995fd3920807cec45bb46efde882404ce820 SHA512 f9dd5a0ee135bb37e1be723c6213f3c2148b1579fab5f56c859d0ca0b55afb81143244cdaedd6d14ab73228176be9770b7dc04a4fe118e9b9f1464c5f79c6b46
+DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6
+DIST kicad-symbols-6.0.1.tar.gz 4809762 BLAKE2B 8133932edf7f480ea61c98838e0c7b0ed32c79ef8cc89d385192c7cd137bcfabdb9a4ed28cc10b2006dfc37729b070d286a5b29b94108da487c797fef1605b20 SHA512 0f62118118adff693bb127d229232cfeeb88f48d3d818d44c3d9d8d1db89de903587ed8cc9081914eec8233650dd0bac6dd5d4618b4417bdf06955ebd1b8923c
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.10.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.10.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.1.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild
new file mode 100644
index 00000000000..911199e91fa
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
+
+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"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+ # x11-misc-util/macros only required on live ebuilds
+ BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild
new file mode 100644
index 00000000000..2fcbfb8a9bc
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
+
+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"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+ # x11-misc-util/macros only required on live ebuilds
+ BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 0a966457efa..e45a9fd2bc0 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1 +1,2 @@
-DIST kicad-templates-5.1.10.tar.bz2 1552124 BLAKE2B 95e876fb049abc5fb1210bea63e389c88b43efbd8154ee95d4f910621954795c20228f5a12a5d692ca771d55783c7b9c6942c21bc27d54027a68aa91152a406a SHA512 2e2f3fbf79f82e3539d6ee31aef5c854695683b7cd142a4293c37ef04845f6d90e8fb2f4f9027efc0e3211703336d4dc65f2573266be0a20b1b139fbe3ee55cf
+DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430
+DIST kicad-templates-6.0.1.tar.gz 2248692 BLAKE2B fa9f1667958f25f965e1f41b50b009724b8b46960b55561048aca74f876196ac896ee72294f32ad815f7d7097dd4caba2a4fe8c5f6731e0e13322c48cf6df1a0 SHA512 ee0423949e63a17634c0abe3eb5184d16650cf702f37fa2f10af8f0e9377d4031b0b213cb8570af63d8ff8d5549f0b6f153287db9d8f64140273134ee2650a60
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.10.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.10.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.1.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild
new file mode 100644
index 00000000000..4eb6a8bdae4
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.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"
+
+ 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-6.0.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-9999.ebuild b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild
new file mode 100644
index 00000000000..4eb6a8bdae4
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.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"
+
+ 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-6.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index cf4bdc5e3f7..ee977e4d1eb 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1 +1,2 @@
-DIST kicad-5.1.10.tar.bz2 18586889 BLAKE2B 2d087e7102746d3570c4e448ab7dfb27f63eac5d5036ea55970770025eacf1f85a26f7bdb0b83be546c97dbd4e9050f46045254334ba5dcecd3197d368d1e975 SHA512 3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0
+DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
+DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d
diff --git a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild b/sci-electronics/kicad/kicad-5.1.12.ebuild
index 586e7c949bb..3957488f0a2 100644
--- a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild
+++ b/sci-electronics/kicad/kicad-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
PYTHON_COMPAT=( python3_{8,9} )
diff --git a/sci-electronics/kicad/kicad-6.0.1.ebuild b/sci-electronics/kicad/kicad-6.0.1.ebuild
new file mode 100644
index 00000000000..4efd1ddc6a9
--- /dev/null
+++ b/sci-electronics/kicad/kicad-6.0.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+ inherit git-r3
+else
+ MY_PV="${PV/_rc/-rc}"
+ 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}"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples +ngspice nls openmp +occ +pcm"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+COMMON_DEPEND="
+ !sci-electronics/kicad-i18n
+ >=dev-libs/boost-1.61:=[context,nls]
+ media-libs/freeglut
+ media-libs/glew:0=
+ >=media-libs/glm-0.9.9.1
+ media-libs/mesa[X(+)]
+ >=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]
+ )
+ nls? (
+ sys-devel/gettext
+ )
+ occ? (
+ >=sci-libs/opencascade-7.3.0:=
+ )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ sci-electronics/electronics-menu
+"
+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="900M"
+
+pkg_setup() {
+ use openmp && tc-check-openmp
+
+ python-single-r1_pkg_setup
+ setup-wxwidgets
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ else
+ default_src_unpack
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+
+ local mycmakeargs=(
+ -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)"
+
+ -DKICAD_USE_OCC="$(usex occ)"
+ -DKICAD_INSTALL_DEMOS="$(usex examples)"
+ -DCMAKE_SKIP_RPATH="ON"
+ )
+
+ use occ && mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ if use doc; then
+ cmake_src_compile doxygen-docs
+ fi
+}
+
+src_test() {
+ # Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+ ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+ # LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+ LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ 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/.
+ fi
+}
+
+pkg_postinst() {
+ optfeature "Component symbols library" sci-electronics/kicad-symbols
+ optfeature "Component footprints library" sci-electronics/kicad-footprints
+ optfeature "3D models of components " sci-electronics/kicad-packages3d
+ optfeature "Project templates" sci-electronics/kicad-templates
+ optfeature "Different languages for GUI" sci-electronics/kicad-i18n
+ optfeature "Extended documentation" app-doc/kicad-doc
+ optfeature "Creating 3D models of components" media-gfx/wings
+
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
new file mode 100644
index 00000000000..129d1937206
--- /dev/null
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+ inherit git-r3
+else
+ MY_PV="${PV/_rc/-rc}"
+ 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}"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples +ngspice nls openmp +occ +pcm"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+COMMON_DEPEND="
+ !sci-electronics/kicad-i18n
+ >=dev-libs/boost-1.61:=[context,nls]
+ media-libs/freeglut
+ media-libs/glew:0=
+ >=media-libs/glm-0.9.9.1
+ media-libs/mesa[X(+)]
+ >=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]
+ )
+ nls? (
+ sys-devel/gettext
+ )
+ occ? (
+ >=sci-libs/opencascade-7.3.0:=
+ )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ sci-electronics/electronics-menu
+"
+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="900M"
+
+pkg_setup() {
+ use openmp && tc-check-openmp
+
+ python-single-r1_pkg_setup
+ setup-wxwidgets
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ else
+ default_src_unpack
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+
+ local mycmakeargs=(
+ -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
+
+ -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)"
+
+ -DKICAD_USE_OCC="$(usex occ)"
+ -DKICAD_INSTALL_DEMOS="$(usex examples)"
+ -DCMAKE_SKIP_RPATH="ON"
+ )
+
+ use occ && mycmakeargs+=(
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ if use doc; then
+ cmake_src_compile doxygen-docs
+ fi
+}
+
+src_test() {
+ # Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+ ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+ # LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+ LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ 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/.
+ fi
+}
+
+pkg_postinst() {
+ optfeature "Component symbols library" sci-electronics/kicad-symbols
+ optfeature "Component footprints library" sci-electronics/kicad-footprints
+ optfeature "3D models of components " sci-electronics/kicad-packages3d
+ optfeature "Project templates" sci-electronics/kicad-templates
+ optfeature "Different languages for GUI" sci-electronics/kicad-i18n
+ optfeature "Extended documentation" app-doc/kicad-doc
+ optfeature "Creating 3D models of components" media-gfx/wings
+
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 6b572519cd1..09d8f72c361 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -12,9 +12,10 @@
<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="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag>
<flag name="python">Enable python scripting support</flag>
+ <flag name="pcm">Enable plugin content manager</flag>
</use>
<longdescription>
Kicad is an open source (GPL) software for the creation of electronic
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/labone/Manifest b/sci-electronics/labone/Manifest
index 518c5f95a13..0c19990b3df 100644
--- a/sci-electronics/labone/Manifest
+++ b/sci-electronics/labone/Manifest
@@ -1 +1 @@
-DIST LabOneLinux64-16.12.42529.tar.gz 120562203 BLAKE2B 5d5e3816ad47e79b8b029b318f76b72908949fb4f92b5497d4b03abf5562144951d2a95832cdd2112df8922a9ea002a508f0d81c5f1fee3a017540dceb70233a SHA512 31068792ca4c2ab88490eacf35a84f8a2c31b330087ee91154e5ecdae63bcf557563c80e45af4a855df9d7d9a1d5b5a761ef5d957ce357368706307ea5ea196b
+DIST LabOneLinux64-21.08.20515.tar.gz 399058267 BLAKE2B 624c4dc4a01edb69f9b36a435744d10b3638c91c7ac0c1e9765cf913e605fe32d1935fa131d650f38a5b713df916d92b985ac5f6489b031bba9b6ec8a1370d4a SHA512 f229a885ea91cc518c4819ad76a928829eb1699603ba48fb745d4a99faca116b100831c17a48243922912c68de27b7938387677ffa2e996a122f36c33d0a205c
diff --git a/sci-electronics/labone/files/hf2-data-server b/sci-electronics/labone/files/hf2-data-server
new file mode 100644
index 00000000000..b9fa83ad3ac
--- /dev/null
+++ b/sci-electronics/labone/files/hf2-data-server
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/hf2-data-server.pid"
+command="/opt/bin/ziServer"
+command_args=""
+
+depend() {
+ need net
+}
diff --git a/sci-electronics/labone/files/hf2-data-server.conf b/sci-electronics/labone/files/hf2-data-server.conf
new file mode 100644
index 00000000000..db93c775c45
--- /dev/null
+++ b/sci-electronics/labone/files/hf2-data-server.conf
@@ -0,0 +1,4 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Configuration file for hf2-data-server
diff --git a/sci-electronics/labone/files/labone-data-server b/sci-electronics/labone/files/labone-data-server
new file mode 100644
index 00000000000..62b5cab8521
--- /dev/null
+++ b/sci-electronics/labone/files/labone-data-server
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/labone-data-server.pid"
+command="/opt/bin/ziDataServer"
+command_args="-l /var/log/labone"
+supervisor=supervise-daemon
+command_user=nobody
+
+depend() {
+ need net
+}
diff --git a/sci-electronics/labone/files/labone-data-server.conf b/sci-electronics/labone/files/labone-data-server.conf
new file mode 100644
index 00000000000..bee6a54310f
--- /dev/null
+++ b/sci-electronics/labone/files/labone-data-server.conf
@@ -0,0 +1,4 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Configuration file for labone-data-server
diff --git a/sci-electronics/labone/labone-16.12.42529.ebuild b/sci-electronics/labone/labone-16.12.42529.ebuild
deleted file mode 100644
index d0e0dd38e67..00000000000
--- a/sci-electronics/labone/labone-16.12.42529.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Platform independent instrument control for Zurich Instruments devices"
-HOMEPAGE="https://www.zhinst.com/labone"
-SRC_URI="https://www.zhinst.com/system/files/downloads/files/LabOneLinux64-${PV}.tar.gz"
-
-LICENSE="zi-labone"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="mirror bindist"
-IUSE="minimal"
-
-QA_PREBUILT="*"
-
-RDEPEND=""
-
-S=${WORKDIR}/LabOneLinux64-${PV}
-
-src_install() {
- local instPath=/opt/zi
- local instrDir="LabOne64-${PV}"
-
- if ! use minimal ; then
-
- dodir ${instPath}/${instrDir}
- for dir in API DataServer Documentation WebServer release_notes_16.12.txt ; do
- cp -a "$dir" "${D}${instPath}/${instrDir}/" || die
- done
-
- dosym ../..${instPath}/${instrDir}/DataServer/ziServer /opt/bin/ziServer
- dosym ../..${instPath}/${instrDir}/DataServer/ziDataServer /opt/bin/ziDataServer
-
- echo "#!/bin/bash" > "${T}/startWebServer" || die
- echo "${instPath}/${instrDir}/WebServer/ziWebServer -r ${instPath}/${instrDir}/WebServer/html --ip 127.0.0.1 --server-port 8004" >> "${T}/startWebServer" || die
- chmod 755 "${T}/startWebServer" || die
- exeinto /opt/bin
- doexe "${T}/startWebServer"
- elog For security reasons the startWebServer script listens on the localhost interface only.
- else
-
- insinto "${instPath}/${instrDir}/API/C/lib"
- doins API/C/lib/*.so
- insinto "${instPath}/${instrDir}/API/C/include"
- doins API/C/include/*.h
-
- fi
-
- dosym "../..${instPath}/${instrDir}/API/C/include/ziAPI.h" "usr/include/ziAPI.h"
- dosym "../..${instPath}/${instrDir}/API/C/lib/libziAPI-linux64.so" "usr/$(get_libdir)/libziAPI-linux64.so"
-
- # the udev integration
-
- sed -e 's:/usr/bin/ziServer:/opt/bin/ziServer:g' -i Installer/udev/config || die
- insinto /etc/ziService
- doins Installer/udev/config
- sed -e 's:/usr/bin/ziServer:/opt/bin/ziServer:g' -i Installer/udev/55-zhinst.rules || die
- insinto /lib/udev/rules.d
- doins Installer/udev/55-zhinst.rules
- exeinto /opt/bin
- doexe Installer/udev/ziService
-
- # just to make sure
- dosym ../../opt/bin/ziService usr/bin/ziService
-}
-
-pkg_prerm() {
- if [[ -x /opt/bin/ziService ]]; then
- einfo "Stopping ziService for safe unmerge"
- /opt/bin/ziService stop
- fi
-}
diff --git a/sci-electronics/labone/labone-21.08.20515-r1.ebuild b/sci-electronics/labone/labone-21.08.20515-r1.ebuild
new file mode 100644
index 00000000000..0c0c263143f
--- /dev/null
+++ b/sci-electronics/labone/labone-21.08.20515-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg desktop systemd udev
+
+DESCRIPTION="Platform independent instrument control for Zurich Instruments devices"
+HOMEPAGE="https://www.zhinst.com/labone"
+SRC_URI="https://www.zhinst.com/sites/default/files/media/release_file/2021-09/LabOneLinux64-${PV}.tar.gz"
+
+LICENSE="zi-labone"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="mirror bindist"
+IUSE="minimal"
+
+QA_PREBUILT="*"
+
+RDEPEND=""
+
+S=${WORKDIR}/LabOneLinux64-${PV}
+
+src_install() {
+ local application_directory=/opt/zi
+ local installation_directory="${application_directory}/LabOne64-${PV}"
+
+ if ! use minimal ; then
+
+ # the applications
+
+ dodir ${installation_directory}
+ for dir in API DataServer Firmware Documentation WebServer ; do
+ mv "$dir" "${D}${installation_directory}/" || die
+ done
+
+ cp "release_notes_$(ver_cut 1-2).txt" "${D}${installation_directory}/" || die
+
+ dosym ../..${installation_directory}/DataServer/ziServer /opt/bin/ziServer
+ dosym ../..${installation_directory}/DataServer/ziDataServer /opt/bin/ziDataServer
+
+ # the services
+
+ # LabOne comes with systemd support.
+
+ local service
+ for service in labone-data-server hf2-data-server ; do
+ sed -e 's:/usr/local/bin/:/opt/bin/:g' -i Installer/systemd/${service}.service || die
+ systemd_dounit Installer/systemd/${service}.service
+ done
+
+ # For OpenRC we need to do our own thing...
+
+ for service in labone-data-server hf2-data-server ; do
+ doinitd "${FILESDIR}/${service}"
+ doconfd "${FILESDIR}/${service}.conf"
+ done
+
+ echo "#!/bin/bash" > "${T}/startziWebServer" || die
+ echo "${installation_directory}/WebServer/ziWebServer -r ${installation_directory}/WebServer/html --ip 127.0.0.1 --server-port 8004 -a 1" '$@ &' >> "${T}/startziWebServer" || die
+ chmod 755 "${T}/startziWebServer" || die
+ exeinto /opt/bin
+ doexe "${T}/startziWebServer"
+ elog For security reasons the startziWebServer script listens on the localhost interface only.
+
+ newicon "${D}${installation_directory}/WebServer/html/images/favicons/firefox_app_128x128.png" zi-labone.png
+
+ make_desktop_entry /opt/bin/startziWebServer "ZI LabOne" zi-labone "Science;Physics;Engineering"
+
+ keepdir /var/log/labone
+ fowners nobody /var/log/labone
+ else
+
+ insinto "${installation_directory}/API/C/lib"
+ doins API/C/lib/*.so
+ insinto "${installation_directory}/API/C/include"
+ doins API/C/include/*.h
+
+ fi
+
+ dosym "../..${installation_directory}/API/C/include/ziAPI.h" "usr/include/ziAPI.h"
+ dosym "../..${installation_directory}/API/C/lib/libziAPI-linux64.so" "usr/$(get_libdir)/libziAPI-linux64.so"
+
+ udev_dorules Installer/udev/55-zhinst.rules
+}
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index bd1baafd599..e58deb09ddf 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,3 +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.0.207.tgz 3893605 BLAKE2B 39309def79e03fd6b116482eec2f200cb2b0d2042add2e2a70b0805bc0bc75654de6a92150167ab755b21c333be917c5fac53a30e9f5ee7915fd662179ce391c SHA512 034387d774f653d6de419d597564e96242b87bf3c478045e5a649f490fe4e5431c983f6667b5900ec9ae283af2775404dfbdcbaf18419f85d7242d492360d32b
+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-8.3.232-libdir.patch b/sci-electronics/magic/files/magic-8.3.232-libdir.patch
new file mode 100644
index 00000000000..fbfe8557287
--- /dev/null
+++ b/sci-electronics/magic/files/magic-8.3.232-libdir.patch
@@ -0,0 +1,13 @@
+'lib' is for 32-bit libraries only, thank you very much
+
+--- a/scripts/defs.mak.in
++++ b/scripts/defs.mak.in
+@@ -36,7 +36,7 @@
+ # Install targets may be different if dist_prefix is set by configure
+ INSTALL_BINDIR = @DIST_DIR@/bin
+ INSTALL_MANDIR = @DIST_DIR@/share/man
+-INSTALL_LIBDIR = @DIST_DIR@/lib
++INSTALL_LIBDIR = ${libdir}
+ INSTALL_SYSDIR = ${INSTALL_LIBDIR}/magic/sys
+ INSTALL_SCMDIR = ${INSTALL_LIBDIR}/magic/scm
+ INSTALL_TCLDIR = ${INSTALL_LIBDIR}/magic/tcl
diff --git a/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch b/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch
index 64ad4fd1827..8455d7bb193 100644
--- a/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch
+++ b/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch
@@ -1,5 +1,5 @@
---- magic-7.5.231/Makefile
-+++ magic-7.5.231/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -18,12 +18,10 @@
all: $(ALL_TARGET)
@@ -15,19 +15,19 @@
force: clean all
-@@ -67,7 +65,7 @@
+@@ -68,7 +66,7 @@
install-magic:
- @echo --- installing executable to $(DESTDIR)${BINDIR}
- @echo --- installing runtime files to $(DESTDIR)${LIBDIR}
+ @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
+ @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR}
- @${MAKE} install-real 2>&1 >> install.log
+ @${MAKE} install-real
install-real: install-dirs
for dir in ${INSTALL_CAD_DIRS}; do \
-@@ -86,7 +84,7 @@
+@@ -89,7 +87,7 @@
install-tcl:
- @echo --- installing executable to $(DESTDIR)${BINDIR}
- @echo --- installing runtime files to $(DESTDIR)${LIBDIR}
+ @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
+ @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR}
- @${MAKE} install-tcl-real 2>&1 >> install.log
+ @${MAKE} install-tcl-real
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 40a3643a1eb..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.0.207.ebuild b/sci-electronics/magic/magic-8.0.207.ebuild
deleted file mode 100644
index 5c62820b86b..00000000000
--- a/sci-electronics/magic/magic-8.0.207.ebuild
+++ /dev/null
@@ -1,79 +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="debug opengl"
-
-RDEPEND="sys-libs/ncurses:0=
- sys-libs/readline:0=
- dev-lang/tcl:0=
- dev-lang/tk:0=
- dev-tcltk/blt
- opengl? ( virtual/glu
- virtual/opengl )"
-DEPEND="${RDEPEND}
- app-shells/tcsh"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-7.5.231-verbose-build.patch"
-
- cd scripts || die
- eautoreconf
- cd .. || die
-
- 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-tcl=yes \
- --with-tcllibs="/usr/$(get_libdir)" \
- --with-tklibs="/usr/$(get_libdir)" \
- --disable-modular \
- $(use_enable debug memdebug) \
- $(use_with opengl)
-}
-
-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
new file mode 100644
index 00000000000..a23b43b71b8
--- /dev/null
+++ b/sci-electronics/magic/magic-8.3.232.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=
+ 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"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.3.232-libdir.patch
+ "${FILESDIR}"/${PN}-8.3.232-verbose-build.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
+
+ 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 || die
+ econf \
+ --with-tcl=yes \
+ --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() {
+ default
+
+ # 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/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/quartus-prime-lite/Manifest b/sci-electronics/quartus-prime-lite/Manifest
deleted file mode 100644
index 82c6b0e92df..00000000000
--- a/sci-electronics/quartus-prime-lite/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Quartus-lite-15.1.0.185-linux.tar 5969776640 BLAKE2B 622060e053a9d7a91fe9b4b61f6ebf1289f3849e666b20bca801f0bd752dac0f551c7aa2b8d16b6238b6df2b174f8d352bbc2e3a2a9e270735c5581dd81420f5 SHA512 7996bc9e0561b650c0318d608b4f59560dd631e3a38c403105f797049c395ce25a0ff5d4346cf6e91338fa297d7e8752ef5a3f83f496d4431ad3591de4335045
-DIST libfreetype.so.6 785880 BLAKE2B a9c724a213d6211e954c20ea203feeacd384768bf34929719326d2a98e166c91114f4a60b223efd770ccf356662c8664c91d4bf4722325c01d310a10e3026f30 SHA512 4b0ae581df3ecc0117d8b12405d7e5203d1ec40e965c39dade16c4b5495e95c71c2c5d739ccfec7c4c90dd2f48c004f4ae49497c46927adc81c98ead52978be1
diff --git a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-qenv-lib32.patch b/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-qenv-lib32.patch
deleted file mode 100644
index 8e3f117e795..00000000000
--- a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-qenv-lib32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /opt/quartus-lite-15.1.0.185/quartus/adm/qenv.sh.org 2016-03-01 18:51:38.192388962 +0800
-+++ /opt/quartus-lite-15.1.0.185/quartus/adm/qenv.sh 2016-02-25 09:22:28.580259994 +0800
-@@ -136,7 +136,7 @@
- ##### Quartus path setup
-
- export PATH=$QUARTUS_BINDIR:$PATH
--export LD_LIBRARY_PATH=$QUARTUS_BINDIR:$LD_LIBRARY_PATH
-+export LD_LIBRARY_PATH=$QUARTUS_BINDIR:$LD_LIBRARY_PATH:/opt/quartus-lite-15.1.0.185/modelsim_ase/lib32
-
-
- # Add <qdir>/adm to path, it has some helper tools
diff --git a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-vso-launcher.patch b/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-vso-launcher.patch
deleted file mode 100644
index e152aed093c..00000000000
--- a/sci-electronics/quartus-prime-lite/files/quartus-prime-lite-15.1.0.185-vso-launcher.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- /opt/quartus-lite-15.1.0.185/modelsim_ase/vco.org 2016-03-02 19:05:09.566449182 +0800
-+++ /opt/quartus-lite-15.1.0.185/modelsim_ase/vco 2016-03-02 19:06:19.020221005 +0800
-@@ -48,6 +48,7 @@
- done
-
- dir=`dirname "$arg0"`
-+export LD_LIBRARY_PATH=${dir}/lib32
-
- vco=${uname}${utype}
- case $vco in
-@@ -203,7 +204,7 @@
- 2.[5-9]*) vco="linux" ;;
- 2.[1-9][0-9]*) vco="linux" ;;
- 3.[0-9]*) vco="linux" ;;
-- *) vco="linux_rh60" ;;
-+ *) vco="linux" ;;
- esac
- if [ ! -x "$dir/$vco/vsim" ]; then
- if [ -x "$dir/linuxle/vsim" ]; then
diff --git a/sci-electronics/quartus-prime-lite/metadata.xml b/sci-electronics/quartus-prime-lite/metadata.xml
deleted file mode 100644
index b8d0419909b..00000000000
--- a/sci-electronics/quartus-prime-lite/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">brendanhoran/gentoo-custom</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild
deleted file mode 100644
index 82920e59203..00000000000
--- a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit desktop
-
-DESCRIPTION="Full-featured EDA product for altera devices"
-HOMEPAGE="https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html"
-SRC_URI="Quartus-lite-${PV}-linux.tar"
-# variable to store the download URL
-DOWNLOADPAGE="http://dl.altera.com/?edition=lite"
-
-LICENSE="Quartus-prime-megacore"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-libs/libpng-compat:1.2"
-
-RESTRICT="fetch bindist"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
- elog "Due to licensing restrictions, you need to download the distfile manually."
- elog "Please navigate to ${DOWNLOADPAGE}"
- elog "Sign in with your Altera account (you need to register)"
- elog "Download ${SRC_URI} and place it into your DISTDIR directory"
- elog "And restart the installation."
-}
-
-pkg_pretend() {
- einfo "The checksum and unpack will take quite some time to run"
-}
-
-src_install() {
- einfo "The Quartus install runs in unattended mode"
- einfo "you wont see much and it will take a long time"
-
- ./setup.sh --mode unattended --unattendedmodeui none \
- --installdir "${D}/opt/quartus-lite-${PV}"
- make_desktop_entry "/opt/quartus-lite-${PV}/quartus/bin/quartus" \
- "Quartus lite ${PV}" "/opt/quartus-lite-${PV}/quartus/adm/quartusii.png"
-}
-
-pkg_postinst() {
- elog "To launch Quartus, run /opt/quartus-lite-${PV}/quartus/bin/quartus"
-}
diff --git a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild b/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild
deleted file mode 100644
index 41d04df2765..00000000000
--- a/sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop epatch
-
-DESCRIPTION="Full-featured EDA product for altera devices"
-HOMEPAGE="https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html"
-SRC_URI="Quartus-lite-${PV}-linux.tar
- https://github.com/brendanhoran/gentoo-custom/raw/master/files/libfreetype.so.6"
-# variable to store the download URLS
-DOWNLOADPAGE="http://dl.altera.com/?edition=lite"
-DOWNLOADFT="https://raw.githubusercontent.com/brendanhoran/gentoo-custom/master/files/libfreetype.so.6"
-
-LICENSE="Quartus-prime-megacore"
-SLOT="0"
-
-# No keywords as per bug 575684
-KEYWORDS=""
-
-RDEPEND="media-libs/libpng-compat:1.2[abi_x86_32]
- x11-libs/libXft[abi_x86_32]
- app-arch/bzip2[abi_x86_32]
- sys-libs/zlib[abi_x86_32]
- sys-libs/glibc[multilib]"
-
-RESTRICT="fetch bindist"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
- elog "Due to licensing restrictions, and old libary versions."
- elog "You need to download the distfiles manually."
- elog "-------------------------------------------------------"
- elog "For Quartus :"
- elog "Please navigate to ${DOWNLOADPAGE}"
- elog "Sign in with your Altera account (you need to register)"
- elog "Download Quartus-lite-${PV}-linux.tar and place it into your DISTDIR directory"
- elog "-------------------------------------------------------"
- elog "For Freetype libary :"
- elog "Please download the following file :"
- elog "${DOWNLOADFT}"
- elog "Please place this into your DISTDIR directory"
- elog "-------------------------------------------------------"
- elog "And restart the installation."
-}
-
-pkg_pretend() {
- einfo "The checksum and unpack will take quite some time to run"
-}
-
-src_install() {
- einfo "The Quartus install runs in unattended mode"
- einfo "you wont see much and it will take a long time"
-
- ./setup.sh --mode unattended --unattendedmodeui none \
- --installdir "${D}/opt/quartus-lite-${PV}" || die
- make_desktop_entry "/opt/quartus-lite-${PV}/quartus/bin/quartus" \
- "Quartus lite ${PV}" "/opt/quartus-lite-${PV}/quartus/adm/quartusii.png"
- pushd "${D}"
- # Patch qenv to find extra 32bit libs
- epatch "${FILESDIR}/${P}-qenv-lib32.patch"
- # fix vso launcher for 32bit libs and linux kernel versions
- epatch "${FILESDIR}/${P}-vso-launcher.patch"
- dodir "opt/quartus-lite-${PV}/modelsim_ase/lib32"
- insinto "opt/quartus-lite-${PV}/modelsim_ase/lib32"
- # Copy over the old freetype lib
- doins "${PORTAGE_BUILDDIR}/distdir/libfreetype.so.6"
-}
-
-pkg_postinst() {
- elog "To launch Quartus, run /opt/quartus-lite-${PV}/quartus/bin/quartus"
- ewarn "This ebuild bundles a vulnerable and old freetype library"
- ewarn "Sadly this is needed for vsim. You have been warned"
-}
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.1-r1.ebuild
deleted file mode 100644
index 98082389e4d..00000000000
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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-0.7.2.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.2-r1.ebuild
index 7033695a668..730463965c9 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.2.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.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 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-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/vbs/vbs-1.4.0.ebuild b/sci-electronics/vbs/vbs-1.4.0.ebuild
index 0c3b4dcf54c..4e58d702ffe 100644
--- a/sci-electronics/vbs/vbs-1.4.0.ebuild
+++ b/sci-electronics/vbs/vbs-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.geda.seul.org/dist/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND="
diff --git a/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild
new file mode 100644
index 00000000000..a4426523ebf
--- /dev/null
+++ b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit fortran-2
+
+MY_P=${PN}-v.${PV}
+
+DESCRIPTION="HF propagation prediction tool"
+HOMEPAGE="https://www.qsl.net/hz1jw/voacapl/index.html"
+SRC_URI="https://github.com/jawatson/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="mirror bindist"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ # bug 513766
+ emake -j1
+}
diff --git a/sci-electronics/xcircuit/xcircuit-3.9.73.ebuild b/sci-electronics/xcircuit/xcircuit-3.9.73.ebuild
index 62140eb5a22..d44b7bc85ed 100644
--- a/sci-electronics/xcircuit/xcircuit-3.9.73.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.9.73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://opencircuitdesign.com/xcircuit"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="tcl"
DEPEND="
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 2e9161df57d..892ff039cc4 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1 +1,3 @@
DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
+DIST xnec2c-4.2.tar.bz2 939408 BLAKE2B 5fbecf436bfebb6979c12d7f76d708a21d784ee5f4f38c6010c5fd16ebe5324ea5469ea578c4ac7fabc26a82e7ea5d5bf6206be79482a9e454183c7b082a20a8 SHA512 bc0929e3cb01eb355c1eb8615087cc70c4585db75d0e6664237e8e268c5dc2159ec9852d917c9fe6b06a3fa780d7ae0b806c2e5cbf48a60622ee4558d9d82063
+DIST xnec2c-v4.3.4.tar.gz 974922 BLAKE2B e6243ca37bf5acc91e523c8444121afb7b56d4cdfcf64120987aebde321ddaecc4c63653e60353d300c987af65e5ecc4f441b4f1aaa72ed88bbcd0833da89d40 SHA512 5b29b6679117e384d0f0c671a5ed3a902012fd18832e89af894cdb26ac7ec4e7e9de5a4195b7fc81de1481ad253fb77483ee05f15ed608a3cfaa32de4071918c
diff --git a/sci-electronics/xnec2c/files/xnec2c-template.patch b/sci-electronics/xnec2c/files/xnec2c-template.patch
new file mode 100644
index 00000000000..fa09bbdb983
--- /dev/null
+++ b/sci-electronics/xnec2c/files/xnec2c-template.patch
@@ -0,0 +1,28 @@
+# Install template files in /usr/share/xnec2c
+diff --git a/Makefile.am b/Makefile.am
+index 9e8873a..6f6203e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -62,7 +62,7 @@ install-data-local:
+ $(install_sh_DATA) doc/$(PACKAGE).1.gz $(DESTDIR)$(mandir)/man1/; \
+ fi;
+ if test -d .$(PACKAGE)/; then \
+- $(MKDIR_P) $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/;\
+- cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/; \
++ $(MKDIR_P) $(DESTDIR)$(datarootdir)/$(PACKAGE)/;\
++ cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/$(PACKAGE)/; \
+ fi;
+
+diff --git a/src/main.c b/src/main.c
+index 4cb541e..6883ceb 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -88,7 +88,7 @@ main (int argc, char *argv[])
+ /* Create file path to xnec2c examples directory */
+ exe_path[bytes] = '\0';
+ Strlcpy( file_path, exe_path, sizeof(file_path) );
+- Strlcat( file_path, "/share/examples/xnec2c", sizeof(file_path) );
++ Strlcat( file_path, "/share/xnec2c", sizeof(file_path) );
+ fprintf( stderr, "xnec2c: creating xnec2c config directory from: %s\n", file_path );
+
+ /* Create system command to copy examples/xnec2c to ~/.xnec2c */
diff --git a/sci-electronics/xnec2c/xnec2c-4.2.ebuild b/sci-electronics/xnec2c/xnec2c-4.2.ebuild
new file mode 100644
index 00000000000..bdc030a2fa5
--- /dev/null
+++ b/sci-electronics/xnec2c/xnec2c-4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools 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_prepare() {
+ eapply_user
+ eapply "${FILESDIR}/${PN}-template.patch"
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ 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.3.4.ebuild b/sci-electronics/xnec2c/xnec2c-4.3.4.ebuild
new file mode 100644
index 00000000000..dee965c2daa
--- /dev/null
+++ b/sci-electronics/xnec2c/xnec2c-4.3.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 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
+ eapply "${FILESDIR}/${PN}-template.patch"
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ 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
+}