gentoo resync : 05.04.2019

17 files changed, 80 insertions, 266 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 010a7660cbee..632c44584952 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index d481f1210161..f494ec60b761 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,8 +1,10 @@
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 DIST gazebo-10.0.0.tar.bz2 52987075 BLAKE2B 38d8954827e2aef1607b5e4841014d394644aa0d7cc8969c18d47dd4311701e70cde40ed8be1e28010c5472bac2787ebd619a72fcdf0c59391f890b53dac2b79 SHA512 ddb7d4514e90722c11de9f0187321d9a9b5eb778c047b432bc6104792f423275b996c76caa91fcc4a6e6cb578fb0d479c429db3e1da25c9ec5da51fb2520e29b
+DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
 DIST gazebo-9.4.1.tar.bz2 53014386 BLAKE2B c3e450f869f3e5f88bd9b5f5924a6b003880fff492849d6570222c7c37e98f1b89df4dca1af16c9a766b049067bbcc9d86334882041c6420b6b5221dfd643bb0 SHA512 76fb217c396f4d70fa4617df3aa5a672b5ddd4680df22eb3fbe67182ef8b3e05affda2e61f71d03e31f9c47b2f7d56aac162b63dec2f122cef1e47fd65d25f02
 DIST gazebo-9.6.0.tar.bz2 52899944 BLAKE2B a1ae213cb81cbfbb62fb8a229f12c0c95c4325a8f2a1aae0d07dfaa3bdf17f4d4c3043f37efb5d407fb34073b354d83e7114e166225b8c90e87329abe1618059 SHA512 ef0cc95897322304e0117947e4b45dfb2c4ef3a24f3fa8c798397b3c6cf68b8193b7013efcf15a01f45b15caeae02ed7dacc53ae3b5dc8fcd393018b33bd3d14
 EBUILD gazebo-10.0.0.ebuild 1861 BLAKE2B b9ff4e39e6872e5c1eb4f5e0c6d80b831233aa30afbd7ea85d6b9674a37215d22c0e22d3741903c2852c778218f71090ee2dc8c877d52527b64e27e968e59eeb SHA512 def5c98c5239f51dd4513e988a87e5ee6de0c2fba4cdc0ea74ffaa0333c0958812c4ec126f12ba568042c393ff53dd266da8c393efe7b0ec525b1f3f54ab9534
+EBUILD gazebo-10.1.0.ebuild 1861 BLAKE2B b9ff4e39e6872e5c1eb4f5e0c6d80b831233aa30afbd7ea85d6b9674a37215d22c0e22d3741903c2852c778218f71090ee2dc8c877d52527b64e27e968e59eeb SHA512 def5c98c5239f51dd4513e988a87e5ee6de0c2fba4cdc0ea74ffaa0333c0958812c4ec126f12ba568042c393ff53dd266da8c393efe7b0ec525b1f3f54ab9534
 EBUILD gazebo-9.4.1.ebuild 1860 BLAKE2B 34803940ef219c1231d1a543b90eb6fe3fcbed2e857fff7c385ab2d5982607bcaeccb23506361665f772d7efeaf99f1409c815799725deea32aca57ce67c3c7e SHA512 e74178fdb49183973ceb33a1a86a4b12b409856afdf2ce71adc809379386a9665cb6b0bbb52480a10eb619b2edaad9cc3eb12396a07941124d8825b07035dfd5
 EBUILD gazebo-9.6.0.ebuild 1860 BLAKE2B 34803940ef219c1231d1a543b90eb6fe3fcbed2e857fff7c385ab2d5982607bcaeccb23506361665f772d7efeaf99f1409c815799725deea32aca57ce67c3c7e SHA512 e74178fdb49183973ceb33a1a86a4b12b409856afdf2ce71adc809379386a9665cb6b0bbb52480a10eb619b2edaad9cc3eb12396a07941124d8825b07035dfd5
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
new file mode 100644
index 000000000000..2ba6f5bb35d4
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils versionator vcs-snapshot flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/10"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 libav test"
+
+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
+	libav? ( >=media-video/libav-9:0= )
+	!libav? ( >=media-video/ffmpeg-2.6:0= )
+	sci-libs/gts
+	>=sci-physics/bullet-2.82
+	>=dev-libs/sdformat-6.0:=
+	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:1=
+	sci-libs/ignition-math:4=
+	net-libs/ignition-transport:4=
+	x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	app-text/ronn
+	app-arch/gzip
+	virtual/pkgconfig
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=( "${FILESDIR}/qwt.patch" )
+
+src_configure() {
+	# doesnt build without it
+	append-cxxflags "-std=c++11"
+	# doesnt build with as-needed either
+	append-ldflags "-Wl,--no-as-needed"
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 5ebb85ea85c8..23eccc428e9f 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,5 +1,3 @@
-DIST kicad-footprints-5.0.0.tar.gz 4978410 BLAKE2B 4b736b9530bcb093ef916c5dff3ee17662c801478c14859b2256575c2d5244e714c0b61f2c4d59f33cbfc23b4f35f590546e0b3bc374d730ebf519a80d8904d1 SHA512 b96706cf021749630b544a437cb0fb278cf4369cb8acb89eb962bd674b3fc77dbca719dd540844d3478082ee0f82e7d65fce15a3658a9c6cbe8df3c691bbfbfe
 DIST kicad-footprints-5.0.1.tar.gz 5074166 BLAKE2B eb8a532c83af37d241c0eb73b7ac0a6bdd75e87f5d06ebdb9a109160cae131240f4f5516c9bd38785c51e068ffcc29cdec075565bc4bc14af3924f814a68aa54 SHA512 16057e7a768097a7e97ae8a25d0c35891d04621e5d5b7437e80f893f48365e562b69c38a8076c1dab0455801359e766fcd1f7d31fec2cc78c9e7cda2d6f210ae
-EBUILD kicad-footprints-5.0.0.ebuild 459 BLAKE2B ddd2afac158a61b8266051740603e4b792f7e58431b23d28fc3401c08ee11003d88986e257cdefad701971d60ee547f4e85b7530f77f62eeba67e0ecf523a033 SHA512 89ea467a27c5073e84a6e61d6422097728fbe0b4518226799ac093232f4903850ad368a6617ce5f6ea42a621092c4bafa6a3fb5a2a0b2efe02eca3334b67db6c
 EBUILD kicad-footprints-5.0.1.ebuild 456 BLAKE2B b49fd1584b037aa4cf93ddc7b86ae699914c1c5838c4cdfeb3a09c11e346e0de0a8f37a01ec01cc975d959c84da0a7c1e311294b6927ff47385062e8987e639f SHA512 c16d4558d3e37f60382c05c18aba6fefc431a2c884d4c1a93685f394c5ab42cc423770d518d65ab62007d10ad6d64047ee7a517c953388c0d9b19e75a11e4429
 MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.0.0.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.0.0.ebuild
deleted file mode 100644
index bc75d2e226ed..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
-HOMEPAGE="https://kicad.github.io/footprints/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index dff2aec4d8c2..16e3783b9711 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,5 +1,3 @@
-DIST kicad-i18n-5.0.0.tar.gz 4053403 BLAKE2B 12ebcc2a178440374280dfed6988583aa27ebb22574eccd2da9104e20d751865a473f05df9f9c523faadaaf7541948247cc57403a5287ffcfe7ec8cdc6f29555 SHA512 efc0729e1da151f490e2568d756b44b3153a65ca658076ac7346736d1703eb73828687f8ce944bdf23c251ac29bde705e403c25bd32097e2a6768e65a4600616
 DIST kicad-i18n-5.0.1.tar.gz 4062609 BLAKE2B a3113758cc1e813fca97abd9c4e5ca367f974900b6ca7072c55eef9d9eff6274bacdad37b81a98f650c05be8fbdff306dc59db1cdd1a22b4d0776c9a89454303 SHA512 5254f6f945fa63e56bc3e9440cf506da3a4ccd76a58fd7e052a04ff60ecaa0daf6ad0599376a5175a4628d40cb1e317973e470a1593714186adb393c20761e24
-EBUILD kicad-i18n-5.0.0.ebuild 474 BLAKE2B 695283308c5a7b10c077b99e8a089c9d589fef8f7f7f890449ba20e87dd4b9dfcf7ca9faeb237e28e673ad4933d3089bedb907ac444d3da4cd8413ab2234042d SHA512 120dfc0416bb39c3cbba29541ad1a831245dbeed02af39a2cc0aed1ae537db8e5e7d7761d8cb96363ec931dd7ec19049ec96de2b9101bdd547bb82f86acb4434
 EBUILD kicad-i18n-5.0.1.ebuild 471 BLAKE2B 4ead8d717ce3a8c3b4f9451b806812647787507a4ccaa8d925aa2f81539c21468cf4a63b37c3cb017f9d938f17f036f11cd25e41309f41ccad22d3ea2f01222b SHA512 93715c5579ae737a6418597f87e1fb57cc75bbc9085faf84dfde5302f8d01b599602ac403145faa6b29feb73f9f2ab0934669b9a6e9c16f401530ef0a9e58a63
 MISC metadata.xml 517 BLAKE2B be3a0d4a291df26add1c632add8b650486c95fea074acb030ce910b8ef64cd53add36bf16ac26c4e7781ee9a7942b2cca1ffa09b5869d9f0bfb4cac905c8652a SHA512 6f1579666c041f9192717440d617e2fbd55f58184ab82d6c724efa2a1c81f5fd7986f9ca934fe88cb459eed3d1b800c5c38889afef48ca81d79e0bec220441ba
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.0.0.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.0.0.ebuild
deleted file mode 100644
index 8c1687234666..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools GUI translations."
-HOMEPAGE="https://github.com/KiCad/kicad-i18n"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 901a1bc4e682..9dd45b780b4c 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kicad-meta-5.0.0.ebuild 594 BLAKE2B 7941b0cb359a494245a93d147d21399380b9d397d27f6c5f692144b4b8932d0108e87fdda70298e26d0aa9a3a8585b1a733fccf67d390043ac15a0a7048cd5b4 SHA512 7aaa796c58f9fca1c1a2d5a667eae3e4e73e9ffe14b21f2012c9f8a120cc543c23c962e6dd60dd6e8d9949a7af5329bb6bb809e6147be98ae997891fc8b36712
 EBUILD kicad-meta-5.0.1.ebuild 591 BLAKE2B 0ecd15509f5670c65f14efee4bb8a070359fc1cacff48d0bcd97bc77fbfdcd159c68b43052c502e5afa4a598e811e5274fcb42069f9f7ae670f7feb9e5e0927d SHA512 c9b92be8e65e935fa2b29d62a0a8e740fd8bc1b3e7ea87345a63b57f37877843a709494e2fcfffb68f223ea8f8655dd9a0fdb13985bc7b5021ece24dc01d907c
 MISC metadata.xml 491 BLAKE2B 5c5a29d7b8ae502e8aa7c637c56e988fb9afd219c2f258ee6140bb8036456b5c5bae4c6ec0512926afa20b6f6f4fa4b8c22fc3c73fd3626ab37206904ee98ebe SHA512 72fe2f2b679d5f20ab2e8932fe46e61227bc7cc6f9fe4c329a6f842f0d4ea0ea607c66042ca411904f8d54df8af741605e4f77a917f45fda759107c46456e8d7
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.0.0.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.0.0.ebuild
deleted file mode 100644
index 5a5e2b32a930..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-5.0.0
-	>=sci-electronics/kicad-symbols-5.0.0
-	>=sci-electronics/kicad-footprints-5.0.0
-	>=sci-electronics/kicad-packages3d-5.0.0
-	>=sci-electronics/kicad-templates-5.0.0
-	doc? (
-		>=app-doc/kicad-doc-5.0.0
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-5.0.0
-	)
-"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 79d65019a515..390a610799d4 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,5 +1,3 @@
-DIST kicad-packages3d-5.0.0.tar.gz 767675132 BLAKE2B d7c43ddf96dcce768ca9fa9d73a8bff3ab325983cbc75dc1fd55e93deecf4014a482b2359f63786dc0b84601780532a71f8b8e70132b3f924f30ebc3aea92900 SHA512 02145a2745242746903c50f3616b836fd02a02411970c8600248b29f267c5abf13527c51a311c581164298498813a55d22663d25eaa0fa337a3188e6412f685b
 DIST kicad-packages3d-5.0.1.tar.gz 791951390 BLAKE2B 31c10869d53c7fe262bc90c721d0e99b1381e5faaf157597f5c58b00f328ab654260cc306466fbdb3ed6c48e71d21b48e74365d62aca009a2d3b77c0c3feb988 SHA512 8f188c5b97904eca0e564ccbdf29c0b6cf99fb60290f3c11a22d4c38c91edb3aee20412be867eee84007e39d54f808cff713f6252536045d92e891ed735ed334
-EBUILD kicad-packages3d-5.0.0.ebuild 517 BLAKE2B a8be63fd6d57e90221fb8359cee7845ceb420bb4bfe9c619907c8b63a4c91c3c298a4944decaef0a18edfc813e5715f7200d27cf204a6bd2be886124c20fd6db SHA512 cf98d9542253072bed49de760517aa94c0c1d489ba9b68250ac67b86881ce860e40406b0f747daf35a7c6f6f580c3065d2c128875474bc76d6cac4314264abc0
 EBUILD kicad-packages3d-5.0.1.ebuild 559 BLAKE2B b98b37dff0374a0836cb62800c004de6cfe6118244ca39e17984f506208b8c33a12b754da7ea6836024b4f3633f920fbea6fd1927d60fa192b8442c786a6ba3c SHA512 d92316f8ec0a47262b2cfd41f4e559451a0c8fbb135559642c69a35362d0a445d8b27c80a9fd90052b981528b8bbec8a681f849675534f319b58978e3466a221
 MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.0.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.0.ebuild
deleted file mode 100644
index 5da63dce83cb..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
-HOMEPAGE="https://kicad.github.io/packages3d/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0[oce]"
-
-CHECKREQS_DISK_BUILD="9G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index bd300fd5faba..514c3df17c45 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,5 +1,3 @@
-DIST kicad-symbols-5.0.0.tar.gz 2690042 BLAKE2B d3d32459335112aa44fce010a88fe859b8413051b4df8d656dbd8cff11c6536808b95bd5c25c1a699a9bfec22f320b418456e9dc024f9db38fa1da2aeade8bd3 SHA512 547029afdda5438108fcc9de7ca1cb6eb86524e8eaad5e32cd6cec58642dd3a98ff6b06ed55b347733306098ddc763e8204e2e638ef1d27cb9f7eb15a9710eb7
 DIST kicad-symbols-5.0.1.tar.gz 2715790 BLAKE2B 5b87d64967c181161309d17f21feda14e6b44814ca9ec77ff9408d8a1d55805eaafea40bdb8ab4964c3fd66832ffef45e6c8c857816036586e5b8f4a33e34c4e SHA512 f0c3ee981cd96a57eed50b1e5a6d7956e0f73edaf86f1afb3a56b93d31161fe0a567d60f02339b3a2e9b9377b7176e9097484035512a40c4ca3a98341dc0056c
-EBUILD kicad-symbols-5.0.0.ebuild 453 BLAKE2B 332b5a400d85565f34d44683f82745ef80a1001956119b59b295a9d3ef9d02f0576e6dcf6125a786d3cca7499c8d396e713bd123b7e709fa488b35a8bff58782 SHA512 5d8501ba8f88e9399b2b7bc88dc8835df7f930f56f62aa1e78f527b4ab9549d6cee77a766c648cf75d4e9d6f9d4fa0e490f9f8709cd2c4d6a12d9d6e806008fd
 EBUILD kicad-symbols-5.0.1.ebuild 450 BLAKE2B c0fda1a73122892636ada55e4c7d63cc667f71f02516bc7847dd10e42de2a5799b7d750ca03c0781113e725db0403a7eb8a35f60d9a8df7daba4b6e8f96f7c41 SHA512 930424dac84702ff3cac707dbd3768b4bc66c991310f6be275ca658c5768e4bcac66d18eaa32e5e4643efec4e2d752bfac0f265c2a239ecb1e92eec3e246f1f0
 MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.0.0.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.0.0.ebuild
deleted file mode 100644
index cf3f669a79ab..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
-HOMEPAGE="https://kicad.github.io/symbols/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index b78a29053104..f9abf16d9853 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,5 +1,3 @@
-DIST kicad-templates-5.0.0.tar.gz 1621228 BLAKE2B e63d97290bb99a78ad0a273772e19d14cf22c36d45d8445cb5dd0b906651e4b3981faac0cb12523e60d1ea3de3dbce71b07166114ee5862e6df090200fb7cac8 SHA512 5e59ac778258a8313df8c3c0fe900acc8b64362f205738494397f51a1eea481a5e8b25d9cc59b370c233be5e47a488de44fed073522198f0634a87ab5f2d7d56
 DIST kicad-templates-5.0.1.tar.gz 1621185 BLAKE2B c21020ba11ff01863e5c8681247f8e17c03d06532f7eb6df94de8c6cd64f51142d54a762f83168b6c4f0b9c96764cb53d220eb6fd237c517fa07bfe51105543f SHA512 ccd995cc39bd578a95b1b3fdbe53a7bb8dd6638aa5717cd9a930371b0a48e66f1783ba3abce9438c7c29ab3b2b0a9075acc0b9c42eeb73480abf170a6f784668
-EBUILD kicad-templates-5.0.0.ebuild 462 BLAKE2B 384ad10b44f385257a1c070f79765cbc24cec53cc76d5342b81f35b22d99ebb6820815cc822fea54fd99d09ee6162be3bf77ecf453b7dca2c6bc631165fa061b SHA512 2baf2897f7fd4a1fff85ac8acef7c943316b0af68159176b4b5538ad563c28bab19c8d7b5f128b032c7f18023f7e4237a00296d6c10c458f358688c0150441f4
 EBUILD kicad-templates-5.0.1.ebuild 459 BLAKE2B d79ddb7dd35b96c1739f4e785c90c35654a982f5f4ef62d2e7e1334e9aa17597b87da0661934680e5b32ee20d99e67165cd0d92c8991a0e620f718fd2db1d1d0 SHA512 8de9ec54219987cd1bd69641c171fb5da3ae76f98bd7aeceb004bba444dd6e6d766597d61b85c46058a67f7748c5262f3fd3d9acc06e44d215c1866ab46ee625
 MISC metadata.xml 523 BLAKE2B 69cc5f4bec43a5acd17e3f762c7648e9af9c70a06516b233d78cd5446a0638115caff7559d43b13abd2929c0d7424335c00ad5cc72a1123fcdc6590fd1da8c23 SHA512 c8f588b7a40f7a1f703566b3585c9fa8051ceaae27db76912fc9f228aa27f0dfe9dcc90b728e11d94e27b6b3ed2ae55f0b0f98d2094ade00befdfd742f485d59
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.0.0.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.0.0.ebuild
deleted file mode 100644
index 7960e622b847..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools project templates"
-HOMEPAGE="https://github.com/kicad/kicad-templates"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index fbd21c244eaa..2afcea59ee66 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -5,11 +5,9 @@ AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6d
 AUX kicad-help-path.patch 4683 BLAKE2B 6b3e3d3567e0f554346ad2eb30b3af9e7ab07e77da2675513dd040e85011f6e711701c0cf3909399f4fe2298d7d59e71727583240d3e06701c18b4c2f59090ef SHA512 570fb711ffb18c7201e7a75791d1cc370493975d19e125de1ff6a78107b5fb70868975efd7d2a8ec921190484f7f91f723cca52337ec2e36f860b73dcedc3e7b
 DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
 DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-DIST kicad-5.0.0.tar.xz 14284708 BLAKE2B 9f4414c4476aca8f2da1d7171b53f56d5ea216f11fc025695a228f93ec05e2f271cbab8429ed39445602a3a0707a31d44cce83eae0ad651167c471f52f3867cd SHA512 79d4d34e8eaa5b6e4c7baac39a76f86af89adbaf3f9181b8cd846ed3a8db1b4c6dd7a36efefda3394d33ef828917909ad3bd8bb22435af9c6f671efbff125b42
 DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7 SHA512 36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
 EBUILD kicad-4.0.7.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625
-EBUILD kicad-5.0.0-r1.ebuild 3505 BLAKE2B a330ec2d0080728dab3690408e7c17150884f10b62d70fff07dc07d37f4127e52b700ead2ec56161f865a5512400c422e110a474161d1f7e672d5eac3866e8f6 SHA512 85b0ab06e6d0b74885b0bf84ec19adbc20a838b3f1051f787172fbdb6c2a7ddd36e586db678eb93c9e5a1088e2b290d7c192e411e743e8922b1741e7de442144
 EBUILD kicad-5.0.1.ebuild 3471 BLAKE2B ac851512fe9132cd39e8e923e87f60043f715cec8036bc4b2405e3f2856c689d75fa7b150b4c13b9d2a7f494a87c12ce03270d2065c611b41fa3740d86aebc46 SHA512 c9b1a4869a5c100110482f03cc61450e7046e6be09c8e739eee858e3ff2fce34dad19ab687324d0c749890f1c4506b7268522e8abdcd41e886a9d411ec2e9110
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/kicad-5.0.0-r1.ebuild b/sci-electronics/kicad/kicad-5.0.0-r1.ebuild
deleted file mode 100644
index 18cae5de2535..000000000000
--- a/sci-electronics/kicad/kicad-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}]
-	media-libs/glew:0=
-	media-libs/glm
-	media-libs/freeglut
-	media-libs/mesa
-	ngspice? (
-		sci-electronics/ngspice[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0 )
-	oce? ( sci-libs/oce )
-	>=x11-libs/cairo-1.8.8
-	>=x11-libs/pixman-0.30"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	github? ( net-misc/curl[ssl] )
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-CHECKREQS_DISK_BUILD="800M"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
-
-	epatch "${FILESDIR}"/${P}-curl.patch
-
-	# fix application categories in desktop files
-	while IFS="" read -d $'\0' -r f; do
-		sed -i.bkp '/Categories/s/Development;//' "${f}"
-	done < <(find "${S}" -type f -name "*.desktop" -print0)
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	use occ && mycmakeargs+=( -DOCC_LIBRARY_DIR="${CASROOT}"/lib )
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doxygen-docs
-		cmake-utils_src_compile dev-docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}