gentoo resync : 21.07.2018

75 files changed, 78 insertions, 81 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 3d47ddb98923..1bd26f4c68ef 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/fortune-mod-all/Manifest b/games-misc/fortune-mod-all/Manifest
index c007ea1e90f1..f3b2a73d42e5 100644
--- a/games-misc/fortune-mod-all/Manifest
+++ b/games-misc/fortune-mod-all/Manifest
@@ -1,2 +1,2 @@
-EBUILD fortune-mod-all-1.ebuild 1630 BLAKE2B 35464b9f379fbd01029891183cd2dc7979f7bc28c25135742fb5f6c42d11a476436fdddf92743fe798f4758eaabad63cdd33ab5cd04151c967ddace8c8e5dda9 SHA512 fc0dd134431fd6c1391d875a46ae3a25220de199585a7fded0c0a16d8d6d9e6611822671afcba4030556862bb73dafe51675bd6ef3d47c734061007303241225
+EBUILD fortune-mod-all-1.ebuild 1624 BLAKE2B 7f80d9bf4511e2921965e11ad6d90e63b5aef5cd1e326e2015a72c2d572a8291df04e7ccbc0b40b93195f069b14227b93ccfbd95046d6aacec21a6a4b4b7e962 SHA512 1201857663a014e774783ef432b15ab2b14d3c41ad273b5c77595829db1e9dd6d54f113a143a69c9272361ba5d80c89105b05b88147921e79c1f76045cacb79d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
index 1f57df817302..023deb9f63ef 100644
--- a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
+++ b/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="l10n_cs l10n_de l10n_it l10n_sk offensive"
 
 RDEPEND="games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-at-linux/Manifest b/games-misc/fortune-mod-at-linux/Manifest
index db87e9c26da0..f7fbca17da49 100644
--- a/games-misc/fortune-mod-at-linux/Manifest
+++ b/games-misc/fortune-mod-at-linux/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-at.linux-20030120.tar.gz 81012 BLAKE2B 551b1169acdd863040389d79f5143e0a294293f856fefcadd0fa3b89ccde7c91c15117af9f730ef54476e1acf3933959f13dd83f879cce8b7123dedc056502ce SHA512 804b785194db2f4727e3196d46b317d6b644bd4d05a4f3286617a2b2e3dff2c9a7c9fb88a0f2a6556d66fd0f975fee8564df236085a7864172c6a6b63c33bec4
-EBUILD fortune-mod-at-linux-20030120.ebuild 850 BLAKE2B 9c837b78ad2d64a54f00ce17de6d8ea85c4d377e8d3e94a0d0f19d0f9fb405bc389c276ea603f21b42c1a0657ad9213d1333ec1b51a5a370f280ce069c63fe70 SHA512 266bf649124466368965e8bf4dce7438dc18654a787a07ddac4e1f8a1e28f7d49a1d44e11cc1e74f5d32a03c2d2772dcbf7426ad4e1695efef31f0e64848e6e2
+EBUILD fortune-mod-at-linux-20030120.ebuild 844 BLAKE2B e17bf1c9af4ba51533e327f33c0f6ac475e736cdb1f7f7c0d48783c790e1fb44f31ec9e24966190e904f4cb44c4743ca73128db38a40a47db8af67e55b10307f SHA512 760653ff40f0863e75467d14da01a9086400f703f745cc6298e0e78ec3c8ff3d4a0bb78037fad0f1462032f8b9ba1849c886023d3f0a2552a567b923a616f86a
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index d293cc3b1cd9..b379cf070038 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-bofh-excuses/Manifest b/games-misc/fortune-mod-bofh-excuses/Manifest
index f24b1d78d4d6..1c23388bc7ef 100644
--- a/games-misc/fortune-mod-bofh-excuses/Manifest
+++ b/games-misc/fortune-mod-bofh-excuses/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-bofh-excuses-1.2.tar.gz 12753 BLAKE2B a16b5e575b1a2fccdbdc85a0ad092d3cd7ed1f3a39bd6bffa2eb5ced6f33fb0d0eb72440f06c8924f1b731551588da72e5f53982d5ef6404e35d61edd1a4717b SHA512 71e9f664a1ceaf20455bc2c49e5efe0a953d188cbcd11e5a536fee73a01623659fbcc379baa4d8b7ac4a6970402c085a508f0e37b7fe182869c7ca9ffc2fce99
-EBUILD fortune-mod-bofh-excuses-1.2.ebuild 645 BLAKE2B 0480612bcedf202ae77e8564447b5c9b45860a74ee903f0ec1ede73a74f8154da32f69fe09b5cf1f346b91b21cb9b94e92cf0479453e6564fff98fa6a14c36b1 SHA512 a15cc0ece853b950ba987e25812d73a83d49f798c0bc75041cf1c39c8d0792dad092cd8876bf43ed68490941f9182a9a15bfafa2a5a274116c3610b3b330ea72
+EBUILD fortune-mod-bofh-excuses-1.2.ebuild 639 BLAKE2B 43fd4bc38fdc84f22ed8c3844de056dd7af3121fa3dea3f337cf51983df9bf398bf3644396b31bd41c720d30a148b3e08ea7185463a1b0c2eb7c644c631a4e3b SHA512 f751245d74852b2bcf3bb663682841100366d138a07cb0c1a5bbefa854a7ae823e2e016de113d88fc2f1907a3375e5c9d600c2c9e73d4a508222005ad70f7813
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
index cf86bccc2cc7..b635f7b08151 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.stlim.net/downloads/fortune-bofh-excuses-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-calvin/Manifest b/games-misc/fortune-mod-calvin/Manifest
index 7ca8a26ae4cb..a81b60dded25 100644
--- a/games-misc/fortune-mod-calvin/Manifest
+++ b/games-misc/fortune-mod-calvin/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-calvin-0.1.1.tar.gz 6787 BLAKE2B 73814edf08c7fdd0603980e353f9e2fe79cf135c642650e3e6f08662a036057238f51276ae7fe0f41070ed26ac47d434e87c77a81384fda8a28873dc61b82098 SHA512 047e9694aca702b93661ac252ca8599d6b3778116907fce93ad2b9eca79e9af497b9f2dc188223d19eff8109691cbf66248cea259786c5504446eee3cd3b8245
-EBUILD fortune-mod-calvin-0.1.1.ebuild 559 BLAKE2B 5a54bad686ca9b66efe3c2474bee6d1eb40449c9d7af3788f76bf46f32b5324146a2126237d8eb1a6bca483b5c7e721f6c1f8f449f33111574caaec45974ecbf SHA512 53028ebc2d8a3b103571da01dd1b0fbf7836197a7c1a16ad394e2106d39c972bcee883aaed7cbc60ce49ae3d30f1e34ae531bf0ec715adee4e2a41e0d50d6273
+EBUILD fortune-mod-calvin-0.1.1.ebuild 553 BLAKE2B 9817603626b7f72f7d4ff509ef317c8db18aa44710eb495b0b97d0133378281ce68b3308e44eff039bf4c0a3c076cc1eac37a024dc4885da4885dc956806a30f SHA512 2318d7aaf3b1ec8b22ce6705ac6cf396f27c8613818bff6031e01d230cbeb36421e4c775765d5e283afce591f64e26a9bf0db72d20d1b021a38246534a48fb7b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
index 81bdbf5f1b08..a7023836f2f5 100644
--- a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
+++ b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-chucknorris/Manifest b/games-misc/fortune-mod-chucknorris/Manifest
index adf314f38180..b4f2b8aca045 100644
--- a/games-misc/fortune-mod-chucknorris/Manifest
+++ b/games-misc/fortune-mod-chucknorris/Manifest
@@ -1,3 +1,3 @@
 DIST chucknorris.tar.gz 23035 BLAKE2B d42b510978321b0857a1e6ff50b80576e5f6af52f9014330a765c78a39b274cfecbe2367811fc31e506b1d0e4f3b65c416ff3c06c6a2d7bf20e302ea41f46417 SHA512 efcee2c1ce5ee747cbdf3cfb0b52958ca76309cbf509627b602cbc56403e67396c879ea46c084b3d82788404829e48990a534eda9e8f3640d39dc894318ca7c2
-EBUILD fortune-mod-chucknorris-0.1.ebuild 586 BLAKE2B 4f828872f95ef20dafdfd2eb246bd53b3de43a85e2c24d9fb1e14859a8fb7cbb632fcdb656b3cbfb03f826580c8fe36e2b017904e3a896a4c49f8376c52f2787 SHA512 cd0f447aaa01c3b67c51a01bb7773c7925bf7a802a18e37ea29a710db27f7cce381ac81d7e8e005b010f07c8045012c445aaf9744dfa860e62db72efe304b27a
+EBUILD fortune-mod-chucknorris-0.1.ebuild 580 BLAKE2B 61b0347d3d2690cf7cfb0fe7781be77c71bf5f1311405a6f27a5096fb3a20bead5163ef78a5a79c055ffff4051f47227685b1ce7cf83c55d7741de4b599d94cc SHA512 96cf5e4792c81e7e90b3ee96b1dba7a588342faa983e060f06dd5be2d2eddc657f26654c75bbce9f962373345330ae23ddc95cde5e473d802c00c98f92809f55
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index 1fe74466ec32..8b4b5703f9dd 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="https://www.k-lug.org/~kessler/chucknorris.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-cs/Manifest b/games-misc/fortune-mod-cs/Manifest
index 8af1a6348c40..e221ac9fece6 100644
--- a/games-misc/fortune-mod-cs/Manifest
+++ b/games-misc/fortune-mod-cs/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-cs-1.6.9.tar.bz2 390766 BLAKE2B 1f84174bab1274e8c26a10ec5eb4921f0d3199b4bc39b88b4ed3b83ed9fa5e2b1b478348501ade17f9899f6f7490748ad736e2f2c6bea4de08055f73ce7257a7 SHA512 4df546eb450edc1de6bb80f788e29fa4aad6050008c28ed12c4afd630533416f3367c09b43ae098329160a19bebfb28ec56ebb730358689d260709a27317b20c
-EBUILD fortune-mod-cs-1.6.9.ebuild 1017 BLAKE2B a50f2c8a19e28b7582f132241ce44fe882f1db8934ebb1d3c81bae020a7050571b35c078617fd25a1848f5a54b377d09a8c8bf789b64b9d15bd75d90a48e3682 SHA512 0a5f77440ffe87a6a9c6186d3091eb3608fcb1acb1ae8d32444a5104c63360ff95e193492d50a70db5cc9db839d957f097a2cf61a6ca64f9d2efd44dee864a2a
+EBUILD fortune-mod-cs-1.6.9.ebuild 1011 BLAKE2B 0ab8d32a58c641b26bc361ae3d2e2b23df3ecd74b7320e03f58d1cc6e20c190cd83ee473da0f252452ff27cd16b52f2e438f17bbb919646b35464d98d1298fcc SHA512 26e994527de63043c7353b6dda6b605e3239a2ee3de161b911e971630f5d85f04e7b0645874f57267b9b6bc7be8d7073f382342c9c59f7f307138d7370afdc42
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index 3bd074a1fdbc..22551286d5ff 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-debilneho/Manifest b/games-misc/fortune-mod-debilneho/Manifest
index 78cddfb53db5..b796571a68d9 100644
--- a/games-misc/fortune-mod-debilneho/Manifest
+++ b/games-misc/fortune-mod-debilneho/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-debilneho.tar.bz2 16982 BLAKE2B 1c4a7d8f42809cd4dd3bb8a3417dd8c5004831cf4ad38d0466bbccef5cabbd516146555f27abdc5dfbd2df7b66427a7dd56bd44c81b9fa4e4a1f46978787578d SHA512 88ff97a50f512d4e0f52c93546939d1ef168e86d6e92996e6b3674ce5ef03581d20cdcea497869975c0b77a2a1936b142903c248f7c5cab69fd322f207801696
-EBUILD fortune-mod-debilneho-0.1.ebuild 598 BLAKE2B 592971203caa47b66eb94beecd3b6387136ba5b903347782e15292e24e3e963ae8aebe730cd883abb3cb0038d4f4eeddcf17f0bb109327d4755655b6ba961ec2 SHA512 ca9a9ea6b2574e1104a66c230142b1614517179cf3560ea9cddba8a7d95386a8a8bd9f48ecd11c8e362e3bc27a628a4dd46fa3ccafe154ee5181a0e47e19ff53
+EBUILD fortune-mod-debilneho-0.1.ebuild 592 BLAKE2B 0927c4193b07413c2383b9d99265950ddb22ab6ea3867bbf90033c40ac6f6c2098b1414622dcf9b682f4e7b2586d38b5dd7e89a75137f5d011225c5ac110fc39 SHA512 c98e209f426552a00c615edc160f5e11c49cf295ec546fd14a6514fe9d889beb84393d4e7adc77912a7088feb0e638013a2ca6b8d427994610d93e8d9abaf4f9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
index 840d7fddf6f8..bbfe45902b1d 100644
--- a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
+++ b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://megac.info/fortune-debilneho.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-dubya/Manifest b/games-misc/fortune-mod-dubya/Manifest
index f3971f960e25..eba3db66f9ed 100644
--- a/games-misc/fortune-mod-dubya/Manifest
+++ b/games-misc/fortune-mod-dubya/Manifest
@@ -1,3 +1,3 @@
 DIST Dubya-20050118.tar.gz 27385 BLAKE2B dbad7409be78d4c741e32d49075d37f59439cbd04d0772d54788a9a7085779bb0cba969576806f7d842eac3ef13ea82d851380f831da9349f39b5b3fcada927b SHA512 19609f79bc12cf74aeef51f3e16a689790ad6ab316924d5726c22e2b1cc7f5007bcaee494da7485d2c34b94ebc071cf62aa042b6156f5f957e55a5e85d1ad5b9
-EBUILD fortune-mod-dubya-20050118.ebuild 574 BLAKE2B 3857139d45692ac84963668d21913d9d068547e7f4fac912bb95c6336a0fbb95b264bfa34ab5dd8ec47a57f403785f5fded27da109052d3ec0cea8f898612d94 SHA512 93a142be209d30fc4901ea0ee7dd9cd538cf43e37def48bec8ec48930c51d728985c8b31356b43aa56a911a509f6a367cfff32ac456912dad110a9ae52299a26
+EBUILD fortune-mod-dubya-20050118.ebuild 568 BLAKE2B 4514a45898a8e15da8f488c284588a8aaa6296db5755bed171bb79434c9e760006d2e747c6647dde81670a83d853661a7094414cc262722a4f45ebdc7b7c7777 SHA512 4b2b7e50ba61d74632c9191d5cedfd85de6b7346f082238cfcbe911f6f27af23db1968ceb5277ad2ef1f554de0c9a3a0085bd082bba666c9bf849d2387d7285c
 MISC metadata.xml 491 BLAKE2B 7791b77c9946d4693be96e4bf897b6953b7318860abdd00f89d50f8a9bbc421259f91dec60e2dc3f609d05fc860525b7aaf1db49ef1308c3ab4804d8e4f15938 SHA512 ad3d2f216c33b6a56fad27364da03f4ab552613e79c424c0794dd49c4d950d9a50679798101938a1e3f55dee8dfc5eaff29b96b80660a70ff2eed3ebc8d6b30b
diff --git a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
index 12cf878940fc..983db651291b 100644
--- a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
+++ b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://seiler.us/wiki/images/8/8c/Dubya-${PV}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-dune/Manifest b/games-misc/fortune-mod-dune/Manifest
index 5623d177f7b3..1acc2117cd4c 100644
--- a/games-misc/fortune-mod-dune/Manifest
+++ b/games-misc/fortune-mod-dune/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-dune-quotes.2.0.1.tar.gz 66579 BLAKE2B 144114b48c872b6c71eb9a82ee4b09aeeb651a28e2df5502008ecd6e99a314f3474e54171db75b503856e2183a4eb64cb4c32b9ac6be6df1d4861f422b1770f2 SHA512 fa40ba975f8a3dd53cc5af7803fd18bc849bd7ea996c03031c3800b3dc42b33dfa540ad1826a0dc94c2284ada9ed6c1b411e314b11a94bad427e080af52b23e9
-EBUILD fortune-mod-dune-2.0.1.ebuild 564 BLAKE2B 3153f49547cc9792fb09772763a513de4a360083a0eabe4331c024bb3d9e86f108f43ed7036da6fbee418e71db6ac26f78c94216e7242a3d3c1b7564043dd943 SHA512 2fbebb510b82943be45ea2b1744aa380d6e74511bb1d46cc74e2a333a0acc7bcf654cbfd6db46f968030d4bc00c6bc585f8c083762ecbef6f4a9501971e3924b
+EBUILD fortune-mod-dune-2.0.1.ebuild 558 BLAKE2B 2e8ca49f8d0fd2708548131d469d6a8184c4363ddd74414b3134690025a55535d91a851aac9dd2b2e8136e55108060a48da6c91d981c106551f00f3985e84012 SHA512 fd230b66cbfde289241a28a8b0a19299a66f6f397ef9f7472ab8f1d736a3c5e42297243ab4db8b84bc5302650454aad587a3ed2f688f8d397fa417a9d19da328
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
index 3d7d957c6414..e3b8ba01d4b7 100644
--- a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
+++ b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://dune.s31.pl/${MY_P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-familyguy/Manifest b/games-misc/fortune-mod-familyguy/Manifest
index c3af34f34a39..d13ddf93b696 100644
--- a/games-misc/fortune-mod-familyguy/Manifest
+++ b/games-misc/fortune-mod-familyguy/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-familyguy-0.2.tar.gz 65992 BLAKE2B 88a7f10c855dbaf8054efcd671e2be3e7a7ff126f4d23ecad0dc23489586ae6319c32808502de66f10f1a0514d79b972bddd2c97b592336c342e77190b7ef668 SHA512 81c3be499b5709588e4da6f5d53cb774d8310f8ee9e626b704009357b9d0572f052b94d48b19671a7592f9c3e46def9f1b9e01275a2d896f101ef5d7b294ed68
-EBUILD fortune-mod-familyguy-0.2.ebuild 566 BLAKE2B 462c52e87a43bb4af1b1baadba4032d0ba9dd4d7199ca750a646a1e9360977e8ba2f7b40429bd69f2f78263ba996a9ebb1eb9cdd8378cdae89354bdad4905394 SHA512 472a9630c3080f92d8b647dfedd93f1d91c0f107e69e0d2478c4e934832c4d41ac0851eb3fb06d3b6d9677081bf62ddbd853f9e8c9eae366de37bde6ba103f9d
+EBUILD fortune-mod-familyguy-0.2.ebuild 560 BLAKE2B 98e485e8c1e485d0e116faab8b9913b0f9165545359ed6108eded006c11d2dd15fff85f2a504f505acea545e39c6ef8267dfec8ff9452b390bad2b4f7a2e462b SHA512 dcccac9283fb427b52649a366f84758a59286e212ba713db0cf681afa406cdbab25e1f673e2e91bf1a607a398269c0b2f90169ca67cb8f791965119181b53613
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
index 7fecb0118719..2858534106a1 100644
--- a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
+++ b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://jon.oberheide.org/familyguy/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-firefly/Manifest b/games-misc/fortune-mod-firefly/Manifest
index 4cabafb68456..44bab21e3de1 100644
--- a/games-misc/fortune-mod-firefly/Manifest
+++ b/games-misc/fortune-mod-firefly/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-firefly-2.1.1.tar.bz2 36649 BLAKE2B 1ad5519cd12f24cf00782d2dee7b62e99653752f795cb226d31f4c4dfe5ac1736be324425ef9b1082eeb3b53fe687bf448ad3e8cc99cc8f114d8ba6dd57a13a7 SHA512 17d659a215598915228a494337f2a49878d2f238e2fc709559bc3dfdf58ff15ae5bf35a2051bd3abdf6dc3608bbbba6b5619737e0cb94a0aa8905fd05e4abca0
-EBUILD fortune-mod-firefly-2.1.1.ebuild 591 BLAKE2B 065e2297ddace789761099dc764621094be0b0d2400ac2e1720b068e7b0a434f4cb875ead4a62a22b56a36328d302bebf2d171bda2ada7152e77f5019951df6c SHA512 6dcb9bb65372832996ed335daff7cf6157105ae792d7452336bf3eeca7764f74b73112e940e5e4f32abf5f0f4b02b73936481ecd5807cd0f4cfe3ae7dc6d0c98
+EBUILD fortune-mod-firefly-2.1.1.ebuild 585 BLAKE2B 3afd4ab2e1b9e3350bec61b785ca81769311c528c88ac30fadb85a7cd0e46cc9a4f5eb3d3da0816357d513784bb1ff4d979355488511feb31f30695621892fe1 SHA512 f45ca550650ca25fdbf9b3fbdee187aaea53b3e8b3d58e6843c2d223468dd0b832a9179a1ba5b47d8df6ff88ac64e6458093526d07a9839b3c66bca270b5799a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
index b2bd89e8c2cc..9217013db87a 100644
--- a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
+++ b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.daughtersoftiresias.org/progs/firefly/${P/mod-}.tar.bz2"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-futurama/Manifest b/games-misc/fortune-mod-futurama/Manifest
index b718cdd9a656..d104718685a0 100644
--- a/games-misc/fortune-mod-futurama/Manifest
+++ b/games-misc/fortune-mod-futurama/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-futurama-0.2.tar.gz 19349 BLAKE2B 959c689d8707122067ac731945def933d24ee5da0defe7c810f794ae48a7efbdd9ebe15be2920d188a870207069dfa8fe72eaaca247979ad5ebe23a7f7f8d289 SHA512 a6780f46c361c31d523c8a39a47dd5d752a7cdb86d26f26bcfe89e5ee367c81af00ad4b538be5a40827a3b212214565afe5b438cb965fe87e05d9574c9483a01
-EBUILD fortune-mod-futurama-0.2.ebuild 558 BLAKE2B 69e1c0cb5dae498c46065b8fc99be329d624cd78c4bdd070fc939237a7b2bbf621fe9c2084ca53528e0a8551a5f0df9206c0d0ba7a02d9ec6a45a33c4e2c951f SHA512 6c52ae8916bcb852f0987d9a126368ea02db4b088a06b20d287a1b151c5c0a533ec55123e394f4bc478c88a2d91c5cde1b1c63b1880dacbb67cbe04bb3935973
+EBUILD fortune-mod-futurama-0.2.ebuild 552 BLAKE2B 7b96eb04712132e126ab347621741e6455f3fb01da0c71a5e70feb80fd8cce462d78e52943c75b7304fa2b1cd909e411c2b33494492894e26503536088770177 SHA512 24939a97bbd0e9c7b8b3c0d68a5b0af35b68494d5d9d025e05acca8884303f84c7f107c6dfe931cfeacab12d7bbc35d19ae8b02a24ed31d5bb1ddcce9af5c1de
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
index 85e30d680ded..9f769fff34fa 100644
--- a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
+++ b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-fvl/Manifest b/games-misc/fortune-mod-fvl/Manifest
index c2dfda7e208c..14e0eee51f19 100644
--- a/games-misc/fortune-mod-fvl/Manifest
+++ b/games-misc/fortune-mod-fvl/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-fvl-20030120.tar.gz 66081 BLAKE2B 78e1fb2887464cf7050dad309f47329ed6eaba1bf153c9d7d9758f9050f2dd77421dcf1a0e58279389811a3cd145b1f6bb3479b9501ee32378482f59098a2117 SHA512 43213abb2772f560d65f8e552a9c384f2163650cb2fa29a9203a05a0c3b36dff6645afb181e317d5e9258cf0597607bb185a8c852289a2f3cf015c6e4f946bf3
-EBUILD fortune-mod-fvl-20030120.ebuild 556 BLAKE2B e39eaf5aee720d8fecdbb02d09c421206b20af922bf1672a3f7928bedee17a314fece18e3e176ab76e4e3e2039d9fe35eb9cfa07a6ebd9e256e4f26f7b63f28d SHA512 4d124919cd519c4b3a3821661a615a9f06e8f6d748a64afc29ac5d2c9e0154222c1fe47f1c81de10aa078bbb478122b662a0c6be439ded8afa08b6c2539d5eb4
+EBUILD fortune-mod-fvl-20030120.ebuild 550 BLAKE2B 61365ec911618a167e5325870cd1ac3e90f0f1ae6761e395ce2fde290f5efdc315d4a278313377e99c102a3f6b9dc7eb632e4d714cd42946475c7007a81d6349 SHA512 1289bd6b93295dd40947512a6e7bd382445018e9278a1e01f3c810c43a9b0b7bed10f48f71fb78dd0087eb1f4e5bba68f8f520d3ae1a366da4f17374c2960b55
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index e0226482ae03..4ed5da04f77e 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-dev/Manifest b/games-misc/fortune-mod-gentoo-dev/Manifest
index e3b6fb9f2d78..50ede71efc1e 100644
--- a/games-misc/fortune-mod-gentoo-dev/Manifest
+++ b/games-misc/fortune-mod-gentoo-dev/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-gentoo-dev-20090306.tar.bz2 50355 BLAKE2B 1acc5d799b310ce9b655baa2aa33547ea9b20cd940dcc8c13b40fb2b5e930351bc67c4353ac559234e20211a82daf7a51b3454374ea81991514eeb99a7bbf789 SHA512 2a6014d1dc95cae8a50c8f502f8271a9b7bf349cb49076ac3e76f3da55f0e509caf27ee04827b1b42add1b42ae07824173495bb0dbed5421693508fff9f36acc
-EBUILD fortune-mod-gentoo-dev-20090306.ebuild 734 BLAKE2B c0245cc7bdbae2d6548607974a15cafec97b7e224acba0855108f91dd01ae57a8ff5e85f87e2b274a04841f59aef2af1b6d5a14976a9c1c344a9693258d6490b SHA512 c0bf4e64981d86e1b0e9490d2acceb0c96aea31d9dd17b76fd1962f7df038a96b14f30e9ecebc4af18f3b0afe34aea76df170d2b4e4cee657ebb1472720555be
+EBUILD fortune-mod-gentoo-dev-20090306.ebuild 728 BLAKE2B 1a3279250a6a9a358dbbf420df34ed59185cf5aea3b600a0b6e724ae612ce6dfb740340d8b07d0a38392c91a4155e77dc7c542aa59a808abc167985bd428738a SHA512 14c9ef8e0655aa44ba26b3fb0806b8c0bc065d44dc818124915e034d2c7ffcb1d20f30f388e691d5b86899bbb19111f9e889d7267356a66c7212b6e5f79c55da
 MISC metadata.xml 451 BLAKE2B 87b7029266a22969d56280db14ca629ee2bb89442cb4852984ebdb33a5d60d276cb51059fa7c91585cfd14b70ab6662da68431177cf3aed8dcd2166dfa079072 SHA512 4dc5894c615627a06c494146c3263a66ac6cd1bf577bf7f9d81b2c5988ccf439ca78812146b9840a24e13b1fd9666b1bff994b7c86e73faa1d0b0f321169deef
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
index bd6c0817d271..1c397691c175 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd"
 IUSE="offensive"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-forums/Manifest b/games-misc/fortune-mod-gentoo-forums/Manifest
index e54c53a3f778..8bc39bb4eb02 100644
--- a/games-misc/fortune-mod-gentoo-forums/Manifest
+++ b/games-misc/fortune-mod-gentoo-forums/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-forums-20041207.gz 8809 BLAKE2B 1586eaae8b9af3e5e230daca8a7993c268a03a511fa5a4b93013efbb0538612131c589bcf50a613b8f132499cee4154c8b0a65844ec06f0eecabc025a5036c6c SHA512 55f1da4dd6c37778ebb46de5436a8f69475cd9a25a5bd01a325cbd825cae4bc6ecaeda94d6b38104fb71a4baa56577f12390884aac545c5d891895aa7ee1738a
 DIST gentoo-forums-offensive-20041207.gz 1510 BLAKE2B 827b1b6bf17c31296734972648be202b0b78b146f4c31d4ab8b31c0a56f59008670e958ce77061b385d3c67bceec3bd19acd52be21db06f5fcb75a2454ad7d92 SHA512 244b4e7f5c5feaa217298f79d2f157999c71d89824f25d89d7a234ec72950bef93a4c0fa23ce1fb385c5c6788c62f09d6b17f454e70cba0052870f4267522dbb
-EBUILD fortune-mod-gentoo-forums-20041207.ebuild 836 BLAKE2B 0f940fd70ac821a2a84d80a2d5badd75fb38c1bb00a3b5532e879a00077f0bd04af6fee156e2dc3c13c7a4b0a760af58a716f81957ad98b51f2c00e2a4a05e4f SHA512 c466d2f9bb8f545c014b6f69f23bbbe3a3f8c3513b6619c66c2c1ab0bd36ae3f686d4841f2286ece2a349b8902be6bb90f9d7c08326be57b7b68d2c60c60f704
+EBUILD fortune-mod-gentoo-forums-20041207.ebuild 830 BLAKE2B 26e984ebf526d67e18256718ea15962ff31d7d2488e72574634497f954a62c95fce80e238afed35d09d33e0a65bc3e7ec62cd6844c91ca0e4bc59ff3f24f39aa SHA512 7ffac81c1cc3a99c24c971c98f01a4b7ba6f9011f7237e4fa6970a7cfa7f22e60b402506dd18d8da0cd3219b17c5fb52b2fdc8a42e83287332fb64a65a95e9fa
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
index 520e000380dc..cfd4ddc76fae 100644
--- a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
+++ b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/gentoo-forums-${PV}.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-hitchhiker/Manifest b/games-misc/fortune-mod-hitchhiker/Manifest
index 30fda1f6d36b..c98d6110cd26 100644
--- a/games-misc/fortune-mod-hitchhiker/Manifest
+++ b/games-misc/fortune-mod-hitchhiker/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-hitchhiker.tgz 11560 BLAKE2B 95561be94c39b0f83ec2a4864c34c8dac743a94288318a2ad1147e4ec78dc2eff1d1521386a489238be71d7ab6ac40b3883d168c11290915d79e20ae3dad4c28 SHA512 a4f4a99c33764e6d4ec823a57f9d2d40168ddf3cb9506e85fb0f6f10b11673abd76d02e9af8a95926ba758a28fbbe895a427b40c36bd31bc43252c4e6dd610b0
-EBUILD fortune-mod-hitchhiker-0.1.ebuild 657 BLAKE2B 73a170ab442050248517bd788b934285a32c9a195165ef32d0caced198afb098ded41de5977aa1fc868a13105255cf4d4e603d99536ff26bbd9598ef8b6f9813 SHA512 c16bf6e9ccf416b6578c1be88f4f4b1f4e4577d5e883829b65ba04459442a2c83a17367008174ece2c8409b221b74374724a94ce6268afb3def66c9baceb433a
+EBUILD fortune-mod-hitchhiker-0.1.ebuild 651 BLAKE2B 2c15ab469192dd2c43d8288682dcfe033f158a13eb2c7f8e4e53ca2a41dc1b87f843a55392154705c405b2b7892d8f8c83510a4fb68d683b937bbae4e2dd1d60 SHA512 2cbe599a984c067285e987c802daaa6c9dd275cf9306bbeb20f7bfc072ff9069b60ddee6f80dd3e52d9424c41d394fc24126013b0eb21cb4b7c514a13daed3d9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
index f4d00afaa2f4..9e62bca968de 100644
--- a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
+++ b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-homer/Manifest b/games-misc/fortune-mod-homer/Manifest
index 4ca7de3df323..2e932b0a5416 100644
--- a/games-misc/fortune-mod-homer/Manifest
+++ b/games-misc/fortune-mod-homer/Manifest
@@ -1,3 +1,3 @@
 DIST homer-quotes.tar.gz 23142 BLAKE2B e5f9c14bf9eeb3bc88609fa72a71b5dd656c90074ba0e2fd8f3bbbe43068263d725f3bad2e5f4d5a92c3e6dbe17e97e65a0000a6b6a41fb18d532cfe2ea602b1 SHA512 babe8ce488f08bfba77dbed8e6ef28afb50952b48540c62c3b9211ff7504e3d0da0ea05a116f096aed3dbbd732afaf1ad60bb88772305dc43ecb0c2f721a7e33
-EBUILD fortune-mod-homer-0.1.ebuild 601 BLAKE2B 1b8c08e381553ed0c1c6bd4a5c8b0ea3a6cae96c3f916fdc06597276c292b52847a3a9d06f5115255a900716b64ae638cf9f3d59d3939021a88a6668a850deec SHA512 1df5b84c8e610ee9d1e505e0b3f811ac9526138d83d738dcef6b09fd040cfafbc429d2ce927702808ee8e7745f17f16c2d0bb2ee6fbbd963a30ee31c70019b68
+EBUILD fortune-mod-homer-0.1.ebuild 595 BLAKE2B 3243349b4c5dfeb72c45ce5cc78be9dc06cf4fc85acc7c81f1e970dbf6fbb6c7eb717e2a6a0897118eb5167d3ad4236992010f86d2089e0c442a33d938c29151 SHA512 51d8b096fe3827737a4d0e1f24e83e51a29b8dacae477edef8a980d5c1196f7420132cb7c2ea296519ca2ea5413680a8b290b2695636d9baf8cdaa57314ee303
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
index 796c033304f4..6b9916fa8381 100644
--- a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
+++ b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.cs.indiana.edu/~crcarter/homer/homer-quotes.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-humorixfortunes/Manifest b/games-misc/fortune-mod-humorixfortunes/Manifest
index 6d156c76f99d..ed278626afe0 100644
--- a/games-misc/fortune-mod-humorixfortunes/Manifest
+++ b/games-misc/fortune-mod-humorixfortunes/Manifest
@@ -1,3 +1,3 @@
 DIST humorixfortunes-1.4.tar.gz 97053 BLAKE2B a86746f5a810c1db6b310227f1855b88d6b8f6359b01973933ace6cc8d4af03a4c4349638ce399f7327800812f2e83464fe2652c7790dd33c3163be0646ab252 SHA512 beac030bb3d7bbfa9286c41cd7a40fce2166fcb058443af0be7ab3f8897220ed4ed1e259fd642554f4b38554351e1bfc2e5eb660a4612cdc23269dbf40163c7c
-EBUILD fortune-mod-humorixfortunes-1.4-r1.ebuild 682 BLAKE2B f3340d0f21b9edca8452a5bb7ace9890b92c4b7cc002bf7d5f8e2ae4c4f8875f31da6671c37e45854e8689a078286dad2c0740c1a99a599a999f01907137e4e4 SHA512 1aa85d5f0c41e6e987c8247c50e36f0dee7db7f12267aab56fd03b884452af2bc363fe991ec1a64bc069ccdd8681a3168614c5e2f63fbb4b2fd96d22a3486f3b
+EBUILD fortune-mod-humorixfortunes-1.4-r1.ebuild 676 BLAKE2B b0f3cf5c716f2e443c4579e814970d27015cfbadc43030f9b9ae18becc7f0668a7e4d33de21b587138a427aaf21c885b27a5888b694bcd6f30e9f3999fafc835 SHA512 60f3687dbfabd252176b1e2cde1c8c3c8fa969cbe571df1166cf23cfe92bb54be27e398a607772e5ebe5fdedbe7beab32ae927e0461224bd241d37ff07a3e715
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
index a08ef0fdf47a..c932c77b6ad3 100644
--- a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
+++ b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://humorix.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="freedist fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-it/Manifest b/games-misc/fortune-mod-it/Manifest
index 9f4381856720..63c84685bf6a 100644
--- a/games-misc/fortune-mod-it/Manifest
+++ b/games-misc/fortune-mod-it/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-it-1.99.tar.gz 739886 BLAKE2B 8f4624f079682defbb34d04de4e3de8140ddeb9765936798f9480ac0a65efcaa67580c9cf201cf811008d97dbf40eb29a2454840e6014f6c0c07758eaded10c3 SHA512 b4b119f5def51a31ee25c5df3e47a0b9aa45341ecb1f7048233aa1d5c1d4fc8127b9eaa29c028a9df5ad71d9868d4006e7d3a1bef776b34d337a5bca47bd5d53
-EBUILD fortune-mod-it-1.99.ebuild 783 BLAKE2B 536cd6a1c27a79a6e63f76f7d21c8cb03581c408dd295aa4c5b31a95f74971cdee8ed35555af2548dd0c82ea495f685f1bb307382bdb017b943be7e017d3a66c SHA512 56a4191cb37a95d2b7ec60ccc3af2645c1dbf72dbd5d55b0a4646fb24d62a15fc7c60622c4479240e0b802d4fd18b5fa6114f1e48a72c2c7510f4cd0ff37dcbf
+EBUILD fortune-mod-it-1.99.ebuild 777 BLAKE2B c93e09b01c03aacc3c4b63d6f6430384fbfacd5d9c75ad823fed9618757d8daed574e86ac2b8010c5adb971ac0aca029c96872e527ef35d738c40dbff54345dd SHA512 e6d6f2633a52d69585f774b1f9fe55f75bc13c634465a7caf7cb5dacb2473869669b6537e089120ae7b19427ba5811b85178d051ac806c688efb5d3743330f52
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index 74fdee6a079a..95763946d603 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.fortune-it.net/download/fortune-it-${PVR}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-kernelcookies/Manifest b/games-misc/fortune-mod-kernelcookies/Manifest
index 0ab1c1010fdd..9de041b95304 100644
--- a/games-misc/fortune-mod-kernelcookies/Manifest
+++ b/games-misc/fortune-mod-kernelcookies/Manifest
@@ -1,4 +1,4 @@
 AUX 9-offensive.patch 4789 BLAKE2B 2778f35d39fd213e215ec679ecabdd145168c35c3a41df0d02a0600f3b2d8e551020cf7ce88f7e4bbe266858593f65642a670935b44b2716acdc2af60e338c74 SHA512 6bf0ae401b55b6e83523ad0b930ff06627499c9b45ba98687843b7d96ffea24dfe92799a581f37ed7d33efb951ab07157467f6034ad8aab9ee86df865005846c
 DIST kernelcookies-9.tar.gz 8966 BLAKE2B c6d503d0c01fe86ac2b59240ba2a1639210b7aef6fb167d8467c4fcad0283880ff00c59e34e811c7bbde3b0bf7e7bb89536e8c3d439b514fb180db2d326847cc SHA512 3d2601ad787928ef852af7d5833c5d32a7c7e364913d451e889eb883d4da450a989c0ff450aef4c07e3700ef3a87f535948d07789c7d2819305a6f36cded7aa3
-EBUILD fortune-mod-kernelcookies-9.ebuild 841 BLAKE2B efaf45273867cf8e9abc97b8d571710b7e3330083cc5a5753bf5e3a33f2b9dbe25d91bfa84a92fe9ba7e3994c40276d53a9651b63ef4c609741c0096404edac4 SHA512 171a425261d869b2b4d40e38299ce9bad0e3876c24670732affe98b8ce6729166ff6ac7ac27d89086074d647c73df6554112cb5c600c07897b45e2743366e153
+EBUILD fortune-mod-kernelcookies-9.ebuild 835 BLAKE2B b61aca9606d51b0ba3e404baaf6a43335bc3af60f6a4af7af10ddee3ec9e7109346efc84b8ced6b2227653dea59715c62647e2e9e1b1a93ef722470881be9232 SHA512 72507ade9ba1f2cf759db258e7cef60e4f0c9dc1d8cb8a496e9946fcb0a1e37ffae9b85d6a64b381bcf78d89938816b06cf09c90c74886c7da11eb28a577bdb6
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index 9b2012861b22..e9cec80bddb3 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-mormon/Manifest b/games-misc/fortune-mod-mormon/Manifest
index 5c621fd4bd33..1654be4d9ca3 100644
--- a/games-misc/fortune-mod-mormon/Manifest
+++ b/games-misc/fortune-mod-mormon/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-mormon-1.1.0.tar.bz2 4750745 BLAKE2B 82fb85e6b78368e2c4541a8af5de7e5e1b4f01b222095fa662395b7f4bf0e3fa041cf3039ba265b572c4242a4531f5902805a8d3aa329170efb043a94df4d602 SHA512 4684e63b1eb2b1fdb2fbe7241f971c9401777a8364333394db0929aca2ee57456ba30bd601df8d2a8077ad41c1aa71737e20806b79e8541d5dd942092be02d4f
-EBUILD fortune-mod-mormon-1.1.0.ebuild 760 BLAKE2B 42f2fb7456c3151cfe050521638e1cedcea73328f8d5e4384214c1549fcae7bd93f9d2a2d87cffbc24b0d414ed4b8610bc85e42ca5ae7826e835ece85abf70e2 SHA512 b243af9a242b6846b407d0e7109faad19448bea47a34783f4b6da394085a511e5ed3f5118f525ffc05ed8a3a08d3dbbddbb60cb283f8ea1509d19e6d5512d204
+EBUILD fortune-mod-mormon-1.1.0.ebuild 754 BLAKE2B 1d7630bb4113c91cd15f5668f5759a7fb1b249c4e6887dbf5ac88a5471ff916635db3fdca615f09c1c1fa0737d0d1f6054c229289925d245a9e0079106d083cb SHA512 9751b3db19013fee78a13ff0fb7096f415fff18707a59d5ed3dfde7b2baf37b4327e70f8972fe1acdd838818c0da52075649a2dc9f92ac007dd3b45a80e25a07
 MISC metadata.xml 434 BLAKE2B 0585865a2419c0913cfac7f40e0f233e289b436f3dd2943c477547dd66f7f777a5302abc144aef28935cd6f9b6c6e3c6209f3d124cbedf1830a11fbed20611b7 SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 12e97acd49c5..8a2fab382f69 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/games-misc/fortune-mod-norbert-tretkowski/Manifest b/games-misc/fortune-mod-norbert-tretkowski/Manifest
index 648b3ad3f33d..95c0edea81bd 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/Manifest
+++ b/games-misc/fortune-mod-norbert-tretkowski/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-norbert.tretkowski-20030120.tar.gz 11501 BLAKE2B 4d5662d1dff0795dace05e1ae2780e6c4b76233eef69febf3770b0fb91cbdd307d5a38930e7ab1711db2d4059b26f6029966bf63e828de3c4496396889bf157d SHA512 df4b846581d6dea55226d6e58235a288def209536f43766fa8b56a07e3a5affbb68e8138e2e01711878480550df322ed6999ef35a41330a58a2f516abc5db13e
-EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 647 BLAKE2B 3c2896b0bbdc8d4a6e10a3f7b05c25375d56c77568d1b4c3c41ffb9e81cdc82b84de8fe6c37ef22a588352e6693da70e14a2876dfbf9fa1c8594d389d6a77fbf SHA512 5a1cd2a929126608634a198a56ac844d6b8036dfddf0207ad6086a5a1dd97314854adf376384d908c75c8433414cda3ad2467511e285300fb50e26dcf7b3bfc3
+EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 641 BLAKE2B 7139a4cd6fd6a59e39ea31f525da41b580dc9829fe9fa36e11facae1d503e2c709a48dde12349bc6e152f344d137b0bfd37fb19ab0c3f19c95cb4619dcdb1e53 SHA512 9b2abb896f6b5d98847d65d3a8adf1daf858224ee68e585f41d4da7d6a68b9f61fd27919df9f3ea98a7db6071fd13e621cc0c3a0024c6bf452766932d2393bb7
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index c6d784c5450f..3f43008d86e3 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-osfortune/Manifest b/games-misc/fortune-mod-osfortune/Manifest
index bc50b0eddb3e..33f5867410fc 100644
--- a/games-misc/fortune-mod-osfortune/Manifest
+++ b/games-misc/fortune-mod-osfortune/Manifest
@@ -1,4 +1,4 @@
 AUX spelling.patch 6416 BLAKE2B 2cfd9616407a3d66b8fd2529ef93db60e27701f31609f8954a1c6e45af4188b577570f75b4fbaecf0be2eb2c2ed60f45d7be4ca06f6697dbb43f0f02b780cab0 SHA512 657c015bf53105a12981308ecae9fadd9e76892d1f1010e84c48b391b2d37e180d60a0e959f5ce30969ba98fa3733e63fad5a6079950dc93fc48a45c24dede6b
 DIST osfortune.tar.gz 3097 BLAKE2B 2c6dff9c81762b36f37df682d9f13f1b4c49ec52128f2bce206895ece64af4a2bb31f8e548cca928f674541eebc23cb4f76a7d5db9150740d4a480c91318179e SHA512 e78f40bbbbe94bc70984f01bc4be9c44a15716d60a526797606a6f38fab3533a0cf428a473e479479a7db2c391e44515294519b24cdd3bda33d82c9081919d3e
-EBUILD fortune-mod-osfortune-1.ebuild 696 BLAKE2B 797dee9fb785f324d795247df649218070acd5235458f62568f33838e2d45b83dcc58ec65db86180eb740fbeb1411a56ee6da36f4771f0fc7dd24bd86001096d SHA512 c8da3ebcac5f4e90d912dbe218f9b3f99ff360253aa6ae3f4f9fedca9840bf6af1b64136a975c4802402504bd1fbdc6169dbf22e884ec200764f18e6d40bd390
+EBUILD fortune-mod-osfortune-1.ebuild 690 BLAKE2B de301e4038ee7490bd6f28b766235544de9cc7fa18849101d885fc354c460527d22ed121404734a6b32a35a623fb880bc55f7aa25fe911bb92a1eb1df833067e SHA512 94685e1cb3eb59011d38b44edcd675bfd9df9f3a05c740334285125d0168e522ea6c39e523391aeb7e328a72426b031005f04ae78801f5d9895da5c65b905306
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 8581471bc8af..6ef069638d11 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.dibona.com/opensources/osfortune.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-powerpuff/Manifest b/games-misc/fortune-mod-powerpuff/Manifest
index e834528d57dd..1dc8ff8b11dd 100644
--- a/games-misc/fortune-mod-powerpuff/Manifest
+++ b/games-misc/fortune-mod-powerpuff/Manifest
@@ -1,3 +1,3 @@
 DIST powerpuff-0.3.tar.gz 17155 BLAKE2B 59a08ab1b3ee4089683ef4a4bdb0ceaee7213d58bfda59ef493d8f27ade3fae8c73f36c05ebc539ab4ec81821734739e7b7c5707a1f3744c0514c46aaab50378 SHA512 89cf14ce07217bcff57fe5eff5b13b6df53b76ff866887032730610ac23184b4bc7d9f00572f31581347ed3827f3906b5dd885324d0e8066a5e0c8a098e53ebd
-EBUILD fortune-mod-powerpuff-0.3.ebuild 661 BLAKE2B 312e2633cf032874d0d22c0016f6ab69f0108d449e879b1050aae19c4e731fe37d4871b3a64eff810915268f3c1e4e786b2480632eb9e3fc7471b91c9c76b946 SHA512 ffdc91ac9e7863c972b3051cc7daee39982a2e4b385e5e60e964b91be71cbcc584114aed41c9a8a261b42683bbf3064e1de8a58aeec8d0d003f40755efe82574
+EBUILD fortune-mod-powerpuff-0.3.ebuild 655 BLAKE2B 3abe1a097cb1a89743b200a3f63a75c925e3026e21ea8a73fbc221cc1fba75a52be3950e558b4d5b420cc2c96fb618c258836e8c4f84da35fb1c8ce68ec26c22 SHA512 776f1f657a391b013c8af463f05ce945c6aba99681bf614f096e2fb8c1d222248fe71d98f4361032cd8a795406f89002966e474cd61be613e89f40a449248822
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
index 83680b342344..660b0d965250 100644
--- a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
+++ b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-pqf/Manifest b/games-misc/fortune-mod-pqf/Manifest
index 51ecf2f12c22..412797bca340 100644
--- a/games-misc/fortune-mod-pqf/Manifest
+++ b/games-misc/fortune-mod-pqf/Manifest
@@ -1,3 +1,3 @@
 DIST pqf-6.0 146363 BLAKE2B 61122f9710f010eb709064bba259d009dd5ee8f8e182827dbd08b93f0c284d0ca6d77c295df9380ae8046830eb014e502ff6fc8c6cb5bb22009ef0e749cd3839 SHA512 c38be09c945c20454cd0ca4d1a4dce18b40bae1ed2c71d093c7d9e4fb2de444425d50a35c7dad5535ed38b5ea52c6c9e8f6035221c08e0485145fc169cb9186e
-EBUILD fortune-mod-pqf-6.0.ebuild 764 BLAKE2B 10f90df2b8a04984819cd5e3623307a6ab75b9208d119dedafe04637d3ce23d046fc380ca8d92f0e87056bf8efed0eb8fb8370da93e2aba9b75f7c0e7098700b SHA512 e39f6520b7766fcf335761f24d04f49a121f35ab6db17927b4b6cfdf584192e7b26351dc34fa0ea482587e243899bf6fc572f8cb2891e5051906aa418ebac4dd
+EBUILD fortune-mod-pqf-6.0.ebuild 758 BLAKE2B 877e52f91058c8d575a8d2bf7efd6383646be21e340a4b4d628390f319099fb3d0be55dd7a9ae17eefb645247b13cd6c2f9e1949e40218d88e4acc00a34aa103 SHA512 e6b50df7f6a32a93d15590a106cd7e5d84fe579c17944afc09f8fa304ebeaacb39ac27bcdba13a3e2f140fa5fe9cb54a186c02c711a912a113b06442b6d0ca40
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
index 6784e068849c..d3568a453902 100644
--- a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
+++ b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.ie.lspace.org/ftp-lspace/words/pqf/pqf-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-rss/Manifest b/games-misc/fortune-mod-rss/Manifest
index 4910cfdcf0d4..583637985df4 100644
--- a/games-misc/fortune-mod-rss/Manifest
+++ b/games-misc/fortune-mod-rss/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-rss-20030120.tar.gz 27294 BLAKE2B 2738ed6a001e2a66b12e72789cff8ad1de114d93567ec5af03cbe4d5eb1fca74236c2c64b1eff35c02188844ffd965b8704e69035d9500e3f8276840ed04027f SHA512 65e3c6afe338bab19fece7111d37eb32270a374b0e62babecb4954bb7209054a6f18886ae67f502f29d148d2ce5a60d3ef401233d91caf765a0ade0d3f5478b4
-EBUILD fortune-mod-rss-20030120.ebuild 561 BLAKE2B 60808d0d3fb58687c647c5ebcf583a14ac12824d3c9a32bde101b7c133aff37d4e43df3e6a7d15ce6ea7e5b09b870f4d2bee1b1991bc06a0f945e91835b1c783 SHA512 088eb9d9662183efe15de42160f5d387481f50d585acbd948b26b881ad48232e68fa872f95d2cf0fe052c6c4013a47371748ca2329ab9c552b40b2d4590f2605
+EBUILD fortune-mod-rss-20030120.ebuild 555 BLAKE2B 751bc077ac1add16685f6fd34f37238a520a2a4c9d035e41399f80b29bd4050f29b35c626dbf651027a936271db80df23356166d07e54ff5003563b077377b47 SHA512 3764534c27bab90c9dc27b3b9a4cb7b3787eb14d7368a56f8719a649e79a38f566fd33adc786a20167edc9b6b87c655459aaa6a0c492424d1bb1392aa8d41216
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index 0385a3bb3d0d..b2aa7b444077 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-scriptures/Manifest b/games-misc/fortune-mod-scriptures/Manifest
index c599d5bd9166..05ff7f8fd5d8 100644
--- a/games-misc/fortune-mod-scriptures/Manifest
+++ b/games-misc/fortune-mod-scriptures/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-scriptures-1.1.0.tar.bz2 2621853 BLAKE2B ac1ff1f4e5fea8e46d065a421c11303bc640fc01d4712c26b47655360a1e816fb451ee8447b6875f384afcafb76ff0ab0978769a7cda205ab66c58a67439d504 SHA512 dc9c98c3f7924c9a1775955a8d1f972035cea27a7505bf51aac9c1ffa323e1447287ec50472f3caca16f31f1a2d2cdc1a17b5b311eb8e5a9746124b19a1d4c67
-EBUILD fortune-mod-scriptures-1.1.0.ebuild 568 BLAKE2B e8045705da107941f61054706aebf232c78ba5848068bd77e1eaa88b3d54ef8a36205eff3cefe6a1a756b46d612bb9a4c8d001eb65b451ab88ec73279c67552a SHA512 cbd7e35302acb9924c880445968cc72f9cac0a9f483cd8eb885bb423c4e2cea9383f2d14244d52415c96b8c07bc04671478ddbd457084f672e22fe0a615666e3
+EBUILD fortune-mod-scriptures-1.1.0.ebuild 562 BLAKE2B 362354a365acbc21fc8fb8aeaa185e978bf3e6b9d90aba16016683af8ba545ac22e2fcbd640888bbacdca00e93a0520d77b9cb670b99af3115fbb4d326336150 SHA512 ce62e522be4d970684276ccabb572d0e5e6f9e80392bda60627093f6b2d0fb8c3e048643eac3afb79199bf25019fc89af6d7b983a79bb04fec733b2d523af9c1
 MISC metadata.xml 434 BLAKE2B 0585865a2419c0913cfac7f40e0f233e289b436f3dd2943c477547dd66f7f777a5302abc144aef28935cd6f9b6c6e3c6209f3d124cbedf1830a11fbed20611b7 SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index 91b61e840cd7..20eeab8c9175 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/Manifest b/games-misc/fortune-mod-simpsons-chalkboard/Manifest
index 12b7f77da036..40072b211602 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/Manifest
+++ b/games-misc/fortune-mod-simpsons-chalkboard/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-simpsons-chalkboard.tgz 5803 BLAKE2B d2b659439b650f7d697ce3d1c9ba230bd0f3ccd2e66193fa09c92fd3d914cee71adae0e850771ddbfff1f99dc4eeeb4db7a6328c47bb9337d35f26e8c919e2d1 SHA512 0ce3e8fea577f018d933c64aa3aaeac859ebbb9d0faba28f6c1f5f330781109ad43f4e317281d75b95f87cdb6476e6393219eff5f7ee5201219ff7e007452255
-EBUILD fortune-mod-simpsons-chalkboard-0.1.ebuild 699 BLAKE2B 4d953f034459bdd6ef09119b43bc53e8170ff9069a69e59ac647fc376d091a230f69da826d6ca5f37c7a8f041b6a36aaf0deccb84f4162f85e231ee11a6d4fd8 SHA512 6b81406bd314fb9578431a7fbbb08db6da86680866099af49f5b0aac5d10d7fa5bcce4190fb8a08f3a6e3d078ee431b81799485c70fe62aa73fb51f8f22d3b55
+EBUILD fortune-mod-simpsons-chalkboard-0.1.ebuild 693 BLAKE2B c73d6dfa1bd6a62f7b02ec43f96351f94b04a01cada50583a86f8d2bc27bb3674dc4d339271cd7cf792dbf6d621261c216dc6dbc25b0bc1d740548a0c4c84baa SHA512 cdec84438dca5ce1b80d3c98b41fea76156094ba2b824b504e17a344862d58ca5324a5c3e4b186903b7fd6ea20e90d5eee23d90ecb7c79d6524307b51755e0f4
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
index 4caa36ce0144..42cfbdd5f420 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
+++ b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-slackware/Manifest b/games-misc/fortune-mod-slackware/Manifest
index 304b05b3a8bc..1db71e9a2880 100644
--- a/games-misc/fortune-mod-slackware/Manifest
+++ b/games-misc/fortune-mod-slackware/Manifest
@@ -1,3 +1,3 @@
 DIST slack-fortunes-all-1.15.tgz 122880 BLAKE2B 9c77d81f117f72ce9bc7b87db1f59e071274f6e4d9fe62e5e2053faedc347e8d4def852b34d59e5e8a6de68ab2e3a66ed6b70bae64f31224c116eb0e236df8e0 SHA512 18c756b2d81d1e2f0f031c3f799c872b5e73ccd70b6df976644fcd657bd181d794b1a977a49554fe806aa595046c10f33ebea1dc70fccf5e58b8df15f3db7c3e
-EBUILD fortune-mod-slackware-1.15.ebuild 1130 BLAKE2B 4b514b446a29b2cf19e4cf5b8f77b0db9a00545a3e956f6784326261d7669cac1de23c8cc35750c0d9257bd717a56bbb1f27c8fb03f93c8b4296bd88cf0a568e SHA512 b48f967636667420cc6330499af3531996f59372dabafb40df9e3fcbc01c75ca567cd5b83dd52bbaa0d402fab466b585daf56d64c0e95d614039774c795633a6
+EBUILD fortune-mod-slackware-1.15.ebuild 1124 BLAKE2B b58c3732a811d76e495ce2f833f284f0f806e560565d36c5d9db93d4143967771c6489f839bf768e41c5e47632a81797de579ed5b4f85b6c17ca88b735bbe858 SHA512 fd1739da46f81b41581ff6a675e4a7c37d8abfe0e6e7ae5893608811dbc5129ca36666db5e081c26f5cd866d87963457a6987fe3183e97d0968fc593611844ef
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
index 0d4bbd6e9174..f2a828784457 100644
--- a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
+++ b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://fauxascii.com/linux/data/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-smac/Manifest b/games-misc/fortune-mod-smac/Manifest
index 419d28a2b2df..0d5ffab3299d 100644
--- a/games-misc/fortune-mod-smac/Manifest
+++ b/games-misc/fortune-mod-smac/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-smac-0.1.tar.gz 22205 BLAKE2B 383cd7bd752295ab26f8b49d9ac8e35b3bb4b317cdf9b36493adf867de66bf33e5b4c4727af53f8bc4997b445668430154390bb912c42329a5b6fa68e43a392a SHA512 cd837bc96e02f46b310ca264439e6e3753975e0613f05b41faf95fc2d9067f42b62a5af448586befd22e0b1c5e30754a4ae4bd34569c9bda434311ce82ac6697
-EBUILD fortune-mod-smac-0.1.ebuild 567 BLAKE2B b786ebf22f5c1d40fb94242f9ec51b82a7299510ab206840b460bff538f47be58ced94121319ac098612b667d72d43e858436de2003bb0b85aab15304136944f SHA512 f9155e7ea4c571073af1be785fc33554469f3392eec1550a007212f356b23c6da84096c65a51841b4ae4fc5a7a2ef981008e8c0d5f06eed6021a1c1bffc0612a
+EBUILD fortune-mod-smac-0.1.ebuild 561 BLAKE2B a7f52310aee9f060d9454c1e893efb3a5953c188bacb429fbdc067fce4a2e98c1aa5fccaa5a7e43f9339d777c7977140352aac197fa0cefdba8395efb1cffac9 SHA512 480b142da3eabd033a41bcfb83997497b99241def4ed3e3c1d43fda4d3a6d94e0df751bd78069f84a158f6a287a1cfd93357873634e2e834e63034f81bcb688e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
index daaaae3a3b7f..e2657c096cd0 100644
--- a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
+++ b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://progsoc.org/~curious/files/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-sp-fortunes/Manifest b/games-misc/fortune-mod-sp-fortunes/Manifest
index 7f035545fa7b..24caece1e454 100644
--- a/games-misc/fortune-mod-sp-fortunes/Manifest
+++ b/games-misc/fortune-mod-sp-fortunes/Manifest
@@ -1,3 +1,3 @@
 DIST SP-0.2.tar.gz 11093 BLAKE2B d54196a7e567a8fd7c5476e4c55f77cab46325e4ec524103267677337cfdf94357d75cd9094227f445d2c971b506add8c9eabe5781b73a79c366cef02bb773c0 SHA512 846c469cc46e05a8314c92b609af3d049fe7e90c7b6c5aeb0c43c1ee12b8c8a3eab22be4aca3c79f64de53cff3d75152feb268f0e6ea80eaf8028f51827bd1d7
-EBUILD fortune-mod-sp-fortunes-0.2.ebuild 646 BLAKE2B c28342512ac8518f338692ab670d02833fd6300e09b3deec47d86046dd64028c3c681f5273d0b106a9ed6d6d7b9c1c77c0c38bed88dd37b003084aa06e133976 SHA512 27d75d0d1439e2bbfac2097c4189b23d8e0c59579b55bed6ea66bff85f6d5c84cf6167e14dd4c8c3a4bdd4a71f97b4cd2a0e37daa4147a582736c28fc7670e50
+EBUILD fortune-mod-sp-fortunes-0.2.ebuild 640 BLAKE2B 64bfb7d4f6b5d03f01787fc015a1f4153a7ce0778d64c4d0fb8ef843eb7a895b661ad2c9c981093275745e6ff2cf7f5711d524bd6df0cac02b220500366f40b5 SHA512 2ec4522b9a4c1b1ad59890ac71856bba463498505727f8731ee1cba15b964472c96d314cca9f35c0c6822fde9c139d6fa3e9e9f79b6a51cca7218c1d97c619c0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
index cfd0effe2e22..ad1dcf39ef76 100644
--- a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
+++ b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-starwars/Manifest b/games-misc/fortune-mod-starwars/Manifest
index 8d556d9e58da..a76244cb13eb 100644
--- a/games-misc/fortune-mod-starwars/Manifest
+++ b/games-misc/fortune-mod-starwars/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-starwars.tgz 5547 BLAKE2B 3f1800239bef03fc0adba4bbfc8d1f3a82f39c7240114b2aab40e3d411b30fa05d0fc3dffb1779be0e0b045303ebe47f78e545b96a6bb66201baa105c1593c0a SHA512 7c829f367b71a56f442045e63ece9b5bf774447de2535e41d6d43ace4c88a0c6e907546bcdef388110998d069b77c24bde39a97a86c89a2693bb089e65b89627
-EBUILD fortune-mod-starwars-0.1.ebuild 683 BLAKE2B 117a5b05412ecca178bd828e4fbf012bcb093ce00827977de396b48b70181bc3b30a2a04a0a34d47816ff6dc7a4beb7c1a8f5038d59ee48ddede9f8d83a96fb9 SHA512 716a802624bede8afa636c1b5015b93a807e47419651aab4acf58b026b5d3e3ca5e85a6d0d818aff5f845bab2dc50c74cec3268220fcd74ce6ca9c3ca3ad0ea3
+EBUILD fortune-mod-starwars-0.1.ebuild 677 BLAKE2B d3231564ab88a699c0344abd049aac80924c377c34174f624dd5a98c20be02309fa827e59458d06bc3c18839f68762d4c80c133c6355e08715ee72094f9f73d5 SHA512 4b9bebd04c547409e2459326e6edf7cbefd30046eca2a59303b52027c3eac5a650a6e487c8cd75896ec8cee492553a3bebf2ca660874835100a85ffec15270af
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
index c0718dca798a..cab8715aad85 100644
--- a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
+++ b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-strangelove/Manifest b/games-misc/fortune-mod-strangelove/Manifest
index 212ee2bf1c7a..aa9849454412 100644
--- a/games-misc/fortune-mod-strangelove/Manifest
+++ b/games-misc/fortune-mod-strangelove/Manifest
@@ -1,3 +1,3 @@
 DIST Strangelove_20041203.tar.gz 2103 BLAKE2B 3abc932f46e684a15f53648e8217ccc8f93fc32c9a7af8eaba73609b3189011068334dbf8d76ff8657677b8e1ab2e0f3784c7b24129e391d7db5af0c6e1a70a2 SHA512 c2e561a7556b50c6a281e3dbeb442034e61342ff1ec9d9d3ff9428b86b67d58ed378f9dd9cf7401bac70e5015a2eb2ae06e681fed323f502f6eba7ff648a5d08
-EBUILD fortune-mod-strangelove-20041203.ebuild 613 BLAKE2B 79242e732578803ad04bdb6aeffb42506aa7c11da09b7152ae678775c9521259c65b1e35652b1a164ab442814ad51624954e5c09003724286ca8c182d1c51067 SHA512 39e5ae6e659447177d0d8c497b3ca52b770e26e9802785419b6e8ad7f2605625d3cf80ec3822122c646986306fbdb2308829107263a794792a1c70e2fff5d38e
+EBUILD fortune-mod-strangelove-20041203.ebuild 607 BLAKE2B 5d19a0ce6b69af0774a949e42e60b042e1422d0f79ff38988d8dc7852e5c994de311043689f9e3c077e801b4dbab7bad75df346f84bdf4d2ff36753069358560 SHA512 0c53e02ce7f545a8eb1f6328e80babfc1c4f8d5ed6e20ef0cbd57a4e5e9a90d49bef320d2d474811d2b282a0015f63ce5235e7ac95f4f5d1e459504aba5867e7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
index 303bf3cc50b5..9050ba26c486 100644
--- a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
+++ b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://seiler.us/wiki/images/4/48/Strangelove_${PV}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-tao/Manifest b/games-misc/fortune-mod-tao/Manifest
index d64e12d4099e..16b5eaa2ec15 100644
--- a/games-misc/fortune-mod-tao/Manifest
+++ b/games-misc/fortune-mod-tao/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-tao.tar.gz 15381 BLAKE2B f1ee9c670ad2b849717a2a2c5158dfaf59b94ba7d9d501152b90aef7d63923d2fcaa2c6264d9d4ec8d11cad0d6116042bcb9c60fd4696d97a833a9b5b4a8443b SHA512 ec8d8b679962e9a1af4fb74600d7d7d348efcda0fd9c4f08db881835f8e1665688f77a77b0eb8231274ab5ecc93443f5348976100031d5b0c4b6245f647db0e0
-EBUILD fortune-mod-tao-1.ebuild 608 BLAKE2B 40c85ab417b259f952576fcbe5e1a88c1213827916067022308dab1e00af5aefc58034ff5aa51e88918deb9994845b6e3512dd2832059e05f1679ceeaad3a3fb SHA512 126c620d635b7e9c9af4d5e93afe3a8c30aad2d2f4bb161efdef33fb0aac8704dc48825e6e64be02d290a5be09fe8e558ac3073cc178fa01cbaea3ea4a655d5a
+EBUILD fortune-mod-tao-1.ebuild 602 BLAKE2B d6bfa2bfc616c9c4627b43d7fe51ad219297c54f7ac35d0a86a58d74c4606cfe0db650d619c32dd988d4e3560325fe26f29b7f8cbe0248c1c5f6d720236acf08 SHA512 2582e2cf6079dd13000cc30016ec58c60aa496d731657207552673660611ac1c801b79ac87502560d361d2b1bf07caa411495cb6001a99f90a979bb8e9d08ade
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
index 1e5df9bb24c6..a91bb53b087a 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${MY_PN}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/Manifest b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
index b5e427dc751b..ec8cb6583e89 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/Manifest
+++ b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-mod-thomas.ogrisegg-20030120.tar.gz 15662 BLAKE2B 58c2bbc1b7c432fad02b201d277eb5608151756efce4126eb20f62f30397bb74577d3dacafab3c5abfa136a61d2ac1d596fd20daf7dc7117eeabd29259244f82 SHA512 e1888b117074ae44eeb34ba499f03793d33cbcf5c2af20eec4171078485d37c06a3ccbcb80a620ea4a8e564840fe832d310ddaa8bc5a5164c8d2f870db0791b0
-EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 635 BLAKE2B e59bf3fca272bbf1d7d8ad988703ddb89a288937a50f248982c07382ba1150dc4317f31b6146c16c19128593f38284cebcf6ae14ece2f5a87fb8844e8d1fb62b SHA512 15486d4352b51f51bb5dad7f152b929f4fe7329670bc2a99f6a71d787ea3a336a330756634030626914005a3164ca96806d7318624a344cf15a80a83a6ec9507
+EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 629 BLAKE2B 118c26849ef675c7d279d4d16412d25038eb316dc6420bfe079091fc90299beab96ab55ad06227b24e1039cf7a3ab4d383de97d17f2db1d5d75c7c707bdc5e2e SHA512 87cd1e6d7abd9eb4205720dde1240fcad00ba109611f228bab13708a9257b198c6723c77b07dd7a92e42738e78bcca868384d19a05122fabd1197281bf386d16
 MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index dfd7b0a14886..117a226ff0a4 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-zx-error/Manifest b/games-misc/fortune-mod-zx-error/Manifest
index 4ea04b993e24..401d451dd1f4 100644
--- a/games-misc/fortune-mod-zx-error/Manifest
+++ b/games-misc/fortune-mod-zx-error/Manifest
@@ -1,3 +1,3 @@
 DIST fortunes-zx-error-1.0.tar.gz 1209 BLAKE2B c8197c765161204fd67e0070aaf0973fbd5d437aa03b1c74383e78119a3ce8f3f16b7fd2dc1192c4c4b28a56125ca5b190a1b727e5c1f0a470172f38fc75f807 SHA512 6412826dfafdcd79eeb2f8100c6e7a7419526af080e98af91243a786b1fc6089ef652eb0d8267eb94564dd932fcd1b5f903a4da76760f23b370e57fbc5c72f9d
-EBUILD fortune-mod-zx-error-1.0.ebuild 728 BLAKE2B 48d416c0cf83c0dbdd2ac9c1030dbda50b3d26465fbd856587133dc524e615d7b8cbb7e732fb8d43f7cf9c0d5450dbd50d8ac72e49ba58fbb9e08fe9f47aaf66 SHA512 d5955579b983c2b8043472d23316e6d2c974c1b780f6a02e398ae970e5def807a2725290d9e462a8037f7f92ddddbda4425a776c08194aeb2408900224a91db8
+EBUILD fortune-mod-zx-error-1.0.ebuild 722 BLAKE2B 0176b3654c15c4d08037b4f6aac49b78c52bc415a6eab2de2e85d8c8f922853b23bc726bb29e341db7a68d462e49f10e405ce0a050a2b9f6d61df6e00477c095 SHA512 e6d8be02493ca6605c46a2b4a138cb90db8605462c4663b867ebc20ec1def3b60db59bbc88cab1b5a663a2e06c8c1f9788fcf9db4f7b7652d2b723903e8f4421
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
index c996c5add34a..29ba3f2f8c9c 100644
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
+++ b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://korpus.juls.savba.sk/~garabik/software/fortunes-zx-error/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
index 1bcaa03db14e..c9dbb4f222e7 100644
--- a/games-misc/xcowsay/Manifest
+++ b/games-misc/xcowsay/Manifest
@@ -1,3 +1,3 @@
 DIST xcowsay-1.3.tar.gz 269836 BLAKE2B 40eea935eb8784c182c03cf68c89f790c826f5162bbed526facee4d7488fb833e55bbecb9824d0b5e98abf3f5bc77068e150a1817f9745fb8ace11b7d7fdbb00 SHA512 b6f6493a988d8e8036ba9f2a0434627ffbd28eacd3330b256d8e6754b7be02eeb41390b28a8160091eca87d142e284adf2e2a37f22d715bca3b58ef1db8cdcf1
 EBUILD xcowsay-1.3.ebuild 753 BLAKE2B 4f891974dd52437b57ecf04b817b04ffe04a6b8ea40b0ce1738efe86b0e24947104e85f279f290ff1d28151090512a7a8a9995405b272234a3299c4cb7940acd SHA512 5fe53c78d754264a6f295ceebd377501b54ea8c441203b05cfe771d278b0f17a1711a7a93273a1d55becfc9a691b52b1368849849791fc4b2e12e534071eef1c
-MISC metadata.xml 323 BLAKE2B 351a7a10edfe4cdc966fe283e89cd6a67bc6609ae7355c23ba9ac4c56d070af1585e0d172c51748d86f6fc917ffd1fc0a6b29c1db0977c5e85bce1849b94eb53 SHA512 e560764dae2cbdf7d747479e49c51cac3ccc02d5e9ed39fe726b8217a0c5f30d5e5306015758f1afb12df022e58a3902f9f007cf412af7940c8743523db088a2
+MISC metadata.xml 245 BLAKE2B 4e9a30ee4c54054986a604c12e24d11e5bc515f4b46b1e36832370f856e78fc250a2aaf5e3091b411c61be11f3cba4f44ea3e8c677b2b0177960d6bb984b43a4 SHA512 ec4e7a6faede299b991ce94f0fbe1ba7e2e4640343c8961a1794f40432a6222ff54c086ff13509237d23cb181a814608db0dc0d230f54304402722aa88b7d510
diff --git a/games-misc/xcowsay/metadata.xml b/games-misc/xcowsay/metadata.xml
index 50abf08fa7b2..6d3b8a616845 100644
--- a/games-misc/xcowsay/metadata.xml
+++ b/games-misc/xcowsay/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="fortune">Installs the fortune-mod xcow binary</flag>
 </use>