gentoo resync : 13.06.2020

39 files changed, 164 insertions, 734 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index f15c00641762..dedb244df730 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 17bd1d24fa7d..d3b792cbdfe4 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,9 +1,5 @@
-DIST kicad-footprints-5.1.0.tar.gz 5370734 BLAKE2B 5a7c9db505edd37f5143cccb210a0f87bc08b1c9166c30a90b59af31f200e24c7608b210a6a3137095bb6eaad64f5f6909d87d685cd0d5cb080fb1f7e90ae575 SHA512 3ae6e35bcff8282b05f5661bf63b38681f1472c632523e3cd7288f2325b466b27708d850b95792084232399062eb54808b7bf08ec3880ac90d8a706c28e211b2
-DIST kicad-footprints-5.1.2.tar.gz 5389330 BLAKE2B fba830d4d9830125a4e52ac2e572e576a21151188d702c289f3f76302b44a30fe2800ff77e435d4e703995fd70cca83f237ba13a43170268de66c5d9402ca742 SHA512 1ca0682bedd74d304c327ac991f25a4d523dfb020ba560e117ab8e167036868703fd46662ddaa8ae1d48ee796fc607d45072ecf7936a3ba25070d83961897fb8
-DIST kicad-footprints-5.1.4.tar.gz 5578039 BLAKE2B f86a0a9f8d77df9d76c25e58c54f3e6d9ed7302bde3638674f8caa1a619a4cb3ffde384029fc896d82aa3535f195dc87450ab8ab5ffedbf194d83778d592b11d SHA512 84dee71a0e52d8bb4bc8d5708a0472bab9fae4ec47553e234ed8ca4aca926fa200593d264e016e688e2c0eb1fe4a680da8b8a5e48b7dc54866241d9965d235b5
 DIST kicad-footprints-5.1.5.tar.gz 5757316 BLAKE2B 1ae141bd01e3581314bdd5f5b79cc919f68cfc48427cd2b08d2910bdd915866ab3cdb542be860f5e10f01825f094fb81a0704e018f53d80a50950b8b150a5ab9 SHA512 dbfb482d41d1c109e1fb395d194f700e45f1c268a33645b71cd9d98ada32369fe01dd6bf10c7f767c65b9b4e0efa6fc1bde1e4c91b9f4b751540fe3b511ba5b4
-EBUILD kicad-footprints-5.1.0.ebuild 450 BLAKE2B adb4de1d7a16e5d61b0e574120f9bcd44a9011e1ca74348a677b8b92b623f8e91d6004e0c5c434fc8a8ab4d166cfca6cdf1f2a9ef4288b26fe16605dd78e9930 SHA512 10f23b38d7096247d3b612b3ea5ba4547161e4126979371a42a94312c6af68dbd925f886320026956b3db9b796de72f3f746a5c28688b3ed78991622cea959a7
-EBUILD kicad-footprints-5.1.2.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
-EBUILD kicad-footprints-5.1.4.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
+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
+EBUILD kicad-footprints-5.1.6.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
 MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.0.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.0.ebuild
deleted file mode 100644
index 3efe77462d03..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.4.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.4.ebuild
deleted file mode 100644
index 268f2b9a6d51..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.2.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.6.ebuild
index 268f2b9a6d51..268f2b9a6d51 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.2.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.6.ebuild
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index f29d80f7f815..e8d7ffb92a9e 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,9 +1,5 @@
-DIST kicad-i18n-5.1.0.tar.gz 4332053 BLAKE2B 41292da8e5d3d686641fc8f421f7da585ee625586508dfddab03088ad213fbe3a83d54c504dcc73c885443390a83e998afd56fed06bb12277ff0003f03da3215 SHA512 c1d971958376d68fc7ea95551b8407344494b6babf807063efc0e392713a4807a3dbda42dc0d3c85035c7cfe19b2d5a139efb0a6323db642fe29852d0bdfccea
-DIST kicad-i18n-5.1.2.tar.gz 4263653 BLAKE2B ea85646cd6568374a1492be9119771c06bce1113c32360c653dc5b54944803c8fb99d1bfb6f8cde2502873215c99238afa7c2a66ba652f7815b9f0d256148a5a SHA512 9c7bb6a3d33442c019669f6bfebb6bff0cf49afaaa58772a70eca3dafb8d405d29ec5338e622af9c97c1cb0a9463a548af43b42178dbe6e647cad1d2638652a0
-DIST kicad-i18n-5.1.4.tar.gz 4310971 BLAKE2B cbd58b689d1889bc492837f00a62a3ac2a1c570a868b11911ea00d40585bd4d56a045435b1aa28fe0cbd374f5750d2e5ecb14e674ae9f2969b509057fbc95716 SHA512 28993e0021ebd7f3c0e7e21b609f57b85b95c74c33d65d30e707c5194b340dbb46142a6250a19256c927dc2f0600a7e1de723aefa9e74b2761ebc7c380143527
 DIST kicad-i18n-5.1.5.tar.gz 4330450 BLAKE2B c111073e97dd35d7545acbaf055918c21375bb4fef3fc9cbc81470d990e8103f0fbd7daf8117531353171239d6bbcffe195fb5933794c13c3978a9cdcf94bda8 SHA512 68e6602fcc7e73c22a594b45ecf53a956af8a134e28e86242bfaa4087df21c04b24ae4df9928f00c2cee7eb0631a02a4de1cd09547b36a466fb324f983ea5363
-EBUILD kicad-i18n-5.1.0.ebuild 466 BLAKE2B c046452f4f93fb0f07450f287012cde695d4ec04fe9b8739a91639eeaf4c1431f45ee02ba24b64710e69efe65f9a644293f5c6efdacb14be807736247a7629b2 SHA512 1e85dbe9b97f3c0506cea3abe14df09efb9434f743d9bafd1b368a23f661bfe070a2261d4380f14d77b76e0ff0ba0cec9ca935cab9f2bb2920dd1bd79020cf9b
-EBUILD kicad-i18n-5.1.2.ebuild 459 BLAKE2B 4fe20cef10baf977fb3ef550ebba403f99c614cbdaf9733fcd127ec9c3d30caa1a9d90a64515c0e5200f34dc3b237e776052ddc2e13a5786c4e381ded787ffc1 SHA512 60c0644549822e8767939c5eb42147ec2ce2d81de314b3a4b569e8bd7732c1518907cdde65d93ed8503fc92f829709dd729db3f6f1b7b719e72d46c2aa930fba
-EBUILD kicad-i18n-5.1.4.ebuild 459 BLAKE2B 4fe20cef10baf977fb3ef550ebba403f99c614cbdaf9733fcd127ec9c3d30caa1a9d90a64515c0e5200f34dc3b237e776052ddc2e13a5786c4e381ded787ffc1 SHA512 60c0644549822e8767939c5eb42147ec2ce2d81de314b3a4b569e8bd7732c1518907cdde65d93ed8503fc92f829709dd729db3f6f1b7b719e72d46c2aa930fba
+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
+EBUILD kicad-i18n-5.1.6.ebuild 461 BLAKE2B 596ffc0b7af633c99fec772aa0cf8371e52eae087d1b0b368fc6cfd1d6404ef4709af60d3b13532cfc0738f0f6458a2560a05494319cfcb1ba3e38e5b1a971db SHA512 8d8d1ce354b40b4955a27d10d4ed94b65640ba38256ff71f5077d082a28ecfc74b29e6c3c23284c2c71dd8e3745899e65413087f5cee407cf3efc9810f6924d8
 MISC metadata.xml 517 BLAKE2B be3a0d4a291df26add1c632add8b650486c95fea074acb030ce910b8ef64cd53add36bf16ac26c4e7781ee9a7942b2cca1ffa09b5869d9f0bfb4cac905c8652a SHA512 6f1579666c041f9192717440d617e2fbd55f58184ab82d6c724efa2a1c81f5fd7986f9ca934fe88cb459eed3d1b800c5c38889afef48ca81d79e0bec220441ba
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.0.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.0.ebuild
deleted file mode 100644
index f7ff2ba8751b..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/kicad-i18n"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.4.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.4.ebuild
deleted file mode 100644
index 7287a48d9e12..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/kicad-i18n"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.2.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.6.ebuild
index 7287a48d9e12..4e4b8730b265 100644
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.2.ebuild
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.6.ebuild
@@ -5,9 +5,9 @@ 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"
+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"
@@ -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-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 33d77a9457ca..3f5f61530358 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,5 +1,3 @@
-EBUILD kicad-meta-5.1.0.ebuild 591 BLAKE2B 89cf50dc0d7696c295f7f1f7971c6257075519f3ba975d9b22c1685fdf11fc9072b476ce63e6e4b8790d7749d4a535418e31b2911969adad4a28827a2fd22616 SHA512 69a516e5c0a619d98ca28596b28016d460ba650bda2d2c22ad111f98117e061fe308e53c46209b900af7f1a40c0e369d09b3b80206ecc16a1402f9ec8b72f221
-EBUILD kicad-meta-5.1.2.ebuild 617 BLAKE2B d66ce1689db271ad6cb5f9e4ded2d14bca770d2685fd3da1911225ed9eb509679ebb8e3ecd8224feac48d0b1570ef2be2f9a7e59a11c62da4e4b05b32a333b9e SHA512 b9c98d3b8fe0e266e77f06ac0608453ecdcb6002058652e89a6f92a0f68da896219383080d9c8803b91ff3bddd570a867010fc999e7daf49c36e2363615ac7a2
-EBUILD kicad-meta-5.1.4.ebuild 617 BLAKE2B d88bce44a5465546b6117d1a1374a339e325067e4ad71ec9e32790634972ab2d0c617d1bc73ec5fb01e9c2721d765a01f0896e62a4d06d0ccea08978143183bc SHA512 938792ad43afdf1721911d485708d929df8d7052e25c7874175f0db878dce10ebef03a2088c8cba4289fa6a26723b509f715e3fe3bd0a8e556beef9e23ff2349
 EBUILD kicad-meta-5.1.5.ebuild 617 BLAKE2B 496eeb23de7d970765fe14f42c5ce6316d53ae61e9c922496b984a7dbe6e72e37a513bde03ebb72ef5609f31240f413d1def639762a2798f4f3ccb865c7cdbff SHA512 4dbc7a9a33f909e646d35970034f9aa537eeadbb5255be8fb3b23a849bd0367cfce9ea5e52a1072d34e7649939a93a768754b044fdf6a81d1232fa9d914357c1
+EBUILD kicad-meta-5.1.6.ebuild 617 BLAKE2B 7cba176e653fcbfe26ba8af93d7337e0e64280c349b550d819dd188051588deb286f57bd6c66e9260b727c28b984272b78beb13f3afb24f6310c02b2162ccc29 SHA512 6c4ea61cc5374bc246c6ffce97034c52de9082b3cc6e7110da137e68cdfe8585187f88f532eb507c3ed1562d616f1e764f96640fb8c1528c8b94c8780c1698e2
 MISC metadata.xml 594 BLAKE2B f9fa7bf50bca85e78a51d280c8d040c0be2aa6c4384b9577e24d02518e7c21af352590c774129fd7cdac6ae9de6557e3f4e115be8d7996e12dc66946729dd9d7 SHA512 ce90535f2ca5a5e33fe577c4cc2ea8a345cf708bd2a223e8922354d73d9aa7e7b4be557f5f4e021f48f8d5f34bca34ed01e192094edc7764779630331463fadf
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.0.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.0.ebuild
deleted file mode 100644
index f556139c384c..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 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-pcb.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-5.1.0
-	>=sci-electronics/kicad-symbols-5.1.0
-	>=sci-electronics/kicad-footprints-5.1.0
-	>=sci-electronics/kicad-packages3d-5.1.0
-	>=sci-electronics/kicad-templates-5.1.0
-	doc? (
-		>=app-doc/kicad-doc-5.1.0
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-5.1.0
-	)
-"
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.4.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.4.ebuild
deleted file mode 100644
index f411f4572daf..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 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-pcb.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc minimal nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-5.1.4
-	>=sci-electronics/kicad-symbols-5.1.4
-	>=sci-electronics/kicad-footprints-5.1.4
-	doc? (
-		>=app-doc/kicad-doc-5.1.4
-	)
-	!minimal? (
-		>=sci-electronics/kicad-packages3d-5.1.4
-		>=sci-electronics/kicad-templates-5.1.4
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-5.1.4
-	)
-"
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.2.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.6.ebuild
index 9ce9e0493325..2e480580842e 100644
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.2.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.6.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.2
-	>=sci-electronics/kicad-symbols-5.1.2
-	>=sci-electronics/kicad-footprints-5.1.2
+	>=sci-electronics/kicad-5.1.6
+	>=sci-electronics/kicad-symbols-5.1.6
+	>=sci-electronics/kicad-footprints-5.1.6
 	doc? (
-		>=app-doc/kicad-doc-5.1.2
+		>=app-doc/kicad-doc-5.1.6
 	)
 	!minimal? (
-		>=sci-electronics/kicad-packages3d-5.1.2
-		>=sci-electronics/kicad-templates-5.1.2
+		>=sci-electronics/kicad-packages3d-5.1.6
+		>=sci-electronics/kicad-templates-5.1.6
 	)
 	nls? (
-		>=sci-electronics/kicad-i18n-5.1.2
+		>=sci-electronics/kicad-i18n-5.1.6
 	)
 "
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 0bdce652a2c6..10283c6204f6 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,9 +1,5 @@
-DIST kicad-packages3d-5.1.0.tar.gz 867189320 BLAKE2B 6f7fd81f56fa4e731cbac0d0e59ed916a5e44d8e5116187d3069a2cae9b2920fc7bbca1014c1f4c3c6626b976b0ee71e9bf31e2df48e5f9f381cbe9c01c37f53 SHA512 31ead3cce5d064f7970dc0e88e23a2cdda2f8370ea0ddb6fc5e7364e52bb3d113e4e71f8f08951e284bb4d40bb6f5750ecf40480c4b26d61e59ece81d43018af
-DIST kicad-packages3d-5.1.2.tar.gz 888156027 BLAKE2B 09f5509c4387c0de9649bc926c3f57dc27c90f0e74dfdfb20943b755a3bf775454bdb31f3fc46da98befb86981570c48d80192c9998c7119062db94149a0e10a SHA512 21f59182ebe9fd65ae5bff050da2504f5418741c7390c6a0024bfbeb0dd701f34de29e2f2f5b08b94d512ba22c1a72facc51432a0858770916206300129ff4ad
-DIST kicad-packages3d-5.1.4.tar.gz 888665659 BLAKE2B ce2299b890397e7483ce609fa0c9a4f16b8940e32dcb942b97907fbc5168577d028e445d119c24a9dcaa4134de0ef273a60caaed6dd6caacba12640f73e2fde6 SHA512 39f6448670311055e74580cdbb196c71d184d0ce9c7b7ba849812cae3702e08273c1fcffe1ba6203ef6b5f54aa83845c4238c2b154eae44930dc411f8749201b
 DIST kicad-packages3d-5.1.5.tar.gz 888817126 BLAKE2B 1b515e3a2f81b0273491ba90d210de1ff43eed625eaff1c774fd969a3255d89c4ccab2ace3087210f5ac2012e0df75bb62f1683c89bcedf60f1c3f03ec2c7abe SHA512 844de269cd9c1c0c4082f09097dc853cd49a2942f621229604b9996c61f8e1c1a0b1008201ad2e13107a07b3f4601601f2d361b60b6e62984165dcdfd1dd378c
-EBUILD kicad-packages3d-5.1.0.ebuild 553 BLAKE2B 01289b9e549e0182f7cc39946946f35c21363c84e4e97f40e455cafdfe3cd454980bd19f8652c361d04d1538285a923a81bbf073fdba810bf29a4998f66b022f SHA512 6c5cd226b17d37b5835d081bed6e12d7840016ca193b2e038a18e37311b4a38de46b1962f25864335b8d1e02a6626378f8bf9ecb28fc3902335ac57b55586af8
-EBUILD kicad-packages3d-5.1.2.ebuild 553 BLAKE2B 01289b9e549e0182f7cc39946946f35c21363c84e4e97f40e455cafdfe3cd454980bd19f8652c361d04d1538285a923a81bbf073fdba810bf29a4998f66b022f SHA512 6c5cd226b17d37b5835d081bed6e12d7840016ca193b2e038a18e37311b4a38de46b1962f25864335b8d1e02a6626378f8bf9ecb28fc3902335ac57b55586af8
-EBUILD kicad-packages3d-5.1.4.ebuild 553 BLAKE2B 01289b9e549e0182f7cc39946946f35c21363c84e4e97f40e455cafdfe3cd454980bd19f8652c361d04d1538285a923a81bbf073fdba810bf29a4998f66b022f SHA512 6c5cd226b17d37b5835d081bed6e12d7840016ca193b2e038a18e37311b4a38de46b1962f25864335b8d1e02a6626378f8bf9ecb28fc3902335ac57b55586af8
+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
+EBUILD kicad-packages3d-5.1.6.ebuild 554 BLAKE2B f90d89ffab9127f911cc42233d303ca5569f8a2c200c337a4cda7a94f08e25e323ab9435cceb60387583808247523159141b4ab88e0aee7563a19b08d49149dd SHA512 f2d5cbe81d5fce256049734f7be1aa9ecdc694613a27a76a0d0552578668d121e4ab5e259940d7992fe7eb6b4ea0c2c60ce380bb945a4c709e6bc5b4d3842c1a
 MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.0.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.0.ebuild
deleted file mode 100644
index d0053954db89..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="occ +oce"
-
-REQUIRED_USE="|| ( occ oce )"
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
-
-CHECKREQS_DISK_BUILD="9G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.4.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.4.ebuild
deleted file mode 100644
index d0053954db89..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="occ +oce"
-
-REQUIRED_USE="|| ( occ oce )"
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
-
-CHECKREQS_DISK_BUILD="9G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.2.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.6.ebuild
index d0053954db89..f3d17f7c321b 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.2.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.6.ebuild
@@ -19,5 +19,5 @@ REQUIRED_USE="|| ( occ oce )"
 DEPEND=""
 RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
 
-CHECKREQS_DISK_BUILD="9G"
+CHECKREQS_DISK_BUILD="10G"
 S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index bdca4035eaaf..de6381481d4e 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,9 +1,5 @@
-DIST kicad-symbols-5.1.0.tar.gz 2837674 BLAKE2B e21d74e9b2e70bd5fbcf4d299ba65967ed3d1c7556bbcb12e9881e3cbf1ca224b2285f142aa3536d95c0e06b025590a3126128edfdf64f68341e9d73a5d14798 SHA512 6c0a193955c0a0219dc4fd60f5a214fcdedc2e38da5ddaabc72f829bfe0988a6a447e65a48908c00ba766190bdcd3e1a9505ddd66062c2528e431dde58f07e99
-DIST kicad-symbols-5.1.2.tar.gz 2858506 BLAKE2B 71642e4585c647a160a2fdd11d991c0044be3ff7a7521181adc1dc8b1df64404e538810f33dcc88c6690d640df2e4c54527ea90913a4ddd6f3bffd74d821043a SHA512 4cef0c98da2fb408ea4170bfbfed31c6b7f5c2f7d49061f86fac98c1acf52fbc035ef10833874bfad5c7efa4643ebf6a989d30e5035038a54d208c3bcc61bda2
-DIST kicad-symbols-5.1.4.tar.gz 2897335 BLAKE2B d5bb84056b2f878dbb2ceee32a0e2e2976e1f5d76c35dd16f958f84cbce72e186cd03c2f52a9b511c0e9d24028c9c43e20190aa141cd8f7b854ccbd58d48de7d SHA512 573dd74d5d3c2b32fc12499826a9e43e5d63649f760c91e5fc3d7a8acb44b2308bbd70facc4f29d139dd895ec26f0feb1d9195b2194131e6c13397d030464fd5
 DIST kicad-symbols-5.1.5.tar.gz 2922505 BLAKE2B 98c121139b8847678e6aa6a657c23168a7468c9f2ba342f335ba8ce373d6352b985db8b6549f9bfecc914eed686aa14bcb5b3112772f945e50e0f9c1cdb40a33 SHA512 345c7990ba17f778fa975250fbb067a01472aa6e03cbd08a1e34203af5517981b6a569981e30b4d56e58a3966c364b529b9679a96a46ef538bd5ac6a6b46eac7
-EBUILD kicad-symbols-5.1.0.ebuild 444 BLAKE2B 65693d6ac0ceceb7bd765f4c823967c8d2b11cdfe6cbdc12b2b8e23bdf2c3bbbbf08ffbf64b9a193033ba45583996cd1b6d4e763ce3823b29da7bed9ec281da1 SHA512 a054cc56e9d2fb749cd4fcab1732eca1919e7aa7fdbeefbe501bfd159390745f267be424adf8f4b5b719b8f381d9b21e8a88d49e3c44bd9ab078a48b610565fc
-EBUILD kicad-symbols-5.1.2.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
-EBUILD kicad-symbols-5.1.4.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
+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
+EBUILD kicad-symbols-5.1.6.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
 MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.0.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.0.ebuild
deleted file mode 100644
index ce2bf639876f..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.4.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.4.ebuild
deleted file mode 100644
index b0040b719b9e..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.2.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.6.ebuild
index b0040b719b9e..b0040b719b9e 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.2.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.6.ebuild
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index ccf542b330bd..34319b767715 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,9 +1,5 @@
-DIST kicad-templates-5.1.0.tar.gz 1620695 BLAKE2B 3b66560639d6df31f6b5f5e579aa5616d6483d445ff7ab1fff0d055d5bc96979c181fa27039730b19d9957f967d1f7b3cdc00a1d7d9c4a1aaf7a0e0081ced43a SHA512 59f29b205dcd7cd4ec883bca79d2a2e8736734407d9bd343316dcc7321bd84800415c24f9bc397e67b6029b2c1226e9a9806fc86fb52829f841788421a78e89e
-DIST kicad-templates-5.1.2.tar.gz 1620807 BLAKE2B 8d243cda34bfed210adaaaf893770808df8eb21ac529818b9b6108a1195b50cab27a7ebcbf20e6b549c83285566722958641524b13bc714bdfc4e5115e48f45f SHA512 789afb4c96f8cc7cfbb9fbd632026478862e38ae972466d49e1620c75e30fd3e38f13155e49bec79a04211e5628152a55b62c847e229d582025045023f2ce8ae
-DIST kicad-templates-5.1.4.tar.gz 1630338 BLAKE2B bdebce3e9c83b0d229c432d96e6d51ce506650f2c4231c3153b94d394efd5e430755049d687782d715d313cb0e0af08c00c4b87497fa55b0d9bd447b8b096fdf SHA512 20409524ba8e195b774c703bfa99bc6d65d8fc46de5fae5cc5c3f5f37d0b9115cc56d116262ac6df56658840b2b1c7fbab65c9ac9fd1bfaafb56dedcdf691bf4
 DIST kicad-templates-5.1.5.tar.gz 1634911 BLAKE2B 899b692de58660eada32a9f31c01b0b51fa5a6233da2395285b8526df411be6260ed07f4f7dc637229874d849d144597822fbf19be1ef48d09505d5bd7a0b216 SHA512 9836ac57d8f0e394eb5bd9a05fb73dd25dc4c0d3dfe20a1271c59b7247b9af2b38c01dd14706add16ba3eaa26d79a18052669ef6404ed3eea0d6ad6d7767a9fa
-EBUILD kicad-templates-5.1.0.ebuild 453 BLAKE2B a8b79b4a24d2cfccc89322a878ac53257905245b0141c26d51e4615b48816a2b9d62b278ecc43526030a3b78c2e5d0538ac2eb3362976670a11b0775848dec65 SHA512 c941b5019b8b04db43d01d25f04d7a1b300a664818c478a8c6d0a70564ddec0c241dec9f89e183026fb3b620cfed4648b76c97b5b482a0d0506461bdcc506f5c
-EBUILD kicad-templates-5.1.2.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
-EBUILD kicad-templates-5.1.4.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
+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
+EBUILD kicad-templates-5.1.6.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
 MISC metadata.xml 523 BLAKE2B 69cc5f4bec43a5acd17e3f762c7648e9af9c70a06516b233d78cd5446a0638115caff7559d43b13abd2929c0d7424335c00ad5cc72a1123fcdc6590fd1da8c23 SHA512 c8f588b7a40f7a1f703566b3585c9fa8051ceaae27db76912fc9f228aa27f0dfe9dcc90b728e11d94e27b6b3ed2ae55f0b0f98d2094ade00befdfd742f485d59
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.0.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.0.ebuild
deleted file mode 100644
index c4fe39ee6dfe..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.4.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.4.ebuild
deleted file mode 100644
index 8ce2e5c4c462..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.2.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.6.ebuild
index 8ce2e5c4c462..8ce2e5c4c462 100644
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.2.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-5.1.6.ebuild
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index d4dadec3e3fe..614ca5eca4fe 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,25 +1,21 @@
-AUX kicad-5.1.0-help.patch 4690 BLAKE2B 5459e3e7fde22590f4357ec3981c9bc2d784f533cc0370befb6851fb01954923722c815aaafa4dcd37f15c74bc31fd3b711ac106301abeb195dedc8086965c47 SHA512 ed5c70b0157ff4db152e2374df669210b194147655c7c5083ffb2f5ce56358c30c4cb2aaff2368f3a34757e5a5021b335ce169727eaaf511b12d1ceb3fb9a350
-AUX kicad-5.1.0-swig-4.0.0.patch 623 BLAKE2B 66d3974741793b84a192d9223e739deddc544c230a8618aa78db1fe48bec1a632cb07bfcdb0b01137c1b1e4cb7d5fda4330c7cb717ea894d6279660752056e7b SHA512 c43552d6da296cbc11232f565a9525fc707304e9a823e4e003d998f4ef013d82708c7b17b4bcef82c661e0f53e849d372c089a077a356b006db3523ffe82892a
+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-algorithm-header.patch 417 BLAKE2B 644aeb5a0c2b084aeea5fd1a18d03bd16df6762a8b848021d6a0e6549142c9e1d3318c7bf20c9b594f9cebe67ecdebd42eacd2d15cb9e0652a5fc3afbc9b12fe SHA512 22424e038ee90dc73344dde8de553c614b3c29fb98fd74879b9dff4196a0d3317be8ec55d95bef57303e5961b20098ed4e29e1dfc25c206d396167a835ac6e9f
+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
 AUX kicad-boost-1.61.patch 9565 BLAKE2B edfafc5a9ef70ace413f7b1fb1c0a47fb4abc4bd52f0ec085d5449b5dc7bea454f16e809ea0c12a274f809bd52549507aefee6e34c9f32bf341449e6de2c87cf SHA512 a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee
 AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b58367fe8536d9349ac1a6c64368b481921b1477d73a126e2be6806b0a5f4404a586a318ca685a67ecac30ebc1a402c518d65680da SHA512 3d11ebd04dcd3b4f08de3b8c2f3e2d5b5022421caea4ca69ab22f45865f6ead5196bb5bc423761679f9259030cc2c8958cc27d9309a8485c69f5ef7393e330cc
 AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822
-AUX kicad-metainfo.patch 582 BLAKE2B 4eeeca5edb27989bfb953e8154dde533cca80cd2afa42e6e3bbd06190ca7371f48cdea2610761092a80e9cf0f25ebb8ea40271d79fef2fb3e7c803accf6fcd02 SHA512 cd3f0366df21609a7deadffb7bb4a2a134c9bc6e5c1aa8ef9b3c685cffc1662ddb8cd8d3769b52c0fe77af832f0b4758584c0b29e8af54a20667f2f522e15585
-AUX ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
 DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
 DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B 182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad SHA512 644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761
-DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e SHA512 5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b
-DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b SHA512 ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
 DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
+DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
 EBUILD kicad-4.0.7-r1.ebuild 6708 BLAKE2B 9c1b70aaa068b9d874ee8f84c8bd79b849a02a91577c43e5b27881b856579248d56de03299300a900e9583d0f2d639ca15e150382236671521f690769c1cce2b SHA512 f2f426f0936148dd8a1d46f81be89cdbbdacf4e363755848bc06f2742600f92e39ab8438a825c1180f2811d9689161fb203e1f49457d7b2a8630a042e604e1c4
-EBUILD kicad-5.1.0-r1.ebuild 3599 BLAKE2B 29f32dd7320c26a0522f11ea53683681245dfc99f9c64a6a2da859560d69092b9e7e6bf89353a53dbf5d736a70db11a1056b2b61ce4ac170736cc7ad9f307475 SHA512 dca933f4b6fd96bd57cd6973925b5552082355dc1ce2ddde8f028628e0a7200dd494bd03b91788ed6e1cc057d240a183689751bd9bb44e13ca37dfc5329084da
-EBUILD kicad-5.1.2-r1.ebuild 3675 BLAKE2B 48fb984e78eb3dfc2423b014c9312d05950a987695ffda2b63d3a3e3854496ce1039d5c14968c97e62a4b29b6d19596790492c3427be0cc2cefb714b6e0fee54 SHA512 6d89d89410d1a81aeee929de11e462b13d716d9c00a4552879530ad40df2f72883a91f5b9d6dd29dd37b811b060be1c7791e03caf84afb09bb4afe9b0854a3b1
-EBUILD kicad-5.1.4.ebuild 3639 BLAKE2B 2f140b6583965c2287a9a6e83f450e741455b34239be39c2ea87930569e487434507e21041c661242bbcfc4cb6eb5e8276551c4b100f58796f16b5c22b221054 SHA512 bbbdd68f196db3e4ef28f88695295e4e2f32960af970813cc8b17362fc3949a76556c0f659631cf5f0615d7a2cffa49ecc8654127f38b5c9c18c5f10e4060089
-EBUILD kicad-5.1.5-r2.ebuild 4333 BLAKE2B 5718da8e06510a5ded9db43da56acff9175016771f5919439e56003a172e6086cbb44b74bc83170660866142461c81017ab8f76b08ab94bd78bc474d7db5a92a SHA512 25b5a64bd0fbef7eefef88f6a5af4f0d758979d003cda5faee3f28f748c2e9d1c3dcf6e99ffd643d4c2cb42f0903bcf78facc30ff59670464d129f1bf90ac616
+EBUILD kicad-5.1.5-r2.ebuild 4305 BLAKE2B d41a667f513624973305ee599d8ab77b2efee05b6c48d604c529cf51e45b80d05a8d04399d076e6faa3df1793dbd6fd151640ca97272196e79f8c9f2feec54cd SHA512 4c3cd4d857b17a0121d508adc1e03bb6fa63fa8f5232b162c7cb021c319d559e288656b97c10a84b40627a3151583937bb5399599301378129c112966c9ce3d8
+EBUILD kicad-5.1.6.ebuild 4338 BLAKE2B f2237d955ceac04f914f6f003857c448aa50b4096d68b3602941497469a7bbc905548aa0c6725e12745c8e6807b63603b733fe7b0fd23b7f7ec7c14a6b8347bd SHA512 41d24eb3e5f9cdf1e352e9d49851140945f75b9919c78a62cbc9589eac7f5496a0282ea21cd2eff776905f4bd26624687a92c9ae1dbaf4983bee556f606c3bf7
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/files/kicad-5.1.0-help.patch b/sci-electronics/kicad/files/kicad-5.1.0-help.patch
deleted file mode 100644
index e89b7e45c24e..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.0-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur /tmp/kicad-5.1.0-orig/CMakeLists.txt kicad-5.1.0/CMakeLists.txt
---- /tmp/kicad-5.1.0-orig/CMakeLists.txt	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/CMakeLists.txt	2019-03-24 16:16:58.287376258 -0700
-@@ -427,6 +427,10 @@
- set( KIFACE_PREFIX  "_" )
- #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
- 
-+# KICAD_HELP is the location of the help files accessed from the UI
-+# (usually provided via kicad-doc package)
-+set ( KICAD_HELP share/doc/kicad
-+    CACHE PATH "Alternative location of KiCad help files.")
- 
- #================================================
- # Locations for install targets.
-diff -Naur /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake kicad-5.1.0/CMakeModules/config.h.cmake
---- /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/CMakeModules/config.h.cmake	2019-03-24 16:16:58.287376258 -0700
-@@ -59,6 +59,10 @@
- /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX.
- #define DEFAULT_INSTALL_PATH            "@DEFAULT_INSTALL_PATH@"
- 
-+/// KiCad help files path can be different on some systems allow adding alternative,
-+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad
-+#define KICAD_HELP                       "@KICAD_HELP@"
-+
- /// The wxPython version found during configuration.
- #if defined( KICAD_SCRIPTING_WXPYTHON )
- #define WXPYTHON_VERSION                "@WXPYTHON_VERSION@"
-diff -Naur /tmp/kicad-5.1.0-orig/common/searchhelpfilefullpath.cpp kicad-5.1.0/common/searchhelpfilefullpath.cpp
---- /tmp/kicad-5.1.0-orig/common/searchhelpfilefullpath.cpp	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/common/searchhelpfilefullpath.cpp	2019-03-24 16:17:31.527588523 -0700
-@@ -25,7 +25,7 @@
- 
- #include <pgm_base.h>
- #include <common.h>
--#include <config.h>     // to define DEFAULT_INSTALL_PATH
-+#include <config.h>     // to define DEFAULT_INSTALL_PATH and KICAD_HELP
- #include <macros.h>
- #include <trace_helpers.h>
- 
-@@ -69,6 +69,10 @@
-     wxArrayString   subdirs;
-     wxArrayString   altsubdirs;
-     SEARCH_STACK    ss = aSStack;
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+    SEARCH_STACK    altss;
-+    wxArrayString   moresubdirs;
-+#endif
- 
-     // It might already be in aSStack, but why depend on other code
-     // far away when it's so easy to add it again (to our copy) as the first place to look.
-@@ -76,6 +80,7 @@
-     // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
-     // build configuration:
-     ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
-+    altss.AddPaths( wxT( KICAD_HELP ), 0 );
- 
- #if defined(__WXMAC__)
-     ss.AddPaths( GetOSXKicadMachineDataDir() );
-@@ -104,16 +109,17 @@
- 
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     subdirs.Add( "share" );
-     subdirs.Add( "doc" );
-     subdirs.Add( "kicad" );
-     subdirs.Add( "help" );
- 
-+    // For custom help path installations via ${KICAD_HELP}
-+    moresubdirs.Add( "help" );
-+
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     altsubdirs.Add( "doc" );
-     altsubdirs.Add( "help" );
-@@ -159,6 +165,9 @@
-     {
-         subdirs.Add( locale_name_dirs[ii] );
-         altsubdirs.Add( locale_name_dirs[ii] );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.Add( locale_name_dirs[ii] );
-+#endif
- 
-         fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs );
- 
-@@ -188,8 +197,27 @@
-         if( !fn.IsEmpty() )
-             break;
- 
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+        {
-+            // Prepend URI protocol since we will open in a browser
-+            fn = wxT( "file://" ) + fn;
-+            break;
-+        }
-+
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+            break;
-+#endif
-+
-         subdirs.RemoveAt( subdirs.GetCount() - 1 );
-         altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#endif
-     }
- 
-     return fn;
diff --git a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
deleted file mode 100644
index 3ab6677e5e18..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/scripting/build_tools/fix_swig_imports.py	2019-04-22 23:14:54.000000000 +0200
-+++ b/scripting/build_tools/fix_swig_imports.py	2019-07-18 15:44:24.255754237 +0200
-@@ -40,6 +40,9 @@
- txt = b""
- 
- for l in lines:
-+    if l.startswith(b"if _swig_python_version_info < (2, 7, 0):"):     # ok with swig version >= 4.0.0
-+        l = l.replace(b"_swig_python_version_info < (2, 7, 0)", b"False")
-+        doneOk = True
-     if l.startswith(b"if _swig_python_version_info >= (2, 7, 0):"):     # ok with swig version >= 3.0.10
-         l = l.replace(b"_swig_python_version_info >= (2, 7, 0)", b"False")
-         doneOk = True
diff --git a/sci-electronics/kicad/files/kicad-algorithm-header.patch b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
index aa118ea6f860..aa118ea6f860 100644
--- a/sci-electronics/kicad/files/kicad-algorithm-header.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
diff --git a/sci-electronics/kicad/files/ldflags.patch b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
index 1495037b1b72..1495037b1b72 100644
--- a/sci-electronics/kicad/files/ldflags.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
diff --git a/sci-electronics/kicad/files/kicad-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
index 48a5ef5be507..48a5ef5be507 100644
--- a/sci-electronics/kicad/files/kicad-metainfo.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
new file mode 100644
index 000000000000..675ff749de8d
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
@@ -0,0 +1,30 @@
+diff -Naur kicad-5.1.6-orig/CMakeLists.txt kicad-5.1.6/CMakeLists.txt
+--- kicad-5.1.6-orig/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/CMakeLists.txt	2020-05-25 20:45:57.199559075 -0700
+@@ -929,7 +929,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 ${PROJECT_BINARY_DIR}/resources/linux/appdata )
++    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/metainfo )
+ 
+     # Install Mime directory
+     install( DIRECTORY ${UNIX_ICON_FILES}
+diff -Naur kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake
+--- kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-25 20:54:51.927438936 -0700
+@@ -36,11 +36,11 @@
+ string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
+ 
+ # Configure the KiCad appdata file
+-configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/appdata/kicad.appdata.xml.in
+-                ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml
++configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/metainfo/kicad.appdata.xml.in
++                ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml
+                 @ONLY )
+ 
+ # Ensure the file was configured successfully
+-if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml )
++if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml )
+     message( FATAL_ERROR "Configuration failed to write file kicad.appdata.xml." )
+ endif()
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
new file mode 100644
index 000000000000..baff144fbd85
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
@@ -0,0 +1,45 @@
+diff -Naur kicad-5.1.6-orig/pcbnew/CMakeLists.txt kicad-5.1.6/pcbnew/CMakeLists.txt
+--- kicad-5.1.6-orig/pcbnew/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/pcbnew/CMakeLists.txt	2020-05-25 20:57:03.387859088 -0700
+@@ -805,11 +805,7 @@
+         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation )
+         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()
+ 
+@@ -824,18 +820,16 @@
+             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.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
deleted file mode 100644
index 558341e09d25..000000000000
--- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Can switch to EAPI=7 when wxwidgets eclass also supports it
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
-
-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=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep "
-		python? (
-			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? ( net-misc/curl:=[ssl] )
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
-	oce? ( sci-libs/oce )
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}-5.1.0-help.patch"
-	"${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}"
-		-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_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-	)
-	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-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake-utils_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
-}
-
-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
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
deleted file mode 100644
index 0afea3166881..000000000000
--- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Can switch to EAPI=7 when wxwidgets eclass also supports it
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep "
-		python? (
-			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? ( net-misc/curl:=[ssl] )
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
-	oce? ( sci-libs/oce )
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}-5.1.0-help.patch"
-	"${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}"
-		-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)"
-	)
-	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-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake-utils_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
-}
-
-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
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
index 26d76cf58871..c2cf00a4c934 100644
--- a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 WX_GTK_VER="3.0-gtk3"
 
@@ -55,12 +55,12 @@ BDEPEND="doc? ( app-doc/doxygen )"
 CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
-	"${FILESDIR}"/"${PN}-5.1.5-help.patch"
-	"${FILESDIR}"/"${PN}-5.1.5-ninja-build.patch"
-	"${FILESDIR}"/"${PN}-5.1.5-strict-aliasing.patch"
-	"${FILESDIR}"/"${PN}-algorithm-header.patch"
-	"${FILESDIR}"/"${PN}-metainfo.patch"
-	"${FILESDIR}"/"ldflags.patch"
+	"${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"
 )
 
 pkg_setup() {
diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.6.ebuild
index 88c18773559e..102ed1968447 100644
--- a/sci-electronics/kicad/kicad-5.1.4.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.6.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Can switch to EAPI=7 when wxwidgets eclass also supports it
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils
+inherit check-reqs cmake eutils python-single-r1 toolchain-funcs wxwidgets xdg-utils
 
 DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
+HOMEPAGE="https://www.kicad-pcb.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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc examples github +ngspice occ +oce openmp +python"
 
 REQUIRED_USE="
@@ -23,36 +23,44 @@ REQUIRED_USE="
 	?? ( occ oce )
 "
 
-COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep "
-		python? (
-			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? ( net-misc/curl:=[ssl] )
+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/freeglut
 	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 )
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30"
+	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}
-	doc? ( app-doc/doxygen )
 	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.0-help.patch"
+	"${FILESDIR}/${PN}-5.1.5-help.patch"
+	"${FILESDIR}/${P}-ninja-build.patch"
+	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
+	"${FILESDIR}/${PN}-5.1.5-algorithm-header.patch"
+	"${FILESDIR}/${P}-metainfo.patch"
+	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
 )
 
 pkg_setup() {
@@ -62,11 +70,22 @@ pkg_setup() {
 	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/${P}"
+		-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)"
@@ -79,6 +98,7 @@ src_configure() {
 		-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)"
@@ -91,18 +111,18 @@ src_configure() {
 		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	if use doc; then
-		cmake-utils_src_compile dev-docs doxygen-docs
+		cmake_src_compile dev-docs doxygen-docs
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 	if use doc ; then
 		dodoc uncrustify.cfg
@@ -122,11 +142,11 @@ pkg_postinst() {
 
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 7c22f3e38bca..76bbb6c73494 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,6 @@
 DIST klayout-0.26.4.tar.gz 52324714 BLAKE2B 663ab737d91a83452234f128b13f73ed8e559e6f0fb11f283bce6bfe80e8f391c7bac5ad16933b2f5bcf46fac6e07233ffc690dea5ddb1702850c52501157c36 SHA512 df91434e87d8cc6f4df837eacd756566626405fb75b0cce40c25f157d547dc1e5929746b6b276a317512c038e014bbdd1655615c93d76d9ed5bcf65280d95355
 DIST klayout-0.26.5.tar.gz 52335763 BLAKE2B b1ab39c378ce23c28f5a58191dbf43c5b8c165e9df241b00573c8f8b72a5a7251cddd41bf62a7e37f59cad68024c52ab99f8d0f10bf1bf45dba975bf37ba80db SHA512 b80dff34a9dd538921f6863fc94eb8a2160b989468ec0493a7ecfdfccea0e4f0441aa1ee860d000b150b0a0bc0b831dcb849ab77e9eb1304e9ed6fcced94689c
 EBUILD klayout-0.26.4-r1.ebuild 1838 BLAKE2B bf2c3445ab7625124bed08a64ff3973340823eafad89b234737336c70d5864c2a20a966f8fc59c0cb675f375fbcda95fbd9d5f1850403c5d603cf5f629190045 SHA512 d0fa0f591028c6074347576b0747f210971fd447e429d4bc23126c12d2492a034b0506827bb765d06fcdd77fac8bae358c6f88467dd6ed55397a2cddbd954dfc
-EBUILD klayout-0.26.5.ebuild 1839 BLAKE2B ebf02ff39559da3d6a4f20e7027447e88461af7f6ab34b9dda4dad3a3adda0a0227e869576c5eb34f75c1029a61df4eb690721b4985d4f82b4e4d92afceac03c SHA512 38d243703148e912550c7b1d979eb621f9c7deebb289b092cf42c88ab7403bcdba2a60c1a75f6dbf8db40b14d4cc28c545d20373799e635d10ffca1fdc8c4437
+EBUILD klayout-0.26.5.ebuild 1838 BLAKE2B bf2c3445ab7625124bed08a64ff3973340823eafad89b234737336c70d5864c2a20a966f8fc59c0cb675f375fbcda95fbd9d5f1850403c5d603cf5f629190045 SHA512 d0fa0f591028c6074347576b0747f210971fd447e429d4bc23126c12d2492a034b0506827bb765d06fcdd77fac8bae358c6f88467dd6ed55397a2cddbd954dfc
 EBUILD klayout-9999.ebuild 1839 BLAKE2B ebf02ff39559da3d6a4f20e7027447e88461af7f6ab34b9dda4dad3a3adda0a0227e869576c5eb34f75c1029a61df4eb690721b4985d4f82b4e4d92afceac03c SHA512 38d243703148e912550c7b1d979eb621f9c7deebb289b092cf42c88ab7403bcdba2a60c1a75f6dbf8db40b14d4cc28c545d20373799e635d10ffca1fdc8c4437
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.26.5.ebuild b/sci-electronics/klayout/klayout-0.26.5.ebuild
index 30250478884e..d0ce619c189e 100644
--- a/sci-electronics/klayout/klayout-0.26.5.ebuild
+++ b/sci-electronics/klayout/klayout-0.26.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"