gentoo resync : 13.10.2019

37 files changed, 112 insertions, 48 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 2bc46a8410d0..c3cda933c4a1 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/blas-docs/Manifest b/app-doc/blas-docs/Manifest
index 39169366753f..c199700da967 100644
--- a/app-doc/blas-docs/Manifest
+++ b/app-doc/blas-docs/Manifest
@@ -1,5 +1,5 @@
 DIST blas-report.ps 1874460 BLAKE2B 3bbef21663dd4642c74110356b828fc4d84cf1d70afe10ac6d0c7117cb133b0f6005f9787e6a49040247d485f409511c214990b336177380f631c567ef1eb92c SHA512 90346f29fadb6304afd4e1b6c170fc71008f9ffa750d49256feb3d37e9ba646e5120ee6e3cbfa8f10c7916119591b240c72ec747f8135bf6581539365838b044
 DIST blasqr.ps 235163 BLAKE2B cf9d03453690d4b25ba0f77741cec1f57dcfbb1be81ece8a940dc06539526d31f79a56179e7e33e3c0725c7ffc125779d6a2293cc2550dd8628eddac9a0a71e3 SHA512 8795864bd250abc4e7ba396b35277554e7226161133d57206dd4d843d265632d3a4977386412547d620d0091013add0ae156182fa5cac20a2272f1cb17915289
 DIST lapack-man-3.1.1.tgz 1117350 BLAKE2B 3c1dfa55efdc1a2e11315885d853354060d04f3beab701d0dd9574e67ba9b34ec762c23b6275812a6849fbac0141c7a5fa56a86d4a340caeab5c001bc274392e SHA512 3dca890ec618f8c87de137760bd072a8664afc21d9f73e8b04b8bf1e4fd50f0796f11c9327f10ca34e3169fd55bbe8007da044580713428652eaa2c3dc25982a
-EBUILD blas-docs-3.1.1.ebuild 907 BLAKE2B c79af9f4243c4fefc24c582be708a77c82d82346d98ff3a5ea83b27837ba1db286a47925280b6a2ecbcecf5caacf37e0d88c1e8cc81c630332ea3905ebfd1ca4 SHA512 b30baa61412c97505be0700dcfad7c7d3d861d7ef80d8edb05a0309e54eb0340b715a5c6592c8343dda05d916e2463868ceb07351df458c88c766780cbc32a44
+EBUILD blas-docs-3.1.1.ebuild 885 BLAKE2B 66227e681e2685ef017117da24b55a058b97d64cef99aeda36261e53db655fa9ca407d6630fc5e2879bb757965415f09519a980b123f414303fdbee9233e20d8 SHA512 722a9e983428e141971dcdf1e49a875603b101a2a25a95eb0a25b77d259241b582abd0d40031bdb52d93a158a7c488b33b9f686999a47c3a5efbf8f9d0c889cf
 MISC metadata.xml 714 BLAKE2B 2d6bafd3860626c883522e2c9d246070e427f19ebe7be1841cb8d78d2e681404e2caf5a07a0bb7f82b8992ecc8a86b7dccc01983fcf6d38bd0758581f164c3d6 SHA512 5bd0b57c069e14559e39b6e693df0218d2620a04169bddb5be98af3ae1e963e7c9f0fc325f27113997853c3bed8f2e5018b5c5081d479f0239f204ee14049161
diff --git a/app-doc/blas-docs/blas-docs-3.1.1.ebuild b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
index 37b907eb0dc1..d034c041c602 100644
--- a/app-doc/blas-docs/blas-docs-3.1.1.ebuild
+++ b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/lapack-man-${PV}.tgz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/lapack-${PV}/manpages
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index b7529d3d5a46..5ac1d76a7f9f 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -6,8 +6,8 @@ AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de7
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
-EBUILD doxygen-1.8.14-r1.ebuild 3187 BLAKE2B 463f9282257c8f4a31b46637c9accfb2a2d4839588ac0903d4665996ac462ab3dde9ae96a3d25b3269cd7492f9eaca3d97dd9fbe6719fc9660429d31264ab71b SHA512 c47808d2d8739a4e9773b5524a256f2d357716a57d11f0db22d552a6d3edbd23848cb0187c209b3febf0e59e62476c1dd2ee3286d2083a15be74d8af798512fc
-EBUILD doxygen-1.8.14-r2.ebuild 3262 BLAKE2B acdff6cc5535499fa674027aaaae039a525afb4933202fb79b99b0d010cd39613aa8a58ddb18c07bf3dcaa82e082a596c85b568240e78745d986c0badd53b005 SHA512 cf6b58eb9d56e672c8c54ae0290a78170feaa2121958ce34828e19c816ce9c3ca7863f001cbd8e0634c602b23fdd2c62640609c32734ed13e965e3ffcc109f07
-EBUILD doxygen-1.8.15.ebuild 3236 BLAKE2B 0e6f62dfb2b5c85b97348496c690ca2e30e69f0c54e0f9444919635f340d3cce2903dd1c65d33bb0d6b05772edd8e77731e103714cdb52be8488052c32eebabb SHA512 535dd4c7077e40afb1cb73500221523ebda63358f2a44aae4fda7c86172a776a50dd6e5dbf5a3a27351fdf18160c4997459ded9beb4c1d44895dce3dfb3b3aee
-EBUILD doxygen-9999.ebuild 3124 BLAKE2B be423d31a057dc9129d85e9159070d609b913ecb11c30ac517b80ccf054783be1cc07bbebedc79dad2c5c57b1e01ba69be9c27550eeae7bb70072f594937cc06 SHA512 167218874b4cf2006fad2de68a7caea6b6267b299faaadfa609fd51b6478857508f7410cc5e00b195668cbed7ed52f7bc68f8ef1fe6259b461525d69cf994d11
+EBUILD doxygen-1.8.14-r1.ebuild 3165 BLAKE2B efc851483f1c382b00264ff513f6cdd2bfdcc8161f3541033ec34f088e4184a802f6217d8a3de16de1a684701766e2ca00d207143415efa85db42c4088dded9e SHA512 74e4263e2f92b30b5c0ba64732384fd67341fc265d80e3cd30c6091c0de7bdd63d16ddb43b7f63b4cc04b88e723d28db8d3815a141532593aea1fa1609284fea
+EBUILD doxygen-1.8.14-r2.ebuild 3240 BLAKE2B 9fed7b65e3b67fcca8dab697b39519a08643cab5f66a16b4bb170265f224d6a4596ee0f03174306e21b1a5090bde7f6caf952776e111e0a70c0e7c36d9fb2d11 SHA512 b62d83fdc8c8ad7a641cc57e2b72e0217c24ad48c0589161fa1279ff32282c3b4548cd3a4bbd3dffa167305ef63b628dd6ff9f3ee428b99ef4e58ee07df9caee
+EBUILD doxygen-1.8.15.ebuild 3214 BLAKE2B b17b7878cb94114ad0d837f3f0f17d2e84acf41e719999af0085a7e852abc00a01f33d6248185ea01cce6dc38297c0ff23a6ce9744c98e6a34d9b4f829526463 SHA512 ae014c865a584a5cc2970449d4fc1916a73c385fe2b2bf7a3d62728c14acda1544cee9989b9d617cc19e8dfc1352285238493d8c33bc45bb60404559a0b0ea17
+EBUILD doxygen-9999.ebuild 3102 BLAKE2B 2e4c2a1534357bdc7ca8e892a67675744bfe85b4e8b2a17c60782e249081e744d8d41019ccb02478acd6a9528cf430b1b1ee8ef007828fdc421e3bcc398e8df5 SHA512 bd23806a0e93f2563c5823c31b36a2f9a6acb71f1f89c7698b045f5d2e1f900ebbc4d552ecf03488e2131df01f4d24f8923e5cff75eb067c2875f41b13e4d8c9
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
index 7b053f387a93..de853a4a2b3a 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
index e01da2ff24ba..f374b46eae52 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
index d48cdc02fa1a..e327a0a51be4 100644
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 5fa14ce3f098..ba29bb09a4ab 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/doxygen/doxygen/archive/Release_${PV//\./_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 	S="${WORKDIR}/${PN}-Release_${PV//\./_}"
 fi
 
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 05fc02811ffb..30709c48abc5 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,6 +1,6 @@
 DIST eclass-manpages-20190728.tar.xz 415612 BLAKE2B b3225bf2ea8036f4714f6cd07ebd00092095f39970855d1847c3bd5e0cfc23baa6328d21788972ae430026b32172d43ef44fd9a9d243711885061cc2c209b475 SHA512 9d7c493808477bab22ecff8d832bdc082f55c39e886c3551c9e75c612de2f94d54d686f4c81ee77e06465eeb0d8004aac6c9fdc530f2c6c325832452242676df
 DIST eclass-manpages-20190908.tar.xz 416412 BLAKE2B 12d2b8c90349993510b3b0b462c3158090751e31abba013557595688136519a83bacc58ab4a26e3ed398aa0cb1647e4fa4fec412cce02f48007c4cf2a7c91121 SHA512 6d99114fd754bc9f84c90fcd485cde38772b506e960c2db61025ce3ceb3258c37f6d0e1be13bcc198b875969551c98e19da3f2c09b04efda0be5f4509b006089
-EBUILD eclass-manpages-20190728.ebuild 621 BLAKE2B e661db0903a9a4e565d97a6e86ba4f1458ae30d12e0374f49f61d6b2b4aa839357f60efdb80b9dd7f03c97323d2800370a21d2cb55c5e9705b7596cd15cca45c SHA512 e13f9e45b4a9a3c0edb1b58cdd85fba89f9089a508bbdb7d5f40570e9c23d104accb33a5534f216439437a320b184aad9a861c012996145d42480587b2aa9d45
-EBUILD eclass-manpages-20190908.ebuild 621 BLAKE2B e661db0903a9a4e565d97a6e86ba4f1458ae30d12e0374f49f61d6b2b4aa839357f60efdb80b9dd7f03c97323d2800370a21d2cb55c5e9705b7596cd15cca45c SHA512 e13f9e45b4a9a3c0edb1b58cdd85fba89f9089a508bbdb7d5f40570e9c23d104accb33a5534f216439437a320b184aad9a861c012996145d42480587b2aa9d45
+EBUILD eclass-manpages-20190728.ebuild 611 BLAKE2B bafbe222fe727aa2b23633ca6204c9f8e85a4212469de64bba74266f12a54baa9e785bdecada034d38f973d6ce34fa442a4f4591b60985b31865a79630d2fdb6 SHA512 5ca5c6d8334ec13f3e58f4817801396a52ff733880c42ca424f8c16be842d10677bc5170a90e7dbd50780ac691a926a2871cf09ab878665a861a8afda5da3f36
+EBUILD eclass-manpages-20190908.ebuild 611 BLAKE2B bafbe222fe727aa2b23633ca6204c9f8e85a4212469de64bba74266f12a54baa9e785bdecada034d38f973d6ce34fa442a4f4591b60985b31865a79630d2fdb6 SHA512 5ca5c6d8334ec13f3e58f4817801396a52ff733880c42ca424f8c16be842d10677bc5170a90e7dbd50780ac691a926a2871cf09ab878665a861a8afda5da3f36
 EBUILD eclass-manpages-99999999.ebuild 729 BLAKE2B 79cbaab27b22289c66c053232bf900a7ce8afacf48f0d5e750d324732e5c74918403cc271286da0eb005d15deb6f5579e04f6ff2eb5e9dd7372ef842d6ec31ce SHA512 64d4c7078873ac0814c68a02596ef6890949dbca960a452c867d2c7cc16b098b8922e5a915360fec4fee47c922e9bab81f84a04b3a71c92a96e47b6b02cc25e7
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190728.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190728.ebuild
index 3e6b3491f481..ca459885e06c 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20190728.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20190728.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 
 DEPEND="app-arch/xz-utils
 	sys-apps/gawk"
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
index 3e6b3491f481..ca459885e06c 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 # Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 
 DEPEND="app-arch/xz-utils
 	sys-apps/gawk"
diff --git a/app-doc/elisp-manual/Manifest b/app-doc/elisp-manual/Manifest
index b224546077dd..ccd2f50826b3 100644
--- a/app-doc/elisp-manual/Manifest
+++ b/app-doc/elisp-manual/Manifest
@@ -19,7 +19,7 @@ EBUILD elisp-manual-19.2.4.2.ebuild 727 BLAKE2B b9535938e38bb0c9aa0257a7276b6551
 EBUILD elisp-manual-20.2.5.ebuild 727 BLAKE2B 025100948a53c32770ff6b459c3bc8de28accf4e70e2fc395555c466dec2121a6467d844090470e95f7828d5e8435b24f83c8cf676fdfe166b07f4b4e2f23ae3 SHA512 91e3fe85384fe049567b3086868608c834a191db870aec3c2fe1fca9533a9cb498a4db84bb706ceaf91182712162bf15bd951b3c669ad1549331e7c4b9014838
 EBUILD elisp-manual-21.2.8-r2.ebuild 705 BLAKE2B e1b2edfa5ff611dddac3f597f45518f14b3a5ceac3916e10ef221da33650a071506c0e181365606c93a876cbab59726cd006573d90b503ad1b8ae78ac4387a2f SHA512 c9c5ac34aec1508b1e07a1008b34ce5de8e4d3ee8bd662604c20216ad0bdd40fdd7be4134b4c14433a573a3d863ce59fadd895d94bb09b5295556792ad834b25
 EBUILD elisp-manual-22.2.9.ebuild 632 BLAKE2B 486878c6e41d64774a184f9b7d43c205472239672b72316f422923cc84f643839a4042fd8d1a79675cc4a9e236fae0fb1138d0d13da632dfc7c9a3c8e6a33e76 SHA512 3fd5bc800c02308953ec8e61b8ae849bac320782bd084ab381c5105c156eee1b9cbf9e340cbb1608c08587c70c3ec80f057c6b2435e407b3f429c24f8c21ee64
-EBUILD elisp-manual-23.4.ebuild 670 BLAKE2B 35f9fff50ddf9bb6b1cb8f64625e251429da22ffbf5f2d3296bdf187b87c0eee9bfa72fe9400c5647a497812ea80ed8638920c9aa811baad8b3179220d47d531 SHA512 3a9c5d2328d57c5f1a902a71e26d95bebef0614ce4075f6cf9066fad517055a20631f9ae357d15a4d0f346e7c7382c6672cabb2d10f47ab46c2e22e3f5120eb3
-EBUILD elisp-manual-24.5.ebuild 677 BLAKE2B 1a66c98cdbc64424360013263b4d292c1910d836322043e4edbc3e8361e8638513c2f0772e15067109062214a9f5ab463041d438c83c5be633d6c8c201290b56 SHA512 c8baf1b57f363eff805bf1b2e16fb26f6d4f873336ab5a257db5033bf46a3e2bd7f60a4e72db25faa9f4e39ddca4ed443522207c847eac8432f1ff6abd255549
-EBUILD elisp-manual-25.3.ebuild 639 BLAKE2B c59a535490e5388afe75ede1f3cc2daa4e0e74dad9ccfe2bead749d85bd960b88eca76f7bf366875c03d466c61758bcd93050afdfe4ff324715f5330e1b9b762 SHA512 ec9898aa21ee08d854bc2a41a464c9eca0cdd95067970e008ee6e514137b6673b1ad88ad0107d75e5901931ae9e33b80f4de94532a727fe2ade50100ef6af784
+EBUILD elisp-manual-23.4.ebuild 660 BLAKE2B 685cb00887c3cb86434992f28d8125d494264d84440aaff62ddcc6ea408f1046767e6e355953d645e4a637c21bcec122536b950ae1f1a5ec1e9e7052ede728b7 SHA512 dbd2154302e41a0fc2676934b9247d43b9432ba530fc80fcbb6fd6c1a8434dd3f183c2f5d0104871fc7607f47f32c8f306c093e13d203bf7b355164c2d662d99
+EBUILD elisp-manual-24.5.ebuild 667 BLAKE2B 6266c3361804d47aae5cab0d033816650007c3ae78f38e99ce01ecca3a6123ee8b3fdafa74d2dd8306dce4d8332f87cfae4015621add9ba12e9667ee71dee463 SHA512 d683e56af0d3e66539ec5160669b0b6a05b5f01c6908b088cb93ff4f7486fe0a820c6dfc907e016cc2e993839d62888a39a864c1d9c4c5fcba353b4db73e5e6e
+EBUILD elisp-manual-25.3.ebuild 629 BLAKE2B 2f72824875a4b32a343d802a029ce23904316cd597be6c30d2262a5c2827cb2065c530f73a95439d90601a2b0e9ab818a9e75c8d2c1c80b0d0ea4308d61ee913 SHA512 db2bffa9fecc34e05fe2bcb205e5cf15c33f2b37771bb25e94f5e40c054143c3f0c5d8f149ed304c4bd4d1c91d945afb9c25e6de926e4788b6e69142837870e5
 MISC metadata.xml 1449 BLAKE2B 11f3b34d702faf8a9e9fca1d1538cbc3b79460da8611aa304bb15fff5f30c0de336cbe3d5abe9b1b8477b9fad29c182021de50427d2f8a31ceb1af23ff9de5a2 SHA512 25d8f591e4cfc53cd164d9e9af9a8866abf3b4a7bbbc6d6d102dd506469ea0b6bbde02ed9f8ce34a8aaa3f32de7dc614fb9c82f49224406952c31e6f96db8baa
diff --git a/app-doc/elisp-manual/elisp-manual-23.4.ebuild b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
index ea879a7492ce..3200ceec91a4 100644
--- a/app-doc/elisp-manual/elisp-manual-23.4.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz
 
 LICENSE="FDL-1.3+"
 SLOT="23"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-doc/elisp-manual/elisp-manual-24.5.ebuild b/app-doc/elisp-manual/elisp-manual-24.5.ebuild
index fca59e62bcf4..86453e2b181b 100644
--- a/app-doc/elisp-manual/elisp-manual-24.5.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-24.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="FDL-1.3+"
 SLOT="24"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-doc/elisp-manual/elisp-manual-25.3.ebuild b/app-doc/elisp-manual/elisp-manual-25.3.ebuild
index 10e056f739c7..19d5f31e9dff 100644
--- a/app-doc/elisp-manual/elisp-manual-25.3.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-25.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="FDL-1.3+"
 SLOT="25"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 88a684eca5fe..0d4800d02299 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,3 +1,3 @@
 DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
-EBUILD gimp-help-2.8.2.ebuild 638 BLAKE2B 49c4ad5ee754911325cfe38111db7fbf2430b4f6d9e8af06fc5b7f218d45ee57f61bf2b72622fbedff5a891d2779640f5bea1bb88f72b06453bb67df9da39cce SHA512 7f57afd1b186c9fe25221ba563478ea249cd21aa712e3b2a438e7dbba093235f2714c373db4f03a130f0e640a08217a35909fa78538d70476ddd05d5cb685aba
+EBUILD gimp-help-2.8.2.ebuild 628 BLAKE2B 6c4b1302e795c7d7cf2d3dc6c67f30e24851eec41051b204ff4bfa7cb7499f82854582f18ff3de4b7e7efce2b285ace5918ba6f667cb6bd8696777f58914553a SHA512 b33677844bdce6407c97dff9dbe363ff0bd8ebfaec0a8c4165134d7fad1d49594e47fcc4efb32d4bce9e37d674d08d5e94f6db0025536e50315e8b70e8849ed6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
index a48b67dbafd2..50cd46b7d83c 100644
--- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gimp/help/${P}.tar.bz2"
 
 LICENSE="FDL-1.2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 3fcfb775df29..c3f25248ff1f 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -3,9 +3,11 @@ DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69
 DIST gnucash-docs-3.4.tar.gz 92762652 BLAKE2B 1aad3f1e7fe5b6ec11b38dc778e8994544d50f9549450b4632e5fcbd370332f05c7c68f9f6bf0e274b654dee6304924d17089b61318e0e4356bf01133ad47508 SHA512 0a64c8fcc88988a08d5b2f7c472356c580dff17b1a2a37b66a6bed790fba9d7bb437955050656656a0be399b2ce1635902f4548f44b62233c1fcd1d75fbb38ec
 DIST gnucash-docs-3.5.tar.gz 97187415 BLAKE2B f35a3a25a120d3807771d74ee1c97713e21617f7ac7b4fdc1f58b9d12f7c0cc899a9af6abca21bd4f91a0978ebf5b93604deaae29f39c8ab86bd83ec93e32642 SHA512 aa832a1929ae91b9fe2a6a4ada0c7dbd8c1a4cf76086ec3ab0b82c7396d45aabbb6971f2db788bbdde71a68c8faca5f4621429819ef6c0d1156bcefdc5d289b5
 DIST gnucash-docs-3.6.tar.gz 96986567 BLAKE2B 753ee011cadec37320fafe3c0973bc5772c300dcf641ba34f05d03b9c13ec159c10f8571876adecfd7816956f2dfa9e83ad5879387536c15e7d1b138f7e38a47 SHA512 1fd36c74633ba699116914eaef245d4b84ab85a6e65578c602db8b2e3150f7fb97b549c12068a691e38b90ae0fa5cc22f8026b6d50de1ac967eb52b8296eb135
+DIST gnucash-docs-3.7.tar.gz 70634602 BLAKE2B bee0b328ab36409055ac4f681d4b09ff5e9aa28d17249491869836e8921700b495b46954465161ad06896ef9bc46c7ee8557ef2a3e8c4bbce2d600e6440bc1d9 SHA512 38f5828d3121ed76eb8a43fd91c1e3349c1f31cb95ee8fb8fa1b4c5223c68fc14627c78a5072a632aa0a228790918112a60269e6ee0211c705da6b4d5467a45d
 EBUILD gnucash-docs-3.2-r2.ebuild 1347 BLAKE2B c6e0b8869682edb5bb8af7d2e18c83ee7cf42f2e99590cb5f5474a369f7a9040ecc301dda70ec3e2e46a2c39322d681484a00abc5f73d4bd5dfe6eb4ed3cca65 SHA512 44bd23ae64ed96efc0b2c7d3b0547cd8a8f02250bde1d8579b118f403c2e9b831703f5651b396ddf0868df9f3500229f29d18ee394504f02424a2c5c5eddefe2
 EBUILD gnucash-docs-3.3-r1.ebuild 1348 BLAKE2B 8f8ba12abedf43cc5d26ec871ce017778cde7532d791eb902f8c084da980015accc6a04f301f4fbfe6201cd114743c0f35a88c42796ff59ea3a30a7960399e02 SHA512 ec36f57e7f890e0f9a3ba1ed760218b1108ecad611c98f89cc427d744ceb8567c0d8818da9d1a4d468ca60357e494d7e83d91797e647ac15b4a79fb0c19b5808
 EBUILD gnucash-docs-3.4-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
 EBUILD gnucash-docs-3.5-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
 EBUILD gnucash-docs-3.6-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
-MISC metadata.xml 444 BLAKE2B d5ab61b0738eb3124b32f94da3b3f38ef8993039a4797eab95f0c2c2af427c6262cdb2b5885d0e4dfc659e15bad9c492db706f134f8128595eeef6afbcd4b663 SHA512 7a97c9139b410b8054093bd666c6043e6383e5b3ad9f19a52e7b4d2aaafa1b915082408d575064e7be1f0c4b14eae660837d608e88956a4e51fa1c647a19b5b2
+EBUILD gnucash-docs-3.7.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
+MISC metadata.xml 330 BLAKE2B 17393892e962f0d868534c6908a6f6f09c4237cfdf81530b81e572f0fdac64495378d545ca214afc451a6323b97c71328aa1c6a8eda81773cb1d77c358e11bd1 SHA512 fa496247f2026343323b8ff8664fb8018316ebcbf14b88b1c99a649805cefe962d773c4d2aa35b266db2942b78d1fc450f200dc065fac48ebfb2113b5d6e8a98
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.7.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.7.ebuild
new file mode 100644
index 000000000000..505a73b78785
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2
+
+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/metadata.xml b/app-doc/gnucash-docs/metadata.xml
index dc94f737b786..74c00ed4c98c 100644
--- a/app-doc/gnucash-docs/metadata.xml
+++ b/app-doc/gnucash-docs/metadata.xml
@@ -5,10 +5,6 @@
 		<email>titanofold@gentoo.org</email>
 		<name>Aaron W. Swenson</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
 	</upstream>
diff --git a/app-doc/lapack-docs/Manifest b/app-doc/lapack-docs/Manifest
index 8b6fa5699e40..447d79adfd2b 100644
--- a/app-doc/lapack-docs/Manifest
+++ b/app-doc/lapack-docs/Manifest
@@ -1,4 +1,4 @@
 DIST lapack-man-3.1.1.tgz 1117350 BLAKE2B 3c1dfa55efdc1a2e11315885d853354060d04f3beab701d0dd9574e67ba9b34ec762c23b6275812a6849fbac0141c7a5fa56a86d4a340caeab5c001bc274392e SHA512 3dca890ec618f8c87de137760bd072a8664afc21d9f73e8b04b8bf1e4fd50f0796f11c9327f10ca34e3169fd55bbe8007da044580713428652eaa2c3dc25982a
 DIST lapackqref.ps 72345 BLAKE2B b5c4b7c7d7dae50f622ce06015ca5230a33f880eabba9e8c2b6e27999d51055b6a5b7bae3f7634c1e9313ffb9ffd3cf542b1d68229ae215f51984798cec0b1dc SHA512 b5177910f988002f9b9bc4e735c457b6e65e57e0f4860e237e82e038bd77ef2071d2251b41677374742219dcd0162cd0a92dfba9801279a4b8bb6aa5bdbf0820
-EBUILD lapack-docs-3.1.1.ebuild 907 BLAKE2B 9235ed1b50ea8201665d0506487ac629bceee33b48434f5abed4e5e80375a111e37e593e7a6e0f64bf4d0a67101868adcfe99c1bffbf7993dbb3c0fc6d4ddd28 SHA512 31f1b3a0833e4b4595f1034b5f2121b58a8e60b75f3ffb0051a901c915604d4dbbcedb7df942454a628ba0595bc8c40baf149e11b20c2de02d2052a8a0fcf4ea
+EBUILD lapack-docs-3.1.1.ebuild 885 BLAKE2B 1970fef5d44ab3f382ddae1cf6813d0fe12f21d122357412af924004dea934c62bc690abd793789871ec33a3638fd27730af8b9aaba75dfa8111fbd9c121e8ee SHA512 bd05b48f31cd824a61f0b41115d0dabcc3fd787b58de6526fd1ace518a628e7b6514c6fe3299ccb3fa97df12c62269df12e5463fd67639b36732e49809281c09
 MISC metadata.xml 702 BLAKE2B 7cb262e5264e6abb4bbdd39cbef6630b2a5a6f8952cd90877260b5218e155197a94d76868ee494a9cae8c639edd33b3fc1b5c1f6de3cfe92e47b4387085a6868 SHA512 d30c03608c227a94b578a235243946be928a26cdbbb873eeb8cf019dec6940c2d8c6dabc341018481ccc8eeccf0d82447c058de43e354e19fc984b78569703df
diff --git a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
index 6ceca92f0e5b..9d017eec92d0 100644
--- a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
+++ b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/lapack-man-${PV}.tgz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/lapack-${PV}/manpages"
diff --git a/app-doc/linux-kernel-in-a-nutshell/Manifest b/app-doc/linux-kernel-in-a-nutshell/Manifest
index caa82b60c643..3dbf7dea8c93 100644
--- a/app-doc/linux-kernel-in-a-nutshell/Manifest
+++ b/app-doc/linux-kernel-in-a-nutshell/Manifest
@@ -1,4 +1,4 @@
 DIST lkn_pdf.tar.bz2 3533339 BLAKE2B d67708c7b100707b6a74f1a983bc396f1068e60d74c63eb2ed99830f0ea4b37b4260504d45f27ceae70e9c01b92b65d9e5076476466eade84f9dbe8d1b384fbf SHA512 5a0815148b379347675e2c8f71476e8e950a8028fd625044457773c4e7b62fb886edc7151a46a9dd0cba47729c99317f779974e395149d87c4c9483c7404ede0
 DIST lkn_xml.tar.bz2 1058278 BLAKE2B f85cc277e7f313e00d26f53218d315c6b741b584a597b2b0adf3a9bf3dc13ddaa2203b1d6976e4189aa8dbeb167709f7ed3522a7c9cf8111e62b6f8d0425de2e SHA512 831b19f67b50f897f93720c19b7bbf90673c420c2b1ce257de3c656a01cb12ebee8499dc86c673cba9c14fb6fc50e644fbf84156d9d2580127affeabda87a83c
-EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 661 BLAKE2B f4afc066c13b87e6f5e75e411dbd46e0151a99fe5527153b89cb99e39ef80681091080481883c124aa2a4a9c4b580cfdee2b0de3117ca1ebb4e3cbfeaaa2778f SHA512 2ef9f31316523e96f23544cb152c8df5dd4d3cc0c11234aa03f6e214200d673bf2f563ce1ecc3a130ec8cfbd6ba811d87ff84ff113d79040b352e121bc8480a3
+EBUILD linux-kernel-in-a-nutshell-1-r1.ebuild 683 BLAKE2B 0b73db3b4147173a6c898461d1a853770361b6ab812d558f8cb20dedb8aedc6be8404e207cba66a03359cc8a751b19325c6817cd516a5cd9cdd5fd50d4141f4e SHA512 a05eb226d6cd7163fe322cfbcfab8f16e225e28c1c3adcaa1c8278c39dfa2b5b1d601b09c1b1786f1aacae5780a6107e6b104fd14848908b2621b89bc2b5bd1c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
index a6b1db80bccf..29e4d76ba3cf 100644
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
@@ -7,8 +7,8 @@ inherit eutils
 
 DESCRIPTION="Linux Kernel in a Nutshell: A Desktop Quick Reference"
 HOMEPAGE="http://www.kroah.com/lkn/"
-SRC_URI="mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2
-	mirror://kernel/linux/kernel/people/gregkh/lkn/lkn_xml.tar.bz2"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.bz2
+	https://www.kernel.org/pub/linux/kernel/people/gregkh/lkn/lkn_xml.tar.bz2"
 
 LICENSE="CC-BY-SA-2.5"
 SLOT="0"
diff --git a/app-doc/motif-reference-manual/Manifest b/app-doc/motif-reference-manual/Manifest
index 9be528066024..a101b0a56a71 100644
--- a/app-doc/motif-reference-manual/Manifest
+++ b/app-doc/motif-reference-manual/Manifest
@@ -1,3 +1,3 @@
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 BLAKE2B 2cfb090b8b54bee37097737979f1ccf2086125b0303f75e6172127241be122f6da1a97e4b6333b50c523362a90b60f273998cdca8e2b573ce8b499458c01861c SHA512 a916d42f389e6f0e58968e46529943213f437a5bac145687f6f1cd6b4ad32516795836115054870fa435ae4d531d50eddc304c9a4fa96f005f45575c95cff973
-EBUILD motif-reference-manual-2.3.0-r2.ebuild 706 BLAKE2B f51c27e97a1ccd100874baaa521b26baa01dfc865a78cc3d3bc431613c93f9ec2353acf5ddf87bcaa6bb9b15f1563bc8e4b3c2ead8beceb179399b1cbded013c SHA512 b37de7288f7c14cdad66206871c2575f202b36be95e16edbac12ed961c8674179489c2454d791f840a496f8cf9b482737ce51227d0b9af6f741e7d23cf91f12b
+EBUILD motif-reference-manual-2.3.0-r2.ebuild 684 BLAKE2B 3f0936f2855bbba346b7dc4b2a265e12804bad0605256add5ef1303032ae6dd154d1975195cf2df445cf5267e53baf7264981f421101ec16a362f3fa9cc0f5cb SHA512 ebeb0a025c9ce4efa5b9ce75ce4ca54062a9650b5aebf7e4d10f33923ea19b71d6b958f3544cba4ae89a5599a56b36de082ed507db004d5816c45b971769fe63
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild b/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild
index 570cadda83ee..6c3bc75265d1 100644
--- a/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild
+++ b/app-doc/motif-reference-manual/motif-reference-manual-2.3.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ics.com/openmotif/openmotif-${PV}-manual.pdf.tgz"
 
 LICENSE="OPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}"
 DOCS="*.pdf"
diff --git a/app-doc/php-docs/Manifest b/app-doc/php-docs/Manifest
index 75288b6beed6..f4392545a3da 100644
--- a/app-doc/php-docs/Manifest
+++ b/app-doc/php-docs/Manifest
@@ -17,6 +17,6 @@ DIST php_manual_ro-20101029.tar.gz 6073830 BLAKE2B afb5996faa33106b626e1926a3f1b
 DIST php_manual_ro-20190203.tar.gz 12964568 BLAKE2B 3426d209332eb3d37084c86b0c5e94b78e2866c01d3a4c8567df47d00881184f60a93c2d96779fe814e8ddda0657f67c57b14e14a064ef81d1597ac40a35880c SHA512 3a55136311184c74f001f85bff7a79d8e268dc851d86ad07ddda9c83d8c9de5c3470feccde6a0d2cd4141f11902e68c80c3164ff96a18316d3a3ddcc983b0d50
 DIST php_manual_tr-20101029.tar.gz 6089215 BLAKE2B 0d162bf3213caa82be98e812bb7487ca1121aa33a94c4bb0131e7ed462f3b2032ff6415e9df90f2716dd6326bdb8a405e556186b296de897d316cf8417131cf5 SHA512 181f8f79be6a1e9d510b935b27f8ed88f410044ddfd7ac80e1ff69bc48f79c3b4d78457e5bf009962f9e68e38605a614a161ae3c46c836ef6aa360cefc08626a
 DIST php_manual_tr-20190203.tar.gz 12617835 BLAKE2B 413586ed07b331251106f75773cc75be5eda338d436d87254d0e373bd708620bd78280b8f97ca56784805385d2eddf85ccfc6c67a14eec336873c76bdb072986 SHA512 02d045a59cd426d963668841660c9a5a08814cb8c72dc3a39be2add9da6107bab9897c968520f6dad036ec78d8b0e3f85b9df1f2cdc5a1cafc223c9fdd717551
-EBUILD php-docs-20101029-r1.ebuild 1457 BLAKE2B 58473e72d8493c07ad51a8d22bdfee60cab9c0c0e8c1749e8229ad1f55e36479344c2911c7175897c8f8de1fabfc1c3ee11e89f0eb1d3b1b2490b3e7a40e9a5f SHA512 b02080cdf1cc32465fac14c12f71b1bd6631bdee71cbe4be244eacc4cf6898822bba44c7a839ed1e92f7b22db6629513d139bcb95d0e475acaa83e7bd479a718
-EBUILD php-docs-20190203.ebuild 1468 BLAKE2B 134eb2912cab61a113f2c1e6fdcadb9edb64a5ab42cefe42403b46e8294de4bd9e182756778d1e06b315db2d8c154f8b46934e6f2af94252391af417ce13078d SHA512 9503e3050fd951e45b18408fa5f14ac9417b1dcce32b735a74676b14d40d27a6c7aeb7371596df4a3a40310dee2d6e3ec7d3ae42c2e63e2df785f61cde415f04
+EBUILD php-docs-20101029-r1.ebuild 1435 BLAKE2B 5497c30ad361cfa0fe396334f2dcb6aaa2034be0c9ee692b0cdd3ae95d3e6000b54f3978eaf919a2ce43d68e9524332097f7045e9d332cd4762b31d5559ec64e SHA512 1da996ad0d2d74ad024586d5fc8deb88612f3d59f3b6d7a7b5beee3b97eea368b232ab503c5ec6eb1f6d7aff18fa9ee747b053277cf8e500a771517c6ba6adb6
+EBUILD php-docs-20190203.ebuild 1446 BLAKE2B e7ca9be9524b6e113632a6eb8e4826e8ba65aeb5cbb44a4a1770e5a05a79c0c5d88c3e0ed0eee205f56d2a896acc506f3d834c631643172e6b83b673ed0f0127 SHA512 80d6bae85de1636a7c41bf6487b8e22bdb3c99df2a2d7bb30425886f18a83980ddbba99ce523a58d0d19a91d021f687816db634da901d28112a01c0d2251770e
 MISC metadata.xml 257 BLAKE2B e3c820c3fca86ae3d3882be99d1ab7a1da63f4f22c6ccd7e00717a3ec941459cbe5720ee2f28ee5731318ac081f6777cd64480de8b5c3953fc11c9193c0deb3f SHA512 ee4118f53c1fd95c499caa6eb3a0c523ae216df68698b601e96cd812be4483540b05eca8bb23b7377a54ab5ecb05a049ecc3027d89651bfef009f0015cfdc7e6
diff --git a/app-doc/php-docs/php-docs-20101029-r1.ebuild b/app-doc/php-docs/php-docs-20101029-r1.ebuild
index 38cd400fbea7..ab054eaab280 100644
--- a/app-doc/php-docs/php-docs-20101029-r1.ebuild
+++ b/app-doc/php-docs/php-docs-20101029-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="php_manual"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RESTRICT="strip binchecks"
diff --git a/app-doc/php-docs/php-docs-20190203.ebuild b/app-doc/php-docs/php-docs-20190203.ebuild
index 77a98e5bb059..e6e68e648c78 100644
--- a/app-doc/php-docs/php-docs-20190203.ebuild
+++ b/app-doc/php-docs/php-docs-20190203.ebuild
@@ -10,7 +10,7 @@ MY_PN="php_manual"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RESTRICT="strip binchecks"
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 5caa067c2ae8..50d24ea72efc 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -2,7 +2,7 @@ DIST pms-5-prebuilt.tar.xz 540244 BLAKE2B 06fbfd4cbf9968fbe19d1960687f226c87b2a1
 DIST pms-5.tar.xz 50284 BLAKE2B ecf3c34d79aa1439e0f0f4bca540b673440db04a7f533f103f5956f6a27e994ee42836ae2871c11fadf9230e2b5973d3d1db9e17167f886a6c929e533ece4d45 SHA512 560bdda40d4d1628e97b65bb354c349e3ac52edd1e337427adb0db61e99b40d214459a5046f4b505edfabc3914e2d585ef0453b13057a25fe138b8a5ebd6292e
 DIST pms-7_p20180430-prebuilt.tar.xz 593500 BLAKE2B e59882b215492424b351242f31b90cc3aa457f7e4630c5b15fe8bc18fd8722764371868f3a44bd7226f4d00c5a8d9c12829d934cda715e575b4c949631c4ad02 SHA512 e27527e4ea1fa16f7c069267bec136521e7be621bd49701920d11e79e4a5645ca8da06aa41c4adaa1813c0f4abce8248e4274d7ec0ae04f6a8479107b0578c4f
 DIST pms-7_p20180430.tar.xz 60072 BLAKE2B 58afb1759c84ae86a1dd69aa04a6e8b799fd0cc1e1877cf1f6224f5b1bdbdfcdeaadcabbd9c37c263d62cb24b4164056a88d3524031d1704b059c376d5572101 SHA512 9bb64de842e0aa8f1a6488d12fffba76bfd190e53523e9261161467b30f001f20cddf593cd32e75ace4af309476eb7eb6966665d7ae9b54a5915237094110a47
-EBUILD pms-5_p20120920.ebuild 1413 BLAKE2B dcdc3568344dfaeef0fb3dbf5e315521aaf5fec20600a8fe01e950b108935b1ed6c85a3c52a6048be36e8bb82828134c3cda4ca307db9af43448f6d882bc4cc2 SHA512 28c3271cc703048af438f060d01f976bcecc7468ddacf91f91cda7325973953761f518d7a8b32f7422e643e4a02fe462fd9e17ad09d7fb31e4a49683b8c04d09
-EBUILD pms-7_p20180430-r1.ebuild 1660 BLAKE2B 036842f297110886c1628b0fdd7d16b1eef9b8f9f03c88fbdf804d1c257582fb85a59c0a940cfd23cb18a5aa53c4521b8f0d112bead3cb87d533586d629a50a1 SHA512 51ef111dfa2296056e76f0d0d727810d3e29c5508f8737846691e8a9c917d36e838a1f7e9163bb349cb9eb87899d04739ab118a8cece2e6fb4813b34190637bd
+EBUILD pms-5_p20120920.ebuild 1391 BLAKE2B f7ab4a9f55a227b1a229015479376c901f923d9bebd5aa778bc996b6f976d17bb00718b5681be22442576dace01b02c0d02914bf8527a447e8a2f0511cb27fc2 SHA512 5c82ac1bc1a186a6d645605578baa0785a61c61b389b6626c78d13573c11189216e7574fec05016ab07e6e07f04eb0480394a19b7d96490a5a0090314538165f
+EBUILD pms-7_p20180430-r1.ebuild 1638 BLAKE2B 8afb9f7254af036c5892bb712742c5e6c3b026ec33e1ec8df18dbf6cf0be531c586c721feef659bd625d63745371eca4ea81ced0fb9c1db7b6794b14b1d513af SHA512 d7f04448737f39651aaa80e2bf2b5378bcb7fbf73affc20bb06f847adbaffc6c252a5617846e1e12931c1bd42b79a13a3aaa966c978251ae4fa14793d5571a39
 EBUILD pms-9999.ebuild 1206 BLAKE2B a9df125c860fe83cf1be1b6332e37f61ef9155073550d18dababd6d001cb265a9cdc2d6752651ec3c4876a8ba2d67b14044c3bc2358610e6f5cfaa6d5b778805 SHA512 7a3f3d205415518f1adc703970b46cf646b7b92d9a3c6e10faeeb63ab343316c18078707526de13e7030c18b77f5964b57a81e33386483449d896e56ab71bc80
 MISC metadata.xml 518 BLAKE2B 370ddfa79e44e10c0234d0aafb89624181bf64ae7e90b89b678a8dcb518214f310bc9afc261d5069a8f07299b2194c3a831e1d2a9bcba8d97dd6ef0dc1369346 SHA512 e1079583ec59594d9c89dbbf68199aff7edb35112375e96a2f6ca28627f679ee46570f649a0723c296bd41d003dd91226e6b2805bc780baded00dc1ae72d24a2
diff --git a/app-doc/pms/pms-5_p20120920.ebuild b/app-doc/pms/pms-5_p20120920.ebuild
index 2e0053e3aaa9..ec756a31611a 100644
--- a/app-doc/pms/pms-5_p20120920.ebuild
+++ b/app-doc/pms/pms-5_p20120920.ebuild
@@ -11,7 +11,7 @@ SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${MY_P}.tar.xz )
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="${PV#*_p}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="binary html"
 
 DEPEND="!binary? (
diff --git a/app-doc/pms/pms-7_p20180430-r1.ebuild b/app-doc/pms/pms-7_p20180430-r1.ebuild
index 449dfdf6c228..fbf885437186 100644
--- a/app-doc/pms/pms-7_p20180430-r1.ebuild
+++ b/app-doc/pms/pms-7_p20180430-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="!binary? ( https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz )
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="binary html twoside"
 
 # texlive-bibtexextra: plainurl.bst
diff --git a/app-doc/xmltoman/Manifest b/app-doc/xmltoman/Manifest
index 57a8c731dd2b..9678ea227203 100644
--- a/app-doc/xmltoman/Manifest
+++ b/app-doc/xmltoman/Manifest
@@ -1,3 +1,3 @@
 DIST xmltoman-0.4.tar.gz 15250 BLAKE2B d8641a19742d845fdab0e11703a60c16656c63529a4d86931a8038cbdb87e0fbf241b7ff38ed05ddab62daab608407bd5d7778c060fe3cbef1750976fa588dee SHA512 347722731e2101ecd0619f88f4efdbca534810c96977a1281af685e8a61f4c1a826a71a9f0e3af43cc899936640787366a78077f36d23a9efcfeb789dbcfae22
-EBUILD xmltoman-0.4-r1.ebuild 737 BLAKE2B f2a03ec8d4a7b58437aba86f3849bb15a4a39e0df409f0e6b9a1042efb43086cbdb870288bf1e8b764b55b7862e1bd5e3c6cd54a7272757aac021abec9bcea1f SHA512 3521ad098db75cefbdbc3ca02113f67fdfeff947a0de53f000de8f22234f5b8329c5c6e2162e10d86d4ad635b6aba4c853d83c41e126192e326dba5c139b0ef6
+EBUILD xmltoman-0.4-r1.ebuild 725 BLAKE2B 48366539c420c11937af51d806c81a6b2bc7028e89e44170706f83e6b88f74500d39d05311ecab5872c98d17d3e40830a79b4982fa71aaaa6c064df7d2ea96c8 SHA512 806de4138272d390ceb97c1990bcf8d96b5018c0ef61472723c63a6986f5ba29f1c54872571a3bd0bdf3e8669da75d5d3f247b2ba5abf1787565a8c1fad054f7
 MISC metadata.xml 245 BLAKE2B e84a1330aec92254ae747019bf2573a814f3cd529a1bdada2c24e5ea462477b282a32440a839cba164f6f9633830e23c95117920d4593f67a97c0175fafaf25f SHA512 3af134c5e57fc7b4fc055162378739b18f3531620338c3b3475ee94c17817948e44c2fe91c58d544ee29d2fae237e5db80388ae1960b017b7991330603377060
diff --git a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild b/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
index c6af63d1e42c..aae8f5f2ef30 100644
--- a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
+++ b/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/app-doc/zsh-lovers/Manifest b/app-doc/zsh-lovers/Manifest
index 604077a0a6f7..381594414f0a 100644
--- a/app-doc/zsh-lovers/Manifest
+++ b/app-doc/zsh-lovers/Manifest
@@ -1,5 +1,5 @@
 DIST zsh-lovers_0.9.0.tar.gz 28883 BLAKE2B a9917c2441222ea27937e4bbcfc6ed4ab7594fb406a28bbdc1849ae6dae11fd924dbf50d97b65f4800b1d3ebd044ac6b1516b80924428d007e7070817a82ced5 SHA512 54e7465304313556f9299877314f18cef631c076cad1a8f3b1ce13a6e24dcb4778e852f0eec31bce62bad2bd9503b8741238f097be8cec541e5c4c8f08af9dc4
 DIST zsh-lovers_0.9.1.tar.xz 26632 BLAKE2B b5c5015e7e61c21452b688aa46529dd468beac5a034b844185e1a497778a1c83b9d8124551a7b0dfd0d441394b0bf71fe64f4af5af7add3956c0a2a2f79f01ca SHA512 16493f2ec095fbdb992188a732ca4205880fa10fc1f1ab6cde8cbd2a0977d95bb06e46d1635c0c9910c249bec024f3cd13a1f8c6597e5201ef8a26b80fac9c2f
-EBUILD zsh-lovers-0.9.0.ebuild 786 BLAKE2B ce32b6606360d1c2da24543784d78bdcf4dafb6f3d858ac6ef5dfe6d994679e8402ce6915629f695c26f074e45266ca5623cc26739ee407ef0fe64454a9fc911 SHA512 aabcf1eed9aeb3a252d0ebe4e6a293640f172adb37461c47113aee58b81d1379734636895e8ca1abfb3b318b73d259e02ed7b07171da9ee9f9adcf3a421d5c7d
-EBUILD zsh-lovers-0.9.1.ebuild 755 BLAKE2B 9938b7bd1f902ffddff94af2841dc4445f39739624095e9fc67cb51c7dcf9d06a919d94efd3547a06ba3a5eb8c010a5773aed4ff1656e3d64a13dff24b942b16 SHA512 2335b7b932b6f1648ed3764dd8198b46f39f8943c4da4573a7ef191b75266ed3aa81be1266cf3e5233ce8ad3bd6b9eb101b3fd3f0f78f90ad29297445989af14
+EBUILD zsh-lovers-0.9.0.ebuild 764 BLAKE2B 1acdb93e945b536d0e4e391a1e4ea6c74a7286da39001fe56f12135f1785273c08781bb02b436a9c7605511d355ee1fd31a688bdeae4539009d46afcce504542 SHA512 e81e4bb58aae64e501ccec00c4d3c14964034dfaba49949b128377476463816980b630a69f0e86c60a1eba885aea380f54788b7f82696109b715bd3905925863
+EBUILD zsh-lovers-0.9.1.ebuild 733 BLAKE2B a155f800abdaff45825bcceae37b6267a700026445d93956d7e1bec9e64618aecf6f433dcbe074dc83feeeebb6e6344306ca401955e0e8f0b6f15532c440e37d SHA512 896166fa7d8b184ff705d896125a2b86a7500d5d510aa1dede5dcdbcdafae7ad22f9b680bd153d6206bd5af2855abea4cd95f0ec54e386515d606f0ae3fd3d28
 MISC metadata.xml 377 BLAKE2B 6329163489737a50e5cbbf5fb0dfcd4099d97a5c675519bd86e80428aa51b89ae2c5a9329239a47a405bf6d94a61dce6f4e2acb27866ff708dc3fb4bce09d505 SHA512 b6b6d0907c374c74d7b3f3151f31ec989ce028d92df3d1d7f2e1fbabb6995ba27562d643ae7fbfd9102beb4b38fe231871eef46664e455ded7414bbfc94ceb11
diff --git a/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
index 9312e8261e2a..57d663783107 100644
--- a/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
+++ b/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="app-text/asciidoc"
 
diff --git a/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
index 08c577d1925a..75adbfcceaf3 100644
--- a/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
+++ b/app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="app-text/asciidoc"