gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /sci-electronics
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
70 files changed, 787 insertions, 1065 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 092c84b589c0..b9465df5d3a8 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/alliance/Manifest b/sci-electronics/alliance/Manifest
deleted file mode 100644
index 4575bb47e0ca..000000000000
--- a/sci-electronics/alliance/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX alliance-5.0.20070718-overun.patch 440 BLAKE2B 8e25a764306373195b8b192264d77ccf72e5cdd07b00d8737639d273179f6bdd3cb0d7a8d01cfdbde4a044d9414c365c76534d067fb51c03cd832e66298bc5f6 SHA512 74874734cd817526131964e46609c1c0ce9aa7bf6812710ac7191e6a23e6de5467ec32f4bf410bdc8d9e868429ccf1a2de9cb8787901fc3de8df5f099cee77a0
-AUX alliance-5.0.20110203-impl-dec.patch 3087 BLAKE2B d32cf80a04495e4b23c2961156d1582edc9d6d99f65d8a7f6e58b855d7e0d2a1f0be78d26c72ff01c0874c9fe32935167fbfeda933d8b3f6735d16fe79059d2d SHA512 92a418ed4291f71fe1deb14256cc53ced983105b70fc1edc1d6ab178553750ed50236f7165a567446fbf75f697a0e354760bf9ca8d06526b8c4292e7495baf8c
-DIST alliance-5.0-20110203.tar.gz 8112254 BLAKE2B 77c81348f432f2b424c2cff3ff188bec72e9ba77777bb31a91a6b9d63ec3b0a61848f4dd2246ddcfdf0bf4199423ffedcc62ac6beac8ca52ece345ce6ebb4f05 SHA512 03859d4d5167c223c2af9784843303a46d9a47e7fb26c2dadd60361b6735f6afb75c3097460dd804ef339c72f2bf0f60e78713be88d2c5ad06ad8b0c376857c8
-EBUILD alliance-5.0.20110203.ebuild 1386 BLAKE2B 25923e6f4a5eccc98e8000ab941a763bca3cc44425c7ad5be979ef2ba3ad6e3e4d1f6cbf838159b18a82b2bd746bb51dfed6152a3fc095f6d6843876c2177b18 SHA512 1236c6c2233c7effabf29664d0c4e225f62a634149ad07d7bf7623dc24fd9e9d59e25107b0b9d16ccb1f803930ae2f5bfef52aebb90b688c9e180b73cfab249c
-MISC metadata.xml 877 BLAKE2B 9acb9be15295137503871aee68b0063f7fa74368c15ecac40eca79f54c038639f2bdd289cac577300e31ad6358d48d432fbf7c94634cd897d50c15f135d502f1 SHA512 dfc2ee14f8ee497740b62d5c375bff36759d603dad54fe8982cbb02b846c369cf23ec788b1e0b000cc89d38be7718ec7089945a527fbfc62648bb55093a82fb8
diff --git a/sci-electronics/alliance/alliance-5.0.20110203.ebuild b/sci-electronics/alliance/alliance-5.0.20110203.ebuild
deleted file mode 100644
index aa8045c61de5..000000000000
--- a/sci-electronics/alliance/alliance-5.0.20110203.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator flag-o-matic eutils
-
-MY_PV=$(replace_version_separator 2 '-' )
-UPSTREAM_VERSION=$(get_version_component_range 1-2)
-URL="http://www-asim.lip6.fr/pub/alliance/distribution/${UPSTREAM_VERSION}"
-
-DESCRIPTION="Digital IC design tools (simulation, synthesis, place/route, etc...)"
-HOMEPAGE="https://soc-extras.lip6.fr/en/alliance-abstract-en/"
-SRC_URI="${URL}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXpm
-	x11-libs/libXt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${UPSTREAM_VERSION}"
-
-src_prepare() {
-	#fix buffer overrun (bug 340789)
-	epatch \
-		"${FILESDIR}"/${PN}-${UPSTREAM_VERSION}.20070718-overun.patch \
-		"${FILESDIR}"/${P}-impl-dec.patch
-}
-
-src_configure() {
-	# Fix bug #134285
-	replace-flags -O3 -O2
-
-	# Alliance requires everything to be in the same directory
-	econf \
-		--prefix=/usr/lib/${PN} \
-		--mandir=/usr/lib/${PN}/man \
-		--with-x \
-		--with-motif \
-		--with-xpm \
-		--with-alc-shared
-}
-
-src_compile() {
-	# See bug #134145
-	emake -j1
-}
-
-src_install() {
-	make install DESTDIR="${D}"
-	insinto /etc
-	newins distrib/etc/alc_env.sh alliance.env
-}
-
-pkg_postinst() {
-	elog "Users should source /etc/alliance.env before working with Alliance tools."
-}
diff --git a/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch b/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch
deleted file mode 100644
index 50cfc30be23f..000000000000
--- a/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# fix buffer overun (bug 340789)
---- druc/src/drucbath.c.orig	2010-10-15 14:15:52.000000000 +0000
-+++ druc/src/drucbath.c	2010-10-15 14:19:03.000000000 +0000
-@@ -66,7 +66,7 @@
- rdsins_list *InstanceCourante;
- char        *TmpErrorFileName;
- FILE        *TmpErrorFile;
--char         DrucTmpFileBuffer [ DRUC_MAX_STRING_BUFFER + 1 ];
-+char         DrucTmpFileBuffer [ DRUC_MAX_FILE_BUFFER + 1 ];
- 
-   fputs ( "\n" ,
-           DrucErrorFile 
diff --git a/sci-electronics/alliance/files/alliance-5.0.20110203-impl-dec.patch b/sci-electronics/alliance/files/alliance-5.0.20110203-impl-dec.patch
deleted file mode 100644
index c1ef31619167..000000000000
--- a/sci-electronics/alliance/files/alliance-5.0.20110203-impl-dec.patch
+++ /dev/null
@@ -1,119 +0,0 @@
- dreal/src/GRD_error.c    |    1 +
- lynx/src/cutelbow.c      |    1 +
- lynx/src/parse.c         |    1 +
- mips_asm/src/mips_util.c |    1 +
- proof/src/proof_main.c   |    1 +
- proof/src/proof_util.c   |    1 +
- xfsm/src/XFS_error.c     |    1 +
- xgra/src/XGR_error.c     |    1 +
- xsch/src/XSC_error.c     |    1 +
- 9 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/dreal/src/GRD_error.c b/dreal/src/GRD_error.c
-index e3baba6..c00bf13 100644
---- a/dreal/src/GRD_error.c
-+++ b/dreal/src/GRD_error.c
-@@ -46,6 +46,7 @@
- # include <stdlib.h>
- # include <signal.h>
- # include <setjmp.h>
-+# include <string.h>
- # include "mut.h"
- # include "mph.h"
- # include "rds.h"
-diff --git a/lynx/src/cutelbow.c b/lynx/src/cutelbow.c
-index 7411f35..306649b 100644
---- a/lynx/src/cutelbow.c
-+++ b/lynx/src/cutelbow.c
-@@ -43,6 +43,7 @@
- \------------------------------------------------------------*/
- 
- # include <stdio.h>
-+# include <string.h>
- 
- # include "mut.h"
- # include "mlo.h"
-diff --git a/lynx/src/parse.c b/lynx/src/parse.c
-index ed8a2e5..9077c3f 100644
---- a/lynx/src/parse.c
-+++ b/lynx/src/parse.c
-@@ -43,6 +43,7 @@
- \------------------------------------------------------------*/
- 
- # include <stdio.h>
-+# include <string.h>
- 
- # include "mut.h"
- # include "mlo.h"
-diff --git a/mips_asm/src/mips_util.c b/mips_asm/src/mips_util.c
-index f5fa55f..5ad6a4f 100644
---- a/mips_asm/src/mips_util.c
-+++ b/mips_asm/src/mips_util.c
-@@ -30,6 +30,7 @@
- /* ###--------------------------------------------------------------### */
- 	
- #include <stdio.h>
-+#include <string.h>
- #include "mut.h"
- #include "log.h"
- #include "beh.h"
-diff --git a/proof/src/proof_main.c b/proof/src/proof_main.c
-index b6eee94..3d8a91a 100644
---- a/proof/src/proof_main.c
-+++ b/proof/src/proof_main.c
-@@ -32,6 +32,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "mut.h"
- #include "log.h"
- #include "beh.h"
-diff --git a/proof/src/proof_util.c b/proof/src/proof_util.c
-index 841937f..fa20ba1 100644
---- a/proof/src/proof_util.c
-+++ b/proof/src/proof_util.c
-@@ -31,6 +31,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "mut.h"
- #include "log.h"
-diff --git a/xfsm/src/XFS_error.c b/xfsm/src/XFS_error.c
-index 20ccd0a..5aded2b 100644
---- a/xfsm/src/XFS_error.c
-+++ b/xfsm/src/XFS_error.c
-@@ -46,6 +46,7 @@
- # include <stdlib.h>
- # include <signal.h>
- # include <setjmp.h>
-+# include <string.h>
- # include "mut.h"
- # include "aut.h"
- # include "abl.h"
-diff --git a/xgra/src/XGR_error.c b/xgra/src/XGR_error.c
-index 3204423..b2d35c5 100644
---- a/xgra/src/XGR_error.c
-+++ b/xgra/src/XGR_error.c
-@@ -46,6 +46,7 @@
- # include <stdlib.h>
- # include <signal.h>
- # include <setjmp.h>
-+# include <string.h>
- # include "mut.h"
- # include "aut.h"
- # include "XSB.h"
-diff --git a/xsch/src/XSC_error.c b/xsch/src/XSC_error.c
-index 9bdf65e..b8c5689 100644
---- a/xsch/src/XSC_error.c
-+++ b/xsch/src/XSC_error.c
-@@ -46,6 +46,7 @@
- # include <stdlib.h>
- # include <signal.h>
- # include <setjmp.h>
-+# include <string.h>
- # include "mut.h"
- # include "aut.h"
- # include "mlo.h"
diff --git a/sci-electronics/alliance/metadata.xml b/sci-electronics/alliance/metadata.xml
deleted file mode 100644
index 72c53d956621..000000000000
--- a/sci-electronics/alliance/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-electronics@gentoo.org</email>
-		<name>Gentoo Electronics Project</name>
-	</maintainer>
-	<longdescription>
-		Alliance is a complete set of free CAD tools and portable libraries for VLSI
-		design. It includes a VHDL compiler and simulator, logic synthesis tools, and
-		automatic place and route tools. A complete set of portable CMOS libraries is
-		provided. Alliance is the result of a twelve year effort spent at ASIM
-		department of LIP6 laboratory of the Pierre et Marie Curie University (Paris
-		VI, France). Alliance has been used for research projects such as the 875 000
-		transistors StaCS superscalar microprocessor and 400 000 transistors IEEE
-		Gigabit HSL Router.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-electronics/fasthenry/Manifest b/sci-electronics/fasthenry/Manifest
index c1fb4d175567..aa034523bd23 100644
--- a/sci-electronics/fasthenry/Manifest
+++ b/sci-electronics/fasthenry/Manifest
@@ -1,3 +1,8 @@
+AUX fasthenry-3.0.20.07.17-ar.patch 556 BLAKE2B 8f0dd170c3874598050e3f5706072f8eadeedd4b8fd7bbf1226132506bb53b7c585c21c28188816a0cfccd19f841a8c082e3b210eda21031938bce37a37add91 SHA512 05abf82c915dedac8290625085ae8ac82b7f483d1391a456387c0b932ffa50c6a8eb5dc121507005a7129f373e752a633d3a4e4db905abbcd6239d96c30f086b
+AUX fasthenry-3.0.20.07.17-cflags.patch 1621 BLAKE2B 1cd3be8b20ebbc5392ccf075ee1c87ef56da08bd8b5bad5c4d1680a7721d8c8e925714d76b45a0c7e77b24f1ea06228313dd37e7a7d1077942e4e592e0822897 SHA512 54f66a9b1408cb88c53c3220291ab5a0674d0bd328fef88be6da630e1567a21a1d9cc6ddf044c3c6c4eb879ff0d84161e8918b887d3cf36e6b7ac351607d60de
+AUX fasthenry-3.0.20.07.17-ldflags.patch 1586 BLAKE2B baec5791cd996f64f20093b6d610f98260b15854e18dab52ba89a65d86f1481b6eb2af58b4878e20df2dc61ff7984dcb17fc55d3f98adc3505577e7922f5a98f SHA512 319a7ac37de72e1c5e8e1e49f0d781674a62bd0be1ee835dacac40e7624fa6e3d5e6aed230cca0a3a10abc5c8c2790be090dfc70c01f2ccbfdbd4273f6933cf5
+DIST fasthenry-3.0wr-071720.tar.gz 5196905 BLAKE2B 577e1b6c9b5483144f54de96439a2f11d41bfe54fbd9973084c2e17d180843ceaaa946899ae1bc71ef7dcf3b048da9775f2015fe03ce01ece67f66f998adba9b SHA512 90419c9e8cbdbb16dcb34db65e4e87643cbdbfad980012ea8c08d4fc062a113e388a38705d4d5af3970107ff71630fe7afe3b29e1de731c147798e683ec71cd3
 DIST fasthenry-3.0wr-082514.tar.gz 3738940 BLAKE2B 3fd5d45e047725bf04299bf77f7385f42faa68d234a06f57cc494684a65e1c02d3879cb42a02dc3f53b0a63b5f5caf5d0a24ae1182ef19695e37a758b9bdb5e1 SHA512 53764d2eb5577d89934ad882af0eeadc6196d95a9c22cd6648e0c342c33ef1d8289b3b6c9ef48662ae4611e2bf914e4c4a68ddc536dc7921e0296cd59c5f3538
+EBUILD fasthenry-3.0.20.07.17.ebuild 769 BLAKE2B 73a749c32bc5493b43db213e7fae815862c077500e7755661f19c1c01de6ec1f99bc821998a7f18e50becfcd0454d09b52ee84e0648605625a3a51ae1288b71e SHA512 790e8cb137df98a077050263d9967ef3bceb9605dedfeb2329f951c50122cefe3ec04132ebe29e55530931480496f2ff63337ed163791dc55b41f24ffef30ca8
 EBUILD fasthenry-3.0_p082514.ebuild 600 BLAKE2B f894d630cca5a684699326796ea23ed14fdbbc8d4bb90ae178b1b07c81ba6c7e11ba46abc89becdb6a87171c81446d8b3aee318795adf210cf78f6e9e8910a84 SHA512 63a4c938169578faa87a83f32d99293a7e3eaccabb830f15b09997152067796d8034a8487d472c7d664d45424330e4efcbe3f52ee6c6c192a389fe76e1a18633
 MISC metadata.xml 333 BLAKE2B f522a7296deba6133ac57d58f634d78e2cdbddbce6ca4ba93fb83717a934f9f1eba3b32727cdc5a8196010cfb7ba9554f42c5fe904496d8ffec69375ed34c7b7 SHA512 03e74ece880711b377a80d6db5714b516922bf32e1b4df1e2fd437578beb04f632b4a36dd0a10933bca307832cc956af43ce6edec27aae7756a5505605ca9547
diff --git a/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
new file mode 100644
index 000000000000..ee1cef974df8
--- /dev/null
+++ b/sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Three dimensional inductance computation program, Whiteley Research version"
+HOMEPAGE="http://www.wrcad.com/freestuff.html"
+SRC_URI="http://www.wrcad.com/ftp/pub/fasthenry-$(ver_cut 1-2)wr-$(ver_cut 4)$(ver_cut 5)$(ver_cut 3).tar.gz"
+
+LICENSE="all-rights-reserved"
+RESTRICT="mirror bindist"
+
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}/fasthenry-3.0wr
+
+PATCHES=(
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-ar.patch"
+)
+
+src_compile() {
+	tc-export CC AR
+	emake all
+}
+
+src_install() {
+	dobin bin/fasthenry
+	dobin bin/zbuf
+	dodoc -r doc/*
+	dodoc -r examples
+}
diff --git a/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ar.patch b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ar.patch
new file mode 100644
index 000000000000..ea1e671b7df1
--- /dev/null
+++ b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ar.patch
@@ -0,0 +1,18 @@
+diff -ruN fasthenry-3.0wr.orig/src/sparse/Makefile fasthenry-3.0wr/src/sparse/Makefile
+--- fasthenry-3.0wr.orig/src/sparse/Makefile	2020-10-24 18:35:15.348900086 +0300
++++ fasthenry-3.0wr/src/sparse/Makefile	2020-10-24 18:37:09.729921680 +0300
+@@ -25,12 +25,12 @@
+ #	$(CC) $(CFLAGS) -o $(DESTINATION) $(TESTO) $(LIBRARY) -lm
+ 
+ $(LIBRARY)	: $(OFILES)
+-	ar r   $(LIBRARY) $?
++	$(AR) r   $(LIBRARY) $?
+ 	ranlib $(LIBRARY)
+ 
+ spice		: $(LIBRARY) spSMP.o
+ 	cp $(LIBRARY) ../SMP.a
+-	ar r ../SMP.a spSMP.o
++	$(AR) r ../SMP.a spSMP.o
+ 	ranlib ../SMP.a
+ 
+ lint		:
diff --git a/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-cflags.patch b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-cflags.patch
new file mode 100644
index 000000000000..7053406cb26f
--- /dev/null
+++ b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-cflags.patch
@@ -0,0 +1,48 @@
+diff -ruN fasthenry-3.0wr.orig/src/fasthenry/mk_syscfg.inc fasthenry-3.0wr/src/fasthenry/mk_syscfg.inc
+--- fasthenry-3.0wr.orig/src/fasthenry/mk_syscfg.inc	2020-07-23 01:18:06.000000000 +0300
++++ fasthenry-3.0wr/src/fasthenry/mk_syscfg.inc	2020-10-18 23:01:19.019207947 +0300
+@@ -2,7 +2,7 @@
+ # except for MinGW.
+ 
+ #CFLAGS = -O -g -DFOUR
+-CFLAGS = -O3 -DFOUR
++CFLAGS += -DFOUR
+ 
+ # For MinGW, there is no getrusage, and we'll skip a gethostname call
+ # to avoid having to link with winsock.
+@@ -12,4 +12,4 @@
+ 
+ # We're going to assume gcc, you'll need to comment this if a
+ # non-compatible compiler is used.
+-CC := gcc
++#CC := gcc
+diff -ruN fasthenry-3.0wr.orig/src/sparse/Makefile fasthenry-3.0wr/src/sparse/Makefile
+--- fasthenry-3.0wr.orig/src/sparse/Makefile	2019-09-02 21:41:53.000000000 +0300
++++ fasthenry-3.0wr/src/sparse/Makefile	2020-10-18 23:01:49.339387549 +0300
+@@ -4,7 +4,7 @@
+ #  UC Berkeley
+ #
+ #CFLAGS = -O -g
+-CFLAGS = -O3
++#CFLAGS = -O3
+ LINTFLAGS = -lc -lm
+ SHELL = /bin/sh
+ #CC = cc
+diff -ruN fasthenry-3.0wr.orig/src/zbuf/mk_syscfg.inc fasthenry-3.0wr/src/zbuf/mk_syscfg.inc
+--- fasthenry-3.0wr.orig/src/zbuf/mk_syscfg.inc	2020-07-23 01:18:23.000000000 +0300
++++ fasthenry-3.0wr/src/zbuf/mk_syscfg.inc	2020-10-18 23:01:19.019207947 +0300
+@@ -2,7 +2,7 @@
+ # except for MinGW.
+ 
+ #CFLAGS = -O -g -DFOUR
+-CFLAGS = -O3 -DFOUR
++CFLAGS += -DFOUR
+ 
+ # For MinGW, there is no getrusage, and we'll skip a gethostname call
+ # to avoid having to link with winsock.
+@@ -12,4 +12,4 @@
+ 
+ # We're going to assume gcc, you'll need to comment this if a
+ # non-compatible compiler is used.
+-CC := gcc
++#CC := gcc
diff --git a/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ldflags.patch b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ldflags.patch
new file mode 100644
index 000000000000..198f2f7e74fe
--- /dev/null
+++ b/sci-electronics/fasthenry/files/fasthenry-3.0.20.07.17-ldflags.patch
@@ -0,0 +1,40 @@
+diff -ruN fasthenry-3.0wr.orig/src/fasthenry/Makefile fasthenry-3.0wr/src/fasthenry/Makefile
+--- fasthenry-3.0wr.orig/src/fasthenry/Makefile	2020-07-12 19:17:05.000000000 +0300
++++ fasthenry-3.0wr/src/fasthenry/Makefile	2020-10-24 18:27:20.624660092 +0300
+@@ -49,7 +49,7 @@
+ 	@if [ $(SOLVER) = SPARSE_SOLVER ]; then \
+ 	    cd ../sparse; make CC=$(CC); \
+ 	fi
+-	$(CC) -o fasthenry $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SOLVERLIB) -lm
++	$(CC) -o fasthenry $(LDFLAGS) $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SOLVERLIB) -lm
+ 	mv fasthenry $(BIN)/fasthenry
+ 
+ clean:
+diff -ruN fasthenry-3.0wr.orig/src/misc/Makefile fasthenry-3.0wr/src/misc/Makefile
+--- fasthenry-3.0wr.orig/src/misc/Makefile	2019-03-21 23:10:58.000000000 +0200
++++ fasthenry-3.0wr/src/misc/Makefile	2020-10-24 18:28:12.805126140 +0300
+@@ -1,10 +1,10 @@
+ all: MakeLcircuit ReadOutput
+ 
+ MakeLcircuit: MakeLcircuit.c
+-	$(CC) -O -o MakeLcircuit MakeLcircuit.c -lm
++	$(CC) $(LDFLAGS) $(CFLAGS) -o MakeLcircuit MakeLcircuit.c -lm
+ 
+ ReadOutput: ReadOutput.c
+-	$(CC) -O -o ReadOutput ReadOutput.c -lm
++	$(CC) $(LDFLAGS) $(CFLAGS) -o ReadOutput ReadOutput.c -lm
+ 
+ clean::
+ 	-@rm -f *.o MakeLcircuit ReadOutput
+diff -ruN fasthenry-3.0wr.orig/src/zbuf/Makefile fasthenry-3.0wr/src/zbuf/Makefile
+--- fasthenry-3.0wr.orig/src/zbuf/Makefile	2019-09-08 22:53:50.000000000 +0300
++++ fasthenry-3.0wr/src/zbuf/Makefile	2020-10-24 18:29:50.686000362 +0300
+@@ -41,7 +41,7 @@
+ LIBS = -lm
+ 
+ zbuf: $(OBJS)
+-	$(CC) -o zbuf $(CFLAGS) $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o zbuf $(CFLAGS) $(OBJS) $(LIBS)
+ 	mv zbuf $(BIN)/zbuf
+ 
+ clean:
diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest
index ea16b6ec3a78..ba53c4db917f 100644
--- a/sci-electronics/fritzing/Manifest
+++ b/sci-electronics/fritzing/Manifest
@@ -1,4 +1,6 @@
-DIST fritzing-0.9.2b.tar.gz 10913985 BLAKE2B d25eed63ec1448b158684c27edaac1aebce93b03c5f36b0a8939c2b0f256203ffcb727f809c4ca3facd186f39218055ad404886633a3cf11ba3126e5177cb286 SHA512 a8b6d99c4e08f86d7a7cc6574053e8b1af565a3919cb2fc406e67972052b3fa3ded002be43e4fd0345189e4e1f3cecb3851cd14711efd83ccbcbef4cbd135c58
-DIST fritzing-parts-0.9.2b.tar.gz 15924206 BLAKE2B 48ad614c363c77b309275f3f808f9e4e8f38587cbb00439716102e88267ad33536e06b531304abb26f40932d9fc72a4f2563596b0084c5b1ff082adb72132b07 SHA512 055c866532c4a09a7de3315fffc485c6be5a576e998fca7b001faae513da86d451ca8ed39583108ec54472ab0e1d8b953c192efcf93e5c19139f0fa83484a549
-EBUILD fritzing-0.9.2b-r2.ebuild 2117 BLAKE2B 85a70c64d601ae077371fe984d47a0a494fd708dc67f559139343b3229cf5a346e283aa91d0931612898b077a9744cbfaaf3e0092c08496afef2bb16c52e4d9b SHA512 cd603bfa6ceb8f8ecc704d1ecce1ddf68e7a776987e433294fa66e4b824d58f83f70f34f43fffe13f4e8adb27ec44d56836725b2e412fe1218f4dc109cb9239e
+AUX fritzing-0.9.4-fix-libgit2-version.patch 818 BLAKE2B 559efc56933460e541850e73eec1f872e3c83757e6e5e6edb8a9adf120f9e1988024d32af92d80eeedad9bce9f8f954caa5bd2c08da6c5fb7a3b6fd8a2110c01 SHA512 344597d2a1d95909bffabd852a199219d1112ec020c5f1b4bc7a46c3ed522ce931f5abef54b68dcd53dbbb52eb890262fcd67dea1947b56ef9b9d7eaebedd6e3
+AUX fritzing-0.9.4-move-parts-db-path.patch 2345 BLAKE2B c95d68d115614152817bd3905a2d0b9efdd5a358bfa242455b626d670c2382affe5ef42bcef71446c567dba28be1fed7b66102d6d82db66d86154e8374f3283d SHA512 851f4e049564a488502a93d2730484a258b042147a6645ce40195a31c97cb92b7d79e7c03751cf6337b4d9558c263f5149e7e969ecedd97abcd0e8824adb551b
+DIST fritzing-0.9.4.tar.gz 11430102 BLAKE2B 20232b3c33308edcab188c61597f87d8a21d9b786eeab4e398c1add6e263562d1b0df95634850d5271decfa380d7b2b0c18c7f19f8b8544f330687e4cffa3700 SHA512 b148d8b93d2e452c975ca3acfd2ad5de4259f99da69c5890ebeea30730674526d480ee3830f61f6057e83b7720f07fce80ef3a74d4b718be691a92d656b755e0
+DIST fritzing-parts-0.9.4.tar.gz 17662003 BLAKE2B a67f4f1297793131d25e6b9c853e987fc0c5ecebd5f57b3675b7f9c4539f867ad18fc6e854c7a2bef1669e05dbc13dcc93df9b9befb8991ca64b2bc3e2a71b84 SHA512 f6f6c396eaf0b61dd56ece22f6bb8fce4369503729fd8f5550643e74a60aaad75abce9e391d63d52f12e4f3420296791fdf9832f7c8507dad2cf623e1bd8340f
+EBUILD fritzing-0.9.4.ebuild 2030 BLAKE2B 51b849a1cef54446dda9ff1613a7279b2b1dd9d219a1b338d58156488de139fff7b29e1a91294e79a9c40250cf9fbd69acdf03474644432d096ba56c84be0340 SHA512 bd7761809c7156b87692bfc16639959f3c04c29dc08398293a0f6387b5c588ac32af717316b7e914e8911adb0f0231405e93c837782b996c6e0649e6453b0588
 MISC metadata.xml 253 BLAKE2B a86bd7fc6589eb44b2b6a4e64f250eedc4cb069c0a0b59ca015f85f482e706304ac2ac00632eac9d39f2015a5fa19dc21c758bc69eaa9f736a1cae97c7bb1a09 SHA512 2a945da80f439b52e18112fa5d1dea6a1bb2f7d39d46c7c4ab8a1a7722c954ff3d859bb7d4e12e6f682289c025350a1353af39a12a8bbb8aa2124834cf667028
diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-fix-libgit2-version.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-fix-libgit2-version.patch
new file mode 100644
index 000000000000..47aea61ae76e
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.9.4-fix-libgit2-version.patch
@@ -0,0 +1,19 @@
+commit 472951243d70eeb40a53b1f7e16e6eab0588d079
+Author: PsikoBlock <rramsch@googlemail.com>
+Date:   Fri Apr 10 21:41:52 2020 +0200
+
+    Fix libgit2 version check to allow building with versions >= 1.0
+
+diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp
+index 65daf76e..36300fe0 100644
+--- a/src/version/partschecker.cpp
++++ b/src/version/partschecker.cpp
+@@ -115,7 +115,7 @@ bool PartsChecker::newPartsAvailable(const QString &repoPath, const QString & sh
+ 	/**
+ 	 * Connect to the remote.
+ 	 */
+-#if LIBGIT2_VER_MINOR > 24
++#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24)
+ 	error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
+ #elif LIBGIT2_VER_MINOR == 24
+ 	error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-move-parts-db-path.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-move-parts-db-path.patch
new file mode 100644
index 000000000000..97835d489cc6
--- /dev/null
+++ b/sci-electronics/fritzing/files/fritzing-0.9.4-move-parts-db-path.patch
@@ -0,0 +1,55 @@
+diff --git a/src/fapplication.cpp b/src/fapplication.cpp
+index 72159c99..d6ba26ef 100644
+--- a/src/fapplication.cpp
++++ b/src/fapplication.cpp
+@@ -785,7 +785,7 @@ bool FApplication::loadReferenceModel(const QString & databaseName, bool fullLoa
+ bool FApplication::loadReferenceModel(const QString &  databaseName, bool fullLoad, ReferenceModel * referenceModel)
+ {
+ 	QDir dir = FolderUtils::getAppPartsSubFolder("");
+-	QString dbPath = dir.absoluteFilePath("parts.db");
++	QString dbPath = FolderUtils::getTopLevelDocumentsPath() + "/parts.db";
+ 
+ 	QFileInfo info(dbPath);
+ 	bool dbExists = (info.size() > 0) && !fullLoad;
+@@ -798,7 +798,11 @@ bool FApplication::loadReferenceModel(const QString &  databaseName, bool fullLo
+ 		sha = PartsChecker::getSha(dir.absolutePath());
+ 		if (sha.isEmpty()) {
+ 			DebugDialog::debug(QString("1.6 SHA empty"));
++#ifdef PARTS_COMMIT
++			sha = PARTS_COMMIT;
++#else
+ 			return false;
++#endif
+ 		}
+ 		referenceModel->setSha(sha);
+ 	}
+@@ -2042,7 +2046,7 @@ void FApplication::regeneratePartsDatabase() {
+ void FApplication::regeneratePartsDatabaseAux(QDialog * progressDialog) {
+ 	ReferenceModel * referenceModel = new CurrentReferenceModel();
+ 	QDir dir = FolderUtils::getAppPartsSubFolder("");
+-	QString dbPath = dir.absoluteFilePath("parts.db");
++	QString dbPath = FolderUtils::getTopLevelDocumentsPath() + "/parts.db";
+ 	RegenerateDatabaseThread *thread = new RegenerateDatabaseThread(dbPath, progressDialog, referenceModel);
+ 	connect(thread, SIGNAL(finished()), this, SLOT(regenerateDatabaseFinished()));
+ 	FMessageBox::BlockMessages = true;
+diff --git a/src/version/updatedialog.cpp b/src/version/updatedialog.cpp
+index 58c71da8..c481cdec 100644
+--- a/src/version/updatedialog.cpp
++++ b/src/version/updatedialog.cpp
+@@ -28,6 +28,7 @@ along with Fritzing.  If not, see <http://www.gnu.org/licenses/>.
+ #include "versionchecker.h"
+ #include "modfiledialog.h"
+ #include "../debugdialog.h"
++#include "../utils/folderutils.h"
+ 
+ #include <QVBoxLayout>
+ #include <QPushButton>
+@@ -183,7 +184,7 @@ void UpdateDialog::releasesAvailableSlot() {
+ 		permissionTest.close();
+ 		permissionTest.remove();
+ 		if (count > 0) {
+-			QFile db(repoDir.absoluteFilePath("parts.db"));
++			QFile db(FolderUtils::getTopLevelDocumentsPath() + "/parts.db");
+ 			if (db.open(QFile::Append)) {
+ 				canWrite = true;
+ 				db.close();
diff --git a/sci-electronics/fritzing/fritzing-0.9.2b-r2.ebuild b/sci-electronics/fritzing/fritzing-0.9.2b-r2.ebuild
deleted file mode 100644
index 29db4abc920a..000000000000
--- a/sci-electronics/fritzing/fritzing-0.9.2b-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PARTS_P="${PN}-parts-${PV}"
-
-inherit qmake-utils
-
-DESCRIPTION="Electronic Design Automation"
-HOMEPAGE="https://fritzing.org/"
-SRC_URI="https://github.com/fritzing/fritzing-app/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/fritzing/fritzing-parts/archive/${PV}.tar.gz -> ${PARTS_P}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/quazip-0.7.2[qt5(+)]"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.40"
-
-S="${WORKDIR}/${PN}-app-${PV}"
-
-DOCS="readme.md"
-
-src_prepare() {
-	local lang translations=
-
-	# fix build with newer quazip - bug #597988
-	sed -i -e "s/#include <quazip/&5/" src/utils/folderutils.cpp || die
-	sed -i -e "s|/usr/include/quazip|&5|" -e "s/-lquazip/&5/" phoenix.pro || die
-
-	# Get a rid of the bundled libs
-	# Bug 412555 and
-	# https://code.google.com/p/fritzing/issues/detail?id=1898
-	rm -rf src/lib/quazip/ pri/quazip.pri src/lib/boost* || die
-
-	# Fritzing doesn't need zlib
-	sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die
-
-	# Somewhat evil but IMHO the best solution
-	for lang in $L10N; do
-		lang=${lang/linguas_}
-		[[ -f "translations/${PN}_${lang}.qm" ]] && translations+=" translations/${PN}_${lang}.qm"
-	done
-	if [[ -n "${translations}" ]]; then
-		sed -i -e "s:\(translations.extra =\) .*:\1	cp -p ${translations} \$(INSTALL_ROOT)\$\$PKGDATADIR/translations\r:" phoenix.pro || die
-	else
-		sed -i -e "s:translations.extra = .*:\r:" phoenix.pro || die
-	fi
-
-	# Fix missing Intel bin icon
-	# https://github.com/fritzing/fritzing-parts/commit/716560e9
-	sed -i -e 's:Intel.png:intel.png:' bins/more/intel.fzb || die
-
-	default
-}
-
-src_configure() {
-	eqmake5 DEFINES=QUAZIP_INSTALLED phoenix.pro
-}
-
-src_install() {
-	INSTALL_ROOT="${D}" default
-
-	insinto /usr/share/fritzing/parts
-	doins -r "${WORKDIR}/${PARTS_P}"/*
-}
diff --git a/sci-electronics/fritzing/fritzing-0.9.4.ebuild b/sci-electronics/fritzing/fritzing-0.9.4.ebuild
new file mode 100644
index 000000000000..4d76ed86245b
--- /dev/null
+++ b/sci-electronics/fritzing/fritzing-0.9.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+MY_PV="CD-498"
+PARTS_P="${PN}-parts-${PV}"
+PARTS_COMMIT="e79a69765026f3fda8aab1b3e7a4952c28047a62"
+
+DESCRIPTION="Electronic Design Automation"
+HOMEPAGE="https://fritzing.org/
+	https://github.com/fritzing/fritzing-app/"
+SRC_URI="https://github.com/fritzing/fritzing-app/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtserialport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-libs/quazip
+	dev-libs/libgit2:=
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+
+S="${WORKDIR}/${PN}-app-${MY_PV}"
+
+DOCS=( "README.md" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-libgit2-version.patch"
+	"${FILESDIR}/${P}-move-parts-db-path.patch"
+)
+
+src_prepare() {
+	# fix build with newer quazip - bug #597988
+	sed -i -e "s/#include <quazip/&5/" src/utils/folderutils.cpp || die
+	sed -i -e "s|/usr/include/quazip|&5|" -e "s/-lquazip/&5/" phoenix.pro || die
+
+	# Get a rid of the bundled libs
+	# Bug 412555 and
+	# https://code.google.com/p/fritzing/issues/detail?id=1898
+	rm -r src/lib/quazip/ pri/quazip.pri || die
+
+	# Fritzing doesn't need zlib
+	sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || die
+
+	# Use system libgit
+	sed -i -e 's:LIBGIT_STATIC.*:LIBGIT_STATIC = false:' phoenix.pro || die
+
+	# Add correct git version
+	sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${MY_PV}:" pri/gitversion.pri || die
+
+	default
+}
+
+src_configure() {
+	eqmake5 'DEFINES=QUAZIP_INSTALLED PARTS_COMMIT=\\\"'"${PARTS_COMMIT}"'\\\"' phoenix.pro
+}
+
+src_install() {
+	PARTS_DIR="${WORKDIR}/fritzing-parts-${PARTS_COMMIT}"
+	INSTALL_ROOT="${D}" default
+	insinto /usr/share/fritzing/fritzing-parts
+	doins -r ${PARTS_DIR}/*
+}
diff --git a/sci-electronics/gnetman/Manifest b/sci-electronics/gnetman/Manifest
index d6df5b64262c..d8bf4eb2e586 100644
--- a/sci-electronics/gnetman/Manifest
+++ b/sci-electronics/gnetman/Manifest
@@ -1,4 +1,6 @@
-AUX gnetman-0.0.1_pre20110124-tcl86.patch 791 BLAKE2B 4d30b2c3991b2f7de62001e90f34bc21d9f705fcdc252b5d0227a699b8cc677c23e3a76a9b614a2daf94e8ba5694f002a4c852dea4013b34a464a5cdaeda9c84 SHA512 42e036a4bbcd3520435d741036f88a775a0fd69ef2af889d529d7b240eb2ac0580b97ec0c41c929122debcb09e16645ac098659cb16b8aed06f87faf1b2b26f2
+AUX gnetman-0.0.1_pre20110124-build-system.patch 726 BLAKE2B 73df2ebce255563d9129ff1a6400092efa58864d35fcb4047329d355a4e694abdbf93848f7d747f443da29bf5fc4e4c7939594b4b1d148e2a32dc2886c93a8bb SHA512 c005f60153399938ce834bfecc74ef1f2f4223e8d2cc84676ded13821767b7dd9a6fb7f4738b52768396d4d9f6f770361f4f3670d9e2007c93fae9e18b81d401
+AUX gnetman-0.0.1_pre20110124-fno-common.patch 912 BLAKE2B e3d10e0424da39441199f4ab0eeb36eeb71961fbd6863e62983f75a9979ee75f164dfc794d72d55c9cee0bcb6e6f20aaa4299e87fcabdd8bc18afb79b25869ed SHA512 89558b0ddadc74ef4bcd8f9a86424d71ebe66286876d0a290e3f6849b3054b2bbbf2ecbe6b0ae1a167cd7c5fba26ae698824054c5c697527ec4f077aecd0bf2e
+AUX gnetman-0.0.1_pre20110124-tcl86.patch 666 BLAKE2B ef42aa52662c65def93717dec3872f6dedae59c70a3d5aed7b845c0daedfd506d2dc63809ac45c1f1a55a15aea41c3ca0ed845c3800d7d1a0d9cd8decbe921c9 SHA512 812f9b14c9aa732cf8f83ffd8a457aeae4f7c3e0301459b7498eaaf7485dc8c1781cfe0ee762ed189b62c3a5360eff5f4a487893018255278e5a7715390dff8e
 DIST gnetman-0.0.1_pre20110124.tar.gz 500308 BLAKE2B 6d5684611e047b70ffacf27ffc55f1f3d6a4064eca4fccf35f2a6d30296b611bed41d524178ed93d5e816b164ceb5b6fcd9c1768f792c64cf62778528ce6fd8a SHA512 d872bf3d4967c201a16e6b625a2003771bb7b33e8af3127a06f445429f575d32451e4ce3cc0f34389cc047b2d0cf2e3ef8afff63b1bf362184e2a5859bbb09f2
-EBUILD gnetman-0.0.1_pre20110124.ebuild 1095 BLAKE2B cbaea0e55f8c3c66abfcbd6b008fb362ad540b266f18f1d0be41b0b0a688ef59321f4b5952a2abcaeed94df25adadea29f08a68ad04de2887b69a3820a1edb13 SHA512 5671c0435662a8b13f951fda9068b20da4c2457d77ca236543cd626c7b095da17696c55491606764e0d5093e546bf14c71a1f9c09c120f4b49595321b3fb0c42
+EBUILD gnetman-0.0.1_pre20110124.ebuild 1060 BLAKE2B 67279ee1c3603d07236b9d849cf9b9c6a19db9bc2f98529f0bad6d23f0f5088503a4941e8405137005db638de45e1b55356eed847e47a9e08ecd044e96a53d73 SHA512 df0ad2e91809ce882f008496603eae01742c6628d84a935b55f1d92e42de504f67e752e5ebfdbd8c5ce0a48cfea0814d2d8e2d7bceb531ce0481aaa07ed27c99
 MISC metadata.xml 661 BLAKE2B 354e2807b50d8ede128a79425ae1f408451f1a8fb8aec2b00c61f3a174c71a037971bd37811de837df8b1681201f63ca2175a145274fcbb4c1b1f736855b0728 SHA512 e63b17d3501a7b0c61ddd6ae8b8e442cad7a70ed5e18312a2437071d458c7fecdc5ce9f5b3d82dcc7c68bf7c3f05ca800da606f95bc2180a825b0e4612a7e3fc
diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-build-system.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-build-system.patch
new file mode 100644
index 000000000000..2801fb592818
--- /dev/null
+++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-build-system.patch
@@ -0,0 +1,22 @@
+--- a/src/batch/configure
++++ b/src/batch/configure
+@@ -72,8 +72,8 @@
+ flex -f -Pvr -o../verilog/vrscan.c ../verilog/vrscan.l
+ swig -tcl8 ../tcl/tclfunc.i
+ 
+-CFLAGS="-g -Wall -W -Wno-unused-parameter -Wno-unused-function -DDD_DEBUG -I../include -I../spice -I/usr/include/tcl8.4"
+-LIBS="-lpopt -ltcl8.4 -lddutil-dbg"
++CFLAGS="${CFLAGS} -W -Wno-unused-parameter -Wno-unused-function -I../include -I../spice"
++LIBS="-lpopt -ltcl -lddutil"
+ 
+ echo "CC=$CC
+ CFLAGS=$CFLAGS
+@@ -91,7 +91,7 @@
+ TARGET='../../bin/gnetman'
+ 
+ $(TARGET): $(OBJECTS)
+-	$(CC) $(CFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)
+ 
+ clean:
+ 	rm -f $(OBJECTS) ../*/*database.[ch] ../*/*scan.c ../*/*parse.c
diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-fno-common.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-fno-common.patch
new file mode 100644
index 000000000000..3e247282b403
--- /dev/null
+++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-fno-common.patch
@@ -0,0 +1,30 @@
+--- a/src/sch/schwrite.c
++++ b/src/sch/schwrite.c
+@@ -21,7 +21,7 @@
+ --------------------------------------------------------------------------------------------------*/
+ #include "sch.h"
+ 
+-FILE *schFile;
++extern FILE *schFile;
+ 
+ /*--------------------------------------------------------------------------------------------------
+   Write to schFile.
+--- a/src/spice/cir.h
++++ b/src/spice/cir.h
+@@ -36,5 +36,5 @@
+ extern void cirwarn(char *message, ...);
+ 
+ /* Attribute symbols */
+-utSym cirGraphicalSym, cirNetSym, cirSpiceTypeSym, cirSpiceTextSym;
++extern utSym cirGraphicalSym, cirNetSym, cirSpiceTypeSym, cirSpiceTextSym;
+ 
+--- a/src/spice/cirwrite.c
++++ b/src/spice/cirwrite.c
+@@ -29,6 +29,7 @@
+ FILE *cirFile;
+ uint32 cirLineNum;
+ cirRoot cirTheRoot;
++utSym cirGraphicalSym, cirNetSym, cirSpiceTypeSym, cirSpiceTextSym;
+ 
+ static char *cirLine;
+ static uint32 cirLinePos, cirLineSize, cirLastBreakPos;
diff --git a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch
index fdb6573990f4..62f61cc5a4b1 100644
--- a/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch
+++ b/sci-electronics/gnetman/files/gnetman-0.0.1_pre20110124-tcl86.patch
@@ -1,5 +1,5 @@
---- gnetman-0.0.1_pre20110124_orig/src/tcl/tclwrap.c	2012-05-25 07:44:51.000000000 +0200
-+++ gnetman-0.0.1_pre20110124/src/tcl/tclwrap.c	2013-02-24 12:58:51.000000000 +0100
+--- a/src/tcl/tclwrap.c
++++ b/src/tcl/tclwrap.c
 @@ -46,7 +46,7 @@
     result = Tcl_EvalFile(interp, (char *)fileName) == TCL_OK;
     if (!result) {
diff --git a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild
index 6594de4d08d3..a8d0ede5ad50 100644
--- a/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild
+++ b/sci-electronics/gnetman/gnetman-0.0.1_pre20110124.ebuild
@@ -1,38 +1,44 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A GNU Netlist Manipulation Library"
 HOMEPAGE="https://sourceforge.net/projects/gnetman/"
 #snapshot from http://gnetman.git.sourceforge.net/git/gitweb.cgi?p=gnetman/gnetman;
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE="doc examples"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
 
-S=${WORKDIR}/${P}/src/batch
-
-RDEPEND=">=dev-lang/tcl-8.6:0
+RDEPEND="
+	>=dev-lang/tcl-8.6:0
 	sci-electronics/geda"
 DEPEND="${RDEPEND}
 	dev-db/datadraw"
 
-src_prepare() {
-	sed -e "/^CFLAGS=/s:-g -Wall:${CFLAGS}:" \
-	    -e "/^CFLAGS=/s:-I/usr/include/tcl8.4::" \
-		-e "/^LIBS=/s:-ltcl8.4:-ltcl:" \
-		-e '/^$(TARGET):/,+3s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-i configure || die
-	tc-export CC
+S="${WORKDIR}/${P}/src/batch"
+PATCHES=(
+	# fix build issues with tcl-8.6, #452034
+	"${FILESDIR}"/${P}-tcl86.patch
+	# fix build system, #711354
+	"${FILESDIR}"/${P}-build-system.patch
+	# fix -fno-common, #707894
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
 	cd ../.. || die
-	# fix build issues with tcl-8.6, #452034
-	epatch "${FILESDIR}/${P}-tcl86.patch"
+	default
+}
+
+src_configure() {
+	tc-export CC
+	default
 }
 
 src_install() {
diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index 8facbb067f95..f17403795cd0 100644
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -1,9 +1,3 @@
-DIST gtkwave-3.3.68.tar.gz 4097204 BLAKE2B acaad5e161c7aeaf84eccb81fd2bad75e2a067224ac436df34b4b4cb9c73bb8b9da019e1adb0e3016d247828d451004eb38f10c101d96e34b3277426e4000393 SHA512 bcdd6f7de6454aefec65a0056a4a6a9994566b19ba0dc13f49f38d7d2bc601421d68aa04ebcd285fcb446f6d4a0a55a169db366c0d9387a809a59d61c8c76cac
-DIST gtkwave-3.3.73.tar.gz 4122802 BLAKE2B 32fcf6e03e0a2d55c952df5d6188bc48c52789fbc605388c63932b5ee507470d7d8ed5f2a0f572b793fa8d3807160aa6c383142e66cbde67b04ffb5c9de6d6ea SHA512 a8a3bf3ba8964c0a42f01f38235762da51d62f5fd602e0a81a2d7c36f9562409e0ccaf9aeaf73c6eb853d979ca2c93008837c395f2312d6e7996135518938eff
-DIST gtkwave-3.3.87.tar.gz 4176746 BLAKE2B 96b43f40e965d54f973dd38a89caf84671fdb5ba03f72e6b3b6d4829926f29789b63069ab537f1627acea8602e716bbfc66585d5f4beb4da53f85c1ef7892a37 SHA512 eed3c93e0f8acb9b075c90ab59e5f2dff3c29d9602a4bac7b6c0adca1bf4778468964532606227719bde1c498fc1f5655553ea9fccbf7d37fbec1671c371b7dd
-DIST gtkwave-3.3.99.tar.gz 3505354 BLAKE2B 1a768aca209ccd3049f40accec3c2dc0f5c1e7b05abb3300dd249345a70da4a72a20e9b5e1e22fdddc1e7e9b7586473aa590ccfa01947494b9040abe228d9e66 SHA512 b4525200a201b409fa8a4758f775671b458e8caf5b9c86b6052158ff24aa1e6620b74b663f755dcec71fd28612949a3a0e9ab700cd4559b962580bc130b8fa3c
-EBUILD gtkwave-3.3.68.ebuild 1555 BLAKE2B 00f56f3f72f125ca6476479e250d9620bcc8a7f2c3a773c8bbce015012ded5b337e254b52d3d96299846a0fbf8a8d365ddd1d0d98304ab16f4d428ee50255cf1 SHA512 4e42dc545a5aa5927b376291472ccd081ac6f62d6d862a97d42bc45064ae9c5e5713c7d74010612e4342a8f56e086fa8e95d4bc5f8d5d7b17f349c1644abb90b
-EBUILD gtkwave-3.3.73.ebuild 1558 BLAKE2B d335c475afee2e538eac2acb90bd8a1a1448a486fcc17f22bbaa620e2160f5291801d6794c58410153f4c152a85ac7f9bea38714ef090e8a9b590c51df8c0df4 SHA512 753da8ef404f389d68195a71498a6d18b25b1a3283a70a4677054394e0572b2cc0bf5b961037e8d02ca7bf4f68e5ffa8089574a12caba3982c46f1537d3c5b93
-EBUILD gtkwave-3.3.87.ebuild 1615 BLAKE2B ac2660fdf5748403ffbf609dc77320d759e371a31354584902ae46d11736051fbeccb3d4a973c58c3447ce70cf4e600883ac8aa97ab335e5eaf575698bc3ca25 SHA512 e5333b70ab78c144fc28908a09e89540aca9e5e0294a1e7d9ffd8eeb62e029c9ee1496d150791dc86165becfe313558c36ebee7db33813997db88e8fa600055d
-EBUILD gtkwave-3.3.99.ebuild 1594 BLAKE2B da99069bbec1a692fce57cc422424fcb70da04989c7a183b280718b78756a6cd1173bd8ecfa8b1cf6cbbbef5b782b15ea48499b9c1a91835aa40be7a88c59ffe SHA512 15fdd9483d7eb86ca462836dd44148acbbcecc11487015e1d5c69378920aea829049e51254c3b4edd952730f091cf82d93bfac3d8b9985deed43451f7d125547
+DIST gtkwave-3.3.106.tar.gz 3507185 BLAKE2B 89389c6eef2fb80b82b048fc94248cf6b30ec0d8fea1260189f2ea1f143123e0294d00f93a0c25f777b6e2c188041af16f4e26e5206e0c65fe23c1f058b19186 SHA512 4deec8dc88210ae542b8066763265450530756d34babf10c7820fe27b23d01e6d2f084ec74b7b0730a645fcb667ba3c0d2dcfb4111e702a523805041dc96768a
+EBUILD gtkwave-3.3.106.ebuild 1342 BLAKE2B 4d618ec344538c9c23425d4ff7c40143253c8707d036ca57450b9ca88f842e8494e5a63e184803e830d89d906d9cd6222f37002c82616576cf1c6adebd453efd SHA512 088a8d99da9cbc18226adccdc1eb1a1e43c32cf7cd00652dd4e416150f3970bdbcdab4b1df8169746189f753b884d062da97a895f5776df7a3404597e9c84953
 MISC metadata.xml 912 BLAKE2B 54c24ca793a80275df4c91427ebb587e721d43ffe983403e8f3d5a0601b293e7f862fe7b6102a27b0a8e40ab916b8b268aa6759e82ef3efa8e058bad1371cca1 SHA512 4b988f4fc2491aa8273a50844dc8bb292521b2a3eaf7ef6b917e21f453761369eb78d57363fdd04aea0cea63af8774bb6b572d145a21292956ca9f43eca6a6b9
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.73.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild
index 2f498f210aa4..0b3043548834 100644
--- a/sci-electronics/gtkwave/gtkwave-3.3.73.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.106.ebuild
@@ -1,40 +1,42 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils fdo-mime toolchain-funcs
+inherit toolchain-funcs xdg
 
 DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
 HOMEPAGE="http://gtkwave.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
 LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fasttree fatlines judy lzma packed tcl"
 
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/zlib
 	x11-libs/gtk+:2
 	x11-libs/pango
-	sys-libs/zlib
 	judy? ( dev-libs/judy )
 	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
 	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gperf
+	virtual/pkgconfig"
 
 src_prepare() {
+	default
+
 	# do not install doc and examples by default
 	sed -i -e 's/doc examples//' Makefile.in || die
 }
 
 src_configure() {
-	econf --disable-local-libz \
+	econf \
+		--disable-local-libz \
 		--disable-local-libbz2 \
 		--disable-mime-update \
 		--enable-largefile \
@@ -47,28 +49,16 @@ src_configure() {
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
+	default
 
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	use doc && dodoc doc/${PN}.odt
+	if use examples; then
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 }
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
deleted file mode 100644
index ee4ce58a03b6..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare() {
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-}
-
-src_configure() {
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.87.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.87.ebuild
deleted file mode 100644
index 80fab4ec0adf..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.3.87.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare() {
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.99.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.99.ebuild
deleted file mode 100644
index 257b3daf3419..000000000000
--- a/sci-electronics/gtkwave/gtkwave-3.3.99.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare() {
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	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/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index 6999189bf3be..4b6dfab99fb8 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -2,8 +2,8 @@ AUX iverilog-10.3-file-missing.patch 8849 BLAKE2B 2cb72c6d2b769ae0ac601f950b62dd
 AUX iverilog-10.3-fno-common.patch 777 BLAKE2B 99ce15739f0d86dd838e652542152cc7b2301a3dee605b7aff299ef3588576b21ed21ae19468a3dcca200cee4b6cd3271125837d75e83dbed770d07cd2eeb83a SHA512 2e10fbb03649da90e97977b18922fb74527d0256fdd6b819ba69cafe64c3a38f09cf47619448fd34a47a2ebf72af406c18d276885189f2381157ba99c1994319
 AUX iverilog-10.3-gen-bison-header.patch 3125 BLAKE2B 75bd40007237491571e0bbac19cd9d007db5b18b491882f52ca9889ead097189371906a62cebae2176ea822572984f58c97ac6abbef7ee89f2397a06a4580c1f SHA512 ebc835c28456498787a82ff446c606a6713343e4421465a17afeb1266b1dc445c760707059b217ee9efc7e79d00a119fb2173c1adbf3270cdd0ed720e3436d17
 DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d
-EBUILD iverilog-10.3-r1.ebuild 1869 BLAKE2B bda326a2afc4ba27c3fb0331033e3f229f323bb0ae7c73f47c9c00363b18c4c16a9ea942d5c7879c8e22f6bd9b86dc7c37370d384ab31d21168d2128cde37caa SHA512 83a96e9ba2ea8cedb81d0cc2f62226afeacfa6c5104213ac040299161500955212b8f6c70f8d991eb478cdfc62779b3bf264704ab68bd26cbc735b7c35e27c13
-EBUILD iverilog-10.3-r2.ebuild 1787 BLAKE2B 1691ece5e455e1dfd053bb40318b8e6582f995e58c8a7b116fd37c6401bd5a0959c4190560b202bca722c89913b460ea1f0690b504646d249488ce2186aa3302 SHA512 970eb1c579e34da062bff435d426973a746ebc2e4e2f5b7ee9b2fb76a9d573d45ba2185f97b54d1ebf35c72b953bd7a7434a1a35af2a58e17dcc238c8445f9bb
-EBUILD iverilog-10.3.ebuild 1865 BLAKE2B f3d3828e9d6d5afd7457dbe620450713e7e8e32ed18ee41f36d07eb474bfd979dd5c27b71fdd3a9847cdcec03229586bfd14c170354905573293137ede1853f8 SHA512 4d6d589df25c6f1139f0f24d3d3074c9b7251972d38828d97989806d6f80784049b0b84eaa93f92f24ba3d60499fd612ba32d6443967a7154a197e4a933f3c2d
-EBUILD iverilog-9999.ebuild 1663 BLAKE2B 639e6e07077819b2f5520f506797c0b43c4bac854221a07b5449869b02a057923d87e6456e6da78059f4c7f76913890ebf5fc69e230dead65fab966686936ac3 SHA512 768983e921a914592b911e034d6c4e4f32a7cab80f00a2ae26041f6eb23a02a177cac4c6e75c75dc3ea1fbee0c9a9d97309afaecb8715ce56f7100a02c09c4f3
+DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721fc62c24f0fb23d220458819cb3b8ea8494410ce956e68831b682b61f27f64e94e9c166a69e5f6d5d30a8269a11 SHA512 5d6a65e1c3b6b62e99af708cd5a259cc69c6b789dd6eff69e225903d9b8c115d9e5d6f7635b30c6558197cd0ee6fd8196a163fbd98956e24c211d97328b85056
+EBUILD iverilog-10.3-r2.ebuild 1785 BLAKE2B 058c19a7d97a4dd06ddae74f5f52d8455b967ca62897ce1306174de02068e20dae8b9fa886d6d9931c448fe38e4e9530d1aac761b1a656403084f0755106025f SHA512 89c9086635765151fbf23c2d1c11c5daca8100d9fef52db681f4124aca10f51cdd8a94885479f98dc541bea583357744952d8ee859c103fcbba48b517acb4442
+EBUILD iverilog-11.0.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
+EBUILD iverilog-9999.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941
 MISC metadata.xml 904 BLAKE2B 92e78cfceee82ffb4feaee92810d496bf78c3321a81c97fbcc0038244e2ea58e87fec57254ebd90852a4d308bd08d944659ce59b339b2762ba26843c8ad59cb3 SHA512 8c3633d7bea101dc771c26355b40d309eb5b0b3ea7bbf3538faaa9c7098253eb623aac3f9e312aed25a9262116d013784adf02d9f2a3943a5fbec3733dab250f
diff --git a/sci-electronics/iverilog/iverilog-10.3-r2.ebuild b/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
index 5d2c037dbaa9..be0e76900950 100644
--- a/sci-electronics/iverilog/iverilog-10.3-r2.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3-r2.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/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
deleted file mode 100644
index a2dea488d4fd..000000000000
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-GITHUB_PV=$(ver_rs 1- '_')
-
-DESCRIPTION="A Verilog simulation and synthesis tool"
-HOMEPAGE="
-	http://iverilog.icarus.com
-	https://github.com/steveicarus/iverilog
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	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"
-	S="${WORKDIR}/${PN}-${GITHUB_PV}"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="examples"
-
-# If you are building from git, you will also need gperf to generate
-# the configure scripts.
-RDEPEND="
-	sys-libs/readline:0
-	sys-libs/zlib
-"
-
-DEPEND="
-	dev-util/gperf
-	sys-devel/bison
-	sys-devel/flex
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
-	"${FILESDIR}"/${PN}-10.3-fno-common.patch #706366
-)
-
-src_prepare() {
-	default
-
-	# From upstreams autoconf.sh, to make it utilize the autotools eclass
-	# Here translate the autoconf.sh, equivalent to the following code
-	# > sh autoconf.sh
-
-	# Autoconf in root ...
-	eautoconf --force
-	# Precompiling lexor_keyword.gperf
-	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
-	# Precompiling vhdlpp/lexor_keyword.gperf
-	cd vhdlpp || die
-	gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
-}
-
-src_install() {
-	local DOCS=( *.txt )
-	# Default build fails with parallel jobs,
-	# https://github.com/steveicarus/iverilog/pull/294
-	emake installdirs DESTDIR="${D}"
-	default
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-electronics/iverilog/iverilog-10.3-r1.ebuild b/sci-electronics/iverilog/iverilog-11.0.ebuild
index 8a107b99189d..de6fe18b47c9 100644
--- a/sci-electronics/iverilog/iverilog-10.3-r1.ebuild
+++ b/sci-electronics/iverilog/iverilog-11.0.ebuild
@@ -24,27 +24,18 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="examples"
 
-# If you are building from git, you will also need gperf to generate
-# the configure scripts.
-RDEPEND="
+DEPEND="
 	sys-libs/readline:=
 	sys-libs/zlib
 "
-
-DEPEND="
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-util/gperf
 	sys-devel/bison
 	sys-devel/flex
-	${RDEPEND}
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3-file-missing.patch #705412
-	"${FILESDIR}"/${PN}-10.3-fno-common.patch #706366
-)
-
 src_prepare() {
 	default
 
@@ -53,7 +44,8 @@ src_prepare() {
 	# > sh autoconf.sh
 
 	# Autoconf in root ...
-	eautoconf --force
+	eautoconf
+
 	# Precompiling lexor_keyword.gperf
 	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
 	# Precompiling vhdlpp/lexor_keyword.gperf
@@ -63,13 +55,9 @@ src_prepare() {
 
 src_install() {
 	local DOCS=( *.txt )
-	# Default build fails with parallel jobs,
-	# https://github.com/steveicarus/iverilog/pull/294
-	emake installdirs DESTDIR="${D}"
+
 	default
 
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/sci-electronics/iverilog/iverilog-9999.ebuild b/sci-electronics/iverilog/iverilog-9999.ebuild
index eb85629d9e8e..de6fe18b47c9 100644
--- a/sci-electronics/iverilog/iverilog-9999.ebuild
+++ b/sci-electronics/iverilog/iverilog-9999.ebuild
@@ -24,14 +24,14 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="examples"
 
 DEPEND="
 	sys-libs/readline:=
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}"
-BDEPEND="dev-util/gperf
+BDEPEND="
+	dev-util/gperf
 	sys-devel/bison
 	sys-devel/flex
 "
@@ -44,7 +44,8 @@ src_prepare() {
 	# > sh autoconf.sh
 
 	# Autoconf in root ...
-	eautoconf --force
+	eautoconf
+
 	# Precompiling lexor_keyword.gperf
 	gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die
 	# Precompiling vhdlpp/lexor_keyword.gperf
@@ -54,13 +55,9 @@ src_prepare() {
 
 src_install() {
 	local DOCS=( *.txt )
-	# Default build fails with parallel jobs,
-	# https://github.com/steveicarus/iverilog/pull/294
-	emake installdirs DESTDIR="${D}"
+
 	default
 
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index d3b792cbdfe4..b8b28ec7692f 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,5 +1,7 @@
-DIST kicad-footprints-5.1.5.tar.gz 5757316 BLAKE2B 1ae141bd01e3581314bdd5f5b79cc919f68cfc48427cd2b08d2910bdd915866ab3cdb542be860f5e10f01825f094fb81a0704e018f53d80a50950b8b150a5ab9 SHA512 dbfb482d41d1c109e1fb395d194f700e45f1c268a33645b71cd9d98ada32369fe01dd6bf10c7f767c65b9b4e0efa6fc1bde1e4c91b9f4b751540fe3b511ba5b4
 DIST kicad-footprints-5.1.6.tar.gz 6015680 BLAKE2B f0b5cfed0c6310867ace49c87e8c43340995b0fefca4bd528031743d19e77ce5624e3b14580e586bb529359a96b0c89fa1036c89a53c4ed2d5b88e3d49d423af SHA512 da0fa31b56da1210f9bbdd0719ba7b9fe642170a8093dc3411ee3bed1f24ebcc2a14e7aee314a7dcbb80c453ea72a44f7acb34e44814d0d52aeb78eeb1227ec6
-EBUILD kicad-footprints-5.1.5.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
+DIST kicad-footprints-5.1.7.tar.gz 6035007 BLAKE2B 9a2d72f1dc4eeef267055da091f531b6e45d8b469736551a9576ec5ed2b081068975b543c09955f2704946f26efd5c330c2b3a33fdedb6cae42cac8daddeebd4 SHA512 c21bb6e65b1e5d332d75bf2bcdf34da03a4f5301a1d8458da3780dc52099f536579a99a139925de33b2c57983043305dabbb80be3bef207461dbc42458281252
+DIST kicad-footprints-5.1.8.tar.bz2 3387152 BLAKE2B 38d4423eaa88d027114d2897a930ccc50091155109b8afdc4413d9b84f50fe261501dc55c84a6bd50d9723a66105f968ee6f5d713dda516ec3da335fee07ad9e SHA512 07a15d8906669816ad9aff82711d7f0401ad02965ee50e4cdf42eb0244daadea943144b7619c1db3c8656007645cb8db9fc3d971acfaea85aa5eb77fe1b537cb
 EBUILD kicad-footprints-5.1.6.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
+EBUILD kicad-footprints-5.1.7.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
+EBUILD kicad-footprints-5.1.8.ebuild 428 BLAKE2B eee43802fc531d1b0c91f56981c08f47c02676d3a955f609034c100577e313bffe86d000e85a573ab2bbf1ed8b03252be32cec5d22680deea095e82a12c665cc SHA512 7bf40ac39263d9d9c5a2a524027899305594701cd752add4319063aa6bd3eece6d9d5e087c3a4b5e0601d1ae04fa94b510fcdaf364295722f78dacf189516ebb
 MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.5.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild
index 268f2b9a6d51..268f2b9a6d51 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.5.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.8.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.8.ebuild
new file mode 100644
index 000000000000..f8f652eff266
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://kicad.github.io/footprints/"
+SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index 74a01fd5fca3..c4d5ea1cd2f8 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,5 +1,7 @@
-DIST kicad-i18n-5.1.5.tar.gz 4330450 BLAKE2B c111073e97dd35d7545acbaf055918c21375bb4fef3fc9cbc81470d990e8103f0fbd7daf8117531353171239d6bbcffe195fb5933794c13c3978a9cdcf94bda8 SHA512 68e6602fcc7e73c22a594b45ecf53a956af8a134e28e86242bfaa4087df21c04b24ae4df9928f00c2cee7eb0631a02a4de1cd09547b36a466fb324f983ea5363
 DIST kicad-i18n-5.1.6.tar.bz2 2929902 BLAKE2B 6ede4e7cf7972d054e9f69bf5a35bad5b48a1b6368ac5efd78ba8e54dd82edf1da4c3bca93b0d9aa083bbd1740e8e952eae044f802579d8942301b49ebeeaeb1 SHA512 58b213845de9359124e98df1e6bed4df3184da2fe075a1751fe4c9861084748853fd258ecf2d99849ca07a3c84d99657158d9168caf6ac5eaa9884b10dd9ca91
-EBUILD kicad-i18n-5.1.5.ebuild 458 BLAKE2B c2002925255d7655c9f94fe02211f946f6327fe6e00144b3a4ef6d307a4609c102f2ca33ae13a76b12934215c98c618016460829d5fd793ecdb07e6868b81dc0 SHA512 c355e7a288bfb310cfcf9f6660d02f2956c1d6bdef72e9cd67614d41f05a4be302aabce3203546d8c29e4e883b037280f7151dbee2c112c980177d33edef98ef
+DIST kicad-i18n-5.1.7.tar.bz2 3161083 BLAKE2B be8aca1365b755a2f910ee987c76bb6be8b910b189f9ee53b7cd12dbe4c3139085327eada2833b566f220da2224a1ec9504d83b245e91a0f5589a8161c10abeb SHA512 1877c28bffd0d29a32867fe2aa5eb1e24df4ab4c36c381976d712d2319e4b6049cfb91f26d1158cd2ba08eab63a7da12701532fe6207b8aa9c4470c951788fa0
+DIST kicad-i18n-5.1.8.tar.bz2 2933636 BLAKE2B b3253899ee500045fb050ed7559c8765a853dcb5dba371ac8c4c30b593e16c348bcee6a2ffcfd31eb391fc9b11b99537e91f4f711943acada02b765f94f2525b SHA512 e177dd590e82b8f23be582a682067ff0a5c615387fe9e5caf4b887f9219350c0766196e7e94e42a2bb37a9afc40186b601655cf528e65aaebf33f9659dac5e3c
 EBUILD kicad-i18n-5.1.6.ebuild 461 BLAKE2B 596ffc0b7af633c99fec772aa0cf8371e52eae087d1b0b368fc6cfd1d6404ef4709af60d3b13532cfc0738f0f6458a2560a05494319cfcb1ba3e38e5b1a971db SHA512 8d8d1ce354b40b4955a27d10d4ed94b65640ba38256ff71f5077d082a28ecfc74b29e6c3c23284c2c71dd8e3745899e65413087f5cee407cf3efc9810f6924d8
+EBUILD kicad-i18n-5.1.7.ebuild 461 BLAKE2B 596ffc0b7af633c99fec772aa0cf8371e52eae087d1b0b368fc6cfd1d6404ef4709af60d3b13532cfc0738f0f6458a2560a05494319cfcb1ba3e38e5b1a971db SHA512 8d8d1ce354b40b4955a27d10d4ed94b65640ba38256ff71f5077d082a28ecfc74b29e6c3c23284c2c71dd8e3745899e65413087f5cee407cf3efc9810f6924d8
+EBUILD kicad-i18n-5.1.8.ebuild 453 BLAKE2B 306a5d0daaa3c078053c6681e441d3324c83ead5486f0ce41bd5d2b86378431f9042d85aaa6d71d6c33454326e248307d3a99e101c9ad259033f4884ffba07ae SHA512 5852351bf53a61ff2074a2ce945c83b8cbbe93965d9ccfabd160ae52846cc9bc81cb4ac23293fed932eae4be363cc34e281a9fe0115d55e8d51d1d5cee6e2205
 MISC metadata.xml 448 BLAKE2B ce544749e7aedb4f4643feeaea90298bce866d9750a4d1edaec7f8d9248520266a8534a936ee76da3fb1e4072b08cbcfb487b87defbfc921defe8ae193ca8e57 SHA512 0ea5cc77902187b805ca9894e31efbaaedae623bd4ebdc41944e0e57b399e5f7bc7209067fc126d8b9b65e75a9d6c718d41c8cdfed12775f3bd35c6d8cae6647
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.5.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild
index 9d7d8d1b67a9..4e4b8730b265 100644
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.5.ebuild
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools GUI translations"
-HOMEPAGE="https://github.com/KiCad/kicad-i18n"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://gitlab.com/kicad/code/kicad-i18n"
+SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
@@ -15,4 +15,4 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.0"
+RDEPEND=">=sci-electronics/kicad-5.1.6"
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.8.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.8.ebuild
new file mode 100644
index 000000000000..581556469ff2
--- /dev/null
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools GUI translations"
+HOMEPAGE="https://gitlab.com/kicad/code/kicad-i18n"
+SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND=">=sci-electronics/kicad-5.1.6"
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 3f5f61530358..153e50714ade 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,3 +1,4 @@
-EBUILD kicad-meta-5.1.5.ebuild 617 BLAKE2B 496eeb23de7d970765fe14f42c5ce6316d53ae61e9c922496b984a7dbe6e72e37a513bde03ebb72ef5609f31240f413d1def639762a2798f4f3ccb865c7cdbff SHA512 4dbc7a9a33f909e646d35970034f9aa537eeadbb5255be8fb3b23a849bd0367cfce9ea5e52a1072d34e7649939a93a768754b044fdf6a81d1232fa9d914357c1
 EBUILD kicad-meta-5.1.6.ebuild 617 BLAKE2B 7cba176e653fcbfe26ba8af93d7337e0e64280c349b550d819dd188051588deb286f57bd6c66e9260b727c28b984272b78beb13f3afb24f6310c02b2162ccc29 SHA512 6c4ea61cc5374bc246c6ffce97034c52de9082b3cc6e7110da137e68cdfe8585187f88f532eb507c3ed1562d616f1e764f96640fb8c1528c8b94c8780c1698e2
+EBUILD kicad-meta-5.1.7.ebuild 617 BLAKE2B 02f8d6a3c29ca8e7d314ace47f5f312f4313838b6653a999cc2d4316a3cde153f88bb371a73bcd6d91f4269ca4319d187b10cdde2dd2ea2b8f9d25470c4f609c SHA512 79f725a9331088deed841a4a8c47ed8341484f9a998d63dde867a98711324389d88112a642f47cac00a42939555154ec49d12d7f093d569a2542d7cae76586b8
+EBUILD kicad-meta-5.1.8.ebuild 613 BLAKE2B c357f1730ccdeb70fa0da044f4a7d7280317c4f25cc5b4e64f34ee4b87fb31b617ba34ffb2dc351585bafdaeb3f8c88d819b740910420f7f6caa2e9650a62f85 SHA512 a70a114966951c027e4a3bcf9876ba372ff5c2f44379b8c12091b3e9bc8efefa1b2be40bbd15ac326fb249f5c4c5f06e069f89043f892aee1972ac91c8fe37c9
 MISC metadata.xml 594 BLAKE2B f9fa7bf50bca85e78a51d280c8d040c0be2aa6c4384b9577e24d02518e7c21af352590c774129fd7cdac6ae9de6557e3f4e115be8d7996e12dc66946729dd9d7 SHA512 ce90535f2ca5a5e33fe577c4cc2ea8a345cf708bd2a223e8922354d73d9aa7e7b4be557f5f4e021f48f8d5f34bca34ed01e192094edc7764779630331463fadf
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.5.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild
index 63786cac4ca5..889616e7ac6b 100644
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.5.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,17 +13,17 @@ KEYWORDS="~amd64"
 IUSE="doc minimal nls"
 
 RDEPEND="
-	>=sci-electronics/kicad-5.1.5
-	>=sci-electronics/kicad-symbols-5.1.5
-	>=sci-electronics/kicad-footprints-5.1.5
+	>=sci-electronics/kicad-5.1.7
+	>=sci-electronics/kicad-symbols-5.1.7
+	>=sci-electronics/kicad-footprints-5.1.7
 	doc? (
-		>=app-doc/kicad-doc-5.1.5
+		>=app-doc/kicad-doc-5.1.7
 	)
 	!minimal? (
-		>=sci-electronics/kicad-packages3d-5.1.5
-		>=sci-electronics/kicad-templates-5.1.5
+		>=sci-electronics/kicad-packages3d-5.1.7
+		>=sci-electronics/kicad-templates-5.1.7
 	)
 	nls? (
-		>=sci-electronics/kicad-i18n-5.1.5
+		>=sci-electronics/kicad-i18n-5.1.7
 	)
 "
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.8.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.8.ebuild
new file mode 100644
index 000000000000..88d76f40cae8
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc minimal nls"
+
+RDEPEND="
+	>=sci-electronics/kicad-5.1.8
+	>=sci-electronics/kicad-symbols-5.1.8
+	>=sci-electronics/kicad-footprints-5.1.8
+	doc? (
+		>=app-doc/kicad-doc-5.1.8
+	)
+	!minimal? (
+		>=sci-electronics/kicad-packages3d-5.1.8
+		>=sci-electronics/kicad-templates-5.1.8
+	)
+	nls? (
+		>=sci-electronics/kicad-i18n-5.1.8
+	)
+"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 10283c6204f6..f43b2af314b5 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,5 +1,7 @@
-DIST kicad-packages3d-5.1.5.tar.gz 888817126 BLAKE2B 1b515e3a2f81b0273491ba90d210de1ff43eed625eaff1c774fd969a3255d89c4ccab2ace3087210f5ac2012e0df75bb62f1683c89bcedf60f1c3f03ec2c7abe SHA512 844de269cd9c1c0c4082f09097dc853cd49a2942f621229604b9996c61f8e1c1a0b1008201ad2e13107a07b3f4601601f2d361b60b6e62984165dcdfd1dd378c
 DIST kicad-packages3d-5.1.6.tar.gz 922508706 BLAKE2B 2742791ee23d12ae25dcbab85e3b65f0126f3b3193392d60738b3cbee8ca0585aede1dc43b65e8c39526841ba9f960d6df95e5135af2feccecae403ec0583b3a SHA512 248fb4a759c7824d17b8a955f0636ed266e404a783af9a684ae09b8d2efc8871851c5236caf4092a97ba0485a9c3962bdea1898658aa17d6503832348b1968a9
-EBUILD kicad-packages3d-5.1.5.ebuild 554 BLAKE2B f90d89ffab9127f911cc42233d303ca5569f8a2c200c337a4cda7a94f08e25e323ab9435cceb60387583808247523159141b4ab88e0aee7563a19b08d49149dd SHA512 f2d5cbe81d5fce256049734f7be1aa9ecdc694613a27a76a0d0552578668d121e4ab5e259940d7992fe7eb6b4ea0c2c60ce380bb945a4c709e6bc5b4d3842c1a
+DIST kicad-packages3d-5.1.7.tar.gz 942594575 BLAKE2B abc7c4b31f109968a48f5177d2ce09d216aa4b191d083492cc2c72db4a3bcf2209b91552a4eea4593634af7b901a1adb842517cfd9ad032062d6cb1f2415af07 SHA512 b1189c4d8a82e16334a2d116370c3e50edea0c2efaf91f4856605b1e566e808e86fc076796a7855efe709c7fafc7a0e2f924ce31cb245d6a3e362793a4a8be64
+DIST kicad-packages3d-5.1.8.tar.bz2 727228580 BLAKE2B f6ba05432fea5dfd7ef9ba78772cef9838c3d98b0b7a98390b8c819b5411f4ba209c4fb12dc75ef31bee6d881438604b8658294bd13ba5ea482b5ea17770279f SHA512 8f5a54408f3ef01e5d3eca876f7ba33abb72a7ca5cb4584e093fda3ba92a6d938db8a2be486a147feb7a7a24b86ead98c33e5ae1ac7622109d8fe66eaab39014
 EBUILD kicad-packages3d-5.1.6.ebuild 554 BLAKE2B f90d89ffab9127f911cc42233d303ca5569f8a2c200c337a4cda7a94f08e25e323ab9435cceb60387583808247523159141b4ab88e0aee7563a19b08d49149dd SHA512 f2d5cbe81d5fce256049734f7be1aa9ecdc694613a27a76a0d0552578668d121e4ab5e259940d7992fe7eb6b4ea0c2c60ce380bb945a4c709e6bc5b4d3842c1a
+EBUILD kicad-packages3d-5.1.7.ebuild 554 BLAKE2B b4cbc50a746aa6c0ddebae52f1eb1ed39c83cead7d512a622e4eb766c41cf1caec493c69de6d91e3f73b0e1b0a7c6793e8bd6fb06e2688a878772f41092d8f81 SHA512 1fbcdf4bb2fccb2a7ddc171bfa07527f97d2a20fda067374b56c777eed87402b676ccd7fd6f4f2d88ae383867fb9bdcf22e634debef4f7e02834f20523ef8abd
+EBUILD kicad-packages3d-5.1.8.ebuild 592 BLAKE2B b353ce155200f95b0ef7499ff069f754dca3c6aba9472712542a1414f44f0aac1f94c11b58b9c407e436d3226851728860f56185efb026c89b676f5111f4bb30 SHA512 f9d86a768977340b5d1e8d7008c98f44367278dc8d0a2db4156642987717425844ff262f488a232673f612552cf6d1f2c3908c160ca9cfe95b9f3101b5bb3b74
 MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.5.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild
index f3d17f7c321b..4069d0c179ef 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.5.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild
@@ -19,5 +19,5 @@ REQUIRED_USE="|| ( occ oce )"
 DEPEND=""
 RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
 
-CHECKREQS_DISK_BUILD="10G"
+CHECKREQS_DISK_BUILD="11G"
 S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.8.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.8.ebuild
new file mode 100644
index 000000000000..67a41a58de5d
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://kicad.github.io/packages3d/"
+SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="occ +oce"
+
+REQUIRED_USE="|| ( 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-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index de6381481d4e..8e08306092fd 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,5 +1,7 @@
-DIST kicad-symbols-5.1.5.tar.gz 2922505 BLAKE2B 98c121139b8847678e6aa6a657c23168a7468c9f2ba342f335ba8ce373d6352b985db8b6549f9bfecc914eed686aa14bcb5b3112772f945e50e0f9c1cdb40a33 SHA512 345c7990ba17f778fa975250fbb067a01472aa6e03cbd08a1e34203af5517981b6a569981e30b4d56e58a3966c364b529b9679a96a46ef538bd5ac6a6b46eac7
 DIST kicad-symbols-5.1.6.tar.gz 2993494 BLAKE2B ba4056e350f049633a3265d2bd4e68af7765858d7d26d282b4dd7913d7a0f9d0011de319c6303c89c94ed4a07eeb93d6e08fca0b966d1e1138bef1b1ed74ad50 SHA512 e090cbafe3cffea86ccfda18d521528bededb573af7a46d5e7af0047a8c70f553e11e56046ec26ea11f742031507ab1ddd99459488f7ee57d8a18d6b9a5249ed
-EBUILD kicad-symbols-5.1.5.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
+DIST kicad-symbols-5.1.7.tar.gz 3033099 BLAKE2B e7e81677c5432c034cfdd6eb8e5ae108129d761e33c3f1969f379c0068de0be64353be42e8ca8394ea4bd3d81753e64bec81fb1a6fd106370e1a5673226fb7ad SHA512 0b6a4451957fcbce9a08706d121bbb853782c1163f8daba35f229b08577001bc1de41148340e59d3865d5b2775537c6ced1bede913845dc531d025559725f393
+DIST kicad-symbols-5.1.8.tar.bz2 1815263 BLAKE2B baa0125218df3ac9c4714924114892689b4ed3da4fd4e7566acc1ff89e47151b7c3e64155ca45200b5a3a1a5eebbcb5e9d656aa5454ae1ee52a76835215247d1 SHA512 f3d55ebf014d53c44c8f064701f605b7c393ca9c48d24281afb093908c4d7e3b6fdad6e0a80feac4e9709fa603b451d090496905af794f875820cda472517b16
 EBUILD kicad-symbols-5.1.6.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
+EBUILD kicad-symbols-5.1.7.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
+EBUILD kicad-symbols-5.1.8.ebuild 422 BLAKE2B 791497e59d77ba606cfdbb486106db4b38997b7e6566b68b25e003e32c200a756a25178c9eeb8b9002279b7010c2633b5f1b0f85b6b4d07ca70bbee418cb4fb3 SHA512 fd5838962dfda45a526123c2642fbfeab539dcfe55192d262d505817d141164aefc5adca00f2e58ffd69db0cd8fca80b228318e5c359024e525f60e9d1361d27
 MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.5.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild
index b0040b719b9e..b0040b719b9e 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.5.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.8.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.8.ebuild
new file mode 100644
index 000000000000..4baf883551d0
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://kicad.github.io/symbols/"
+SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index b55f913beec3..881ab11ed849 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,5 +1,7 @@
-DIST kicad-templates-5.1.5.tar.gz 1634911 BLAKE2B 899b692de58660eada32a9f31c01b0b51fa5a6233da2395285b8526df411be6260ed07f4f7dc637229874d849d144597822fbf19be1ef48d09505d5bd7a0b216 SHA512 9836ac57d8f0e394eb5bd9a05fb73dd25dc4c0d3dfe20a1271c59b7247b9af2b38c01dd14706add16ba3eaa26d79a18052669ef6404ed3eea0d6ad6d7767a9fa
 DIST kicad-templates-5.1.6.tar.gz 1634919 BLAKE2B acf7f2bd709d8482fb8de408cf89d568a8130d2ddc619e0d3a19e717b507915681879cc8102993a3b0a99c8c9360e5c787243cf1be5f1f76e3a9518ac5b8623a SHA512 cd0d539322e8c4fe9787d68bf2d7c1e5a287824aacd89edff77e1531052664669ce1193f58f5e992ff28183afadcf14c080c9ff407247f0b3d6c12366b4d4b0d
-EBUILD kicad-templates-5.1.5.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
+DIST kicad-templates-5.1.7.tar.gz 1643946 BLAKE2B fee5a92f0f6d1914a12b03c90cfe76239b84fabc6b1b34e1381a59a140459eb27fd9e347e27564faaeecc9f89c149f246d5171e97a12825d50a4cb89f9e33104 SHA512 1c836ac53ab87e83118d158076f8527c0ec47aa047a385f836536971d9f0adc56c6c0029a1ce14828c31d7d446ac4b0cac7403dddec122633dee42ae6c33e4f6
+DIST kicad-templates-5.1.8.tar.bz2 1552947 BLAKE2B 87eb0b40981e63a795ce900792998a27cbe5c7bd441bd27b78ff356b943cebd3a2664ce1ff629501cb107d806276150601cbf2a59a5a94e64199a229d2d94328 SHA512 0f6fcd09ab2c0e64386a5a9046aebc0dfa053a1d6c28a18daa896fc7899d121bc2214f515af4556adba2871bb903715d4751ec1ece770a48b371b8b2ad1e8bb0
 EBUILD kicad-templates-5.1.6.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
+EBUILD kicad-templates-5.1.7.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
+EBUILD kicad-templates-5.1.8.ebuild 431 BLAKE2B 526c92f9c32bc4b5989641a5c1d2c746dd18077c27a3aeb33550ed77f151f360d327f147cfd5d2e3145a07744a810256f58f0b85aa8df42bb229ecb0c97da622 SHA512 7df0045f7b30af7dc990423c4429712cd53e9ab9c1bc1d024652804bf7433d0cde76ceeedd50932fcc2257958ef0b80c712fe42f41ab85e2b9438a000e75ad4a
 MISC metadata.xml 453 BLAKE2B 56db0c51d13c0cc2b65536b09e23714f53951c9f25ee716c6ceaaa65e12b2a6c85bed8dfca279364641e1b346bb70ac25c693ab9a0bd17b06d5dc732a0164a73 SHA512 f15055be34911712c68e6500d5f94a17bb21ec4c82eebdbbeb98053bc3daebd6d33c1626389cac8fab0834235f621d078dc89cf0f37f1126b03f6dbccefcae4b
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.5.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild
index 8ce2e5c4c462..8ce2e5c4c462 100644
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.5.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.8.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.8.ebuild
new file mode 100644
index 000000000000..6bc0cb273a29
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-5.1.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 8be1a2229631..c53803eb78d0 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,13 +1,13 @@
 AUX kicad-5.1.5-algorithm-header.patch 417 BLAKE2B 644aeb5a0c2b084aeea5fd1a18d03bd16df6762a8b848021d6a0e6549142c9e1d3318c7bf20c9b594f9cebe67ecdebd42eacd2d15cb9e0652a5fc3afbc9b12fe SHA512 22424e038ee90dc73344dde8de553c614b3c29fb98fd74879b9dff4196a0d3317be8ec55d95bef57303e5961b20098ed4e29e1dfc25c206d396167a835ac6e9f
 AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d339f035167c3d0f0801f396ddfbbee22d843be53f81440b199c307604c98f08509fe9ec55efab6c297a7175947 SHA512 704fb0cc60bc18610bd410028c5c6302548bac646b0653ba32355b03fadbe4d8366dbad18469d5fd49d1d86e70497a13cbc2748c9e4b139d3a640c46bce50a36
 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
-AUX kicad-5.1.5-metainfo.patch 582 BLAKE2B 4eeeca5edb27989bfb953e8154dde533cca80cd2afa42e6e3bbd06190ca7371f48cdea2610761092a80e9cf0f25ebb8ea40271d79fef2fb3e7c803accf6fcd02 SHA512 cd3f0366df21609a7deadffb7bb4a2a134c9bc6e5c1aa8ef9b3c685cffc1662ddb8cd8d3769b52c0fe77af832f0b4758584c0b29e8af54a20667f2f522e15585
-AUX kicad-5.1.5-ninja-build.patch 2171 BLAKE2B 1b9c6f07abed53e04f676f9aaea6f4e244ca0293e725a81c4d1037e0453201f00cc1d7267b48793c11f0715154762240fefb48ac3b3efcb905857eef76016c66 SHA512 e0ca5eb4695948934c89f3a19edb8dbb77c34039d65c5c0ffaa42c16c5cab0cc5537c747a2f9c2e154be9861f8171537fec6004208b91f32736f521465c959a4
 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-5.1.6-ninja-build.patch 2154 BLAKE2B 8b7fd64878e8dac5e9dcfdad262cdde1ca87460d7776d0213f0cfec39b432d638651260cc0b537b9fb5cb18de6e020d2920d065333cebc5f2dd1606e43a69d9a SHA512 8d1d9740b8f09623580ec1ddc8a9de407b3db0fe7ae0705ef3f1c7b234972a05b32885c581c9af26ae8a245c3b5b0e2c2eacc37bffce11881b50c43003ee77fa
-DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
-EBUILD kicad-5.1.5-r2.ebuild 4309 BLAKE2B 377d2af7c9b84715da93767d3b8cd3c0f247c84d5888f68b7a103418ecad42eba44078929fd22b2f614fee39505717cc288994b33c76ee88e3283262bcece4a9 SHA512 e0ee69147c3e865e814a8c45b66451a076ce08a3581fa31cf15cdd0e6c2084492bcc2cc7a091e88c211aa19a2f6fd578d18087077ca88881e03c6ed12df59925
-EBUILD kicad-5.1.6.ebuild 4342 BLAKE2B 5a89ff32ea1ee6c6d1a1c1fe6e8c63368e6b5bc552b57c5bffb99c8c3515abf9077331cd004eeec722d2afe1e2596dee7bddb6fc2f9f5db74c6ccec444abaab4 SHA512 3455b1e37f0079c25005cce0f160fa541edac8cabdfe5f5c9b4ebf7719f390daa5065e4e5bf54e361d6eeb6ab3c66884f28b1b6b3634d4020c124edcb237acff
+DIST kicad-5.1.7.tar.bz2 18279204 BLAKE2B 9d12cf06282d2b8a5c5c4b0a387774ef90f8035bf0fafd9f5d939819f71edbb248d2b15fb4b3f35a80950fd41d140d93165ece61748076d7e2938cc0c9140e46 SHA512 f853eed50245d875b2443cc9accb3c75e8404d8fee12f129df68b3ab7052c31cda1eb0ad22fc10eb23b35250188973fb51a8c55fcb1560ea65d6e5e22b94a182
+DIST kicad-5.1.8.tar.bz2 18282857 BLAKE2B 07afa95853dae587293f71b4b6b5e888610439d39dd5bd715a1f424a837d46894771bf3eb4b447f7a70ea0bb0a810fee141a81bf56a4be50e81415b38552ff11 SHA512 6d40c5ce65c4350174412359d03a9c0c3a311de9ba57d92c1b053fefbb3e518cccb7a38a2a87e8f5b1950a3676514d25ae0e5e14a97b72a56cc0d401aeab3452
+EBUILD kicad-5.1.6.ebuild 4552 BLAKE2B d4ef44bdb71f42c9dc39e8338caea02aed7457b0861a11019bb64560361151fc624f6e2649b9308c756a6ca26286d7edb279703e4b4910cf1b9707f55ed7efd6 SHA512 4fe63f3b918378835d365870cbcca7010ce85833cc973c0b132e33d60262a5dbdafb84e84a8991aca9594af1eb9b59218170bc747d9177220c344f4af20b4e62
+EBUILD kicad-5.1.7.ebuild 4516 BLAKE2B 34922791e769d2154d495434a5854837eda397e8252ef5e8169d4a2d3b5c367eee7c72556041538d7ee82f484ad28716f05cb1f9ddc7ddd79f0c533546a392c9 SHA512 5cbe19e4d7285f392b9b6db93a968c91ac94b3a19e639b7ad1f99b8b04c45f45c6e1f7ebb91523730b0869ac92c6381759e0dc2b06e8aad32c3b42675ef4c11f
+EBUILD kicad-5.1.8.ebuild 4510 BLAKE2B 37d532f5be896e3f08b83a981f01677d382b55a4834ad2b5b6efc40ef992dc63b9b602d84d6100147ed26b80fb484cc4bc1697a3af7a71ed153562ed8430de5b SHA512 a72a87ea78b48b4988d43262d562c7d307ef4473cf286c22eb99e8eebd73f273e36324e6fad906907cfc916a8c4401accdebdde4df0f90bbe5078181c7acb1ee
 MISC metadata.xml 1013 BLAKE2B b6469c6095bc87dd09a15b8c29df6901c8c3a9137a85f11bca0198b87de4dba56a363763e577303c046ba0ae5734af20f87aff574470942b222489b2c8081067 SHA512 68b19d35279516a088271a06fa2edae7109f2f79c1bf46add405d11885e221f8166e21448cb1e70d961c185712496410a3f32e34265d18360e779f12dc907611
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
deleted file mode 100644
index 48a5ef5be507..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
---- kicad-5.1.5-orig/CMakeLists.txt	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/CMakeLists.txt	2020-05-11 23:51:52.122093410 -0700
-@@ -919,7 +919,7 @@
-     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
-     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
-     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
--    set( UNIX_APPDATA_FILES resources/linux/appdata )
-+    set( UNIX_APPDATA_FILES resources/linux/metainfo )
- 
-     # Install Mime directory
-     install( DIRECTORY ${UNIX_ICON_FILES}
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch b/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
deleted file mode 100644
index 3b4b6a4d2fef..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur kicad-5.1.5-orig/pcbnew/CMakeLists.txt kicad-5.1.5/pcbnew/CMakeLists.txt
---- kicad-5.1.5-orig/pcbnew/CMakeLists.txt	2019-11-14 09:09:45.000000000 -0800
-+++ kicad-5.1.5/pcbnew/CMakeLists.txt	2019-12-15 03:47:03.479894245 -0800
-@@ -808,11 +808,7 @@
-         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy )
-         set( PYMOD_EXT "so" )
-     else()  # only linux remains among supported platforms
--        add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
--        target_link_libraries( pcbnew_python ${PCBNEW_KIFACE_LIBRARIES} )
--        set_target_properties( pcbnew_python PROPERTIES OUTPUT_NAME pcbnew PREFIX "_" SUFFIX ".so" )
--        install( TARGETS pcbnew_python DESTINATION ${PYTHON_DEST} COMPONENT binary )
--
-+        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" )
-         set( PYMOD_EXT "so" )
-     endif()
-
-@@ -792,18 +788,16 @@ if( KICAD_SCRIPTING_MODULES )
-             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-             )
-     else()
--
--
--    # For phase 1, copy _pcbnew.kiface to the python module.
--    add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
--        DEPENDS pcbnew_kiface
--        COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
--        COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
--        )
--    add_custom_target(
--        pcbnew_python_module ALL
--        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
--        )
-+        # For phase 1, copy _pcbnew.kiface to the python module.
-+        add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-+            DEPENDS pcbnew_kiface
-+            COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
-+            COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
-+            )
-+        add_custom_target(
-+            pcbnew_python_module ALL
-+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-+            )
-     endif()
-
- endif()
diff --git a/sci-electronics/kicad/kicad-5.1.6.ebuild b/sci-electronics/kicad/kicad-5.1.6.ebuild
index 89c22dcb004e..0eff75e7cb86 100644
--- a/sci-electronics/kicad/kicad-5.1.6.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 WX_GTK_VER="3.0-gtk3"
 
@@ -131,6 +131,13 @@ src_install() {
 	fi
 }
 
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
+
+	default
+}
+
 pkg_postinst() {
 	optfeature "Component symbols library" sci-electronics/kicad-symbols
 	optfeature "Component footprints library" sci-electronics/kicad-footprints
diff --git a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild b/sci-electronics/kicad/kicad-5.1.7.ebuild
index 895f44b23fb6..4e39f2bdd57a 100644
--- a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 WX_GTK_VER="3.0-gtk3"
 
@@ -11,7 +11,7 @@ inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 
 DESCRIPTION="Electronic Schematic and PCB design tools"
 HOMEPAGE="https://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
+SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
 SLOT="0"
@@ -55,12 +55,11 @@ BDEPEND="doc? ( app-doc/doxygen )"
 CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
-	"${FILESDIR}/${P}-help.patch"
-	"${FILESDIR}/${P}-ninja-build.patch"
-	"${FILESDIR}/${P}-strict-aliasing.patch"
-	"${FILESDIR}/${P}-algorithm-header.patch"
-	"${FILESDIR}/${P}-metainfo.patch"
-	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${PN}-5.1.5-help.patch"
+	"${FILESDIR}/${PN}-5.1.6-ninja-build.patch"
+	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
+	"${FILESDIR}/${PN}-5.1.6-metainfo.patch"
+	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
 )
 
 pkg_setup() {
@@ -131,6 +130,13 @@ src_install() {
 	fi
 }
 
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
+
+	default
+}
+
 pkg_postinst() {
 	optfeature "Component symbols library" sci-electronics/kicad-symbols
 	optfeature "Component footprints library" sci-electronics/kicad-footprints
diff --git a/sci-electronics/kicad/kicad-5.1.8.ebuild b/sci-electronics/kicad/kicad-5.1.8.ebuild
new file mode 100644
index 000000000000..eb9b3fb01986
--- /dev/null
+++ b/sci-electronics/kicad/kicad-5.1.8.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,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"
+SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples github +ngspice occ +oce openmp +python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( occ oce )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.61:=[context,nls,threads]
+	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]
+	github? ( net-misc/curl:=[ssl] )
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	oce? ( sci-libs/oce )
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	python? ( >=dev-lang/swig-3.0:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+CHECKREQS_DISK_BUILD="800M"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.5-help.patch"
+	"${FILESDIR}/${PN}-5.1.6-ninja-build.patch"
+	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
+	"${FILESDIR}/${PN}-5.1.6-metainfo.patch"
+	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use openmp && tc-check-openmp
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	default_src_unpack
+	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
+	# avoid QA issue.  This is needed because /usr/share/appdata location is
+	# deprecated, it should not be used anymore by new software.
+	# Appdata/Metainfo files should be installed into /usr/share/metainfo
+	# directory. as per
+	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
+		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+		-DBUILD_GITHUB_PLUGIN="$(usex github)"
+		-DKICAD_SCRIPTING="$(usex python)"
+		-DKICAD_SCRIPTING_MODULES="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
+		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
+		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_USE_OCE="$(usex oce)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile dev-docs doxygen-docs
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
+
+	default
+}
+
+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/linsmith/Manifest b/sci-electronics/linsmith/Manifest
deleted file mode 100644
index 39277228198d..000000000000
--- a/sci-electronics/linsmith/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX linsmith-datafiles.patch 757 BLAKE2B 273a60d1b93046c015c178c6d037252c667016c3601c7830c9b4c0ff1c1b899c013660ee76034d143011d8c34b6077d137202f3398b9d7fbae3836105dcc69c9 SHA512 af6f38420a4adc8386c70c4837aee74ff5cf2994bc0edf230198cb41cd53dbee69aa08c497dccb5e20f6a89282b2f690995d7cd5f86b93c8ac0f6488f0c0d266
-DIST linsmith-0.99.30.tar.gz 1132438 BLAKE2B fda024052d0aa1af7254aa37975a62bcb1bd2dbeb020202853bc32c85e6859bda6153fb5e6af8f18a4bf29a11c5eb7bd5eaacc68ebbf20b7d2622cc0d04d77d1 SHA512 d1f6cd3895b7c217de49c214f8b86b1bb9ce97d540546f0004b7f320b7cf142652cf0ec51ce48cf32b89564bf408546bf10d5f4937544cf9e8a4d87d1db5bed5
-DIST linsmith-0.99.31.tar.gz 1138998 BLAKE2B c8b32bf2530b87a0bb9f2b7914e5ccdb6c8ad28b57b919b93c4ed0fb272a2e61f588adb3794b81565580a68413f3cb4e43ac861c4a70cce105d3e821d21eccf3 SHA512 0218992243ff5db6efa39e01d7eddf6d44d921fe4caf131d020416d320a542f19bd577a3bbd9fc8df5f1ccb62ba152d02f825bab8fae55dadd262c5dce47c076
-EBUILD linsmith-0.99.30-r1.ebuild 1519 BLAKE2B cb4adba8667494bc1f7e833c9fac55f4133a67fccb262b0b2133ef8842ad7c69b5c2136fb20422c224fe4167fc4a790e3b18cd6fbd7b44b0d0201201db811047 SHA512 2fd8bd079eaa2cb6c793b80d062c13c47d5fa02df4922bad2669299aca8ec10737a4b5d2f5d83338b5dbf73812843cfa880ca41219b938020df390c527c7d9d7
-EBUILD linsmith-0.99.31.ebuild 1548 BLAKE2B 2307cdfd1a0b0d62cdfb093d577a39e74ff39ce8f2e0e8c00871f89fa5823996406cbc4c675d46a1bdf7d7ea6fe4c18239da17756f2fe7b0b6c497d4caec8a7b SHA512 0c4403310cfbf4a86884e5450b87af024d4cc5cdd79e4eb468a8594f9381d8ec76ca1755e26d2291b14c8b5a03718c9aa3e1ece3658a6afca73a0f05d9e271c6
-MISC metadata.xml 473 BLAKE2B 397250ec12397650b2695e1ff89d5dfc9a3c556b64f6fc02c42427757c9c2ca8d0af8630854b611602f6cbf7d2ea66b529c7e4ea50d4d9a5ad7bf94dc15b14a0 SHA512 46151b41b8bacae4dc89d8ef861195f3c6baed7854c1ab176b5ab54b99cad27d92418a58739e2266491e2b4ec003000c4f694ca94c1e0257465ce1eb1b5c8f2b
diff --git a/sci-electronics/linsmith/files/linsmith-datafiles.patch b/sci-electronics/linsmith/files/linsmith-datafiles.patch
deleted file mode 100644
index cae7a2a7c28e..000000000000
--- a/sci-electronics/linsmith/files/linsmith-datafiles.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.am.old	2005-11-03 00:56:51.000000000 -0300
-+++ Makefile.am	2005-11-03 00:57:09.000000000 -0300
-@@ -20,15 +20,6 @@
- 	    fi \
- 	  done \
- 	fi
--	@$(NORMAL_INSTALL)
--	if test -d $(srcdir)/datafiles; then \
--	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE); \
--	  for datafile in $(srcdir)/datafiles/*; do \
--	    if test -f $$datafile; then \
--	      $(INSTALL_DATA) $$datafile $(DESTDIR)$(datadir)/$(PACKAGE); \
--	    fi \
--	  done \
--	fi
- 
- dist-hook:
- 	if test -d pixmaps; then \
-@@ -39,11 +30,3 @@
- 	    fi \
- 	  done \
- 	fi
--	if test -d datafiles; then \
--	  mkdir $(distdir)/datafiles; \
--	  for datafile in datafiles/*; do \
--	    if test -f $$datafile; then \
--	      cp -p $$datafile $(distdir)/datafiles; \
--	    fi \
--	  done \
--	fi
diff --git a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild b/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild
deleted file mode 100644
index 6ee6d95fdf63..000000000000
--- a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Smith charting program, mainly designed for educational use"
-HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/libxml2:2
-	dev-libs/glib:2
-	dev-libs/atk
-	gnome-base/libgnome
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# This patch is to prevent make install copying
-	# the examples in /usr/share/linsmith
-	# Now they are cp to the correct location.
-	epatch \
-		"${FILESDIR}"/${PN}-datafiles.patch
-
-	# fix QA warnings about wrong categories and location of icon file
-	# in .desktop file
-	sed -i -e "s/Application;Engineering;/Education;Science;Electronics;/" \
-		-e "s/Encoding=/#Encoding=/" \
-	    -e "s#pixmaps/linsmith/l#pixmaps/l#" \
-		${PN}.desktop || die
-
-	# fix QA warnings about 'maintainer mode'
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/usr/share/${PN}"
-	doins datafiles/conv0809
-
-	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
-	doman doc/${PN}.1
-
-	domenu ${PN}.desktop
-	doicon ${PN}_icon.xpm
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}"
-		doins doc/manual.pdf
-	fi
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins datafiles/*.circ datafiles/*.load
-	fi
-}
diff --git a/sci-electronics/linsmith/linsmith-0.99.31.ebuild b/sci-electronics/linsmith/linsmith-0.99.31.ebuild
deleted file mode 100644
index 911fd0398417..000000000000
--- a/sci-electronics/linsmith/linsmith-0.99.31.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop
-
-DESCRIPTION="Smith charting program, mainly designed for educational use"
-HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/libxml2:2
-	dev-libs/glib:2
-	dev-libs/atk
-	gnome-base/libgnome
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS TODO )
-
-src_prepare() {
-	eapply_user
-
-	# This patch is to prevent make install copying
-	# the examples in /usr/share/linsmith
-	# Now they are cp to the correct location.
-	eapply -p0 "${FILESDIR}"/${PN}-datafiles.patch
-
-	# fix QA warnings about wrong categories and location of icon file
-	# in .desktop file
-	sed -i -e "s/Application;Engineering;/Education;Science;Electronics;/" \
-		-e "s/Encoding=/#Encoding=/" \
-	    -e "s#pixmaps/linsmith/l#pixmaps/l#" \
-		${PN}.desktop || die
-
-	# fix QA warnings about 'maintainer mode'
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto "/usr/share/${PN}"
-	doins datafiles/conv0809
-
-	einstalldocs
-	doman doc/${PN}.1
-
-	domenu ${PN}.desktop
-	doicon ${PN}_icon.xpm
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}"
-		doins doc/manual.pdf
-	fi
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins datafiles/*.circ datafiles/*.load
-	fi
-}
diff --git a/sci-electronics/linsmith/metadata.xml b/sci-electronics/linsmith/metadata.xml
deleted file mode 100644
index 0ca98970f31a..000000000000
--- a/sci-electronics/linsmith/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>tomjbe@gentoo.org</email>
-    <name>Thomas Beierlein</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci-electronics@gentoo.org</email>
-    <name>Gentoo Electronics Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">linsmith</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index 6fb3177c13b6..60d2cdb696ee 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,7 +1,5 @@
 AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31
-DIST qelectrotech-0.61-src.tar.gz 9083192 BLAKE2B 25966e70f7f297ed55b539472970698f0947985c377cd90648d03fce8bf73c1bdede97e1104163147c5e60bb8ad05c55718f182528e6131adef6efeaf76f8e82 SHA512 b07d28520bef5773f5f93595c53a839a160c5927a7534ec30eba451fd33ab090909fc1971f28aea53538ff8e20ca45eff0b6597f3ab103b00b89eaa65067f918
 DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd
-EBUILD qelectrotech-0.61.ebuild 1155 BLAKE2B aa15c747e85a3419d77d576e2dbc9b060f3ac1970427dd743b969a216093eb5a550d6fbf9920eb1358e5330e1dfdab41ae7648f1deb04e5a8360593aaed2334f SHA512 620c5a75269d85fa56fb2bc573041853e722c65d709331b3642edd9683067bea30011eff09402b4045a2a5ba110527b48143a7c07f14bc899d1203b45f9c4daa
-EBUILD qelectrotech-0.70.ebuild 1150 BLAKE2B a702ebbe768db66eb7700db96a4518b70186db48ef669c78ab944ae2ce56b9c85b367dffb3ab33642c0147a15488aea02e1be8afb965142aaa809d47d25c624b SHA512 042f8ade40b93d9bfc68937bb1d89e0f8c2b90c3741c4d4e6ce0f78e88cfaa5e3dd4897a7ea89c5790a553ef8df764cd359c2a5b554ce10f910262e816e4618b
+EBUILD qelectrotech-0.70.ebuild 1148 BLAKE2B f815517770d377e6488137a0e013cc012608a27ede5e7fdd02b2f6d7e624e38c263cbbd38190f9040dc7fd6a84c205d16e1d02daddf383a2cbe7c52494312ee4 SHA512 b96df75832dacb6e02b5affbd75bb6dc3c45c6a4a77fb22722d1d3fc051e20a6229cd988eb0045d56bc408a24e0a2f4d78415f465e5fa704b899f59f3912aeb4
 EBUILD qelectrotech-9999.ebuild 1139 BLAKE2B 827b5184d0117228521a770808c2f00aafeec19e5bfc5623d7ba23bbee6ebb2f81b80be2b4c85ec5599613ba903725dd54f011c1e16de9a9d3b886dd2e6692a6 SHA512 0b8e91434bfec88cf0a0822fc8085a8d9eadc3277a955c06df2a59a37d395d43e6e6ed84ee0cdeba9191271d9569eda6012b01245fea1573fe4453bd8ea7b808
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
deleted file mode 100644
index 38d8540b0f54..000000000000
--- a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-${PV%0}-src
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt5 application to design electric diagrams"
-HOMEPAGE="https://qelectrotech.org/"
-SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( CREDIT ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
-
-src_configure() {
-	eqmake5 ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	if use doc; then
-		doxygen Doxyfile || die
-		local HTML_DOCS=( doc/html/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	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/qelectrotech/qelectrotech-0.70.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
index 85e3e238086e..cddb5f1a5ac9 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	MY_P=qet-${PV/%0/.0}
 	SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/sci-electronics/sigrok-cli/Manifest b/sci-electronics/sigrok-cli/Manifest
index d458162a6ba2..f58cdd9da870 100644
--- a/sci-electronics/sigrok-cli/Manifest
+++ b/sci-electronics/sigrok-cli/Manifest
@@ -1,4 +1,4 @@
 DIST sigrok-cli-0.7.1.tar.gz 221754 BLAKE2B a2edd3ef990c484660dd3fa6f8b8f2ca3eb500a39ac66da1ce9b95c7dd6bfbc5f39b7e5a28872bc8b4c6b7e6282919bbb22f71796ad8e16f3549ef2e4674f02e SHA512 a56d9439efca74f8362ed225d8fa92adfaee053470b166629ad2d8f3ebf5bea05a37782750c9321aabd3b47e634734fa5e5b0cc5353bf49dd1629cdcdb98aef5
-EBUILD sigrok-cli-0.7.1-r1.ebuild 1078 BLAKE2B 95a24aa3de667f5a7e897efc4c729e2067d9e35f1ccaafb0a39e7b6993bafa988c1a3e5457238fc38369a5f946eef4a9b6b68e1f303c2df6d7ee1c574032fcdb SHA512 c40237af30466d343742a2b2e3a0b8b8a655cc8ada443af0df36c1de8e5e9356b0c018662ac318357630622014cb93c237ff563e43766ad54e2c8dd4e255699f
-EBUILD sigrok-cli-9999.ebuild 1078 BLAKE2B 95a24aa3de667f5a7e897efc4c729e2067d9e35f1ccaafb0a39e7b6993bafa988c1a3e5457238fc38369a5f946eef4a9b6b68e1f303c2df6d7ee1c574032fcdb SHA512 c40237af30466d343742a2b2e3a0b8b8a655cc8ada443af0df36c1de8e5e9356b0c018662ac318357630622014cb93c237ff563e43766ad54e2c8dd4e255699f
+EBUILD sigrok-cli-0.7.1-r1.ebuild 1063 BLAKE2B fdebdc0d26832cf399e494acd29ff2ba69727e62fc82377c6476737fcc6273bc897fefc1900ba026a749db589b64a1bae3accdec61ae77d4ae4a53aa9e13211b SHA512 78913b9fc250935b80143fc468f68cb10c3825cee0eb890bc369c2ff1bdff74d882b3107f8b2432d788f464f5d533477df15b1af2f3a0307572886f090a4e1d1
+EBUILD sigrok-cli-9999.ebuild 1063 BLAKE2B fdebdc0d26832cf399e494acd29ff2ba69727e62fc82377c6476737fcc6273bc897fefc1900ba026a749db589b64a1bae3accdec61ae77d4ae4a53aa9e13211b SHA512 78913b9fc250935b80143fc468f68cb10c3825cee0eb890bc369c2ff1bdff74d882b3107f8b2432d788f464f5d533477df15b1af2f3a0307572886f090a4e1d1
 MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd
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
index d13613f4a65a..098c026ce516 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit gnome2-utils python-single-r1 xdg-utils
+inherit python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -42,11 +42,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
index d13613f4a65a..098c026ce516 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit gnome2-utils python-single-r1 xdg-utils
+inherit python-single-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -42,11 +42,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/sci-electronics/voacapl/Manifest b/sci-electronics/voacapl/Manifest
index f151d0012653..428058f630e1 100644
--- a/sci-electronics/voacapl/Manifest
+++ b/sci-electronics/voacapl/Manifest
@@ -1,5 +1,5 @@
 DIST voacapl-0.7.2.tar.gz 2054761 BLAKE2B 8a6dc0f0af9c42b9463b4b436c8652e049b5e8b9874406da33352f5ad67e154d977ffadabbfd92764be61cfac1fea22f0900c3cf1a6c80b3e0c2297e4623df61 SHA512 d78bccdfb7db079dc77e60f80bbae66a48d6173fccec9dd32a6a0cbc283af64d8ab05eebd1e43f4b0461653919a557a88c9b3603b5d13927fbda41d2cbab78c0
 DIST voacapl-0.7.6.tar.gz 2114486 BLAKE2B 2177ccb93e83a2fe29ab14b1884c0a4adc9de02dfb35ab0d4e854405110ae2583e6d12f6d646e808f39e77e357639ce5ce3a3d8c425c86ee3d85f6050ba22e47 SHA512 192a974cad059ff265af272c195c8184e18785650e194d25906bc75de0c3d99b9730f2e8131e619300b5fe9f6dfb25cf1437b6701d019c5e6574340d8f6e113a
 EBUILD voacapl-0.7.2.ebuild 454 BLAKE2B c51603d3bcd3a614c87a9ac2bf5193299f396da39d378758655e141413c8c8b9760446623f1af422cbdba232077b02dc5d0a1d5d7d9bd98e6b47885bc1457001 SHA512 0b3829584b4b49d132ca6dd7611cd02f06b8c4829d8030019d396421c6a759c06e2e8c18a29cf9a41ef2d2fdc93d73ebb90dc6b34b16dabcf294b3becf1f0cd8
-EBUILD voacapl-0.7.6.ebuild 518 BLAKE2B aae50d67909d4cdc2a603d9388ca773987ebf19b8953000c387d9c9c7339d32b1b0ae1e45c1f90c4f86a360d0fb9683f10a3286a2b3e36f41e8c5985d536820d SHA512 f1b4a5d61fd6e4ded11fc6cdd48b0797e05f5bf89f4ca2867fc33b0f0983be73b4737d76a0d09fb3a7ab6e3e522522eb19f6c4e348b8b1876a4605ff36b6cffd
+EBUILD voacapl-0.7.6.ebuild 516 BLAKE2B 77a5509169b4cd99f873720edccda24b4f64a37e8f7272165e052454014f6a73222d91520a67debdfa755c561fb28cd10f410f25110dd0ea94755c7447a767ea SHA512 ed280e2b21ea1eeabb9c7459f0b174c378fa4da9a05b3f9c945ef08df7b2eb1446e8094d9ee276d7699bb7344fb1b3bd936cad060f86ec3146332e8c00f1357c
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/sci-electronics/voacapl/voacapl-0.7.6.ebuild b/sci-electronics/voacapl/voacapl-0.7.6.ebuild
index 8db2459df0c9..0ae8fe6a8d63 100644
--- a/sci-electronics/voacapl/voacapl-0.7.6.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.7.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jawatson/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RESTRICT="mirror bindist"
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 827537b6214a..33a0e8c7af70 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,5 +1,5 @@
 DIST xnec2c-3.5.1.tar.bz2 995554 BLAKE2B 697a7f1d5d89e108ebc02b6f21a3e9593cf617778f3b19c2bee2d901095c48e639b86922d360c752b8e9ecf1cb1dfd58169c33df3ee2d620968c236db334ba39 SHA512 3ba4bbe9d013176ced4d5aa584cd1e4b55caeb193cd3ec905e460421ed21038ff44dea332a3aa0650c34df6ef6bf5a2a9cbf5da7c7ba892b82c2fe7e253d99f5
 DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
 EBUILD xnec2c-3.5.1.ebuild 708 BLAKE2B 24da62d8c61c43ffb67e1e253ccc30009e744af83bcbdf1b0e199b1d4e77a3204ad459aad101dfd7aa3bc1af3ffdd7e3fb81ff9bed8315ef437f207a25361f9a SHA512 0deb7a199bdbd6d2a11625b85827be4c4fd101e39213b31a717fcc5d2bc3dcbf89c004181b46d0570604d7c9bc47a74574a50177d3216f8c31f1e6af1556200a
-EBUILD xnec2c-4.1.1.ebuild 787 BLAKE2B 381d3046e4fdd7a69f507b61afd24b8ba28269510c1fe39497f3029ebfb7c8ae511583553847c11fb142ecb81f0fc511a3117ee85df473bbfa0faf5ea69e1c4f SHA512 bd44af2d066f5c3250782d82bdb7c7a9f61ff60a3fa6ce9602dd237b49809b6c581f6427e6bab1490ae8a0d58ca153ef8c0cb830461664c8aa122da4f7c3a5b4
+EBUILD xnec2c-4.1.1.ebuild 785 BLAKE2B 525e838b9b4b95226960ad3b63d4b0d3287e22d8bc95e0071afc0f3fb9b8fe049a4ee0b71ba42f75faab02521629df012825768d0f052c1de4aa97c2f5adc954 SHA512 e350dba8b64219dbd4ddbccd31c135b97bf2c62133d6d6a7dec1b4eeb06df2ab86851dd4aed32555b6a3ca53850f0b115c73d94df697449b6463c89e56c9b584
 MISC metadata.xml 1634 BLAKE2B f210b33b42df3619ad9f7870f35bb7330ca62005b2d47bc07024d3e8b1d4c52e340f0c790c5529c1838d14c244c2aaadf136178c9ab2d6eb7bfcd2ea66c44814 SHA512 3ba6cbd28a2f3d969c392607b29dfbbe225898674bbd9fbd732890a07c68514d3976739b04668bd255aa891480fd05dd3e7bfa6883b6594c00b594f85816ab32
diff --git a/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild b/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
index 002559b18a75..caca0d5d56eb 100644
--- a/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/glib:2
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /sci-electronics
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)