gentoo resync : 25.11.2020

23 files changed, 56 insertions, 344 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 098ebf7a3769..4fe9aefbdf04 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index ba7cf9ac39ee..931290c541d4 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -4,6 +4,6 @@ AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39
 AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-EBUILD doxygen-1.8.17.ebuild 3229 BLAKE2B bbefd6742c5dc0d21eca4636aa57f189c4cc150cb50211d0e7a80137348a811697dd89622dfe7b281417ebd9ed0397d8a03fb284e6ff92c7b29ad8216c6ca483 SHA512 b15e9ff7a4730d34dfc94bbc25a667d58a2a8db91434b3989b08393b896a1473f1c4cfbf1309253adf794c50515a2553ddf2ae593553536b130727f165d6f705
-EBUILD doxygen-9999.ebuild 2892 BLAKE2B d9fa09ab0c9ea4d8771ec6e6a4f290aab7ca37ded9281469a1035e3d3fda477d60f7241f0ac8f40ada6ca643b308b2048c11477d5bfd737f20983bb4031bef00 SHA512 6781ed49e6a4020ab732b7ff69aead2127660d51f37150eec6c97a4231d3c266c7dc51f66918f52ed35f5b37e9d1ec376dab75a046872efb206fb1ef5661f7ad
+EBUILD doxygen-1.8.17.ebuild 3242 BLAKE2B e679748c29150eab39fbad373e7908bc8323ab01de55eaf9a3ae6800caa672139e21d943efd915a21afa6e31e8528cbc054fceaca1a9d8da45ca707ce4f6f733 SHA512 a1da4ab92fbad2063706b858c41388a103c22e3ca46bfeacff8b504898a26712e41da181c04076fd073d60e0acf8b8f57b8bf2b5a58973d247be360da372de7d
+EBUILD doxygen-9999.ebuild 2905 BLAKE2B e6f702b9325bf5af7133b4b2433dc4a2aa3c2bcbd3d41228da70b7321d39a7851540c878bdaa1eb350254807d31f3ef18b29dfe777b286e462c2201ee79f13bd SHA512 903a355e9580a4ca8b157178361756331228f7b61ba6b4ee2f9485b975c52818bc5e30b8993aaacf5fd11c0962b33d26b205ac45e2263f657a338ead78e3b7dc
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.17.ebuild b/app-doc/doxygen/doxygen-1.8.17.ebuild
index bf7d60e1406b..84c6af723d76 100644
--- a/app-doc/doxygen/doxygen-1.8.17.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.17.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils eutils llvm python-any-r1
+inherit cmake-utils eutils flag-o-matic llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index c8cede4e3256..0e657c1e3f45 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils eutils python-any-r1
+inherit cmake-utils eutils flag-o-matic python-any-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
diff --git a/app-doc/e16-docs/Manifest b/app-doc/e16-docs/Manifest
index fa3445f4c942..2b2a20208af8 100644
--- a/app-doc/e16-docs/Manifest
+++ b/app-doc/e16-docs/Manifest
@@ -1,3 +1,3 @@
 DIST e16-docs-0.16.8.0.2.tar.gz 1655229 BLAKE2B 7f57fcc90791f27e2186cd266222072c5ab5214f12e0f35fbdf706035e6f7ce68ab632779e77572e3ddb8c0d183aebfacc23dc25f400a941325dced54ae72b92 SHA512 df46cedff63984f5fe3cd4d523406efc3b4334447cbe9e31abae969961142887c5891bad7c65b066bb077f69789de4d38718872554e4a23f3b5b853bda665e31
-EBUILD e16-docs-0.16.8.0.2.ebuild 370 BLAKE2B 1e08021ed008270dd32bf41d31c51ede0723620ad42340ea8d15df9708aeadecb1803b5f5eb171892c36a6aa81aaa5197f070351b4db735cca4959282510d03f SHA512 b485e31a2b8e5379b005d3962f563bd8c9e3ea24204c459d618d4c3c1b4b582c047418d75c31eae0be3de78c7b56a3b194f39e52837ef25e2fb5045fdbcb4d41
+EBUILD e16-docs-0.16.8.0.2.ebuild 368 BLAKE2B 92efba5030d5e6e8a0d46e91cdc49b6e8213a5d083a76b5ce567cea11397962488fe94c78bd71a051f2e6563fda2e2faae5101b2ada671d1636272de610f2ce0 SHA512 359656ee14ed2316d898ce0b7a0747bcb65118d6e09250557f78e4775d860a6d0575b30956d1fe182d9d7cffdc8b0257fef95be81dd1f42f89f870d86a3de1c8
 MISC metadata.xml 343 BLAKE2B 295618490636872ce0aff5266028733087db75ec585d604a9908afe1cfa49e4101778badbc3dded2717e733fa76b879a4fbb58070b3e2e1e09268a871eb7bb8c SHA512 200efaf51e5c6746fa854a10d1d63348695db4da86091cd50ef01a9fd4b7d46cda9c79f257fdf337911d276fc2f95ca17dc05070a252f7eaa1fc3bb9eb2c1071
diff --git a/app-doc/e16-docs/e16-docs-0.16.8.0.2.ebuild b/app-doc/e16-docs/e16-docs-0.16.8.0.2.ebuild
index 3de207108ca7..65f4dd7680a8 100644
--- a/app-doc/e16-docs/e16-docs-0.16.8.0.2.ebuild
+++ b/app-doc/e16-docs/e16-docs-0.16.8.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,6 @@ SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="!app-doc/edox-data"
diff --git a/app-doc/geant-docs/Manifest b/app-doc/geant-docs/Manifest
index cb8d381bfbe9..e2af87b60508 100644
--- a/app-doc/geant-docs/Manifest
+++ b/app-doc/geant-docs/Manifest
@@ -1,22 +1,17 @@
-DIST BookFAQ-4.10.5_p2.pdf 183943 BLAKE2B a66e170d52d2b06e20d0521d45ae5e0fb2113db8b4fadcc17706328430a44dff0406eb781c95cd14cf84baea877f05dc8bf7276bd5d9bdeca03c4edee04ef65a SHA512 2273ef07e42a86fee916bca385f9fe1f850d263b343629392991c3bc34da8fb5c2e5490707f34dcdb2d138487ec15e2f01254dde545a49a98fa491618d66234a
 DIST BookFAQ-4.10.6.pdf 183227 BLAKE2B 50065fea13a2f5fed0e0de52b316968da05ebaf7fc8704fd9860b07ac83af9423ff2937a5b134a987b32dfec108b86548e4b0e0bcaddb1608850f336dc38ba7b SHA512 99a80740dd996d0a5f6ad198d82b9cbf991dac13096f4220530a9e87103791b65a43c887797efb261e2e461a0a89e652f18665095a661e68d1bbd763d8385d6d
-DIST BookForAppliDev-4.10.05.pdf 3724808 BLAKE2B 7e50455cd3c49d1cf9bc2d60626af208f09000b20213d22d57c96c6d109f82f3a2e05fb55b798d5676cf092da74f1a8a6c52eb081ce7badbb8cb41118b4181d8 SHA512 32a4c1e5b93a79696e579d09d5c9c1e2123bf3f7fc99b2b96a0feb6c6b141d47d3241b24dabcb7725a2966d8d293765c7b8a03ba866021c4474ecb67f7719873
-DIST BookForApplicationDevelopers-4.10.5_p2.pdf 3724808 BLAKE2B 7e50455cd3c49d1cf9bc2d60626af208f09000b20213d22d57c96c6d109f82f3a2e05fb55b798d5676cf092da74f1a8a6c52eb081ce7badbb8cb41118b4181d8 SHA512 32a4c1e5b93a79696e579d09d5c9c1e2123bf3f7fc99b2b96a0feb6c6b141d47d3241b24dabcb7725a2966d8d293765c7b8a03ba866021c4474ecb67f7719873
+DIST BookFAQ-4.10.6c.pdf 183227 BLAKE2B 50065fea13a2f5fed0e0de52b316968da05ebaf7fc8704fd9860b07ac83af9423ff2937a5b134a987b32dfec108b86548e4b0e0bcaddb1608850f336dc38ba7b SHA512 99a80740dd996d0a5f6ad198d82b9cbf991dac13096f4220530a9e87103791b65a43c887797efb261e2e461a0a89e652f18665095a661e68d1bbd763d8385d6d
 DIST BookForApplicationDevelopers-4.10.6.pdf 3731281 BLAKE2B 40a7ba97dbde79bbdfcf800922bad6e8678818fcb49d175a1f8514dff1c893036fddc9f5a04710961a9612fa7d5ce9e422e5bf12d025f665cc60c29af4094b23 SHA512 1b78eb945bd8819daa0d218d069e9a799736ce8e8added481038e4c61619f533491b5d1119791e0adefb5c5bf0eedcc36435b23120ea3276977c459d20e1ee3c
-DIST BookForToolDev-4.10.05.pdf 7380134 BLAKE2B c75ea70339eaf3a57b6baf2070eaff3ce0d91668f8201b380442b1bee00da5de22694a9a35996b1b2ced17a17f07a8498a95c2364711dfe994ac81352dbb7fd3 SHA512 7c716248ee3e72ca7159fd7913fdd8f3fa2428dc3d2b4c2082e324c93405d4d666a55eed30df22e058a0c68c25abd72c7bf24d1fc781e63a20708f43101c1973
-DIST BookForToolkitDevelopers-4.10.5_p2.pdf 7380134 BLAKE2B c75ea70339eaf3a57b6baf2070eaff3ce0d91668f8201b380442b1bee00da5de22694a9a35996b1b2ced17a17f07a8498a95c2364711dfe994ac81352dbb7fd3 SHA512 7c716248ee3e72ca7159fd7913fdd8f3fa2428dc3d2b4c2082e324c93405d4d666a55eed30df22e058a0c68c25abd72c7bf24d1fc781e63a20708f43101c1973
+DIST BookForApplicationDevelopers-4.10.6c.pdf 3731281 BLAKE2B 40a7ba97dbde79bbdfcf800922bad6e8678818fcb49d175a1f8514dff1c893036fddc9f5a04710961a9612fa7d5ce9e422e5bf12d025f665cc60c29af4094b23 SHA512 1b78eb945bd8819daa0d218d069e9a799736ce8e8added481038e4c61619f533491b5d1119791e0adefb5c5bf0eedcc36435b23120ea3276977c459d20e1ee3c
 DIST BookForToolkitDevelopers-4.10.6.pdf 7331646 BLAKE2B f5ef48bf09284e1207dbfd9513c096dba0595dd357caf45f52aa164206fb0c24935844b3b45f95d606339756c0a9bd558965b78de7cb62abc5bfd74a2b01bfbd SHA512 e108577c2d3dba45422fd5523b2a6fc222457e0cae76e34ebb2d1f4692b4ff9714a8a9f1ae95307aaae528b86373a844821a4a073733185ee56a3df94ce6e24a
-DIST BookInstalGuide-4.10.05.pdf 329532 BLAKE2B e367ae17b11105a5324899e6fc1e4117c4586e4d617cf3aa8c97ebe2820ee9ee339a30f96174b41b14344d30dde6a84ca9639901facec5e85526349cf3623328 SHA512 cf60fcb34f245605ffea364c30cccd69e756e53801c23c51e01daa1f02da5fbda319210e4bf9154786b423248d3a579abd403f0c2ff9911ae9d3b7d91d314d26
-DIST Geant4InstallationGuide-4.10.5_p2.pdf 329532 BLAKE2B e367ae17b11105a5324899e6fc1e4117c4586e4d617cf3aa8c97ebe2820ee9ee339a30f96174b41b14344d30dde6a84ca9639901facec5e85526349cf3623328 SHA512 cf60fcb34f245605ffea364c30cccd69e756e53801c23c51e01daa1f02da5fbda319210e4bf9154786b423248d3a579abd403f0c2ff9911ae9d3b7d91d314d26
+DIST BookForToolkitDevelopers-4.10.6c.pdf 7331646 BLAKE2B f5ef48bf09284e1207dbfd9513c096dba0595dd357caf45f52aa164206fb0c24935844b3b45f95d606339756c0a9bd558965b78de7cb62abc5bfd74a2b01bfbd SHA512 e108577c2d3dba45422fd5523b2a6fc222457e0cae76e34ebb2d1f4692b4ff9714a8a9f1ae95307aaae528b86373a844821a4a073733185ee56a3df94ce6e24a
 DIST Geant4InstallationGuide-4.10.6.pdf 327501 BLAKE2B 9379ce8243dcdc08f764f7217b86d1dd414c649cfc163702a16e883774be9ea2242b8f326672be0088dd180de727c95539227d8d17002f0bf79e74ecf5a5955c SHA512 3c480f493d093d22c6cf4378ddcebd7d192684a4202597fe04640e695cecc7ec36fb403311eae8a59fd88a5136d5734fadf03174b3391cdc06744a7b91834caa
-DIST IntroductionToGeant4-4.10.5_p2.pdf 143798 BLAKE2B fa8d4e3899ca6dc7d0db0cd6cca0ed765ec6dc4b3ef96f9d0145b602ef38ed63fd888ac06047356432616f367fe8c8df9c71f48637d7bcce7defe8a8744ab2e0 SHA512 9249d2d5555093e71b5b1fdd199477cb246d574692a8f02338c762c71aa1f9a143840cbc9539d6f45cba492b3977ccc11cc6a632cf50b7e42aa693d6efaf921a
+DIST Geant4InstallationGuide-4.10.6c.pdf 327501 BLAKE2B 9379ce8243dcdc08f764f7217b86d1dd414c649cfc163702a16e883774be9ea2242b8f326672be0088dd180de727c95539227d8d17002f0bf79e74ecf5a5955c SHA512 3c480f493d093d22c6cf4378ddcebd7d192684a4202597fe04640e695cecc7ec36fb403311eae8a59fd88a5136d5734fadf03174b3391cdc06744a7b91834caa
 DIST IntroductionToGeant4-4.10.6.pdf 142963 BLAKE2B 69b3594fbe888c4d00cf41f27a20a4127df970d4b58da68ab921245b7a888f3d3e439c6bc2fd2b32b7720aef6e867159ea1dcc22a66f4fb91c78c7a8c60ff255 SHA512 ef04dfc8ef49f05d3eaeb625fa61d74c6b59dd1b3504d63ddf6a0c80dd547ca03f5ce0cd28fdd7e9f1638bb91ce7dbea059cc5ae26ed776d78767cddf8b237be
-DIST PhysicsListGuide-4.10.5_p2.pdf 345493 BLAKE2B d2eb008b0e3ee754e0339eda24649e99c41a01e7f2ce41a44fd518d7a17c1d15b484c803a14692c28ebd4c162aa6463548f38088c4549dc1657b912c856d37a9 SHA512 fe94a355f49b61fcfd12948bbdad834f284f0086151cb8d097efebd4dd34c4cd84641f9b77d440e9d658d1fb0d00d4e512d452ae99c298a197df6ea5e468b678
+DIST IntroductionToGeant4-4.10.6c.pdf 142963 BLAKE2B 69b3594fbe888c4d00cf41f27a20a4127df970d4b58da68ab921245b7a888f3d3e439c6bc2fd2b32b7720aef6e867159ea1dcc22a66f4fb91c78c7a8c60ff255 SHA512 ef04dfc8ef49f05d3eaeb625fa61d74c6b59dd1b3504d63ddf6a0c80dd547ca03f5ce0cd28fdd7e9f1638bb91ce7dbea059cc5ae26ed776d78767cddf8b237be
 DIST PhysicsListGuide-4.10.6.pdf 343740 BLAKE2B f53d7e06692af87aeee32a43406ff8388bc491e3cdfb37c41106e6d0848433ab3ab8c12da2160dc4a89593998f40d3447a026e1b294e989c902352f01e941d68 SHA512 58ffc1ed365f14cd03dce76ce98a6ef54d52bb4b4fa5d6906e64cbb8e81045e2ed980815760d5a25b95883c01ec081bfc8a21def2b43f9b61964cb50a79b5bfd
-DIST PhysicsReferenceManual-4.10.05.pdf 19527078 BLAKE2B 1ac3dde2f9d039ac5f7bdffe4027e4117a9db71e4916f9dddedf6fde0390e33cf1a99f4f0d11708ed2dc2a3fb25cab3d15935d0f83a6a69c58ebf65dc53beb9e SHA512 cf1a5abb91d2c24502f3a37d4413d99c0555239c5e777505f8c8f17b81d90c2236766252ec563422d9b551787098e267a0b1595fd34588dfe0fd04945681881f
-DIST PhysicsReferenceManual-4.10.5_p2.pdf 19527078 BLAKE2B 1ac3dde2f9d039ac5f7bdffe4027e4117a9db71e4916f9dddedf6fde0390e33cf1a99f4f0d11708ed2dc2a3fb25cab3d15935d0f83a6a69c58ebf65dc53beb9e SHA512 cf1a5abb91d2c24502f3a37d4413d99c0555239c5e777505f8c8f17b81d90c2236766252ec563422d9b551787098e267a0b1595fd34588dfe0fd04945681881f
+DIST PhysicsListGuide-4.10.6c.pdf 343740 BLAKE2B f53d7e06692af87aeee32a43406ff8388bc491e3cdfb37c41106e6d0848433ab3ab8c12da2160dc4a89593998f40d3447a026e1b294e989c902352f01e941d68 SHA512 58ffc1ed365f14cd03dce76ce98a6ef54d52bb4b4fa5d6906e64cbb8e81045e2ed980815760d5a25b95883c01ec081bfc8a21def2b43f9b61964cb50a79b5bfd
 DIST PhysicsReferenceManual-4.10.6.pdf 19489188 BLAKE2B 4323a460a62a9cb7a1bf575489ab02f15bb96dfe017a19d71e15f6d3a06ed8355246c2d5f362601ca5dff9cfad1e0032a85cc8aac88e150dca36308925016efe SHA512 7e42749e578809e89ed589498e18e15fa2a62cac61668e628c77af093a85454d79a5738f4ca034c73a2fb7c67afb9a563e9ffc16a20d85fdbab9f57b6bda4d55
-EBUILD geant-docs-4.10.05.ebuild 967 BLAKE2B 8dce5d9e63e976498a0b8e2a2a746905e162cdf432ea1d0f9b5438ca5c01a007c54a898a70bfca63b54c4eb98a4d20840d4273dea39092b319c223ffc8da4208 SHA512 c3f67e8f03ab776df1085d07cf71dbf40483d3695c92b2a106c9b2c4cb6367bf20e34c9cbee80f46851bd2697d2e76db0cdfe3df5d85155afb64e687b3ac8dcd
-EBUILD geant-docs-4.10.5_p2.ebuild 1465 BLAKE2B 8edbfa83d97225b8dc5130a58018a1457d2c3387a51d422a0c690d984f34ad5906fb5ab266bb08c321ae0c98a5fa034cdd1fca2774f92dbdd58e37c3964d5a19 SHA512 595714645bdc7af5e5b9b09e4eb1a5ef7c6450e509401f20d1abd4d6974c7576f4023023c110f8a3bb6cd47f54ebd0a55c4bf51e8e740d09acc8df9edbb4e807
-EBUILD geant-docs-4.10.6.ebuild 1370 BLAKE2B b35de42675b442c06ec2b9fdd6d77310eefdabf89d2455fc6186712bd93c4800406f8f9ed05d1fa875457224fc221c15429ac1f6c7331c5c002e225e28adacdb SHA512 63e7ab681b8637971a72cb208b471eb27ffe50f9ae15ef63bcd4048e5abdaea20f8b2b0e225f4326f3778f38c15f02e398f5f07bf053f98afe9195b7a0de978c
-MISC metadata.xml 371 BLAKE2B 7b3f5d3a28df2d53f884e9a39284648a71a044f66721ad9573963e57cb5d98b9de1e23ff1285100283a59ff29c11c9325f3a42faa10a197cd8c8365bb4d6ca78 SHA512 e2fc8de64456e31678f2052f85d84dee4c6d76af52bfc4d9da7ea73bf7a5213fa9296e2d275d9edbcb2a27ca895b5d46cd08e858608227a6628c60effef96dd2
+DIST PhysicsReferenceManual-4.10.6c.pdf 19489188 BLAKE2B 4323a460a62a9cb7a1bf575489ab02f15bb96dfe017a19d71e15f6d3a06ed8355246c2d5f362601ca5dff9cfad1e0032a85cc8aac88e150dca36308925016efe SHA512 7e42749e578809e89ed589498e18e15fa2a62cac61668e628c77af093a85454d79a5738f4ca034c73a2fb7c67afb9a563e9ffc16a20d85fdbab9f57b6bda4d55
+EBUILD geant-docs-4.10.6.ebuild 1368 BLAKE2B cc6f9aa96165ee160ffe5cfb2f1d79c0cdbc6f5f9ef85b20cd62c1c454c5c00c3e4384919e6e804f5b6258c32b966b2905e4169049090dfbf13b2e351c3875b3 SHA512 e7bcf2cc9e4d6ee0f3be7027ecfb4518525ad3e2bc3fad1662beaff339b4f1898982d5476998143b23426b05e78ab9dbb05b15545e649a1b42020be7253d97ed
+EBUILD geant-docs-4.10.6c.ebuild 1368 BLAKE2B cc6f9aa96165ee160ffe5cfb2f1d79c0cdbc6f5f9ef85b20cd62c1c454c5c00c3e4384919e6e804f5b6258c32b966b2905e4169049090dfbf13b2e351c3875b3 SHA512 e7bcf2cc9e4d6ee0f3be7027ecfb4518525ad3e2bc3fad1662beaff339b4f1898982d5476998143b23426b05e78ab9dbb05b15545e649a1b42020be7253d97ed
+MISC metadata.xml 383 BLAKE2B 534bb4b663df0e1d2af34c8ce0814e4f0aae60de0be4d21fbec449ffe2a2fc8c2ddd35967748aa53895c52f38a36802a67dfbc2ad2c97d34b4eec23f41b1b61a SHA512 6080bdec73f0c48f20a8d1defaa37d25c0e25c72c7771867823095831f351fe13099c33725b808f5ecde937a4124b52990744af2c04c8865b1bd7aa709fb7c1f
diff --git a/app-doc/geant-docs/geant-docs-4.10.05.ebuild b/app-doc/geant-docs/geant-docs-4.10.05.ebuild
deleted file mode 100644
index 11d491f9b3bb..000000000000
--- a/app-doc/geant-docs/geant-docs-4.10.05.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
-HOMEPAGE="https://geant4.web.cern.ch/support/user_documentation"
-SRC_DOC="http://cern.ch/geant4-userdoc/UsersGuides"
-SRC_URI="
-	${SRC_DOC}/InstallationGuide/fo/Geant4InstallationGuide.pdf -> BookInstalGuide-${PV}.pdf
-	${SRC_DOC}/ForApplicationDeveloper/fo/BookForApplicationDevelopers.pdf -> BookForAppliDev-${PV}.pdf
-	${SRC_DOC}/ForToolkitDeveloper/fo/BookForToolkitDevelopers.pdf -> BookForToolDev-${PV}.pdf
-	${SRC_DOC}/PhysicsReferenceManual/fo/PhysicsReferenceManual.pdf -> PhysicsReferenceManual-${PV}.pdf
-"
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
-	local d
-	for d in *pdf; do newdoc ${d} ${d/-${PV}}; done
-	echo GEANT_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" >> 99geant-doc || die
-	doenvd 99geant-doc
-}
diff --git a/app-doc/geant-docs/geant-docs-4.10.6.ebuild b/app-doc/geant-docs/geant-docs-4.10.6.ebuild
index 56ae17a3ab7e..b215540487bf 100644
--- a/app-doc/geant-docs/geant-docs-4.10.6.ebuild
+++ b/app-doc/geant-docs/geant-docs-4.10.6.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${DISTDIR}"
diff --git a/app-doc/geant-docs/geant-docs-4.10.5_p2.ebuild b/app-doc/geant-docs/geant-docs-4.10.6c.ebuild
index 0d7981b98b65..b215540487bf 100644
--- a/app-doc/geant-docs/geant-docs-4.10.5_p2.ebuild
+++ b/app-doc/geant-docs/geant-docs-4.10.6c.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-# Note: documentation patch releases are not the same as Geant4 patch releases
-
-MY_PV=V$(ver_cut 2-3)-$(ver_cut 5).0
+MY_PV=V$(ver_cut 2-3)
 
 DESCRIPTION="User documentation for Geant4 physics simulation toolkit"
 HOMEPAGE="https://geant4.web.cern.ch/support/user_documentation"
@@ -29,7 +27,7 @@ SRC_URI="
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${DISTDIR}"
diff --git a/app-doc/geant-docs/metadata.xml b/app-doc/geant-docs/metadata.xml
index 447371907610..7bccd71dfa13 100644
--- a/app-doc/geant-docs/metadata.xml
+++ b/app-doc/geant-docs/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>amadio@gentoo.org</email>
-		<name>Guilherme Amadio</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-physics@gentoo.org</email>
-		<name>Gentoo Physics Project</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>amadio@gentoo.org</email>
+    <name>Guilherme Amadio</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 2f1ca158e1fa..b50016fd32f7 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,9 +1,3 @@
-DIST gnucash-docs-3.8b.tar.gz 71058053 BLAKE2B 0a69db02faf6487f2ecc1b5f9a788fb50cec65ff7db53ca9ec6048510156f094c0ce457d1abb4a9a6694060f68780c0336de41dbd0736ad93055cce81b3a66ab SHA512 3c30e88412e17960006517fb7c341220159c45760ca28c79c27c66551451c8ec14e000757f4d9a78c923e10d437351e38dbedaf0a1f3b11bbf5b87d80cb230fe
-DIST gnucash-docs-4.0.tar.gz 62498230 BLAKE2B 39d711267a7ec0d45915659db8557fd2871c295aba82601c34878f56c5a24b0f56ffa68a4597e464050e3e59f62411ae6f5efc0870bea2fa46f313f58ed3826b SHA512 4aa4510b86a6bf3a217c9809b73166c0ce777b9f5a506c15f51ca80a0aa45b93e774e1b7c07571ceb0aad6b6df67a4f268d5498874d23653cb0c94620f491d1d
-DIST gnucash-docs-4.1.tar.gz 62496616 BLAKE2B c1868c5a639c12fbc77dd8c46d504d9aa66574d577068c781f5c652ac3b385bffb61aede88953f0c9e89369b71d92ee94c7aa553b91e0adcfbb99b43244ce8b4 SHA512 dc63650ed989eec273ab720f802bdcbfdd3041bc4f6bedd02a4575cbc337eb2f264aa05986ecc99e4c7d3007827b213a0f306e3ae38821950dee17bb21b10615
 DIST gnucash-docs-4.2.tar.gz 62497632 BLAKE2B 764387cbbc1d072ac3e245a86b78eb484cfa05371dcf4c17d0441bf08e00f85523975c50a88ecde24e9d949572228a723d53fcce7df397553b0e50145be28686 SHA512 e54082dcd7f92d7ca3f31cea5968ecd4167dc9e1e12f23d8684af3e2af4c696d8afed3cf477df771bb11da125ee5887d09ead1edff961ca4bedfb58fd61efdf2
-EBUILD gnucash-docs-3.8b.ebuild 1358 BLAKE2B 4abd2b5b72ac0e1caa7a6191c49d08a7390dd348d21c5bcc5716deb77e94d1fe361a9a7f1edb1f4ab2efa0f5632706de1cad47d721d257fb1732566a31ebcf96 SHA512 8b14c904744631998045641d2b429a61444ae7510feadd629da206ef73dc9e9e1d04234af3e92caeca6e510f58bb52eadd5f39e0cbece050210dfc09198b6afa
-EBUILD gnucash-docs-4.0.ebuild 1360 BLAKE2B 9b1ad2c3c66b80aeea946c6ab8fdd0d7434ae68f4d98eb38b28269442917d51838c571634774c36a2a0c5fc4a5010916f580d416a8f1a2d3f6d7e59d649958cd SHA512 b96c389704240d71671d0405f7d9c9958ae7b59005188a6992b1b5d45bc1e6a61be692743b233ad10869a6c1580105af0c0da40dc6e6f007870271612fd1b194
-EBUILD gnucash-docs-4.1.ebuild 1367 BLAKE2B 0e0bb4ed0af46a1e10e7365ba5dbf9a33cf91fbc65e93fc7c438e03f54c04530ebf8ac6e283ce38b48c46c6bbda798903cd0f5ccd303ceb8301144db1c40e597 SHA512 c397fc4a1c18451afc82f46bc473891f34c4ec7b88cb13963f89468999a97777ae91aebdd2a56a37049bbb5605ddbec34d3628265dc69d24bd2dfc2cab0b403d
-EBUILD gnucash-docs-4.2.ebuild 1343 BLAKE2B c46ac8fa92d1ec0de53af5d87e7a3933a0dfb9b98dd5e3bf9679866b9cb84019c04116a4e512711124099c82d33dc2ae2c715ea0a456eb99b3a9e3b5bbac447a SHA512 d9a6f39428961e0926016f467f4c9b4ce59a8f2cb4c42aa834cd398c6e01a98b0de6255b3fd7135f16dc77e1376380f34ee12ce51ee497be18f029973be8cf58
+EBUILD gnucash-docs-4.2.ebuild 1341 BLAKE2B 878dc829afbcda2a162e52de7d3016bf0d5475fb1aadcef8613b8eaea9224a30f21645210ab5156b9c9ed74b9470d3f835f31f01f8e2e00dab274b71f3e0c3a1 SHA512 8a876f0f5041d0c9bfc204cc0a80537788e58654af05c2ee78cb903d5dced7f26efe3f4bf370ac896074242534614b5ec255bc1f1ef1673d0181cda722465c7c
 MISC metadata.xml 330 BLAKE2B 17393892e962f0d868534c6908a6f6f09c4237cfdf81530b81e572f0fdac64495378d545ca214afc451a6323b97c71328aa1c6a8eda81773cb1d77c358e11bd1 SHA512 fa496247f2026343323b8ff8664fb8018316ebcbf14b88b1c99a649805cefe962d773c4d2aa35b266db2942b78d1fc450f200dc065fac48ebfb2113b5d6e8a98
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.8b.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.8b.ebuild
deleted file mode 100644
index 8547f41b9a73..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.8b.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2 optfeature
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.0.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.0.ebuild
deleted file mode 100644
index ccc9207cc0e9..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2 optfeature
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.1.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.1.ebuild
deleted file mode 100644
index c52b5e0830b3..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2 optfeature
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-LOCALES=( de it ja pt ru )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in C ${L10N}; do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
index c9d4be30803b..978a86aa675a 100644
--- a/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 LOCALES=( de it ja pt ru )
 IUSE="${LOCALES[*]/#/l10n_}"
 
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index d8c038c63302..6e23ac744596 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,8 +1,7 @@
-DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
-DIST kicad-doc-5.1.5.tar.gz 75372826 BLAKE2B 89e9f57009446ee7e6560f97c8e4de61250faa337ff9777d6d73f879bf3fb4575d7df878a2fe78cde48fe3884fdb5be69f9b807731232480550e6b214191cfa5 SHA512 52d06d67df25cf67fb2507a788f414bf3f83569d9cefe0763b9f65e014c1f863bdc3cc6a0d1fb843bd89129118bab117a8c9f83eef4e475bfb4fa853822b2fe5
 DIST kicad-doc-5.1.6.tar.bz2 74202367 BLAKE2B b4d4ff704bf59c7663469f5c4a314a44f1762f8ae5a9fb3abb1a2e8eb54c5dd843f3d095d7e60d0ae541d9e51241fa35ae28c56a495cd0c7e0874d5b1a473296 SHA512 6fae707154aa662689c5da03696d30ebc7442a6d2706cb14d470e91675d0f77c3eb9dd716d29b1eccde5cb0ff39a582a497be2d65d5e34e40defe2fdf97093e0
-EBUILD kicad-doc-4.0.7-r1.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
-EBUILD kicad-doc-4.0.7.ebuild 1187 BLAKE2B 44eb1d3012c24f431f255b4203109398c3cbb4de0e068c81bad2034c866b9f00b8bf91e9941e8dbe23857359d72e9948d561cbc66dcfb1d8162da23f08950ff4 SHA512 9d36ba68ac9dcc0be7ea28832a424288e46b2226bda91d2b13318323789b8479eee913f5a793fda3ef47bec6877cbabccac607c1c5d648a4621df82faab39405
-EBUILD kicad-doc-5.1.5.ebuild 1436 BLAKE2B 2ad02a03a17f1b524e44d8a56e40274fcc6addb51c2af39fdd945bf4a5926d7ed26fd6d4db5f34e33621d44f3efd8e0c14aca15f2c28b6a0525ec29247b103d1 SHA512 58550533ff06de493ba5a0eb3b627784fcc8cdabe4e9cb77192e89b697bd9684cea29dff163be107b19d2360b33093c450694e8e1743bec5a73cee33593eb4c3
-EBUILD kicad-doc-5.1.6.ebuild 1516 BLAKE2B 162ddd8371768af6f2ad7169bbe9b4e876825491815c2e64eacca9b8a779bdee162f683b8194599ead145e563f87b109b88103a7823a8f98663d69c77bdf70d6 SHA512 ee8142eed747aa610dea3388af7c2ea0b3cb51578373379079c596a9e84bebeb980779b62a2a6fe0d9bb3cf44f6889504d64dd981961226dd5faa93ee7022d62
+DIST kicad-doc-5.1.7.tar.bz2 74202031 BLAKE2B caa6f6403fe984230cbb1d0b0a75355621f9e371976774e66aac2216994249397082ef8699f0adced0696344a256edd5d47c42ce8d789ebf624d702008f0600a SHA512 72dcfdf3d943dc73bb4f30c9dc9f0cfe7a0c3f8749a04b04624c47e2b69f6be29627e2768d008980ae9ac691aa56c97529edc15741c72e261e4c2c6f3e7b32b4
+DIST kicad-doc-5.1.8.tar.bz2 74199662 BLAKE2B f1077202a5a5c263f5cb8bf00f4f33ab0515e5abe15ab18bc21de742d6c4e0eafa5e3b1eb9cd12d45446b7a47654c44a67ec980af8ce0ed5d7f3261628c91f24 SHA512 763951f91b3a86d940fc508fc20846752bd2c7a4520e820e37708feb0054993d84a365df5abe10b5c26799479754ca19366456f3eba2ff3ee6acee34908dd699
+EBUILD kicad-doc-5.1.6.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
+EBUILD kicad-doc-5.1.7.ebuild 1440 BLAKE2B 829d304d8aaddd7b910f40c3b0c9df18b31e1dc2e746f0407d88e6e97c296294fe99c949fac5b0d8f55541c535d0f54c20e6c2e7bb2f5abaaf6a7de939c8524c SHA512 08149aba541030e95dc8275c28bf94cbbb129952d29b1214dc05e1b2f8a34bdb8648330bbeea7decd9970c206be6cf0a5750f1dda914b781bbb321d36364dfdf
+EBUILD kicad-doc-5.1.8.ebuild 1426 BLAKE2B b0f8b7f6fd8b6bea2d4abd1d3e78e5dc42ee84dfeacedb930b72e8414e39da9ec1f4944af15b04cad590dbca7a75054097fa4bd3190dbecaa19b67e11a9370ee SHA512 74f3d5a215dd2e718316261803fdb574c9766e2239e9bb55a7199e6c2b2847245c094a995c3f73164a9d51cd689ae591fb25de0f8661e9d6b42ec1e51565524e
 MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild b/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
deleted file mode 100644
index 13732e326c4a..000000000000
--- a/app-doc/kicad-doc/kicad-doc-4.0.7.ebuild
+++ /dev/null
@@ -1,46 +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 manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="html +pdf"
-LANGS="en fr it ja nl pl"
-for lang in ${LANGS}; do
-	LUSE+=" l10n_${lang}"
-done
-IUSE+=${LUSE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LUSE} )"
-unset lang
-unset LUSE
-
-DEPEND="
-	>=app-text/asciidoc-8.6.9
-	>=app-text/dblatex-0.3.10
-	>=app-text/po4a-0.45
-	>=sys-devel/gettext-0.18
-	dev-perl/Unicode-LineBreak
-	dev-util/source-highlight
-	l10n_en? ( dev-texlive/texlive-langenglish )
-	l10n_fr? ( dev-texlive/texlive-langfrench )
-	l10n_it? ( dev-texlive/texlive-langitalian )
-	l10n_nl? ( dev-texlive/texlive-langeuropean )
-	l10n_pl? ( dev-texlive/texlive-langpolish )
-	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
-		-DSINGLE_LANGUAGE="${L10N}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
index 6f1823b17c90..1578ee1b2ef6 100644
--- a/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.6.ebuild
@@ -6,8 +6,7 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://docs.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.kicad-pcb.org/"
 SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
diff --git a/app-doc/kicad-doc/kicad-doc-5.1.5.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
index edf35c290db3..1578ee1b2ef6 100644
--- a/app-doc/kicad-doc/kicad-doc-5.1.5.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.7.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.kicad-pcb.org/"
+SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
diff --git a/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild b/app-doc/kicad-doc/kicad-doc-5.1.8.ebuild
index 5d54fc34345d..973e10fb41bc 100644
--- a/app-doc/kicad-doc/kicad-doc-4.0.7-r1.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-5.1.8.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Electronic Schematic and PCB design tools manuals"
-HOMEPAGE="http://www.kicad-pcb.org/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.kicad.org/"
+SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="html +pdf"
-LANGS="ca de en es fr id it ja pl"
-for lang in ${LANGS}; do
-	LUSE+=" l10n_${lang}"
-done
-IUSE+=${LUSE}
-REQUIRED_USE="|| ( html pdf ) ^^ ( ${LUSE} )"
-unset lang
-unset LUSE
 
-DEPEND="
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+BDEPEND="
 	>=app-text/asciidoc-8.6.9
 	>=app-text/dblatex-0.3.10
 	>=app-text/po4a-0.45
@@ -36,13 +33,15 @@ DEPEND="
 	l10n_fr? ( dev-texlive/texlive-langfrench )
 	l10n_it? ( dev-texlive/texlive-langitalian )
 	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
-	l10n_pl? ( dev-texlive/texlive-langpolish )"
-RDEPEND=""
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
 		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}/usr/share/doc/${P}/help"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-doc/votca-csg-manual/Manifest b/app-doc/votca-csg-manual/Manifest
index b73d700598d5..8a6a230448a4 100644
--- a/app-doc/votca-csg-manual/Manifest
+++ b/app-doc/votca-csg-manual/Manifest
@@ -1,2 +1,2 @@
 EBUILD votca-csg-manual-9999.ebuild 752 BLAKE2B 937b3cf85dfae0db8f243d6eddbc1f2a07b167915fba17da5478379f6dbaa0edf6c4b4eac8c37ca06935c90ddb2653f614fe8bec517857332e2a3e8fd2cdc771 SHA512 5058f0312bd6930957ca597ffe442f78e9c73e46ef403951df560ba85925cebb0d5d4548c5410b44ddc70e2aa611c8c39bffc24eb313de1115f6aed2060af88c
-MISC metadata.xml 460 BLAKE2B 129d9e9e30b503ef1e1dab1401e8389fc60c848b5ab57c80f45656081b89ef1d6048d17e3a0b8ba41fc3e12490956dbfb50b205dfd250d63fb465b5acf725380 SHA512 e8a442f8dd487dc2006b140ce3b51c1a46baeacb240d3930f31986c7f49bfb03db6e2c8e0ff5abd3a88c427e21aef6b0addbcef6a38e9e17209ceba0e4d3aa9f
+MISC metadata.xml 460 BLAKE2B 862c861e3ee7c4169496508d0beac1c7226ebd66ef98a5499e390ba44734b6a7f5a93305083aaa54a99f495b8f84cbb7024f70870e08cca67aca76eaa6f9acb7 SHA512 fdc04a4215abd36b92afee1d5a3fbcdd4e3517d774d80233628f8e8633fe90e6aef8ecc46bfda0f241c8685f1a6204d0d7af62a5cfdf2393b2a7f38e32eb8884
diff --git a/app-doc/votca-csg-manual/metadata.xml b/app-doc/votca-csg-manual/metadata.xml
index bc2ef05746ed..71690409f62d 100644
--- a/app-doc/votca-csg-manual/metadata.xml
+++ b/app-doc/votca-csg-manual/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Gentoo Chemistry Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">votca/csg-manuel</remote-id>
+		<remote-id type="github">votca/csg-manual</remote-id>
 	</upstream>
 </pkgmetadata>