gentoo auto-resync : 05:11:2022 - 15:18:09

15 files changed, 349 insertions, 4 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 83afdfc68c57..007d866faab6 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 edae22db6de2..59fa72a72ac5 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,8 +1,10 @@
 DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9
 DIST kicad-footprints-6.0.6.tar.gz 31647789 BLAKE2B 3af7027987b25c4a3ee19925acaa539cea643656e1662f0b80ec76c807aca9ef7433228fc88cdd0c34b80e7bbb886abd5c11765983e9adc5b347ce01bd4b51c4 SHA512 6d93a90bfc0b246c70b336aa9265a051a33d8b490a81271fb85ab73cd19184a031f3429ce8ae9e1650ece475a30f0f283c43c5bb2d1f427b4129d4ed61480ac0
 DIST kicad-footprints-6.0.7.tar.gz 31657956 BLAKE2B 127ac81c83841919903b300af89c2126e1f53ff1c03d6dcd2466eac8d4733da4f923831e24aa43fca2b5c6d9ee4389bd67f0bd2b4d300adb5356e261b14e897e SHA512 e0959846e057df46e38385d1fe71895930435fc51ad03bbc893481264d969d9739967b069855b59341388fec5458a4f2c71c527b7af7357437c5606c91f5436d
+DIST kicad-footprints-6.0.8.tar.gz 31697942 BLAKE2B f70d818b766ab2175ce638ced1d632b575b59c28167de037048ea49175448920a69458067c3cfe3237cc58ba08157a6fc7ffb34b96d17d64f32dd9bda5dc19e0 SHA512 e839e0b75657c76473cf6455f6c6c32ecd03d049e86ebb4abbf80e02de56e132fa0d32fc2b9e730d24dbd6cf770791589f9a0d8c2341cc8597705bf33edd4687
 EBUILD kicad-footprints-5.1.12.ebuild 435 BLAKE2B f8452914dfffb5c899cbf8e0112318f96f3833628f90ca48c208c26b6a558ce69eb1e90f390f686c88b51ecc194abcf1bbc87aaa1457ded6980af0b0e49ee5c4 SHA512 9945e466d7812e9c44f4481a077cb19162a7d2ce73425a12b5e6bd51a1ae7cf7fa8d7f91cde116d55665cb49585e4936f8a2d141f1f8a612f49c0b8a1c8a736d
 EBUILD kicad-footprints-6.0.6.ebuild 869 BLAKE2B 8cf2547e8d1065a2d2e18e3056849f622afd39881ff90d15280b1500ce2635b2dad15fa7b85bfda6387c7b98ae08eb161eedae2c11f06a83e9349b22062e087e SHA512 5b60dc906f7d3207ec36587297a1193b221bab2ff0116b94913ad3e7d4f58c3ebc398ecbb1f391313c0cc267b91b78cf0a7c257c568e62293f4ccaa5aacb6320
 EBUILD kicad-footprints-6.0.7.ebuild 870 BLAKE2B 5ba8eda9374024ba6293409b98a89035b74ed2b2e5de5cce90045edac7cfdc54c8fd7669804a55796c53954e1d503a03ea94cfc1053cb76d440268cafc427a93 SHA512 561c2bb63e31558701f619373be2fcc8490ce0294300733014506b344934e5d7a5c7ff50bb6242860ec51d755569640cbe4f2328d6766e0559b7558ec10aaae6
+EBUILD kicad-footprints-6.0.8.ebuild 870 BLAKE2B 5ba8eda9374024ba6293409b98a89035b74ed2b2e5de5cce90045edac7cfdc54c8fd7669804a55796c53954e1d503a03ea94cfc1053cb76d440268cafc427a93 SHA512 561c2bb63e31558701f619373be2fcc8490ce0294300733014506b344934e5d7a5c7ff50bb6242860ec51d755569640cbe4f2328d6766e0559b7558ec10aaae6
 EBUILD kicad-footprints-9999.ebuild 863 BLAKE2B e7abdc6cc61b2fda88acd5618a0263bc8991dae6042b02172e1a31b559714fbff03b9b15846c99079ee9ba03a05d27d537983727baf9ffea3c8aa128904d5ccb SHA512 5ee5c0fce8ae9a38b51ca01bf7d4cd49ffb92d7230aa31b05a9e4c48a91734ec24c85669feb6b1ac675b8a5fc55e8c89944722b8f223abd2815800de828f0cd3
 MISC metadata.xml 766 BLAKE2B cba91a16d3b205f5f36dff3aba3afad956d98d23ac08ecb26bf3ef5471e5fdb7698c86cc1e245a34069f73a052eebdd37594941194b7f3f5d9c57a88718d7de0 SHA512 8d24ac5ad64aec5939be1244e417c2299353d6d618bea63ef949f6c82a865cee98ab11a3dd8c57e447e13203abc3a40da7070f585379c1ec54b0bd46c214d0ec
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.8.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.8.ebuild
new file mode 100644
index 000000000000..e1268b9afd0d
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+#	 x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 34f2279a97e0..57a106cf3fd1 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,4 +1,5 @@
 EBUILD kicad-meta-5.1.12.ebuild 620 BLAKE2B a4c802e020999a16be0b615bb2bb18d11330b041822a283f541f98d17b6d247c9ca835c5d177928fce26a638412c94de6fdf122f5eb3c5afdc8dd7365ff6a0f2 SHA512 aa7ff651a6cc3761f88b87462b91d3e125e69c8155a95676d77013a0a9824f454cc3fa276ea88e1ef2a2c7a5cccc89e0085b698354d145e3ce38a451018d50f0
 EBUILD kicad-meta-6.0.6.ebuild 616 BLAKE2B 3a43f155c4ed2251422a0d0c52f443ad98a9828a9b69f2a18070100618886dcb4e6094750600eb63b23a479fcb01288500a8905b6b865290a68d03936d67bc47 SHA512 eb73ca87b606a1b9f515338b2dc9fc7e6eb59221d406d8028ac225a9cd4158030f7bd6107fef7755afa6fb2031ac2f529e8035138739d0bc3312bf5f49f964ba
 EBUILD kicad-meta-6.0.7.ebuild 617 BLAKE2B 586b8fa96d7345fbc8976f0cac98c8357ac316d90f74433d4e48d759ae4613150e05f5caa5e0da83c4ca0f680edf8cf46370346bad694f941f5c12959effd9ce SHA512 0ccb2e1737e9b0b1589905e78818d7b5ccd7221ec329cb21c95902da32a59fa67400fb038edc05447d0632aaab0f6f3f265ba07b067f523ffa1f1ed16968e53d
+EBUILD kicad-meta-6.0.8.ebuild 617 BLAKE2B 586b8fa96d7345fbc8976f0cac98c8357ac316d90f74433d4e48d759ae4613150e05f5caa5e0da83c4ca0f680edf8cf46370346bad694f941f5c12959effd9ce SHA512 0ccb2e1737e9b0b1589905e78818d7b5ccd7221ec329cb21c95902da32a59fa67400fb038edc05447d0632aaab0f6f3f265ba07b067f523ffa1f1ed16968e53d
 MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6
diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.8.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.8.ebuild
new file mode 100644
index 000000000000..9b332cea06f2
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-6.0.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+IUSE="doc minimal"
+
+RDEPEND="
+	>=sci-electronics/kicad-${PV}
+	>=sci-electronics/kicad-symbols-${PV}
+	>=sci-electronics/kicad-footprints-${PV}
+	doc? (
+		>=app-doc/kicad-doc-${PV}
+	)
+	!minimal? (
+		>=sci-electronics/kicad-packages3d-${PV}
+		>=sci-electronics/kicad-templates-${PV}
+	)
+"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 3f36f7adff86..4c78c1b3f87f 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,8 +1,10 @@
 DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2
 DIST kicad-packages3d-6.0.6.tar.gz 951710688 BLAKE2B 16176514519897167807b9c2d6659b16d38574484bc09fd871c97ea943531f8726a8173b5a3d143818397eb1086db0d6bda43add357c95e92bffac05560ec9f2 SHA512 f8231c4ce508eb379ceb397cf6e9f963411a0a5cee5d1fa9a9e929c964662d391ab12555c4d3e8bca1b9507338571f3036af7f24e6a4d093f8f2aa3ba93e9345
 DIST kicad-packages3d-6.0.7.tar.gz 952830693 BLAKE2B 0eec72303c3146f3b11092a2e7129e53b68fefa4a869e9e87302aa04e092d96514f12a2344b8964a13701a1d7198ad39848b5496c81ae0090ce41670b4a7618f SHA512 cbbeaa85df3e2b9a8c8616994607ff446b8d97dc039562b9c3823ad8cf2efabc02eb49f1a34b6ac3545db21dfbb264d79d05f2edeb2c79a13fd1093999f331f9
+DIST kicad-packages3d-6.0.8.tar.gz 953204306 BLAKE2B 268e20b3e89c70ad78604cb6427a28d488f634148a6dd1065c28ab8c7e73c9bd5ce166a55d1d765f0b4cc2a987602cfa08c9707d2ba3f0ccebe7e8c928916530 SHA512 f0027ea4e89731fa9da9a6bc9f43ff963fefb9662bd04b78c86c39fa423563cb638a1f37c1a8f0d44345092b69c7b450bd10ad2a8e79243af8a6ebd6549aee17
 EBUILD kicad-packages3d-5.1.12-r1.ebuild 559 BLAKE2B 698bb6c1eeb4f63d69f29095bd17b00d5b420c1dd16faec9910e2b5a13e8be124d9c087dc1678ca3d516d1a8f143e8b15e68244d150955f37f23a5d7b1f8a617 SHA512 0475814185604358e047f864a847b273cbe032cbb0a5997f49a3afdc77c66c7fdb15b762b6f5337016f737f857b036bd37b64d5315858fc082dc87156871b691
 EBUILD kicad-packages3d-6.0.6.ebuild 1066 BLAKE2B 58c9ec2662c5dac6d00c7c27a73fa52e4b14edc380d9adee048085fa6bb46aec99f7e3c3ae7d753ec93eff5bf48d9aaaef87ccebc7ea200ea6b26c7190683652 SHA512 37b37d76ef40be3c002929d466acea36a509038ce8a3ec47560f3ebd7423141dbe014fe5e056308c75ac67779475ff12c1667785623cc7e7a34c29656d2ff93a
 EBUILD kicad-packages3d-6.0.7.ebuild 942 BLAKE2B fe22314c91aaed1c42debc8fa6058c43d4755a1dfbddc2e8021e6935568032d031be44b54cce025522c7c6fc502f13970c279caf2748f86a0f734f8cce400b77 SHA512 165a43d1e0a7203c7c95831ac9a6a294dde4cbe07873483db9f76ce041641c1d55b92bb38862baadf29a94ff074437eafcdcbc5b709f80b63ae6b5ff4723bdd0
+EBUILD kicad-packages3d-6.0.8.ebuild 942 BLAKE2B fe22314c91aaed1c42debc8fa6058c43d4755a1dfbddc2e8021e6935568032d031be44b54cce025522c7c6fc502f13970c279caf2748f86a0f734f8cce400b77 SHA512 165a43d1e0a7203c7c95831ac9a6a294dde4cbe07873483db9f76ce041641c1d55b92bb38862baadf29a94ff074437eafcdcbc5b709f80b63ae6b5ff4723bdd0
 EBUILD kicad-packages3d-9999.ebuild 935 BLAKE2B d330b7f1541b2a344e86b4b2b4d054c257370acf777c062706b710a8e5ade08525ef1c3c9c3a0dab995541a4d254ae122d7297147486bc2a562d8fa90c6b2e68 SHA512 8972a6552bfc9e386437ede679d3dba2e637efe17424641d5a112ca9c28cdfbcd03e543c254d76a1de789a76604ed33c18222f483d33e62c94e24c5947c75924
 MISC metadata.xml 897 BLAKE2B c306e73c992f4b4c6099176ed71b232aa196ff07c0ea2833b14d465a96f8db4623a17d629c66533d7a8dd5032dee74aaaf7ebacd3ed7c72359ad7b9b9746e348 SHA512 796a2eb49ff7d7f65d473217b2534a4ef811354828defb76005f694f37f7b638bb65be304de74507e89b99c0e97026503e74222fa972c389d638d2ef3ea059b1
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.8.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.8.ebuild
new file mode 100644
index 000000000000..5646b83a340a
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${MY_PV}/kicad-packages3D-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 4f70f7e71d70..bc28814dbe5e 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,8 +1,10 @@
 DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6
 DIST kicad-symbols-6.0.6.tar.gz 4845755 BLAKE2B 32bf6a03f5f06be09b571e0d5470059bc799d662aefd40554e6d9603f29862af3d75f600218f715026349216bbc1a6ea3000eff5a3a5ef8c66a8643f83872090 SHA512 edd8f2d2d34c0431bd23a8ae0433f2ce311aebecef4672ddf7b5d1bfaf71bf4cd8f98f3dcaa9e1662f5a928e204aff834b5e19cea77a31d2e3a23373f760406c
 DIST kicad-symbols-6.0.7.tar.gz 4846798 BLAKE2B 1691027e1bb9e93ee4e390590e748ff0dc0994d740f999a1220c9897c44deb71b62de2df4a1cb8817cca828317b3d7ac7a678bcff1a9570abedf3b9cce518541 SHA512 27b05f46b48de338266a713da92cf96af59918fbc4850de05bce5ddf5ed9b2d7e949cbbf8c23b22663c2388824f8de464bafe1df31e829620c0ff19f4e7f7be2
+DIST kicad-symbols-6.0.8.tar.gz 4850988 BLAKE2B e2797af781e1dcaf946dfb3e04d8ddcda4f24e722f31cc0a62a0e823b6a7eee68bdf90306577a671322311543766e5af8f57c387e4c09163e27ff73e96af282b SHA512 c33be2a499c05d2bb2b3d75c6017ba173024a7bfe72247640a2d18fd94321865edc29582f42df1c3e54c9ca366075d5986ca24377c48affd6a8356591d9ee9b2
 EBUILD kicad-symbols-5.1.12.ebuild 429 BLAKE2B f05364cdfb4fc1e8e6a79722c374d2f260ab46c6e35c09d209e1121cb6f188177073c2ef05283dae3700f8c3c6767216666f9460044e6c9b1525766b0898b98f SHA512 7cf1cff346c6ce05516825d89d08c25a7af0903464e92cd0003fe212bb58fb870c26692dbcc932ef1a552729e6927ed08e291ff0a022dcd4403ddb632f02ccee
 EBUILD kicad-symbols-6.0.6.ebuild 761 BLAKE2B b9f070b83420d68a492ef74d4fb6bab88a90fc1d06aeeda2f0d409b04e5e10930f0e45800f176616943781d20146389e786b33e1d86bc322e9a65119eeb5d2b9 SHA512 bf4dfbf3a602f124027fb8757092a7266649d87b505eb79e1d73bc240aba889546284fd416f635a885cafa0c6518d2e8018944c1f2f7c505fe80808c7bfabcb4
 EBUILD kicad-symbols-6.0.7.ebuild 762 BLAKE2B fd144c2c48d52163f6fff0528bb0e5becab560e9405ec4f37d19a9b355c6e46f288d2eeed8dcf226083aac028862bc5275a91ec5491518e13bc5ecf752aeecda SHA512 07d48e69e2dbc8e5a3987bfcd3f4887fa134ed8c886b2635aff46d3bf542229365be05f8cb5f9ece27d3aedd03d6ec688b08dfaa8dc33b689bc50ed653e844de
+EBUILD kicad-symbols-6.0.8.ebuild 762 BLAKE2B fd144c2c48d52163f6fff0528bb0e5becab560e9405ec4f37d19a9b355c6e46f288d2eeed8dcf226083aac028862bc5275a91ec5491518e13bc5ecf752aeecda SHA512 07d48e69e2dbc8e5a3987bfcd3f4887fa134ed8c886b2635aff46d3bf542229365be05f8cb5f9ece27d3aedd03d6ec688b08dfaa8dc33b689bc50ed653e844de
 EBUILD kicad-symbols-9999.ebuild 844 BLAKE2B 0105cb6e28b9f3b7426ddc4ffbacff06646d1c84d66a89d9dfc328511dd7c7339799ebadd24527e1120e6c4588fb7ff2b898749d19747088b3b722de36bd4a94 SHA512 90345c12a573d46121238ecb54678f86b5ce93cc1f80d66b137a9f220ed4865b550ceda56bf6b6eaca36e9b0fb8750fdb53c4837e02ef09a17f17e55ea1d4e72
 MISC metadata.xml 724 BLAKE2B 10eccd33b4ca07e25e2b3ce44d30583671b33836f7fb7a9c68b063bb267529fb0e2988b71bc57d0d92967f583ae3ac4e0cdf0762da687a834f51620f45df5411 SHA512 76569f2955cf1db93bbac820d513aa4d58f4bf27089736a9adc98e1df4d21c0c80be6c894dc2eb024b2cb0271e37a479b15ce68d377bd028df2becf5166958a2
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.8.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.8.ebuild
new file mode 100644
index 000000000000..02943f2ff696
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 513dc22a74e0..babdaa45bc5c 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,8 +1,10 @@
 DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430
 DIST kicad-templates-6.0.6.tar.gz 1057646 BLAKE2B 3bca2c6557ea8879d53a24a9a97872235c7d6289259936744a098745d0aaca9c2e397d471aa738d0007813c77e8a299c2975393bc0c0e62212be293cd210c049 SHA512 b9c4df8b7da9f5e3405a942c3afb09f5c387e311927042889211fb3c3a2a4610a1ccdc94ca2c1e1ae06e351617b15882adf5899f6dbfb392611feb5711e5be92
 DIST kicad-templates-6.0.7.tar.gz 1057666 BLAKE2B 62b6d6b93cf94c6085c69f349259eeaf9d7fdb9aa9faf631c4ee89de20d9f2c3d70e6afa9ff90ccaf9bbb3ad1877907d375ae6777dda3a841d3e263ea9edf2d6 SHA512 c04f2754d2ed8e18fdb054ecaa900a80f8f937096513dbe0a9dbd89c341490657ad673488bf9f3a3d0850861c99524127128b8efb1283e2df3feefcea8806d53
+DIST kicad-templates-6.0.8.tar.gz 1057692 BLAKE2B bb51c1934d1af16f90b3671ebed67b7bd027f660f3a13c8de29e2ac34dae1e7bacb99bd6398f17fd8a709858128431cb2f898f413c327cfa0acb89a04c3afc05 SHA512 6d7d05eb2482fe326ca242db74b65a1ffe84ca4eddd89ce2bdcb160b85ef94e1835d7ed3c006591fd2e92346c5379b1a4fe3a52dd25947dadbb59ce363aeb2ce
 EBUILD kicad-templates-5.1.12.ebuild 438 BLAKE2B 245672d11e479bd59d83eae963c7606addb45d8202a7212034dc9d92f8eb27b2809844848722dccc2777dd4126e67b48049934a1077774f598a8ed9e1c1fc638 SHA512 e9e21e3a0b429a9f1d267f6d0f9dde8405ababdfb5cd81c8e3d8f6f7e1f136490c88238fbc699b296631cc75359f8c2205bd0f10f160cd15fcd1dcdce777c122
 EBUILD kicad-templates-6.0.6.ebuild 697 BLAKE2B e863371c758f0c33fe272c8f8bdb192e4c8f1a5a5c38807997b24df591a41c5b4616b58f260ec921efc6291c5b3ba970754b1adb95235b1dd5c4b52b5d4d60d4 SHA512 3a82c50efed4363dff2c6eb5371c5a10ee286b34f4a01a102c2b2d60494faf13903509219411586af16e07e86c522817f9c2063c89d6100f2bc5a58ec35c2283
 EBUILD kicad-templates-6.0.7.ebuild 698 BLAKE2B fcfe2e16a5b2864d82ec552ffdb3dc3600fe618575c1af65ebd2ee1db71e9d55081abd85c22648692dc1523ebefae42618bf35e1645644d48472111e1c0d05d7 SHA512 d6cbe3de9d0efe622e84d779652826169a2ad4f75e6f3855df57aba9947be776d0b856e6e4e759423345437bda0c8e4e1e48c7789e19e078f82305be00be66fd
+EBUILD kicad-templates-6.0.8.ebuild 698 BLAKE2B fcfe2e16a5b2864d82ec552ffdb3dc3600fe618575c1af65ebd2ee1db71e9d55081abd85c22648692dc1523ebefae42618bf35e1645644d48472111e1c0d05d7 SHA512 d6cbe3de9d0efe622e84d779652826169a2ad4f75e6f3855df57aba9947be776d0b856e6e4e759423345437bda0c8e4e1e48c7789e19e078f82305be00be66fd
 EBUILD kicad-templates-9999.ebuild 691 BLAKE2B 44322a26e224d77803cc24cb73723e52c8abf5c0887b7c30504c5b9530ff2e38d134fece90cba308ea4c4105759ef1ac06fb5a212409f06f73ec938bf4ed74b3 SHA512 395279ec620a31c789dae437e192b13347a32dbb8b637a5c2aa8e9615842d9f51ba0ccc5426cc2c65bc23dae09984c9a4e4bdcae3ba9ba588f6729c3e20be5ed
 MISC metadata.xml 484 BLAKE2B 3542f585439e05e86fc86e11f524c15f10f835fe5419141b6361ae4503dc6dff5d0c9d7bb24134c3722e4ab11d6cad6d450625f7e5edc822b3d0ee82fd8bde48 SHA512 03468e0fa2d56c7241219eb07b1cddc225b5e18f6800a513005f76cd19110b4ad9d8f9b2895107695b6c62c8f276b38bbf544a7651b61f3e83878c94a40b8886
diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.8.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.8.ebuild
new file mode 100644
index 000000000000..fcdb94bb2f13
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-6.0.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-6.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 54e7ee0a8c29..1167706d6da2 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -7,8 +7,10 @@ AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827
 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
 DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c6666844c5bc9d0ec2 SHA512 c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
 DIST kicad-6.0.7.tar.gz 45143677 BLAKE2B 4ab9132be84cb6c6c566a826e5966f4fe64922dcd66f78c558126b37a276e075af80440da35071c864457298f6f964ba15511d0038424f473c3fb079d5f042e6 SHA512 0466650d166becbde23f1202e8bbe73ac7c743b5baad9608252fe4e960f0d15aad363664b69d840ef4568bf6d1c042b94252afce8657594a5f8193c979613e0e
+DIST kicad-6.0.8.tar.gz 45155261 BLAKE2B fda898c4a4e435b9f61bc706a29814a14ee3882e26043355bb14d4e99a334602d83453d6164a4589a106104ce1a5e4cd7b774ce89fb3b0f40cf140aee16d8e73 SHA512 8ecba5481e1876075976316f94af44116098cf652dba263b5d4a5c1eeb3628ba4814a3698c8cacf40c8c7b4c118e47db3d9db198ccfd30f532576343a7a62791
 EBUILD kicad-5.1.12-r3.ebuild 4841 BLAKE2B 3650e3d50347526b847db5ff1d49d64a57942f224ece8ec8b4cd5b4301520bb81757c24e76276c18e09635041f8e1e35bfcc8e830f37d47c85a21019de6725fb SHA512 455617db4a03f75cd6b1ad6857843b7a1e699c43e31d265690de107030202899dfa1e380c92e48ea47b25aabafa09ff3678c73efbcd2d5900e24a39366a62e4f
-EBUILD kicad-6.0.6.ebuild 4435 BLAKE2B 5dc647e0aea007666f9b2bcdef5cff53da80ba3657fcfc1966ce37c746dc55b34e0a05d35f4a6bc7ac8874996868b665bbd830727a24fe27465839197ff3aff5 SHA512 d31b82a375bf72417e23d44193767d63b64a48c82e16c0b2dfb409f97bd2f51bf63964b938403fcce51ecdaece10949495829fae2beb909fc14201f0124e9ea0
-EBUILD kicad-6.0.7.ebuild 4443 BLAKE2B ba5b290076cb008c908fada65aede54d3f1d92defc1002996c78ed8146c3b592afcadb07a650de2ff0dfb0a3de0a6b60ccd257d965d17f1b4fd704ff65281f40 SHA512 0823b9619d6223d0bca930e68e2eb370cf8b2afb4df9658e5152813b2d99469ced3047c196762fab6ec3c8ed18f00389355ce7010a10dc640dcb9f0a66052ddd
+EBUILD kicad-6.0.6.ebuild 4366 BLAKE2B 3691d12f5a1875490334899073158bffc7b1b87c412812cb04326e446b4491d4a8bd0d4a3a304532abce9fe94edaa642320ea6878f5fb35b4987d2315418d3b9 SHA512 14006927420f0c3a0cc2a1fc47c98abeb3e060042d0b71be96f590ba7c70d545b6d333ee48b947b762b693376793c25628b3d2384cf5e62702bdc1210c3f9650
+EBUILD kicad-6.0.7.ebuild 4374 BLAKE2B e18a4fcfc2d3cbbbc08857975dccb13f7cdf11f0e92e15ea4a6b5b2de4a47128296f4081e33e63cb616d6311c2b85079b6648e20886376c62c57da6aa4d10a73 SHA512 d5a4c1d2f896cdcf6274e689b6c87a93f1b0a0ae06b2ba80c1b99c7efe471b7637a530f5b947caf549b9a4f3b639f947c889e9256daf4637765043d9677b0471
+EBUILD kicad-6.0.8.ebuild 4374 BLAKE2B e18a4fcfc2d3cbbbc08857975dccb13f7cdf11f0e92e15ea4a6b5b2de4a47128296f4081e33e63cb616d6311c2b85079b6648e20886376c62c57da6aa4d10a73 SHA512 d5a4c1d2f896cdcf6274e689b6c87a93f1b0a0ae06b2ba80c1b99c7efe471b7637a530f5b947caf549b9a4f3b639f947c889e9256daf4637765043d9677b0471
 EBUILD kicad-9999.ebuild 4326 BLAKE2B a87d6d2c4716a94244514dfdfcdbefb4088608e062bb8ac8c1aa10389eaaf3cd0a9a5f0f9e3525a7c230779dfaab2e612f7d8e516fbbc4b46ffa142f8c790951 SHA512 a048bac273f48ce9023fdde226cc5f451fa85eaeb26a7b07397055c938477735c98a5181fc653d619ba91ec3296db7ad942767700011176881755137741bd6f0
 MISC metadata.xml 1047 BLAKE2B 1ed5807dc4f194f6f66e6e0743fe186dd046128bfec2fd3e2a72919e4cf714b0ac6d1ba7da0764ce0b4202eb0a068e5c3e261dfcccf309198400e8be009b7845 SHA512 dc7b727047452b1398fe4029c3b7e70826074733be7c1f2c6c2d485948380da208561a738427d0a5f8a67dbec07593c529b4f8b6690b8a5de7b3bb291576ab59
diff --git a/sci-electronics/kicad/kicad-6.0.6.ebuild b/sci-electronics/kicad/kicad-6.0.6.ebuild
index 2ca2a1b0142c..ca3edd939568 100644
--- a/sci-electronics/kicad/kicad-6.0.6.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.6.ebuild
@@ -159,7 +159,6 @@ pkg_postinst() {
 	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
 
diff --git a/sci-electronics/kicad/kicad-6.0.7.ebuild b/sci-electronics/kicad/kicad-6.0.7.ebuild
index f54b1112fa14..7471c53d9dbd 100644
--- a/sci-electronics/kicad/kicad-6.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.7.ebuild
@@ -159,7 +159,6 @@ pkg_postinst() {
 	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
 
diff --git a/sci-electronics/kicad/kicad-6.0.8.ebuild b/sci-electronics/kicad/kicad-6.0.8.ebuild
new file mode 100644
index 000000000000..7471c53d9dbd
--- /dev/null
+++ b/sci-electronics/kicad/kicad-6.0.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples ngspice nls openmp +occ +pcm"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+COMMON_DEPEND="
+	!sci-electronics/kicad-i18n
+	dev-libs/boost:=[context,nls]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	nls? (
+		sys-devel/gettext
+	)
+	occ? (
+		>=sci-libs/opencascade-7.3.0:0=
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-3.0
+	doc? ( app-doc/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="900M"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-scripts-install-fix.patch"
+	"${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+
+		# Merged from separate -i18n package, bug #830274
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_PCM="$(usex pcm)"
+
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+	)
+
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}