gentoo resync : 18.08.2019

23 files changed, 294 insertions, 10 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index b69fc0d5de63..17b822044ba8 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 4463daaad9d5..12cca780f763 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,7 +1,9 @@
 DIST kicad-footprints-5.0.1.tar.gz 5074166 BLAKE2B eb8a532c83af37d241c0eb73b7ac0a6bdd75e87f5d06ebdb9a109160cae131240f4f5516c9bd38785c51e068ffcc29cdec075565bc4bc14af3924f814a68aa54 SHA512 16057e7a768097a7e97ae8a25d0c35891d04621e5d5b7437e80f893f48365e562b69c38a8076c1dab0455801359e766fcd1f7d31fec2cc78c9e7cda2d6f210ae
 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
 EBUILD kicad-footprints-5.0.1.ebuild 456 BLAKE2B b49fd1584b037aa4cf93ddc7b86ae699914c1c5838c4cdfeb3a09c11e346e0de0a8f37a01ec01cc975d959c84da0a7c1e311294b6927ff47385062e8987e639f SHA512 c16d4558d3e37f60382c05c18aba6fefc431a2c884d4c1a93685f394c5ab42cc423770d518d65ab62007d10ad6d64047ee7a517c953388c0d9b19e75a11e4429
 EBUILD kicad-footprints-5.1.0.ebuild 456 BLAKE2B 54bf8b030085bfed1bab032713cab089fccaba6ae5ebeb1c9a5ec043277d6ca62cc8952c1fe0255017ee997980f515e78771d1a72f351796e10aa9d4b199bce8 SHA512 d4543b6a86b07f13d62b18daf7a867fce54ca79fb131ccdfcbbf93f7d2d4daa72703b09e3f7ce175661f759af2a123848dc9f86fddc62477fa18b9daf9665d39
 EBUILD kicad-footprints-5.1.2.ebuild 449 BLAKE2B 78e59ca02c42c1f5db3f105d71139faa2f7f927f2ef884e24fb4313676448c842d75b498b606b24e48adcb2ffc8e7cb7f5cad5f12174c9e8fa16b91d5aa315d6 SHA512 9657095f4893f9e9acefda665ed4ffeb359accaf4a70415e58a312d5caf2005ce21a21c63631b1d3dbcced18749b0fad4584997dac0cf00e67d2904b63502971
+EBUILD kicad-footprints-5.1.4.ebuild 449 BLAKE2B 78e59ca02c42c1f5db3f105d71139faa2f7f927f2ef884e24fb4313676448c842d75b498b606b24e48adcb2ffc8e7cb7f5cad5f12174c9e8fa16b91d5aa315d6 SHA512 9657095f4893f9e9acefda665ed4ffeb359accaf4a70415e58a312d5caf2005ce21a21c63631b1d3dbcced18749b0fad4584997dac0cf00e67d2904b63502971
 MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.4.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.4.ebuild
new file mode 100644
index 000000000000..87e73ca040ba
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index 06d50e40ff63..73a818037966 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,7 +1,9 @@
 DIST kicad-i18n-5.0.1.tar.gz 4062609 BLAKE2B a3113758cc1e813fca97abd9c4e5ca367f974900b6ca7072c55eef9d9eff6274bacdad37b81a98f650c05be8fbdff306dc59db1cdd1a22b4d0776c9a89454303 SHA512 5254f6f945fa63e56bc3e9440cf506da3a4ccd76a58fd7e052a04ff60ecaa0daf6ad0599376a5175a4628d40cb1e317973e470a1593714186adb393c20761e24
 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
 EBUILD kicad-i18n-5.0.1.ebuild 471 BLAKE2B 4ead8d717ce3a8c3b4f9451b806812647787507a4ccaa8d925aa2f81539c21468cf4a63b37c3cb017f9d938f17f036f11cd25e41309f41ccad22d3ea2f01222b SHA512 93715c5579ae737a6418597f87e1fb57cc75bbc9085faf84dfde5302f8d01b599602ac403145faa6b29feb73f9f2ab0934669b9a6e9c16f401530ef0a9e58a63
 EBUILD kicad-i18n-5.1.0.ebuild 472 BLAKE2B b999b506fbaf42ea11686e78798e559705954f9f0a864766189d3aa418775590654c459269a7be6d6a13da98d87a2e14a555dc00b850f0108fb67642ae639067 SHA512 b726169898a204cbff744e15b7dd42397f1900f7a18d6134b4c3f8aa015505465fd4e5258f2b9df80467352ca304e32a6b8856548e4e9829b8d3f8f86e4de357
 EBUILD kicad-i18n-5.1.2.ebuild 465 BLAKE2B cc7ee606641804dcd1c49418bd4ccf3ea091a4bcd7e2fb9d6d915e15a582bb08d4c5f292bbb0e3765a616ebc3e22516690d87cbab5ae1ee202b248ac8d0cbe92 SHA512 fdc3e342c616c7f64ea88d1d5abbb493b0d1f2b0e4b3b9d6864b15ceddde1cfc0e8811698829a108b6bb6ce99b3a7a5ad0657f2d2ef1220161b5953178c3ba32
+EBUILD kicad-i18n-5.1.4.ebuild 465 BLAKE2B cc7ee606641804dcd1c49418bd4ccf3ea091a4bcd7e2fb9d6d915e15a582bb08d4c5f292bbb0e3765a616ebc3e22516690d87cbab5ae1ee202b248ac8d0cbe92 SHA512 fdc3e342c616c7f64ea88d1d5abbb493b0d1f2b0e4b3b9d6864b15ceddde1cfc0e8811698829a108b6bb6ce99b3a7a5ad0657f2d2ef1220161b5953178c3ba32
 MISC metadata.xml 517 BLAKE2B be3a0d4a291df26add1c632add8b650486c95fea074acb030ce910b8ef64cd53add36bf16ac26c4e7781ee9a7942b2cca1ffa09b5869d9f0bfb4cac905c8652a SHA512 6f1579666c041f9192717440d617e2fbd55f58184ab82d6c724efa2a1c81f5fd7986f9ca934fe88cb459eed3d1b800c5c38889afef48ca81d79e0bec220441ba
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.4.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.4.ebuild
new file mode 100644
index 000000000000..5632bdece4ef
--- /dev/null
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 67ea88c19c54..f5987bbf9c5d 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,4 +1,5 @@
 EBUILD kicad-meta-5.0.1.ebuild 591 BLAKE2B 0ecd15509f5670c65f14efee4bb8a070359fc1cacff48d0bcd97bc77fbfdcd159c68b43052c502e5afa4a598e811e5274fcb42069f9f7ae670f7feb9e5e0927d SHA512 c9b92be8e65e935fa2b29d62a0a8e740fd8bc1b3e7ea87345a63b57f37877843a709494e2fcfffb68f223ea8f8655dd9a0fdb13985bc7b5021ece24dc01d907c
 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
 MISC metadata.xml 594 BLAKE2B f9fa7bf50bca85e78a51d280c8d040c0be2aa6c4384b9577e24d02518e7c21af352590c774129fd7cdac6ae9de6557e3f4e115be8d7996e12dc66946729dd9d7 SHA512 ce90535f2ca5a5e33fe577c4cc2ea8a345cf708bd2a223e8922354d73d9aa7e7b4be557f5f4e021f48f8d5f34bca34ed01e192094edc7764779630331463fadf
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.4.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.4.ebuild
new file mode 100644
index 000000000000..f411f4572daf
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.4.ebuild
@@ -0,0 +1,29 @@
+# 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-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index f519ad60b1d0..d66b3a4a17ee 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,7 +1,9 @@
 DIST kicad-packages3d-5.0.1.tar.gz 791951390 BLAKE2B 31c10869d53c7fe262bc90c721d0e99b1381e5faaf157597f5c58b00f328ab654260cc306466fbdb3ed6c48e71d21b48e74365d62aca009a2d3b77c0c3feb988 SHA512 8f188c5b97904eca0e564ccbdf29c0b6cf99fb60290f3c11a22d4c38c91edb3aee20412be867eee84007e39d54f808cff713f6252536045d92e891ed735ed334
 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
 EBUILD kicad-packages3d-5.0.1.ebuild 559 BLAKE2B b98b37dff0374a0836cb62800c004de6cfe6118244ca39e17984f506208b8c33a12b754da7ea6836024b4f3633f920fbea6fd1927d60fa192b8442c786a6ba3c SHA512 d92316f8ec0a47262b2cfd41f4e559451a0c8fbb135559642c69a35362d0a445d8b27c80a9fd90052b981528b8bbec8a681f849675534f319b58978e3466a221
 EBUILD kicad-packages3d-5.1.0.ebuild 559 BLAKE2B 45e38c6abdc6a1ad5c9e64c6389b3bc59cbcfbe3d42a7e8e2face9f96634bd06f442ee0215b4234b6fb84ba38b8c84e0476200d6fde477fa9d99582b9e10b217 SHA512 3a283e27b5b30747f85ea6debbe92f988948dfc2ad1029d2a14eb0d7b7a843cef1d0520eeae9999a47a73957fb90c57ff136185713fe075ef43ad42c7b00f775
 EBUILD kicad-packages3d-5.1.2.ebuild 559 BLAKE2B 45e38c6abdc6a1ad5c9e64c6389b3bc59cbcfbe3d42a7e8e2face9f96634bd06f442ee0215b4234b6fb84ba38b8c84e0476200d6fde477fa9d99582b9e10b217 SHA512 3a283e27b5b30747f85ea6debbe92f988948dfc2ad1029d2a14eb0d7b7a843cef1d0520eeae9999a47a73957fb90c57ff136185713fe075ef43ad42c7b00f775
+EBUILD kicad-packages3d-5.1.4.ebuild 559 BLAKE2B 45e38c6abdc6a1ad5c9e64c6389b3bc59cbcfbe3d42a7e8e2face9f96634bd06f442ee0215b4234b6fb84ba38b8c84e0476200d6fde477fa9d99582b9e10b217 SHA512 3a283e27b5b30747f85ea6debbe92f988948dfc2ad1029d2a14eb0d7b7a843cef1d0520eeae9999a47a73957fb90c57ff136185713fe075ef43ad42c7b00f775
 MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.4.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.4.ebuild
new file mode 100644
index 000000000000..55fef4803e2c
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cmake-utils
+
+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-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index e4449324b359..6b595f648e72 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,7 +1,9 @@
 DIST kicad-symbols-5.0.1.tar.gz 2715790 BLAKE2B 5b87d64967c181161309d17f21feda14e6b44814ca9ec77ff9408d8a1d55805eaafea40bdb8ab4964c3fd66832ffef45e6c8c857816036586e5b8f4a33e34c4e SHA512 f0c3ee981cd96a57eed50b1e5a6d7956e0f73edaf86f1afb3a56b93d31161fe0a567d60f02339b3a2e9b9377b7176e9097484035512a40c4ca3a98341dc0056c
 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
 EBUILD kicad-symbols-5.0.1.ebuild 450 BLAKE2B c0fda1a73122892636ada55e4c7d63cc667f71f02516bc7847dd10e42de2a5799b7d750ca03c0781113e725db0403a7eb8a35f60d9a8df7daba4b6e8f96f7c41 SHA512 930424dac84702ff3cac707dbd3768b4bc66c991310f6be275ca658c5768e4bcac66d18eaa32e5e4643efec4e2d752bfac0f265c2a239ecb1e92eec3e246f1f0
 EBUILD kicad-symbols-5.1.0.ebuild 450 BLAKE2B ea27d6eaf74264778edf95ad44352f632e6ec5a49cfc18af3cd36331ff65f139a6c0a5ebe7a2cf021962d440ec42631ccbf7d81d5ba7a6ed61f832c79cb930eb SHA512 12a80d7111197543ed56d086fa787c11cf1f5482c8643861f512e2e7eca8fefd8516a7666d415ca71db423057c5ee23011882519c77c37a3089a6d6a55db433e
 EBUILD kicad-symbols-5.1.2.ebuild 443 BLAKE2B 4a06f93f67253a3e2b2716e04c7cd37dd9827fdf797ee90bb58b7f19852f5783752114a15502bb8248ea5dbf9e6b9f15ecd184387fe4ab579e91916b57a1df2c SHA512 32b4ccd674a44f286c754cf846acfc174f2fce3b78d98e34b200c5131b467f4a8dad45ac20e093114a13d7b47577e8f87598ae93083a7745eb8c19be2af4ba06
+EBUILD kicad-symbols-5.1.4.ebuild 443 BLAKE2B 4a06f93f67253a3e2b2716e04c7cd37dd9827fdf797ee90bb58b7f19852f5783752114a15502bb8248ea5dbf9e6b9f15ecd184387fe4ab579e91916b57a1df2c SHA512 32b4ccd674a44f286c754cf846acfc174f2fce3b78d98e34b200c5131b467f4a8dad45ac20e093114a13d7b47577e8f87598ae93083a7745eb8c19be2af4ba06
 MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.4.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.4.ebuild
new file mode 100644
index 000000000000..f21180e7b6f1
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 14a2d2586c4d..c62e7827dbc9 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,7 +1,9 @@
 DIST kicad-templates-5.0.1.tar.gz 1621185 BLAKE2B c21020ba11ff01863e5c8681247f8e17c03d06532f7eb6df94de8c6cd64f51142d54a762f83168b6c4f0b9c96764cb53d220eb6fd237c517fa07bfe51105543f SHA512 ccd995cc39bd578a95b1b3fdbe53a7bb8dd6638aa5717cd9a930371b0a48e66f1783ba3abce9438c7c29ab3b2b0a9075acc0b9c42eeb73480abf170a6f784668
 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
 EBUILD kicad-templates-5.0.1.ebuild 459 BLAKE2B d79ddb7dd35b96c1739f4e785c90c35654a982f5f4ef62d2e7e1334e9aa17597b87da0661934680e5b32ee20d99e67165cd0d92c8991a0e620f718fd2db1d1d0 SHA512 8de9ec54219987cd1bd69641c171fb5da3ae76f98bd7aeceb004bba444dd6e6d766597d61b85c46058a67f7748c5262f3fd3d9acc06e44d215c1866ab46ee625
 EBUILD kicad-templates-5.1.0.ebuild 459 BLAKE2B d6370deb80053a0d49f2f184fef13cdd941edcc46222a0245531899c5e7cdeaf6354315cad76d04c9180ac275c4b4eeef2c56c2d6a0ae160fabb6b9bbd95611f SHA512 ac7adcc2ab0cf6980f752853f8c1888a0aeaa127c86c760983a2bae009fd3fa4c59d10adafbecc34eab108ac425601d03f3640e837e034c29c9df403dffefe8e
 EBUILD kicad-templates-5.1.2.ebuild 452 BLAKE2B 295b8c54d33d2f19cccd527427c713cdb44433d8274633efbcaac2d04aa4a54ec6097fd5c5cea5961aa1b101c33f924265f6079268bd9699107233c9f2f3f186 SHA512 eadc5d89832c44bf8475aac1b228a15729aa13e0b33d5f5ba90a05ff052e472abf1726ea303999f48f80bcd39a5db675fa8d35dccb8c31bade5ce6c330ef2dce
+EBUILD kicad-templates-5.1.4.ebuild 452 BLAKE2B 295b8c54d33d2f19cccd527427c713cdb44433d8274633efbcaac2d04aa4a54ec6097fd5c5cea5961aa1b101c33f924265f6079268bd9699107233c9f2f3f186 SHA512 eadc5d89832c44bf8475aac1b228a15729aa13e0b33d5f5ba90a05ff052e472abf1726ea303999f48f80bcd39a5db675fa8d35dccb8c31bade5ce6c330ef2dce
 MISC metadata.xml 523 BLAKE2B 69cc5f4bec43a5acd17e3f762c7648e9af9c70a06516b233d78cd5446a0638115caff7559d43b13abd2929c0d7424335c00ad5cc72a1123fcdc6590fd1da8c23 SHA512 c8f588b7a40f7a1f703566b3585c9fa8051ceaae27db76912fc9f228aa27f0dfe9dcc90b728e11d94e27b6b3ed2ae55f0b0f98d2094ade00befdfd742f485d59
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.4.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.4.ebuild
new file mode 100644
index 000000000000..da3a76f1b1da
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-5.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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/Manifest b/sci-electronics/kicad/Manifest
index a183145c0000..c8e2606b2082 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,6 +1,7 @@
 AUX kicad-5.0.0-curl.patch 568 BLAKE2B 6a6d4d382f014fa57a5af8af27e6090f4c9e7b8c9454ee09f039c472f0089f0d9cb045d435b5193d6da4fa2a24dd5a859f7905b330d9bbbd5b0fa4cf116e8512 SHA512 dcb7a260f5acda58dcfdddd59920df02b8003b1727728c90076770fc67b4e7c47050b915e3d634612077b66d1ff62b6409111ee1003c443f48ea6356eeb59841
 AUX kicad-5.0.0-help.patch 4683 BLAKE2B 6b3e3d3567e0f554346ad2eb30b3af9e7ab07e77da2675513dd040e85011f6e711701c0cf3909399f4fe2298d7d59e71727583240d3e06701c18b4c2f59090ef SHA512 570fb711ffb18c7201e7a75791d1cc370493975d19e125de1ff6a78107b5fb70868975efd7d2a8ec921190484f7f91f723cca52337ec2e36f860b73dcedc3e7b
 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-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
@@ -9,10 +10,12 @@ DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e7
 DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7 SHA512 36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d
 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-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.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625
-EBUILD kicad-5.0.1.ebuild 3462 BLAKE2B c15ef73ec7bd3522522fc61e274ecbfd6ea3110829dae3afe8e64516147a1d513354b09c67e6728b4216ab4ac5f9753495770ed50577a9ef3628aaac73da7b28 SHA512 3914612ebf357708a24524c24b7e9442019baa32c98f339d6b5b1cf9a7d5c611f0c257b126a01dbf135efdfd604a2793ad5ca97ec3fab59034a81126f6ea3f75
-EBUILD kicad-5.1.0.ebuild 3493 BLAKE2B 1298dbbcd0682a881ba56afd82ab8e4887d6f0a5b10942feace1af116095bbcafcfe1b11de375ec6d24fa89d32c7c2066d84eb4aba303347c36f251d015b7a03 SHA512 a95da3de07e43c4337ccc7bc717901633337d56be34c77fc01993275dc6e96fe991bcbf882ea546c34f6bcbfe5bcaa323563540d695f6bb81f21e6886e4c2c5e
-EBUILD kicad-5.1.2.ebuild 3571 BLAKE2B e4dd2286a9baee4ea2d65e75acc20f5b9a406c3000f69f882ac24389eec0aafbdd75045057041b6d7afcc69e597ed5dd93a4c88a2e4c594ceadf0d3f740fc42f SHA512 771eb7a214f54f98a6a1b83b3b8db327c7081f42274bb9d374c3727436ac25f0935c800002ec31208b9b4be25b33796b986f55bc0c314468364551f5a969368e
+EBUILD kicad-4.0.7.ebuild 6661 BLAKE2B 2b34abec43c309038343b5e14f993d0eb637a6b01dc1eb3b8e8d58b9bb70adf1872417880d1bf4d5461329cfdce3101eacbc50a77bf6550138341fcf0e1dfb42 SHA512 885a5a2bc8e49d7894aaca5c235b1de58959b4d5cf878154d668084305d3286641146f69c670c24d4c876afc4538526543de9d9423fce2d6e05cf9b70a32b089
+EBUILD kicad-5.0.1.ebuild 3468 BLAKE2B 66776730d8e107d6b157535518890c2cd53051ffe3718ebec9646e73cfceecc76dc3d5e131a35b2da7ea711964afd5eddb7a961812a755fd5233f2d475a748e2 SHA512 bec62f8ddd9e5d2b5a53c1133ee3385183566e82504c6ae2ca3ff99a8459396d31955d1289afa257466f4d30b9bdf0dac55735c354bc7227ac2729e362cef8af
+EBUILD kicad-5.1.0-r1.ebuild 3545 BLAKE2B 38c8bc62db3d95a2071e455701242f9bad695fb1b0c26a7e4c109a03d08883c8ced8fa5565da772394e71463c991ce479fc36acf5e570c38e328ebddd578af60 SHA512 05d189041d440111986af78ed82db50fe729cd25849e1d4e172d9529593be0abf773e00b295cde247cbad926a27b20b1e76774afa8f08c813bc9ef4faa0ac242
+EBUILD kicad-5.1.2-r1.ebuild 3623 BLAKE2B b61c9dcbf5d62aae53ef2284656d8447ae154399504249acc098fa14957dd6ddd5ea9b2d49ca1e85f0fc044906afa86734aca7efeacd42a43a7fc5f6016b97a9 SHA512 33f7df8e2b50a8f1c726fbd22a4597483565684f2ea216e1ff46af2a92ea12dbea61a08434a5dd10a0639b28fc1b79ca4e8295cef51e9729ab88648966a8211b
+EBUILD kicad-5.1.4.ebuild 3577 BLAKE2B 4753f48246d5ffcc97dbbf5558555c931aa17ae89785d62456f104f0073454ad812bd7021004622c815f5623d51ab13476ca1745269780130394441b478c11e4 SHA512 e23ae92c9f5a4be3cc72176849fe6e802e8def876356a3f228103fe634f9f737fe5d1a749633d1f7b5f01fa3c35c6261e50f3b92dcac5f483ec084a24829f2df
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
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
new file mode 100644
index 000000000000..3ab6677e5e18
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
@@ -0,0 +1,12 @@
+--- 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/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7.ebuild
index dd5b21104e16..2ed5780e7a1f 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	)
 	media-libs/glew:0=
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-libs/zlib
 	x11-libs/cairo"
 DEPEND="${COMMON_DEPEND}
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
index 5d1508385fdd..e04b292fa1ee 100644
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-5.0.1.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)
diff --git a/sci-electronics/kicad/kicad-5.1.0.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 8fca5ececb98..6780bf0336dc 100644
--- a/sci-electronics/kicad/kicad-5.1.0.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)
@@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}-5.1.0-help.patch"
+	"${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
 )
 
 pkg_setup() {
diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
new file mode 100644
index 000000000000..a35800d88ee9
--- /dev/null
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 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_{5,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? (
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	>=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}]
+	github? ( net-misc/curl:=[ssl] )
+	media-libs/glew:0=
+	media-libs/glm
+	media-libs/freeglut
+	media-libs/mesa[X(+)]
+	ngspice? (
+		sci-electronics/ngspice[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.2.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
index c739de95232c..6cf2d51c218c 100644
--- a/sci-electronics/kicad/kicad-5.1.2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	media-libs/glew:0=
 	media-libs/glm
 	media-libs/freeglut
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	ngspice? (
 		sci-electronics/ngspice[shared]
 	)
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index cf5555688cc1..b6d129ed60e4 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,5 +1,5 @@
 AUX klayout-0.25.6-gcc8.patch 527 BLAKE2B bd9d1ebac1a4f4679f076a3bedb67b3a4fe040338e0d63a7e25e5fb523707b7525ab7a9088122c75aa0a16e34e6e262efe097f5f96ff6db72b1d5add8f7192c5 SHA512 3280052ef3d9caf78d716c8cfb6e33205bbd2c9543f52bfe28e5c23749b3bbf8ed59edf7bbc8b8a96753f0e90484dcaacaad39c4ccbc2bebe979520589589f46
 DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
-EBUILD klayout-0.25.6.ebuild 1693 BLAKE2B e77df8a03de65fd44a82123c90f86051751bae462d89e184493e5155ad48ef132646bffdd856510cf0ce19bf84e6c2070da26a322384903116d8c3f5b0aa344c SHA512 d246909e87f3b215432112c735aa5dcd6ebc49b72ce29536603043c83be7acaecbb87a18ce0c2061b9dfda6e06a863bd5198953a6d890840da8fc6dba5cb45b0
-EBUILD klayout-9999.ebuild 1650 BLAKE2B a322349b78e9fe2e3a934d7fa135fd3126b9d2dc6440bc8b9ab51cb41dc84d74603386574826a3e640f8fe96ba0840e42415aeee29e6a82835e83c74320e5c15 SHA512 ace38def2e21bfab7a2bdaa4a2d6d085f05f03983cb5b9c15ca1b26fc18cb8c3d68ddac53f4822d1fe9c29c35d72bd84954873819b27a266a9bda90cc383058e
+EBUILD klayout-0.25.6.ebuild 1729 BLAKE2B 258a7e7631675a5074ed00742663423c1d87d1dd623480262fd3525c667d8e168d0f23a280e286c097dcaa0fc92a6082268339ca3bd2905c2b7b694ceceeb0de SHA512 8bcfc12427027e3b419f6cb88e83528b8c613b9b5fd7dd90a00fa6bb1c77ce64ead39fdb7f2a75e9626dcef6db1942a2fa28d5f7045d0a15541381fce31e4761
+EBUILD klayout-9999.ebuild 1686 BLAKE2B e4f6cd090df46dc4f05fcaa6182f3910b18cca6ce36fee8c70f9c83ecba315cf78e14c58441d73e86006e6047d8f805e4f76b2145c01eab902bfceabf55c9dfb SHA512 f73ac7a6d1230cffdbcfa468cf03f808eddff9a7d51dce9bbc06997230271b0789a85eec58fc59003030d3ef83288c9e473be25084ad99a91e8df202499de3f3
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.25.6.ebuild b/sci-electronics/klayout/klayout-0.25.6.ebuild
index fbce59f9b0fe..743706b0e0f0 100644
--- a/sci-electronics/klayout/klayout-0.25.6.ebuild
+++ b/sci-electronics/klayout/klayout-0.25.6.ebuild
@@ -25,6 +25,7 @@ HOMEPAGE="https://www.klayout.de/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	dev-qt/designer:5
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 754f49f53ece..2b00550a26e4 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -25,6 +25,7 @@ HOMEPAGE="https://www.klayout.de/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	dev-qt/designer:5