gentoo resync : 15.06.2021

18 files changed, 44 insertions, 25 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index cdc3a2bc1558..99dc33e6918b 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index fd182b953947..79982ed7acf0 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -3,6 +3,6 @@ DIST eagle-lin32-7.3.0.run 48599533 BLAKE2B 9412464dec7f3dee0944bfa588c5d9d1c8fd
 DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c61891ebab7e3f59d41aaa0c6ecaea2f050ced62552656a2311542fee497dbe8fbe43c958a8e76a9b00217c430f678072 SHA512 7ebe73bcd71857c5b8087e911ebfc45507715725abab15b80c9800476128790f8e373d01c52c05a87102597d355390ca0687964eff74af1283b162fba8dbb53b
 DIST eagle-lin64-7.3.0.run 48248700 BLAKE2B e7d8a7a23e0023159d626203bba2cf195fad3eac54b9b72947c9e72e7bb3f3534ce2545857ce76e70302eb1d2042cc30f9c327fc2a5a4dd4287e82aef4393dc6 SHA512 bd158b25ed682c63405b90358f82ffcb0903c7f5e5ae81737efcb56b6074a78125de31909c64f31a5f4bab7727c63b6aa0c7af0f6440793010f7f6de3f92f681
 DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770
-EBUILD eagle-7.3.0-r1.ebuild 3575 BLAKE2B 13ddfd47fc56feb42a788e8f18ee3eb38a289a1710d4a3c1056b07f025ad8654dadcc965b4d70e1ae0390cbda1fb05f5236568ec6a99865d7ade623b0dfe099b SHA512 a0a02e65cb148606e37555c9ce86ace158524026e8fc9fa20e4babdd8af02a941bf24ad48ec0e29577999f599bab30deaba5dae266522f8e4fbd1ba94bc14a47
-EBUILD eagle-7.7.0-r1.ebuild 3577 BLAKE2B da856a4731f74c1079218e58e23cf4bb6f0e42def12f69af914534bb0a5795fa88e47bd0bcaa8ecdeafbe7b732e2e19767ebc3fc071c8fab33b1a28f9ef8b069 SHA512 27b61b6006b0a45ed2a534df6b75b2a97d28f9cf9eccb851cc8019ff5deaac8f88ade3041ab3d9bd8552a6a63c88437f4d5119de48c54ee00cf78e8343670742
+EBUILD eagle-7.3.0-r1.ebuild 3578 BLAKE2B 5eb7ae0701afd9547b6431344327809e6ca1cd2cb505a59261481531d2ffcf1766d9ecfd7c82633b2e445adbf2199a20b2ed605e5e6adc33cca3d97dc11d70bc SHA512 f20a8a5cb4ebfb2c6bb64458288e1896594eec5add05465fe7b42a2da383cd4a598e3a47790c68215d84267d66b7f22fe2ad6c59aba38be80646297b1193d36f
+EBUILD eagle-7.7.0-r1.ebuild 3580 BLAKE2B 8375385083919c05e572911bd1f6c079dbfaf842a2517d0a08f1deba2c13f9c1ebf3f8fb5bbdcf04c42005aa93cb6c1d3eab11ce377966b979b9c326cf61d6d3 SHA512 1c5ac0e9437f83d74ed5bc4809a5ccdcf9219fc89f7262eee4928a24d49d88029f0b19df041a55153daeec9e0c8b4868580bdfa44b0db8ac51298ff37c8aaa1c
 MISC metadata.xml 671 BLAKE2B fe104f5979bd1c3443983d0dd04b14fbce7c9f07b789a3faca57b3aacd3031855dd3eeda11775179f44a86b6f96274c235a574affb7b02abc21db34ce2e4c770 SHA512 e45c4c1d534e47500ad9a1354d568b879ba0b098f792c7bce74638148b153089fb85f2e5eb8198fe15406ded94981622be00db5572ec2d53dfca3d46f163d960
diff --git a/sci-electronics/eagle/eagle-7.3.0-r1.ebuild b/sci-electronics/eagle/eagle-7.3.0-r1.ebuild
index 1525e2d013d2..a814f7ecec99 100644
--- a/sci-electronics/eagle/eagle-7.3.0-r1.ebuild
+++ b/sci-electronics/eagle/eagle-7.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -113,7 +113,7 @@ src_install() {
 
 	# Create desktop entry
 	newicon bin/${PN}icon50.png ${PF}-icon50.png
-	make_desktop_entry "${ROOT}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
+	make_desktop_entry "${EPREFIX}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
 }
 
 pkg_postinst() {
diff --git a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
index 0471e5ea1037..f723b0377c57 100644
--- a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
+++ b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -113,7 +113,7 @@ src_install() {
 
 	# Create desktop entry
 	newicon bin/${PN}icon50.png ${PF}-icon50.png
-	make_desktop_entry "${ROOT}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
+	make_desktop_entry "${EPREFIX}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
 }
 
 pkg_postinst() {
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 827fc3073132..78045b1a241c 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-footprints-5.1.9.tar.bz2 3387238 BLAKE2B 8c8873a7feb72228fcc92ab5e8950f63fcb09b4b1b16b6f8da5aa3caa30985ceb02e326ebe8ba96fcae07fae71a6233a7d8009fbe6541f2e7c6807ea67c7046a SHA512 28030a750b806be664cb91b3b3e4c0bf2b9efa0518ec55b1ff433633c2f69ab99bedbbdd3264b50cbe80a182e3f97343f5dfdd25e073abe1563231a8318b4155
-EBUILD kicad-footprints-5.1.9.ebuild 435 BLAKE2B c9beff3509330723d542a89eb2c011eb63be5bbcde98c351108d010fefdcd63acdbb62449801596858d71114f8a15b153b0db13c439e53c4a0003758f2c76225 SHA512 89d12bc654c80f6541b5f769042f93c5ed64861eb9541697b6b7c8909d8f18885cdd00233b71436fe5626a122ed1a1e447c5d7ad82ff8a2dfa96352cfc8417ff
+DIST kicad-footprints-5.1.10.tar.bz2 3382220 BLAKE2B c2725a83e1d817cbf748dcf173383a53ee00c917d50c00368feb29150d14d1172df8e2b87fa0b8a2f3921658baae833048889c16d45469c7e888002fc63e9fc7 SHA512 624f5bf4a7e9b30ca1f7f8aa4d8270baf59667c91e65b8beb3c36b546fc4fbabd6221cb408458eb166e0364c7b8c77923b5809d94aea3ec65ae58c65055b6eb7
+EBUILD kicad-footprints-5.1.10.ebuild 435 BLAKE2B c9beff3509330723d542a89eb2c011eb63be5bbcde98c351108d010fefdcd63acdbb62449801596858d71114f8a15b153b0db13c439e53c4a0003758f2c76225 SHA512 89d12bc654c80f6541b5f769042f93c5ed64861eb9541697b6b7c8909d8f18885cdd00233b71436fe5626a122ed1a1e447c5d7ad82ff8a2dfa96352cfc8417ff
 MISC metadata.xml 765 BLAKE2B 683e6562f3e3125a5bfacaf329be7d4a36e755816726507f0dabe26147c995536d37875833c0d943cd9c1a890fba2959ecdd9ccb667449009e988cf3cae0dbcb SHA512 7da9a552823e83b2a099fcfcb0ba1bb28b7faf60bbdd37fd70e7fafa40869999a0af8139053ed7a1b101b042b4d0bdfe5a1870ee18182899abfba10b620d482a
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.10.ebuild
index 01e320ed9a00..01e320ed9a00 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.10.ebuild
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index b8873ebacfc0..9ae145fe3cff 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-i18n-5.1.9.tar.bz2 2934490 BLAKE2B 391cd9b8a23f5dd723884704ce231f79d8bf57b7f2852a97b08228e887226f75714c6515c335122f9f34d13a033e9039423b8bbfb281e4f6396ac158bea5f4e8 SHA512 d41359464e3504263bb964af4f14db027f9b55861098f29d0fa97eb2fb26205d49c00cbda4795317a46b54157f2fda67a94be412cfab80ce81846e173bf1a14d
-EBUILD kicad-i18n-5.1.9.ebuild 460 BLAKE2B b4090cb8b86e3dea31620c8532e3ea5367fea3cbbff5b9f50b9d65d1a29c13a2e990c2b4d7beb3631f87ff7d87abfee3f62c8df2c86fbe83240a88f08ef0d6ca SHA512 962cdb1369df1d10e05271c01af34bb1affd281e3971de9b5bccdadfdf47a17f063a8d31d3c7788a85f1ec6254b768579d7b747d987ae1538b2c68ae67549aeb
+DIST kicad-i18n-5.1.10.tar.bz2 2934783 BLAKE2B b836c12d5265d9da36a4647b8f8e956c7a7a1ebc8a9467f0c4b1ae6d3deaddaddd6c42811bfa6d89440015f1273bb2356bbd91b43ed62e25b402f4b203f598bc SHA512 c40d170ae247f376da03159eeddafbbb1828612ce274714f6111f1be16d122808e7ecdbd3d79dcf90f13f43ed55d603055eafcaf69cab7323367db711631f789
+EBUILD kicad-i18n-5.1.10.ebuild 460 BLAKE2B b4090cb8b86e3dea31620c8532e3ea5367fea3cbbff5b9f50b9d65d1a29c13a2e990c2b4d7beb3631f87ff7d87abfee3f62c8df2c86fbe83240a88f08ef0d6ca SHA512 962cdb1369df1d10e05271c01af34bb1affd281e3971de9b5bccdadfdf47a17f063a8d31d3c7788a85f1ec6254b768579d7b747d987ae1538b2c68ae67549aeb
 MISC metadata.xml 478 BLAKE2B 517564607aa1f61c5a6df0051402838fcf6d5ea1e2dc4950f38d463e959dcba447e47d3478b729afaf2a73f2c121acfc9b3aa6eef3740db942d9edebdf215860 SHA512 9192c6b3852ad652b47e754f077b035b75c67119a6c3282bd5b17e0b4df32c017b2f02f83733f002d944435b8ad9481153569248913c2c030de42f9af70a9e26
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.10.ebuild
index 3a3a991dcd71..3a3a991dcd71 100644
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.10.ebuild
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index c7616ef2ffd1..36a021b3147a 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD kicad-meta-5.1.9.ebuild 620 BLAKE2B 65e0125c6b6d1c9d608dc80fc1a90094f34e653dc36d967f33eb6177042bc5fa7848cb14086911de3aa15be2816b67a019cdda326f1fde22ec55f2f2cf0f16b7 SHA512 0c7976d70ea6965aa6472257a16b81811b85129e155781a491d809c0b2e456a83cd2a0cc9e71f67ed894d1d26e037985c073618bec59083f3a268b5c85ba65b7
+EBUILD kicad-meta-5.1.10.ebuild 620 BLAKE2B 65e0125c6b6d1c9d608dc80fc1a90094f34e653dc36d967f33eb6177042bc5fa7848cb14086911de3aa15be2816b67a019cdda326f1fde22ec55f2f2cf0f16b7 SHA512 0c7976d70ea6965aa6472257a16b81811b85129e155781a491d809c0b2e456a83cd2a0cc9e71f67ed894d1d26e037985c073618bec59083f3a268b5c85ba65b7
 MISC metadata.xml 624 BLAKE2B 71c179dc2e1259e6bc60ec33b8d305377a36ab4394c2dca43e239b3e2693e3abd07a47f03ecf3377c49c7bbb2782c1465639c411cefb9aeee6411873cede0037 SHA512 d9a888716a957c146afcaf390976721851b47f0f3a87c9b728800e21df31ef9deeb3b26b36e9dcee3fdaef15ae48d88c708c3d43098cb51b5ead280d674ebd2f
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.10.ebuild
index 8ff9f5fb6d71..8ff9f5fb6d71 100644
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.10.ebuild
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index af75c8daa6fb..e01db22d0e35 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-packages3d-5.1.9.tar.bz2 727202241 BLAKE2B 2f80b2e1bbc6b5c5d5c7baf77af187dac07d8c9ebc47d99419378f20b3a8eb9eb00da106810f0a3042a90c4bec44b467e78bc9c60b71c2b85e017342766f9101 SHA512 f5bfb9793d204f8f1bf46fe18897d59775fe7805299fd6af0215b8b9e28ce99d5183930120bfa7b5ee8b7599ae3be76f598b42b74db44ee50b7838fada860dd0
-EBUILD kicad-packages3d-5.1.9.ebuild 599 BLAKE2B ab86a7c3fa587e6c61a926b7dd24b3e18aaa151c45e4998a343b2c47a02f8ba0fc0cd86dab494e5f79185213520fa1673eece58c6c069348e349a22b980a7745 SHA512 c6d335f511e39a9732cf84c006e53c761c01c131efa826280a323b22db7c6168707d76b5d764899a7b3e0b86eddd67b72d76e455cc6e56b597f5931826f50b90
+DIST kicad-packages3d-5.1.10.tar.bz2 727194444 BLAKE2B 87d210be8e32e84f29d67f861962f869f62ba1828a6557f75642c652e81239543bbe4d3a2ae8dc34767266d16cb2a51dfb8c79062b9bb90ae359001f39b7684f SHA512 95c25fe94f3e198208f073c121d234508aa8e67a621d17bc1737d14fe860c9a8cece6e7b66037f9a9c7f1a06f104b942dc2ff59f318e8b6854bdddb1d238faf4
+EBUILD kicad-packages3d-5.1.10.ebuild 599 BLAKE2B ab86a7c3fa587e6c61a926b7dd24b3e18aaa151c45e4998a343b2c47a02f8ba0fc0cd86dab494e5f79185213520fa1673eece58c6c069348e349a22b980a7745 SHA512 c6d335f511e39a9732cf84c006e53c761c01c131efa826280a323b22db7c6168707d76b5d764899a7b3e0b86eddd67b72d76e455cc6e56b597f5931826f50b90
 MISC metadata.xml 975 BLAKE2B e71ae29f52e1eef3f91fe1d2e20e3b7bc1d795787007766c756e94bdee05e070df7f47c339cc4bc77557e77c031de0328a57dc8de949c20b3bd8507c0ff0b7ea SHA512 218ca87f07b072d45ebd010bb85b63b505abedb66cdfc5401f40d6842fe3cf78a9e98eeef9ce196300cc0cee8d7f227e5fe09e763e8669957190641065a061b3
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild
index ce0d62fefa15..ce0d62fefa15 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.10.ebuild
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 91f71d154956..1df1fd5615a1 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-symbols-5.1.9.tar.bz2 1814966 BLAKE2B 5c66513c276434410fcd8f9a8c1478fce8182bee3c92c4fff42d2cf13c416ddc5f8c25618725f2f9eb54b216557d346eff4ebea78aeb7ebb3ed960baa3137138 SHA512 21bd0308723cf7dba8ab2294d70714160db6c64e5ebdad1c9344df0b6cd56fb9216d64977de68bd7ca8be190a89809576b71d21486c3e85fe077cceac54aabb3
-EBUILD kicad-symbols-5.1.9.ebuild 429 BLAKE2B d9f18913bda85462cfeb321b03ca36c8cece223c7ad00233e3d1ddd81a09c33072dea13d19b1babc2a1b6263e593af4163cbe6e2845a9aca28f1aeeee3f7366d SHA512 4d5fb02b38b7cbd944f675b8be69fd9a2f6b4838ca4d535dd37eff4304d7227da15f9d860622552f7e46992fe909eac24a7e0f63af982805c525e3e4e861644a
+DIST kicad-symbols-5.1.10.tar.bz2 1815573 BLAKE2B 030847bef5b0420fcbc0d77adcf14f5e08b738ef7c547fae9da70fb70ad1f94149eaf482d1d3da667b369bad6e08995fd3920807cec45bb46efde882404ce820 SHA512 f9dd5a0ee135bb37e1be723c6213f3c2148b1579fab5f56c859d0ca0b55afb81143244cdaedd6d14ab73228176be9770b7dc04a4fe118e9b9f1464c5f79c6b46
+EBUILD kicad-symbols-5.1.10.ebuild 429 BLAKE2B d9f18913bda85462cfeb321b03ca36c8cece223c7ad00233e3d1ddd81a09c33072dea13d19b1babc2a1b6263e593af4163cbe6e2845a9aca28f1aeeee3f7366d SHA512 4d5fb02b38b7cbd944f675b8be69fd9a2f6b4838ca4d535dd37eff4304d7227da15f9d860622552f7e46992fe909eac24a7e0f63af982805c525e3e4e861644a
 MISC metadata.xml 723 BLAKE2B d31f05802f9ad89b8f2c040595fa75cb37ff9ea14cc6cd38acd7b24360b0d9ae72ebf69ca8022352b88bd3d2f5abf05df1042e2e92e74aa6cb186e2ca98a8e83 SHA512 426b9dc1492aaa8e0214c04b6cccc195e3e05290ec32f29339ad044b9dcfa651b40a55a1a0c8f9dd0c93c5c60a1ae0bfeb9a1d779f4f5429a55f8b381f9b3d65
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.10.ebuild
index 85dbde951ce9..85dbde951ce9 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.10.ebuild
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 637c1735fda6..02ab1f4507fd 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,3 +1,3 @@
-DIST kicad-templates-5.1.9.tar.bz2 1552087 BLAKE2B d6637fc8acb2906ed2b07dceabb00982b4b9d8d4bb9703f8c3aadc174d3f7945748b80fe5a7c0b40a4f2340c4af7ed04cf82b775a5fbd4d807949c5c12aa67de SHA512 284676c7bd2c4bc1b1867e73da4827fca0df965a43850641f1836c0cac71b6270984af4fdd75fe25bd7f638f4b08ee115e84038390855d15c089f074ee4cff4e
-EBUILD kicad-templates-5.1.9.ebuild 438 BLAKE2B 4c32d3f7a0231ac4333f90cb64e36ef336e3af2c3cad57fac2a8a92bc946d136f7905a4fa8272a5e4ee11013561f230f1a6e7c6041a264ba62947b24fb3387fb SHA512 c82e3e3e366f60478598e26524767de65302f241da8d368f2278ff81cfb3b1384fdfc84dba2f4b2b77a2bf405c081462ef68f80a353a6cf8056d9c103041da2a
+DIST kicad-templates-5.1.10.tar.bz2 1552124 BLAKE2B 95e876fb049abc5fb1210bea63e389c88b43efbd8154ee95d4f910621954795c20228f5a12a5d692ca771d55783c7b9c6942c21bc27d54027a68aa91152a406a SHA512 2e2f3fbf79f82e3539d6ee31aef5c854695683b7cd142a4293c37ef04845f6d90e8fb2f4f9027efc0e3211703336d4dc65f2573266be0a20b1b139fbe3ee55cf
+EBUILD kicad-templates-5.1.10.ebuild 438 BLAKE2B 4c32d3f7a0231ac4333f90cb64e36ef336e3af2c3cad57fac2a8a92bc946d136f7905a4fa8272a5e4ee11013561f230f1a6e7c6041a264ba62947b24fb3387fb SHA512 c82e3e3e366f60478598e26524767de65302f241da8d368f2278ff81cfb3b1384fdfc84dba2f4b2b77a2bf405c081462ef68f80a353a6cf8056d9c103041da2a
 MISC metadata.xml 483 BLAKE2B 162a91061d886c47f37d3e208aa555d7203a35c6773b0c1c12444bc8ad32ef30baa590e25af030a2b54440760ef93b5768ea7c3a84f0a745572b2d78fa46549d SHA512 8bf8391eb2b66d03353ac50492cd8b504cc739597dd0a67b49bbbcdd895b8a5c99a03f3e4d982294f36c7afc705699a1c8319ea132506472da7b654d799d8bea
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.10.ebuild
index dce1272e1a77..dce1272e1a77 100644
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-5.1.10.ebuild
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 2c4cfaddced3..99c2388c8344 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,6 +2,6 @@ AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d33
 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
-DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108 SHA512 565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
-EBUILD kicad-5.1.9.ebuild 4465 BLAKE2B 16b0c54f9dd11c7d3804f15c99ce8ec67be4a63c96b2941dc0786eb67133944320103472f8c48697d32fea58290068a2c6a7cee620b76b1fd85a96b3113ee41d SHA512 8ee198bfa529c73f246c2a33566165757b0b1d9a2cd78385dfecc32fa2b741504cff34e46319d840bbee5348cfcb69a40f5ae5d25d11b3e9e89675fa3cbb46b2
+DIST kicad-5.1.10.tar.bz2 18586889 BLAKE2B 2d087e7102746d3570c4e448ab7dfb27f63eac5d5036ea55970770025eacf1f85a26f7bdb0b83be546c97dbd4e9050f46045254334ba5dcecd3197d368d1e975 SHA512 3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0
+EBUILD kicad-5.1.10.ebuild 4992 BLAKE2B 2db0e275594533782b7502887c234f5308b3c3bf619fbf17e513f33a028f9c841d94ff29508f5909d7c613c16a7352f664325642903132ce39665efef0ffa845 SHA512 de161c52a52515ecec62d86268edbb3d51fc8cf137987a2f004265d42465ceafdcaf36d328d1fe690acc94abbc6892ddca13c56e2231d71be66c9695831c800f
 MISC metadata.xml 1043 BLAKE2B 01782b6dbb1f44de2c100eff987f9f3715afc7e860c782b333cbc8a87e8d117f0111c09c563e79859a7247d7931a5d46623461459118e0e3a55b7e5883f6aa02 SHA512 463508b78ca804425e53877e79e394b9d4977c5c65955c5f47ff1e1ab8eb1a45c576a50c22d49c5855bfcdb07d17ec41d39b90ff5e36ab00a8515a5bc805ce02
diff --git a/sci-electronics/kicad/kicad-5.1.9.ebuild b/sci-electronics/kicad/kicad-5.1.10.ebuild
index f738cbde21de..b7970b620c2e 100644
--- a/sci-electronics/kicad/kicad-5.1.9.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	ngspice? (
 		>sci-electronics/ngspice-27[shared]
 	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	occ? ( sci-libs/opencascade:=[vtk(+)] )
 	oce? ( sci-libs/oce )
 	python? (
 		$(python_gen_cond_dep '
@@ -79,6 +79,15 @@ src_unpack() {
 	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
 }
 
+src_prepare() {
+	# Fix OpenCASCADE lookup
+	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+		-i CMakeModules/FindOpenCASCADE.cmake || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	xdg_environment_reset
 
@@ -104,10 +113,20 @@ src_configure() {
 		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 	)
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-	)
+	if use occ; then
+		if has_version ">=sci-libs/opencascade-7.5"; then
+			mycmakeargs+=(
+				-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1
+				-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1
+			)
+		else
+			# <occ-7.5 uses different layout
+			mycmakeargs+=(
+				-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+				-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
+			)
+		fi
+	fi
 
 	cmake_src_configure
 }