gentoo auto-resync : 19:07:2023 - 01:02:32

23 files changed, 44 insertions, 477 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 7206e3c401d0..9ee3ffaec896 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 96781dd0db95..0762934b995f 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,10 +1,8 @@
-DIST kicad-footprints-6.0.11.tar.bz2 23763091 BLAKE2B 8a4478a4dbdedef9d3f1f658b09065746e48d4e6f5ecfc89aacb0d53a0bb33a71b16ba6742062f6629b14e0b788485fb876076b82c576c8a72ef7bcc19fc74be SHA512 f30a7443bab7edb7943759d6b938be05b0fbc23d2c7c95f4b9e983c31295062dc1885cea076b5e06de2d1aa766b732471f34ae78c5f682cff1c024937acf8363
-DIST kicad-footprints-6.0.9.tar.gz 31723499 BLAKE2B 33856d28a52f8f516c96c38c68aabe3d57c3f7eade5cb654cd0dca15f36263b9860f252468edf0b94f228c2497ef7e862cebfd023e2a166ce1696a89c1cff1e1 SHA512 43436a61fb1be66dc6cd6079e49e7af0f7d374f074874fd008eb45c2b3faee596e102173a274064a536f11c4525f223c9e8c2a33969811414811a226e69affaa
 DIST kicad-footprints-7.0.1.tar.bz2 23942389 BLAKE2B 06408aaf1a388287dc0929f8f99e70bcab62051da1a4674f48ea264a75fd5780fe355420dafe96fd8548679c508a3860bdc0ba8ef287a3c7b3c6c78c0fdc2975 SHA512 1bc7ffdf089414c40e74a2b8c155e83900d406f46036d0803f115e505e25f7071111acc5bc85456de4c96af26d8a13ca81bd28dca5dfe48e26e5944f4478a688
 DIST kicad-footprints-7.0.2.tar.bz2 23956893 BLAKE2B dd86bea1ad8d61eec3d755ac29b13f94a0037cd99455843cd8d711f655be98ed3fda5e4620302d05ccc1a95910f83f0a4ce1465b9e8e5e69baab8306229709ba SHA512 ad49198a72747ce892eb2a58393fd4bd57dbc4c95d0ffb02ab8318d61f0693077203d97a81fd62cb98435de3928e827b90a67c7d5b00018ae80abd6034512e31
-EBUILD kicad-footprints-6.0.11.ebuild 872 BLAKE2B 5e7fb1db34e9d175f4a65d9eb0737b3f047f899d57039a496ea74824548db3e9d5d151a8da0e073ada6327d58050fc6ac287a25b52f12bca496b754065c11b91 SHA512 83e985b57f992224462e16a28ce416b995688ff5dc2639324c18b9c19455455194fc162790cdd95ae962a1ced27f97f0385057679f972f51bf2247a08abf3d83
-EBUILD kicad-footprints-6.0.9.ebuild 869 BLAKE2B b38552d1da1fc4ac3610bc7dab4160a5db10032a57e27da835f8233ddf3538a6d6178cc27bf68f3992fe191f061adbb4ff39bec2c5b04adaad4817dfc508fb6e SHA512 0f95329d50c41c6b58ff620a9c95c7ef8603e5150e22195a9139479cc84cd8122d5ffb3e15347b495370bba03e74b00f10b3ba16435b82b79ff314d03ece244e
+DIST kicad-footprints-7.0.6.tar.bz2 24045275 BLAKE2B 7efb3e5b256f94ac657283d2a0bd19b8e6eb5ae65ed31d6e4aa64a8a37423392e6c890ed0231b2d81f9b223241873ee07cf2c9935d042d167e340b43c7ce55ef SHA512 16eb37e5c26b940c46193a36bc93f0debbabb13bfeb07d1cdb56a8221f1a1f6167ebc16fecdbcfdf0f258f1a1cffc06864126ffbc337dd736b15b70d024d1bc8
 EBUILD kicad-footprints-7.0.1.ebuild 734 BLAKE2B 7e38b8f2c60f9a42f61db1b20b5355b7db5f1057b0e2553a340c168d2792294ed25eacfa2a1b919bcddd077d19118e095f1fe119f4f2feb85061bdb209972752 SHA512 b1fbff7bd39b5daae923afaae7d8c5085a8ae24b18be75c6e9ba68c0d3db3d8d1e86141fcff8a0a5006946cb6cead613aea7007b327be9439e51d67e9b61e9e1
 EBUILD kicad-footprints-7.0.2.ebuild 735 BLAKE2B 9e9d0baf11b94f0d40fe503e471f3c78c5073e716cebfbddbaf0fc4e4d94384baed813316bafca6438190acc378b211f1ac5f796c964dc655a35163cec9f1e85 SHA512 35982599de717abcbb5a70007b1d3073c18dc217ede180bf6331f04386eb378af5751ab3d934da353ac27d77b824b20bb918226155da9d3d3b599b309b28bbe6
+EBUILD kicad-footprints-7.0.6.ebuild 735 BLAKE2B 9e9d0baf11b94f0d40fe503e471f3c78c5073e716cebfbddbaf0fc4e4d94384baed813316bafca6438190acc378b211f1ac5f796c964dc655a35163cec9f1e85 SHA512 35982599de717abcbb5a70007b1d3073c18dc217ede180bf6331f04386eb378af5751ab3d934da353ac27d77b824b20bb918226155da9d3d3b599b309b28bbe6
 EBUILD kicad-footprints-9999.ebuild 735 BLAKE2B f80e84bf0658e1024301b2213112f0192e7fa5dfad140e0fe9792d4ab28058e800c9508a0660ca344d63ee7dd5441f4f19c89bf047e29115e17ed2c51fd93b22 SHA512 efd1bfa76d6a51897576ebc48ed9b0381171721173c70f9133d4850cf2e654b440c15c93c14318ce69c7282827c6b1fc9bc135f81766e1900aa77e8dcc28b6f9
 MISC metadata.xml 776 BLAKE2B 30982b2c0cea33ecaaa4284235bd37fdf622f34a3f85ec0a5d2ede84669afef43c07e25af0e60048ea0167cbb8ff38af8ec0a4b0462b0f2efe418e7efde77278 SHA512 b4ccbef5457263dec344709e4ba4a900da9abe252983fd67798a5b1ab9bc1c9d24f6178bbb493db1eac617ff64bb5d31f29df570891751a52a86a6beb55d6d56
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.11.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.11.ebuild
deleted file mode 100644
index 90a31fa8cb1f..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 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.bz2 -> ${P}.tar.bz2"
-
-	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-footprints/kicad-footprints-6.0.9.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-7.0.6.ebuild
index 8a46cc5de857..ba02cb94ca78 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.9.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-7.0.6.ebuild
@@ -12,15 +12,9 @@ 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"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-	fi
-
-	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="CC-BY-SA-4.0"
@@ -28,7 +22,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=sci-electronics/kicad-6.0.0"
+RDEPEND=">=sci-electronics/kicad-7.0.0"
 
 if [[ ${PV} == 9999 ]] ; then
 #	 x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 29d39ee67d21..0084ad0afd44 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,5 +1,4 @@
-EBUILD kicad-meta-6.0.11.ebuild 617 BLAKE2B 05643d4f57aae44e91abea1081db65c8e7c1f9b5ab6ce007e6d62626565baaed7e171c4a5f6276d46bcb7487422680a38c70ae32a03968a94319a1dc11fbd89f SHA512 107f4a48578819571b11c57dbb83b73695270c496b15760fe2c7d7cc3f2effeb6fb364d81e77550b6bad5f18b98c6281dbe20f9afdce9c5afd5e6580f6dc3de2
-EBUILD kicad-meta-6.0.9.ebuild 616 BLAKE2B 8e3fca6f3528e7e0cd3d51c83be0eec98e7852bbdfbfd715625662f98eb0684eaefc409ec262b3ecee84df728f1d6c1324cdd679f43440619945b370a1b26368 SHA512 d0ce9fd57afd7d53a3b6007d846e1d04b53e05dae38bc5d1045a4e4225a863889a685f85d8c55d1b7434a407c7e874c512896ce8c496e0dfaeea43c8ca52af39
 EBUILD kicad-meta-7.0.1.ebuild 581 BLAKE2B ded735060b29e10c148e1f2c3a2d2be18888375ee7db18a0f9cf51a4e9156aa93ca1181fbddf3c2b96735c66351b74c4cc47930d38fc595de529220ebbfd75ee SHA512 c849a1246dccbec149099b5821ecaf748fa16c00d839c4ef53a6b7aa0040a2df14b6251864b52ff2afdb9c6a93168a997fa9203124781d7841556001f2559b23
 EBUILD kicad-meta-7.0.2.ebuild 582 BLAKE2B 2495daf1863ee585888764d8c3cd30f8dc7be809a8c5d2b64bb7c4bfbfc9add3c9a2f566b30670fdcb70e28ecbef2a95d3f0a00f180049ea358b4b241ea17579 SHA512 65b397c9a72abf809154ba5f5d815f32858bff67f58149b43eca8794112080e4bc886c1d1f83538ee5e19d08d144be9fc83d53eb0520aef3cd2c3ac1b0ca6447
+EBUILD kicad-meta-7.0.6.ebuild 582 BLAKE2B 2495daf1863ee585888764d8c3cd30f8dc7be809a8c5d2b64bb7c4bfbfc9add3c9a2f566b30670fdcb70e28ecbef2a95d3f0a00f180049ea358b4b241ea17579 SHA512 65b397c9a72abf809154ba5f5d815f32858bff67f58149b43eca8794112080e4bc886c1d1f83538ee5e19d08d144be9fc83d53eb0520aef3cd2c3ac1b0ca6447
 MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6
diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.11.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.11.ebuild
deleted file mode 100644
index 199f078b2c01..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-6.0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 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-meta/kicad-meta-6.0.9.ebuild b/sci-electronics/kicad-meta/kicad-meta-7.0.6.ebuild
index a9b6381bc4ae..9fa1015e5396 100644
--- a/sci-electronics/kicad-meta/kicad-meta-6.0.9.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-7.0.6.ebuild
@@ -10,9 +10,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-fi
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 IUSE="doc minimal"
 
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 30a53ff624e6..09146d84b532 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,10 +1,8 @@
-DIST kicad-packages3d-6.0.11.tar.bz2 737065465 BLAKE2B 959ee6137a7d7cd818099bc86b3069cb77d280f60d3c3027fe4ffb02277a65aefc4e4d674bd7ce285fca4afde34482801d65e882c52cb86b9a6199956c22a230 SHA512 83d064ad893322c6ca5b6f8785005749ed7ffed5719a71abb6660557e537a100c4905d2e7dc26a6306381145cd356afa4830c7d90f210f1b9bd57e7e918bdd6d
-DIST kicad-packages3d-6.0.9.tar.gz 953182554 BLAKE2B a0f9810d1236c3ef1b0adae3cc2f1d8172fb52add6a9d5666dd32431725a1d3fd0456119ef21b05bd390ec90fce359b46e846f0af063feb4f8d97bc69da57f68 SHA512 fe014b35ce9071ed48d00481d509fba678dc0bea5170f626de9b18c0e0285cb441fcc635197da40af869e35c50104a9a69d991348d6031293ee166b734ba7cc9
 DIST kicad-packages3d-7.0.1.tar.bz2 768042873 BLAKE2B 1077e2deabfe75bfbaa9c6770c6bd1c273e7699b1b0bb4b88b6a9e2dd3f3becab583c0f2d143070d01021711548d0c6e8630286d0d63904ef4c09f39f5d2234f SHA512 f634ff5449cf5b9b619d09495b8a38fd58445589d73ba98442b2fa134d18b81e50d72eea37724e1460cafd4b1c4c2bb345a1e453371b9298e7d79bf54629d721
 DIST kicad-packages3d-7.0.2.tar.bz2 768222191 BLAKE2B 8e9485d0b4ee2c0d9e71675344f720b2af78a5f3541c56eabd0286ddfaf12a997456c7f9cd6e4bbde2dcea2ae5dd3f8f8fc2b2384266b5a7b0b9747a41544629 SHA512 248d39693045114631d5e9630b21ad5ea3bd019a64f372ca5fbe1c2920fc3e324ea86cced2ad11d20640389c473dc3dfd3333d0f8c283159af1cbcbcfdcd9320
-EBUILD kicad-packages3d-6.0.11.ebuild 944 BLAKE2B 9d16319cc7e92f88f05340b2fa8d756ec9eaeba6767fdd0c8bde5e9dc74aaeded6dce665708aadd071c49cb1a25837b5ecf9263d1138583df7884aee45041322 SHA512 d92ddc1831a5f77100562abc4761e6a1abb8cb403e2b944e0af26b1372ce3c72c2c53be69dece06f22a7887c08d3b111add9b2392a33248f317c86ad88085dba
-EBUILD kicad-packages3d-6.0.9.ebuild 941 BLAKE2B a3f3804f26c7c1189a51ae3329e1e87aa7aaf17b9f75480ecb0a6d5d9e44697d6084ffcec9a577eeeb34ee0ab0dcd9b618abcbfe229265e2426c1283ae4560a8 SHA512 3ddeb86a6c24a7d5de43a7d0c6b12b37f1a60805b296bf74ad6cb9a35bf60b5a63127e66d30ccb4b0595c0d9b44723ebe87431e1cce2fcae1cf61ba48a1b3f1e
+DIST kicad-packages3d-7.0.6.tar.bz2 768656951 BLAKE2B 249dd4326fbca08692a4c4068d0576c8edc09beaa32a2d21bc080f63232c8a335d77759811b0bce7beaac6a111db87fb6081bcf9bfffac69f538a73788be3de9 SHA512 9947a320e8d195ee15936a300b6d051952bd4bf9e2110e2dbf0c9c205328f81721a5266ba833db5db5742ce0ec76957e43d0953dca2c46e223e11bbbf450a762
 EBUILD kicad-packages3d-7.0.1.ebuild 841 BLAKE2B 1136c63c5557e700c5781bd5097e89d92cc31c9c989412cfe41eece9b3f3f745679c237125d73f6a1a95b59cc57581b01ada2a99a759392691cf268d5672c037 SHA512 f430d57576a72fa4c20680e867cceefbdaaa3862c7ef7d49fc4083e1f63355e1d876ec8a1330b8d88dac1b094cee743a0ad121e1ae411452f2cc77c3f40aed7c
 EBUILD kicad-packages3d-7.0.2.ebuild 842 BLAKE2B c77b6ce82a2f793a318fd81484566e965cdd9cf95adde3b88dc612e78e43e6baa286a2fd1ffb65e8556028780c3e89f93186003fba18b1f7a65e3ec0f499d8a2 SHA512 31df462a42e518312f0f8235ed2b90c7bab7537e3ac4b4c9281b5d941ab455a1f67a1169fc64d0ea484701d88a10174891868e1da4087b7fe77c27851fde578a
+EBUILD kicad-packages3d-7.0.6.ebuild 842 BLAKE2B c77b6ce82a2f793a318fd81484566e965cdd9cf95adde3b88dc612e78e43e6baa286a2fd1ffb65e8556028780c3e89f93186003fba18b1f7a65e3ec0f499d8a2 SHA512 31df462a42e518312f0f8235ed2b90c7bab7537e3ac4b4c9281b5d941ab455a1f67a1169fc64d0ea484701d88a10174891868e1da4087b7fe77c27851fde578a
 EBUILD kicad-packages3d-9999.ebuild 842 BLAKE2B a22a8effad98c5c2ba00af8a7121b516f5bcd05f1a1077d9d262131370f172f0343f557302a169cdf92fb1c38abe7c8fbf20a01828f055712119f464e4e6a43b SHA512 0f7996683ff97a77a359dd644fdd8ebb6e28b413934012e7a232952c4df8233550e637e722e9dd9251954b1f410d17c3dd5fb489d80baad24ceeda4e0acdaa4d
 MISC metadata.xml 907 BLAKE2B 645bfff1ab4f879a9cbb5994b57c959a06f669b0de25b37a9003b046beed955b54b29c6fe660060b3379d02eb247692bab9afdd6364da59318dbe590e5f8a68a SHA512 533862b4c7d390e749bbe0d745dd015d4aa86731f0478d8beca639a829444fab91ee61a3cf39cde43866e49fdac550fb2433d41f63c46f35aa68c0d5081aa7aa
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild
deleted file mode 100644
index f01fec709899..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 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.bz2 -> ${P}.tar.bz2"
-	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-packages3d/kicad-packages3d-6.0.9.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.6.ebuild
index 344b60c32007..0814793b5346 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.6.ebuild
@@ -12,21 +12,17 @@ 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
+	SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN/3d/3D}-${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
-IUSE="+occ"
+IUSE=""
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
 
-RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
+RDEPEND=">=sci-electronics/kicad-7.0.0"
 
 if [[ ${PV} == 9999 ]] ; then
 	# x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 620bee951562..188b916dee55 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,10 +1,8 @@
-DIST kicad-symbols-6.0.11.tar.bz2 2291352 BLAKE2B 4ac716d52cf1f47e5ff3c182d36b712ce729ce1ab2bff2509d34e9bc094f7dc1affad070294e7bd560ba9ab17215d6c7caccace23c961191bc4fbb5edeeae704 SHA512 55c9d4829b5732aa82d8809611f82be737f1e48fc20aff8d1237fc1658060557b86d65f236c6f1a4419f0cc553d0277cb23a23aee69d700a88dafcaf208dbf69
-DIST kicad-symbols-6.0.9.tar.gz 4854079 BLAKE2B ba50c3062dc01145239d0950072bcaa6b61b2dbcf954fcf6e96e0d06c2c9952bd571c81a0e05dcdff462524c38e8c8807752e7d854eb7684397634414b55b8ab SHA512 2cc44ead8029cd502cc5301b4515aa23275d32068e091a0a4a645f6fd9ed88f2b7d329d9faa7e66cde58cedeb47810c66db8e6f9313c2bbfe18e5a272f82a163
 DIST kicad-symbols-7.0.1.tar.bz2 3012164 BLAKE2B b6bf419247d67f39e868dc05abdbd60f8b6f677bd730fb8250b6517f2f68f740ccbd63be55e2d7c667c557493b42937ca65a0dd6480250372020f14a0c3eea59 SHA512 63cca3de17af08c78c1bb98d58ccf4825b6fd9318abd6c996e8218fd3d6168acc396c5cb1b73fe26ead0da4a91f0e8040f363ed9ae74169cad4ca7965fdd0890
 DIST kicad-symbols-7.0.2.tar.bz2 3014152 BLAKE2B 6b84cf02026a3efc1059fb27ae0d6fa1e36024021298f25d0d4abd066e9a4b51e3353a88a4efbc93252c0d0119c74f6a91860691fc002818b28d03d89a9bfcfe SHA512 399c5e863f487bc85126a2f7f6ed084e8a4374397682f550754776991f4668274a37b645854598c0690976c0b6e50a1e396285f32ed5913ecf14e4b3ad4bb2ec
-EBUILD kicad-symbols-6.0.11.ebuild 763 BLAKE2B 390e903f7462c8e930bb8980d2ad52312e7cff1b9e0afbeca72502ffca6fb931bffe5171168446a01309f78868a6e200fc9b323cc3d8afa81569733d33eff9c2 SHA512 6a4f03a4d388abbddc354716d696ec5c52d9c2605356b94a416bcec169305cb32eae1b9e85de56eadb9aad509b01802467e448f56a95a90709b8d4f735a9bcae
-EBUILD kicad-symbols-6.0.9.ebuild 761 BLAKE2B df0699fddef39531d30858151329d495e5b38e07b6555bfe937480aa2bf869281b27df124e8fcc086cd3945b0b0936e58c48fef9cca14377d313a4525d5b3ddc SHA512 ee1c31529a18175fb16f0a396272d4eaf07225f85288425a4952aa563c1c2ba8afe87e2c0f7a1e9ad7f752d0b6a0b478920912654481bf6314f227c528b67c76
+DIST kicad-symbols-7.0.6.tar.bz2 3026739 BLAKE2B 4dab0b34d142ec4ee570b2e48990501778bc8419e4cc0120193e62a4b4687776892ec2910061a216a0db98b77678163af19b8645ed721aba98cb82f581a3842f SHA512 883897da4e5e2222d96a82f999d09b7cf8e210474dfa1eeb18be9738be127793925fb1154aea8846019e3e86df3124bc12bd12de83819472d1d8c25b1fb196d8
 EBUILD kicad-symbols-7.0.1.ebuild 725 BLAKE2B 388a6d3d73ab3a84866b2540d7e2b6acb816e2264927fd92af04dd97a0398737fba3d026e0bdda6595bd4caeb6e5910b57cfc0d9fd73a34266cfa6c68eeab8df SHA512 929ebc20c1c9e1ce5343ff9bd4bc14093d2ac5807c454cd10240bb8f1559dff97318a18ddeed2600915a274a798e42d7bb35711f232ce649a31c1a866d9240b0
 EBUILD kicad-symbols-7.0.2.ebuild 726 BLAKE2B 3bf852a25ec618f3cf20b762286a091930f1edb3af20ba5b4cd113aef39874e5278a05e995159ade3db3cf7fbc2091c1647d4b0e0684b26d5a5c6ce468df498e SHA512 fbe3cf50e9d2607f7f84eb7412069282efda60bf62184f44b9982ccd0d76318b9ca34a4c51485a8e7eb6a59a05cdd2a3bd511d291a8d0d2f610aa442c83209b5
+EBUILD kicad-symbols-7.0.6.ebuild 726 BLAKE2B 3bf852a25ec618f3cf20b762286a091930f1edb3af20ba5b4cd113aef39874e5278a05e995159ade3db3cf7fbc2091c1647d4b0e0684b26d5a5c6ce468df498e SHA512 fbe3cf50e9d2607f7f84eb7412069282efda60bf62184f44b9982ccd0d76318b9ca34a4c51485a8e7eb6a59a05cdd2a3bd511d291a8d0d2f610aa442c83209b5
 EBUILD kicad-symbols-9999.ebuild 726 BLAKE2B 1c3c5480ca643101f345b17bbbc6aae7f578d4e7c905138572bfcffc95e1c863a03a86bd1c33a8df452abb84727260930f083f4e220d0f12483179dd128b6de6 SHA512 4627369c5a495d9a440a2474e421c789df0dd6fe5d443db845c7580b2c357df7305f26b86fbb84daead2ac76d4d199d71d1c45e7c636ea5970ca3c4723c5cc85
 MISC metadata.xml 734 BLAKE2B 3ced3601f6bb8bd6289b8bd2b7d18745643bf151bee1393c12653e722a8bb4f0edcfac97a7ad3b76072af665c7463f71f0f442c653fc9e177cbe520e5c2dc623 SHA512 00b5f7f898380c773481889350fc42bba3211096914dcd73c1a8ee112ea12890aa88dde96ea819689d2a87367da6962b2d402c29c4b0449012df43a9d55af0bb
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild
deleted file mode 100644
index 34f69ac0a947..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 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-symbols/kicad-symbols-6.0.11.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-7.0.6.ebuild
index ff1ab4a87464..26631a5e5f9f 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.11.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-7.0.6.ebuild
@@ -14,9 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	fi
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="CC-BY-SA-4.0"
@@ -24,7 +22,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=sci-electronics/kicad-6.0.0"
+RDEPEND=">=sci-electronics/kicad-7.0.0"
 
 if [[ ${PV} == 9999 ]] ; then
 	# x11-misc-util/macros only required on live ebuilds
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index e339f0113024..915bb77a3d88 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,10 +1,8 @@
-DIST kicad-templates-6.0.11.tar.bz2 934873 BLAKE2B 6d1e2bf7396dee79904930d443903a49ce932e61c32a6577a7548ae3c6ee903b75af0278031f0d98c74e4b0b8bc5d90760de6e3127a3ed4c58fa84e52ba7510b SHA512 dc1b8ab6c9a9285084bc4a9f50feb9044e971891096f5b3fc9d0912169c3b1df6ea1c6584ffcf877b0e649f7f6c38e6787edf8a7f2455405751267045d6394bf
-DIST kicad-templates-6.0.9.tar.gz 1057613 BLAKE2B c2c0c78093995629216cbcb93c40a05e1494da90a6cb91909e54fcb115fb7d6e10b3015a94200fef61407a6beccdc0f2bea84319531b39562bdf19ccf243a726 SHA512 f5e82599dc8532b2f286d62e650084b4d0470308a2cf447831027a85ea1028587342d51d4005018449f17fcbc9bd9f6ed850d7e3818c88692906790ef8981471
 DIST kicad-templates-7.0.1.tar.bz2 1419796 BLAKE2B ce6f259e8668eb4ed3541cee1aca44259af2a19142cb5ef1f049b40d7d23fac5e48cf13e3b101798d02f0661230c96bdf8f74a802b7bbb3dec13272a498a7e34 SHA512 5214ce5b48c2340feb3d6ce3d882462a6ea1468c53ce5de30d7b608c026b9d51db38b33375d24b845a8196eacdc2dbe5c28f2f1ff22af4c398724fb6566ec2fe
 DIST kicad-templates-7.0.2.tar.bz2 1247364 BLAKE2B 4143ef4a1741e099609eeced84983c9dd1d9bae615fb49cd1fad213eb8d9d266b0e2fb079188e61e024403a97d5848c60ae0ef927907d470a3c8c99cc30a0cb8 SHA512 d00847c0dd1cfd23af20a1bc05a481efee0390659d7de89cfa2fcc702814a9dc6905291c00fc067cdc399f58e70ad7864bbd1dde1b146193156c1c21cb18abf9
-EBUILD kicad-templates-6.0.11.ebuild 684 BLAKE2B 5f3f6ca769008acad6be96d15c7a9f896093a4ce095f7715087568273c1845f65b7c4d8d7ccc1c7f2ff2bef1b5bec9d60ebc0a2ee3bc44cba06d8227dceb33b8 SHA512 77134e340f487b9d8dbb1790d662ce2dcc4e178fff3e6f8c6bb6edfd8038623f5157fc36c99a7ad5d128c4211c4bd9516f2e31c6d3eb44bf046768084d1e0083
-EBUILD kicad-templates-6.0.9.ebuild 697 BLAKE2B 00eb18651cbdb308b655b4aa1cf11d44dcabac760188f3615a8dfad3043d88c5f5100c8afffb257b38fedd438cd31a7ee6ca73717837f58adf615d08456a874f SHA512 2c69def714554c978d6430a2ca171299ad6987250df342f944d8cdd1e4b8f619522c03f05ba6ba35e2bead88742479c9a2ea12ded7c6ffbde20c3de3e34c446b
+DIST kicad-templates-7.0.6.tar.bz2 1247604 BLAKE2B 5e5f80e36c8caac6ce63169b0188df772d5573607b094c8ecb68671b79ae64eb8b4c5bb90ee95fc720271c2de230c5151ddde3374c5faff26aa90271470ee3b6 SHA512 ac00f6ceaa4530fedb397f5c475eec2bbd89bba7f02691824117a06d4100e4f64b7720fd79c93576a84d6fad0768b1895f5ae951e37f4e64cbff9da00b176dca
 EBUILD kicad-templates-7.0.1.ebuild 562 BLAKE2B 595e1df695c99b31e738125ace5ea5c82ae4571c1fb0e4f8b524003181feba442509fc907512a3198811b4f1e8f49f880d7eb300a2f35a6937e1aa3e8d714137 SHA512 b80a7601bdadbfb2572f9bde6faa34ec24fc9bd601abf74c00a4bc46e811b09e6174130769696d88e408889c68c8d75079a05a8c44967a84f7b5377392d2e3d6
 EBUILD kicad-templates-7.0.2.ebuild 563 BLAKE2B 0f0bb850662bc5173d58c090e62bc59b1cf1b695fea6c99f8d3112dea524c61f37f7021cf9d03e33936ca2a1cbcbce26d769baa6b69160faef09f004e4eb626a SHA512 43cc520b754ea277a54f25a5ff21b53b32a2974a643a957a763878e09b4b04dfd94e710ebd431846c5581f3cf1e5d098e15f3cd458d2702141ef15760bc53db4
+EBUILD kicad-templates-7.0.6.ebuild 563 BLAKE2B 0f0bb850662bc5173d58c090e62bc59b1cf1b695fea6c99f8d3112dea524c61f37f7021cf9d03e33936ca2a1cbcbce26d769baa6b69160faef09f004e4eb626a SHA512 43cc520b754ea277a54f25a5ff21b53b32a2974a643a957a763878e09b4b04dfd94e710ebd431846c5581f3cf1e5d098e15f3cd458d2702141ef15760bc53db4
 EBUILD kicad-templates-9999.ebuild 563 BLAKE2B 803a314ee3ade729dc6ecc253cc048baa1f82beb420846ff852c6cbca49c82194294dbe764c67531abfa2f2f8b461d116636db504704a72549e93cc045fae6cd SHA512 ed919607b61c11ccc09522375c5972262a74e153a1974a56eb1195f2f76de8acfe66c8fe73a5042e0b1a72f6d05e96f57ce2a940a4abe332fcc13d82d89d3599
 MISC metadata.xml 555 BLAKE2B 3da578d0a134622513076db9ee939f467173c38b96ca157f95485a799b6f57a6ee07cbb84a0402e8f68be4a44fe8db9b214e2730878449ee44caaf284e0dc2d8 SHA512 274899879d1075fc5e421d7181934e9359ba93c73fe4beb67ab4c28456931b21ff321b36ce1c2e56d37ad8387b75dfc8cffbd0235fadb52ef9c5a4a0cecaa051
diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild
deleted file mode 100644
index d8f7f7a3b81b..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 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-templates/kicad-templates-6.0.11.ebuild b/sci-electronics/kicad-templates/kicad-templates-7.0.6.ebuild
index 613273fc7506..bffd6445a28e 100644
--- a/sci-electronics/kicad-templates/kicad-templates-6.0.11.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-7.0.6.ebuild
@@ -11,18 +11,12 @@ 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.bz2"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-	fi
-
-	S="${WORKDIR}/${PN}-${MY_PV}"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
 
-RDEPEND=">=sci-electronics/kicad-6.0.0"
+RDEPEND=">=sci-electronics/kicad-7.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 3d3a66c51f12..25d740742c74 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,14 +1,9 @@
-AUX kicad-6.0.6-unitialized-variable-fix.patch 592 BLAKE2B b26757a1e9d4115616a721fdba7527cb72d489ae75976f9967f24cd12735b6f090a71bdb0c7d632d33ada0b3dc77f0d7f9370d02c34d83bd0afebb608621b85d SHA512 2f1e81132e87858f789833bd05fdda2309fc344c1535295c6308e3058bed85edbfd9900a0529e1489eb6f87bb27146a7dec2893a10d311c43b7117c00beba948
-AUX kicad-6.0.9-gcc-13.patch 1094 BLAKE2B 6b09be7cfcc6895fd6d744c8755959c501ce7dfab1a4759cd1999d2dd172273f36c4091554743109a1a52c8ea98896ee04795070eda943a24669e73e94319177 SHA512 fd2924c8f8faea50da3defaedd3d4b6f89654d18a108c07e5e38277d70397856e493e33601bc632ceca5a62981501f136bbbba0462a68b421db72d0aa9dd55e2
 AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
-AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
-DIST kicad-6.0.11.tar.bz2 34083016 BLAKE2B 85662dd57eb5f28498317b1554e703efdebaa470f749ca239b2caeae4c366005a7c9bb1d1ba6375ed80d277efabf09b56d3e7e1e82bf93462b4ba5405445157e SHA512 9827be9f2c18be1ab3bc5a1a3bd3d6297bc69b561e43b0f9010cb49009c3e87f1d320034411ecc0a2277b5686923a3d4bcc507278590814309d10de14463266d
-DIST kicad-6.0.9.tar.bz2 34045371 BLAKE2B 797f1d10a5405751bc51ec9579c5c50c21b56761c8b59ae99e8a52e50a787f1271053eb4d36e5c2483adee277764ea75300dd50c62a2addeb540e748bf8b93fe SHA512 015335de5d9bbd4acdff8dd7da85847ea0b666d3d4dd0d4c9e7b731cc516cb3575ade231e742a089cc5591ef9e4059f2bedc83677fa85220b9e6cb8ef5776305
 DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec SHA512 6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516
 DIST kicad-7.0.2.tar.bz2 42844186 BLAKE2B 136d68b3174cde74db96b1197c62da1fb4e54f628f73a6e0ea092c713b529863d9e443b6631a0ecbb55e2d299a7b78b8218d05e605f8ae8f5972915147ec140f SHA512 04d7e39815f9e87b8646f25fb7e1b82bcf2bc63e26e078f3175c37a2c2e0a2bb7771e70e4698dbfc496f112a733668bdc746eefd1a9c4c76d0b36696738026a4
-EBUILD kicad-6.0.11.ebuild 4399 BLAKE2B 1ca4411dd01828e1371ef52167dfcaed6889af78d7df6643945a2a91d70d4180e428fff13dd5caea20f274df175b8abd826e4621eead75be994a21072bfc12ab SHA512 bdb215a6d0f2f9e4e91c463110ef0e83593c70f78d331f2277c655192ca12aa7985c3e2990dacfcddf26034e29521c7d018b4d93abb107272b32b5ed6eeccdb6
-EBUILD kicad-6.0.9-r1.ebuild 4427 BLAKE2B 6645e57532a9635b0e97ba4cc92c676fa0a7ecf8380812552c598f88b5354d30f138dbef8f4aaec084ba21eadc2ee48874554fd55041522205522626e1908a23 SHA512 8e8d77a85e05ea0a759b8d726b533b84cd01fd86b37de3cb57085684e6c59d43d13447e4e8f45a2ac3bed164705f0282d6b5d6c941faaa414f062643913f8d6d
+DIST kicad-7.0.6.tar.bz2 43548452 BLAKE2B 90fa15d67f5629266755c469208baa486f41003a9b6ff32c7b7a0707967d54dbc3410d332f0ab1fde91c6045c345b34d1e27585feb265386e58447aea464a93f SHA512 492e6f4997eefda03eb371ec92c1a971cc37e16cb18f4ead08db22370048f6e2fce332c58d5eac64554808bf15738ebd18cf8f3664eacd6d3066a35268f3ec6a
 EBUILD kicad-7.0.1.ebuild 4134 BLAKE2B 01eb2c3112047409613c67d190d29ea2e2fc8cc0029796c0fe3d7e54b3f450bf947839f0e75088071660f075e1749ac3ef726ad36fc9394ede71dc53da9e8bd5 SHA512 0490fe205737be0e163e75452b83cbaa34d62acb668409c865c222ceaa675d80dbe2670b68fc16282daffcc204ccf0c9074407f9cbe84215c14760218c080469
 EBUILD kicad-7.0.2.ebuild 4135 BLAKE2B 678a4552411ca57ad86405ce811569ad167a074484d2b10210359ffe7555b88aa87564ee0af15526eac86f8691a1c3c59b5b51784dce9067bf283425c10de116 SHA512 9c985c7e63292506433d4e29faffcfe5243bd7405e8d63981f88603933570c7bc1d3e33bb0988331c5283037b9071d568663506de9469fb16a760e4191c0305b
+EBUILD kicad-7.0.6.ebuild 4135 BLAKE2B cc9d91642254fa327cae20d6a9286ac283993e5f9463be1dd81b41ed1709d99e33eefc61cb23a40dc8eccb90ed331103cb7f0b8f8356a41a9f5367c91b2c9e08 SHA512 7e0c2c0e9738ca877532a241e9b547104480dcac24970cf262ce2d6ed79f086975100d9002ae13c1533b002264aeaa180b47ebd6966feb7cbd3cbeb193caabce
 EBUILD kicad-9999.ebuild 4135 BLAKE2B 678a4552411ca57ad86405ce811569ad167a074484d2b10210359ffe7555b88aa87564ee0af15526eac86f8691a1c3c59b5b51784dce9067bf283425c10de116 SHA512 9c985c7e63292506433d4e29faffcfe5243bd7405e8d63981f88603933570c7bc1d3e33bb0988331c5283037b9071d568663506de9469fb16a760e4191c0305b
-MISC metadata.xml 922 BLAKE2B bfdb3ce1ee74c7b6f2da1a5fbe7835e2114af83b594edabab7b7674000462ee6963acee3bb1f384bed0b4a36b0529aebdab801fe3a482b23e742d9186e7684b2 SHA512 575659f3c5d0fc74469ff14f8abaf58776f1d0ffdd16b85e9f617d3e956d2d0c1c7f70aeebf02aa5c7afadcea0e0a589e6fb16f160b398482524fa7ce592ba4e
+MISC metadata.xml 765 BLAKE2B ca4295c6a975ed0161e0e19d6faffa585001c65bb1b6c53659d63c22e10aa1856840752182e3f9108b11b582105691f6d03f3a63ee52fd5ea875b6ba3049e379 SHA512 4af8f8ba855e6c5dfc6e4f34ba1efb0705fb92dffb9fcc6196457a43ebca11da4b1fa752a6bba02ce3bbb7bfbbeeb5a5f8cedfb055378d67f622014ba3240768
diff --git a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
deleted file mode 100644
index cce508c1e888..000000000000
--- a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp kicad-6.0.6-new/common/tool/tool_manager.cpp
---- kicad-6.0.6/common/tool/tool_manager.cpp	2022-06-17 18:11:16.000000000 -0700
-+++ kicad-6.0.6-new/common/tool/tool_manager.cpp	2022-06-20 00:17:13.548239632 -0700
-@@ -902,7 +902,7 @@
-         m_menuOwner = -1;
- 
-         // Restore cursor settings
--        for( auto cursorSetting : m_cursorSettings )
-+        for( auto const& cursorSetting : m_cursorSettings )
-         {
-             auto it = m_toolIdIndex.find( cursorSetting.first );
-             wxASSERT( it != m_toolIdIndex.end() );
diff --git a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
deleted file mode 100644
index f1047cb9dee5..000000000000
--- a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/892499
-https://gitlab.com/kicad/code/kicad/-/commit/8c324f1fc8f7fcdb5e8f494da3d45997001fab4a
-
-From 8c324f1fc8f7fcdb5e8f494da3d45997001fab4a Mon Sep 17 00:00:00 2001
-From: jean-pierre charras <jp.charras@wanadoo.fr>
-Date: Tue, 20 Dec 2022 12:46:19 +0100
-Subject: [PATCH] Fix a missing include. Fixes #13216
- https://gitlab.com/kicad/code/kicad/issues/13216
-
---- a/pcb_calculator/eserie.h
-+++ b/pcb_calculator/eserie.h
-@@ -2,7 +2,7 @@
-  * This program source code file is part of KiCad, a free EDA CAD application.
-  *
-  * Copyright (C) 2020 <janvi@veith.net>
-- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
-+ * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
-  *
-  * This program is free software: you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License as published by the
-@@ -21,6 +21,7 @@
- #include <array>
- #include <vector>
- #include <string>
-+#include <cstdint>
- 
- /**
-  * E-Values derived from a geometric sequence formula by Charles Renard were already
--- 
-GitLab
diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
deleted file mode 100644
index d52a05d3bcf5..000000000000
--- a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-6.0.2-orig/CMakeLists.txt kicad-6.0.2/CMakeLists.txt
---- kicad-6.0.2-orig/CMakeLists.txt	2022-02-10 16:29:07.000000000 -0800
-+++ kicad-6.0.2/CMakeLists.txt	2022-02-13 20:09:37.244713966 -0800
-@@ -950,7 +950,7 @@
- ###
- if( UNIX AND NOT APPLE )
-     install( DIRECTORY scripts
--        DESTINATION ${KICAD_DOCS}
-+        DESTINATION ${KICAD_BIN}/scripts
-         COMPONENT resources
-         PATTERN "*.bat" EXCLUDE
-         )
diff --git a/sci-electronics/kicad/kicad-6.0.9-r1.ebuild b/sci-electronics/kicad/kicad-6.0.9-r1.ebuild
deleted file mode 100644
index e9fb8bec1498..000000000000
--- a/sci-electronics/kicad/kicad-6.0.9-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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.bz2"
-	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]
-	<dev-python/wxpython-4.2.0
-	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"
-	"${FILESDIR}/${PN}-6.0.9-gcc-13.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
-}
diff --git a/sci-electronics/kicad/kicad-6.0.11.ebuild b/sci-electronics/kicad/kicad-7.0.6.ebuild
index 7e4168d52685..355bbb97546c 100644
--- a/sci-electronics/kicad/kicad-6.0.11.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.6.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
 
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 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.bz2"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 
 	if [[ ${PV} != *_rc* ]] ; then
@@ -28,7 +28,7 @@ fi
 # BSD for bundled pybind
 LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
 SLOT="0"
-IUSE="doc examples ngspice nls openmp +occ +pcm"
+IUSE="doc examples +ngspice nls openmp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -36,18 +36,21 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # 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="
+	dev-db/unixODBC
 	dev-libs/boost:=[context,nls]
-	<dev-python/wxpython-4.2.0
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
 	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.3.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	sys-libs/zlib
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+		~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
 	ngspice? (
@@ -56,15 +59,12 @@ COMMON_DEPEND="
 	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
+BDEPEND=">=dev-lang/swig-4.0
 	doc? ( app-doc/doxygen )"
 
 if [[ ${PV} == 9999 ]] ; then
@@ -72,12 +72,10 @@ if [[ ${PV} == 9999 ]] ; then
 	BDEPEND+=" >=x11-misc/util-macros-1.18"
 fi
 
-CHECKREQS_DISK_BUILD="900M"
+CHECKREQS_DISK_BUILD="1.2G"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-scripts-install-fix.patch"
-	"${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch"
-	"${FILESDIR}/${PN}-6.0.9-gcc-13.patch"
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
 )
 
 pkg_setup() {
@@ -103,8 +101,8 @@ src_configure() {
 		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=ON
 
-		# Merged from separate -i18n package, bug #830274
 		-DKICAD_BUILD_I18N="$(usex nls)"
 		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
 
@@ -114,14 +112,10 @@ src_configure() {
 		-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
 	)
@@ -148,10 +142,11 @@ src_install() {
 	cmake_src_install
 	python_optimize
 
+	dodoc doxygen/eagle-plugin-notes.txt
+
 	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/.
+		cd doxygen || die
+		dodoc -r out/html/.
 	fi
 }
 
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 36c0a94d2d79..693935b54ebc 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -11,8 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="ngspice">Enable circuit simulation</flag>
-		<flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
-		<flag name="pcm">Enable plugin content manager</flag>
 	</use>
 	<longdescription>
 		Kicad is an open source (GPL) software for the creation of electronic