gentoo resync : 05.12.2021

46 files changed, 271 insertions, 153 deletions

diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index ddfb80b5ccf8..74b9e8252ee9 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40 b/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
index 76a0f58df107..0e9fcd950eb4 100644
--- a/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
+++ b/metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3
 DESCRIPTION=Application for the schematic capturing and simulation of electrical circuits
 EAPI=7
 HOMEPAGE=https://github.com/drahnr/oregano
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 || ( gnome-base/dconf gnome-base/gconf ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=https://github.com/drahnr/oregano/archive/v0.84.40.tar.gz -> drahnr-oregano-0.84.40.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	waf-utils	6dce9ffe7d6fe961321a99f8da53a887	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ae05f6d5d32c6d6c660d08b23fba6986
+_md5_=59636343a4d3ba451ba338a8674190c2
diff --git a/metadata/md5-cache/sci-electronics/electric-9.03 b/metadata/md5-cache/sci-electronics/electric-9.03
index e5ca9dfa7e33..fa108912b5d5 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.03
+++ b/metadata/md5-cache/sci-electronics/electric-9.03
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.03.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	a3d583b3f640032c3eff643a4191bd03	java-utils-2	8a3af9303fdbeca4510a6ba6e91b1460	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=aaef3cf65b53ebb61b962cb4772a48e0
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.3.0-r2 b/metadata/md5-cache/sci-electronics/gazebo-11.3.0-r2
deleted file mode 100644
index 909650551257..000000000000
--- a/metadata/md5-cache/sci-electronics/gazebo-11.3.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
-DESCRIPTION=A 3D multiple robot simulator with dynamics
-EAPI=7
-HOMEPAGE=http://gazebosim.org/
-IUSE=cpu_flags_x86_sse2 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.3.0.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=315db38ef1d4fc13eab70ae40b92abf1
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.3.0-r3 b/metadata/md5-cache/sci-electronics/gazebo-11.3.0-r3
new file mode 100644
index 000000000000..2a18c2a85cf3
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.3.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=7
+HOMEPAGE=http://gazebosim.org/
+IUSE=cpu_flags_x86_sse2 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.3.0.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=91dbea29b46306bd3ac6639793c8501b
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.5.1-r2 b/metadata/md5-cache/sci-electronics/gazebo-11.5.1-r2
deleted file mode 100644
index af53a6775ac1..000000000000
--- a/metadata/md5-cache/sci-electronics/gazebo-11.5.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
-DESCRIPTION=A 3D multiple robot simulator with dynamics
-EAPI=7
-HOMEPAGE=http://gazebosim.org/
-IUSE=cpu_flags_x86_sse2 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.5.1.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=315db38ef1d4fc13eab70ae40b92abf1
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.5.1-r3 b/metadata/md5-cache/sci-electronics/gazebo-11.5.1-r3
new file mode 100644
index 000000000000..0070e5ffd7a5
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.5.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=7
+HOMEPAGE=http://gazebosim.org/
+IUSE=cpu_flags_x86_sse2 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.5.1.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=91dbea29b46306bd3ac6639793c8501b
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.7.0-r1 b/metadata/md5-cache/sci-electronics/gazebo-11.7.0-r1
deleted file mode 100644
index 3fa2864dbbb8..000000000000
--- a/metadata/md5-cache/sci-electronics/gazebo-11.7.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
-DESCRIPTION=A 3D multiple robot simulator with dynamics
-EAPI=7
-HOMEPAGE=http://gazebosim.org/
-IUSE=cpu_flags_x86_sse2 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.7.0.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=315db38ef1d4fc13eab70ae40b92abf1
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.7.0-r2 b/metadata/md5-cache/sci-electronics/gazebo-11.7.0-r2
new file mode 100644
index 000000000000..f640842c4b84
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.7.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/ronn app-arch/gzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=7
+HOMEPAGE=http://gazebosim.org/
+IUSE=cpu_flags_x86_sse2 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.7.0.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=91dbea29b46306bd3ac6639793c8501b
diff --git a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1 b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
index 341b5360dc75..170681236a0f 100644
--- a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
+++ b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=GPL Electronic Design Automation (gEDA):gaf core package
 EAPI=7
 HOMEPAGE=http://wiki.geda-project.org/geda:gaf
 IUSE=debug doc examples nls stroke threads
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-scheme/guile sci-electronics/electronics-menu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango nls? ( virtual/libintl ) stroke? ( dev-libs/libstroke )
 SLOT=0
 SRC_URI=http://ftp.geda-project.org/geda-gaf/unstable/v1.9/1.9.2/geda-gaf-1.9.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c09c55f6cfb67bc532861bc65a5e73c9
+_md5_=f7b96b49e76ac329273e23743d941f4e
diff --git a/metadata/md5-cache/sci-electronics/gnucap-0.35.20091207-r1 b/metadata/md5-cache/sci-electronics/gnucap-0.35.20091207-r1
index 806e147df1d0..68a56eefba9f 100644
--- a/metadata/md5-cache/sci-electronics/gnucap-0.35.20091207-r1
+++ b/metadata/md5-cache/sci-electronics/gnucap-0.35.20091207-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNUCap is the GNU Circuit Analysis Package
 EAPI=7
 HOMEPAGE=http://www.gnucap.org/
 IUSE=examples
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:=
 SLOT=0
 SRC_URI=http://www.gnucap.org/devel/gnucap-2009-12-07.tar.gz http://www.gnucap.org/devel/gnucap-2009-12-07-models-bsim.tar.gz http://www.gnucap.org/devel/gnucap-2009-12-07-models-jspice3-2.5.tar.gz http://www.gnucap.org/devel/gnucap-2009-12-07-models-ngspice17.tar.gz http://www.gnucap.org/devel/gnucap-2009-12-07-models-spice3f5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55c9223724aad1ff8f6a4cba98653d19
+_md5_=cec8168ee5ea76cbbd27a8644132325b
diff --git a/metadata/md5-cache/sci-electronics/iverilog-10.3 b/metadata/md5-cache/sci-electronics/iverilog-10.3
index e7eaaed44603..18b1c7e0fef2 100644
--- a/metadata/md5-cache/sci-electronics/iverilog-10.3
+++ b/metadata/md5-cache/sci-electronics/iverilog-10.3
@@ -5,10 +5,10 @@ DESCRIPTION=A Verilog simulation and synthesis tool
 EAPI=7
 HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/steveicarus/iverilog/archive/v10_3.tar.gz -> iverilog-10.3.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e0d0d3128769a8fc437c0841081f815c
+_md5_=96c538c9df2de9cdffc0e7ee3aafe67d
diff --git a/metadata/md5-cache/sci-electronics/iverilog-11.0 b/metadata/md5-cache/sci-electronics/iverilog-11.0
index 2ab443bb92b8..3f0e67f431d7 100644
--- a/metadata/md5-cache/sci-electronics/iverilog-11.0
+++ b/metadata/md5-cache/sci-electronics/iverilog-11.0
@@ -4,10 +4,10 @@ DEPEND=sys-libs/readline:= sys-libs/zlib
 DESCRIPTION=A Verilog simulation and synthesis tool
 EAPI=7
 HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/steveicarus/iverilog/archive/v11_0.tar.gz -> iverilog-11.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=22ebea2584525b105aed0e5eafd4cf1a
+_md5_=9a68f1ce9fcd9aa111d49332dc108232
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.12
index 599ca88a5719..23c6bd779712 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.10-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.12
@@ -2,7 +2,7 @@ BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads(+)] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads(+),python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads(+),python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( >=dev-lang/swig-3.0:0 )
 DESCRIPTION=Electronic Schematic and PCB design tools
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.kicad.org
 IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm64 ~x86
@@ -10,6 +10,6 @@ LICENSE=GPL-2+ GPL-3+ Boost-1.0
 RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads(+)] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads(+),python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads(+),python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sci-electronics/electronics-menu
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) ?? ( occ oce )
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.10/kicad-5.1.10.tar.bz2
-_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=63c955aa7324dcfbf35a893a474e782d
+SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.12/kicad-5.1.12.tar.bz2
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=6f198e159883cd98a705d47921ab3810
diff --git a/metadata/md5-cache/sci-electronics/kicad-6.0.0_rc1 b/metadata/md5-cache/sci-electronics/kicad-6.0.0_rc1
new file mode 100644
index 000000000000..b2fd58f7d36b
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-6.0.0_rc1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=dev-libs/boost-1.61:=[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:3.0-gtk3[X,opengl] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( >=dev-lang/swig-3.0:0 )
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=7
+HOMEPAGE=https://www.kicad.org
+IUSE=doc examples +ngspice openmp +python occ +pcm python_single_target_python3_8 python_single_target_python3_9
+LICENSE=GPL-2+ GPL-3+ Boost-1.0
+RDEPEND=>=dev-libs/boost-1.61:=[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:3.0-gtk3[X,opengl] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/6.0.0-rc1/kicad-6.0.0-rc1.tar.gz -> kicad-6.0.0_rc1.tar.gz
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=997bfd2915e836fdd897dbd016668739
diff --git a/metadata/md5-cache/sci-electronics/kicad-9999 b/metadata/md5-cache/sci-electronics/kicad-9999
new file mode 100644
index 000000000000..acfc05408aa7
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-9999
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=x11-misc/util-macros-1.18 dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=dev-libs/boost-1.61:=[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:3.0-gtk3[X,opengl] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( >=dev-lang/swig-3.0:0 )
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=7
+HOMEPAGE=https://www.kicad.org
+IUSE=doc examples +ngspice openmp +python occ +pcm python_single_target_python3_8 python_single_target_python3_9
+LICENSE=GPL-2+ GPL-3+ Boost-1.0
+PROPERTIES=live
+RDEPEND=>=dev-libs/boost-1.61:=[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:3.0-gtk3[X,opengl] ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) python? ( python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=d555d3961222a22f42a590783e5ee6d8
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.12
new file mode 100644
index 000000000000..a89440796e25
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.12
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
+EAPI=8
+HOMEPAGE=https://kicad.github.io/footprints/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.1.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/5.1.12/kicad-footprints-5.1.12.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=94deb842c1e48a94460af38466b748d6
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-footprints-6.0.0_rc1
index 83b5b4aa1909..0c27f1f57a42 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.10
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-6.0.0_rc1
@@ -2,11 +2,10 @@ BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
 EAPI=7
-HOMEPAGE=https://kicad.github.io/footprints/
-KEYWORDS=~amd64 ~arm64 ~x86
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-footprints
 LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0
+RDEPEND=>=sci-electronics/kicad-5.99
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/5.1.10/kicad-footprints-5.1.10.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/6.0.0-rc1/kicad-footprints-6.0.0-rc1.tar.gz -> kicad-footprints-6.0.0_rc1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=614cd55c5b2b6dc08bc5a02283ee6658
+_md5_=f8f24d5f11eb87dd1374993637c0d7f1
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-9999 b/metadata/md5-cache/sci-electronics/kicad-footprints-9999
new file mode 100644
index 000000000000..22d0306c972a
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=x11-misc/util-macros-1.18 dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
+EAPI=7
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-footprints
+LICENSE=CC-BY-SA-4.0
+PROPERTIES=live
+RDEPEND=>=sci-electronics/kicad-5.99
+SLOT=0
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=a1a0ccf9082aeafa9ac4184ef4c1b7c4
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.10
deleted file mode 100644
index 98c0054d4831..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Electronic Schematic and PCB design tools GUI translations
-EAPI=7
-HOMEPAGE=https://gitlab.com/kicad/code/kicad-i18n
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.6
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/code/kicad-i18n/-/archive/5.1.10/kicad-i18n-5.1.10.tar.bz2
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=940237e69e4cf0a21455d029ce6af16c
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.12
new file mode 100644
index 000000000000..0b9dc8b9f4c1
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.12
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools GUI translations
+EAPI=8
+HOMEPAGE=https://gitlab.com/kicad/code/kicad-i18n
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.1.6
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/code/kicad-i18n/-/archive/5.1.12/kicad-i18n-5.1.12.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=3b295563f661821d90182aa392334954
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.10
deleted file mode 100644
index f368b8fd6a4c..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
-EAPI=7
-HOMEPAGE=http://www.kicad.org
-IUSE=doc minimal nls
-KEYWORDS=~amd64 ~arm64
-LICENSE=metapackage
-RDEPEND=>=sci-electronics/kicad-5.1.10 >=sci-electronics/kicad-symbols-5.1.10 >=sci-electronics/kicad-footprints-5.1.10 doc? ( >=app-doc/kicad-doc-5.1.10 ) !minimal? ( >=sci-electronics/kicad-packages3d-5.1.10 >=sci-electronics/kicad-templates-5.1.10 ) nls? ( >=sci-electronics/kicad-i18n-5.1.10 )
-SLOT=0
-_md5_=16d2e53c3d98c9aedc50654a685aa4b6
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.12
new file mode 100644
index 000000000000..dec2097820d1
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-meta-5.1.12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
+EAPI=8
+HOMEPAGE=http://www.kicad.org
+IUSE=doc minimal nls
+KEYWORDS=~amd64 ~arm64
+LICENSE=metapackage
+RDEPEND=>=sci-electronics/kicad-5.1.12 >=sci-electronics/kicad-symbols-5.1.12 >=sci-electronics/kicad-footprints-5.1.12 doc? ( >=app-doc/kicad-doc-5.1.12 ) !minimal? ( >=sci-electronics/kicad-packages3d-5.1.12 >=sci-electronics/kicad-templates-5.1.12 ) nls? ( >=sci-electronics/kicad-i18n-5.1.12 )
+SLOT=0
+_md5_=edcb9fcc3d5cd7b6583bb6eeac57e956
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-6.0.0_rc1 b/metadata/md5-cache/sci-electronics/kicad-meta-6.0.0_rc1
new file mode 100644
index 000000000000..62971929b372
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-meta-6.0.0_rc1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
+EAPI=7
+HOMEPAGE=http://www.kicad.org
+IUSE=doc minimal
+LICENSE=metapackage
+RDEPEND=>=sci-electronics/kicad-6.0.0_rc1 >=sci-electronics/kicad-symbols-6.0.0_rc1 >=sci-electronics/kicad-footprints-6.0.0_rc1 doc? ( >=app-doc/kicad-doc-6.0.0_rc1 ) !minimal? ( >=sci-electronics/kicad-packages3d-6.0.0_rc1 >=sci-electronics/kicad-templates-6.0.0_rc1 )
+SLOT=0
+_md5_=5e003396d27ee9afe7a2249cd71a1b3a
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.12
new file mode 100644
index 000000000000..200e39ca3df3
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.12
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
+EAPI=8
+HOMEPAGE=https://kicad.github.io/packages3d/
+IUSE=occ +oce
+KEYWORDS=~amd64 ~arm64
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce(-)=]
+REQUIRED_USE=|| ( occ oce )
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/5.1.12/kicad-packages3D-5.1.12.tar.bz2 -> kicad-packages3d-5.1.12.tar.bz2
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=44f33e39177d9778c9450f45d8e2a7a3
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-packages3d-6.0.0_rc1
index 55a31ccfaf78..a78063ddfe01 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.10
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-6.0.0_rc1
@@ -2,13 +2,11 @@ BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare pretend setup test
 DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
 EAPI=7
-HOMEPAGE=https://kicad.github.io/packages3d/
-IUSE=occ +oce
-KEYWORDS=~amd64 ~arm64
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-packages3D
+IUSE=+occ
 LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
-REQUIRED_USE=|| ( occ oce )
+RDEPEND=>=sci-electronics/kicad-5.1.0[occ=]
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/5.1.10/kicad-packages3D-5.1.10.tar.bz2 -> kicad-packages3d-5.1.10.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3d/-/archive/6.0.0-rc1/kicad-packages3d-6.0.0-rc1.tar.gz -> kicad-packages3d-6.0.0_rc1.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=8fbe8d50d971c5704d44acc3ac9caa85
+_md5_=1a8196385303704389ed5a604e96dee7
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-9999 b/metadata/md5-cache/sci-electronics/kicad-packages3d-9999
new file mode 100644
index 000000000000..54a658c9d288
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=x11-misc/util-macros-1.18 dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
+EAPI=7
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-packages3D
+IUSE=+occ
+LICENSE=CC-BY-SA-4.0
+PROPERTIES=live
+RDEPEND=>=sci-electronics/kicad-5.99[occ=]
+SLOT=0
+_eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=17321ed7f407a9dd3363ea4c7088ac03
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.12
new file mode 100644
index 000000000000..3e2827987075
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.12
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
+EAPI=8
+HOMEPAGE=https://kicad.github.io/symbols/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.1.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/5.1.12/kicad-symbols-5.1.12.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=1c0a04e12ef678ee242263e64da98afe
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-symbols-6.0.0_rc1
index 3fd381410828..9ae2cf3ff182 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.10
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-6.0.0_rc1
@@ -2,11 +2,10 @@ BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
 EAPI=7
-HOMEPAGE=https://kicad.github.io/symbols/
-KEYWORDS=~amd64 ~arm64 ~x86
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-symbols
 LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0
+RDEPEND=>=sci-electronics/kicad-5.99
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/5.1.10/kicad-symbols-5.1.10.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/6.0.0-rc1/kicad-symbols-6.0.0-rc1.tar.gz -> kicad-symbols-6.0.0_rc1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=3537ac089683cf48ea4f7692d3b430d5
+_md5_=053f0cf8206b54b1b8e4ec5ead887284
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-9999 b/metadata/md5-cache/sci-electronics/kicad-symbols-9999
new file mode 100644
index 000000000000..3294a00f14e5
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=x11-misc/util-macros-1.18 dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
+EAPI=7
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-symbols
+LICENSE=CC-BY-SA-4.0
+PROPERTIES=live
+RDEPEND=>=sci-electronics/kicad-5.99
+SLOT=0
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=f8081812506a8080fe5752617f471b9f
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.12 b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.12
new file mode 100644
index 000000000000..e2f700e2950f
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.12
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools project templates
+EAPI=8
+HOMEPAGE=https://github.com/kicad/kicad-templates
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.1.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/5.1.12/kicad-templates-5.1.12.tar.bz2
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=bd348cb9408fc96b3bc014e16273de6f
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.10 b/metadata/md5-cache/sci-electronics/kicad-templates-6.0.0_rc1
index bacc45498405..35fc283a0f00 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.10
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-6.0.0_rc1
@@ -3,10 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Electronic Schematic and PCB design tools project templates
 EAPI=7
 HOMEPAGE=https://github.com/kicad/kicad-templates
-KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=CC-BY-SA-4.0
-RDEPEND=>=sci-electronics/kicad-5.1.0
+RDEPEND=>=sci-electronics/kicad-5.99
 SLOT=0
-SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/5.1.10/kicad-templates-5.1.10.tar.bz2
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/6.0.0-rc1/kicad-templates-6.0.0-rc1.tar.gz -> kicad-templates-6.0.0_rc1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=143c6af5f9e39af64f9cd4ed19d46e2f
+_md5_=94ecbb911398fae0d741cbee50a45fe9
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-9999 b/metadata/md5-cache/sci-electronics/kicad-templates-9999
new file mode 100644
index 000000000000..1384c5726840
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-9999
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Electronic Schematic and PCB design tools project templates
+EAPI=7
+HOMEPAGE=https://github.com/kicad/kicad-templates
+LICENSE=CC-BY-SA-4.0
+PROPERTIES=live
+RDEPEND=>=sci-electronics/kicad-5.99
+SLOT=0
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=94ecbb911398fae0d741cbee50a45fe9
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.26.11 b/metadata/md5-cache/sci-electronics/klayout-0.26.11
index d5d232aa32f8..97de9f20ad08 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.26.11
+++ b/metadata/md5-cache/sci-electronics/klayout-0.26.11
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[w
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.26.11.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c52b652742bd3de97d72ac8ae0a7bcf0
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.27 b/metadata/md5-cache/sci-electronics/klayout-0.27
index a27dddacea79..c622b707d765 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.27
+++ b/metadata/md5-cache/sci-electronics/klayout-0.27
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[w
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=c52b652742bd3de97d72ac8ae0a7bcf0
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.27.3 b/metadata/md5-cache/sci-electronics/klayout-0.27.3
index ef37243ca2e2..426bbd80f27f 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.27.3
+++ b/metadata/md5-cache/sci-electronics/klayout-0.27.3
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[w
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby27 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.27.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20d4a7f3be6413a87537df5e5760cb99
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index bde23fcc863f..5448e60425aa 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) || ( ruby_targets_ruby27 )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	b3936ca28790633a9d3e5dd891ac9ae6	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
 _md5_=20d4a7f3be6413a87537df5e5760cb99
diff --git a/metadata/md5-cache/sci-electronics/ktechlab-0.50.0-r1 b/metadata/md5-cache/sci-electronics/ktechlab-0.50.0-r2
index 5a84c7dac8aa..22738cb6cd0f 100644
--- a/metadata/md5-cache/sci-electronics/ktechlab-0.50.0-r1
+++ b/metadata/md5-cache/sci-electronics/ktechlab-0.50.0-r2
@@ -1,8 +1,8 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 gpsim? ( dev-embedded/gpsim ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 gpsim? ( dev-embedded/gpsim ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=IDE for microcontrollers and electronics
-EAPI=7
+EAPI=8
 HOMEPAGE=https://userbase.kde.org/KTechlab
 IUSE=+gpsim debug examples +handbook test
 KEYWORDS=~amd64
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/unstable/ktechlab/ktechlab-0.50.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	9fe70cc0ef1ddfecce7548500987215d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	f95aaca4085d2d633c2b76abfd72208f	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=28a123388092e20bb5349992861de7ae
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	3efe514b4cd196a075e50ab6552a203d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	10ca734e4845124395fc126944c8d053	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=5f2d3bc90fd5c3caee4311f879358b5f
diff --git a/metadata/md5-cache/sci-electronics/magic-7.5.202-r1 b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
index a129af01b4f9..142f045df95c 100644
--- a/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
+++ b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= d
 DESCRIPTION=The VLSI design CAD tool
 EAPI=5
 HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt
 SLOT=0
 SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-7.5.202.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=de5458bb228ed1f0957d09b741240c75
+_md5_=9c90608aad1b4a158b3a64e751c29a5c
diff --git a/metadata/md5-cache/sci-electronics/magic-8.0.207 b/metadata/md5-cache/sci-electronics/magic-8.0.207
deleted file mode 100644
index 86a5779a566d..000000000000
--- a/metadata/md5-cache/sci-electronics/magic-8.0.207
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/glu virtual/opengl ) app-shells/tcsh sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The VLSI design CAD tool
-EAPI=5
-HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
-IUSE=debug opengl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=HPND GPL-2+
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/glu virtual/opengl )
-SLOT=0
-SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.0.207.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1678d7773e545123db542d9f944b45df
diff --git a/metadata/md5-cache/sci-electronics/magic-8.3.232 b/metadata/md5-cache/sci-electronics/magic-8.3.232
new file mode 100644
index 000000000000..dc97eed10ca1
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/magic-8.3.232
@@ -0,0 +1,13 @@
+BDEPEND=app-shells/tcsh
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt cairo? ( x11-libs/cairo[opengl?] ) opengl? ( virtual/glu virtual/opengl )
+DESCRIPTION=The VLSI design CAD tool
+EAPI=8
+HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
+IUSE=cairo debug opengl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=HPND GPL-2+
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt cairo? ( x11-libs/cairo[opengl?] ) opengl? ( virtual/glu virtual/opengl )
+SLOT=0
+SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.3.232.tgz http://opencircuitdesign.com/~tim/programs/magic/archive/2002a.tar.gz -> magic-tech-mosis-2002a.tar.gz
+_md5_=6ca43c7240b9ef291283823efa3c4acb
diff --git a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2 b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
deleted file mode 100644
index 4c49d0b1e78c..000000000000
--- a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch postinst pretend
-DESCRIPTION=Full-featured EDA product for altera devices
-EAPI=5
-HOMEPAGE=https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html
-KEYWORDS=~amd64 ~x86
-LICENSE=Quartus-prime-megacore
-RDEPEND=media-libs/libpng-compat:1.2
-RESTRICT=fetch bindist
-SLOT=0
-SRC_URI=Quartus-lite-15.1.0.185-linux.tar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=f2075fffc6735dafe0f4ee7a14487b58
diff --git a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3 b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
deleted file mode 100644
index 08250e1e2159..000000000000
--- a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install nofetch postinst pretend
-DESCRIPTION=Full-featured EDA product for altera devices
-EAPI=6
-HOMEPAGE=https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html
-LICENSE=Quartus-prime-megacore
-RDEPEND=media-libs/libpng-compat:1.2[abi_x86_32] x11-libs/libXft[abi_x86_32] app-arch/bzip2[abi_x86_32] sys-libs/zlib[abi_x86_32] sys-libs/glibc[multilib]
-RESTRICT=fetch bindist
-SLOT=0
-SRC_URI=Quartus-lite-15.1.0.185-linux.tar https://github.com/brendanhoran/gentoo-custom/raw/master/files/libfreetype.so.6
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56
-_md5_=74217b19c6ebb20e90d6bff8fe1f028d
diff --git a/metadata/md5-cache/sci-electronics/vbs-1.4.0 b/metadata/md5-cache/sci-electronics/vbs-1.4.0
index 2897b8b36542..ec4e3e6eab9e 100644
--- a/metadata/md5-cache/sci-electronics/vbs-1.4.0
+++ b/metadata/md5-cache/sci-electronics/vbs-1.4.0
@@ -3,8 +3,8 @@ DEPEND=sys-devel/flex sys-devel/bison
 DESCRIPTION=vbs - the Verilog Behavioral Simulator
 EAPI=6
 HOMEPAGE=http://www.geda.seul.org/tools/vbs/index.html
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.geda.seul.org/dist/vbs-1.4.0.tar.gz
-_md5_=f516564cc8f10b36c181ae0b8cafecc4
+_md5_=874190199b5a1e3ba620e6b99a2859c8
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.9.73 b/metadata/md5-cache/sci-electronics/xcircuit-3.9.73
index bd3ce0d8189e..5e6a75432662 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.9.73
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.9.73
@@ -4,10 +4,10 @@ DESCRIPTION=Circuit drawing and schematic capture program
 EAPI=6
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
 IUSE=tcl
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl media-libs/fontconfig:1.0= sys-libs/zlib:= x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm x11-libs/libXt tcl? ( dev-lang/tcl:0= dev-lang/tk:0= )
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.9.73.tgz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=27ddf18d9cea95f7ffbd099a34a14d41
+_md5_=6feec48666a4eaa2f51ffb918f2bb440
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-4.2 b/metadata/md5-cache/sci-electronics/xnec2c-4.2
new file mode 100644
index 000000000000..c09e35d561a7
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/xnec2c-4.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 sys-devel/gettext
+DESCRIPTION=A GTK+ graphical interactive version of nec2c
+EAPI=8
+HOMEPAGE=https://www.qsl.net/5b4az/pages/nec2.html
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-4.2.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=b93b58cbfda4585adbc2e321dceb1a64