gentoo resync : 13.10.2019

125 files changed, 302 insertions, 331 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 365ea121dbbf..1c5235f227b0 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/advancecomp/Manifest b/app-arch/advancecomp/Manifest
index fd3b53e4fc73..0e841cc5d4c7 100644
--- a/app-arch/advancecomp/Manifest
+++ b/app-arch/advancecomp/Manifest
@@ -1,3 +1,3 @@
 DIST advancecomp-fcf71a89265c78fc26243574dda3a872574a5c02.tar.gz 1195310 BLAKE2B 9dcab7e266023f996504cfcfc9ba8237f216f2bf1af56d645e3fe7fb79a5e3d0dae2abdd47cc9c38c6ade385d1eb44b1e0ae6afa6fd2485afd1423be37276d06 SHA512 2c3e01146441aa940f6de464e0c19613f22d6a5fd671e4e0b1b83e68cad322ff0dc6be0fa328524332e6a782198edfeac0443b72a30d9c51c86e7c5ad141f6b7
-EBUILD advancecomp-2.2_pre20190301.ebuild 1011 BLAKE2B 85951bbe9b83a936629b687ad11e5bba57727d9659448d0799a74861c3eed4233fc337e9e39b6cd44b44ed6838d1ea63264a6266479257ff428c8eb9e5da66ad SHA512 5484156344790d8b8496cf422c941801f1927609eaaa1727bd8e02799d380001d8f88bc76f55a035ff5f74f7969e80381c40b25acf1f898bacda6cd02a0fa112
+EBUILD advancecomp-2.2_pre20190301.ebuild 1001 BLAKE2B b49393301407a223fa08e732109575f4cf29cfec2af145e1769c512c31e2edac2a04ff9b7d45cd3ae5871a15d3c33bd79d71f6d8c865899d37a1ae29b656b3b1 SHA512 9bf38eca276b4aadc34f80106c78e607fe14ecb366536e45acb06febe3e9f0eaf15c6cd44e1185292e2d7be170ef1fb077f2abaedf45c8f8a177f18c78b0d3ac
 MISC metadata.xml 525 BLAKE2B 7b701e8291c27054417e28405eae6e285a384f80e96801fa7b088115a40abe3d35f2db1104a1b77a9a5e486327cdc91327427605172e4f00c61b515c91b0ef8c SHA512 4bde385cbadadb14a594602dddec98f079cf1f970138c63296ef1c634bdd9f352c9662b0064f3738017e9ee24bff5662e7e02df19797ae0276c7e889376857a7
diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
index 08fbb55a5208..5eb02005ebb5 100644
--- a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
+++ b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/amadvance/advancecomp/archive/${EGIT_COMMIT}.tar.gz
 
 LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="app-arch/bzip2:=
diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index e627c3859a22..b7c2d94ebaf3 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -2,5 +2,5 @@ AUX arc-5.21m-darwin.patch 268 BLAKE2B f353d9a5cfecb4c434cc65303190523fdc0a8af15
 AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685ce23fde54f6e77c34e41ab52b29db52b29883d6772f735773e04209506ff61f36909d895595a34afe35ace7aec9d SHA512 6cf269ca19d5000deec43bcf7e766d28aefa53219c5af8f65429e80f4a8b8ec557199d73cb380665b4d14517118ac567a001edcee1514691901d8192109923c0
 AUX arc-5.21o-interix.patch 341 BLAKE2B b37abfafd5d0de28ddcf0f8c5392e2e9ea6921e5a8ebfe7d0fee836fb91513964f25bd60e65f8791f642b106b614c933d607af101408872f715f93a6d89f9d5f SHA512 7e204d6d70a5f5c591012a26b498cb2899f50a207358413e164a7b4cd39776c3eab1e8026eac4ab8c86c6cc37e2fbaf8bc34657f618b2f12295c56d6d59c99c8
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 845 BLAKE2B c3fdb7752cfccd76653e7ed12fc8ccffc41bfb53d2102b646f54d60dc4608e07be997449a694b54445d25a0b0620cd56694f6b4e5a1d554467633db3893a1008 SHA512 c17f89ba7b4155aa00c0c2f3ea23249148047a312153822b5ce33f34f0e91c8afbf2f52d09369bd2366047ce6508d475b3ca9c985b069f3b1d029f2575583594
+EBUILD arc-5.21p.ebuild 835 BLAKE2B f1af1dcdf5ef7b6222238a48246fa27acfc85475c9ccf0667ce0c29aa51d7f1f6e29c8af5e3f821bbe2c7fd4da7c135ec2d91e61c7c447a29eb4dc329a452c5a SHA512 35ba333897384a5862c2ae29d34d61d6c3650aeca74668d9703cbd1622b9225a98957e32e61d92df460202db5950d435b7d64d3febc85278349a323b80067b1e
 MISC metadata.xml 356 BLAKE2B 8f18c0ad0004f2b5a4ad4d35cb420a709bdeaaba374491c58e19ceadc06b6bccdb54419cb4c93985498e9b99b33417d2cecfe26db6228cc500a407e172124f2f SHA512 22f42b35b8c8ad43bac261820902eb8fc9835c2ed1a96e75a56fc97e0732060e6354e9485458f928177f201f7f6ebd9e75c7cae9a1cff4b376b997d3c3f20d18
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index 21daa1b15601..d6cba347c27b 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index ac279f9fdff9..70c2fbecfe0e 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -4,5 +4,5 @@ AUX arj-3.10.22-implicit-declarations.patch 833 BLAKE2B 7162e7851dca555a1d904642
 AUX arj-3.10.22-interix.patch 1257 BLAKE2B 167249b08e73a1114f58781d732288397ba18030c00b3c0df99f5610946569de63fa5d5c2dcf6840cbc7785cc0f22948361ab5d21da6692fb0915a925f308804 SHA512 0ed64bd6d37dcca43651b32623881aaf94525c8dde82515f03ef748a642945366fe2da732aed7ac7c1f6165a6b03fd3b50f078afc135546704d06179d99227cd
 DIST arj_3.10.22-15.debian.tar.xz 16756 BLAKE2B f9bf45f103cf3f76867006bdbd61f6c5e04d75d9543e99e01304b285b8858034c60f38ea76bc8cdc502b44a8515fb7a04fd9d2f3d07f9ea19e1c5d3a4d448eff SHA512 66e1bc3188afc24573fe98374f9b0cf939d0d3c7a1b356e6367ef544fb0e64721fa686fd1e791f58508576f0f50994878347bcb054f48ebe240cc9ab97e00688
 DIST arj_3.10.22.orig.tar.gz 431467 BLAKE2B e40409b9f88a1a7e56de4200b464c3dc420659fa3991bf904ca86bbdb428fc8d17f095b9eabf3170712458ef2136e96545810201cc6755c15e45d4ae9a5e3a03 SHA512 4730dfdbab4f8095396c337578ed69bdaae52955ad468db50b52af8ad2846ecd6cfc05eb3ac0d03838c1c32ea60126f14a22b93e8181c06b9546456f3937ff76
-EBUILD arj-3.10.22-r7.ebuild 1210 BLAKE2B eaa690a1b984e349bb3b04cf907a6bd180554827d0404da98b6920a03c0cb3a93a4477e32c67dc91001523eba2f4073036540022073193d8c9dffbe35370cf41 SHA512 77cb756920893daabbe8a6b4cf73c12b58827103441c8ffeb819411671610428b5aa5b69006af5933ab49ec613e00a565f9e26d3a296351339266d20c28c5ba7
+EBUILD arj-3.10.22-r7.ebuild 1200 BLAKE2B a21e678eaa0cd788a4c762c7e5719bed7e7266f45e427abac6269162bcc794bcccd1a5fef82b2bdd5f98de22aacef6a17dd4151633eabc305582789f8e0aac2a SHA512 7b10728bcbf6e71ef7445589db947bcf2ff731d0270a4e791b89e1b7cfb11f5f3fbdb7adda89347b573b37f44db345e6d5b0a1b1378f38832163fd410801f7d7
 MISC metadata.xml 240 BLAKE2B 1ec9da3b56dc6e923ce8cab2787b77c19b522e9e0e2048a56e8fff8c5d008b0e5e2e6fbe39f0633d1a3c945526dd66b0160d535ada00ceac5ab93b2f61576626 SHA512 64457fffc601ed1e5d4a9154d0fc977a489cc0f2dae35b4da56c78deb66e42e1f9ad33364e13472c33fba0769ee8908bf256a9568c448d3bc895a6a2e2aaffca
diff --git a/app-arch/arj/arj-3.10.22-r7.ebuild b/app-arch/arj/arj-3.10.22-r7.ebuild
index 5ab9a6201364..2cfa30f4cf93 100644
--- a/app-arch/arj/arj-3.10.22-r7.ebuild
+++ b/app-arch/arj/arj-3.10.22-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 028f0a4e83c0..2e492e637cea 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -5,13 +5,13 @@ DIST brotli-1.0.4.tar.gz 23819000 BLAKE2B 5c0a7ed2cb7e15722c2f08dbaaaa5e74f10a03
 DIST brotli-1.0.5.tar.gz 23825684 BLAKE2B b179f75f3e452bdd3fabbd74d9172bc0a00f797e7facf7a9061e5e81c52148297ea7dd8ab9954c3f596f59e2a96cb22ef057c4c02b1bba4ecf10db7b70e0711d SHA512 703cad94c7f250133d2cfe222f3183612c7649b184bba218907b805f423568046d42695f33acf7da95daf684be118c9d631cfa5706e5a195b611c716db4c839a
 DIST brotli-1.0.6.tar.gz 23827656 BLAKE2B 8d31eb1c4119de44702f2239fba9db72f1ae81801d06e51716432ff2f8aa78259c52cbd57b8fcd005c1bc14ada81b6e47a35c5d3864bb10bb02d113e30bd321b SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010
 DIST brotli-1.0.7.tar.gz 23827908 BLAKE2B b9fc554cd23c8387b648638b6f9bb2d29fa87035856d03cf284662f9281984f3bf8e40109e61155ece18673f4391bc0fff704f8ab800a2041d3ce1824478d2ae SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
-EBUILD brotli-1.0.2.ebuild 1435 BLAKE2B 9ac0b3043f33dc8b37b55b9d1909b7f99a42aaefc1ad44a78fe9447f839ca549fbf092a2f860a412fb45bb0c126f23e8c891ca253386e79823aab905b9511f28 SHA512 5bd2f631c895b32c38e574cec28be51587598db63a8a2e42625d9fbbcb8ca751e58e3df177b8af6ade4522127024d5d8812619b640a2a55e43506771087158ee
-EBUILD brotli-1.0.3-r1.ebuild 1416 BLAKE2B b9a5f452d97b3860b4954e9fd2aae10a032605979e514231c819eb19595fee238012c7e55a6447828ab6f056cad612bfff6ba78592dae16737082179c2097afe SHA512 e1efd5d22bf8bac4054a001a88beff408e021b7a33092968899e0b999278cc64505cb9c1a7834e31279eddf865d61ff15b685a11573810830af41f21a6ae5272
-EBUILD brotli-1.0.3.ebuild 1393 BLAKE2B efd3ee74f6eef32b1032b06107ce986296867f3eb0db9b15c88dca9a8f4e34d283e0dcb29e4822b42472bdf7b88d8d0861a255c4e4ae2b481a5927f15eb1ef5a SHA512 27811846b30f2831320e4376a331daae35a074ac663906424912bf4a800e40585aad2d7d5195fa8bbb2f0de77c657f90e8809e6249a338259fdfc1e64bb460b5
-EBUILD brotli-1.0.4.ebuild 1416 BLAKE2B b9a5f452d97b3860b4954e9fd2aae10a032605979e514231c819eb19595fee238012c7e55a6447828ab6f056cad612bfff6ba78592dae16737082179c2097afe SHA512 e1efd5d22bf8bac4054a001a88beff408e021b7a33092968899e0b999278cc64505cb9c1a7834e31279eddf865d61ff15b685a11573810830af41f21a6ae5272
-EBUILD brotli-1.0.5.ebuild 1453 BLAKE2B 9859a5e12bf48136d72d8710d353635f9d4a7e7dc81c936a10bf301e8024b04050c1550dbd67b5ceeeb188b0c4ae60b761de269e28c6ee611133aa2ec7f3bfb7 SHA512 b0524cd8a7e3ca3ba862d95888fd5bf233d94a81f89e65dd4425b9b111f6cb7d1fd8080d972d79d4b9c3ad47c46853c4516719a4605f531986ddc73caf8d234c
-EBUILD brotli-1.0.6-r1.ebuild 1684 BLAKE2B 6889f76600de558a02f39c6404b2ba9385ca83efa3989cd3c458aeff0c9a9d2804afff34ee359b9c427b5a5a24bfb3a28e31dc72d47bd2979033c60edd048957 SHA512 3e09194f3ee29fd8fb61809c9e360bf617e349ab630fee5bda43824448f0ec6c7b51de095a72312db8ad0ba65f24c367f26a8b5e792cc2ca4023a9415521f8a1
-EBUILD brotli-1.0.6.ebuild 1453 BLAKE2B 9859a5e12bf48136d72d8710d353635f9d4a7e7dc81c936a10bf301e8024b04050c1550dbd67b5ceeeb188b0c4ae60b761de269e28c6ee611133aa2ec7f3bfb7 SHA512 b0524cd8a7e3ca3ba862d95888fd5bf233d94a81f89e65dd4425b9b111f6cb7d1fd8080d972d79d4b9c3ad47c46853c4516719a4605f531986ddc73caf8d234c
-EBUILD brotli-1.0.7.ebuild 1644 BLAKE2B 38fa990ac9665f8cd838b52c78703a0aea6f34bfea994de580befd219d59f4bbac9ae5a3b7794b99621f5bc6ac9da081daea842a608afe20b798e7e66ee65e30 SHA512 be614799fc6180151febb40670cb59f68b0f52f269134bcc933f41e8d1660832c11f5941480f978ff1a38d556a54f46a4b50ad4fbe547b1c2cf7d0c5eaa392d3
-EBUILD brotli-9999.ebuild 1654 BLAKE2B 1e6551cfe5323ec32ea0e148398ae386d9cb07edf98d51dbc73d268bfd38472661c0cf4d987f443f749724fa7fdc851c80fc1eb9225e234a77f361409d080f1e SHA512 924f625e26b4cc7582c19ed8cf603e2ad8afbd1766e79348a73285f932ccae2012799a9f94962e118b62f14b9c96d8441586988f76ffb25902baa9fbea885849
+EBUILD brotli-1.0.2.ebuild 1423 BLAKE2B 157d67255ffd120485ad22dddce9d5f953055b76999f6083d752519d813c025127aef64feeb250ae080bec4b086489bdbedd7670a1f1932ce5280c9c156475df SHA512 b5dae36637da86d3cee40152046a3a6f2132f006ff94e252526f5b9e05dc42e7bcccb83df88f19d9ab255af43f718289215c08637fb1ff2f04957bf001a51f13
+EBUILD brotli-1.0.3-r1.ebuild 1404 BLAKE2B 0e81b622f2d3a26656495c6bd15256ac7018be5df75e604dac83e69289c21e72b629cf2cde33c698525112a7aa5b80ee99532ceebcf5a1965acf57725ed85e15 SHA512 c237c57e402ea513ac89f5718eb310e9ce9407232d874360fc2f4d96935008f8ab63bb4fc233cc7c9aa56880dd59ef529d007e32054d26e014624bd549703229
+EBUILD brotli-1.0.3.ebuild 1381 BLAKE2B 97949d011621730e439c507db91f448a8774befad0bd81bc5d5b457e1c4d89320c69598edfbc4e5f921050b1b1a6cb63f30c66298126bad4f102996e95134b85 SHA512 77342e8262ebc38e0d250b61b843045c5b6ebea59b188ce77f99c1bd7d1559184140c9202e9c39ba538ab1188413929894af643061426edf8991ba3c4cbc3a63
+EBUILD brotli-1.0.4.ebuild 1404 BLAKE2B 0e81b622f2d3a26656495c6bd15256ac7018be5df75e604dac83e69289c21e72b629cf2cde33c698525112a7aa5b80ee99532ceebcf5a1965acf57725ed85e15 SHA512 c237c57e402ea513ac89f5718eb310e9ce9407232d874360fc2f4d96935008f8ab63bb4fc233cc7c9aa56880dd59ef529d007e32054d26e014624bd549703229
+EBUILD brotli-1.0.5.ebuild 1441 BLAKE2B 3959d6c39a5cfa11346037ab5046e6e1bbe4f35faa355bb37cb76516bc43b97c18182434831430583587bd9cb69be98d827d38ed387e46ee9f0ee01ba0240d61 SHA512 f4338362630a60b985612ee9e638a419aadd22b70c3923c5c99b6f183f60a1bbc94270e9c80027ed005213ba4a440e6fab528d3942886384e23711074ea6c087
+EBUILD brotli-1.0.6-r1.ebuild 1672 BLAKE2B d032591b026b3383fba68a6efabc1b0858fef80f8a81fde190fe4d0a16be5b0d931b562ce72a96182983d7a54ab5ef00202ee84c2884341d117b3e0a26ab6e1e SHA512 c045f9ae276818af6f9a30676091850c7290dc1ce4b8530026941995e6abf79f9b27fa0bcef89e9353f6b756ea6d75a7f1967ab87150b04b5dee7f44bf010a77
+EBUILD brotli-1.0.6.ebuild 1441 BLAKE2B 3959d6c39a5cfa11346037ab5046e6e1bbe4f35faa355bb37cb76516bc43b97c18182434831430583587bd9cb69be98d827d38ed387e46ee9f0ee01ba0240d61 SHA512 f4338362630a60b985612ee9e638a419aadd22b70c3923c5c99b6f183f60a1bbc94270e9c80027ed005213ba4a440e6fab528d3942886384e23711074ea6c087
+EBUILD brotli-1.0.7.ebuild 1632 BLAKE2B 25e95466563e4ef2f13779899227c61b8587ab8adbf6b81b9b99dcc5b611857e88aa3185a17c3b81052fefb86eaf63ce2145bfe9508c389069dffe2827cf535e SHA512 3389d89a59ba1064a78b2cd4779dfbe7f7122d93b21b773dcd2a3512071d597032b4003f879a2fd270a882d74486298f146d9f032d0b6b3379daaeba9378bdfe
+EBUILD brotli-9999.ebuild 1642 BLAKE2B 25cdbd35511a0510d39cb7595e0170f4193dc461cbec35742cace8c64ea73b7097c1346b462a2297f547a34584ef6c5592265e5a2eb0cd6052ddd37d5eca3182 SHA512 4472e08448f55df189aef470a98157a09d3672fdbcf673952de2abb6f07001047762fd5e7f69c2500b4e9eba58b0dd6134ba6a0d11dfe87780e8f012cac1ebc3
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.2.ebuild b/app-arch/brotli/brotli-1.0.2.ebuild
index 5646a99006f4..682a6dc71dcb 100644
--- a/app-arch/brotli/brotli-1.0.2.ebuild
+++ b/app-arch/brotli/brotli-1.0.2.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	PATCHES=( "${FILESDIR}"/${P}-no-rpath.patch )
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.3-r1.ebuild b/app-arch/brotli/brotli-1.0.3-r1.ebuild
index 95f53dbc3fc1..7ac46e91346c 100644
--- a/app-arch/brotli/brotli-1.0.3-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.3-r1.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.3.ebuild b/app-arch/brotli/brotli-1.0.3.ebuild
index 598c19d1b9af..9a2753bcfaf9 100644
--- a/app-arch/brotli/brotli-1.0.3.ebuild
+++ b/app-arch/brotli/brotli-1.0.3.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.4.ebuild b/app-arch/brotli/brotli-1.0.4.ebuild
index 95f53dbc3fc1..7ac46e91346c 100644
--- a/app-arch/brotli/brotli-1.0.4.ebuild
+++ b/app-arch/brotli/brotli-1.0.4.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.5.ebuild b/app-arch/brotli/brotli-1.0.5.ebuild
index ca18477ebe69..3aa5160498cc 100644
--- a/app-arch/brotli/brotli-1.0.5.ebuild
+++ b/app-arch/brotli/brotli-1.0.5.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
index a4ef3bfa3719..ee1416438b4a 100644
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.6.ebuild b/app-arch/brotli/brotli-1.0.6.ebuild
index ca18477ebe69..3aa5160498cc 100644
--- a/app-arch/brotli/brotli-1.0.6.ebuild
+++ b/app-arch/brotli/brotli-1.0.6.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
index 54b131b3d54a..ae46ff731e1b 100644
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ b/app-arch/brotli/brotli-1.0.7.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index 703ecf1488be..dbbad99aea23 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/bsdsfv/Manifest b/app-arch/bsdsfv/Manifest
index 1c8e1fb99216..406f9f71efb0 100644
--- a/app-arch/bsdsfv/Manifest
+++ b/app-arch/bsdsfv/Manifest
@@ -1,4 +1,4 @@
 AUX bsdsfv-1.18-64bit.patch 2388 BLAKE2B 377975f51f211c90cb9f7571c4b6e437cb75a536238aa703321efcc6ddd13e19b9649468eb8c5aaa23f5ad982148fe92bdb65fb8ef40023d7a4375133810d6c8 SHA512 5831956791b03972b1fdd3199687b10e7a55d562e815f94b863fb75a549eec14b85488bb0a9c9e5d2fb3241a95846f710dd5b19547ce33c425da756c685c18a5
 DIST bsdsfv-1.18.tar.gz 13301 BLAKE2B 663ae589e67455dbea968aeedaed74ed8f267fdb9790417da3d61aec9b3f50a5d87857c5e0f39a359d8b20ebd0bf706c5b775bf61c617669c479460ae8e2ff60 SHA512 f2742cfc5c56c915aff7534eb07025394c57bebf74d6505dc1d7e814e5ca098b474a718ae1c2aeb993cf95dd55fc792c56f9ac80344d112738da2f20157647e6
-EBUILD bsdsfv-1.18-r2.ebuild 582 BLAKE2B abe3c1765ca5dbc8c0996ce4be024f5dde3be36d45a7f9f12d429cf15980815ba663fd4d2a1b21f22f26cdd337f8612d24ec0368a5ce0adccdf9ab6b7138fe87 SHA512 bde8f6f8622c1d7e0ce9091a880b6294ea0f5ec9220378cae97477009eb71c5e033b70b5917fcb5e2641b8eda833c977939a0af40f00e2e824e47cac38bba388
+EBUILD bsdsfv-1.18-r2.ebuild 572 BLAKE2B cf07aa4d1ddb320d3e99216326314572b1d9d73e0d10cf5ea325ce1c72886ad7c4daa80782b392587436fdfee39a4822e0d17afbec680e0ec048ce7d24551213 SHA512 622b0c5d62d4b1108bad6b4d3e5978875064a9cfdfa37f2a21f45fcd5b7f776baf8e80b273088c9a0155f0911256ffe5862b87df001221509e9c7b1f18e4d442
 MISC metadata.xml 309 BLAKE2B 4b2f7c2d25c38ffd3a43fdc64bdafb3e28dead993ce6fdf2302b4cfea2a947e77d1242d145f0bf668ac85a6a118524da418a1f361a69b7064851d14ec8007888 SHA512 a741f56a3f1ccde998c0504b75dac3e3cdf49b2fd7f08f1906f97be7a496ef04b3692a90f27863b7e1d9b8361ac7aeebd8bbc337bc2134eff3324a41ad7353ea
diff --git a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
index f41cfb584790..587200385df2 100644
--- a/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
+++ b/app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~hppa ~m68k ppc ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index d9ac4d324c6d..7908a6dfd2c0 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -17,8 +17,8 @@ AUX bzip2-1.0.8-saneso.patch 465 BLAKE2B 7af873611a22431a80e1781a219de6d8838a2cb
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a SHA512 e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
-EBUILD bzip2-1.0.6-r11.ebuild 3171 BLAKE2B 3e39109f16e6acfbd0f209fe9271446ec4d5932ce0f0ec52dcec9ebf8f1289e5f337c1cdd0787ff9819fe3c03b40751e01252a7aa7c625fa3680c47f1de05666 SHA512 6a37ee93825f8fb19bf914cdb2cf7e882b1e3b2885893df34ed44894e0b8c7d647b31820e106ef03920ced52c4e391647f72bbe76c2ca30b707ab025bd80e4f4
-EBUILD bzip2-1.0.7.ebuild 3039 BLAKE2B fda8ce3919743fb2d2e7d97d075a711ba38fa184558566035cba1306a686a83a8b50b321848f4230335611850675464e5ce15689e079cb25039a1e3f6c7e597f SHA512 6add454fa769e983b99e8a72b2aa14b990a7a693a019f49b9f3e1e85c111644c964460a06dc3f1772a1bd32b720e2643a5a1754f96d3ef0b13e3718408d7b1b4
-EBUILD bzip2-1.0.8.ebuild 2986 BLAKE2B 3678c8015221602f36aed4f3bc03aa8336d55d2b3608646b7ebb45f45f7b97e946a4e433e8038b95e53aa86706bdb6e5d62c14ffeb46ab9839a1347db8e089f8 SHA512 242ce10c80b7bf6e8dde9770cb73c8962dde7d4804217ae18664615a43a3160f3185fae81c7c2a6ef592915748f621b795d52c2da15b028ab62f03663b1f84f3
-EBUILD bzip2-9999.ebuild 1417 BLAKE2B b1e5244700abb4ab7cfbe8642af2cf78aed7d32676fba72b158843e79cf081314b7f9f422abac2ec753ec35b12b463f7dbc1524fdd01f04c088c1357789fccff SHA512 304684431b8fe792beb5adc0d0935ae3b17e991ed2784f4ff1a3464657dab628b653c3f0cada32b1b2f85b2eaad1443df9ad965c237913242198d1add22549e6
+EBUILD bzip2-1.0.6-r11.ebuild 3149 BLAKE2B 1295262c2f786892cddaf31f60dc0679a8a16ee54d06c9ece9cf299678f0c313a2ed65144b926bc4a0f3d44be48e1302243e2e208b8c0900d55a9502b258ed2a SHA512 bf5c4c2f1b6540d5f899010e3242fa988c8d9b6f776b76bedbfa0e049ae9d2b09b7f8c54c1e2b8f6dd3783a90aaf9a3a60be6a1c906ed3f8e1d9f74a51230993
+EBUILD bzip2-1.0.7.ebuild 3017 BLAKE2B c53ac9c2079a0c3d7dbad1834eb2ecc023f7954ec23420b27d9670ebd3400256cc44cae80d1e9acf2b4d7df7e4fcf4a554af31428b254d7d05e6eaeaa72185d4 SHA512 a8981ceadd8c39e6a3d544c14db01605db3173a6d9adf4fde767712fa602027bc1033d4c2b9b8b85beeffeb67c5579ebed2ff94d4dccf27f2b4f0d4810a822ea
+EBUILD bzip2-1.0.8.ebuild 2964 BLAKE2B 24d35a378df299fb6de58a6784c0ebf44476699e62515c719182ee712b7dedeaae55c767fbfa74dac9fc09a6f1b26532cdf8cda01e9491f0de541400fd67203d SHA512 3b93c95003795e0667fc7b0705abed7ed2f575aabb000f30e5db4b9263e10a9ea1c04d30dc25deeebfac503dc522e30e368dad580a56078418c1a34c66fbce35
+EBUILD bzip2-9999.ebuild 1395 BLAKE2B 5da5e48cbd8fe10d149bea4e31c8ce977ca31b9bfd1a47aafb3c14f34b6556ad3eb9cb3aba29fb534c42d65edd77229f7aa11b16e52c9b908a085ede6722b441 SHA512 60d3b6244fb19fe8691a4b72ba596be0fbe5a2620da151cb4638656a8ffaa631bd0e473ee23c43b86c57921aa87f3cad76a92aba4c5fd8c351c011d275c3b716
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index 09361b3bc875..eeb8f6136a5e 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild b/app-arch/bzip2/bzip2-1.0.7.ebuild
index eb484311ab63..95c7e67969f4 100644
--- a/app-arch/bzip2/bzip2-1.0.7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.8.ebuild b/app-arch/bzip2/bzip2-1.0.8.ebuild
index ffd93f563cb2..98b583d85c46 100644
--- a/app-arch/bzip2/bzip2-1.0.8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index 18d203a04c24..ac95fff0d7be 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git"
 else
 	SRC_URI=""
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index 3bee5110f2f5..4e0ff69d748f 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -3,8 +3,8 @@ AUX cabextract-1.9-remove-spurious-test_files.patch 423 BLAKE2B 33c226d287ab77a3
 DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
 DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622d8dae1648aae1bb5c0ec7c7978bff01b7ca2526f1b6090f193d88c00e3f49ae111f348d03fec9f575bddbb4b4096 SHA512 c354a4b20a222b40813f01baf8311c9a76611da427f9f44e977a3fd09508e24a18b486e3eef889a9debdca459f1b0c28d5d25429ccd555d3a2e4ff92d91cec14
 DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
-EBUILD cabextract-1.8.ebuild 1151 BLAKE2B 2edab5bff07fa5c086a05c8d53488ebd9ea1da73ed2d67da624c3e34a3f327087dcbd7fd1c76c72068d97b01b0936bd468c3c628765f37e6d0d313818f1eff49 SHA512 9e99ac987bcd6220d8f5911e53f4a930fb999ec5c9f61df9393df88ad68659dc8116c1e13d772f24bea1168815083e1fac45dd6febf09199c27af67ee170cb61
-EBUILD cabextract-1.9-r2.ebuild 1670 BLAKE2B 4472600bd7e89c2be27073b13d5012e52aaabb92418745f8796b76a54d3d1ec7858ce08d56d1200d88db845a90e730ab65c959c6ae0ab0a6366271992154da46 SHA512 6d11319f7af3a32bdca6f015b62678260812bcd44672d313ec007b18d5ff310e0a73686b87710e9a3d3e9e86dd1f0b4c59c2461d2eea1c2d2c9537d87b363441
-EBUILD cabextract-1.9.1.ebuild 1566 BLAKE2B 1053df84c408ba80d89fdc1e5aab1b826d278b91b009da43120b30edda5b5ce4717923c3b47c04f8f0401c4854e4c70f2af76e44787021389ce59fb3b1660eb7 SHA512 e169dba7c24cd69c454427d4627b0a9d51b3f412c6862fe3d7d97927940192966662170e1968f9edc757bd54f0ff66c3accd33114f319ab198d77accc82de033
-EBUILD cabextract-9999.ebuild 1566 BLAKE2B 79681bf62a5e3a14c21c7491e47e650b21e2fb518dd8a7df870da3afce17a74f79089c5b25981bc20e64a9044376b9bd77425d75c065acfdd0d03d2771d6d1bc SHA512 d6f9ce211b4114a29084decd6f56e7675b31115bf507518e1f4d07547e5c2d40ea71408f275da12b8723d47a1ed6280b31019b07112af9960d9b583862ba4832
+EBUILD cabextract-1.8.ebuild 1129 BLAKE2B febd5f7eb9fb85aabc47af400c1e5016fe008095d6db6c33890b4dac0f03f762ee5e886a37e6f6e2af08cae130e3087f1f20cc0d7ad02aff70ef7230861a29cc SHA512 cae7de45d2fcd0fb934ae7edd9e1409304f6da8e1535ab70dd5de78c93fd839e49ffe2f0af789cde5b7dd00dc0d295036e144a895169c1b0eb2baa163bb5e0d5
+EBUILD cabextract-1.9-r2.ebuild 1660 BLAKE2B dcfff6254eb9ed1f482b0793f0300fefe81d1044b8b80c2936f968c9d16f1f36f81a72e8b2523132654032e4e5efce7b4cca580a7712e085628d3b5cd14b9439 SHA512 7bfef5f08352b08b5350bbb6f5c35e73164bead00d0aa06df99a34b9727019ee7d0e4b55ef5ca960afac6d1f3f5b1876b8ad9ed75fb397ebe78895f29e2a915d
+EBUILD cabextract-1.9.1.ebuild 1556 BLAKE2B c50d31f7964003f738bbbbd6192c86118d7ff1850530242797f1fd891b70a0981e50ac4432530fcb38458ae6c7cc913846527ad2239db852cb11dbe7bbc7b46d SHA512 5b0ee9bdf4eae5a960665f6ed3a7afead1e3f8f4bdf8e1bd16b8a28b3b2fa8494fc94f516fc9de31dc1babfee82943e739198e2bd181825bb3ad93fc79831ef2
+EBUILD cabextract-9999.ebuild 1556 BLAKE2B 8c40b40fb3c76a602d50fb36ba5d36b24a84e8f056d98ab964259987766ef4e0ae8338f9fb16efee7e3cd0c7e07dc0e9f7529a7f0b3a9893be4182ad8e9520e3 SHA512 3a2566ac2a8643d5e3107c59676f521f94860e9ae2eefec4f3361b6037bf2e194944972d962793dfe6bca6dd3b7d498557aff8c84a9c75736a928630c79c112f
 MISC metadata.xml 497 BLAKE2B dc1c758e518500bcadecefb0a3ac5d6bcd62e97113ccf69ee034707c416e8d7e8282060609f24d2406ada0a443624600b2a9ef554c4adaa9b315a6712491213f SHA512 5e1dc4d999b091846720b303fa59358955610a73cfa15f33bd51488d32e099f1651939e903227814b90857751c1b6408280493d8a0ae3c0f94828c61db53b6e3
diff --git a/app-arch/cabextract/cabextract-1.8.ebuild b/app-arch/cabextract/cabextract-1.8.ebuild
index 8e267080674b..c97854959b5a 100644
--- a/app-arch/cabextract/cabextract-1.8.ebuild
+++ b/app-arch/cabextract/cabextract-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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 ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="extras"
 
 RDEPEND="extras? ( dev-lang/perl )"
diff --git a/app-arch/cabextract/cabextract-1.9-r2.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
index 662d81bff7b9..a151a4ebb1c1 100644
--- a/app-arch/cabextract/cabextract-1.9-r2.ebuild
+++ b/app-arch/cabextract/cabextract-1.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cabextract/cabextract-1.9.1.ebuild b/app-arch/cabextract/cabextract-1.9.1.ebuild
index fb656c5eab7b..71d12ab8e370 100644
--- a/app-arch/cabextract/cabextract-1.9.1.ebuild
+++ b/app-arch/cabextract/cabextract-1.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cabextract/cabextract-9999.ebuild b/app-arch/cabextract/cabextract-9999.ebuild
index 6f8a446e8da4..5cf2a83afa2d 100644
--- a/app-arch/cabextract/cabextract-9999.ebuild
+++ b/app-arch/cabextract/cabextract-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 
 	LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest
index 85ba8c3edd3c..a49520c261cd 100644
--- a/app-arch/cfv/Manifest
+++ b/app-arch/cfv/Manifest
@@ -1,3 +1,3 @@
 DIST cfv-1.18.3.tar.gz 68030 BLAKE2B 72372ebf7fa2d72a68b20cc0bf82823e973de5e8acacdcded85f50ad0e2f3e867c6924828b0a4ee42663e623d0d6d2e55b3f4b94addd83a703e4502edb1dda35 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71
-EBUILD cfv-1.18.3-r1.ebuild 755 BLAKE2B ce83067a0e8d6b00912f732055b8b0620943e7e33cd4ac00bbac8b41067a2702ff53453a72c2b105dd9634f49413f3ce0d870765a2480c453514cf4674c95d3d SHA512 49bc02ea03ffbb88f468baf359352578eacd7694f8eaa1410a342fa9ea056f9a6d22b5c93ec1da995731a98a2a5fd33b80f967e8f5ef0e8ed33eeb8b1be9218b
+EBUILD cfv-1.18.3-r1.ebuild 745 BLAKE2B e781ee1173842bc29fd4a8e9a7af77637dddd25dd2faefb85bf3d4250f05f2d8787d6e5cde39708e9db3deaf18af9a371e5fbe8df0df47d0a8bf051e4300b3d1 SHA512 4b84222ca5b887626f958709c8ca665451d7de46be75d14cd7c9dcac63f52db4a3b75275b2e969e675c4700a001eeba3217cca4a9ed176b02777ed16531c479d
 MISC metadata.xml 581 BLAKE2B bc30bbb35470c1ab89641e3da14813f964ff2e4d2aeb6f37abd4bba0e4b5e5288b21637927fb0a8c04066653a09a66d00d3fcbd67a65d4b18e59cd1c31eefa1d SHA512 ac57bc554978a1f62b0ecef157853b66a00aa7098be0f5e42e01e5cf9546a8aec259dca9037d6698defea3e2e265ef7827e9e9cc73db98d6584896a3755b9d56
diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild
index f15261510f0a..05ba386240c5 100644
--- a/app-arch/cfv/cfv-1.18.3-r1.ebuild
+++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="bittorrent"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index a09dc468f0d7..21948262dd8b 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,4 +1,4 @@
 DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519
-EBUILD cksfv-1.3.14-r1.ebuild 663 BLAKE2B 4063ec9778a60dfa9d89207ce45020298fff54255246eab68e3f7785d220ecbd154806bd85de4a2fa1362dadc2a4d84707f78879f40fda84ca629d0612c9fb75 SHA512 f6af234743dad13fe5151ec95731209f75da32ac0f0dcdc196fe96aadf34f10635a4a075448c3449d26a07ad7451e458f2613684770834a5c430a8a128e7b93a
-EBUILD cksfv-1.3.14.ebuild 734 BLAKE2B cbfee7261d3c8eac8381a541df541c5fa663f02a743a442fbdda3f0014e42737c76256636628dfa1c168e6f76c7faebb1b0e4c6bca00e5309e6555507fefb6d2 SHA512 2793ae00e4cfd2cdca826fc581d9d0257df6d29d6d205960f780b9be6617d9af08b7ee48b309731d10d69f090ac801e538977581ef337b47be73308af3602298
+EBUILD cksfv-1.3.14-r1.ebuild 653 BLAKE2B e511a0573e46fe0fe5caae51be498e759c812808c33cef34666d608d990b92048ef6f016898c0d6ea0288d60b3aafa1e27756a60be933185e0f4e6a417dd5a0a SHA512 3f28b4371abe0af78bbcc0b1a02036362bb1a6b816997529313bcfe8d59b02f8014f74fae1c0141ce2633411cfafd150b7cc9920334db073e188e7c315210207
+EBUILD cksfv-1.3.14.ebuild 724 BLAKE2B c46b08c0ffc690d752fbb4433bbf05a14b42e09d3975be5f9c70eeffae2936c975d397127389a3566d708f9813504fd24f9ca6614fe263e0a731c8f0b391a2c7 SHA512 9c99995bab6fdc31d8427cb3e49fdbe78dec883fe0afc50c08d5f35c1548a4f10c424916b027946c303b64ea2d09aff31d805f250e905b618d44f7b619ff6473
 MISC metadata.xml 301 BLAKE2B 3e0945108754a3afcc9261293790159773b42004104ae4ae6d3275aa3245965298a4334d029c3821b62434e42eb8a4feef05ac40bed9703ab845001afda4553b SHA512 e6e2beb7e4c2d47fcc52fa57bff562229554d30ec41405d0ebe920bb442154e9aeb12b9974a97ac44c086a7e0510989e3a6c8a510163483bec9370ca88c52776
diff --git a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
index 47615468c282..c4ed878078d4 100644
--- a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	# note: not an autoconf configure script
diff --git a/app-arch/cksfv/cksfv-1.3.14.ebuild b/app-arch/cksfv/cksfv-1.3.14.ebuild
index 09c200e889a3..8fb1fcfc4bed 100644
--- a/app-arch/cksfv/cksfv-1.3.14.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_configure() {
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index d78870ebeadb..d1051eeeaabb 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -1,5 +1,5 @@
 AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa8971ca8beee6eb04b6ad3974c0d2770ac23669839b348013974ee827affb7b943d4dfa1be8d29b0b77c8ebea5e01791df SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
-EBUILD cpio-2.12-r1.ebuild 859 BLAKE2B 837ebfa3106778479403b8e5786a09405d2c680ac3b6d54c54f6f509246bcd037772088b0b8ac664697381044a7bb295812ee0af26a585ae843969918ac1c9b4 SHA512 47f6af66d7ca6a35e00783cf2ec80adbee6084e23faf7934ffee9ce2d2c9cd37541c6b76bdb88493c2c09759730d5553ffc80ed52cfbeedf9e9f4477cdebe886
+EBUILD cpio-2.12-r1.ebuild 837 BLAKE2B 70ea1ca2821538eef1d18bafffbade45ed9a93f6eec98a637e3fdf4d74bfb2f24bf50ef1e53160f5c03ad155875dbb0c4c3ddbb69fb7d4fd9a3f7e27e6b2c875 SHA512 fa86a064698a57a600cf60856e3690059006e96c45632a9910c025223e8bab2b4ead4031458374a8f9ed0ee2ef587e4de84f8e4fe2c175ba17bdb15049297c5c
 MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index f2d138dd76ec..12fb030d70cd 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 src_prepare() {
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index 072d2dbb9762..19f8456175e4 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,5 +1,5 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
 EBUILD deb2targz-1-r2.ebuild 646 BLAKE2B 4bbad5f015e86c02b923ae39fbbe51eb6c04c95b5977dae1de48faffcb698c611401cfebad4d06b13aec7ea8acb365254fa26267be0c60e6a103634d17797d0b SHA512 496a8acfabeff21f0f0e14dba5242d23f1cd1820c7b0bc2ebb2cce8ac5ab12582a9d1dfd75966f2ca915303064ff06962e4b48da89bc2b7ff4101fca0e2dee2b
-EBUILD deb2targz-1-r3.ebuild 620 BLAKE2B 1c133e08f12e80914d91deac2faf9e6944b50b992aef3bdcc781e9066d4f58b5add1a9e6607e4c41ca0058bdc399d8919ad779007124016397b123382e2de2a2 SHA512 d9e5da4e10599eca4159cd8c8804777b82bd95d4a343245281c203252431cd239ee716a58097046e049ffb1257e899f8b88a6d38b73a78a64996e0077986ce64
+EBUILD deb2targz-1-r3.ebuild 619 BLAKE2B 273b6e1ee8f65588884a0355aae48415585df23e8804780f9ee52a9e7b4b2286d2ebc4006f28f6a9dbd4e4432b61ebbcae3daef12023800a4dd81fb3aab8b555 SHA512 2711658a204e8bc996f97abb5f86b506012e4ea7a5f4f5a601324c01b662f63dc77ac26dec9afabd39a1e27a9efe0d3987c5ded6b24656b3469fcd41adf98377
 MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r3.ebuild b/app-arch/deb2targz/deb2targz-1-r3.ebuild
index f34c0c35c90f..6670f17fb306 100644
--- a/app-arch/deb2targz/deb2targz-1-r3.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 1ae985d44133..3c15f3b35b62 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,6 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
 DIST file-roller-3.30.1.tar.xz 1443340 BLAKE2B 352b094b51d342ac71f2174b59dff262ba46b4697c21164ba18bf825d70cb609d59a35ce0efe1013e217e86754822accc11c59eb9bba7185a9f7efe5dded4def SHA512 8f3f55cd7d6769fbf8f72118bb8982775c3f83534266db1f2cc9bbfd9e8dd68545ab49baaa4e468ce22e616346dec9c99c11a0c5b4208dca2e648fac8756cea7
 DIST file-roller-3.32.2.tar.xz 850256 BLAKE2B 5e7f8fed74ff3ff87079753d3fb227cbb77c0a10b75995b84a6019e13434dd4bff16946d38c2b340c85f5dd7879692cc5edd4aa9471f30ea92d2a7fff5176296 SHA512 d1c1e08f12ce343c23c43816305f75c0f3a3f3df32316805864d7c39b5e85b5a00e04a355a0dd8001db8e01ae089daf3b72c3f38fda582795944a6be09451b2a
-EBUILD file-roller-3.30.1.ebuild 2126 BLAKE2B 3ca2c6d6f7a288570dd54b2944962b61358c06ba1182a84a2d025c652103d67af751201e934867743e00e19cd0fe5e4004ebf6943931016351e52eef1b6a6ef5 SHA512 e642ec6cec104546dd84e83fe3d9f54abfc79a12ab2d2eb56419c431ada3e2a90b1ad269d354a8c18842456f753707cb9a4838eeabfee564092b960147d64af4
-EBUILD file-roller-3.32.2.ebuild 2164 BLAKE2B b4b9116e6d5dbc6c8277d18f3e48ef1c31d6de661013eec03dfcdbcdfb8d17a1394ea0980e8dd17cdd741b9fd46759821cf0cdedcb94658df92ff69ff9e66a5c SHA512 cec9ab9b3b6b07ae14a479cc63b01a3a7e78ec45dfaa5884dbb6e98abf1b2d8ee4ee9a429b6f9295b651b8e5497857861abd9a7560be8d2f6060b881cc91d673
+EBUILD file-roller-3.30.1.ebuild 2116 BLAKE2B e74170fd5a3a89c792ea698daf5b64d189d03dbf5b63731e1c308a033ddbac6dcb0ca67429aeeefff694e01090346cc4338b06f0d6f3f4d62b38adf73e39c785 SHA512 b507d420a53a1b718fb3c967b5856590dfa46ba4ac9b58f0c3f6942cb83edbe0f66f2e72c44c38ea4d8fe89ba5f4d3169c6ec1b8251425b70b7aa5f8d958d0cd
+EBUILD file-roller-3.32.2.ebuild 2154 BLAKE2B 18c77663cb55bacf952c39835445e50a2042cd8fc0602f2db7f52fcfa9c47abb7a0db21a537c4103a638aaf75b59d42161ec162b75a5636c7776940cd4028556 SHA512 64d9d57432266fe45d9b10211b1417e7d64ddc483f266a535bb16f6e4fe9ceffdea24032acdd09459975963162051289084990f92ed22c5e210bd834927263b9
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.30.1.ebuild b/app-arch/file-roller/file-roller-3.30.1.ebuild
index 5599e241ed3a..0f65e25672a1 100644
--- a/app-arch/file-roller/file-roller-3.30.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.30.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/file-roller/file-roller-3.32.2.ebuild b/app-arch/file-roller/file-roller-3.32.2.ebuild
index 905771e02117..40854a846ced 100644
--- a/app-arch/file-roller/file-roller-3.32.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index 934be68a6e60..ec4b4ce4e907 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,6 +1,8 @@
 AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801af378d4f1a5953228e3485a7a0fd497f55e03134bf446f44b89e3c8cee9547b7d6043da2af8e8daceeef01117b SHA512 2371a86ad9961937c625fd29a7f6229038ecf9ec48591ec0e152d17c9cb78c8524a31c7b667ecf9e630a84abbfc334541aec7be2d2b30b51c0fe286c0028a8c8
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
+DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
 EBUILD gcab-1.2.ebuild 1144 BLAKE2B 6a3c33843b194eb03b929478472d139e35152f80dd466b95b320b6c4089a81b4e0d8e1b99c1ba8a9dbb3d76e792ed60925bde29e0742cc4ee37ac90a525a8c88 SHA512 28030c1f3dad612c89c732657a2b2345cfe0f888c366c8ec814f528abaadbe9365f892cc5b62c41a78040b4e11d5a9a51d0b6d475a6efcc5a1d25038cd9fec79
+EBUILD gcab-1.3.ebuild 1121 BLAKE2B fc70039d0b905a76d306843e2afb824007bceb312ce4d2a70632f2116cbb834cb9e5a0ae470f1e0588a5b95947ee9a6c8748c1b86cfa18ad26ddfe20eac9be4d SHA512 e383c7ff542f5638ec36219b87534c8004ae7a3b31594e9e4416ec96f1d4bc1f64f36b64d501a388badd7efc9fd6589e9f1569cc2028d2840f986408e3dda4ee
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.3.ebuild b/app-arch/gcab/gcab-1.3.ebuild
new file mode 100644
index 000000000000..cde2e418f9fb
--- /dev/null
+++ b/app-arch/gcab/gcab-1.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
+HOMEPAGE="https://wiki.gnome.org/msitools"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.50.0
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection)
+		-Dnls=true
+		$(meson_use vala vapi)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index e7d01fa618a5..724171fc0a68 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,6 +2,6 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
-EBUILD gzip-1.10.ebuild 1145 BLAKE2B 94610de53a805029e6462fda3772432d44230c0ac27c19defe5442d01911c6ae1016d3fae122b82ddaec60d9966e43e5647fcc6983633b58163c4f647410e450 SHA512 bd3261c933df7fde3f6de90988fb96469e75beb7fed1b00cc53d70215285ec104d5cfe6e2653f95353252c34d723446d47b739bc006d640bbeaed489b8a914bb
-EBUILD gzip-1.9.ebuild 1174 BLAKE2B 87d13ce95327ba96f7a1a98b4dbbd0a4a6485f7150730200a97a96c0e204448449270487203435e0978a6f2398ecc3737c2205a3b51d96ae22bbab79fa8706c6 SHA512 4b49d9e5d6596c836b8ae4df64006263abbd68ccc63816b8c591cb88cd62592acb23c37b2046283498f4fcd1ebc0caf6cdbee2314748cd9ca4545c4bcdc956e1
+EBUILD gzip-1.10.ebuild 1123 BLAKE2B 1b462094be39010a69fe52ca6985471549f1229a52799ac5ea6bb948c4f13bc75da4155420d1ad71a94d40ef7b11c850a3deb3b8032379828575e9eaf6a88338 SHA512 9f9d38b1f7913dd41445672cc9d88529253130dd27867fde7e6e1f3ffdb97f717cb9caadcdd92bf101c57f96c36a4615db734518ee146bda2868873b81b47979
+EBUILD gzip-1.9.ebuild 1152 BLAKE2B b86b54e278d2d1739624ed750a2956ed9b4c2e32b11c141dd069bf78137d8db83c1724067179080c87f7869ab9eaa6dcd798b6c88c9f421d5f251d5b97faf514 SHA512 c521ca7a81063d5955faf2f690aa170e8512f0be2e08dc3f44c884fb8334be2cd3a6891f4d2e0b988a746e24aa0bf77a2d2832289b10ecfdda4ef479771cc465
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
index ce3be1be3de2..8a25973c52ac 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index de6e71841bf5..0ee46eb0c392 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index d9aa449f923a..16f0f0555e8a 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -1,5 +1,5 @@
 AUX lbzip2-2.3-s_isreg.patch 500 BLAKE2B 7839d78d204c0b88ee68d728d1279dc2bc2e6222046cb28c60001c194513de7f3343dfb93d6db91bc4424fb639e2a1cbe428db1ff6753ec2c5b3c004a2b8f321 SHA512 3158763b364e8ba41b0fea03529c6e4a0c6f3d17e7d0ce796fc9a6f6bc7e70fa7db759dc205026818619e137fb6343cf21534014b64dbf07c1cdb3bc1059cc04
 AUX lbzip2-2.5_p20181227-fix-unaligned.patch 1061 BLAKE2B a8c11adbbf53806b09d9b0b6b724247a17e450eac6953a9d9852539ab6d50901d739b243a0d4c72cc46cd7bfaa609fd6829af659e0c6ed6987e6725c471ca201 SHA512 0ddd04a06d2cc763b454074aba588d2cb252e0ab8c83c37133deb5cef2c265261fc38f6b32f8aed5ddbbc8aafdcb29e96df1b61f2f2cfd2e1b93818efd69114e
 DIST lbzip2-2.5_p20181227.tar.gz 704920 BLAKE2B e5da0091c0e4fb73724c5ea472d757d76356cffbf1fc679bf4ee05e25690b7712dceaf17f355383bfd4eb525c4aea04c2e5312592df5bb99159e000769bcee2e SHA512 53b29721a106d280927f2c18f33247645bb7fb3e67d835885d73e037910bf02e473f1210d848df41a387be30f829213d98ac9387b2a9201b94d12117809fbcf5
-EBUILD lbzip2-2.5_p20181227-r1.ebuild 837 BLAKE2B b05e6ea81314e8de6bea2464d2f90e93cf7b5d7b1da4406c06c45dcbdfcd53826727b59e89112ddc7ce7bb301356476ba91bf808ed53f5eed579ec5af956a0bf SHA512 e709c741968d528f8bc29d7fd020a7cbcaed86b3fde44da35e75bcde01ea3e8137e2e07030053862f72a06d1fbac2b18a5ec7d6c16ec0f92300012001d7c511e
+EBUILD lbzip2-2.5_p20181227-r1.ebuild 815 BLAKE2B 374811b62c73303b4da573474fc36a4c6eb35b833274febd275f961121ba06892d31d11c0ab16a1cc5877d0626efbe3cb6057bcb6182e5bd8791cf2fd3fffe72 SHA512 f30d243efc5b2671a079a6970029076a7b99468d558cf15399486287016d599ccd683837114145a1a6b954339a597765ca03ed3065a3b238b44018c1d3edf7eb
 MISC metadata.xml 534 BLAKE2B e09b3c70d05c66c9edffa19cc3e52be55ecade605c97da4e2f4f6c930dd1ebb548ddb873d31c50c995c0493fd3329978db661796c43ae029a5db79ac0e1974f0 SHA512 86b03f188fb14168b7d2d6956fa2df4941d94c95ff00e6bfd27451fe76b9318dac477bdb13b6443ae0186837335d66cf3e52ddc4ccc2f2979e60fe287f5ac2b2
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 7dc8fcd267ff..073f5bfe7c28 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index 98491e3a6f6d..e3c67e1a6f34 100644
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,7 +1,7 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 AUX lha-114i-fix-getopt_long-declaration.patch 263 BLAKE2B d5b53f0624a9b039167289f32369ba2b2905e8a223201404ba8d9a63d1a2fd9cb73f7e5d40fc2a14bcb510a4e49905545947bb21cfd38871e80c92591ba0007b SHA512 0216d24e001b7dc0db179d8e809fa838fd1d1d965e7d3f4ead79b9b276c39ee2666d6268fd835f9ce35664452d662aaadeeab00cb121f3485765db4c6be9d145
 DIST lha-1.14i-ac20050924p1.tar.gz 285518 BLAKE2B 7e10ee4cfaeb7212f9dfbe254d33ec7b97bce41a042eed3d6f826790650f5059a19d2a334cc41a86112ba8d80904168a0b3c2785e7670577b2bda0b4d27f0dcc SHA512 efe43d407d273f8f724f7b205223bd122c76adac4b67ad5e9811e88cae03f1f3c3af4297aa6f24951a02558975bbafacf697e97ab0da578b4e0115b89237566f
-EBUILD lha-114i-r7.ebuild 991 BLAKE2B af079ce8bcb696d6f7486c14e4faae0d4767e81556c85dd0c8ecf96e33d4d979b696af26c27abb7598e4410355193e2cd550d0342c555214f71fced05e86b674 SHA512 58af6daefe2f32f9479496811c78e0b224196da43f798d9734ee2bb4e78fcefd143bd2b01b409c8aeb1a736e6eae3548ef483e4a829b0a5a8d52dd226426a1e5
-EBUILD lha-114i-r8.ebuild 1147 BLAKE2B d8d4589cd5130d531750633b00553f98a59da7c7cbdb77750478a3bb3b6fb5f87a477f1bb524c972cd81c34189006d2371117df5c96b75be799e3f06079daee3 SHA512 fc3be81aba9e9f7d9a27c753ea187790956dcec389a890e6d06e939c0aafdc88a0b7e579f05f57809950f88bc32777b10ad3948b95fe27a41cecfd149ef08544
-EBUILD lha-114i-r9.ebuild 1145 BLAKE2B 3782520dd549dd9e8acef29baa3c9c6dd7913fbaa979388525d76e6e96dc40a0d810510c6b72764346de8ab1be7224095f73f84a5cc81039183c7eca6b91a3dd SHA512 15b7be4b3feb1d850f6e3c7d95f889cdc236d448bc76f7a663a4ccaf99e0a48dc8992c2cb7827b2b39d75c8c4e9a8f036c41dd73eaf6315e800b17d12f4af43f
+EBUILD lha-114i-r7.ebuild 969 BLAKE2B cce714e5920a9d180578fa69914b319ab316f98cbca1c62530d806339a5cad4a195a1b9abd239a2169a1c704905d9025eb17031e5cedf554a0ff4a30497c63be SHA512 4b780963a85cd2edd4d9bf186282aefee42c1f975ccb1c5887ad1a7c004f7eb46ef9fddbd289f959639ca0dc5962798c7bfb9a269c3b46fd6b64a57fb7e37a8d
+EBUILD lha-114i-r8.ebuild 1125 BLAKE2B b46fd93323dbbc981dc9ac6ee4871c1754474b436ec6ad14aca5e1001d0f4b881e3046c52f182e3b3616ed5436ca987a51594587d248adf63a4836408d53a05c SHA512 a5373c91988716b09053285c1df68df582d554e0dc8524f0c8e8cb4ebe7f75afa9df7f4e0d2f58b09c0fb12b42ea71a2c4d2b7558736608ac3f86ed9fdacac06
+EBUILD lha-114i-r9.ebuild 1123 BLAKE2B a5cf91cc14d5900823203b1f6cf12c4830bab5baa573488ab8e7561df3c3473c3515bcb0f89c26b96998ba7df30f6e0839e00a586804131d3b531431a8462a32 SHA512 c76ceab5bac6e63ac6574702dd6801a339b365de7c9a43e1d0309ca61b4ff92e40ab147e737fa3cb6ca13d29de0207900c7017bf4e5549cf04d1a65c66a8feb9
 MISC metadata.xml 534 BLAKE2B 861f00b0b2b6c547ba122d9dbc9da0d9b84bd49b553a2c8f2d2fa5dd7ef7dcd86caca75292a825dccb74becd7ad8c34a4f9cbe71cd5096ba7617953c4f612c7c SHA512 499669685613b31d118c1878fda13c25551d13eedb1532507d2952a490725b1083dd16aaf4d6927bb2cc8ca859c2d29e1a064d15f9d4e099108ad7ea80fc040f
diff --git a/app-arch/lha/lha-114i-r7.ebuild b/app-arch/lha/lha-114i-r7.ebuild
index 9bc254e7cf19..dcf54bbf5ae1 100644
--- a/app-arch/lha/lha-114i-r7.ebuild
+++ b/app-arch/lha/lha-114i-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-arch/lha/lha-114i-r8.ebuild b/app-arch/lha/lha-114i-r8.ebuild
index 2964658932b9..b9e27d7fb4fb 100644
--- a/app-arch/lha/lha-114i-r8.ebuild
+++ b/app-arch/lha/lha-114i-r8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://lha.sourceforge.jp"
 SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/lha/lha-114i-r9.ebuild b/app-arch/lha/lha-114i-r9.ebuild
index fc3cd93847f4..4c171bb8e04d 100644
--- a/app-arch/lha/lha-114i-r9.ebuild
+++ b/app-arch/lha/lha-114i-r9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/22231/${MY_P}.tar.gz"
 
 LICENSE="lha"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 8e33050864bf..fc930dade780 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -2,6 +2,6 @@ AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a01
 AUX libarchive-3.4.0-without_zlib_build_fix.patch 4850 BLAKE2B 2f4a670afa2ca1ec22036b3544d03b04f7cd5fed4ce9829017c07323c45f4d0eae40555856d26a81345f65f6b65d0cb026ae4fa17ed3c1a42392190e390cf069 SHA512 1ae44704d4fcf5477baec6fdbf518dac6b9f40d3648d1a0447c0311b8388a3ab11fdea3db8b249a1cdfde65fcd27c4f41076d3f50444e67ec9bcec1a801775bc
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
 DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
-EBUILD libarchive-3.3.3.ebuild 3625 BLAKE2B 572ade5c05fa4a9951c6ffca4ccf5dfecbaa1a13538ec8f7589823b7dd90f3476722f92afa79d615236811f8838f852c2a68803ac74756022eb9167607de32df SHA512 e87384a803a6a4148517ce235f2be295f6b59c7e8e0bba6a9c0c2b1bc3be90d5eb41d1763efe70a30fce202c77bd3e56b71213135dec26aaf8a5540cc46f1c60
-EBUILD libarchive-3.4.0.ebuild 3691 BLAKE2B f45351446ccf244340cfbce44cc0eacefee6f906b3c35aa6f0c2ded9d7215e70eec6ca1b81f88731ee47da444d8d4683c9b2a55d51438430ca230e89e07683aa SHA512 ef81ab5a6a773e6061729f726a6af5d752693e98b97c07c573d8e4c32fae1c22165d866f46500c2994cbe151f9c828c411b1277d18e5e57eedcd8d4ec06f9602
-MISC metadata.xml 1414 BLAKE2B c210d41cca224da3963f412003cf095cb65fc3ce0752b0f723fa51589e0c424cd40d83699dad0b4939cb19a5d628e2c26f65bd9f397acb259d42f0274f78fd93 SHA512 b875822515c38bde8d4eb20c2124ed62d1993813b3ca647c7eaca884a2f7d7c42832fdb39642d72829d394cbb75017d3ed1a858c35214d7090a0579aba38ba5d
+EBUILD libarchive-3.3.3.ebuild 3603 BLAKE2B 01906589b7af8002258dd85ea51c46588b3c070d20d1480a5b892224c97b428ccd89c0690da086ab0adb30d0da134fed23912a2b83da28cb99c9a1c09e79ad68 SHA512 4393279fb4a17caede13888365798253954a0275812a444586d06ca34ea640321e6d3df06a0e0f4d27f6ee8bde5be6be15c719a1e0a931a122bc868dd9b338c5
+EBUILD libarchive-3.4.0.ebuild 3669 BLAKE2B bc408f72315738ffb1e7b381d9423d5af774342dcf2ad55cc90d227c15fd16359ee6c99df4fd0fd41f87b09ce159f161ae9564d9e6237ca96429d7567b64b083 SHA512 5ad8026a8781264f45bca06ab721977e1abb6f7733015aa1e87cf871022e8595c6eaf389581783cd144bacf716032d0d020c0c690dc67dd8cc17c7368ece27c3
+MISC metadata.xml 1419 BLAKE2B e40e4f003c6b5e23f9b00889644406b5694ccdd4afa354ce4d72e5d5b4dc3550c8d6d70184a24cc247c03ad6430cc1d1e7579a829d178ca56337945dc602318c SHA512 f5ddf55a12dca3998849f8b414f9603ba6f17896e3f7f955b3c90276dfd306c12b97abad76cbc0709823b28b029427598e272418a4e0eee5c7942272674e65ed
diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild b/app-arch/libarchive/libarchive-3.3.3.ebuild
index 50cb45ba6497..0425e43f5886 100644
--- a/app-arch/libarchive/libarchive-3.3.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~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 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/libarchive/libarchive-3.4.0.ebuild b/app-arch/libarchive/libarchive-3.4.0.ebuild
index 47f77c61efdd..ded576e7b675 100644
--- a/app-arch/libarchive/libarchive-3.4.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 
 RDEPEND="
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index 553fc08711f4..1da101e8d49f 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>bsd@gentoo.org</email>
-		<name>BSD Project</name>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
 	</maintainer>
 	<longdescription lang="en">
 		C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats.
diff --git a/app-arch/lrzip/Manifest b/app-arch/lrzip/Manifest
index d0edfd83dd16..e7bd363f5f62 100644
--- a/app-arch/lrzip/Manifest
+++ b/app-arch/lrzip/Manifest
@@ -2,6 +2,6 @@ AUX lrzip-0.631-solaris.patch 372 BLAKE2B 93bfcfd952ebb976ac3fb2906eff79dd88b799
 AUX lrzip-missing-stdarg_h.patch 259 BLAKE2B c191b888f7849030ef4584f3a461bd14eb44c9eed2d9ad2126ebf54f11f57f877a2c6e50847d53d6ab14e3a568118def65dbe7cbed522af411f3becca4ef0827 SHA512 33775d10e2588f55030033b845bb086abab9fd82798dd3257ab26692bcc3619169b32687cfd6d94de1fcc5afde8fd3eb4e2a40d9133249b5e83fd32499733dc8
 DIST lrzip-0.621.tar.bz2 503286 BLAKE2B 3fb80f72f0bb81340d4e83b996ad2cd94fc0067b8e67599defb535e86614ad4a2436d8e6ab00bae24e4c9799a01aef267a7078cc6745d68acf868d0f1dbd606a SHA512 be94f54c3d84c93e3c1ab7b08ca6d2a02bc343983785be4884f42521520d2babc31db3abbec4b77dc9f710d18648adcc3d24b203289d8d4728afb3ef0fb90c0a
 DIST lrzip-0.631.tar.bz2 522158 BLAKE2B d0ffe63e1bdd21304d6d7a7dc969d4e79770fed105cf03ea9d504f890cda35178566afa5f88e13beadcc1095f052a014deada3b3f102247eadb8c746d989d119 SHA512 6420cd465ccd4581066408482335a82089f84f0aca1b05249b9fc6039b7e67df94457a7c871859e363206df3a40e93cfde576388785113f6c99b31d34c00a307
-EBUILD lrzip-0.621.ebuild 767 BLAKE2B efb27ceca33a204d0aaa2da56c06330bdee315c8dd722e46f6e3132f90f3ddba2b45f04718e8e8fab7c99eb877849255db12277bc8b42c4a4a006872be62dbd5 SHA512 837be30ad4f39f6a406789f48ca673869a588c71e8b83ee83498c64e56bd3b85cb4d5f44479eb095481c7fc04755a2359e0132bca5fa4f277be88e6649fad6a3
-EBUILD lrzip-0.631-r1.ebuild 1015 BLAKE2B 2b8da1555b9c184ea177731d43a6fe47ac9682d3301f2a400a8f7663421b4a51d2a449fcceb4c1306174249c04a3a7ed24da64e79029c26867c79a4f1e00cb54 SHA512 1fc98949066a4769b538a73fda86f484df6e1876ce9e1ea15d138cdce604f3025b8b50f1aeb6f00aa54d1b2fb55c58beac63bd65ab5932ef12cc6444dacf8553
+EBUILD lrzip-0.621.ebuild 745 BLAKE2B 12ef6b7b498e7978b590dab5ea4842bb2378235a0b2348eeed8645d12d4ed4db1b4d717f801d87f15028ef0c9e32cd9d0b72e666f4c56dc57247573ed6d734e2 SHA512 65d3dcaca49a97b840f271ab93b1ab0ff9a64dcce99907f6d6bda28c6db0e9a467c00a0731bc0462d7cee4ce1a045bcdb2ea01ec05b2ab9803ab35c183cc7bff
+EBUILD lrzip-0.631-r1.ebuild 993 BLAKE2B 0921eb7f050fb6e8b36c969b88cea2a25224c03297c43dd560c39d2b85e5fc9167c628d4082016f95241c813d99c18c25ad3fc0493915a08570e9641b8427ba6 SHA512 ceff4787d87829524566ca225564fdb7ff573efd797b88d9bc482b8413d6276dfaf18262dffa5698d6562d266fee817d076ff75289b86c6fcb194b4b8455ea37
 MISC metadata.xml 607 BLAKE2B 818153c4b56ca259dd824e13c396822f5373d094d50d104562984032f7656703dfd75e617d1d03279c05a52334a265191c633cd609d6c6e948a20fc937f866ca SHA512 7236540b6002789563681648ef8016c9b692f814134fac72ccaf7ada302c8cec3c53c88658bbf2afde7625d8c756dbb5efa6b8d395f8436fe028ed0d49c5206b
diff --git a/app-arch/lrzip/lrzip-0.621.ebuild b/app-arch/lrzip/lrzip-0.621.ebuild
index ce92519fb8b0..2c3c973d99c2 100644
--- a/app-arch/lrzip/lrzip-0.621.ebuild
+++ b/app-arch/lrzip/lrzip-0.621.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-libs/lzo
diff --git a/app-arch/lrzip/lrzip-0.631-r1.ebuild b/app-arch/lrzip/lrzip-0.631-r1.ebuild
index a7f80ad61a56..4f1a1fd92f5a 100644
--- a/app-arch/lrzip/lrzip-0.631-r1.ebuild
+++ b/app-arch/lrzip/lrzip-0.631-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/lzo
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 707ce64beed8..2e108575ac3b 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,12 +1,8 @@
 DIST lz4-1.8.3.tar.gz 327897 BLAKE2B e2be80be14c67cf1a07cc6a2e6f6777a87abdd15499b9c32b8096e09284aea19620adf930e28454ce105e325cff684d2625e0a38211705f3c105a80b72f56be5 SHA512 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f
 DIST lz4-1.9.1.tar.gz 285336 BLAKE2B 50dfad2e92028a1ccfe186efb5dbe24e4641e104da656990ba5138a84d29fbfea26d96c2d7f64f8d6a686dc98b4890990a280d4d86e321b04f467b65b6c61e1f SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e
 DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
-EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
-EBUILD lz4-1.9.1.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
-<<<<<<< HEAD
-EBUILD lz4-1.9.2.ebuild 914 BLAKE2B 17ccd03f4c90a6973a0bc5f7f9ee6624a9fa7adc3ea5b54c5e0359e81dd9e05e25ee0021b526faef9fa6e02fd910c553b44652ad9908c64c17229b16a2443c80 SHA512 d5db3864b0ece8d826d57dd689b0614329b1fc4ca6492829056cb12883fa8110822781aadbc6fb9cf9c96d3a22ddd0f9dd200093adea582028c2592321479cb5
-=======
-EBUILD lz4-1.9.2.ebuild 911 BLAKE2B ce27a83c0cb654c501ddc75529a5474e9eb1c4b91b19cd4681f740b188df16e3fcea491de6a6a383ff4be326a70000ee5f60b608aa7503f651e9902526e0d72f SHA512 d33c13af38282e5c3afdc5e61f55f2b40973c06555d5db61bd412185179b5103221babebca007dab72ad7615d4a79c6c5059442bc152ddb0b94f5e9dc0e843d0
->>>>>>> next
-EBUILD lz4-9999.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+EBUILD lz4-1.8.3.ebuild 899 BLAKE2B 1176dcc2975061f7b064981cfae6b73bdf15530a00f23a2b86d79cbc579b1d6f89d725130e684172a1525dda8e7c26d0a1a875386144bb357e513c0c733f2174 SHA512 781dd041acdfcd7930f75e801b04b8c45329a1446754893a6e621c958ce10fa08e3a21beb0178b2b737c40ae868906b304e6bc1dc36deeab2910552ec6c4835f
+EBUILD lz4-1.9.1.ebuild 912 BLAKE2B e4cdda81ea0a79c7fc3a70510e7180b7925547be14e1b373a4690032aae8abe9fb9cdef6a0e4a5db758db9a96aa5854ba9e52fda1ed47e9dcc1c543dc7541a89 SHA512 a5a2960cf77ff026c77c60bf0b19de4297a3d20ccbba1addc2b7b86f30ba8f7fd2a0d9a5031ca8f0368a68a32417eec1d20815cefc33a858d260ba9f3ab8ec8f
+EBUILD lz4-1.9.2.ebuild 899 BLAKE2B ec656e181dc8f59c9800ac0544759708916615540d30a03051a8a43049a7589f557a34177d2172fce52e13bd02507da6d80b17ffefdd2ca0162022268ea4cba4 SHA512 c4a7ee9880189e00af914b0ebaae76aaa9350964b5ec8fd30f81d91a062ef04e2b07f49cefff69473030528dd6363fc02c7245e1d1409beabe2d08971f65527f
+EBUILD lz4-9999.ebuild 912 BLAKE2B e4cdda81ea0a79c7fc3a70510e7180b7925547be14e1b373a4690032aae8abe9fb9cdef6a0e4a5db758db9a96aa5854ba9e52fda1ed47e9dcc1c543dc7541a89 SHA512 a5a2960cf77ff026c77c60bf0b19de4297a3d20ccbba1addc2b7b86f30ba8f7fd2a0d9a5031ca8f0368a68a32417eec1d20815cefc33a858d260ba9f3ab8ec8f
 MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699
diff --git a/app-arch/lz4/lz4-1.8.3.ebuild b/app-arch/lz4/lz4-1.8.3.ebuild
index 15202148199c..b0acecf06f91 100644
--- a/app-arch/lz4/lz4-1.8.3.ebuild
+++ b/app-arch/lz4/lz4-1.8.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-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 m68k ~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="Extremely Fast Compression algorithm"
diff --git a/app-arch/lz4/lz4-1.9.1.ebuild b/app-arch/lz4/lz4-1.9.1.ebuild
index f68caa90b673..2cbe311b2b2e 100644
--- a/app-arch/lz4/lz4-1.9.1.ebuild
+++ b/app-arch/lz4/lz4-1.9.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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 ~m68k ~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="Extremely Fast Compression algorithm"
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
index d0dfbdbe0e15..e5f48fc2de57 100644
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -11,11 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-<<<<<<< HEAD
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
->>>>>>> next
+	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index f68caa90b673..2cbe311b2b2e 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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 ~m68k ~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="Extremely Fast Compression algorithm"
diff --git a/app-arch/lzip/Manifest b/app-arch/lzip/Manifest
index 6a07e28ffd28..46c0c1bf21ba 100644
--- a/app-arch/lzip/Manifest
+++ b/app-arch/lzip/Manifest
@@ -1,3 +1,3 @@
 DIST lzip-1.21.tar.gz 105558 BLAKE2B 07658ec901bdfc255fef5af24b62614b2db9821b9a2820daa5137fd47ede0b68bbf3eac340ad5484d2ef7011d15c2eaccf19abc9e33b5c96273fc9b9d323083e SHA512 02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362
-EBUILD lzip-1.21.ebuild 861 BLAKE2B 3774236197625b01fc21762d208433ed3af023fb3e5c447ff676d0e8869551121a04ae39d688c37554457987913927f1108a1f48eff6b00b8b4fb8f591db3f2e SHA512 0eed8b58844b8a6c62ebc5f2f51f9b0aeb53bfcbde0fdf6e8b5cac51876ed7cfaa4113b618ce5d412e53737fe53ff64c029e1c46ad284c1c135a56e6c906a562
+EBUILD lzip-1.21.ebuild 849 BLAKE2B dca44b0129c44ef25007ff3e091afb20a1b6600bed93ece6769ebd0c750e965a7f5642487065cd9920fc5dc511ab67bf56155efcd70d0cbd8fdf0660bbb5c1db SHA512 3bcb95dc586c04b87dde043c004dc6cf6d2157675883b1d4b23560fbd1c95345e513fda0956244f8f43416e224cf417efea78fb5fb3513c037a5cc8ec604aefd
 MISC metadata.xml 357 BLAKE2B baa377044f421ed8bc913a5bbdc72e49e026bf0529190f07aa2d0081208870453f140af7ce3d3a97121b563891b4a4b36196db233a3fdb6a98b6eee34af9e9ba SHA512 e5f560cf4a71e085f50e0710d39e81aeddff8fb72fb07126f86a080970dc2b79acef11522b2ca471fccbf4e20e34ea57712b0b178eaaaed7c9ab5df9910542e9
diff --git a/app-arch/lzip/lzip-1.21.ebuild b/app-arch/lzip/lzip-1.21.ebuild
index c33c93d78fe9..989b82d540bf 100644
--- a/app-arch/lzip/lzip-1.21.ebuild
+++ b/app-arch/lzip/lzip-1.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.savannah.gnu.org/releases-noredirect/${PN}/${P/_/-}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-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 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${P/_/-}"
 
diff --git a/app-arch/lzlib/Manifest b/app-arch/lzlib/Manifest
index d6f7fd68397e..3e725d9f5e28 100644
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@@ -1,3 +1,5 @@
+DIST lzlib-1.11.tar.gz 105873 BLAKE2B 6caadc4c3b78db835bcf4f11e5290342f0f952943006589345898a85211b0a0ae5d775d0a8e7747c549eae00dd0abd2e2afb5c07eb75b4fda712a9361a71bd59 SHA512 5aa3ff084177efe906518724a98a78c32d1c0e02b967800a44388fc6af441de48fcc5899457913fca11fae3beb8bebc260ac447f0a336b1c14f3f13726114567
 DIST lzlib-1.9.tar.gz 96147 BLAKE2B 17de794c1823558a804c93a4df14cd75e66eb8ebb6d62af1ef7349e1ed187fc77b57cc44901af76767871632dac2dd624f9e4313226fcf41225d140b5c64f54f SHA512 2d36e0b27f544fdab958dbf7d966b41e44c134382ec9f792d94dacf60355eadc25a1cf2b8b7049287995fa5bfc27aec0f3e4253304e3b10813c96b0609408278
+EBUILD lzlib-1.11.ebuild 722 BLAKE2B 18282d343db8b9b4369f5e51ed3d200329dea04309ba542425f5c022c5f65236e83f1af86813c39d38e17386a708e2858c2583a08cd8e03b9b011f684f9fdcf6 SHA512 fabfe95e56384f974f7af39f42d8042187e80a481302fb87afec1dbbb0656381461459c27a05e20b8beafc6caabe48a785f026c587c8682dcd1ad1eff79b2c1d
 EBUILD lzlib-1.9.ebuild 725 BLAKE2B 7bdc92b62acac168410f61c4fbbe667fbe0ccf7811af9f85a3a57d3057941046fdd77e27b98e3335bcce30b9a39fe8658301bfd2d4377f093898b9381f390931 SHA512 c1bb9e14b7402262e738f190f989f8b2ac637bed38fcb293965ec836f3397bd556ddefc0876db5c27cd90b53cb85f486b29f4a340f465ea4331a7ba5b7a38825
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzlib/lzlib-1.11.ebuild b/app-arch/lzlib/lzlib-1.11.ebuild
new file mode 100644
index 000000000000..b5c07f78748d
--- /dev/null
+++ b/app-arch/lzlib/lzlib-1.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Library for lzip compression"
+HOMEPAGE="http://www.nongnu.org/lzip/lzlib.html"
+SRC_URI="http://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+
+LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+	local myconf=(
+		--enable-shared
+		--disable-static
+		--disable-ldconfig
+		--prefix="${EPREFIX}"/usr
+		--libdir='$(prefix)'/$(get_libdir)
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 4926734cfb2c..17dc8b9d31f2 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -1,3 +1,3 @@
 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
-EBUILD lzop-1.04.ebuild 972 BLAKE2B ed9c89cfee1baf3a225b58ec785cf952f1b8d8c660bd43d8041783d3d0b1f39c2f3d62f7c23ba24083230859aceeb6f7eb5d3dc0a4d47401f6ae7907a9ed5d61 SHA512 539462862596468abd73792d9b91dc0f6987fc7be013169e6a73b1ba3b39d2e43187612378e632e935785ce1092b08f94043b007c973620a72bea507172b935c
+EBUILD lzop-1.04.ebuild 962 BLAKE2B 2412ed5d7c9d6d900858b0d63e78b40287b6946d444317c0801c4e0befe0f51987564cf61c3248e33e6ca2a3c4cbb9c73845abb6a960a46e0b91a16ab2cceb46 SHA512 2c09f000ff0c2057b0b2142647712ceed8a04093af9de0d7a7defc350907d599f2e6d97908c01f6197fc7eadfbd29b838ced9244e2d20fe216e9462490de04c7
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzop/lzop-1.04.ebuild b/app-arch/lzop/lzop-1.04.ebuild
index 31e4fc993cba..b975eb180769 100644
--- a/app-arch/lzop/lzop-1.04.ebuild
+++ b/app-arch/lzop/lzop-1.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.lzop.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/lzo-2"
diff --git a/app-arch/mscompress/Manifest b/app-arch/mscompress/Manifest
index 707b7030e972..a841b22140c0 100644
--- a/app-arch/mscompress/Manifest
+++ b/app-arch/mscompress/Manifest
@@ -1,5 +1,5 @@
 AUX mscompress-0.3-amd64.patch 613 BLAKE2B 310ad5f0b5f068dfaefe3916d44560a7b29a3ba41a81a87b0db65cf3210a55ec4b7ca4ff1d9c15c282e6d60fa7d5101d65489865276e4e81e784dbb68cfa23d5 SHA512 94d17fa87a0ba7029569da65e8f22af834b557db1c0a4715afe3afcfc6cee63e7bb604bc37f700729c2efe08b38b46a940b4ee8fd426e293747fb4003d7f53db
 AUX mscompress-0.3-makefile.patch 467 BLAKE2B bb5c6f88194ab577e167b0c0ab4f0e8174674d82bd3337e8c618532084811bc0ac8521b2a3950d5cb73d164c620a6ea3a5c22d93682cf75298934be8864495ed SHA512 d633867a102ba099576c6671967c802bca293a81896ba6ecd5486ad025dfa66220dec9ecc4615c97db22deea914183d8dbedf5ab75221abeb5a65e0c7e949669
 DIST mscompress-0.3.tar.bz2 40989 BLAKE2B b8aeca23fb62a6b4b779da4d4155ba835085e79fea0d69d4da2e65ececb856531d43ee45b44c24415d5827c749c3dc7ceff9de3043fc6174244939a3f75b4c68 SHA512 e69a95e9c12979e852227553028b578f324ec38472ead11f9c0cce85b77bc817ea39d5ecf74599c7935c692eaac537456ebefe110400514a3c834b12597dde14
-EBUILD mscompress-0.3-r1.ebuild 799 BLAKE2B d600170377899df90f44660317950e3d88daf20583fdb7561d0f280e021a4e62417f86dba4762ed9d8213167aa4355c49e9da103e93fbcacd7207b67d1644066 SHA512 4d095c633591ea3182f4910674e72cdf8532a4f894cbdae7ede263719c371936a080f18a8669396ccd542fd8595e331da484dae13cfcb097d1ee44b8ed8b2bca
+EBUILD mscompress-0.3-r1.ebuild 789 BLAKE2B c3ea5b73c1631735fd9fea44e7e5a741bbd2d143ddf8aed6112ae763f96a140cc20b96d3dd234a6e3666535f99a8d0f373d1548f1567911a4c60bfcfd08bd261 SHA512 c23d1f7b6b3c18add2795bcde20068a30a385c2dfea8e9d7c852cade54a1b3deb6971413300acf90c6fd800ecc2214cef55b65e3e3615137d600e8a77094e3be
 MISC metadata.xml 368 BLAKE2B 7e47a9f9006d136b7482be3211b16fdcaaa9b4f0795fbd155d39dfe1c9b6c53113f5558ec9f93b78ef4832fedf0438c593f62e8aa89fd0598f9b7a12e2370174 SHA512 4e24e69033ec97407b9b9f7a496762b76a54ed9e9135f71c34d5575c8b604c20054fe34d189a54172af48c5f2ab26f167ac1b7b3852a481e70aafbe2d2298f20
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
index e7a2b9214c20..76d6e64551e5 100644
--- a/app-arch/mscompress/mscompress-0.3-r1.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 0acfc812c4a7..7c00d6a26c1f 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -4,5 +4,5 @@ AUX CVE-2018-10115.patch 8946 BLAKE2B 21fc8367ec1c811119bd43b5ca8ac1399748d4fe0c
 AUX CVE-2018-5996.patch 6427 BLAKE2B a60d4c51470d9a1ee58afc4ced5190dc589c78604dfd8cefdb5f4caca74d73f175722f777c4c13839951178b394c44b69577c8b5125f45581890dfaf1325d47d SHA512 7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40
 AUX p7zip-16.02-darwin.patch 2134 BLAKE2B f8890b8b3e0a3ade007f162e5d3b7fdc9925e8960c6e22463a5ebc474e4ebb2577f0cc0312fda6c129bd1a02dc3ac6d3de17f2c551ee710ab36d0658acfaec52 SHA512 ed8689e39e5bd55eb9cc74c02c94782ac893fc30079492dbde459f24d07037ca63c91526ea428934814febbfbcd1f80c0683cd40d48eab055a3f856b1d78fb37
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
-EBUILD p7zip-16.02-r4.ebuild 4637 BLAKE2B 1f47cc6b98a0b4bc5d6536a6379e3a418f5c819eb76860dd599558f71f2575c066e3f2ce671a0a819f07f38aaece402568e03d9a8217b3d9ece07ed31fc8c11d SHA512 d65d77186dd0da7cb685eff2f92f6c99343db73df1e4950bd4e7b956d1f92ef4113009d913ae03fa7a19c6c8233d96aa5694841405caa6296a67a6bc853dcf36
+EBUILD p7zip-16.02-r4.ebuild 4627 BLAKE2B 90a10ba5d2b5d89f26e631b7059a76877bb0bb969e2c093c0e7ea4615f7497f7fe1e92e9f06c8f53e60bf41ff8eec00511ef0cf799e1408453548ff87dacbee0 SHA512 bbdb642df5fca59771719a2871e38d4be199a80a6e5b0793d42f04ce1a474263ddf02a13954234d5d9a82482a30d1bc3af165baf510ad22105a79055bdbb6660
 MISC metadata.xml 393 BLAKE2B 6ab87f3e2f35dded47136efbf8f93c7a899a5918b4a8e3ab6658a427da8085e8eb0e6ce2aec09fd0ea5fb14909081600b79027878b7e5b8ef9d476def057e52f SHA512 50eb24c1e60e0be2c02d8054a5039c5e2b11ac82aea3f90c0a37c21e68b01135de88878b1079ec46eeb8d1f8ab52fb8c9f58f88a498feb38ae5743adb7519176
diff --git a/app-arch/p7zip/p7zip-16.02-r4.ebuild b/app-arch/p7zip/p7zip-16.02-r4.ebuild
index e33c8523e3d5..da1b64126563 100644
--- a/app-arch/p7zip/p7zip-16.02-r4.ebuild
+++ b/app-arch/p7zip/p7zip-16.02-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 652aab9e7624..1fa185bcf110 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -2,7 +2,7 @@ AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d3
 AUX pbzip2-1.1.12-data_truncation_fix.patch 3348 BLAKE2B 848afb0cb6311a28ba958346fdda210aa7bb325c8e3a174c7359e574322f8eb41a04d8e785aa70332de953db170706e9c1fefef6d7274ebfbc211769f4dc88dd SHA512 c6bac8fe33f9d123358c1a01cdb94a8dd6be4c63553f62568311f06b25cf371ab7d881797ebb0d66d9f772c5644fe1f38a70fdbd64b99adaaed82f1e96dcc966
 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
-EBUILD pbzip2-1.1.12-r1.ebuild 1122 BLAKE2B d1e86f7fdabc1a141aaa5443e9737c214a69c812ff9dacafcbebd5e9ff7bc4d9b43881dda6f637213e8f411c5d3e9e959c18509499596dca6680b37dc379db9f SHA512 137c5d554c2cae6a9db6010037aa24c1edcff8656ee524526eabde2c175543f596cd25d87f5fefa32567ca9b22856504f52a5f4683c6d619f7fac87dcd47a2db
-EBUILD pbzip2-1.1.12.ebuild 1060 BLAKE2B acb4e0bebcca4008e9ce3e759b57128845688b8ba18f9357564ef6907980899669630f46edcab7ff9b74d7f1f93a111e47f319bd76ffe57fb3c1e445a1940ced SHA512 3c6d032f54827eedf507faddb4c9ef4662dafcd5e36e5730a864f391714f08ab4089e595a2b314dfd494bb2df967ed9e8fa180032daf4c5c7ee63d055cebaf44
-EBUILD pbzip2-1.1.13.ebuild 1141 BLAKE2B 0b4df36bdb353d65c4e338b016b055e8511df3ac7b739c74efae6a632cee5297aa58917c294ed97ceec1230515f4671dec8adccad52a723fe12b65adb62538bf SHA512 5ca654096b0d32c8abeb8123e94030c027782a30e0a088c52850ba104516c1324e50def6bac92eb9f0529592df65de02948f2ce19fe6503191e836d27a8eff86
+EBUILD pbzip2-1.1.12-r1.ebuild 1112 BLAKE2B d38969d2bf9513196dde302977e2afd5f14e45efedadabf89ec8c94d58c3ac1d6497988a7be0ea5dda860fc8e4c761f1e5aa84db0a2220d2e39567ac361f369b SHA512 7848eb91709b7aa4098c72934411718db3d22763151c8d16435f72b8c41de30586822e5772be5a324530b9a30ccfc3de72e59cb2687d4239b7e8e87e254dbf2c
+EBUILD pbzip2-1.1.12.ebuild 1050 BLAKE2B 072dc357431ab40f77c1a0a0fd0389e72926af8448febfae4cd747626955eb8569b0240fa14942643182a4974cb9ebc4cbd23036428ee751123fd55f02564ed0 SHA512 cb438df63fa0b2f3b8f2658cddbed50d1294aa631c48ec695f7d643c47f31caa3a46bb9308cf52b6bd326b397ac091f0aa0deb194e6be17545e234488a5527b3
+EBUILD pbzip2-1.1.13.ebuild 1131 BLAKE2B c22ff0a05b8c04de37aa8a6183cb7b13842a08976aa64c67bedb532d16dc83d7f9c90689cffb15ebc1759c199719a8e1ff281436b6b476ebd0191a98c1401c5b SHA512 26828cf910ab44e1926f9e38486648bf0af8f860d37a18f567fd9c913a8b248723c16102009b3cafb50aef653d3e194f421e9b7887900c7c3763bf6ad2b9d99b
 MISC metadata.xml 443 BLAKE2B 3a25a8281989265bb3339d4b46442e5c73920567ff19bd12e57a6aa41d40534428e409ca9dc548318d2487288e12e2c6bb305809c7585c3d6742c8709a649d9e SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0
diff --git a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
index 17dd86164475..aca24db54470 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index 2fbefa71b8fa..043af33abb11 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
index abf49d114075..133a35b29581 100644
--- a/app-arch/pbzip2/pbzip2-1.1.13.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"
 
 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pdlzip/Manifest b/app-arch/pdlzip/Manifest
index d2014067dc3a..9b7c962804d8 100644
--- a/app-arch/pdlzip/Manifest
+++ b/app-arch/pdlzip/Manifest
@@ -1,3 +1,5 @@
+DIST pdlzip-1.10.tar.gz 62416 BLAKE2B 7e8a4bc5793e10a819e911535149336138473b30b552e6d728b3f547e13e34540ac8fa91d84656c3feeb2816c06cd636cf3eafc5b031cca2b63e704a8f7f6ee8 SHA512 a0da45df3af68176d1ebceccba833d0d41b04750d37e90b3da6f1bdc98a41fffcb8e0ce04a296a31351aa7babd1dcaddf08f616d103970ad5fbf13e469f287ad
 DIST pdlzip-1.8.tar.gz 60564 BLAKE2B 2fd38cb6d17e0344a73cb44d36c53be373ae0ddfaa88af01c78dd54f33c6fd7ec5b52a61fbf6c134b080f42006c01d24a419bbae91d23205fd7902c312952050 SHA512 ecab8500105754499448c0cc481917404ce5b9dcfb6ba66c5c51fbc8a6189b109d025f38bc7c497aa2f602e7722f302d6b05e4ee37c5ec8f97cdf253c128ad9e
-EBUILD pdlzip-1.8.ebuild 618 BLAKE2B b80aeb64af232e13fd3cc1989c8b3c4d027a4fa22182a4d74308d22d85137cab0beb4c1f2ba36892e9fae165a21c765a16ee0e83a2b1057267554b2e1f42cc93 SHA512 6eb150c202f8ec95df5674b1817d14c15f99ed11c15cff59b39110b3c860b99a729bde2a1c72edb8b56e259637c499b27312e052925d03c44b9fecfd7b5d2bdc
+EBUILD pdlzip-1.10.ebuild 605 BLAKE2B 8c6fffa82741efcc9c56795270fdc1572d4d408e1dd6501b2377264e8e271788c036fa3a5eb29d3c38ad783778ab3151b1f1063ebc9fe6f23aa4ce5a6b9096f2 SHA512 c00f8e5a9675f74069741636a407dec7051af803ee1aacef2039adf259394cc18ed3f28b7e17f652548cba09e66e3b8d4ce1cb48ae8955bdec368484ccc817d7
+EBUILD pdlzip-1.8.ebuild 608 BLAKE2B fa67af6804477075a4a73e3c0368e5e05b3cdfabedaf96e7da88c888364e2c41463f08083e45306f7c80d3858f3e20c053bde8fa3be77388ec4e4cf5a0fa12e3 SHA512 023b6128203daef9e427412c25d972aa042ade040324d9de9245b204d2775265b52b50a18f3a42ea03f76fddeb888d4d20808d35a3cf0cb1cd9528c1cf1c1db5
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/pdlzip/pdlzip-1.10.ebuild b/app-arch/pdlzip/pdlzip-1.10.ebuild
new file mode 100644
index 000000000000..54060f06792c
--- /dev/null
+++ b/app-arch/pdlzip/pdlzip-1.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Public-domain version of lzip compressor"
+HOMEPAGE="http://www.nongnu.org/lzip/pdlzip.html"
+SRC_URI="http://download.savannah.gnu.org/releases/lzip/pdlzip/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE=""
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/pdlzip/pdlzip-1.8.ebuild b/app-arch/pdlzip/pdlzip-1.8.ebuild
index 160eee1561e9..8bee5017326a 100644
--- a/app-arch/pdlzip/pdlzip-1.8.ebuild
+++ b/app-arch/pdlzip/pdlzip-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/lzip/pdlzip/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~mips ~x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index e6890804d2a4..1256deb6abfc 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.4.ebuild 961 BLAKE2B 06d7155c64ca7968102d57d75a031c2156799f5f2c8c9501573d06a9b7867febae73cc57ddfb15aada32dbab72af03c0c978c963c5766b803aa52661ddbe0713 SHA512 53134911a3ecce3146e658af27fbfeb11900cc238b9f23cb16e46557dbe1fc1b48375e009021950a1111dfb90fec3130ccd26d54aa480e5e5d32e405f47273b0
+EBUILD pigz-2.4.ebuild 960 BLAKE2B 9e3186757ee7fbde628e318a721dda2388242db71755ee9852f3c1d5cb5755e7ae2154e70a0fa6446c76cadd637dfdbc02b7311dea860f203b90749620f9d08f SHA512 a6c4239dce45de1f74acff365def819c3537dba716e4fd76be1d08ddf8cbf9717d9d9d37c2cb8a778dfcaaa76c98bbd9e3c6c2896e0e12515f8624e741ba2c4c
 MISC metadata.xml 577 BLAKE2B 00e7995f3a4724227abc66b81ff56b83dd41b3ed173e80267b6d739f7db140f19b31c81420177e430ded0f9f38cf8c7cc527bf092d438ce5cb3ab867da1b6695 SHA512 5f825b9a9b0570d7687f2296e36f8dae325755e2d5895701cf621f2c01ec8db892932811f4b151231dab547380d96d234f715537a911887ce9bf144b7cf54532
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4.ebuild
index 300e5764323d..d019fe181d01 100644
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ b/app-arch/pigz/pigz-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index 4324e1a8f4d2..f357fb775093 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,5 +1,5 @@
 AUX pixz-1.0.6-avoid-unaligned-accesses.patch 1253 BLAKE2B e852f1c991bc7ba282b47516598d09a41182f01ceade67276dcfb192767c1bf33a36cf992d5de201bddc24790896af9e22e83f3fcd48a84f3ea3f6c9cfd7e50e SHA512 6390ec34f3d7d07be6ef6842a631d2e2ef87abe54e5f745846a6c08a4c1a7c15d50d3327afae131dd4b64a66ff187ada1d4cdae4f4503c33e249dc238082ce9a
 DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
-EBUILD pixz-1.0.6-r1.ebuild 1192 BLAKE2B b16efeaccd366807cf0e6d9cea800677b05231397e7de49b11274339fb27b5b8c31935051850fdc43af59fc3c794b0b24cd02ce56b61de1ed6cc244b384ede3a SHA512 b6465574d64efd6a27db3a52b9ae5227ac8c54b192761b5d97041416d6671ec55a4f5608da11e4824d5a3da04feda331dbb94e8be8a46603c6faaf79f6e54686
-EBUILD pixz-9999.ebuild 1133 BLAKE2B 1df4240b4409c81ce3a28ac47a276954e3b977c1964411c995e8335da4246fd79350be5c1543b5ab896230fb81a28c6aa8ec7be26b0e5d87d2bf0c45f1cb8a7c SHA512 350b2274074199349d2724816d233df340c015a2fa2efc228bae5bf35838a92ce91150e9d3b0bc86cca7433830288876da11d6217a79bd4495d8e5ae974dab16
+EBUILD pixz-1.0.6-r1.ebuild 1185 BLAKE2B 3704f7974737bca5286d4b06935f0856324652e040514470bac6b6f16f11994ae4611a15ab4c19b86d38a15a13fa1bd69e006e3cb8bbc1fc7bebff885ea34f59 SHA512 8b4286de3fbc729aa5c8b0860e0b63b839e7e700f2d71db2c461e8cdb74d718e3d6d09b57012eec4cd828a62016240650999efd59738d3d7000ac6f1ca0a98ee
+EBUILD pixz-9999.ebuild 1130 BLAKE2B f04a81379a912fc19d19e64d6b9d111de1686f8b0bb75c93ce40ecc17d1da590aa2e728a9792613e7d1bf10f6bb725f5c674b8d3805a20301ae014b52bbb75fb SHA512 bad7eceee00c8e404d28cc82524b7bb9da4ef92b354fcbb00d01df951e8892cb431a6dc14c4e1acbec6321d9e520770f265eb7a8d05175a219020efbf40c5f28
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/pixz-1.0.6-r1.ebuild b/app-arch/pixz/pixz-1.0.6-r1.ebuild
index 7e2076596294..37d6b9ffdf67 100644
--- a/app-arch/pixz/pixz-1.0.6-r1.ebuild
+++ b/app-arch/pixz/pixz-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index 488b2bce873f..a1998849bea6 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-arch/plzip/Manifest b/app-arch/plzip/Manifest
index 8700eb616030..17e6af0672ba 100644
--- a/app-arch/plzip/Manifest
+++ b/app-arch/plzip/Manifest
@@ -1,3 +1,5 @@
 DIST plzip-1.6.tar.gz 66214 BLAKE2B 8f3865b8170c456cd37ac550b68e0846316f4c7329dda4470b3298d139ca392d000a357a1ec52c0f7c2303e6612ea4a1204e93c2fa487e70f387d9cffe96c21b SHA512 14f794e290eb58bcdf1fc5699c08c36f57473e36eeb3920dff519741c4265883f8ee348095a9315562812574c3f5ece7bd7ef4a11fbd955fe2ee54e361900f77
+DIST plzip-1.8.tar.gz 72365 BLAKE2B 66b8881b6c70932c66e40edab22235103d671a870c980c0b0b08754e94fbc1b2d0f2eeb26deac4f27fbc89d69c3b588bd51cb973b7b59cbb2d0f6ab4cc9a115d SHA512 e8e822f8ae77e06178538b62075fa1c5d9cbc76c78bee7ad595a4637cd4077f53fd9e3fe61ca3fbddaa8b950e739d97527dc8fbecae04de1ac3ef83d0d5f13b4
 EBUILD plzip-1.6.ebuild 629 BLAKE2B fc8d93c5f2475a5810b9512eb98caefcbe849fe0d1057f43a9035c8b9bbc61fcf02f56fbbb02a302f5265e0014f6e57fc29eb1d39bc7a7fae437d647fe40d2d5 SHA512 dbf4a42c5641ae7f411591a9a79cfbffbf93a4249be5c1f650810311cd29bb136274002d1f182dd1e97e2671d6d3d1b966df0a9fc6cfcc8eadc903a780420e29
+EBUILD plzip-1.8.ebuild 626 BLAKE2B b99284ce5c49edca724faff8f220a0ad4f6b7c627242f26f0e141ae4d0fe41643b86ea02a4b144aeba638cdd2b68a3fb225b5e22c29623023df4a838b17ede7d SHA512 ad1d62baa9fa16ea531396004e3207b800af39fff06e319c02acbf5d0174a68f99129405bde9895ec574ca41eff67a2d6ccb2d7cc26d59095704c3c957b0c999
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/plzip/plzip-1.8.ebuild b/app-arch/plzip/plzip-1.8.ebuild
new file mode 100644
index 000000000000..f9fedd5f8ae5
--- /dev/null
+++ b/app-arch/plzip/plzip-1.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Parallel lzip compressor"
+HOMEPAGE="http://www.nongnu.org/lzip/plzip.html"
+SRC_URI="http://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/lzlib:0="
+DEPEND=${RDEPEND}
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}"/usr
+		CXX="$(tc-getCXX)"
+		CPPFLAGS="${CPPFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+
+	# not autotools-based
+	./configure "${myconf[@]}" || die
+}
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 71c4d9bc587e..58f428c59473 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,3 +1,3 @@
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
-EBUILD rpm2targz-9.0.0.5g.ebuild 776 BLAKE2B 1d8af46c61505140d4646982d097accc06a576de6d0ca4f37f541ac1a2ab87537b1e2330530d4238f1fb8bb5116216a932828033751b84874514679722d1eb0d SHA512 a00bc15b8fb2ab8665e7cabc9d6aef6c2d50e1f2c25392f5c63a98719187c868c2e67ec410b9e9c9794c76dbdf9c00ae676f714a12b0cba55d1fee835a78734a
+EBUILD rpm2targz-9.0.0.5g.ebuild 754 BLAKE2B 43cf69d7748c2ff5e2b0ffc209f172166bca24e1822faf1734c56f26fa42cfce6ed171f2b53f65be46efac816d7490cf7cef78c2550ac3d214386dd35916ae50 SHA512 b070d92a2fd63ace36c13f9ea92ea1dc96d3be48d652e72794913901b03d5082c0f62db89df7d2dc45ac6a16b4a8cba71aa0688f250648bce7e70f7aa5d99c24
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
index 35658a996e60..3bd9c603cb02 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-arch/cpio"
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 553523396bf8..8eaa098af727 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,4 +1,4 @@
 AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BLAKE2B e9181a6a89bd62c3433c71008d182fcbdd2960e29542539f9ef5a48eff15347968a8a1a2d362633056f27df0a5ea84a5a721afcc375335295cb7c0cdd9267790 SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4
 DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
-EBUILD snappy-1.1.7.ebuild 1936 BLAKE2B e78295119fe314d12951eb24007663ebb3fdf88fb06a826d31d632cc6c824422c5a7fac6e0e4a3362a15a8bb9adcf6345f07129740490dabf690abf0d2274ea7 SHA512 0dfbffe311100e5bb6e7a9bd3cfb3e3b687da8729f1253219a70ab98e0a22619794080babfafe4c1c7a1688b4cdedf52da7a5f50ee3c2c8542f5bff4fa7daebb
+EBUILD snappy-1.1.7.ebuild 1924 BLAKE2B b0b0103fb1d2b715664852d517cfd02b078952a3565d79531769afde7c601da6e1d39d243c1299967739e00bc38590ff4f2c5b20dd53a5ff93db5bf9ebc7ce6d SHA512 2cc9e19f38bfb7285833fa229223c47d9a596d0200510e2d80715e01a73dfa083a911963853d236c961cb5f83874ed83993ed33880676b6a93902b31b070955c
 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
index 5634d24aa2f9..188a906e8ae6 100644
--- a/app-arch/snappy/snappy-1.1.7.ebuild
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV%%.*}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 # upstream killed static lib support with build system update
 # (and we have packages depending on the flag)
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 02b7f091ea86..bcf291fda2b8 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,4 +1,4 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
-EBUILD tar-1.32.ebuild 2206 BLAKE2B 77d58ad75486c98a680f472e70b8355cc74f3d77eef59186228f5dbd8a710eb91d060d0d01468866c95363484162a1f1afd3ad5ca3d761df72f78ef49668e2d7 SHA512 208aea1ff7d52c7e96e98a2a94067543f43a185c10c127be4b0f237ecdd1cc87f597cd6a8912a62a781d8d4c8de2c1b7a1d9e442d98c58f87e12bd48ca5355b3
+EBUILD tar-1.32.ebuild 2184 BLAKE2B 1ac7fc363aca970d2d32adb6194576356a170c866c0065c347fafce0659e343e23f03f2f096fdbaf134e44f16bac9816c785c4788f266986dbaea3c4ec2121a2 SHA512 f5b9bb2b88904a5945b086d6531fa96089b2da890db0a4d16602fa3bea997208d8bfaa7a80ca9b6d22be7c9d0d62a87e5166ad5ab534d76f48a24fb1fffc777e
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild
index fcdaa190dc6a..87a5167ce1cd 100644
--- a/app-arch/tar/tar-1.32.ebuild
+++ b/app-arch/tar/tar-1.32.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
diff --git a/app-arch/unarj/Manifest b/app-arch/unarj/Manifest
index afe90ba14a07..fcfa4d5c8815 100644
--- a/app-arch/unarj/Manifest
+++ b/app-arch/unarj/Manifest
@@ -3,5 +3,5 @@ AUX unarj-2.65-Wformat-security.patch 1303 BLAKE2B c13a77846264f9e5e8ab552179d00
 AUX unarj-2.65-gentoo-fbsd.patch 168 BLAKE2B db8ad647f7666cc2e0032b35f5cfc36d63a38f918e4424681778f8d3ad599a1356c4c0733c35d4140618a311b8e07da61b035d7ff391efec1f1ae6fea7de9a78 SHA512 fc3d42d7ee9b38e871938c159398e773102e9d83896393f074f0cf02b4619d6d663668cea50d84d04b1372b7b5d4f6e46db36345123a65750b545416ef7f2eb2
 AUX unarj-2.65-sanitation.patch 2710 BLAKE2B 814acc285392cdc44d2f4151e2aa10b9664f3dfec0968028e6f6c20207586034182cbeab9dee8e8340fe52f1a2bd7bb4d1793714d2f6806889128d2bb200d0c6 SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755
 DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
-EBUILD unarj-2.65.ebuild 698 BLAKE2B 8f32870056779dae8f3ad89d0a20684df7c623bbe8e25ddeab266eee69b83cf7b8934d4f257412a397e00ca5afe9a3bcc23fd6e9cfa8bdd3d5b7a56708f285b1 SHA512 bd0c68d1053d59b50c40171ec6f3dbbf3500fde07b81be8cf02135793eedce2addcf0a35bbfcd33283de9b05425493e785fd93207c628b25614163428573c201
+EBUILD unarj-2.65.ebuild 688 BLAKE2B ca3cf37c4d63bf87ef9cfe147e0536a215223596bef429f458096e9de3504d421e5c51a579f65384d744e701b520bb99548a8b96d1eb95915bf49d2b64951a15 SHA512 f64580aa630a3ecdeb655ef7b2d58ad6b26bcaa6164ac3c9f5f12f7f77b6bbad09b496a023c96f0dcb0ae0e2c72f6514cb182f6b67a60646d4181ff1c72199aa
 MISC metadata.xml 438 BLAKE2B f481e5ad2c0786e15e1f0c2aa835fd356d239f84ad59319f8330538466576c342f3c10a7c04b646ce3474d04e8fa52d592368ea2958cd03c60d514e178cfb049 SHA512 507f17fa799964dd8c11492327b7077f9a2e667aefe2c9249a05df95f8f0a7a1c4ffd1735a2f9292f999c0914ba901f7f3a534c626c72eb69dff04a0f5ca22a6
diff --git a/app-arch/unarj/unarj-2.65.ebuild b/app-arch/unarj/unarj-2.65.ebuild
index cee73863c913..0c93b956fcf0 100644
--- a/app-arch/unarj/unarj-2.65.ebuild
+++ b/app-arch/unarj/unarj-2.65.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="arj"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index a1f38936fb49..4c5d41f694eb 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,11 +2,8 @@ AUX unrar-5.5.5-build.patch 1021 BLAKE2B f11426cac10efe195a0507ea99c77813284ff8d
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e2e20ef2c15817fffb7dc275fd326fd96b089257a8044982c0ae130ca3dc42126356d973ee6a8afd43e28df0 SHA512 101a21a20d8e30ca2cccc1605e332579064d362feacb36e9d4a7cd5218585298dcb48ec2805ff9523ae9b25e8e3d3e7557b73ea457702c6cb6d8c50d324ea1f4
 DIST unrar-5.8.1.tar.gz 228917 BLAKE2B 4b34fd35a371ea2784af0968a95270b04afbefd4968c74c44e88d7b79598fe05b01c331ce730cbfd2535d5a713049e7f4dfbd38d28266e957ae9995cf8ce54b3 SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612
-<<<<<<< HEAD
-=======
 DIST unrar-5.8.2.tar.gz 229116 BLAKE2B 88bcc90e36d231dd35b066495967a116571ce25b6cc6ee73e84ded5a56fd74662e0c9da10a7e7025d2cecbdd1e47d84f303207b6a466c1488168f523e7fb23fd SHA512 09f12f141925aa99d74d4a0a0f3bacdd5b53d174473346de317cf95c1f560ef4bad445f14d81d313f8a34e8400df6a76709d068b9cd23433d1f638935185ab0d
->>>>>>> next
-EBUILD unrar-5.7.5.ebuild 1882 BLAKE2B 469b7c10834d06442bf6687909300efc774579673b3443ec5e415368c25a485f84dd80bf4e4a3603c4ff0807e6947c84c325b712c2f44c128d0ca6336f1c22a7 SHA512 7f2c73c399d917e44b5dd19b979938d6bd9a8e1ca56a01cf2a1f8347ab46e5181029aad02e316ef2a7752ddfac45dc79609a39339315765219011ac4007620b9
-EBUILD unrar-5.8.1.ebuild 1902 BLAKE2B 0b6cf0e2c32279ef92e21c68358c68e778da9fbd2e9727737ff16751695316b535b22c5ebc86a88e17b741c9cd97aa5e7608d8ed930aa735695eae944c356952 SHA512 5c7d1dee03603eab1464dcf87fc5858cd00a9d601a9ce4226068265936b1f0df402bf2e103a4add4db9fd948a60744f1898d124b621882b0228b10351090a867
-EBUILD unrar-5.8.2.ebuild 1902 BLAKE2B 0b6cf0e2c32279ef92e21c68358c68e778da9fbd2e9727737ff16751695316b535b22c5ebc86a88e17b741c9cd97aa5e7608d8ed930aa735695eae944c356952 SHA512 5c7d1dee03603eab1464dcf87fc5858cd00a9d601a9ce4226068265936b1f0df402bf2e103a4add4db9fd948a60744f1898d124b621882b0228b10351090a867
+EBUILD unrar-5.7.5.ebuild 1860 BLAKE2B 4f15915fc48ee749a8c2b488fac6377446007354b1f5cf32c3ef277c8ad7618520bb49c266da733a850262bab18ccb98eadf4f3718808021a44682eb6775b996 SHA512 8a369ec848020f91ff1bd6f11a01b4d0970620f7927ad85b17140d2c30a4e656d0d1967ed7eca56071e109911d3ef1c438cce0dacbce64fcd3da2edcad76cc45
+EBUILD unrar-5.8.1.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
+EBUILD unrar-5.8.2.ebuild 1880 BLAKE2B 7c0ae095f7358750a151c01a373a3011db7e4f50f4a0a1098a774df29f64b55e11efebead01e96cd9bdb681ce66c20f7660b75fe2689693f93190e98271b82d3 SHA512 ad38c54b141848fd6b9c554ded67e281a55f5016f8e40e1fa8401805ed510bccda935983e9ba6fd715fd3a55f895691a4da476e73aab82f4fd10b84896c7ff17
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.7.5.ebuild b/app-arch/unrar/unrar-5.7.5.ebuild
index 872ed66c1b51..3e3c594c4e00 100644
--- a/app-arch/unrar/unrar-5.7.5.ebuild
+++ b/app-arch/unrar/unrar-5.7.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-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 ~sparc-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 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.8.1.ebuild b/app-arch/unrar/unrar-5.8.1.ebuild
index 76112ad11f74..7fce116316f4 100644
--- a/app-arch/unrar/unrar-5.8.1.ebuild
+++ b/app-arch/unrar/unrar-5.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-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 ~sparc-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 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unrar/unrar-5.8.2.ebuild b/app-arch/unrar/unrar-5.8.2.ebuild
index 76112ad11f74..7fce116316f4 100644
--- a/app-arch/unrar/unrar-5.8.2.ebuild
+++ b/app-arch/unrar/unrar-5.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/5"
-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 ~sparc-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 ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index cc9cc146fcbb..48da51c0a098 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -4,6 +4,6 @@ AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d
 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
-EBUILD unzip-6.0_p21-r2.ebuild 2593 BLAKE2B f626ff277131a9d5cc952bdfcbef19677acf487435835c0f50a438e74db7c3f8e795d0f95a51f51c14e7517ee90cd5906cf7e3c94206d46796c010d6ffd074ab SHA512 934edfb2983a9e423bd6c48d9bd7d71531c50a3578c8311b2310a126b21012986fe0a2726e40890c841fff13f5d75c56f6bfc48823f495cd227377d0b3bc4268
-EBUILD unzip-6.0_p25.ebuild 2606 BLAKE2B 19fc6e70ec6ea38deff1c0433b7d7367535967919d6b5e9efa15ba1d291d3e4a1203efc41afedac544187193aa2eb4058fd0f46a80106b78d1b38361b1036a6f SHA512 1497ff9cad0d17caaca2045e1adf075ad3bda34985cb73da9bae84f2941b746eeeee9195c26591dccbbbfc67463b09adc0a0998c8105b5a9acae46cded5c8729
+EBUILD unzip-6.0_p21-r2.ebuild 2571 BLAKE2B a10a7394f991d18575d2d801eca38d9661a38b9e54646eb8aec7e529fdd7a7d42ff240601b4a39eb09af9ca8dced1492dcc7309a052050bda2dc2f5d616f4dfc SHA512 4d0573f3b198a40107186da5ef5091b3c4b330aaabea49a6b2a8567f8cf0d079949f9ac8c884335824e0979f18277dd398d2cf310e0c80723cf9238a0e521d8d
+EBUILD unzip-6.0_p25.ebuild 2584 BLAKE2B beb5c1f8e1157dde938b8bd9d09b2a585b66687194cb9bbe0af10d7b6055944f94b6407dfdb5ca8a1f637f1c8952614b6330d8f59fdfd60024099e24d0d7ff8d SHA512 55a3f1737ff01c8cefdd1f88161ed55e01176823c3cb92d260102471d206d124d8473d7bb50a4d38ec21d5a45a3acb9602cf5189b3c00359246777d68f162222
 MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
index a1660471ba5f..2722b1b9c00d 100644
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild
index dcd460f9f049..544d9c12d314 100644
--- a/app-arch/unzip/unzip-6.0_p25.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index 6ae8400a5453..c6f7f8d0685c 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,3 +1,3 @@
 DIST upx-3.95-src.tar.xz 790776 BLAKE2B e7e5e24ba3675ab9f9f3daa36d6d3f00b6af614c2ca64c4d185a065afcdc02373ccf0200f7116ebbfaa1f9b961078f40296b1c716eca80aba86e95d6a9463b99 SHA512 0e1d3e26462057f16587197e73301957e870107808fdbcd24d9976094dfa0e5efbe8da0f9b6732a99f05990dcd4be242a87ea19a7110dc052c6dc982cd596416
-EBUILD upx-3.95.ebuild 807 BLAKE2B 388441afc4a845b9528915a24c8999ba81af251534cefa3ddbd006bdbf1abb9476b536f2c7e857ead636965826d9006fcb29a4c3c27acbfd46401fdf3aef0c3f SHA512 a0884c0ca7e0501d968e364b6726fd4f3eda15bcea687bc77b1eb150da4f27bfc80cc152a0f55cc2223211d9ab81f8bc2f4f3499de5e62bec2860dc989f1720e
+EBUILD upx-3.95.ebuild 797 BLAKE2B 65691ffb554ccdf920f608274ce514151e051f90bf2effe1ae0314d63ae10f3c25ba03fd33fc620209ca233a479474bf46194235130e71ff0ac534af3d4fe568 SHA512 aaae2315441ebe149a20bc3b1850a269d21c15057ec9cc9fe7d1e0f31eadfad98c57d35c6a5aaac2038579b3cbe633d05b085592fadf5145fd76ba27ef45262b
 MISC metadata.xml 556 BLAKE2B 79efa27ad3c90188372a09e32997f8e2a6259e546a91518c9b332f5b659f5d21bce26862a0a532a0b63e5fcba3efbb717a1518325184d7f931931a084cbd0396 SHA512 fa0d21d7f5c7b7cdecd54b9c438d1151af0baadb207297cfaa26d7f0230e538156561aeeccd50ef23b7060f6e7d653282a59fabaf6f866aca49cdf0970c35b36
diff --git a/app-arch/upx/upx-3.95.ebuild b/app-arch/upx/upx-3.95.ebuild
index f0ea16873abd..c991b587c2bf 100644
--- a/app-arch/upx/upx-3.95.ebuild
+++ b/app-arch/upx/upx-3.95.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/upx/upx/releases/download/v${PV}/${P}-src.tar.xz"
 
 LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/ucl-1.03
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 902e19ffa614..6a54facd0d30 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -3,6 +3,6 @@ AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047
 AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
-EBUILD xar-1.8-r1.ebuild 1205 BLAKE2B 296674ef4169aa92ff3eb40203ddce1463fa495196e9ddd1048fa2f5859acbb8ee724a50ebcc398668a723b15dfe1af8aa27199019502d4023d17205c9c3c78b SHA512 68c48ec7b162b4cbd3ac1147e500ccf84b54b80cfc27e50063fc0d0030c8f05fb02868ee8d71a463fc23c2c71eca306ce88ea44eb0bbcd923cd66b7c08aa3b64
-EBUILD xar-1.8-r2.ebuild 1456 BLAKE2B 6607ef1ad27a0bb48b0b2aac2886c9136d8588f0c69a4c438a977313046b22a91c379eb8d06313fd4fc9ce0c1d80691b75b20fc96604c765485f6ea0d30d9aa3 SHA512 5893d2c1f299f95cdce6c1ef4da361a816ac2d1d6e89e0d330cd87128ccefaaf8fc78572a9f6a656403fe60c788962972208150e9d29b9dfb50f78f53af9e4ee
+EBUILD xar-1.8-r1.ebuild 1193 BLAKE2B a19751f073b99f3d24f01a49252bb07954f21fe53616a3fb632d1a3f6cedd25d427e21f473579d1aa7355ce384685886a8afc9caae178bed9b2560da909f5d16 SHA512 af10895611f19ed52b691f4fca0a2aa06895daa49e02a3067e77e69641eaf9746577f0798fbf6da39bd072a750c8a24f33cfff26b1ef9319e1ff6845b560eaa5
+EBUILD xar-1.8-r2.ebuild 1444 BLAKE2B b7d6a945190c5e8b1ba45b40d23e6baa1e569bf8ba2f18fef79edfd4bc19c3da1d6d3a7be741fb1f56f4f09e68cf9ef9548ff7de100cc27339da3143dfaa9e29 SHA512 7244df1c6dfc828582a1ae71f21abbab8278bd61c6bfc1dd13fd8811e18c156cb83140882fcca50368289ade0a528bebc16b58e510610c62e79fd4ca6c21fd84
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r1.ebuild b/app-arch/xar/xar-1.8-r1.ebuild
index 0c1ac372aa8f..a9d20e9f4226 100644
--- a/app-arch/xar/xar-1.8-r1.ebuild
+++ b/app-arch/xar/xar-1.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index a4a659f2fb10..4a33df6ca299 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-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 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 8024c6201147..ee2a31176ea2 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,3 @@
 DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
-EBUILD xarchiver-0.5.4.14.ebuild 1447 BLAKE2B e48bb9eb70a7e29392ffd11d08fcc14dcc57671771a78676a5f8e9c2e2010933292226a5d59954873d7be85e0a997c45dc88f2d02e11416d9e6ef2e81ebdd3c1 SHA512 9d09aa222cfbb472a365ebc34218b04ff926d1f1e06acab7e033df4822613ae390e569ff78ae94717bc9eba7cd46b25207a134e2949be97a9965df1f1c07cf2c
+EBUILD xarchiver-0.5.4.14.ebuild 1437 BLAKE2B 7a3256344e5d4d6d47f1d20fd2c6a4f757d2ef083e53cc11efd22d7147e4ef3eb54c9f8e774a96bc510431cfaba6ec6eb18515c6c7d9dfbdcee0a76e98cfd0f7 SHA512 138e4c847b1083fd5888db3de1ba00762e33229caf2b63fee9e8f2533926e9f993b4e829c9e86ca86f70eb6516255fe3ce6f41ecc9b9356a739baacb3fd132cf
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
index 39ebd47bfc07..ad0502e6d40c 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # older pigz versions have incompatible command-line processing
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 6d4f3ea7c3e6..c52f376ad522 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,5 +1,5 @@
 DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
-EBUILD xz-utils-5.2.4-r2.ebuild 2706 BLAKE2B d7aafa86f26a9fd8b148cc4d9183365f323852b9dde311b2d91e394119e966379a99e242ec54b312fea89bd453b454035b0d8de0a802bfb4513fb2c675eaf68e SHA512 0aaa33811944233e533d4f90a9682658680371eb47e4e8adffcaec54763f3dad4b0b724e6f3e8e1f3c7b7358468d6f616b07db84c7ab6d6bf1543316c9b6f12b
-EBUILD xz-utils-5.2.4-r3.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
-EBUILD xz-utils-9999.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
+EBUILD xz-utils-5.2.4-r2.ebuild 2684 BLAKE2B b4666367eb514243f2da35de3068554c83e4b71974476637954bf5f59e242f8ad1739fb3994712cb504952d7cc16a09e777f0a4bd3a6518c2b1a71a98e3f0294 SHA512 19f99a4199c03b34f007e206e90c282e93a5576a2605b62de8334ed55ea06b1a0431fff03f4e7302434f34a43316ab76d11dbc173b14e3cc005b913e941d71fd
+EBUILD xz-utils-5.2.4-r3.ebuild 2622 BLAKE2B c89cd916d3c885a82a31750211baf37c0016c43d97ae350c3c1553a3c939af9cbc2840790c19d11fb405c5ca1c85a55d340046f762704e157afc13ead3fcd3e2 SHA512 cb418fc449d14e57bcf9f4fc2539777cdc14643142a5aa739126814a2e4de23054f3ac2f54974b899363c8d1dcaf50cbd578af5db9c07ca553ae44223d686fa0
+EBUILD xz-utils-9999.ebuild 2622 BLAKE2B c89cd916d3c885a82a31750211baf37c0016c43d97ae350c3c1553a3c939af9cbc2840790c19d11fb405c5ca1c85a55d340046f762704e157afc13ead3fcd3e2 SHA512 cb418fc449d14e57bcf9f4fc2539777cdc14643142a5aa739126814a2e4de23054f3ac2f54974b899363c8d1dcaf50cbd578af5db9c07ca553ae44223d686fa0
 MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
index 46b80edbb4e0..cf23ee340b27 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
index ac156fa115ad..4086a001c985 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index ac156fa115ad..4086a001c985 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -17,7 +17,7 @@ else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S="${WORKDIR}/${MY_P}"
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 667258aaa2f4..ede6ea23e1d7 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -6,5 +6,5 @@ AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c1
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r3.ebuild 1740 BLAKE2B 02ffe389cf012ee0a0216432bf1dbd4f7d264b3fb32725c7dc776f02f15fc8f086865b87ee0388d1f8f60907f6629f561e928429e908a8aaeaf78ac76b2d354c SHA512 161436a7a2c4b90ec10af7214d4b3cb74f3ee279a94a4261df03fa980706f8ec5a588b9cdfdc068051cfdecbf037668c916111bfca2a12fa677bcf6fb4b1158d
+EBUILD zip-3.0-r3.ebuild 1718 BLAKE2B ddd28a495390691d9dca55d7601b36916e43a44ee3c3fc9da62fb6fa2b645d0ad2f96a6291a18de3c6566a1e4a9a8aaee6f3bc1ae7f925e4cc7a513b8eb10291 SHA512 29489cdc1b67e9506f324c9087266991342e0d7db5b43ad13b6a5fb8bd5dc7c413ead2708af5f30268ae384565eb5b47bdf49d3bc72785837bb43d504a2d3901
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
index 22aeb260c169..2e7f30cbadd0 100644
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ b/app-arch/zip/zip-3.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="bzip2 crypt natspec unicode"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index c640b2dd2435..37bf8223b882 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,5 +1,5 @@
 AUX zoo-2.10-gentoo-fbsd-r1.patch 744 BLAKE2B 76c60ceef76f9325ed6212b8a879da4b11808e0fa1445f765f8fd60b2627b7b1b9becb844bca43de5e9eb82dada9050a732971f48914a7e79f4670332e8f9140 SHA512 083e94a0ab2089b046f6ddf469ec21d0c9d31223a9ae109c360de368b815e551f1ad28b53fb2e1497290b231a8fc6d67e5716c5cf604b3e8088569ddc439a068
 DIST zoo_2.10-28.debian.tar.xz 14984 BLAKE2B e45ed5381e64d7ccac0e8100df12a8f55abbf7961e54a05ad6d3f07cca1a939f9320caa69196895a35dbea5d4aa82975ee2e5fb2202f793f33f4ebd7d5ff65e8 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708
 DIST zoo_2.10.orig.tar.gz 172629 BLAKE2B 9789f0ca53b2dd538e0032c31fa945f3f4f0fc739cadf536ec38621824cc89409d9def036e5df893a7cd4c5873302273d638c087a51cf7b1477501567c6578b5 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f
-EBUILD zoo-2.10-r5.ebuild 841 BLAKE2B 471a9eef55c1d2545b09450c315ebb546b83e1fe0256c93a53c028a225f83a80c70f9bcee5891a69ee15af64687d01252e7bd99b2068afae15aa9b82f6d83357 SHA512 caaa2b61e1b73e930d712186190efd990fb91c4f50239ad83e20ddc5d324ef9c1d4151c6df566714f3ca02edcd7f1987c9e0c15740482f31a5aa5d62475e3f5d
+EBUILD zoo-2.10-r5.ebuild 831 BLAKE2B 20642c253fa1d4de8ca81c2beccfe5b305526766458dfc681db88da6864653c6f2796d4ac4018e3b6e877ba1d58665cca3c01cdfea265e05d26e03683c392016 SHA512 fcb973a7e42406bc93d8384bdf5d2b9a48fdf835fb8afc7473b5d7d9b06da69380dd6799ee85ca6d337dac632154db6dbc2e9af0495847d0eead65e9e693ee97
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild
index a9c59e5e1788..2701d10e7155 100644
--- a/app-arch/zoo/zoo-2.10-r5.ebuild
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${P}.orig"
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index 5902892e225b..7b00c42470fa 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,4 +1,4 @@
 AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
-EBUILD zopfli-1.0.2.ebuild 947 BLAKE2B 5c51139e43bd7363060f9e88fe5a426efb1ea00c8f916904830560df7fe170ee684899414d828122685422ebf19c0282333efcf6d7e1cff39ff6b61c43ef6a37 SHA512 cefd7aa9bde9eedfc594d96c6e2bf8cd8e502bd36500f183f745688875d479f27bbf8fb75ae2b08b42c9a923db3ecb15d1d65cb6da03412bf3d08069bc973be6
+EBUILD zopfli-1.0.2.ebuild 954 BLAKE2B 938ebe7b1edb90d019328e84827732f831b97e08fb6f3597c83caa7353fdc3dd9428661b870a58d00c12a67e8447a315f47487db21a2a3e3405687a4b17ac248 SHA512 156ae12f2cd0eca35efc8fa2b2b51bbb4b5316ddfb9fc846034ca29c2417525427895ed96a7223043d3a2b52811c4cda930e845b24ff19e42ae69b96ebdb3dab
 MISC metadata.xml 384 BLAKE2B 0ea1ed6757cfd935a4e46b926d33891d99b5c943cd3145e9587b1e3d905d27c3756820f6d530afc329a552777ef19c6f4b4c54ae67798fd813b20363133a75f0 SHA512 f096a21a2f292028e07d029df22a40c252809879acc4b40c31c1bcf157c5ce28da0dc9d7466bfe6a6f13f0e61ac2d0e46e7a082135d7ae5fd945faad4837104a
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
index 6abb43d97623..a64e65d0663c 100644
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )
 
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index ced70c44b908..ea2338b1277c 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,15 +1,9 @@
-DIST zstd-1.1.3.tar.gz 845902 BLAKE2B f8896d467c255dd0dfd348aee0d8b8a13b1551ee0e526db0f4b8939654ce5bd40f0a0273109880b27196d2b4fc4b381464f102fe1f736956f6c830205c601087 SHA512 6c025ca3899d0487bf2b4a9b333b47c6e2bb525ae3fc7328cc040f50d6f3c53a1bb9bd17e104352ddbc7b96b240c250c60d5be99e0a980332dbd3c518b2a81e1
-DIST zstd-1.3.4.tar.gz 2059958 BLAKE2B b1d332a35066fb00e32c6dccebd5ad1065bcc3c7d0dd07d8408e5a2c2641dcdbc388e053ce8d15f9e261255e80f018a172d6e103b5c2f5a2ebb555333ac5f15d SHA512 d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554
 DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e578d70d9fbb1678cba314c90a60339697232a5515990505e3c889aac92c3c2c4c3fc48e0d434b4dfd6cac9df1 SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738
 DIST zstd-1.3.8.tar.gz 1875233 BLAKE2B c9775b0e33e61d2c064df60a266246f6b9b65b70ba2cc529633cf700b5dcac795e13ec0e20bd51bdd02ee5fddbc7f2fc030902ee37a5a433c2d7828c285b3c23 SHA512 834f7b6477c1e7d70f71105ea52be15c33866b48b93b7a3c6dff4f10c761e5ad35f3903899516317690a4b768051f6eedf7c030292f57cea5613d4017fab9466
-DIST zstd-1.4.0.tar.gz 1898741 BLAKE2B 1b92a055712bb47c3d56c51f3ddddeaba00f9b746f7e47a2fa1a0afdf9798ff90f0ec734880a5d03644d47deb0e55f75c2cd3cbdab1a146dba5f49d4efeb2ae0 SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671
-DIST zstd-1.4.1.tar.gz 1908835 BLAKE2B 564ae54a96804954c25987eb0a744b7197c17555286187f615ce8c1b0a52a0522dc8a9e0c1e4e8b7ddd2ffbf302646b7c119d2b5be4d0867e58d2ee4ff70efa4 SHA512 5bfac959dbbcfaa16fc0b5d3d5028c606e0c56d385581644a7376d6c61f2efc081efa65e7cc3d3e7b4c107646e0b67b3a75f9b3ff392624025d3a0816c45a9f2
 DIST zstd-1.4.2.tar.gz 1909790 BLAKE2B 7b420caf91bd2e9739a26e5ea61c0c5b7d9d6d8e6630612fd66fec24203bc38ae7ab527587318c09997e1e577210b748576d8cb40a0d8dd366fafc306b28c0fa SHA512 5473502093332401c83b02e4ac66b2e05f32f710121d371daf164d8b002be9c06c51578bf9fed0ffb70bb67a0c64457b0e7a02f0d1ba5d36b1f3b6dde93ff907
-EBUILD zstd-1.1.3.ebuild 902 BLAKE2B 3b5c5979aee9a7f29f1d515e605e99f4934ab0669a2b5c55055861396f1c002fcc7ac55a871b74feab38c4d48cf4f268e0d36df1b5210ddcec886a2b07ff021b SHA512 639420bd40f0f308413ea00f5803bd57db06d5a25ebab55e7a61dfbb26de721381c4cc8ecc71b22f3756be7149f27928ecbc8061f3443b2d51ad97c8a9bd5e46
-EBUILD zstd-1.3.4-r1.ebuild 1328 BLAKE2B cb6df01593f2bf6f52d0f54759aaa03fa610bd4a63b0c23f3626f7907af26fbfa038842ecb7a1b98b664f9b072e85b5318fc56f059a6b73b0c2e677aae17121b SHA512 8fd02dbc9f09143c81d90e2931812cc42877a0955960232947ba8e50dddbc55f9cbe2e2f60e4f4f53b1ed7122f43bd4976741e4a24243e0360e8e6fbc82ffe5b
+DIST zstd-1.4.3.tar.gz 1911868 BLAKE2B da4c4b4f6afc36a23a13a9582874891ad206b01dc805f9e79879cb833b47c0bb18ec1b3bb5c0b99f4e8707d21659ca0b7446a84d15f513a3fcab206bc7f49539 SHA512 ccda90c7437635f92d0db39dfba3604e256f1f08284c35c042763a54b0ead45dca8e7fa3e5cf8032292d1dd9eefc1369e23f78a80d9335d69170563090677d5f
 EBUILD zstd-1.3.7-r1.ebuild 1345 BLAKE2B a6162c4b43128fd005ee2ef916dbaa1b2193e5e62ac745c29a05b88b272921b8557af64cb56185d58657a9d58ad156ea9cd6ded9d2bec5938b1b749755f5278a SHA512 5209f66e534b09c1de77db8f320c8ec2878051de5a500a671d164441ec89334406c5177e18d0f0385bb734bf9052057c1d63aba461c6008811479b420f15597e
 EBUILD zstd-1.3.8.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
-EBUILD zstd-1.4.0.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
-EBUILD zstd-1.4.1.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
 EBUILD zstd-1.4.2.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
+EBUILD zstd-1.4.3.ebuild 1348 BLAKE2B 8d8fabfc7d4070e5688ea33d0517b6861be53761a58a4ccd61fa07ce56b84fb53f8912b0158e3ff79042efc2147f386632a740c16d5fe73e83d001335aacfc89 SHA512 f8597317a438618b1c360a0a2e82715cd9d9b015e430e18c201785d54becff8b5a2fd6d91e7d86afd3f62594475419c211544aadae31b19a81dcabdbec67b3b6
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.1.3.ebuild b/app-arch/zstd/zstd-1.1.3.ebuild
deleted file mode 100644
index c87529fee201..000000000000
--- a/app-arch/zstd/zstd-1.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="static-libs"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.3.4-r1.ebuild b/app-arch/zstd/zstd-1.3.4-r1.ebuild
deleted file mode 100644
index 1ae35e5b72b7..000000000000
--- a/app-arch/zstd/zstd-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="lz4 static-libs"
-
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		HAVE_LZ4=$(usex lz4 1 0) \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
-
-	emake -C lib \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
-
-	emake -C contrib/pzstd \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-
-	emake -C contrib/pzstd \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-
-	einstalldocs
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.4.1.ebuild b/app-arch/zstd/zstd-1.4.1.ebuild
deleted file mode 100644
index 2704ae6a18f3..000000000000
--- a/app-arch/zstd/zstd-1.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="lz4 static-libs"
-
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		"${@}"
-}
-
-multilib_src_compile() {
-	mymake -C lib libzstd libzstd.a libzstd.pc
-
-	if multilib_is_native_abi ; then
-		mymake zstd
-
-		mymake -C contrib/pzstd
-	fi
-}
-
-multilib_src_install() {
-	mymake -C lib DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		mymake -C programs DESTDIR="${D}" install
-
-		mymake -C contrib/pzstd DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/app-arch/zstd/zstd-1.4.0.ebuild b/app-arch/zstd/zstd-1.4.3.ebuild
index 2704ae6a18f3..2704ae6a18f3 100644
--- a/app-arch/zstd/zstd-1.4.0.ebuild
+++ b/app-arch/zstd/zstd-1.4.3.ebuild