gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-libs
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
423 files changed, 1494 insertions, 4191 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 74004ccb0678..76a4e9e535ce 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 3b135d8f5c0e..7129f79fbacc 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb
 AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.6.1-r6.ebuild 3859 BLAKE2B d0c893a3bfd7bb1b832db459268d592d9bddc9adb4b8987396f60c7f837671f318b0e11c83a9b49bb7dce8723fcd10636a32c79edad8a9601ce5e0abdfef6e50 SHA512 b090e79b0a7a622605d594305f8b34ded08c6538358ccdf5343027508213bd5fd54eabccfd81df276a807e749e73a7d5a6f63c5eb46ab66855ebc6c98debb99d
+EBUILD apr-util-1.6.1-r6.ebuild 3840 BLAKE2B 2a148947e4d60cdf7a46270882f44f5a33b3e2b788eb46ae2bb345a2a9a2bf7e73f28aa34a536b739c2c292d54aa6e0fc11a70ad05bd3aeb159634984e401928 SHA512 813d0c6308f05fde22e93eca6cd1d32bf8307d1aec5960be45bf3140797f69dacb3dfe739593ec0bed57eb67ad7c61fd38f243c82c495f2d2a9d61a7fd4ab6cb
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
index a30d4b805b28..e56b8bc55b24 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index b101ea201154..77d589b63d7e 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,7 +8,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r4.ebuild 4375 BLAKE2B 90b64f9ff2c75943dc1e3af995f20da04d39f5eda30a11af369c29c5abfe7fd81fde013556bf39b9c12977fbaf85b8c4ab48276acb59fe49bbc720d19cc71a91 SHA512 fb52c26e6b03dd7451530d4197b09fa4aa77d423dab40b5e99fca39f31c846e5f938dab13a9388c55041425585acff58cceaec341638ff24e6c223b3177ef6e6
-EBUILD apr-1.6.5-r1.ebuild 4323 BLAKE2B 938bf92a460eb858b5a904e35fdaea447c8555ff4f2e8773469ae3dbaa455c1d3bd106db6139d09a95fb832fe6c785ef8d2edcc624a890031370957c43695849 SHA512 92afea5a9bfe44ad89926b62989cd4910c3f53b906cd89f15c9be9ef79e82ec1a825ce24fec0015888f95ff6bdb4f5954dab08eb67257b634f44a05cf8abebdc
-EBUILD apr-1.7.0-r1.ebuild 4230 BLAKE2B 48e60097117a82e2ed54c76db9459c279ff6027a37a117b31956d301d8d2bac667e7172aa7594cfaf5b6c6214859bda7929a80615d0671707d334992e4015b32 SHA512 95b3159d75de6da4f969572877ceca635b63eec2b6f396acbf7047dee130ba50d0e42e7483decb2f21caf68c3dcb500efc2190bc61777ce759a983cf7f727104
+EBUILD apr-1.6.3-r4.ebuild 4356 BLAKE2B bca2c2b2bc5c36c1063381fd5e10afb01445c4d8c686cebfd47d5555e4ec5c3502fa5f5379c9514af502083f26592f5ac5c601a5aea900c4d9eca42ea58b15d5 SHA512 d72d98a9f6fd70286a322578c9a204467b0fb032b6c7e285f1d2e060067b2bd91d91fda3b7b3c36f039e0a6e5c346ce988aa2cd022168df568f097226f76e8dc
+EBUILD apr-1.6.5-r1.ebuild 4303 BLAKE2B d5b24e55547196f7af1a410799b016ed4d4c3e7b56bd4cd98cfad2695cf6a631ada4bf5a7364b6cf13fb42f34518c23c891475669834bc41b55e09d1bf6ec1fa SHA512 2835d34a94ed1ad850860331185442dbbfb32d399dbf52ee63c31867fed82d5344b0c01ea1811409d6159d9e2d92e8152529c1458e7205057fd6d1f4fece4c7a
+EBUILD apr-1.7.0-r1.ebuild 4211 BLAKE2B 76cbcefb7731762f453232e97ef3ac8bd4c760837106893bee3e97e7a3cc7843293eb29e28660c89b501d36b59a5860d0d3aa7493ff364211587b09aaccb5626 SHA512 0d01ea1981bd339dd89a00c309b59ab6641d384c29cde0223c43c295a8e0ac79d6af412f99098707c7a95af00e31af5e9eee36af33e75d09e35868f59597aa83
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index 4aae28015124..ef0fbd8ec50b 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
index 5ecccc4f584c..4ce4d3d21ff4 100644
--- a/dev-libs/apr/apr-1.6.5-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 006d3ad66017..763666803158 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest
index d9da1516835b..e9c8c635751a 100644
--- a/dev-libs/argtable/Manifest
+++ b/dev-libs/argtable/Manifest
@@ -1,3 +1,3 @@
 DIST argtable2-13.tar.gz 3326444 BLAKE2B 8c78d56c2e1a53747cf480808064cb006644db50a2cb38adddd71eff07d4d7f6e5467c54eec4e5cbb729a7f639927b2d3283c6995bde54134d7a85e39788b87c SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
-EBUILD argtable-2.13-r1.ebuild 1017 BLAKE2B 991dcc5301d19d25a47cb73826820a47165dd53c5bce7b3989b5ac5088e8e452a77b316f9c93f87a6513e12c01e2e4fc439b6848b32f8cd9d29a21c86304f06f SHA512 6bcd2a53dc7aec354be1051de42fc6366dac34e1fcaeaedad861e04f08b61cbe4adda065cfabd2189b800fd28b647ce23559e87f70e1f1db9bcc91533efe11b9
+EBUILD argtable-2.13-r1.ebuild 1016 BLAKE2B fdf6b431a52eff91df8204c3f89ca6e8eb578f743c4fc942156b2457e55edb9eb6e9aca9c2d0901283066203715001988171f2dfbf795e8cec366a10e250b78f SHA512 016612ef6a7dd3e85feb01b0b48183b75b264c0397180a3de8cb0aaa9d18ce939a16f2aafde4f7b40dc92a862f0cec8e5211d4a642b868b49199be8d185c16b4
 MISC metadata.xml 243 BLAKE2B 511d8df17d176cde00906a1632ded7f6c0ec20365b356b94f64c68639c12a17c9c9a8073fc96b1c317b87c7bcfbbf0dd19136207002e810ad8012785f347e1a3 SHA512 16366e8cb41b7dad2327025b380ae289217bfd7dea66e1bf4e37a1c850e566b2485e23b2f06d1d5f5e974fb4910ac6ea5f07767c1dee6bf2621572a7f0639b74
diff --git a/dev-libs/argtable/argtable-2.13-r1.ebuild b/dev-libs/argtable/argtable-2.13-r1.ebuild
index bb91214c70ff..43524040b1e1 100644
--- a/dev-libs/argtable/argtable-2.13-r1.ebuild
+++ b/dev-libs/argtable/argtable-2.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc debug examples static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index b8490432b74b..988c77147caf 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,6 +6,8 @@ AUX boost-1.73-boost-python-cleanup.patch 3414 BLAKE2B 5167f69bbaf47be548a522638
 AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
-EBUILD boost-1.74.0-r1.ebuild 11224 BLAKE2B 4251b39853cf0d542ab3e38d6a193d2ed569cb1e2989daf8c7733a0093762bfcba61ecf5840261aadb3be11a3e9ce420a20bd6a1cdefd3a22d89801e4a1e3eaf SHA512 c40ac4570f08537f46147771c23b0096349128fa3cb74d68d98d0cf5e787e8a71048888341ef0c014a303b7230de71af43a7e65c683678debc8e1d4d2d31eafa
-EBUILD boost-1.74.0-r2.ebuild 11278 BLAKE2B a46f5b7900febf66e128314c956105234d17749a158680f42e1b47ec1089e8753b070d78d3b80f14e88534ab6769d2faf2626b54a74e7f939330df1d2f9d23eb SHA512 9de9e857bb583655f761c0d4afd1a1d6401be85be11801481d914d282c6b1020da51b713cf34ef3d6f45908ca7be40f92d5dec97d3df4a7255dbb6f94475be0a
+DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
+EBUILD boost-1.74.0-r1.ebuild 11215 BLAKE2B 7c0297e0dba1870458403c4773d975d86f268984ce3056f96f6e2d7266dd5af684284a391ea537ea26db52fd8a37a2e349d947d78494078385707ff564de9e43 SHA512 5a1b9fe4a0e1eb1402443b24766fd5686e21ad631cd012ec790d15d778fda78dca1e11dc950d031be52878f2aacf0cb2bc76bac3668d2ab8ec83e38fcc7088da
+EBUILD boost-1.74.0-r2.ebuild 11269 BLAKE2B 64da3849f12b9b2aa863536995ba190f7e3f46e57f923c81fdf8f676770be9f3d89987aaee3cd996c9efd7639e4f0f4f3624170de78b1610400aef37d19e5723 SHA512 b92e43125626e2136a01e2e3351e6b5edc64544f596ab30690df756c8c1060113963a78f143765379906ba03bf3eeb03800adbe493d65cc27f0ee467a3f69a19
+EBUILD boost-1.75.0.ebuild 11100 BLAKE2B cb87f5b303c24ee54d467c0138395ba01045e9c339ad49ee9409c23285b5e7bf5689d0ab2203c51e540e52faf8ccc3f4de686b5f46f28756fcd499ce6aab154f SHA512 159300d3d0d5063ba6eb8b5a083e45a79edeb81f56720119ba2ba495ae701104f1ae804c2c212b8a64fb2b363198af770a9c2b8f75287d45bcb0ef29d6ac00ec
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.74.0-r1.ebuild b/dev-libs/boost/boost-1.74.0-r1.ebuild
index 289729c05267..5c33855bd6f3 100644
--- a/dev-libs/boost/boost-1.74.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/boost/boost-1.74.0-r2.ebuild b/dev-libs/boost/boost-1.74.0-r2.ebuild
index de5aba9c7e6d..7ee28e38a21a 100644
--- a/dev-libs/boost/boost-1.74.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/boost/boost-1.75.0.ebuild b/dev-libs/boost/boost-1.75.0.ebuild
new file mode 100644
index 000000000000..24acd4484ba5
--- /dev/null
+++ b/dev-libs/boost/boost-1.75.0.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	# Remove annoying #pragma message
+	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
+	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build
+		--prefix="${ED}/usr"
+		--layout=system
+		# CMake has issues working with multiple python impls,
+		# disable cmake config generation for the time being
+		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
+		--no-cmake-config
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam "${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		"${OPTIONS[@]}" \
+		--includedir="${ED}/usr/include" \
+		--libdir="${ED}/usr/$(get_libdir)" \
+		install || die "Installation of Boost libraries failed"
+
+	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 10b32fcb4ca3..b48928e2350a 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,7 +1,5 @@
 DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
-DIST Botan-2.17.2.tar.xz 5940964 BLAKE2B 009df11c9d4379a15a48697554a82df3baffad0fff98af995f9a5b9b3223e4db42837650d41b7081170b07fb70d62ab347c5577ef2480a8f7011b40e1cf1764d SHA512 fa9bd30d02540c4544646971c7b82d3873f32362668d2496b4bc1a92f47d52f75ec9533d5848a7d8e9b9077c7ae2866b55d70d39101c705eec0edf9dbf01d6cf
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
-EBUILD botan-2.16.0.ebuild 3089 BLAKE2B b75fc14404acbcc0d1e88278e47283ba0655c318c393deea9b4d26020e7ff45e892beb26d2fee90aec797c34a8c4caa4ca46acd920d434c3f7c89ad3476c6ea3 SHA512 5a8813e00f96d2201dea7bf5c1d10043180a59cca1217b7cdf291c65c1529069e38451b30569c4727af6e548ccdc103c2617d6e6275d703d0ad5835172383730
-EBUILD botan-2.17.2.ebuild 3096 BLAKE2B 1708642bd29b845938675e193b4dbad68b72395116a10ae4eb918c7bda1a693e9659aa11ff46593ddf8ced6c077e98c454e5a0d6ac16f77bc7f4bb685348a0dc SHA512 27d13a9582cbb9b0a923419bfd4b5eabe4126d18bf0c3b226443278aa9e7c742cf409b002e581636e1dbe6437bd5a018dd7829160fe818b220f8fc46c6247989
+EBUILD botan-2.16.0.ebuild 3090 BLAKE2B 194ec6964faa72f817898591613feefd26dd8eb9860c40561daf51489b653d6dc65ad9ff65393d36a560d642ee1c0c6d53b308e67c6b0bcb0a3696cb4ab3925e SHA512 31e089ba9f46373c4831966384d3a0dd51ba2c85e20bee5de5f69d789f6270522142d237df78ada68639b86cf8966f45d1e49d55e135743b9b3cf725f8bac257
 EBUILD botan-2.17.3.ebuild 3096 BLAKE2B 1708642bd29b845938675e193b4dbad68b72395116a10ae4eb918c7bda1a693e9659aa11ff46593ddf8ced6c077e98c454e5a0d6ac16f77bc7f4bb685348a0dc SHA512 27d13a9582cbb9b0a923419bfd4b5eabe4126d18bf0c3b226443278aa9e7c742cf409b002e581636e1dbe6437bd5a018dd7829160fe818b220f8fc46c6247989
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild
index 4fb2d52c4d0f..b8d465aedbe1 100644
--- a/dev-libs/botan/botan-2.16.0.ebuild
+++ b/dev-libs/botan/botan-2.16.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/botan/botan-2.17.2.ebuild b/dev-libs/botan/botan-2.17.2.ebuild
deleted file mode 100644
index c15f5000f25c..000000000000
--- a/dev-libs/botan/botan-2.17.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-r1 toolchain-funcs
-
-MY_P="Botan-${PV}"
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sqlite? ( dev-db/sqlite:3= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-
-RDEPEND="${DEPEND}"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
-	if use doc ; then
-		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling module(s): ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	local chostarch="${CHOST%%-*}"
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
-		chostarch="sparc32-v9"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*) myos=darwin ;;
-		*) myos=linux  ;;
-	esac
-
-	case ${CHOST} in
-		hppa*) chostarch=parisc ;;
-	esac
-
-	local pythonvers=()
-	if use python ; then
-		_append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-
-		python_foreach_impl _append
-	fi
-
-	# Don't install Python bindings automatically
-	# (do it manually later in the right place)
-	# https://bugs.gentoo.org/723096
-	local myargs=(
-		$(use_enable static-libs static-library)
-		$(use_with boost)
-		$(use_with bzip2)
-		$(use_with doc documentation)
-		$(use_with doc sphinx)
-		$(use_with lzma)
-		$(use_with sqlite sqlite3)
-		$(use_with ssl openssl)
-		$(use_with zlib)
-		$(usex hppa --without-stack-protector '')
-		--cpu=${chostarch}
-		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
-		--docdir=share/doc
-		--libdir=$(get_libdir)
-		--os=${myos}
-		--distribution-info="Gentoo ${PVR}"
-		--prefix="${EPREFIX}/usr"
-		--with-endian="$(tc-endian)"
-		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
-		--without-doxygen
-		--no-install-python-module
-	)
-
-	tc-export CC CXX AR
-
-	./configure.py "${myargs[@]}" || die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-
-	# Manually install the Python bindings (bug #723096)
-	if use python ; then
-		python_foreach_impl python_domodule src/python/botan2.py
-	fi
-}
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 10cb7fa843cc..7f9909439975 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,4 +1,4 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
-EBUILD cdk-5.0.20160131.ebuild 1183 BLAKE2B a415b0ca097e808652d5384e0540f9e2a31229e1e0de8fb430430c78acfefaabdd3141a8766c2080789d41c798ad15892b2032cf0801f0f0939efe63eb437867 SHA512 2509488e4e39e7771cba97def1eeb800d7930c301776c495823fd042d09dccfb2a5514a643ea74e8bf6972d5bc56a74407f93d63b340e727304dfa880caa5b3f
+EBUILD cdk-5.0.20160131.ebuild 1184 BLAKE2B 488c718eedb70b6597e407d66e340c3bad3a65e681d3f369023d7ebae446ae6c99b01be83398a95190dc30233609e4866985634acc45f0b1ac3236e67d1c52b8 SHA512 ac97c4bbf62f60f1c79910f19d3b5deb48adcf8fd421b46df35b9525de5534ba3a5028d7f714d0e54701e3bde54a7040ed394b2486ecbbf47b2fd00d6f628fb5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
index 8fb480622f85..fb5cd7e68fd6 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index 22facd4727c4..7c2c9b90cf33 100644
--- a/dev-libs/cgilib/Manifest
+++ b/dev-libs/cgilib/Manifest
@@ -1,3 +1,3 @@
 DIST cgilib-0.7.tar.gz 268783 BLAKE2B 525487df43b9a936af8e32aa1e9b979bb93197cee7d7eb730e31d756201bab441e46d21b05b2c9e92a518fe761d7e6a643545160587e462b604780d52a88c261 SHA512 9feaa6c18e0c8ebbffa2682c07e584ab4970e0b98b61507ba67b83c920d9ba9012244fa96c95ab71121728b9945269683a2eef274cd56660576ae9b055861c83
-EBUILD cgilib-0.7-r1.ebuild 607 BLAKE2B 1791838cf524d65d3de96b2401d1689ffa287e4101de95c860be8ae56c34bc55ae586102823193308312e0bced7f113e53e138f39dcaa6bc5f2b7e88b12f74e9 SHA512 e896622899bf05f5cd1927859b4c708acd5dc9204b6bb65f13af3ba837c2b34cb36e6bf5907f75409423826a9f293fec9b43e246c4bf95d88bcb6cbf0c25516d
+EBUILD cgilib-0.7-r1.ebuild 608 BLAKE2B 1c6c284b9d84cf74043b4415773b7db17089c3b38333964163aea7ef9916b7929ada37318161bd3731e55b181bbee21eeb0ef71fe9f905c115d5d0dfde037702 SHA512 6a223b44e7ecb8962fa1825574c6a08277a16608e68f65f96621fedcc5cffeefe1cdd7ecedd688e4fc9e361c353221aae62e205ba7ee1517c1b5d55b813fd14c
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index 4f873fcb0b7a..265ae95244fd 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog README cookies.txt )
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index 34f3e27164f5..259903f20a18 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,5 +1,5 @@
 AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
-EBUILD chmlib-0.40-r1.ebuild 824 BLAKE2B e3274916e314e100665532627205f82bf7b3b2b2ad8c9b473d2ee48a87700c899cff75f000503ee150b3a52740ea91df16cfd058b5ca9273f5890d1691a42f80 SHA512 e1d7ef48841086cad69905923995c67c161829182822786654d26c393df36a4f17c2e5d29e8a3fdbe44636b4577c087f8cf5ca3a1e06fff21053ccff8863b33e
+EBUILD chmlib-0.40-r1.ebuild 825 BLAKE2B a5a08db69dc608e4332d58e59373020cbc68b59498780dade5fb8e50734843384de5aebf606fae2ecb2d46e66cffc0aa25622a546bc712ebdec9dd15f8a94554 SHA512 023f8a4f05f0e173b4dc9a3f5412858de52bbef108e7e874299609f6d533de5673eff9b024ec7f704ccabb687a4fc7aeeaa27f7750fff28145eae6a2e47ee11d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index 957e5d88bca4..fbeb8f1b53c8 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="+examples static-libs"
 
 PATCHES=(
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index d7436035275a..d9394fc054ab 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,7 +1,7 @@
 DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
 DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
-EBUILD confuse-3.0.ebuild 1144 BLAKE2B 6bd65ec30d98b58809d3534fa706ee3342ded63b16d67647b56da1868b8005c1495b28572a1eba084bc3d839a0b9149733be04cc13b5de4dbbbf32ea37bd3b96 SHA512 7b99185b9266523218389c64f7ce04f0eddbce8c8c15cdc045885d7924d11ee2cd8823e1209b23f5d96c94dbc9006d3f872fc47d6394119371fa182d60419fdb
-EBUILD confuse-3.2.2.ebuild 1158 BLAKE2B d5c70f358f19069692966841921a71f86a18c234e70efa7175dd90fe07e98bd65de5a1f5524fbef691f7e7724a09221b2843b1bd63e5dd6f0178c9743a56b98e SHA512 cc010f8ff44fbfbacd2ba20e574e9eb92ab383cac955740bc68c3d7a3aa72dc3023ae4f32ce8e30f5a17008aab5cfc2fce845c5a5764ba1f34370e1e6d2daf69
-EBUILD confuse-3.3.ebuild 1166 BLAKE2B 3479038d7f5ac05e9ca88db18c856b790819c2b3dcd4a06af3cabc4bd9daebabf668b69e4b1176a0b332313235c44ecece4ebddc2a11c10466b676577f766c74 SHA512 712be1e3d84038b6c1bd94a98c4993d5de0c558b3264a959aad74521202572eedd4527991ef564fb0f56ca8e896c2a0af77875a13e79b9a4408e2683d4c3e148
+EBUILD confuse-3.0.ebuild 1145 BLAKE2B a8dbc76fee7ca638050835e2440d28c6f306bbade9c1e87100d13d5938220866f2bf82f948387caaa86eaceb19ba340f52abc8e04db24211bef58d8d6fc03283 SHA512 a443983f7c69b19d27a34cb9587a28001bfbb18270c446013fe4c10a6bcd29cd6262ad30a58ec71ebb2573633226911e5a4b612e1086caa4b34713e5d1c76d3d
+EBUILD confuse-3.2.2.ebuild 1159 BLAKE2B 93a94f417a282645b70990f009ea43f545cbb324aa8649ebbb15d2e8d325cae03d0d803a846e67e5a81f3cc4f4d002d5d55206b0696ad756e5df928484f81b2f SHA512 e75791714a4b91cb326996687a7cef54cbdb54b7a9a17f566e6a956613be92050bea8c29410919ae09515a27268657809416675c2f235e1b72fa65e25ea7808c
+EBUILD confuse-3.3.ebuild 1163 BLAKE2B 5c30d24ee6506fb0c7c965182708e93fadd73a116e127a2f61901b8ddeb9ab77c0978373dd485112ef72290e9c32c3f28a2ffedd0be07fcf52768cb45cbda95f SHA512 b143abdb0879e6e7474013382d618e0a982f35855075b25013828d4657e8367ea61cc21ef10190a9e735a38524d5fe6e4723e07b6e0a2388430a43b075a222d3
 MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild
index e2db63553e1d..294f4fcd0bf9 100644
--- a/dev-libs/confuse/confuse-3.0.ebuild
+++ b/dev-libs/confuse/confuse-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/confuse/confuse-3.2.2.ebuild b/dev-libs/confuse/confuse-3.2.2.ebuild
index 5efbbf361833..8ffbef80c0a5 100644
--- a/dev-libs/confuse/confuse-3.2.2.ebuild
+++ b/dev-libs/confuse/confuse-3.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/confuse/confuse-3.3.ebuild b/dev-libs/confuse/confuse-3.3.ebuild
index b1d52d810168..6fc2d7f5da9c 100644
--- a/dev-libs/confuse/confuse-3.3.ebuild
+++ b/dev-libs/confuse/confuse-3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index a2976a069482..a28d6f32ac9d 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,11 +1,6 @@
-AUX crypto++-5.6.4-nonative.patch 1011 BLAKE2B e8f8245dbb1ce9a0011c0e73ea1021ab4e0e197d2f3eaeaa455265dcbb75b19d50bb308b787bd926afee994c674203622662a120b6c539d6fed6c434bae86b55 SHA512 fd9973d5fcb8182f89388276c54e8698c9b0ec82be1e93a575b4a00ad5f8b2966cd2cf699258dbf8b681423b31cb3d926a694d36d0eb07bf583811d55e845837
-AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f04d90f0b5bff524aa817a46dcb1c3fd005609a938e08007d71bf407bd8ef0c334baa2054b44c2aac58c15817314223c7b0a2c SHA512 42566d3e67c6b253b65587877652112691ba91e554db47843256a9c2af8a29d7950266a508358356f008462ec51cc1dadf4d0e9dbbd33a33a5a94d029eebc1f9
 AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540b7c7d8c88c4f671db41c3b9b22ab8d537b9ddeb6cee899daa58b2173e5486ee763ba6f163ecfa3a20018a5117a94 SHA512 d9f23cf713e76d986d50fce895ba9ef2980b3ad81460b81217f9fa5af2a8840ab9e9e72c1d8d9635eaeceaa45f1add9e8dad36fd4159923b659f4fce09ef502e
-DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
-DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
-EBUILD crypto++-5.6.5-r1.ebuild 1508 BLAKE2B 414f8076a72da047953f6153e867ba9f3a46aabea6bdb49be0c8581c76c47ca7017f606ba4e83261e6d61ed50986ebe0430d62e8870ec13f6689f64de92b67e4 SHA512 c9d628ced0291647540937d5b8b21a3d8b906c1f735efefe46e9df39c34038129e13ee305fadf21e61a844a2d526432379bcd1a0906f305eee247b5735af4068
-EBUILD crypto++-7.0.0-r3.ebuild 1055 BLAKE2B 227217e396ccaa5da08fc2ab159f0519cc9ec0d9283a480d2f9f8f9fa1861fdd7d99b20c50ed891fb206faadc770d77fb894d6140ab15e088faa2ed57a439c17 SHA512 46579432b7c764ff592ec94a5d744aad6f1a9453dc2a4583dc71872fcf52260052d8e3edf790364b7eb36e30ebdb1459ee6fe9400fb62881fe81c5ecce96924f
-EBUILD crypto++-8.2.0-r2.ebuild 1734 BLAKE2B 75558e27ac641842302bb1204ae483852c71b65741de7f426c415b15907ae1b20515c0e9f2518248884003157b4eabfca8637eba01ac2df7f0c26be77074b454 SHA512 7d75f266de075a6410ef26999697db14c76ff8b38316afa227419c1532b63c62a70a9cdee67684cded93b12aa49e592be1ba7c0f9ef81666fb95c692d2b99587
-EBUILD crypto++-8.2.0.ebuild 1100 BLAKE2B 2f84080a48c493a2c6ecb94c5b59a24ef253ceec47bacf364fb81e3ef9a79254c9171f62199087586a853cc21da3febda660e4c0601974ede860bff18ed5f8b6 SHA512 01afc48b803f776c94836a762f7a6734f0497922636acacab3063d8f4f9903bab0173e87467e3dc3364a51789537c4561761353497b55585382e2cfbb9526622
+DIST cryptopp830.zip 9120687 BLAKE2B 777ae6a0716793dbbf40594e5f910783852df15e1d6444ddb9505e9f00e6ead0c17fcf6eb5d0b4d58881595fefa79d285bd2db1f1789716ffb59624c50823c3d SHA512 ad5219a66c5924d330d3646d0ff996dd235006f6812074bc4eb9e8c662a4f000ba20449d377f24b133d19ce682f7b2a3b2eb4c08857ce0f5bb39743d1d425147
+EBUILD crypto++-8.2.0-r2.ebuild 1728 BLAKE2B 16a66423eacd0ef476c55b2ff1ac59d074a7fafdce464d7ad5b8d04769b2dde7f098f27b7ab9986ba686f29b168f1d44213bb45f4fddf6223a095f24525a4378 SHA512 6e37f760a975c95251c5919fb30f9a6311a0f5191c9ceb8984ebf7d7283558010fbb60af5f57bba5b73f25197eff43475c47dd0eb8807e97a04f87bebc6b5308
+EBUILD crypto++-8.3.0.ebuild 1095 BLAKE2B 7a8ceb7e2203e017b5236c023ad4afd7bd6fc9d1dc49c84e2d6ba638d78cd05c76f642ba519e8ecdfc38e6972750b69ba7aa87f4219f74260f5e3586e8ae101c SHA512 d402a6c90c6b342fae9fad6a7037e4d229221ff82bc218fd46e8feec10dd632619de051950639f8208373cc580ba39d5445ecf76a4bd1ca162e7d3d867f61a7e
 MISC metadata.xml 505 BLAKE2B 8c1bfd20c9717c7b410af1d0dab008327049437c0c3a046bd3d3d79cac08cac11fe39c29eb933ce5dce3b3a7b57c017367d486b0c1ed70c78496b61ae0ebf981 SHA512 1a4c274988ad19a49919d882eb403c8bb75ebef7ebdc6350e6d705ab6abe672bb6ee32e8be71dbc52c3b71cdd84aee6b7b44e0a42b571de2480b7b78fc871253
diff --git a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
deleted file mode 100644
index 0d60a1066e54..000000000000
--- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-
-LICENSE="Boost-1.0"
-SLOT="0/5.6" # subslot is so version
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
-IUSE="static-libs"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.6.4-nonative.patch"
-	"${FILESDIR}/${P}-CVE-2017-9434.patch"
-)
-
-pkg_setup() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-}
-
-src_compile() {
-	# higher optimizations cause problems
-	replace-flags -O3 -O2
-	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && append-cxxflags -DCRYPTOPP_DISABLE_ASM
-
-	emake -f GNUmakefile all shared
-}
-
-src_install() {
-	default
-
-	# remove leftovers as build system sucks
-	rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-
-	# compatibility
-	dosym cryptopp "${EPREFIX}"/usr/include/crypto++
-	for f in "${ED}"/usr/$(get_libdir)/*; do
-		ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die
-	done
-}
-
-pkg_preinst() {
-	# we switched directory to symlink
-	# make sure portage digests that
-	rm -fr "${EROOT}/usr/include/crypto++"
-	rm -fr "${EROOT}/usr/include/cryptopp"
-}
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
deleted file mode 100644
index f1d8bcbf44c5..000000000000
--- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-
-LICENSE="Boost-1.0"
-SLOT="0/7" # subslot is so version
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
-IUSE="+asm static-libs"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-config_uncomment() {
-	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
-}
-
-pkg_setup() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-}
-
-src_prepare() {
-	default
-
-	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
-
-	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
-}
-
-src_compile() {
-	emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
index b81af078bf30..1ffe175e83b9 100644
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.3.0.ebuild
index ec4e24855984..84d1b838f7c4 100644
--- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.3.0.ebuild
@@ -8,30 +8,19 @@ inherit toolchain-funcs
 DESCRIPTION="C++ class library of cryptographic schemes"
 HOMEPAGE="https://cryptopp.com"
 SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
+S="${WORKDIR}"
 
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
 config_uncomment() {
 	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
 }
 
-pkg_setup() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-}
-
 src_prepare() {
 	default
 
@@ -41,6 +30,14 @@ src_prepare() {
 	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
 }
 
+src_configure() {
+	export CXX="$(tc-getCXX)"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+	tc-export AR RANLIB
+	default
+}
+
 src_compile() {
 	emake -f GNUmakefile all shared libcryptopp.pc
 }
diff --git a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch b/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch
deleted file mode 100644
index 77d74ee729e9..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: work/GNUmakefile
-===================================================================
---- work.orig/GNUmakefile
-+++ work/GNUmakefile
-@@ -125,23 +125,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS
-  endif
- endif
- 
--# Guard use of -march=native
--ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
--   CXXFLAGS += -march=native
--else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
--   CXXFLAGS += -march=native
--else
--  # GCC 3.3 and "unknown option -march="
--  # Ubuntu GCC 4.1 compiler crash with -march=native
--  # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
--  # Sun compiler is handled below
--  ifeq ($(SUN_COMPILER)$(IS_X64),01)
--    CXXFLAGS += -m64
--  else ifeq ($(SUN_COMPILER)$(IS_X86),01)
--    CXXFLAGS += -m32
--  endif # X86/X32/X64
--endif
--
- # Aligned access required for -O3 and above due to vectorization
- UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
- ifneq ($(UNALIGNED_ACCESS),0)
diff --git a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch b/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch
deleted file mode 100644
index 428f48901a31..000000000000
--- a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 07dbcc3d9644b18e05c1776db2a57fe04d780965 Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader@gmail.com>
-Date: Wed, 10 May 2017 18:17:12 -0400
-Subject: [PATCH] Add Inflator::BadDistanceErr exception (Issue 414) The
- improved validation and excpetion clears the Address Sanitizer and Undefined
- Behavior Sanitizer findings
-
----
- zinflate.cpp | 8 +++++++-
- zinflate.h   | 4 ++++
- 3 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/zinflate.cpp b/zinflate.cpp
-index 664efe6..fbd7505 100644
---- a/zinflate.cpp
-+++ b/zinflate.cpp
-@@ -550,12 +550,16 @@ bool Inflator::DecodeBody()
- 						break;
- 					}
- 		case DISTANCE_BITS:
-+					if (m_distance >= COUNTOF(distanceExtraBits))
-+						throw BadDistanceErr();
- 					bits = distanceExtraBits[m_distance];
- 					if (!m_reader.FillBuffer(bits))
- 					{
- 						m_nextDecode = DISTANCE_BITS;
- 						break;
- 					}
-+					if (m_distance >= COUNTOF(distanceStarts))
-+						throw BadDistanceErr();
- 					m_distance = m_reader.GetBits(bits) + distanceStarts[m_distance];
- 					OutputPast(m_literal, m_distance);
- 				}
-diff --git a/zinflate.h b/zinflate.h
-index e2fd237..c47d2f6 100644
---- a/zinflate.h
-+++ b/zinflate.h
-@@ -96,6 +96,7 @@ public:
- 	};
- 	class UnexpectedEndErr : public Err {public: UnexpectedEndErr() : Err(INVALID_DATA_FORMAT, "Inflator: unexpected end of compressed block") {}};
- 	class BadBlockErr : public Err {public: BadBlockErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in compressed block") {}};
-+	class BadDistanceErr : public Err {public: BadDistanceErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in bit distance") {}};
- 
- 	//! \brief RFC 1951 Decompressor
- 	//! \param attachment the filter's attached transformation
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 2d6362f37140..162f41de9edc 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,26 +1,4 @@
-DIST cudnn-10.0-linux-x64-v7.4.1.5.tgz 422699128 BLAKE2B e13b22428f011a4ad6532bfa35d836f23ea6298ad220eaea6c3a6fac7694f1c6b6920255690fac10d84388fb2bec7cc60a0319bd1816b20eac134c7b112822b9 SHA512 fd065c23b27416e2ace5f0eee854ea4a5e04f6ab4cf3a38cf806bb37a45d29756c3f138dfa01b991e96410de3668e0bb9d3cfc19cb7da7113c1f10d4147fcf67
-DIST cudnn-10.0-linux-x64-v7.4.2.24.tgz 424488399 BLAKE2B 9883cccf146e3ca3a05b8e7ebb2d265da3b7e05949ebb76369a865aa1c2c55c217b21a7847417264712882cc882b25380e5978e58c74279eb208ec593d85e919 SHA512 1e1533a62355bbebc3df62b4c0f306195c7301334390511fae2e0f071d58451edda69b72c3a257fd16470fe3ac5d3ec00aaf208dee2e30d7db0c1f9300a9c663
-DIST cudnn-10.1-linux-x64-v7.5.0.56.tgz 471291852 BLAKE2B 966a84e983631c827d7852e1dee0a87d80b61521a3c7c836c746f6ce5b60afb1da955a692dce5f0166600707c1f060231d7062d78acdf6085deb37c023301b8d SHA512 875e50669f7ab0b8f52e793285041c0a33dfc951a562869258dd22f85c94cc924c87325253f39fa64c4386768eafd3b0fe181188ef6dd5707f57fc88a6495e36
-DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844a0b5df22420148bcd9092b9ad81a45560f901d36e3ab228e7b5fed85519094f4b68be46cbb631368d67166cbef2546b94185a9058d SHA512 c8d2c6efdb79940f5d475057b1e11246038b894990f58a620635e03d561ec3987806c0bccee8c12d0d3d8c4b5bf5211e46faa2c12918520af61f36bd36eb1738
-DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244
-DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d
-DIST cudnn-10.1-linux-x64-v7.6.5.32.tgz 523418497 BLAKE2B 28febb24382d411faa870cd42e999431d1ee1d083c09903ee4a8f5bee676981c60f6daf6cd256978db69345397db743a7a6f6187376520f5c4f968f6177e0201 SHA512 1073bc42c2c36fce6b710882a04a4035d66d95c410200b9d50953e993d7b801cc3a837e42843ad2447e62ea5dfc8ba22c8a803464716c56ffb811aa278645771
-DIST cudnn-10.1-linux-x64-v8.0.4.30.tgz 678710754 BLAKE2B 5ad59925a500968eef8306c7e207c12ea2f55deecd2d044d7f1f158b76264aeb954f3029d1eaa5ef2aa6939c56e39177af28fc00cc04e2fdf26f9091ef46f3ca SHA512 419f2875a0b362107ede5d238250496c1011cb8e1fdaada1ebdca8737e9df4eaddd1d3a25feeb0ef9baa0100c9f84507e527ed922b676f7883e0594b017ed9d9
-DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6
-DIST cudnn-10.2-linux-x64-v8.0.4.30.tgz 700128057 BLAKE2B 9883cb5993850b9dc0fe703925be4980b7768a6b1be940058f727e69e5d606f25b54ec3368fd22dddcc39092ac488ded4a9078c4ebb743e12c59688413c056cd SHA512 ab41425bc5fad91e9a4270059d8125efc93407956b64c2ecc926506d4c826f33fb7561b143b159e92b286937e940f05fb2f4059747ee80c28b1e7a4d8b53c000
-DIST cudnn-11.0-linux-x64-v8.0.4.30.tgz 1048904376 BLAKE2B cb9ee44998ca17f670430e2e0641d3f804ff468e1b9fedc88ae6827b340917a89a8dafce88318f30f70333b06dea87c6f7b76851b3fbad6902b020b79e1cb085 SHA512 3364625e24bf5e57ceb4e38cf4eca81341245d9ba354816247537c943c70f9981719cf94873b19aa23b45c64d16a0374c0b9f60328e76f8e5b38f6c88610bff4
-DIST cudnn-11.1-linux-x64-v8.0.4.30.tgz 1510998061 BLAKE2B 1829886516d75ef6015cdbfe26ab8508d9e99d9a3c39b2fedc236663e509f4bfe9adaa54814906a2bb5b885379d4e2349e46d3580f815acdb16e9f73d51574d9 SHA512 57615fef93f0897ede6d65da255a61f2e84d25ef46cd85c5f65558ba4bd8fee6f1ff06a4b0ecf20d0ff92bfd019a3068c719cdcd0de0eb2d16b18caee4aae610
-DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
-DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
-EBUILD cudnn-7.0.5-r1.ebuild 565 BLAKE2B 883ccb932c1f725857ed0dbf411455074aee04e2d451e2d9854ac34b4bf96b406fabf4f6c14b886dd290e05c780c8c1bf070f5c12f5b7c2089826e157df8afe8 SHA512 9033ffec0923335865f04c6e4ada3bc4266bf59a458dba2230f583ba900ff13499c26f01ef6d3f41941916b0a4ec5d2321077f3a7382fc116bbe8770cc4c898e
-EBUILD cudnn-7.1.4.ebuild 554 BLAKE2B 3e7bc00ebb9dd2c01e26148f213cedb9b047bff89084bc63dd631ab70d0bb795a7afd525f155815d83a63441b3ae349bce2c0697d964629d022330d90832fb60 SHA512 c255e5c3fa2aa8f10cb022489e7384a4f80888270214bebb18d695e031cbd4cef3ff11921a0b82d555073a5cccaa9a191aa43f92f4f4674f2db9eaa05dc33785
-EBUILD cudnn-7.4.1.5.ebuild 543 BLAKE2B b040a2b17939e30b7c76bdb04dce006e861f5dab16acd048cdc08dc6b7a1fd94b247c0a681a4e263633af7c9d04e5f193e725df37b3b33f305ee94b29ecbf428 SHA512 80126c7fc9f55fadc1fbce58997a1f5daad803af3335fd429c70dd126b4f2a2f6b105b25488613ec3fe20624f1d5758f2b67de0112d8d4930a2b05b24a0e1315
-EBUILD cudnn-7.4.2.24.ebuild 543 BLAKE2B b040a2b17939e30b7c76bdb04dce006e861f5dab16acd048cdc08dc6b7a1fd94b247c0a681a4e263633af7c9d04e5f193e725df37b3b33f305ee94b29ecbf428 SHA512 80126c7fc9f55fadc1fbce58997a1f5daad803af3335fd429c70dd126b4f2a2f6b105b25488613ec3fe20624f1d5758f2b67de0112d8d4930a2b05b24a0e1315
-EBUILD cudnn-7.5.0.56.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
-EBUILD cudnn-7.6.0.64.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
-EBUILD cudnn-7.6.1.34.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
-EBUILD cudnn-7.6.2.24.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
-EBUILD cudnn-7.6.5.32-r2.ebuild 858 BLAKE2B ce144c670e508c53d1f3d1621616dbf49c1493445058cd027f1920942a5f254c0133fb39e7aef9514284e2fe3a87b0a36770167176c25dc133be945525f3619c SHA512 18c3b7686ab6242a6a6fb5883d0a5484a37fb040be46ffc7087da28a4b1d7913b3eaa6ef9ce2d52194592b4b6a6b79aee302f1c9c9f79c582ea99f853219a9dc
-EBUILD cudnn-7.6.5.32.ebuild 718 BLAKE2B e8fec9a34ff7103a60c8ec7f226d29054c711c13cc127a41abde7620344246edb06139147a769a3b3b0a7fd007765177ed781726a297bd9d013cc2e44e86bdff SHA512 d435be66ef4be1c40885016c5e13d5fd11dbadc4d109f06da5eef3608bd3d57e7b66b54d3f6ea12c6a94a4d91aaf8b8b6fd3872aab7205d4473ea61281cc8182
-EBUILD cudnn-8.0.4.30.ebuild 1090 BLAKE2B 1d85500b4fc1095fac64b155eecd9bcea4ab794319b1efb884d64023508bc5105c7a294323d8c7e26dfbc837ea8e9a903a15e4c80414782cce142ebdcf888717 SHA512 d945ebf9509e03f99026220176624f7ae0289878e03aaeb16387761d8d496086b9ff5b40538132eabb09989dc32ea548ea8285b4fc546a17d9b552676ed45d0c
-MISC metadata.xml 492 BLAKE2B 0d757f175d18c84a7c9cbe077d382285a905e4670028f2ff2bb4fb793be819de38916fbbb27129ce4d78b2db72a4cd32a4d9911874d43df5083b651f8135523e SHA512 8bf084e468673e90b19a0e53985e81bf770de4276e5455a4155f06b0519c75720509c55cb9c1fc5f23798b0f835c6b4f4eb025ef402cb48334a06b025954b2bf
+DIST cudnn-10.2-linux-x64-v8.0.5.39.tgz 706337907 BLAKE2B 1dda021f7c313b53fe6024bd7c0eccf3746a55b7399a63cf3160f2a474fd36e33273d8714dc099fed901b6be3dfac51d14033cdb0fe85c2019222127b695c9ef SHA512 867fc7ff9336656431069f01d5f59bb5da09d51dc38ba723d066a1b338646b704969a5c7595551b357b98e7d2204863d4d2b7a84708480e16dc3dbb604f26339
+DIST cudnn-11.1-linux-x64-v8.0.5.39.tgz 1548325637 BLAKE2B 6c846156b3d6b2c286ea2ec639dcaf887ca172b23d98bed5227c312a4cf79381d5b81c763e6237cb57f3ad47500042cef6d454d43755110defcb6f98b6e7a28a SHA512 f704df22336376a9053a7c1f22e650beab61c6829325e0c221416f38a867180a65f9aca7a6f14f5a61c0b450d24a1dff27df47d996d3d26ff1c300b9bedaacc6
+EBUILD cudnn-8.0.5.39.ebuild 851 BLAKE2B 3ab0bde4a416c7c83623604cd86cab09237cb39ce780a44e12dbe34dd88c771e042439bbd78c423c18b61dd2f2c54e08cecfc6f359689dd02e0de5f144fbfb06 SHA512 f9871dbd87ecfa60baa5a789245f1ff828b1547831b3e04575e1c760a35225567761a79f630d8fe86df1c499943397398eb625c178db97fafbf2f3f2bcfb14d4
+MISC metadata.xml 384 BLAKE2B b0f6f04f6a0e59747517b7c29c6786e9c709e511300cd17d0372a1bf5c29d9c201a7e640600fce6209ee4d589073622818a7802565e11120efdda21d5e82d947 SHA512 f09119c58f68b6142947f477f42ebe51ebc71f71f2d189bc6d8080ce06bbfcba285df9d6664d603e43e5aab047f085c66015682f491e78e8ffc174e4146cba6e
diff --git a/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild b/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild
deleted file mode 100644
index 219fb86f697f..000000000000
--- a/dev-libs/cudnn/cudnn-7.0.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CUDA_PV=9.1
-
-inherit versionator
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(get_major_version)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${MY_PV_MAJOR}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt
-	doins -r *
-}
diff --git a/dev-libs/cudnn/cudnn-7.1.4.ebuild b/dev-libs/cudnn/cudnn-7.1.4.ebuild
deleted file mode 100644
index af229d78d73f..000000000000
--- a/dev-libs/cudnn/cudnn-7.1.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=9.2
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${MY_PV_MAJOR}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt
-	doins -r *
-}
diff --git a/dev-libs/cudnn/cudnn-7.4.1.5.ebuild b/dev-libs/cudnn/cudnn-7.4.1.5.ebuild
deleted file mode 100644
index 12b9a675c0be..000000000000
--- a/dev-libs/cudnn/cudnn-7.4.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=10.0
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt
-	doins -r *
-}
diff --git a/dev-libs/cudnn/cudnn-7.4.2.24.ebuild b/dev-libs/cudnn/cudnn-7.4.2.24.ebuild
deleted file mode 100644
index 12b9a675c0be..000000000000
--- a/dev-libs/cudnn/cudnn-7.4.2.24.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=10.0
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt
-	doins -r *
-}
diff --git a/dev-libs/cudnn/cudnn-7.5.0.56.ebuild b/dev-libs/cudnn/cudnn-7.5.0.56.ebuild
deleted file mode 100644
index 2f134235f5ae..000000000000
--- a/dev-libs/cudnn/cudnn-7.5.0.56.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=10.1
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux/include
-	doins -r cuda/include/*
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib*/*
-}
diff --git a/dev-libs/cudnn/cudnn-7.6.0.64.ebuild b/dev-libs/cudnn/cudnn-7.6.0.64.ebuild
deleted file mode 100644
index 2f134235f5ae..000000000000
--- a/dev-libs/cudnn/cudnn-7.6.0.64.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=10.1
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux/include
-	doins -r cuda/include/*
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib*/*
-}
diff --git a/dev-libs/cudnn/cudnn-7.6.1.34.ebuild b/dev-libs/cudnn/cudnn-7.6.1.34.ebuild
deleted file mode 100644
index 2f134235f5ae..000000000000
--- a/dev-libs/cudnn/cudnn-7.6.1.34.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=10.1
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux/include
-	doins -r cuda/include/*
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib*/*
-}
diff --git a/dev-libs/cudnn/cudnn-7.6.2.24.ebuild b/dev-libs/cudnn/cudnn-7.6.2.24.ebuild
deleted file mode 100644
index 2f134235f5ae..000000000000
--- a/dev-libs/cudnn/cudnn-7.6.2.24.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=10.1
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux/include
-	doins -r cuda/include/*
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib*/*
-}
diff --git a/dev-libs/cudnn/cudnn-7.6.5.32.ebuild b/dev-libs/cudnn/cudnn-7.6.5.32.ebuild
deleted file mode 100644
index 9efaf0b7e601..000000000000
--- a/dev-libs/cudnn/cudnn-7.6.5.32.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CUDA_PV=10.2
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-MY_PV_MAJOR=$(ver_cut 1-2)
-SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
-
-SLOT="0/7"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux/include
-	doins -r cuda/include/*
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib*/*
-}
diff --git a/dev-libs/cudnn/cudnn-8.0.4.30.ebuild b/dev-libs/cudnn/cudnn-8.0.4.30.ebuild
deleted file mode 100644
index 43f665fadede..000000000000
--- a/dev-libs/cudnn/cudnn-8.0.4.30.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
-HOMEPAGE="https://developer.nvidia.com/cuDNN"
-
-SRC_URI="cuda11-1? ( cudnn-11.1-linux-x64-v${PV}.tgz )
-	cuda11-0? ( cudnn-11.0-linux-x64-v${PV}.tgz )
-	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
-	cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )"
-
-SLOT="0/8"
-KEYWORDS="~amd64 ~amd64-linux"
-RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
-
-IUSE="cuda10-1 cuda10-2 cuda11-0 +cuda11-1"
-REQUIRED_USE="^^ ( cuda10-2 cuda10-1 cuda11-0 cuda11-1 )"
-
-S="${WORKDIR}"
-
-DEPEND="cuda11-1? ( =dev-util/nvidia-cuda-toolkit-11.1* )
-	cuda11-0? ( =dev-util/nvidia-cuda-toolkit-11.0* )
-	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
-	cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /opt/cuda
-	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
-
-	insinto /opt/cuda/targets/x86_64-linux/include
-	doins -r cuda/include/*
-
-	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib*/*
-}
diff --git a/dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild b/dev-libs/cudnn/cudnn-8.0.5.39.ebuild
index e4c0526676b3..08834aa3d656 100644
--- a/dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild
+++ b/dev-libs/cudnn/cudnn-8.0.5.39.ebuild
@@ -5,32 +5,32 @@ EAPI=7
 
 DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
 HOMEPAGE="https://developer.nvidia.com/cuDNN"
+SRC_URI="
+	cuda11-1? ( cudnn-11.1-linux-x64-v${PV}.tgz )
+	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )"
 
-SRC_URI="cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
-	cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )"
-
-SLOT="0/7"
+LICENSE="NVIDIA-cuDNN"
+SLOT="0/8"
 KEYWORDS="~amd64 ~amd64-linux"
+IUSE="cuda10-2 +cuda11-1"
+REQUIRED_USE="^^ ( cuda10-2 cuda11-1 )"
 RESTRICT="fetch"
-LICENSE="NVIDIA-cuDNN"
-QA_PREBUILT="*"
 
-IUSE="+cuda10-2 cuda10-1"
-REQUIRED_USE="^^ ( cuda10-2 cuda10-1 )"
+DEPEND="
+	cuda11-1? ( =dev-util/nvidia-cuda-toolkit-11.1* )
+	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
-
-DEPEND="cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
-	cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )"
-RDEPEND="${DEPEND}"
+QA_PREBUILT="*"
 
 src_install() {
 	insinto /opt/cuda
 	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
 
-	insinto /opt/cuda/targets/x86_64-linux/include
-	doins -r cuda/include/*
+	insinto /opt/cuda/targets/x86_64-linux
+	doins -r cuda/include
 
 	insinto /opt/cuda/targets/x86_64-linux/lib
-	doins -r cuda/lib*/*
+	doins -r cuda/lib64/.
 }
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
index 31978d943c26..61e3b0310e2b 100644
--- a/dev-libs/cudnn/metadata.xml
+++ b/dev-libs/cudnn/metadata.xml
@@ -6,9 +6,7 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <use>
-    <flag name="cuda10-1">On nVidia CUDA 10.1.</flag>
     <flag name="cuda10-2">On nVidia CUDA 10.2.</flag>
-    <flag name="cuda11-0">On nVidia CUDA 11.0.</flag>
     <flag name="cuda11-1">On nVidia CUDA 11.1.</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index fddd9920b417..edcc795bfdca 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-glib-0.110-config-glib-genmarshal.conf 3281 BLAKE2B 5724ec3aa555d71b26739a8d4ded9773872fdfacdd6657070fb8ccd2b4164180655ecc7b83ef0c9440b867394c766c9276662d4d278a9d988909fba04b6d744d SHA512 76dafdb81234600b0717e79d1ce8cdc6668aaacbed607f929bc9d299dcad0330ccf62e2bbfe73338526770faaa40f9f5564a108d8830484bde2ab7a78cae6e03
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.110.ebuild 2550 BLAKE2B 62c0efc5a9321aa72c27481db578bfa5ad252e39d78e313171a7314e2d6fcac4413fce9e5a98423e7249dd3f3333405ba25af399ab1e7a4e3d25dc46a3a59131 SHA512 979283a5e976572055562ae2558ec616f53647dcf6aa425ad925509bbabe2fc0c57a6b1f50468ac0a27b6f38a2af5989db7523af4e989567b863ba69235d5bee
+EBUILD dbus-glib-0.110.ebuild 2539 BLAKE2B 13cb6e91f81821663fdf40cdbe4fe30f13e0d4e55ff7c5c4a4eb22181a10ed9891a8d2351a276082b47642462732bb2f6f1bf3db7a98fd7b6cf3db704614bfc5 SHA512 4b21e107e64d0353af3cf1a52cf6f926a590a4f61972cc4139818b52af5d4b116fac0bc7fc5b6a54707329231cc684989359e087f57674f4a377b31389eefeac
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 2d3b43af461d..f0822d964676 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index a7ec5c6eb82a..3a4b122d5d33 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -7,6 +7,6 @@ DIST ding-libs-0.6.0.tar.gz 880038 BLAKE2B 97d575fa73e436ae5062c15eb6448a31f3e27
 DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
 EBUILD ding-libs-0.4.0.ebuild 516 BLAKE2B 3efb751ee44e75122af233c127090cf3977a4b2ebd0f57c929d18951c8d4472f6de73ced552d10a8667c6e04177e477a5fcedc074fe595571dd5ae0ca33b03be SHA512 23b7dcac84ec3ab93ae0ba3aa8e1c4f649d19b11a093034ca79878ca1415eff62c90f08aa2dcee4400c7c61de5f943b5232ead4c6015b05d208db3aa45380f2b
 EBUILD ding-libs-0.5.0.ebuild 568 BLAKE2B f30b0af74f3d5ff23662f5e2448e1d6a482b1f6c1a3983b292704401fa2191836a98b97f75c20c66617e10758b1f2be4769c964dd04a0a848b3e333db95b197b SHA512 a88a8971056083abd78d3d35a0890cb95071a371c8f28a85e864fc00f9a64cc6419eb10a3ca85255ea0e5c55d3eb3ee0b33216a8f93410102a39cea060c4ce5f
-EBUILD ding-libs-0.6.0.ebuild 619 BLAKE2B c26087be8ac01aab9fc43ab6887fd8f6fd83f41384f1b2066179d46f3bf437aac558e7c3357868ca900ac5a2fbd1129d7b4943bb5138b97d00ac9e9b130b6d92 SHA512 f424e4bf606df2b799ded366ba97decf4a156a2c7bc51121a6c093f897efb9ee3a8ff24484bf9a22fbf3437ed0c0950c01a5dcfa6be11090d3c765d2697537ca
-EBUILD ding-libs-0.6.1.ebuild 824 BLAKE2B c1bf1c4d8248677492a8160fd6b3e63f58c7db3cd81a52f1ba2b87ead5a25d0a1d0e2970d6681fc30f0c6975d8ded9dca7b2249637a7c22ab2fa5d9c467cabf3 SHA512 b7f766ffebf8caeffbc064676ea26eb1963f3859248666c900903f78650457aadf4178394bfec69fc0a0e712a20d8cb2b56d4e4a4016da50a4e41f123fc8eb3a
+EBUILD ding-libs-0.6.0.ebuild 620 BLAKE2B 2935132f47904c52cc03fffec7e0ef461df517b1a9313ffba53f0cf265c10634087080a1ac1baec03c19c5c0c0f63c0e44aa5f6de79b12cc57f713add2b98c23 SHA512 ba9b6e0e9f462ae22cdfbfb4ddf50c48f52f1c93fb7336351ae4d95addc30cdd5bda38218dbceec90bcac3faafb3980391195d4091381d0267f9766c91df1058
+EBUILD ding-libs-0.6.1.ebuild 825 BLAKE2B 789e20ec00d527df4087230e4707ed24c89ac47399d3c65d358d74c7e68be5bb598c1142d83f7eb6ec092866f97d1733eac92b884f8949b24a1cdf16160a8484 SHA512 b0456b1f28c306c437fd418cc536cef8cb5798febd2e66952101f3cbdf82ce3af34832283d2b460a590d1e6c1a70779b1d6f056431ef0edd5b8a17f7972c43f4
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
index be795d15b544..654721bc0024 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
 IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index 13751314c449..f64be15bf4ae 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
 IUSE="test static-libs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 7bac2e6c66ef..715f8c9362de 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -5,6 +5,6 @@ AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 AUX dmalloc-999999-texi2html.patch 355 BLAKE2B 3b599bdfa45f6c781b446d72cab79acb6f6b59e0c648989c1012b625f4e07ed5b0934cd4c21865af154a1745e1ce2b72bf90f738efa40d7c2654e5e2723b389c SHA512 e29aba00d3e5edf0639685858215736f3aed4baa9f7b79577a69bf5e2e51a0072e92befe7ad0e24a68ea35e184271c15312b5acea145ff1a186eb0d35a985c72
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r7.ebuild 1856 BLAKE2B 5b53473108b3734739b190bcbb6de70223f995c56eb2970c60711e2fe0381acc64fe63c7077bc827e9c9fab93787887d1cc11eaa45fc0f6c3b5d356c31a67f35 SHA512 2f38656b920367281a179afb298c7fc2a4cbe7f3db56001f9812711c6836ad18e579c7e78427d110b329a528b443bf40852aaae92819b2aa8e13d88dcbd18f57
+EBUILD dmalloc-5.5.2-r7.ebuild 1857 BLAKE2B 178895ee67fb6e48aac2001352b9e73243beae5432ab6236d7851a74826c9774ac938c7be26fecf6fd444bf20ae9337072dd5082a7aac011fd9599572104ee34 SHA512 bf44f7e338a9122146932a9e351aefd2d18541ac394d69cf8ed1ef28a03f121024ccfdba9fe6263be520e9a51f473906b2bde78db06cabf2ddde2633990ba165
 EBUILD dmalloc-999999.ebuild 1706 BLAKE2B cdfde19b66fb9a99b8bd9651407d52ec4df3c32c605efcafe19d739ac8c3d423376efb249cdff5c988c017d32500de2083a0aca054e18d6b64d110642b289d26 SHA512 f3a92909acacd3cee47bec324c4c98e391a2ca469d8c07aa4e6f32265c0cfecfff3ab61a6ff565e20a03b48ef54562c6da99ef299e15124dfe11aed65dda7e24
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index 447c2e1307ab..fb49d37d57e2 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/dotconf/Manifest b/dev-libs/dotconf/Manifest
index 56af61d58f8b..e8d1c2f53720 100644
--- a/dev-libs/dotconf/Manifest
+++ b/dev-libs/dotconf/Manifest
@@ -1,3 +1,3 @@
 DIST dotconf-1.3.tar.gz 333301 BLAKE2B df3f4c9bc4539ed5b21bd4d6059bd911bb319d9dbe4f48c6d45c34559eaaa646abea847f6d0b35678c12d9b5e89e2f112047557d458be608215d76bb50af004c SHA512 ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e
-EBUILD dotconf-1.3-r1.ebuild 638 BLAKE2B 2fe08ad0f784bcf4f7c1f2a4ee631d907e04e9bf9d36206d20165609653584b3273c4f866846b7c43942a8f0c8d6dd1c44e48beafb7addaa61abd593e9fb0f08 SHA512 b507f249a25d1192b469fd4a2b6bbc866e256ab3c82125a008a838cf72287a69c7f8b0fbfb1b498de554c10fa9a2bea706f1bac97ec34c3c38dea80008a35c6b
+EBUILD dotconf-1.3-r1.ebuild 639 BLAKE2B 4524621f34f4140e5b9f8c210e43bd6f298c4b3a80daa879a54d3c85806e31367eee341d58d8183d0a0b23f487ef62da462c898b7191ba92a309f5340304933b SHA512 783f97f15902352af624c042df36ae57627de7a53c13c4882f6a2d9eaf1e87bb956fd3966f8554ce554211afb860215148948d9cb2b9a7cb7b39582916f16672
 MISC metadata.xml 444 BLAKE2B 32e2f3c775e22987798a07050c3e2446d658f9124ae02b8edf60d05cf65b14b68b912987838930518e100e8e09b914b493ae71a1e60aaee758517799ec065ed8 SHA512 cf7e9367f5c1184b089375d0922a60e01bf985b215c59b2272dae535c948d5d1044de614013cd38978a28a59b28d86cc6d60085d5c39f59ea6b714309c8fba86
diff --git a/dev-libs/dotconf/dotconf-1.3-r1.ebuild b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
index 293fd121585b..8d368cb59d05 100644
--- a/dev-libs/dotconf/dotconf-1.3-r1.ebuild
+++ b/dev-libs/dotconf/dotconf-1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=sys-devel/autoconf-2.58"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index dcc971057cfb..212d6bf135e3 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,3 +1,3 @@
 DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
-EBUILD double-conversion-3.1.5.ebuild 474 BLAKE2B 974657bf0c9b839b32afd1d828cc3574aeac14e993ace8f2e2640df612effad7459781aaa2cd1e13101207e88512bd3367cdd55eafb194919f5cb071053415d8 SHA512 7731ad901265ba084230229c5f7c600302954c3dd22e07f9746b02edc855276e6e83aa591d9da2836c254ad9a061d5b21690b450b371cf78f2a14d5660f07b92
+EBUILD double-conversion-3.1.5.ebuild 475 BLAKE2B b1e21ecc8dd0452bdc7d3bc77445906e938b194ead9944290ac3ad98087f80864a47591d291dd0f45c8619b60bbf4cc2d6018b869c01a5da1cdc844e8586c1b4 SHA512 09d500e702a461236917e4a0861c6af0bec5f8651d3a20a2fa971a96dce07aab64ebd8c5b05271d96df6d7671fea44cd02893c29b2c225fcc747cf0337c85512
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
index 4f2d8481a132..8ef06639af4d 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index 4ba94ceeb9f3..0597d684894b 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1,3 +1,3 @@
 DIST eb-4.4.1.tar.lzma 438852 BLAKE2B 575d301605d014999b571c14fc639d8043bf32660180aeaa2386ca58c506c4ff03bbeae6166aededd0494c6609514ef9a6d8eb1d1cd94883739ca0522fc9fa72 SHA512 c65ffae78d4f3beb9b6bdffde2b265fdb3a7c9b4c7626ddb0ca279e4193d48cad5e9748793f3ead3786e8c7d340134edf4ff1b9d835542ff12639581793b80c6
-EBUILD eb-4.4.1-r1.ebuild 820 BLAKE2B 41c8ef1035366c60f986c893b25f4478deac6528ded5ba6ca941bb464f0361ff4cf77e6ec746bdf3dfa921abe3c321cd89ee8a14753b3d9b85f6ef9d6df16b9a SHA512 c5e2c076e27000f3a1c997c2e18808f2faabce69761f471128a1b488d99e6eb7572291db8e6e5e72e2555dad8cb729ebe749cedab7fdc8fc73e100594da03391
+EBUILD eb-4.4.1-r1.ebuild 821 BLAKE2B 61fd4654643774af847125b8430f57e4e99502c2dc379fb5bc93be5c11650cd12909b4b5e8d4dc295d8fa4c6c584e6876b223cbb2d8a5cb9be87f01d72af8e14 SHA512 5ef2f5289006f64d0129149e30239ecf94fb8e9a27f5acabf91d769dbae072b8290a56319c7dfa8c59ffdd1a1cc4856279b7b9ca0c6958b6b35ad1a62307a990
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eb/eb-4.4.1-r1.ebuild b/dev-libs/eb/eb-4.4.1-r1.ebuild
index fc59b4ffde58..2caae076012f 100644
--- a/dev-libs/eb/eb-4.4.1-r1.ebuild
+++ b/dev-libs/eb/eb-4.4.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.sra.co.jp/pub/misc/eb/${P}.tar.lzma"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="ipv6 nls threads"
 
 RDEPEND="
diff --git a/dev-libs/eventlog/Manifest b/dev-libs/eventlog/Manifest
index 966df218102f..9492b901fb41 100644
--- a/dev-libs/eventlog/Manifest
+++ b/dev-libs/eventlog/Manifest
@@ -1,3 +1,3 @@
 DIST eventlog_0.2.12.tar.gz 303925 BLAKE2B 2321b26456380788752f8cb106f4e7b7ea30c9d463d04d536d46d0deb83a0640b86483f46acb33537f539c127a9dde484c121ad608ed43f1a8f525fd6c04aa3c SHA512 a681ab2961f5bf38e106a5b0b4492e74098808e2bf1a100f545736902649c705db124c0847796a47485faa8b0befe691a789d752f313c5b65ad50ed2763d2cce
-EBUILD eventlog-0.2.12.ebuild 671 BLAKE2B 9b816ae5592d17030343f74987462cce7556b663b62cbecc80605f8b060c441de52630580c5594ed09414b38cd1ab9e9a148c2ab37c82de7fff43bba8156a2d2 SHA512 cd2a20c3e902ca5f2333882247618d3bff1e319fd603f839a7a2da283e76a1662353e039463bf6989ab2fff4a5f27b387f20cd4045acc97a8d3c3b8ae37a2b03
+EBUILD eventlog-0.2.12.ebuild 661 BLAKE2B fa62ad1de3646f17b71278d5da27a1259654f755609dd8fe9a6b9b8a81625105d3f6cc087c2d6badf305a4cf6a6102c3b513099e20caef195f036ad2842ce0f0 SHA512 33e4c766b5096d9667e429d102f11c29a232c5498dbac1f77e3a6148f055591963470e634132ed2f2997fe907c6003a687f0a9791897396234de4caf7f5174fd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index d886e06c86ad..4314da457d3d 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index f7086084d040..63678e3672b4 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,7 +1,7 @@
 DIST expat-2.2.10.tar.xz 425432 BLAKE2B 5d84d7dec5aae6ca7906bd2a2b8a249457111e064295b83b6c9927b5ef0dc97e7220bac1da17781e24541259ae81b60a2314cd372bfbdfc2e08fab082377df4a SHA512 a8e0c8a9cf7e6fbacdc6e709f3c99c533ab550fba52557d24259bb8b360f9697624c7500c0e9886fa57ee2b529aadd0d1835d66fe8112e15c20df75cd3eb090f
 DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9
 DIST expat-2.2.9.tar.xz 422460 BLAKE2B ea0e0bd005bbfd355e819e2b157859878a20ad9a6807cc5a10a6656f062e2443adb483adb0452d751b3d460834e3f613b8ecf7cdaf743be1b15815d005d01fa6 SHA512 e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0
-EBUILD expat-2.2.10.ebuild 2542 BLAKE2B a48db7ea86bd98b7afe42004e1a7f01cc0dbf548b96bc52e37a4433710a9de568c03177a094c5562b2e5c24db9a6d362f5b3dca7d571bd776e70840fb0283ca2 SHA512 888878858f2ae8fdef1a8e3b37ff35872b56df96b922ee2f9feeea1c95737280b615b4b7d872d8e81901dadf63c4c411943f5cc87e072919942a5cbe0d351bd8
-EBUILD expat-2.2.8.ebuild 2509 BLAKE2B 7b76c5410eadbab36e3dfd5f99720b2f969c51d131d1228fafec265707d8dfc9df4fd98ef776778e9c23b81f298e421a4068cfa26cd500236f84328dc9d6d365 SHA512 da6448c66c60edbe38762de1ebbd3bdf68041e6f3c9afbf8ef95ea470250fb9576a9fbdb343e9aee90af74ce207e0fcf52b4115e71b78ff573e3449fee6fec0a
-EBUILD expat-2.2.9.ebuild 2542 BLAKE2B a48db7ea86bd98b7afe42004e1a7f01cc0dbf548b96bc52e37a4433710a9de568c03177a094c5562b2e5c24db9a6d362f5b3dca7d571bd776e70840fb0283ca2 SHA512 888878858f2ae8fdef1a8e3b37ff35872b56df96b922ee2f9feeea1c95737280b615b4b7d872d8e81901dadf63c4c411943f5cc87e072919942a5cbe0d351bd8
+EBUILD expat-2.2.10.ebuild 2522 BLAKE2B c5b183dc1d142494bc4a6bb4f71b96a210dfda6f1a7c8d77d377cc71097144aad7b47ac564a49a97695d277de1ce561fd1826c1b601a1bd10ed2ee07f9352ea3 SHA512 f6e269011183bc7f85cc32919e3b3bf17bf4e7331db834416d78160e20cf1ca27c0d93c1fe3c4980abacb230669d2b2ea86fcd4edaccc760ddac60325ac2e822
+EBUILD expat-2.2.8.ebuild 2489 BLAKE2B 39557452d87881e3d888b1e5722fd450959cf5797716178dd36b39b317823c159c9c7119d95e60214e7443ca08591f54917a7a804fe775c2cd7dbe06f50e11dd SHA512 9457d04129f80e2621b87e5b20a26a67d2098d696db9a7198d07eb116665be1b8ed0096269491854f5fe86c7cf690f045739b18cf7272a16f545ceab146f6ea1
+EBUILD expat-2.2.9.ebuild 2522 BLAKE2B c5b183dc1d142494bc4a6bb4f71b96a210dfda6f1a7c8d77d377cc71097144aad7b47ac564a49a97695d277de1ce561fd1826c1b601a1bd10ed2ee07f9352ea3 SHA512 f6e269011183bc7f85cc32919e3b3bf17bf4e7331db834416d78160e20cf1ca27c0d93c1fe3c4980abacb230669d2b2ea86fcd4edaccc760ddac60325ac2e822
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.10.ebuild b/dev-libs/expat/expat-2.2.10.ebuild
index 2da0a2ea35e0..3c9b32acc0c7 100644
--- a/dev-libs/expat/expat-2.2.10.ebuild
+++ b/dev-libs/expat/expat-2.2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild
index 7e7cd367ff73..74c45676cf69 100644
--- a/dev-libs/expat/expat-2.2.8.ebuild
+++ b/dev-libs/expat/expat-2.2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/expat/expat-2.2.9.ebuild b/dev-libs/expat/expat-2.2.9.ebuild
index 2da0a2ea35e0..3c9b32acc0c7 100644
--- a/dev-libs/expat/expat-2.2.9.ebuild
+++ b/dev-libs/expat/expat-2.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index bb9671fc29d2..aa6b7c22a3dc 100644
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -5,5 +5,5 @@ AUX fcgi-2.4.1_pre0311112127-gcc44.patch 202 BLAKE2B e1c215ce690abb22799050b562a
 AUX fcgi-2.4.1_pre0910052249-link.patch 850 BLAKE2B e56ffa28035ecc8892d64dc097560068c61d7f6f9cd3b84a23b92f22b646cb73eeb5b81e2275e86ece868f9c7d83757a7fc0366596a718f170c6da0b7fdd351a SHA512 6180201e3ac7e9fe659b281cc612ed7d6d58acc17f670feba843931c5b038a7d08e75a9f24b098413bc309cb1cdbc6b96ba77f6f1fb43e47066815937d622b52
 AUX fcgi-2.4.1_pre0910052249-poll.patch 2469 BLAKE2B b1c16bf0ff35d1ccb62d006e4e846b55a1ebafd549c53952784fd3fdd744574a2db332ed06740e3a5d519515355335df1e2310bb3744a95753b821a434721bcb SHA512 3c00be90012bb7b9aabcce0eb014b2b0a8ec0bb8d4a44389237ae1c88fd46129e7686b035a427177545762275c30151c8a1037258b409486706a7f3a64db70b1
 DIST fcgi-2.4.1-SNAP-0910052249.tar.gz 614929 BLAKE2B 243125c2e815ccc505b23ea1be153c304a3174e5285583bb8be5411f624bedba76ebcb61389c0c4178a497678af6aeba4b8b840dda2d83c4638de6e1dc85b69e SHA512 7ae7542ef0934f44d8c7a120366a5cd92639d0bc283a16be320c9218a73a0302c961cc004074e3915209690f1e2b67fc234c9ba55d35af11e31566d79f081c87
-EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1262 BLAKE2B 7dcee2ed6d17427b5736655e7d084232b166fe0f15d4fe28481ea4f1858b3376887c8d622fa41c79e726e1e01affe9e2aee8d475f2ab07e79e638572ff9acf47 SHA512 99e774c97753f8df19d21ad38cde5218befb9c9e48d17ee7adf0c14fafb1b09ebcedfc8f8651a79612982487c75b3dd5e43a6324a8cd972d43595b273abe28ef
+EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1263 BLAKE2B 1f5cf957bc1a1350ecda63a5a4dddf3e41832d5ece9a522f713d697f693083791ab30981032b6862d91ae556e510d3f2ec89d05466a75951719dabac442bddfb SHA512 a968e18326c75c4bab0cac807e1fecffacb279b2812eac52137adad5ab084e1996bf3f81ad05e136eb1a234f883c2f043c6262b12ea781cd4d834d82a2f2861a
 MISC metadata.xml 233 BLAKE2B ae934b099af8794db5635a540435443d177ef7a27c2eac37aecfe093dac318d44f717f79ddce49ee446fc10d4416f8c4034fade511b6c0bc36dde5768729e1c0 SHA512 bc903c3d553ad0aab3b42fb9cdba1972ba9b010206d29a40137490b9f49a454515ca1326d17e3b9a10e37cbb9a8ca4f5b9a8829ac6648989fe2bde5f23267f18
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index 1c1ac94db425..a04c71984456 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"
 
 S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index db7242acdd5c..47445e35e43b 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -3,8 +3,8 @@ DIST geoip-1.6.10.tar.gz 161506 BLAKE2B 968ae25afe8345def099b82acf5bca4b7bcba05f
 DIST geoip-1.6.11.tar.gz 161934 BLAKE2B 628dd37bbcfffe36970d6bc8cd12ff1d504d9dc7bb760860ce59fbeeac631317556077ca5b50ae42c9cc8567ed41194379ed0743a0c2b0b0bef65504b13e62cb SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
 DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976
-EBUILD geoip-1.6.10.ebuild 1261 BLAKE2B 691d7021a1553c2ce3a8238414a61d68ee7156e7644538509106e7e9ce1ab63978b984e7b12748d3c4297befba9682d662cdfe4d236e725e872db236f5aba315 SHA512 454384c622e26031a1d3b787c66e38c96f9a3187ede20cd3bc800847119823fa57533a6b02c1d58235ccc5912e2ccfbe811d2cb4394442456369e55f3934c0e1
+EBUILD geoip-1.6.10.ebuild 1262 BLAKE2B 292dd45ee9f261aa7c3554d05337f14d8db08f3022ab4ba4cd00141f72e567fa186c3a56f7554cf07147b4c12ca05a65a0fa73cdc62a3e0487b2e2f71cdfb929 SHA512 6bfb72710863d441695e72c32ff355290293187a27e7244c53d25c1de557c958e59e1a16cbd3dee7150bd521894bf7eb0934749a0d68366277a7563f7f4539fc
 EBUILD geoip-1.6.11.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c
 EBUILD geoip-1.6.12.ebuild 1269 BLAKE2B 66d9ae6650806205ce173050052f93835a646090045dba2273192ae66f3070024140d1eccea238743af8e35c8730ec98821e24018f152a7d67d05daac52cbacb SHA512 aabb588e388f6e00358c70739cec7cb330e6093004dbdcfcc2ce209b0ed36f7e77fd97654c3dfd91619471afaf98c1d277eaa778c5426f327fb04f611027c08c
-EBUILD geoip-1.6.9-r1.ebuild 1261 BLAKE2B 2d6b4b60bab7390826bba6465adfe71312f26d40e6a6cb4cb0e0fb02ccbe9796041c2b0d30162db782b811be8c07f6dc66b76330d3100b5cbc10b120423bf8b9 SHA512 80b9088f738fa76f50854971e3edc4a4ca7e127d2d8a62713c2469cc77cbcbb0767bd1f40a9132554fbc3657e811db89a9ca49cf1f3e2514af4df4e4cb571f28
+EBUILD geoip-1.6.9-r1.ebuild 1262 BLAKE2B 3c943ad84847dd2d49e9448c67858329a5e4a00ace289f7184d8ea9ae7086451482f92f31147940e7bbb386e55a23a1b12397653fe9e52b921007277a8eb6bd3 SHA512 fac580a443ee56aa9ac35d27e6a257da0d0bcab2fd46e6d76e22ce66d46b887c4ad7ab64513ea8f0f5490328ed52230439d18399d1b3c7283adf92def939a921
 MISC metadata.xml 374 BLAKE2B 1dba87e78019d8000de7779503afc32bf7a0dd5626981db35c0fffd608cfc4b0996159b15961a97aa3e8ee8a128a0263bb10b310c1457de2f955ef55c2f93e01 SHA512 1637e770cb8d68a11ec8c9b9e902d026c557efcce48221edc02dd9c0841ce14b8558402283c81b5babf133a5d84c148e7df8a5e864970fdbb0e256b9d8340762
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
index 361665551bd2..282925bbff31 100644
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ b/dev-libs/geoip/geoip-1.6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/geoip/geoip-1.6.9-r1.ebuild b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
index 5765e23fd909..b951be9e1a64 100644
--- a/dev-libs/geoip/geoip-1.6.9-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 9ebc2532db06..e1d2253744db 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
-EBUILD gmime-2.6.23-r1.ebuild 1499 BLAKE2B 5fa080e22105dedbbb3c948aebdc41cdc8dfacfd42b858173d8044b7cf8f9dfce8f0271fbe27f5c48ba885d0502c64f723228373a39970f63d3a07ad740c01c2 SHA512 cbcd5ce244219de5e7ef7b604a0349df42005dd23a30f5c74ca501b77b035ef01e6d8d9528bb1112f982abd92ff505ea3457bc92fd0f8dc865f1432678f10e14
-EBUILD gmime-3.2.7.ebuild 1587 BLAKE2B f585b31c393f18caf907174a9185774e8b1b45c93b05f09287254c5492275160b1eddf9fb36162347b4b0a415ab319c5eb863e5585f80cdb36561a2dda5e158f SHA512 21ab58e50bb608b0d5fcdb1dfef2fcde305c9240eadb0bf649720bd714b512f2cf03814f207f64fe1e86fb15b1e677c4e8d318ebb9f059d12ba074b0769cc3ec
+EBUILD gmime-2.6.23-r1.ebuild 1500 BLAKE2B 7ebe8ea044b6b0e1252978a07a79ec0ea3cdb84ba49872fa67e3cd4529edc6b7b6d1baaef63dcd84dfae71a1eae5a80de998d8b5cefc5e357856c1e3636706dd SHA512 2b8b64ba1ec3d4365ba1bfe42932bb448b173d7f416434551387a92a0f268131ca2d8ee7ce5880b3377f0e74296425ec7040967ce6765bbaf096fc0b4170ed5e
+EBUILD gmime-3.2.7.ebuild 1588 BLAKE2B 1c9f2ac4d2f1b739c8024f0798c451510c939f6a70d8be74a01f9884fdd2e84dc1e273b51af8a0b042386c6201f61486ab4be4e692e6be548bb1a8186747d362 SHA512 d55a3b55bf19f1d04093afac2712e265c8a82a2dcaa98c7db2057a1184c0d703b565d45c1ec32d8218aa81ebbc8b6b9568ba92ad3cebe12a70e8f06f0cc9162b
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-2.6.23-r1.ebuild b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
index 19f104e434b0..8bcb45c5af0f 100644
--- a/dev-libs/gmime/gmime-2.6.23-r1.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc smime static-libs test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
index 024522bf7067..dd290616f287 100644
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ b/dev-libs/gmime/gmime-3.2.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 135e6aeaa1fe..61bb05e0ed62 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -2,5 +2,5 @@ AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298
 AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
-EBUILD gmp-6.2.1.ebuild 3081 BLAKE2B 6b01532390466dce9e277d9cdf71c32718c5bec50ff14ed11959ece01acbcf4b6f9b95a1ec9e7c0c3e3418f8a5bfbeb2d065439f494c7882e5f6fca98fab02a8 SHA512 2af2f0427b04caaf9df95e6d4e3386c137ed431bf5c5a240039c0ef19918a359d2d49004625490de3fe9b3d11b5e70555ddd4daf32c4b485d6834d0b4d378b69
+EBUILD gmp-6.2.1.ebuild 3061 BLAKE2B c3e8525b72e4c796853d574f95d3a1bd8fa1877be1f8b488d53038c95ef41e426614199efaa8485dd2b630789522f089901b9098fd3b885cb430aaba27338ef7 SHA512 8d15df87097c4926840f0ab85944cd814339fb6aae34e7730c4525cf7b95a3f2584ccce5e0a8d8c5f5f6d1c7608d5f1f2499e5708f5a3650f8a049c060ebb723
 MISC metadata.xml 523 BLAKE2B fc919502e81ea5a1a169284b1782a8044887082e485cfb8497eef7c4cd5cf6c2170818ca6a60b43d90d92eea03f82535a58e72346ba3e8eff240a3a3be4a7f99 SHA512 ea63c1b90851f602787ff84b8e6dbc51f56bf9e5c724ff4a9e7367af83ce8d2d8d0a17770c29e23d00167cbe033292b614195912bd40cb404824c4d22bdda82b
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
index 4467d61aca90..2d668952762d 100644
--- a/dev-libs/gmp/gmp-6.2.1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +cxx pic static-libs"
 
 BDEPEND="sys-devel/m4
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index fe0e627a62f0..48853eea55f7 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,4 +1,4 @@
 DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec
-EBUILD gnulib-2019.03.17.09.24.57.ebuild 929 BLAKE2B 05b41daeb6549b329b188682762e6418a20c55a60739178a7f0a3c284498c6931e8cad37776155b7c622d44b6c21f13d07927482c85a13173eaba3499426a3e7 SHA512 3439dfba3d5c40181553c8c13c95e379bc802ac25b541bcec504b6e8207713c34f4901a35625ba79b66c741672d6baec80fc58a60b08f45177e834fe62f59d0e
+EBUILD gnulib-2019.03.17.09.24.57.ebuild 920 BLAKE2B 1b3067f397b59fe1ad908f8b2206ce0f96e28a7bf8c76314c5e8f3f98b647ea6395c760adeec6cad47d1e58f1560d05f83b940d24ac227b45436a980034ae3da SHA512 29aefc32fe5c14277eac2bb80c6c48c01055089e50fae0a87951b944a3dbb5fe58beaf277c353eb2dba952ff01405f700892dc084ce39d0515cea9d513159fa1
 EBUILD gnulib-9999-r1.ebuild 788 BLAKE2B 58e59d347b87cc6a6e1f4e04b6723d1e6dccc7adb7d8c5fac2d4df749bb059da9cd38df28139046281cb5e3c0eee5a62949c47fab8b6976cb37f99fa300fcc33 SHA512 f6042419262d62e10dfb62c2770e821157672040bd86ac3e92da9b5fd008a6ceda1486f331ead8716195cb8c9c3966531ecfe1d47bb6cc09e313a7f4492b269a
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
index 500065fad3a4..f8ff711142ef 100644
--- a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
+++ b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 S="${WORKDIR}/${PN}-${GIT_TAG}"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 058c6701f75a..60fa35bfce3c 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -2,7 +2,7 @@ AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
 DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
-EBUILD icu-layoutex-67.1.ebuild 2502 BLAKE2B e452136b482c356e571acffad2a251bd784425dad08053c0d07f8d844e85e1838600ac60413e4bbd2fc19c654e355dce1609d72b1f89bad9d01f71210e9e80bd SHA512 5ef730853a72505f6d0f36033b128b5de2c3182eff92c3c36607b33d4f6095e96f46419fc9105a32341a2fcfc679ebc1ab5ffe2f1f10542c14b4d13b6a67020b
+EBUILD icu-layoutex-67.1.ebuild 2503 BLAKE2B a81b75b1a20d6f30c58fc4043d8af09c632b2fbce0f478cb37a9d7afe7c984c943f22d649e7d6c7e30d8df093f35a6a938104a5c4152d735bea6be3d566e9efb SHA512 49b4e0034e36a97c9456a9ba78319017082501130b9d2e9ec7e336a96f1f7023d93112f8f3f4caec6994ee2a645b03675feca1194d0dbaa029679cf6ab006ea0
 EBUILD icu-layoutex-68.1.ebuild 2508 BLAKE2B 9e75c5ef13e8930c2c690ca9957f0613a4b738b40769c2cec3f7c0d184c2e6dbcf8d7eb48977b9e4e362013d8d6efe81ced246be054176ef03a5f733519c942c SHA512 bf0d113999c2e0f8b24bdddf604fe75815c1fc6a9aa9ef183b52a6797b27c547168a35d6ddec57d0f0ded491141296e9ed5e3edef48c36026b7be6bb54b69ad9
 EBUILD icu-layoutex-68.2.ebuild 2508 BLAKE2B 9e75c5ef13e8930c2c690ca9957f0613a4b738b40769c2cec3f7c0d184c2e6dbcf8d7eb48977b9e4e362013d8d6efe81ced246be054176ef03a5f733519c942c SHA512 bf0d113999c2e0f8b24bdddf604fe75815c1fc6a9aa9ef183b52a6797b27c547168a35d6ddec57d0f0ded491141296e9ed5e3edef48c36026b7be6bb54b69ad9
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
index 39488ffadbc4..a1af526c5f82 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest
index 0239016c76cf..3827ff603efc 100644
--- a/dev-libs/icu-le-hb/Manifest
+++ b/dev-libs/icu-le-hb/Manifest
@@ -1,4 +1,4 @@
 AUX icu-le-hb-1.0.3-icu68.patch 1931 BLAKE2B 56bbb65821e575e2c270759f5ddd5107a2e4935295b0320dd6e69d902fb47bb851290d99704c609f82e9efaf35fd7dffe2c52ea0393bfe63abff20930883ea5d SHA512 1e2f8c079b9e1340d857bf09670958894c427eac20a29f564ef1d91b82b3eec7331b79dfc41ce172a95e2ab6678e41a42098e6af0da2af93ac5646415bbea010
 DIST icu-le-hb-1.0.3.tar.gz 39352 BLAKE2B 7cc2e56b6ac334e0f9c259d4f9d0356480c1ae4eb647610ebfb81ee9b1bc0326f1dba68991e2893cc9b029ea53705cc0936cbbf29e74ab4ef336f58f5e8b47ab SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4
-EBUILD icu-le-hb-1.0.3-r1.ebuild 989 BLAKE2B 3421aeb3459d7a8bd45b91936afc32f22f51dc2723b8ee67637675fdaca4d4b8bfb28bcca10574649c4b7bfe46dff91f47ae3b13997c92b26aec035f5b7208fd SHA512 bbb13e2d7ed73003a8c5f2f09f64a028ad56abce63ddd5df4b6b81302fb89c42c9b5e71294aff28471b279512014ee98576a5b019d869ae385f81ae212944dbf
+EBUILD icu-le-hb-1.0.3-r1.ebuild 990 BLAKE2B 64e67e57fd425f5c37b6e144dc8ec5312765645587bdcdcec0f3e907dfe3d664001a6656c0942872371bb480f6803e5a61e0524e89356b54566bf52f8564aa2d SHA512 4cb888d6e224a7d2ca0bf830a50848dc789f82f1a4f69acfd493b47a133f4def1a296865f0ede504b738f0e1105fe869e10591c7f63ffb7c4531626110c224fe
 MISC metadata.xml 464 BLAKE2B 326f9087cfc3c08145ed5ef2dd2c109fcf1c81ca3a8a4394504045361243c4e9db69fee1f47d67bb7aa9a91e3d6e62cc61f45a74b611d62c389a70e1a1829058 SHA512 40aeb13c0ee32afb9b58e3412bf26806bbf724deebd6b966477412df1889cfc62c90755820381d3622a535ce83ec7bf4e051f85dea84138b84bf553ecc7b84fb
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
index fa6e7b24bd9a..aa65d1b6013c 100644
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/behdad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="icu"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # dev-libs/icu is not linked into icu-le-hb but the latter still needs
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index b0f33194e6db..83a84f7a7835 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,7 +4,7 @@ AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d1
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
 DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
-EBUILD icu-67.1.ebuild 3335 BLAKE2B 355e74e20aee373cec9241a9b080f610f8c29461b0636c04767c7132826f34346532b15c45d027fd27708744063efaa7163e65040b8b1612c679056c23a66290 SHA512 30ed94fe4c6fb563e2421921b33d2bc5c0066a80f531337861fb0d1614098d4ea411bc58dccd1873296c2d6e39ff39cea8d8402059135aa5fd07fab18fe57602
-EBUILD icu-68.1.ebuild 3386 BLAKE2B 615a1f49dd938525623ce8f084e38feae5b4155e394ee742028fa3f69ba69ff79a82b8d068af96d9fb2d145b050223e7d31521f32f08ccf344b997fcfe3a8681 SHA512 185c6bf733b5030533dd683c634cfcce13a4966135d7680384946a516fcd5e327268ff941f9d71948803fad1f21924c5049aac992d7b07147ea8167b62f38154
-EBUILD icu-68.2.ebuild 3385 BLAKE2B 43a2456f3eb8079e511825f28977b2ddae760e32bad32dd387c2abe6fd7b4cd44b51026edff0fc78eae717b83759da56a01947373d02a1b52870da0e7515fd6e SHA512 1e06a731f3e69e69a085705a5a7bdc1944e63b3580d4b6dd1f5d4429f4fdf458e82fb6b615ddfb98f93e7894e3ffcdb680949834e8a7551ad59267d76f7460c2
+EBUILD icu-67.1.ebuild 3326 BLAKE2B 1b4cdbc84c40ef295e607ec90cd85f33b32f2261c7adb02964d22e25cb37124a5a254a34dd9331f57a16bf8826b1d13ae4bbe6db11f87e44a4bec5c04d43629b SHA512 fa86f67a99c6002be01b25b34958eb24b6bde6a7b7b0d4878b32bd691a0b7e6799209d9f37203a1a2e6b4387cfc3b7592533b470002373d787815f780dabe115
+EBUILD icu-68.1.ebuild 3377 BLAKE2B d6bb32f792aaf7de6d3ea568084ba0d212f62251a09ba070065f34358338c70d9762da7f990b93bde073fb72177992346d0c860f0e6676c597f6db903ca9942f SHA512 d4eb52cba54a87ae6776d24f5e424eb5ae01846cf2276fff5543e7d858827d9f12d2cd92c354dc17ac932b347312fdfd6a982a3de03f8b90934d8dbdaaeba3c1
+EBUILD icu-68.2.ebuild 3376 BLAKE2B 11fa9b8b830155971779031cf5f4168c45c3cfced2b3ab2fa5809e42f469f3d542c7a31077b87dc848a419afac8437e0aacf9d4869551661dc7dcd8103125d40 SHA512 d5fd86c1b3ad809fd310d742d56e85eb9af3572a11ea0b5cb7e42ddba5e226938ddb651961a23d755da3a1ed965d38bd8ac4520a9d7016d569bd17ffa176b7ad
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-67.1.ebuild b/dev-libs/icu/icu-67.1.ebuild
index b3cb3107a54e..89bde4dbacc9 100644
--- a/dev-libs/icu/icu-67.1.ebuild
+++ b/dev-libs/icu/icu-67.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild
index e13a81c1b337..da6eb4889807 100644
--- a/dev-libs/icu/icu-68.1.ebuild
+++ b/dev-libs/icu/icu-68.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/icu/icu-68.2.ebuild b/dev-libs/icu/icu-68.2.ebuild
index 4474443813c2..0807c6e90ece 100644
--- a/dev-libs/icu/icu-68.2.ebuild
+++ b/dev-libs/icu/icu-68.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index 48e5b3e33bbd..6c418d00df62 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,9 +1,6 @@
-AUX igraph-0.7.1-unbundle.patch 8525 BLAKE2B 716137c2d7b4ffc3e29b484539867216574162dc3c55ea747c57cf24689ef3de032776f9e7f1d76cdb1c0e39bd6afd5fc3cc2e74de4209d632bdd568a8b884a4 SHA512 8b796f95044a231b2695532d158721cf48dfd266f5acfc2eec8a7f3706208190ee07eccaf83823ba9323edaef15afbca60ff7013cf0d9d7fda0ab5b0ee5e0eff
 AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c
-DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd
-DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b
 DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1
-EBUILD igraph-0.7.1-r2.ebuild 1021 BLAKE2B f57456480c2b191750bda562f88503df46b4c6adaaa0d70bee3dd570d323eb7d26c355328bf40d896238f90c9b485ac35aad3b059141425f57463a7308f7b911 SHA512 6f852704fa6bcd52ae289f78115d4f21df0c1ff720cd7f5673882f17d34d5d174f8657b461a1543f9a8984b6d100cd91584279e3e3b33fde77b05bd527b65688
-EBUILD igraph-0.8.2.ebuild 1169 BLAKE2B e15a502fa48ac7f7174103cb76db131333f3635ca55ef838abf1107835d7c8adb5a91244f2a5b34cd129290252416a385259182b3b5167dcab76336acda5a91d SHA512 efa374895127874150b12119c1a81aed2d03be6e5fc9648cb0be1553f7770ab48d34c73aecc2e4fa1e21a892d1501d6e371023b07aca8b520e483d19df527524
+DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370
 EBUILD igraph-0.8.3.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c
+EBUILD igraph-0.8.5.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c
 MISC metadata.xml 807 BLAKE2B 9388edde0d01baaedc25d6cdf128e2f4b1df9c9894bb371fe088573bae73da4d572b89aad9dff6e77d080c1e084e31c2d2e7f0cf7c994b2b91e5d00b6ea86850 SHA512 a71270dd5c1a1c99792a623563f5efc70bdc16575f2e83296b6a04f4d2b960a73ffa4c8a696844f38d01b51af4ba0c054d59cb132c6da660dff10cd12e02777a
diff --git a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch b/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch
deleted file mode 100644
index 755e749c1868..000000000000
--- a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index acf76cd..a9db7bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -167,7 +167,8 @@ if test "x$enable_gmp" != "xno"; then
-     AC_CHECK_HEADER([gmp.h], [
-       AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library])
-       gmp_support=yes
--      LDFLAGS="${LDFLAGS} -lgmp"
-+      GMP_LIBS="-lgmp"
-+      AC_SUBST(GMP_LIBS)
-       PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lgmp"
-     ])
-   ])
-@@ -231,24 +232,16 @@ else
- fi
- 
- if test "$internal_blas" = "no"; then
--  AC_CHECK_LIB([blas], [daxpy_], [],
--     AC_CHECK_LIB([blas], [daxpy], [],
--        AC_CHECK_LIB([blas], [DAXPY_], [],
--           AC_CHECK_LIB([blas], [DAXPY], [],
--	      [AC_MSG_RESULT(not found, trying to use -lblas anyway.)]))))
--  LDFLAGS="${LDFLAGS} -lblas"
-+  PKG_CHECK_MODULES([BLAS],[blas])
-+  CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}"
-   PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lblas"
- else
-   AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library])
- fi
- 
- if test "$internal_lapack" = "no"; then
--  AC_CHECK_LIB([lapack], [dlarnv_], [],
--     AC_CHECK_LIB([lapack], [dlarnv], [],
--        AC_CHECK_LIB([lapack], [DLARNV_], [],
--           AC_CHECK_LIB([lapack], [DLARNV], [],
--	      [AC_MSG_RESULT(not found, trying to use -llapack anyway.)]))))
--  LDFLAGS="${LDFLAGS} -llapack"
-+  PKG_CHECK_MODULES([LAPACK],[lapack])
-+  CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}"
-   PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -llapack"
- else
-   AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library])
-@@ -258,17 +251,15 @@ if test "$internal_arpack" = "no"; then
-   if test "$tls_support" = "yes"; then
-     AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library])
-   fi
--  AC_CHECK_LIB([arpack], [dsaupd_], [],
--     AC_CHECK_LIB([arpack], [dsaupd], [],
--        AC_CHECK_LIB([arpack], [DSAUPD_], [],
--           AC_CHECK_LIB([arpack], [DSAUPD], [],
--	      [AC_MSG_RESULT(not found, trying to use -larpack anyway.)]))))
--  LDFLAGS="${LDFLAGS} -larpack"
-+  PKG_CHECK_MODULES([ARPACK],[arpack])
-+  CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}"
-   PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -larpack"
- else
-   AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library])
- fi
- 
-+PKG_CHECK_MODULES([CS],[cxsparse])
-+
- glpk_support=no
- AC_ARG_ENABLE(glpk, AC_HELP_STRING([--disable-glpk], [Compile without the GLPK library]))
- if test "x$enable_glpk" != "xno"; then
-@@ -283,7 +274,8 @@ if test "x$enable_glpk" != "xno"; then
-         ], [
-           AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library])
-           glpk_support=yes
--          LDFLAGS="${LDFLAGS} -lglpk"
-+          GLPK_LIBS="-lglpk"
-+          AC_SUBST(GLPK_LIBS)
-           PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lglpk"
-         ])
-       ])
-diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out
-index ec38497..6603034 100644
---- a/examples/simple/igraph_arpack_rnsolve.out
-+++ b/examples/simple/igraph_arpack_rnsolve.out
-@@ -16,7 +16,7 @@
- ---
- 22.0483 0
- -21.3281 0
---3.00735 -19.2957
-+-3.00735 19.2957
- ---
- 0.373224 0.226696 0.204213 0.0473383
- -0.289145 -0.296079 -0.0479785 0.156365
-@@ -31,7 +31,7 @@
- ---
- -21.3281 0
- -12.4527 0
---3.00735 -19.2957
-+-3.00735 19.2957
- ---
- -0.226696 0.695866 -0.204213 -0.0473383
- 0.296079 0.120213 0.0479785 -0.156365
-@@ -46,7 +46,7 @@
- ---
- -3.00735 19.2957
- -3.00735 -19.2957
--12.1099 6.27293
-+12.1099 -6.27293
- ---
- 0.0768616 -0.195028 -0.152389 0.21912
- 0.147607 0.0704569 0.346547 0.125122
-diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out
-index dfe2c22..9fe81bf 100644
---- a/examples/simple/igraph_layout_merge2.out
-+++ b/examples/simple/igraph_layout_merge2.out
-@@ -1,13 +1,13 @@
---2.73912 -2.95429
---0.479512 -4.00008
--1.96326 -3.51798
--3.65613 -1.69214
--3.95248 0.780051
--2.73912 2.95429
--0.479512 4.00008
---1.96326 3.51798
---3.65613 1.69214
---3.95248 -0.780051
-+-2.55311 -3.13964
-+-0.22007 -4.0407
-+2.19703 -3.39835
-+3.77493 -1.45795
-+3.91094 1.03935
-+2.55311 3.13964
-+0.22007 4.0407
-+-2.19703 3.39835
-+-3.77493 1.45795
-+-3.91094 -1.03935
- -1.6061 6.30088
- -4.92661 5.80435
- -3.69637 8.92826
-diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
-index c39d0e5..fdfd264 100644
---- a/examples/simple/igraph_sparsemat2.c
-+++ b/examples/simple/igraph_sparsemat2.c
-@@ -21,7 +21,7 @@
- 
- */
- 
--#include <cs/cs.h>
-+#include <cs.h>
- #include <igraph.h>
- #include <igraph_sparsemat.h>
- #include <igraph_blas_internal.h>
-diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
-index 630bf1a..b23cbe1 100644
---- a/examples/simple/igraph_sparsemat3.c
-+++ b/examples/simple/igraph_sparsemat3.c
-@@ -21,7 +21,7 @@
- 
- */
- 
--#include <cs/cs.h>
-+#include <cs.h>
- #include <igraph.h>
- #include <igraph_sparsemat.h>
- 
-diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
-index 4d85bde..7497faf 100644
---- a/examples/simple/igraph_sparsemat4.c
-+++ b/examples/simple/igraph_sparsemat4.c
-@@ -21,7 +21,7 @@
- 
- */
- 
--#include <cs/cs.h>
-+#include <cs.h>
- #include <igraph.h>
- #include <igraph_sparsemat.h>
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e7085c5..194f4a0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -9,9 +9,6 @@ AM_YFLAGS = -d
- 
- lib_LTLIBRARIES         = libigraph.la
- 
--include lapack/blas.inc
--include lapack/lapack.inc
--include lapack/arpack.inc
- include plfit/plfit.inc
- 
- F2C =	f2c/abort_.c	  f2c/dolio.c	    f2c/r_sin.c\
-@@ -99,8 +96,6 @@ if INTERNAL_ARPACK
-   ARPACK_LIB = libarpack.la
- endif
- 
--include ../optional/glpk/glpk.inc
--
- if INTERNAL_GLPK
-   libglpk_la_SOURCES = 	$(GLPK)
-   libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk
-@@ -255,7 +250,7 @@ SOURCES = 		     basic_query.c games.c cocitation.c iterators.c \
- 			     drl_layout_3d.cpp drl_graph_3d.cpp \
- 			     DensityGrid_3d.cpp \
- 			     foreign-dl-parser.y foreign-dl-lexer.l \
--			     $(CS) sparsemat.c mixing.c bigint.c bignum.c \
-+			     sparsemat.c mixing.c bigint.c bignum.c \
- 			     version.c optimal_modularity.c \
- 			     igraph_fixed_vectorlist.c separators.c \
- 			     igraph_marked_queue.c igraph_estack.c st-cuts.c \
-@@ -274,8 +269,8 @@ libigraph_la_SOURCES       = $(SOURCES) $(HEADERS_PRIVATE)
- libigraph_la_CFLAGS        = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
- libigraph_la_CXXFLAGS	   = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
- libigraph_la_LDFLAGS       = -no-undefined
--libigraph_la_LIBADD        = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
--				 $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \
-+libigraph_la_LIBADD        = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \
-+				 $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PRPACK_LIB) $(CS_LIBS) \
- 				 $(PLFIT_LIB)
- 
- if INTERNAL_GLPK
-diff --git a/src/sparsemat.c b/src/sparsemat.c
-index f96d022..6990c91 100644
---- a/src/sparsemat.c
-+++ b/src/sparsemat.c
-@@ -23,7 +23,7 @@
- 
- #include "config.h"
- 
--#include "cs/cs.h"
-+#include "cs.h"
- 
- #include "igraph_sparsemat.h"
- #include "igraph_error.h"
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 6da83b2..c0b82d6 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
- 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
- 	} >$(srcdir)/package.m4
- 
--EXTRA_DIST += package.m4
-+#EXTRA_DIST += package.m4
- 
- TESTSUITE_AT = \
- 	testsuite.at \
-diff --git a/tests/mt.at b/tests/mt.at
-index 050974a..9558d6f 100644
---- a/tests/mt.at
-+++ b/tests/mt.at
-@@ -29,5 +29,5 @@ AT_CLEANUP
- AT_SETUP([Thread-safe ARPACK:])
- AT_KEYWORDS([thread-safe ARPACK])
- AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal], 
--                 [-lpthread])
-+                 [-lpthread $(${PKG_CONFIG} --libs arpack)])
- AT_CLEANUP
-diff --git a/tests/types.at b/tests/types.at
-index f80a6a2..29ac739 100644
---- a/tests/types.at
-+++ b/tests/types.at
-@@ -133,7 +133,7 @@ AT_CLEANUP
- AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ])
- AT_KEYWORDS([sparse matrix igraph_sparsemat_t])
- AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out],
--                 [], [INTERNAL], [-lblas])
-+                 [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)])
- AT_CLEANUP
- 
- AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ])
--- 
-2.0.0
-
diff --git a/dev-libs/igraph/igraph-0.7.1-r2.ebuild b/dev-libs/igraph/igraph-0.7.1-r2.ebuild
deleted file mode 100644
index b920276602c3..000000000000
--- a/dev-libs/igraph/igraph-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Creating and manipulating undirected and directed graphs"
-HOMEPAGE="http://www.igraph.org/"
-SRC_URI="http://www.igraph.org/nightly/get/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gmp"
-
-RDEPEND="
-	dev-libs/libxml2
-	>=sci-libs/arpack-3
-	virtual/blas
-	virtual/lapack
-	>=sci-libs/cxsparse-3
-	sci-mathematics/glpk
-	gmp? ( dev-libs/gmp:0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	econf \
-		$(use_enable gmp) \
-		$(use_enable debug) \
-		--disable-static \
-		--disable-tls \
-		--with-external-arpack \
-		--with-external-blas \
-		--with-external-lapack \
-		--with-external-f2c \
-		--with-external-glpk
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/igraph/igraph-0.8.2.ebuild b/dev-libs/igraph/igraph-0.8.5.ebuild
index fbacf2931bef..186bd9a51133 100644
--- a/dev-libs/igraph/igraph-0.8.2.ebuild
+++ b/dev-libs/igraph/igraph-0.8.5.ebuild
@@ -15,17 +15,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	dev-libs/gmp:0
+	dev-libs/gmp:0=
 	dev-libs/libxml2
 	sci-libs/arpack
 	sci-libs/cxsparse
-	sci-mathematics/glpk
+	sci-mathematics/glpk:=
 	virtual/blas
 	virtual/lapack"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.8.2-unbundle.patch )
 
 src_prepare() {
 	default
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 564435a2995b..4f3baa079a1f 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -3,6 +3,6 @@ AUX iniparser-3.0b-cpp.patch 1032 BLAKE2B bc558d7c0263b2fef25a0cca617a717378a203
 AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c67ead108150375d850d6afe6f57815e9c4b434415596c514632e0575ea1cdf0cb464d6ca12e47780db5cd237bcf38849771ee41a SHA512 f1f01120fbf740cce5749f8ee9ba2014794523bc045999f45ad28a2bd4842d1e822b65fab2feb0751cba074de956c753949fb8b188454daf129c1ba8f0b6a1d4
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r2.ebuild 1282 BLAKE2B b437ffcd1d48a77053cb1c75dd387769df7c0ab03e7b63185f3a455e56c0cad54f0ecb098fc8fe3c703d32e150d15b7e58d9d6e0920554381a8f568df265d89d SHA512 8e6de570ff690a11bd91fa35473a674ef61a92686e50a18ab3d9e9934d88f010b06cef725f15a82257ddca87368b83307b68a5b27b864b3ad194fb605965060d
-EBUILD iniparser-4.1.ebuild 1547 BLAKE2B cf44db10df056fb24b2168f93f0fc59983cc0c476fe917d30374dbdce82cabe30f42ed5a813ae743ba7979db702eb2915fa6bddc55301a3ec0daae699c62b829 SHA512 cffa4d34f706eab8ef1ad5dabb3cb603e35b6747b9feb9a259c514a1706e6add6382c032e8c0ea8cbba62007a277731ac7eff0a5f131c6a858e8d079a9dd0913
+EBUILD iniparser-3.1-r2.ebuild 1263 BLAKE2B 49c5b200f5a11a3c790776ab791f9a24632441a1f715a26c206e35ec58fe3e48ed1cdee2f51d9780ac5aa78044f0e2c72463af6d2098ef48ef403a9e91b6d267 SHA512 3376eb3707e8bcf9c16de4e3e50d35478d59dffe5e25e09a4dae9d4f5ef6fa949b47dd8862a9c02555cd700fedc15ecdac73e91552c7abcd121caf15bc1a0c5b
+EBUILD iniparser-4.1.ebuild 1528 BLAKE2B dbd480774bf510c831f57045a3aa4a51dbe1ae612ea44bac36c9d85b5edbbee4a05bc1cc71367d049d08680fb00a41dd7cbb228c1b5a4211654ecceb505afc5d SHA512 6ba9ee9e52485b92465f5d912ff6b3dc95dee7b887f8629b12ef2ee5762a6c539d7cc5a168756df5141a642781dcf0b6040e57e813bfb970c09bf7318ea49528
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
index 5c50f4305ea2..b6d858701885 100644
--- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 # the tests are rather examples than tests, no point in running them
 RESTRICT="test"
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index d3af126dfbf7..8b6d61cb5b40 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index a2530917ae37..55f170ea1f4f 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,6 +1,4 @@
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
-DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa
 DIST isl-0.23.tar.xz 1729656 BLAKE2B ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b SHA512 da4e7cbd5045d074581d4e1c212acb074a8b2345a96515151b0543cbe2601db6ac2bbd93f9ad6643e98f845b68f438f3882c05b8b90969ae542802a3c78fea20
-EBUILD isl-0.22.1.ebuild 1342 BLAKE2B b30eb0d7b7441ad45cc987e548be0c942492c6f78f6332d7defe6961a4f28b02e6fa5881dd0b631190fd169ea2fd0f5af3a473420bcd993323610866b92f8305 SHA512 e75af99ec615dc4f02ca08ae293cbb38ff1650707975f730090508e76c7c97899df2258b92a20829584177e9c223235d07ff528428d29b4f043b411978bc77a6
-EBUILD isl-0.23-r1.ebuild 1865 BLAKE2B b2411f244e197f7bc37fffce68d421eab875cc9bb9ef44bbffd306fbcfed5a0c6490f6f5247cd99fb289b40943ef4ab705b1f1cebe6251e0a996020d304bdf07 SHA512 510f5038addae47da350214a074a4acc6401fb91aefedf5771371d346b0aa804e60b49d3ddbecb2dc276156f270011e5f217c485f8748e6147edb585d6e6c874
+EBUILD isl-0.23-r1.ebuild 1956 BLAKE2B 7533da81ab4c34be9d8ff2e07f64d97181953f255c7a210b5431fe6c4c3ee4adf2bf778e0ba9fe7ba8feb50efc20638b8b6baec9c5927b5eec8f0a22b3492fbd SHA512 3fb5a046807b152e8b00f8dfd4b8ad253f8c04dcd2e59f30483f77cd4e7c48aa800c7cfc6175922f934555cd00cf9eb74e7a50ffb764dd22217020071901cb1d
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.22.1.ebuild b/dev-libs/isl/isl-0.22.1.ebuild
deleted file mode 100644
index 8835c838fc72..000000000000
--- a/dev-libs/isl/isl-0.22.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal preserve-libs
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/22"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib \
-		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15) \
-		/usr/$(get_libdir)/libisl$(get_libname 19) \
-		/usr/$(get_libdir)/libisl$(get_libname 21)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15) \
-		/usr/$(get_libdir)/libisl$(get_libname 19) \
-		/usr/$(get_libdir)/libisl$(get_libname 21)
-}
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
index 1b89c28cfb3a..3429bca33b61 100644
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index b802d569cb50..3c729b381bc7 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,9 +1,7 @@
 AUX json-c-0.14-cmake-static-libs.patch 1818 BLAKE2B 4058bdcf64d59510e4f7dbbf5a1aa2d36d5c3f3b094c999a09afd5739dc8e837a08fd39aeabee72cc9845a11e3923c1271b51a5273bc8850a1a75e1e832ff094 SHA512 23c8fb64ca5c7e97ab060d5e984c264fb9ff508fa08dd99c362a52fbd281c488c5d84e0426ea386c87afc87cf0d0d68ab3618d86a599f9be6e4fec1c158b75a2
 AUX json-c-0.14-object-limitation.patch 8789 BLAKE2B 39e307143dd439cf5eafebc86851c98cb09ab45ad33f4e30b7d1f88a4d22feebbe9a472d8b856de15d9a5f66f5b3b1a507958a5594967ac1e44b130ef62f91de SHA512 6a3ad442ae56082f6c76dc53aa9d9d5eb77743a33f1ed28fc49df6e445932f5809d094feca8d1f4cf90f6fe6516e902de99c481bab0527e2fa382ab008dbdd7c
 AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764c3786b8a35ad6b4e5736561901fd7c24f46f0f48b7dfb1b21395fa0fbda24e2bbbfd81d50f9c8de52908022c766df744 SHA512 3a3c31890ef7c1d6cca4f2bcd1b76602165471ab03d55c85da8c821e82e1985fa33ebbc35fa63350158fba5ba517f45f0a895f0624da97bb6f7caab0e4eec7b6
-DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d
 DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
-EBUILD json-c-0.14-r3.ebuild 1246 BLAKE2B c06d68d6aaa52c0281841ab0de9d58923da4b1dc5c1c6ecbaa633cfce307ced0da8e2d0e2800cc20eb2fd9dfdb93e5d6ffcc5acb474d6a7c3f7e394bada5ecde SHA512 14e8374030a30f813395ce4454ce4a1e218c3c7da33ef9f5970e2b6718dbd034a2d4bcbd058989fb559a7f1f2418bfca091f50b5e5422bb9ee286f18fc910d50
 EBUILD json-c-0.15.ebuild 1085 BLAKE2B 8bea9975427aef1949cd491bb742c3c76d0d2ec2cba6aad7960d13b79bff0a6572ca8921700f3f2313ddfb6af4977e742f1b4d03701e54f560393595e9a57552 SHA512 15d69aff34c431107940a7fe6bd0604749230ace47df22f616bd430ad8ec44f5f5ea40edb36449977064c1132e268427e04138fe002567722733c3201f0f7290
 EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa
 MISC metadata.xml 984 BLAKE2B 392320cc8a02c2d1cd3190d7f0631771d6be73a131a68602c4f25a22fd6e22e00e491415a36708a739363de526b5497517544f95582f69fbe2dfd8ae89f308f7 SHA512 207f7d87d807b29467e23f7609a2a041eac3a9444d93b23d8950605cc7230212ee44f4e20dffb90d843937876fba63f4b477bc35e5a2cd3118adbc1ce3cc6e05
diff --git a/dev-libs/json-c/json-c-0.14-r3.ebuild b/dev-libs/json-c/json-c-0.14-r3.ebuild
deleted file mode 100644
index 483ad5f16310..000000000000
--- a/dev-libs/json-c/json-c-0.14-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="A JSON implementation in C"
-HOMEPAGE="https://github.com/json-c/json-c/wiki"
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_rdrand doc static-libs threads"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.14-cmake-static-libs.patch"
-	"${FILESDIR}/${P}-security-fix.patch"
-	"${FILESDIR}/${PN}-0.14-object-limitation.patch"
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/json-c/config.h
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DDISABLE_WERROR=ON
-		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
-		-DENABLE_THREADING=$(usex threads)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && cmake_src_test
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-}
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index c5ee05a4f8db..db0f0febaf38 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,5 +1,5 @@
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
 DIST json-glib-1.6.0.tar.xz 168648 BLAKE2B 45a323b49cb7e9b3b37fdceb0bd95585663983acee82fa8a54afb2c817e9b86332dd94775db0be81e7ff25cfd56515816487275165889f44fef918250b71115b SHA512 0025f913c54a223e6c5f7e65c081afc8ea65ab5a30ed9f30d2d2bb28d17c5695f6e308c64dfdf128e47ddc99d3178421204b5273e78305a096c0b7dfe67dd406
-EBUILD json-glib-1.4.4.ebuild 1513 BLAKE2B 5b25ecdf9e892824564e56605ca5bd0f8c21ff037faa70d39d4167d850996e2ab0f68784279b3b885504d98e344e6c62f10a349e6ed3434574780f5c0422943c SHA512 688bb6e76bdfd6ae49cca7fe04db4f3fa118bcbe6438de8f7142237acde1194b840cf4473a9eed636de5254b0337a1e9326fdf7e312b16754a2d42fca5e3ad67
-EBUILD json-glib-1.6.0.ebuild 1545 BLAKE2B e7fe9cb86f92f4f2d191251d5603c28bb39c3f5a569f5dab0b3cc8e437de31f91ac0df1d2a2405f344226b57b6e9c1ea2fca6642dc5ef3c2506a25dfeb85fd75 SHA512 4fe1d16e9d72c81968c55504232a97229f9265e80347941a0032906ff130600026712da3ff923259a30c4437fb16104aa74de3451845318364f72a698b3553ed
+EBUILD json-glib-1.4.4.ebuild 1514 BLAKE2B c6c90de778fd04db9f8d1656bc195a66643dec302b44eb46c845d87f226ea37ac5641df57d0d9076ec1ed69039458ee00c609f7fdcfdba0dbb0122aa39998ce0 SHA512 a65556de5ead0c2563fe9106a2d94ab83a428a8973d1b5931f79858fc2a73d47d1bd7244a4d77347a3e14ff4809674be35a7d02bd3c7b7689e8e16878447c5e4
+EBUILD json-glib-1.6.0.ebuild 1548 BLAKE2B b5ca65ee8dab6eaa56bd24a3008141f1651a1e5812b8c1e8f3da92a72fd9fe65e6110273a44ea4ae494e6ee554dcdcc790370adef6525b763828b33c0d79db64 SHA512 59e695778dd3f2002512ef40f73836984397639410f03b6ad989d197943f05e7f28dab87c1462a67d777cd1385cf9626267003aa62afb5c2fc90ab898cc5c94e
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild
index b4a5172fae10..0f1020925a1d 100644
--- a/dev-libs/json-glib/json-glib-1.4.4.ebuild
+++ b/dev-libs/json-glib/json-glib-1.4.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/json-glib/json-glib-1.6.0.ebuild b/dev-libs/json-glib/json-glib-1.6.0.ebuild
index 3723a06a5540..35c0e160931a 100644
--- a/dev-libs/json-glib/json-glib-1.6.0.ebuild
+++ b/dev-libs/json-glib/json-glib-1.6.0.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=(
 		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
-		-Ddocs=$(multilib_native_usex gtk-doc enabled disabled)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc enabled disabled)
 		-Dman=true
 	)
 	meson_src_configure
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 4a524243c2f7..dff816211608 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,5 +1,4 @@
 DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c66f80e807035f709822f241ef74f64085260678772580cb82bcceda83b4b3c31b92393f8d70f24d54f77f7ba224 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
 EBUILD keystone-0.9.1-r1.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b
-EBUILD keystone-0.9.1.ebuild 1740 BLAKE2B f1266df26be8551da6310d93d6e4972458c0692136ba02d2741dbb7cf75de629c0190f48ce58e8a630e662fc165605e708a4420edddcf3025c0ddd2834d7e421 SHA512 e3941b5166ef543cba6d6247e21aa6a8b0c49aa7faa72a0b28375012160134bcdb2f7029ead47b13e604fc373d3b948729e37b395c5485554c580ada86b5a9fa
 EBUILD keystone-9999.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b
 MISC metadata.xml 256 BLAKE2B 3e4f2745a843bada1b6d70aa80041aa3235d81b928ad329e3e01d8dbfc65c4408e73b7f0a2ed11b838fe25dcd6c20e2ef6461a3a9a08a81176eca079e22e203d SHA512 2d6b8edd67d5030357e85c8262e76ef07bae042f07c1061f4883554436236790086cf77b27d0fd107ebeeb2f4d9f30f47be0d831c907e4cfc84c2e99bda188d5
diff --git a/dev-libs/keystone/keystone-0.9.1.ebuild b/dev-libs/keystone/keystone-0.9.1.ebuild
deleted file mode 100644
index 862e1fa15569..000000000000
--- a/dev-libs/keystone/keystone-0.9.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-CMAKE_MIN_VERSION=3.8.7
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils distutils-r1 llvm
-
-DESCRIPTION="assembly/assembler framework + bindings"
-HOMEPAGE="https://www.keystone-engine.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P/-rc/_rc}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-IUSE="python ${ALL_LLVM_TARGETS[*]}"
-RDEPEND="${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )
-"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-llvm_check_deps() {
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
-}
-
-wrap_python() {
-	if use python; then
-		pushd bindings/python >/dev/null || die
-		distutils-r1_${EBUILD_PHASE_FUNC} "$@"
-		popd >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	default
-	cmake-utils_src_prepare
-	wrap_python
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-	)
-
-	cmake-utils_src_configure
-	wrap_python
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	wrap_python
-}
-
-src_install() {
-	cmake-utils_src_install
-	wrap_python
-}
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index f3934e9bc26b..472fb2a4efef 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,5 +1,5 @@
 AUX kreport-3.2.0-gcc10.patch 4160 BLAKE2B 1d3e579ac1c2e6da0cecc22a2128746a6f3fdf99c7b4b5b66e0992f10ec9555b83efc6b6eff62acc5c2a72299abf3baf6b0e7fec9b7b0c57702a23d7cdc4cec4 SHA512 a378710adb3c885591dadb878ad6c4c8ed6c3e92feebfd59aaf8eaf1f03ddbe720d4480622e744c37ec0d7bb52812b9e91eef90ff5d3af30f70da7bbbba5aff8
 DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
-EBUILD kreport-3.2.0-r1.ebuild 1379 BLAKE2B 29e9eb5d8bb5f72bb6beb7fd3ffae37bedbf1153a207d4c661201d40a62233a30c4d99967fc8441c8bedfdc3382b83d3a4a3b4cdaca63dc7bfa218b763f65dcb SHA512 f13c2b26d270addcb8644ab542471746590d06d44be6fc540e70605fa66e67904ca1b4d6547501a8f66e86358d231b5d94e09649193bdbc2494c0d012caca4fb
+EBUILD kreport-3.2.0-r1.ebuild 1378 BLAKE2B 0d4b9b9cb6e883dd8a85e0aa18bcba68aef335509194852a1f700ee61822d80983436720f2d9797d0a2e9f601c87dc16cabd027c2f832d55d37aaeb9baacfe4b SHA512 d41a4b48ba980186ba3dbdc64df48e091af474037ccdc25c7c4b35f812e350b9f313d40d0daaedb65624872c3fb7689db1b03fb34bb31a4c9dc26d350e8bcdee
 EBUILD kreport-3.2.0.ebuild 1343 BLAKE2B 00a2a331bee70beca3e04b3cc8b55c91f5e4bef86220e0b7bfbaffdb0453a3476c427d6434bc111641997c93acca918c5842aa443f6657b01613a21712c8af9c SHA512 c885b487aba1ba67d553917e9f6b74ca0afbab5a760200abd07c2efa488be5cbca6610cc51f2bdd517b791cd8b014d58ad624895c775f08196d02471946c8ef0
 MISC metadata.xml 444 BLAKE2B 6bcc5b1d127a801fae72db2855c9b01ffeef4d118554164d8d7c02e3edd7d0f00e22f3f6dbf45cdbe1b8c764d6efdbd3034ffc6b8cf041b7e9537d59a6629740 SHA512 7356b187c34c57ab44573e7cd3da164888c2b261c2faecc8f890db1eedae63573587447f44356dba9ee2d6218034e13cb093dbed4f63589a6f0544123f7680b9
diff --git a/dev-libs/kreport/kreport-3.2.0-r1.ebuild b/dev-libs/kreport/kreport-3.2.0-r1.ebuild
index 058f6a40c5ba..2b4721fe78c9 100644
--- a/dev-libs/kreport/kreport-3.2.0-r1.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KReport"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="LGPL-2+"
diff --git a/dev-libs/libIDL/Manifest b/dev-libs/libIDL/Manifest
index b8f67864e067..95d49a2bb6ed 100644
--- a/dev-libs/libIDL/Manifest
+++ b/dev-libs/libIDL/Manifest
@@ -1,3 +1,3 @@
 DIST libIDL-0.8.14.tar.bz2 427149 BLAKE2B c4fc6e4da9d581ddcaeab492586406902b07f964e70b84352b1436e8bc214986141f0a3d40506a7f408a1919c31275e89039978b09c496d5164e673ec236fe9a SHA512 906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac
-EBUILD libIDL-0.8.14-r2.ebuild 803 BLAKE2B f75b22f17141ce41ed8ebe932b3de480cbaca25c8dc056b2dd2a712502fd8691648744de39737b7232e1040509e6d6a3411d09ce541b609b299d31f3e1c4a73b SHA512 f2882d42668288836de17e37cb352b47d9132146452a10b952c9faadd23d78ea3f1d1271a81c18d6a50501a47895a76df9b77d56547152722d00a53fefdf243a
+EBUILD libIDL-0.8.14-r2.ebuild 795 BLAKE2B fd3afc6776b5010928e1eee217d0eaf6c23eee5fd29cf74a23f682425279740fc45b3e322872f8a8c2e9ccde6fe2574ee27b46918ee457f2564aa224b63259a4 SHA512 aa4dbfc8abe0cd3b459a0bb6382b30e4f3dba7596d5e68a9e4faefe6be42e4886d1f10263a43c90a93c8161cd57f35a092aa376c25ec94274767d16630151c16
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
index 84a4d8eaa1fc..9abde017b99a 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index fab32318347a..ef996393a535 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,5 @@
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
-EBUILD libassuan-2.5.3.ebuild 1223 BLAKE2B cf011f69d8ed47b936561330c6401a660314364b813abfd67b59c08004512406b6526fab81004410b666cf4a8e0afba337cf9fe64e32136199b2e195d08bcda6 SHA512 6f1b1d362c384699a31074f266d25bcb011cd5400bceb7462294bfe343b6f6a6ad64fd4c66384d6c5604569e5bd07df0e57bc421ae8532059c16057033bb2d6b
-EBUILD libassuan-2.5.4.ebuild 1233 BLAKE2B db7471a8118dc02e3ad096c4c323e613c2e0060b33b3bf19978b6e93b80f7c3eab88f029ae78f5834b55ef890eb9950f26daa0b255e904dd289b6eb6f03b6ea5 SHA512 7476857a1b982a0ae0e0235902d717c7074fbe51d5eb0f57a8e488a3351bc7048efa8b75f81a93dcdabc601deb87404427bdbd7d3cc30bef6e11defc7a33b752
+EBUILD libassuan-2.5.3.ebuild 1214 BLAKE2B 0a7f17210421c79dc397b6f0490b42435f7083d081f91d25984aebbafa3834631539de24f5749f590d71712442cbb472e84c9287618da93bf1785c82a53ef088 SHA512 53a789681654ae4cab60e21b1ae1a41d3dfadf70138bc878fd55168add5b5aa713c3f29a9507cae62928ba062132963f5b4ba84e6025f7ee6b60b0f8ff7e50aa
+EBUILD libassuan-2.5.4.ebuild 1224 BLAKE2B f385135f0345f710a1ff378bd8dbfe70850ba25f174771cff430d07ac8d17fded39c7f593593b98278ec5076201fdb81744b84acfd622a89c7db491be91c4d96 SHA512 1572d55cff296c0283f6e5c611bd10ab5339f3e18e98f91705231e44011734b9be3a82ab1eade8894105d535fb2c9fc3cdb4e17d978e5c0b0e32f2fa5693ce0a
 MISC metadata.xml 869 BLAKE2B 0553da6ce347ea1413910cd3dc422a28201982403a08bdc4725c35c764b97e488fdb361980a6759d7545e474291fd26ede24883875f2feff39ff555ed63dfe9e SHA512 b9561c267faae23ed753f61024c97b2da74c48682183ad4c2291910073530a389f6b416c5ecfae9b28b593d1b48b92802d64f4c5fcc917cd6d70818e0c5e080a
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index c712d1fa6158..3c1ba65420ca 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild
index bfdc9bf52091..cdc427554fbe 100644
--- a/dev-libs/libassuan/libassuan-2.5.4.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.17"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index bf59a61449f7..debf14c3dc23 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,4 +1,4 @@
 DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
 DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-EBUILD libatasmart-0.19_p5.ebuild 953 BLAKE2B c300baedbe81f505db4bf8d939e5878eb2abf7744891cefe00eee99786acd96e2d4347f91ab70e8d349fcf48327c84e62082143e3af4437349cb9f81115100c2 SHA512 9aefdcb54b72a432dbdda6a7791d867d9eca53045e02f4ca9e9fd0aac00d098dee563602c596df95839f13724113a54c2739d63164fad92126fd7e47f131b07d
+EBUILD libatasmart-0.19_p5.ebuild 1182 BLAKE2B 87b7f98e145901e4667953ec4adc4f532cf8f99688a8bb1697fb0262d9d54ea8b7adfdcf9ac8f5d6274df6aeec8d760dd1d51c138aa049f98c507edf3e88cbd1 SHA512 9d758a3bc2924a2eef5362082f38f4cfa76a16280536bae63d5ef50b374d2a56274d03652d74c4c034e77c0b06b5be88b63215f4d3802c756316113f616bb94a
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index 7da99e26ec24..ca77a0f760aa 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
 HOMEPAGE="https://salsa.debian.org/utopia-team/libatasmart"
 SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
@@ -10,14 +12,12 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
 DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${P/_p*}"
 
@@ -34,6 +34,17 @@ src_configure() {
 	econf $(use_enable static-libs static)
 }
 
+src_compile() {
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		emake -C strpool strpool \
+			CFLAGS="${BUILD_CFLAGS}" \
+			CPPFLAGS="${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}"
+	fi
+	emake
+}
+
 src_install() {
 	default
 	find "${ED}" -type f -name "*.la" -delete || die
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index d0791aaebc0e..2aee3148aad2 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -34,6 +34,6 @@ EBUILD libbson-1.17.0.ebuild 1058 BLAKE2B b45b4ea5065e8e2a4c71353af6d271fe181c96
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
-EBUILD libbson-1.8.2.ebuild 778 BLAKE2B 28b05b77bf0305041d0cff10085f90709540100447232632bbfd3850df4aef8f17eece96182099592e7cac8a819c0c3c168c7338753c4da53bba0b03bd3805b4 SHA512 f5630bbcaacf9fbaed58c072eaa57ad01a919488bc4db66e34d2c5ea08c6442d42cb30f1cdb30e8bdfb1e71f1b363a2c9493ee3d7ba3482a172e92e979ed68a7
+EBUILD libbson-1.8.2.ebuild 779 BLAKE2B d928a6f8248448e8d5988246bd63737771f6971165e3056797c23674c4bfddff0c32f73eb2e55e08e5b2c322f3763d05beb0af7644cfa3d444f33b527177a9af SHA512 9ad3d186da9d4c936445afa4c789f9e8a14929a68b44d74a3c8530679e1302a325ad9839f6582a1dd742fd7cf9dade3fed171560a8772a5744eec664f7925824
 EBUILD libbson-1.9.3.ebuild 777 BLAKE2B cd5fe3826c1fdf263b86a1e7d4f4247cc5839497c04c88cfe70036a0a33a2c468f8118b1fbd5ea4248b84db948176564db724bdd3eb7951b1464a61def9c9607 SHA512 d847c9bf88596c69f281041dd6bff7b4bf9ee88e5e92f8b2fe4b16105d56ca826bb5fcd9d7f7b33ade37edb74e3c161b6b85c6060b91a7d73332d404214fb463
 MISC metadata.xml 333 BLAKE2B 25979b807deae1e87e62fa985ffc6d01853a50340d694ac6b4383854df15c26d1c7faf3a4abefd195a7525ed95e255b9beeef5e22a25fb936244de1029fd0480 SHA512 bfe49ec533a23f950bbd560e65fdfa0c5c839d189a53ffc3135242c5bb262141f0c89cc69d7578fe9b3ea9116b70d55d1c362a1090f069e54e54bd03c51f6265
diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild
index d730cc35cea7..cc0a1d7a476a 100644
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ b/dev-libs/libbson/libbson-1.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE="debug examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 60239718c50f..17f8e48b8a6a 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,3 @@
 DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
-EBUILD libburn-1.5.2_p1.ebuild 888 BLAKE2B 0697b49b794ed9b41f707792db87b55cfab4884d40b021f3591940fb7678ceeec848d642f7dbc190b6220b8058fbae3ddfdaa9e3102dc8954f36e14ce1ab3fa5 SHA512 1c5d49c91319bba61e3981dab9e6053ae3d8e027c9bb94b36d27cd2ceaf8ca59d6acd757a805d35fa677f7700088fe270a1792fd9d32d5c3e6e4fc14630ccbc6
+EBUILD libburn-1.5.2_p1.ebuild 889 BLAKE2B 981fee1ecbfca821dd15422f20963858807ccf0c7624157150c9f75eb4b9e4ab0527e8b63a50bb4efacecdb3460ae5fa3f2d471f0f0d7385763ac77c5ef8a86c SHA512 654cde093a0ac37397e4d0d63284259e2cb8230f0ae8d9934573501425c39049cd2b04238f284c62f8e13f3c885d3cabfb17ee70b8811533354b2ffa4b7e1f8d
 MISC metadata.xml 243 BLAKE2B d63a20aa244e2d01198a2c4d25830ea1a68f7fa3fcb918ac373c31e99b303cb825bc33a753324b0999290c49421076f5fcb2450783a7e13a15cac8bfa8ebd044 SHA512 010182e2f4aa6b9ba90b1cc05b0efe19e0f40188917402ff7ef6034b5210376b33a35f9a2cc921b4cd90030bd6bd8d7e632928b34e2ed91a3e3a36a1e0b8dae7
diff --git a/dev-libs/libburn/libburn-1.5.2_p1.ebuild b/dev-libs/libburn/libburn-1.5.2_p1.ebuild
index d400be57d1ac..45baef1c2335 100644
--- a/dev-libs/libburn/libburn-1.5.2_p1.ebuild
+++ b/dev-libs/libburn/libburn-1.5.2_p1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 3087d4b9320e..74ea478b3d58 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,11 +1,3 @@
-DIST libcbor-0.5.0.tar.gz 719348 BLAKE2B 57e15e648159e7858d9d57a8b4cb7f3682f8153248610c9a3385cf9cbdea8babaf81d596b25d44bf6d59c75de23e76cce462fa7860b294019f46636726206d5a SHA512 5c2e9610d9fbb0bfc59f89a180f70b58539a1760fd39cad696af372c164a87828a23bb4d3a54d8e9d846be5271204800f0ad63656ef830f06a0ccdd10edfdb2c
-DIST libcbor-0.6.0.tar.gz 262622 BLAKE2B 2d3bc10bdb69c9205430718a8f2652672a8fa580ba7951c4012bdc8b502a9d6dcb26f398740f5fd35dfe0634f8e3d8ddf7eff5b9ec35c95cdc5383e2dce9f0ab SHA512 6adbb32780d428140388295c5d740bd77b0ae7b21e3f73629ba56a3aa4e4ee5dbb715454061b0f6f67f2b19ea8366e0e5c24f4ffb1ba629afcb7a776a15045f7
-DIST libcbor-0.6.1.tar.gz 263486 BLAKE2B 9a2415c1dde7ed611075c3b03ea1d8ab63bcb00dfc0cae3d7a3bb225b6fbee2a8f576b1f0f97eb6f0cf14c1a6e9df1c77f69320bac041287b0dec37c073f8b85 SHA512 dc9bb7d18b934fe33faabe30010425cb272d7e135f3bf233554bc934b1701f85c7b662e0d5a6a1921c21cd46acb4393600e9adc05b09d1b2a8e3c92ca9d7e4e8
-DIST libcbor-0.7.0.tar.gz 266323 BLAKE2B 76f93d3199e703c4167aeed262da7ba78d1df82e081754609391572b89f216efba0c54511d4021049fc6c62ab01b08835f02a58bbf226d973174b37eff087761 SHA512 4e2ed55ef17b8b77f82d780b1ee998d0342b67e6beabc24795117e5e222549640fe7fd261c8e78524d6489d03f7f5aa46b987709790a81f93e4d7409c32fecda
 DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
-EBUILD libcbor-0.5.0.ebuild 1308 BLAKE2B 1024113bdbf7409c9e7e6644ca543edc3bb5835ba16ced60fc44a5fbd74a26c4ddef2ba46f2cdcceb975d0fbebaa31265e6753ee55d5720e1d30e6461d733646 SHA512 25cf8a6eecb5efc065447fc8d56f40fd9112e778a58738993c24a45fc6d819a339ba2fe510d742092a540433ba575b4bdd187ed66038da80afa304d439ffcb31
-EBUILD libcbor-0.6.0-r1.ebuild 1303 BLAKE2B d7caa064bea8106579e3da3267cd64f6086d10509a38cf108b0e7faff386208afb72292f9d9847a539478ca64fa1a0328b1807b50194ab409da2a5276fd4a29c SHA512 3922e922e408f6f9adca1f704ee6a0800ee7657d06276b9b17477350850e1d1933638adf7bb534d39da6e1214ea24bab37aae0c793d0cd850aea76483373d1cd
-EBUILD libcbor-0.6.1.ebuild 1309 BLAKE2B edc2449e15d584345d162d18c21aefc832f8890cc42b2f95cea0891ed69377e16cc3ddc3697e0ecc4e8f38eaffb415d06c4c321f966638b2e87a58947bfbdb99 SHA512 4d8abc7dea8dafe9d6249ccd98578d989078d1bfa46b3932b8ce7b42f51e053134678742814725e435f63d516fe9344ec5c77d843d944809f2f2ba54680211eb
-EBUILD libcbor-0.7.0.ebuild 1351 BLAKE2B 7744c2f1ce576b2de409979f5292411163d881e73217f09c9415310e69303aff380b58d97538dd4ba7259c3eeafee23c0efca26d32130d47d4bc12ab111f15ea SHA512 ebc838adb4ec17b9620a8b6011336dacac5af031fcaac37db3c9c7e55d3ae52d7d68700327d196a078a77ad63df31d1ea752779bd17c89b043eccd5ae28d0e4e
 EBUILD libcbor-0.8.0.ebuild 1360 BLAKE2B dffbb62f33b520a77a96bc3496bc2eb42cac38999d1d2da743b8faff93d7e1638ce023ad65d749e658e66502ac01f7cbf613cce3f20bf8bc5859b13dd2237bef SHA512 b149a4ccb15e81f023df0cf99e25f2510cb13dd1c2235e2cac8807b695de087961505366b134eb3f3f4da84a43c7a46c4c8e4ebfd20d6b60d1a23bb3391e9435
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.5.0.ebuild b/dev-libs/libcbor/libcbor-0.5.0.ebuild
deleted file mode 100644
index fac56ccb78b6..000000000000
--- a/dev-libs/libcbor/libcbor-0.5.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="CBOR protocol implementation for C and others"
-HOMEPAGE="https://github.com/pjk/libcbor"
-SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+custom-alloc doc test"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/breathe[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-util/cmocka )
-"
-
-RESTRICT="!test? ( test )"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
-		-DWITH_TESTS=$(usex test 'ON' 'OFF')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc >/dev/null || die
-		emake html man
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		dodoc -r doc/build/html
-		doman doc/build/man/*
-	fi
-}
diff --git a/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild b/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild
deleted file mode 100644
index 92997f9ab209..000000000000
--- a/dev-libs/libcbor/libcbor-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="CBOR protocol implementation for C and others"
-HOMEPAGE="https://github.com/pjk/libcbor"
-SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="+custom-alloc doc test"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/breathe[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-util/cmocka )
-"
-
-RESTRICT="!test? ( test )"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
-		-DWITH_TESTS=$(usex test 'ON' 'OFF')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc >/dev/null || die
-		emake html man
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		dodoc -r doc/build/html
-		doman doc/build/man/*
-	fi
-}
diff --git a/dev-libs/libcbor/libcbor-0.6.1.ebuild b/dev-libs/libcbor/libcbor-0.6.1.ebuild
deleted file mode 100644
index 368f5493f9ea..000000000000
--- a/dev-libs/libcbor/libcbor-0.6.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="CBOR protocol implementation for C and others"
-HOMEPAGE="https://github.com/pjk/libcbor"
-SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="+custom-alloc doc test"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/breathe[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-util/cmocka )
-"
-
-RESTRICT="!test? ( test )"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
-		-DWITH_TESTS=$(usex test 'ON' 'OFF')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc >/dev/null || die
-		emake html man
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		dodoc -r doc/build/html
-		doman doc/build/man/*
-	fi
-}
diff --git a/dev-libs/libcbor/libcbor-0.7.0.ebuild b/dev-libs/libcbor/libcbor-0.7.0.ebuild
deleted file mode 100644
index 9d906f79cbf1..000000000000
--- a/dev-libs/libcbor/libcbor-0.7.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 cmake-utils
-
-DESCRIPTION="CBOR protocol implementation for C and others"
-HOMEPAGE="https://github.com/pjk/libcbor"
-SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+custom-alloc doc test"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/breathe[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-util/cmocka )
-"
-
-RESTRICT="!test? ( test )"
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
-		-DWITH_TESTS=$(usex test 'ON' 'OFF')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		pushd doc >/dev/null || die
-		emake html man
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		dodoc -r doc/build/html
-		doman doc/build/man/*
-	fi
-}
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index 6f5205e0e764..511f091bde24 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -4,8 +4,8 @@ DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd091726
 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
 DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2
 DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a894740085ef099f3e63e68e568d58e9a0609ace21002375431dde862f86352b6aec0c5374f65e64aeb4e39c3d59b406ae14bdee7a9 SHA512 c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0
-EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1884 BLAKE2B ebf28c99b2e999ca113090ecc4a6b8f2135820075d81e0899d9ee886f58a61837a8355cb7a7ba53360dbebe98e4858975b4307ea886b1898b914bd0c5ee1895e SHA512 266e753ec533929d71d6a78c226059377c3c3aae8fcb1e5c41ca3bffc79c78b6612fa6ccfe3278cea8447d2b1b85c194ffe95eb336c743fa260c6bce8728e7be
-EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2115 BLAKE2B 6eefb74d1e33cc289405e19316256d697cdeea881fc7843f54be872b0b1184f3760fe0cdeef35e64a07a205ae56c2089a526478290e51d72fdd538f550cd622d SHA512 dafa5f8a7554def3d4ddf0c18ab4dc8ccc6d8a6cb59df3a04812627cfcb3cc7a7b286ec795cb53052376b95d525fa201425982d4de6fb44342b10856a5302c90
+EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1885 BLAKE2B b0288e202bb1f94fc5ba479b56d83ed1292788134f49e6cd789d9d1db7396690bbcb1b5581a46169f683ba451f7375581c40d03b409b5a82b812e50220a81f28 SHA512 32957c2ad0f66606faf6e0f89eb1480e70c7249e14f5f2b6b44e676f64f1896b95fe4f22e673fa77ddf0384b7c3ca83542bb958c5650ab6d4a5ced5a96e103a1
+EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2116 BLAKE2B b7af1ea1a9afc36994a69ef0a42fb9961b4eea2a9fb5c44595632541f0fa0a49bb2258f6d05bcb2ff0f434e896dafbf07224affffee711adfbae668d4b421bb3 SHA512 6bfb98ada7f9f0c813c1dd4c5ec99d7755babb14370bc6953dfd733f58d4fee8d426032769334b0d7b82c484c7d73014c0c5fdb246cbeaa83c4c05aabe277774
 EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1874 BLAKE2B 68b797f1f18739e97805dec62c3dd8c62863d3a6dd564fe5f2e4dc54eb8a1c2a359c818cc9fee025280cffb43d92472b857894ab41eb903c2f973b9e2926acb2 SHA512 265f9368911ad1420cb00e6fa50937a3eb8585105eb78085920d6d086b1648946cd841721405bd09ea43430d7fe24eabcc39490e3a261633e12499ea676ab4b4
 EBUILD libcdio-paranoia-2.0.1.ebuild 1879 BLAKE2B b42d584f9e03c96251446bf80853e8b269d18697d33ed9205e50684568bcbf52fff390424d08ee20b50080ad4f60144e447acbd7eea7cfeb1ad83c3453756119 SHA512 ff2a1587899666bb4b05984b99ad1f1b5126f17102563bad7486a9b39da7d80cb0ccf628a28a64164aeea3746e3961f38fe8daf52b9cae972ebcb221e973627f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
index 02b3e419163e..dcced2ae3ab1 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
index 83e809552966..6b19cdd94969 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index a7ae3e18aa50..d4c2278673d9 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -2,6 +2,6 @@ AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f16
 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
-EBUILD libcdio-2.0.0-r1.ebuild 1857 BLAKE2B e475a25ab9ca1e8ff8fcc3d06bc25e01311a620e26db74c5c13986a6a415702dbe92858cbe3c0ef44f9b1671d72b884e944b98c2b04cae5cb4198122521005cc SHA512 4be2d83bf6bd8d0beca5cea123989949fa01cfa69b2043857fcb5f6237f8c94d68c6e56870c4d7b5585f6af399c53564f22a2e7ee22a85eb000e5260c7d7fbb3
-EBUILD libcdio-2.1.0-r1.ebuild 1807 BLAKE2B 9c7e28974723a3d02261f6689067e8303cc2a0385e259e75905ac662efddc112a1199b6d213d3ea8731e1bf7ef7cd76db33b0f37155e2ac97079992d0e43186d SHA512 9539f402eebc584a3117a0d865022c3dbb17e8d5ed187ba7b35129282ea7e81aa85070ed5a115614a17708ce25285b099e8e95b5736a9a1a34daaf9cb4b50b84
+EBUILD libcdio-2.0.0-r1.ebuild 1858 BLAKE2B e956d3daca2dd9b91b1abdc36994cbee507a89cfb1d08975e5b7e496e56a6e032bd727bc2a791662cdb144b77e93d6f740a2000a0a3e55ec247f2f2e1d1e4898 SHA512 c059c045bca20a40ab187b384594174fc075780bf556878f5052581b9e5f6396b2e72b933e619d8c06d6341f9d2ef2d9c36a73312739a00c19ce69c43010bbc5
+EBUILD libcdio-2.1.0-r1.ebuild 1808 BLAKE2B 2fd2b334882ad4a6b82dc514b11c6e37ff26025600a356ee63156c3b7209d9ab7b8c957f1dd49a8ae9c16af2d0aea672928961a72aaa1b170c56ce7833ba613a SHA512 76ccf7be04239a19ff7959dfc6f432722c6aa340bfdb741a938950477ab2242dad241f6760d2169d9329b92561231b26aaa3259b14c739c6a946ed8dae1f9375
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
index 32821868a21d..36f58dfa61d5 100644
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index ea3b0f90cc89..3e15b018e2c6 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/19" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libclangformat-ide/Manifest b/dev-libs/libclangformat-ide/Manifest
deleted file mode 100644
index ec97c5f67a29..000000000000
--- a/dev-libs/libclangformat-ide/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX clang-qtcreator-compat.patch 7480 BLAKE2B aabe085093786be2733f50259be355596b8f35ddcf524aa9437f67462e48c22532e51b113a1e839e6f1bb22548229ee111c0587e58b62e3a145a6bdf43b9b347 SHA512 6e8d761dcd7bcdda476326fa8b2e3d5966f15959aefc500c04a57b6396a035fc822ad1a57184519de3ac7340c680a5f49f5fc9841d24210e20e949d6b28a57b4
-DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libclangformat-ide-10.0.0.ebuild 1724 BLAKE2B 4b7fc4a91fff065ef5b9687dbbab5e905d39a9ec6b7903b90c27e14e232522ba79ad928873a658c46c60eb5e7e596c798fccc9189844b5e002313fe02b95a9c0 SHA512 21d3e5d1960548bb04a5a57ccc40b3aaf4f1df69ed9ad650253b6f01b655a9fd7232e035c27a3b037b93f5e83930ce10ff995560429aa62e27cba99c238a539c
-EBUILD libclangformat-ide-9.0.1.ebuild 1719 BLAKE2B af595842b8e1928f435a93bdc04935bbfac86c90ec40a87344b1023e1bcb855dbcf3517e63f1c0d9093e652aa12aa8ceef8cc0e48a831831f445185e6687125d SHA512 c345fed4ed94521ec51ae5b998db71f29efc5b927bd3471c754649c787373939a396f0dcd16bfa3a2516eb415cbc2457cd7616b17a404b70712c94f8b99335d7
-MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch b/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch
deleted file mode 100644
index 72b9453ce7a4..000000000000
--- a/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From fa1b9053729ec6a4425a44ec5502dd388928274a Mon Sep 17 00:00:00 2001
-From: Ivan Donchevskii <ivan.donchevskii@qt.io>
-Date: Fri, 12 Oct 2018 08:19:25 +0200
-Subject: [PATCH] [clang-format] Introduce the flag which allows not to shrink
- lines
-
---------------------------------------------------------------------------
-* https://reviews.llvm.org/D53072
---------------------------------------------------------------------------
-
-Currently there's no way to prevent to lines optimization even
-if you have intentionally put <CR> to split the line.
-
-In general case it's fine. So I would prefer to have such option
-which you can enable in special cases (for me it's an IDE related use case).
-
-Revert this change if upstream clang-format offers better solution.
-
-This is a cherry pick from commits b748c82e3664c2e2e3d29645ede472d87b8cde63
-and 1817513d4f3a2e4e26be124dbe395340f798fd51.
-
-Change-Id: I9d2935b937bb68ea8dc59fac8463718475e9c080
-Reviewed-by: Orgad Shaneh <orgads@gmail.com>
----
- include/clang/Format/Format.h         | 13 +++++++++++++
- lib/Format/Format.cpp                 |  4 ++++
- lib/Format/UnwrappedLineFormatter.cpp |  9 +++++----
- lib/Format/UnwrappedLineParser.cpp    |  2 ++
- unittests/Format/FormatTest.cpp       | 16 ++++++++++++++++
- 5 files changed, 40 insertions(+), 4 deletions(-)
-
-diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h
-index cb37b0c890c..b9c4df3d1af 100644
---- a/include/clang/Format/Format.h
-+++ b/include/clang/Format/Format.h
-@@ -22,6 +22,8 @@
- #include "llvm/Support/Regex.h"
- #include <system_error>
- 
-+#define KEEP_LINE_BREAKS_FOR_NON_EMPTY_LINES_BACKPORTED
-+
- namespace llvm {
- namespace vfs {
- class FileSystem;
-@@ -1200,6 +1202,16 @@ struct FormatStyle {
-   /// \endcode
-   bool JavaScriptWrapImports;
- 
-+  /// If true, no line breaks are optimized out (works only with ColumnLimit = 0)
-+  /// \code
-+  ///    true:                                  false:
-+  ///    int foo(int a,                 vs.     int foo(int a, int b) {
-+  ///            int b) {
-+  ///      bar();                                 bar();
-+  ///    }                                      }
-+  /// \endcode
-+  bool KeepLineBreaksForNonEmptyLines;
-+
-   /// If true, the empty line at the start of blocks is kept.
-   /// \code
-   ///    true:                                  false:
-@@ -1767,6 +1779,7 @@ struct FormatStyle {
-            JavaImportGroups == R.JavaImportGroups &&
-            JavaScriptQuotes == R.JavaScriptQuotes &&
-            JavaScriptWrapImports == R.JavaScriptWrapImports &&
-+           KeepLineBreaksForNonEmptyLines == R.KeepLineBreaksForNonEmptyLines &&
-            KeepEmptyLinesAtTheStartOfBlocks ==
-                R.KeepEmptyLinesAtTheStartOfBlocks &&
-            MacroBlockBegin == R.MacroBlockBegin &&
-diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
-index 2c4f8760540..61ea88626ee 100644
---- a/lib/Format/Format.cpp
-+++ b/lib/Format/Format.cpp
-@@ -417,6 +417,8 @@ template <> struct MappingTraits<FormatStyle> {
-     IO.mapOptional("JavaImportGroups", Style.JavaImportGroups);
-     IO.mapOptional("JavaScriptQuotes", Style.JavaScriptQuotes);
-     IO.mapOptional("JavaScriptWrapImports", Style.JavaScriptWrapImports);
-+    IO.mapOptional("KeepLineBreaksForNonEmptyLines",
-+                   Style.KeepLineBreaksForNonEmptyLines);
-     IO.mapOptional("KeepEmptyLinesAtTheStartOfBlocks",
-                    Style.KeepEmptyLinesAtTheStartOfBlocks);
-     IO.mapOptional("MacroBlockBegin", Style.MacroBlockBegin);
-@@ -678,6 +680,7 @@ FormatStyle getLLVMStyle() {
-   LLVMStyle.JavaScriptWrapImports = true;
-   LLVMStyle.TabWidth = 8;
-   LLVMStyle.MaxEmptyLinesToKeep = 1;
-+  LLVMStyle.KeepLineBreaksForNonEmptyLines = false;
-   LLVMStyle.KeepEmptyLinesAtTheStartOfBlocks = true;
-   LLVMStyle.NamespaceIndentation = FormatStyle::NI_None;
-   LLVMStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Auto;
-@@ -745,6 +748,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
-       {"^<ext/.*\\.h>", 2}, {"^<.*\\.h>", 1}, {"^<.*", 2}, {".*", 3}};
-   GoogleStyle.IncludeStyle.IncludeIsMainRegex = "([-_](test|unittest))?$";
-   GoogleStyle.IndentCaseLabels = true;
-+  GoogleStyle.KeepLineBreaksForNonEmptyLines = false;
-   GoogleStyle.KeepEmptyLinesAtTheStartOfBlocks = false;
-   GoogleStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Never;
-   GoogleStyle.ObjCSpaceAfterProperty = false;
-diff --git a/lib/Format/UnwrappedLineFormatter.cpp b/lib/Format/UnwrappedLineFormatter.cpp
-index 6b6a9aff461..c88efbc6867 100644
---- a/lib/Format/UnwrappedLineFormatter.cpp
-+++ b/lib/Format/UnwrappedLineFormatter.cpp
-@@ -684,7 +684,7 @@ public:
-   LineFormatter(ContinuationIndenter *Indenter, WhitespaceManager *Whitespaces,
-                 const FormatStyle &Style,
-                 UnwrappedLineFormatter *BlockFormatter)
--      : Indenter(Indenter), Whitespaces(Whitespaces), Style(Style),
-+      : Indenter(Indenter), Style(Style), Whitespaces(Whitespaces),
-         BlockFormatter(BlockFormatter) {}
-   virtual ~LineFormatter() {}
- 
-@@ -727,7 +727,8 @@ protected:
-       // assert so that we can simply call this function for all tokens.
-       return true;
- 
--    if (NewLine) {
-+    if (NewLine || (Previous.Children[0]->First->MustBreakBefore &&
-+                    Style.KeepLineBreaksForNonEmptyLines)) {
-       int AdditionalIndent = State.Stack.back().Indent -
-                              Previous.Children[0]->Level * Style.IndentWidth;
- 
-@@ -772,10 +773,10 @@ protected:
-   }
- 
-   ContinuationIndenter *Indenter;
-+  const FormatStyle &Style;
- 
- private:
-   WhitespaceManager *Whitespaces;
--  const FormatStyle &Style;
-   UnwrappedLineFormatter *BlockFormatter;
- };
- 
-@@ -798,7 +799,7 @@ public:
-     while (State.NextToken) {
-       bool Newline =
-           Indenter->mustBreak(State) ||
--          (Indenter->canBreak(State) && State.NextToken->NewlinesBefore > 0);
-+          (State.NextToken->NewlinesBefore > 0 && Indenter->canBreak(State));
-       unsigned Penalty = 0;
-       formatChildren(State, Newline, /*DryRun=*/false, Penalty);
-       Indenter->addTokenToState(State, Newline, /*DryRun=*/false);
-diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
-index 3cd3c8f9cdf..3aa30c7cb3f 100644
---- a/lib/Format/UnwrappedLineParser.cpp
-+++ b/lib/Format/UnwrappedLineParser.cpp
-@@ -2554,6 +2554,8 @@ void UnwrappedLineParser::nextToken(int LevelDifference) {
-   else
-     readTokenWithJavaScriptASI();
-   FormatTok->Previous = Previous;
-+  if (FormatTok->NewlinesBefore && Style.KeepLineBreaksForNonEmptyLines)
-+    FormatTok->MustBreakBefore = true;
- }
- 
- void UnwrappedLineParser::distributeComments(
-diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
-index c05fceb4766..38906d9ee31 100644
---- a/unittests/Format/FormatTest.cpp
-+++ b/unittests/Format/FormatTest.cpp
-@@ -385,6 +385,22 @@ TEST_F(FormatTest, RemovesEmptyLines) {
-                    "  void funk() {}\n"
-                    "};",
-                    Style));
-+
-+  Style.KeepLineBreaksForNonEmptyLines = true;
-+  Style.ColumnLimit = 0;
-+  EXPECT_EQ("int foo(int a,\n"
-+            "        int b)\n"
-+            "{\n"
-+            "}",
-+            format("int foo(int a,\n"
-+                   "int b) {}",
-+                   Style));
-+
-+  EXPECT_EQ("[]() {\n"
-+            "  foo(); }",
-+            format("[]() {\n"
-+                   "foo(); }",
-+                   Style));
- }
- 
- TEST_F(FormatTest, RecognizesBinaryOperatorKeywords) {
--- 
-2.26.2
-
diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild
deleted file mode 100644
index 768bfe1f0f4a..000000000000
--- a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake llvm llvm.org toolchain-funcs
-
-DESCRIPTION="A static clangformat library patched for IDE use"
-HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
-LLVM_COMPONENTS=( clang )
-
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-	)
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile libclangFormat.a
-}
-
-src_install() {
-	into usr/lib/llvm/${SLOT}
-	newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
-	insinto usr/lib/llvm/${SLOT}/include/clang/Format
-	newins "${S}/include/clang/Format/Format.h" FormatIDE.h
-}
diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild
deleted file mode 100644
index 5c04b67cf27c..000000000000
--- a/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake llvm llvm.org toolchain-funcs
-
-DESCRIPTION="A static clangformat library patched for IDE use"
-HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
-LLVM_COMPONENTS=( clang )
-
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-	)
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile libclangFormat.a
-}
-
-src_install() {
-	into usr/lib/llvm/${SLOT}
-	newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
-	insinto usr/lib/llvm/${SLOT}/include/clang/Format
-	newins "${S}/include/clang/Format/Format.h" FormatIDE.h
-}
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 3e93d0b2e227..322b898f4984 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,7 +1,7 @@
 DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
 DIST libcss-0.9.0-src.tar.gz 522267 BLAKE2B c104dd2cf859b908d68ac318d1da0430733b8813fbfbcb1f8f6a3d373e3a2ba1db6685542823fe0bef838619ec358f336f8eb07dc073a55a2f8c1907727295b9 SHA512 435dbca91aa2b91398dddbc1d9d035d104be193bb593907e3fff9320cc4f668f8aae54e0d5d0b7cd2ed9cb36fc02255fbe97bc9038b79fe505b581d6af1ded0d
 DIST libcss-0.9.1-src.tar.gz 522715 BLAKE2B 32206403f77997e6692eed00c9233e6f49f08efc2515901a8bef7590883e44ef320511368fe5a67968102911d849696a4419735c7f6691f0f272fcc3b9a000d8 SHA512 069b30e74ff03fc91666dd16f22a38effbb3e29f066fd0fbc09efdc26dd8678e3f31adeaf918c5596fb962c56335fb2ecdbde1aa6704fcbdec3c2f97d03e5bbe
-EBUILD libcss-0.8.0-r2.ebuild 1102 BLAKE2B d398d721d8b6fa481fe95e15afecbd1718c801356dc264b1dac4ce1ac2d2f20e47bf8def4f4537ffc3c30f0337975f3ea78b980d2fcb3b879e9c19d8f5b118a4 SHA512 ccb62c75f37dbf5d278ca4cf9f46375c4969831f7a3a0c133d66b7a3ace2475f8d4597c38845a991c0e71239f25c5cf162bad62d45a4b2bc1ab3d8b8f709a96f
-EBUILD libcss-0.9.0-r1.ebuild 1095 BLAKE2B 43432199078b9f7b5fca793ec25ff79c3b24800823d7b8d450bb08bb873a84744381f967bbc71db034bdcf859a425367c83c5be5c866ba8d2306e3a35d57aede SHA512 88ea117382adf65e1bab9b23f2a25caae2c96364ac576027233789cfcb77cd559b7fe6dd358e89aea490e8ba6c5b63cec0bb48a34c687258f129cc8a8252d1ca
-EBUILD libcss-0.9.1-r1.ebuild 1095 BLAKE2B 43432199078b9f7b5fca793ec25ff79c3b24800823d7b8d450bb08bb873a84744381f967bbc71db034bdcf859a425367c83c5be5c866ba8d2306e3a35d57aede SHA512 88ea117382adf65e1bab9b23f2a25caae2c96364ac576027233789cfcb77cd559b7fe6dd358e89aea490e8ba6c5b63cec0bb48a34c687258f129cc8a8252d1ca
+EBUILD libcss-0.8.0-r2.ebuild 1091 BLAKE2B 8678d2aa61ec3b82e6e78e4f67ade170216b2623282e88c6336aa81acf3949aed39be1a754545808fc0b0a5e2086883b3126c3e1d670a4806a8c6945fd5875f7 SHA512 0aad3c8e1be00a9570cfb75fc876b301cd996959fc74c94194cb7818ab3dd01e7896a7fae079b326124949eb20e6f249bfeca22290ca15cd71836736dc627006
+EBUILD libcss-0.9.0-r1.ebuild 1084 BLAKE2B 9ab5540531a15fc4da96c8fb980fac5f283929291826dc3bedcc40dd9010dc9dd71ca6e7bcb511a0b6943960aeae43905bd69aa6c0c4527bfa234f8d2659b94c SHA512 d3356cd9946a95cf8dfca67b3ec1d406eba08274c205f10a4d8779cd27455a5df9d8e7fa8b70340d5f1c9f2eccadf068df534a471faf86597f70c73d745b8b91
+EBUILD libcss-0.9.1-r1.ebuild 1084 BLAKE2B 9ab5540531a15fc4da96c8fb980fac5f283929291826dc3bedcc40dd9010dc9dd71ca6e7bcb511a0b6943960aeae43905bd69aa6c0c4527bfa234f8d2659b94c SHA512 d3356cd9946a95cf8dfca67b3ec1d406eba08274c205f10a4d8779cd27455a5df9d8e7fa8b70340d5f1c9f2eccadf068df534a471faf86597f70c73d745b8b91
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libcss/libcss-0.8.0-r2.ebuild b/dev-libs/libcss/libcss-0.8.0-r2.ebuild
index b388f262e7d5..9c537d57334b 100644
--- a/dev-libs/libcss/libcss-0.8.0-r2.ebuild
+++ b/dev-libs/libcss/libcss-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libcss/libcss-0.9.0-r1.ebuild b/dev-libs/libcss/libcss-0.9.0-r1.ebuild
index 03d454f91075..f532d433da5d 100644
--- a/dev-libs/libcss/libcss-0.9.0-r1.ebuild
+++ b/dev-libs/libcss/libcss-0.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libcss/libcss-0.9.1-r1.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild
index 03d454f91075..f532d433da5d 100644
--- a/dev-libs/libcss/libcss-0.9.1-r1.ebuild
+++ b/dev-libs/libcss/libcss-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 8f230fe15004..1a9e7b37ea61 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,6 +1,6 @@
 AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
-EBUILD libdnet-1.14-r1.ebuild 1476 BLAKE2B fe622b61d8bcd0c16a14c7fc496f55021d6e1b5880ee5eefb65c1ea1237ff4d850282ee0dc150b4a2f81825c4f5ebc80357b57dc83c26d46b0701f979a62d49c SHA512 85017562b1e3275d7eb255d87330b6f812ddfb8531a16973545c782dd639e12265c0e97148b63fa9e394955c99d5dce3a2e692a0c893fac6fbf6f7bc8333a7c4
+EBUILD libdnet-1.14-r1.ebuild 1484 BLAKE2B b1590fce22cfa777bceb5f6e795862fc6516fce3800ed00fbee91ce1926d18faffb5b2e385a98f6942c0e1e8ec92e95af53ee7f9c3e01e3d7643ce36c4b6326c SHA512 15fc2146d759a143b281936bc7e1c3c1e71e1959dc4354a924f9aafae8bda8b2e140234c0f23aa88c007c4ba5d12a08fabb0806998a1d8c44eb699548b8e91fd
 EBUILD libdnet-9999.ebuild 1376 BLAKE2B 9b8e58f34258ff145a513a3758b458e69cf6dce876b9488648c81c75a5ea074044bdec2494b86f40ca1ee8f4738e4a294530e45d61f56b9b3b1037c118287f2f SHA512 8b59231e80d511ff5bb59bdb750daf2713379358889805625a81e06b3481b031586fa2cb4aa7d959a6e75960edb7a4628c9fc833f1d4814b643cc91d62a5637d
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
index aa60351e6e6c..3d34dd007371 100644
--- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="python static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libdshconfig/Manifest b/dev-libs/libdshconfig/Manifest
index 8bf49eba6fb1..9d9290965760 100644
--- a/dev-libs/libdshconfig/Manifest
+++ b/dev-libs/libdshconfig/Manifest
@@ -1,3 +1,3 @@
 DIST libdshconfig-0.20.13.tar.gz 323720 BLAKE2B d470f71930e9c2b909d99fc177a0d867dca459c7831a2752b39573729a3b875bd65fd6cc68da3966912987b07f956afebe84d6f5329437eed391ac92c2ebb296 SHA512 04f3580bf1e1dbac130d350eb4c6e86a980f2ae8636a206821813ed0e14db07dc7ea720ebb3816455a4a939294caa2f2247b7348ecea72769a6f05bee0dbf19a
-EBUILD libdshconfig-0.20.13.ebuild 561 BLAKE2B 6165ebaa2129964012b9dcda728599a9ff1201b8681cf39a4449e3607f7e184a6f090ce300ba71d6f45975ee6e87db88a70c929e1c9f5f7c4c1f70d92dd98e60 SHA512 638b5c1dfa37c46c79da2c9bf78e68a2d7e54f111d90e2bbd055577cbea1c4bc1c33df9ad5e68e880cbd0703ed420fdd65d43f0e9d88d8b36bc36ab9b587f3ef
+EBUILD libdshconfig-0.20.13.ebuild 550 BLAKE2B aaca00291938908d1cbaf52a6473c35dbbc3370d6cce242f5bfe81f173e908e14da72031dd0c56ae6663e3c80ed75616797bab28b6e94f7a0ca6a116e2a78445 SHA512 4303f2aecf83d43a9dcb837951e7217cb6afa9e63315b750c9779dbc3251fec3e645f44a0aae35f348530be89e3d1d8f46b4888fe43bf40fc3533e97691f1437
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
index d7ed58d8cbb4..35b59f243fb4 100644
--- a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
+++ b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/ssh"
 
diff --git a/dev-libs/libee/Manifest b/dev-libs/libee/Manifest
index c9556bee39e9..cfc2ffb099bb 100644
--- a/dev-libs/libee/Manifest
+++ b/dev-libs/libee/Manifest
@@ -1,3 +1,3 @@
 DIST libee-0.4.1.tar.gz 357116 BLAKE2B 121f7cbdea1978889b6fcc24bfabee0c64276bf060265578e7b8067d217ee6371dc6e49b7ac733aeb0abe57bcc1df1552029831bd7a6bc6b42431d3166f90037 SHA512 810cbca8077c975b045b6761de22642708b3555aa8959c17e6be3f3865612642176762ca4def09274a6291256608f11b5833bfaaa25ba0d66f71d0dee6f594d4
-EBUILD libee-0.4.1.ebuild 639 BLAKE2B 220d965b30db93ae78c8ae956545f720952d2de21ef580fd7946f2ad9a6e2b549ab6c1a7e8c6765d59a56156ba4961c922f2b0220f8e3b8ab69047571174aca4 SHA512 a6444329d6eea20861ce55c1938e1d9a1b13edf60a8e818491c1885d1a4c490ec00f8a763974cb96639d3ddf5c248bd93f1d7cc58125cddc13a20a76fd8851ba
+EBUILD libee-0.4.1.ebuild 640 BLAKE2B e6ef5dfd7b87ab0f43bdca4ca591a145b5d5e72003338f62ffb7d6cbd86b4155116ec9aaae749534a6b4363d3a18ac69e60fed46cd857fb74bc4c7457b39f0b9 SHA512 e6309f5ea159a198ff2549fd7ab2cdc8db35c1367a580c9395b1353825e77abe1071441e7eec8a5fb6ae7c654540ea06a4b56f8162ee21e0438b124002077fb7
 MISC metadata.xml 325 BLAKE2B 8ff60b6615474ad4ba1def5ef9a89cb98f6e3a54dbb6d45cc3c2b0c6ea815ec71c7d04fb08c9af4cc116b95197dd28c49c9e65b5f43be636751bd1d1abeb909a SHA512 0118c80631e3be45293d46bf16ca279033edd35365dc332f155880fc328a7310272da11ada63de212283d77c7f051bda648520a4b9c0600f67675da4015d14a7
diff --git a/dev-libs/libee/libee-0.4.1.ebuild b/dev-libs/libee/libee-0.4.1.ebuild
index c00d1015be58..9355b1f0a058 100644
--- a/dev-libs/libee/libee-0.4.1.ebuild
+++ b/dev-libs/libee/libee-0.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.libee.org/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa x86 ~amd64-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index 5276908724de..a71a2df46d3c 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,3 +1,3 @@
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
-EBUILD libestr-0.1.11.ebuild 724 BLAKE2B dba27b9b0d033f49d4db668860460f0407acc526ea8b12bfc11cef4c6d7fcff55bc02cd67a53ae5a630932580998b14b3146394cade47e331acceb5d445d27a2 SHA512 91abd7484f89c09f744d9a6d2f177668025fedc53e8417e26dd76ffeac61461fa6aa948a0d3f1cada9dbc4638e7becbd54475af05dc7ea31e49e53480e5f641c
+EBUILD libestr-0.1.11.ebuild 725 BLAKE2B bc5b1d5478fb10f3c1bb8adab2d4eb69c82b95431a147eedbb7b1c65b262fa59d35221095f0f3f5a8212c96ffb50501e648ae6e44fcbe0badeadc479e606372f SHA512 bf44bf03be423b00bf154df8df420f0b79b1a6e8c8e6f8c367a7c6b0d8c56770c42ce2e3da94b051525b652fe25a48ad65f7aba7a9cd9c9dc339e3778523f784
 MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild
index 2c5eb88c8ae6..46bfad9d48e4 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libestr.adiscon.com/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa x86"
+KEYWORDS="amd64 arm arm64 ~hppa x86"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 0e824cbe19ad..cd9db4910ea1 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -2,5 +2,5 @@ AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f
 DIST libev-4.31.tar.gz 565540 BLAKE2B 59df831f4cfc9a615234d8d5b845a687ea41cc27aea84698e213bfacb79d8f9862ff776c2bf3888495cc303daf3b9073a1f660eaedb1437ebaa6d678c8ef0873 SHA512 c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18
 DIST libev-4.33.tar.gz 569527 BLAKE2B 8a6cae25ffde10b24a5bbf084f6a8559af326b37acdbdf47dda34b7f0c7955f3ebd26958594444a574cfa3e2b4011e4be93ad2bd994ffd4c094bf36620e67ba5 SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b
 EBUILD libev-4.31.ebuild 1126 BLAKE2B 788de40000071e63400ad9c993d6e478efa9080561c9c9a4eef293cf1f44baff7445627b13b87f34f3dd71dc0d1ae5c614604f35afd5f87c38d117404f7df9b1 SHA512 f9806dcb3be49f806e98f506a6ff94c7ccfbbd81f7409bf1ffa73f25ca53daf6ac5986ba0fbcc071156b35d2e13fe2c6c935b8579c04683786c04fde7430a2ca
-EBUILD libev-4.33.ebuild 1042 BLAKE2B c8ee09ee545828941593a64ca9002cf4539c49b7dec6e616740149797575fdf7a6c029c278abf06a6732c0addda281b0d496be777ee2248fa113714591161eed SHA512 d794746a0440f8d7719ec9c8efbdfddc40d62b38309a4a5fb022d324a2aa895560e367f495aaaebc0183ded5e2d92c418c67f49c1abc85428ba754df023437de
+EBUILD libev-4.33.ebuild 1039 BLAKE2B df082aa77e0e29a53b511e8f92715a84bd337fd84fc797d1bebd3e14a382998c929096d8cfb1cff638ef021ae45b0299e0f02d60348ebf14e799f8898cf830fa SHA512 c1aa595dde271228953a49d8ca5b5e68278e0572baca6b06e769cd7bef41d67673e51e47815214d12f0132fdf0dae5aa2d7e5670ef65522b357e610b86aa9aa3
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild
index 6385b9f3b684..3d58c7d38dbd 100644
--- a/dev-libs/libev/libev-4.33.ebuild
+++ b/dev-libs/libev/libev-4.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DOCS=( Changes README )
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 30ca6b9b18b3..9cf65dbc91da 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
 DIST libevdev-1.10.0.tar.xz 445792 BLAKE2B b7638ae85cac8b8d29c3255da1de50a06db9eb97d752b383852c85c32f8f93f31135e9d28acd474695d36d87eba04d455abd99badf6e492c2561893c47f796d2 SHA512 94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f
-DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645
 EBUILD libevdev-1.10.0.ebuild 1254 BLAKE2B aedff018f2461a447f79effd5cd340423fbd8a06e9af842a2a7676621ac8cc21d177a24186bf1175706389e5134a685d4f6380430a08231f527737e4e36963f1 SHA512 f978d0351755a44fe64d5e7d28dba16ed6d54e0735fa681279bfd7f9765d618a9b6472ae46ec768b0cce394604606311db2b3971fd57e10b36657221ddd70e01
-EBUILD libevdev-1.9.1.ebuild 1246 BLAKE2B 4c752d3fb3115742cf9bbae3c4fe024ff653c9b95d4205c47fdeae72dfc66ef90f23cfa862385275a671a738390109a62733ec79e3deb4354aaba6ea88e5f926 SHA512 52d2ed4b2a193975188e43d9bf5aa610fbbbd8892eb89549007e8ba42746fcfe6950d79c989578ee97873cbe6df0cf750908c933edd6aaeefcfd4b48a67b85b0
 EBUILD libevdev-9999.ebuild 1255 BLAKE2B db5362fc5b28a3fb4217f21ec2429ee91410b8f5a6289c9ff3794428fe5374d45368d0dba4de29923c7b410000592fc8033c24a0a20a9bd24b177dc7d0ee364f SHA512 098e5b1adb48cdab57951e68a91f6d5128116ad0eb4248ea6c039790c753a4f8cbc38646d0ce328ab1574cd23500445a92659047161e8ec4f5a1e1b6ec9a25a3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.9.1.ebuild b/dev-libs/libevdev/libevdev-1.9.1.ebuild
deleted file mode 100644
index 6077f50061b1..000000000000
--- a/dev-libs/libevdev/libevdev-1.9.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit meson multilib-minimal python-any-r1
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson test -v -C "${BUILD_DIR}" -t 100 || die "tests failed"
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index 98ef43497502..8fde026635ab 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1,3 +1,3 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
-EBUILD libfastjson-0.99.8.ebuild 797 BLAKE2B f6609cd4a28e186ed652cd005df3c851a991fd25d5167bffbd4fbb150376ab2afc12b26b3ab37d0de22de0b1beb27f0bab41d1b0de5a6e0a7b83ea6243a3e00d SHA512 1a2cd8e6388436981a589944e2054597fb1c3c799cb74923b5e5b607e523eda8b6ee9d6277cd44277f1060fded8bfde685d8505e2417277b2fedad8fe9822580
+EBUILD libfastjson-0.99.8.ebuild 798 BLAKE2B 128eb7191ddb61e58a1fbf7a0d3628c7e2be7e75b95b177e9052c41f29eea8fe0f286a6fb9e3980b0896ac0626bf05618e6b5e51d7166113f758f20401fffbb8 SHA512 9609f897070f08b031ff226023afe58db45cd34b2200c5f636d71f1bc1665214e054004e3117edd5bf0f01fc1c30cb4542e0fbd9c2b24c91bab5c29b6945526b
 MISC metadata.xml 538 BLAKE2B 55f8eeaa861845ba5d7c7386fe38f1e45ccf57d3c619dee616c890af65cdbccc115df324e873b90fee67375f6caabda26dcb870297e39575188196b2d7275eb3 SHA512 10dc8d8104e44fd107c150d272da317812755a36f44e56521dbf43259e33247f4080273b1dbc0577ebf5430798e48b2c64ed17d311070e31f9191708f79a4f31
diff --git a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild b/dev-libs/libfastjson/libfastjson-0.99.8.ebuild
index 0001b9be630a..d708a382d6a2 100644
--- a/dev-libs/libfastjson/libfastjson-0.99.8.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.rsyslog.com/tag/libfastjson/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4.2.0"
-KEYWORDS="amd64 arm arm64 hppa sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa sparc x86"
 IUSE="static-libs"
 
 DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index 169fab1fe2b5..18e8cb80ec7c 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f5826524659
 AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-EBUILD libffi-compat-3.2.1-r3.ebuild 1641 BLAKE2B 9eeecd9a7d5033ae20e754c0e0ad9dd787c677413191acd616de3c72484ca493843ee6652a73c1c1d2581750104758519d2a1328225389a88e7312ff2d26ccfa SHA512 07655931c91489bec483353dc0841a637af7b58fe36e330a04cb607b1b126d8c5535ef3451156bbf4059beeaa2b188b89ae93a456d669d9b9196a26659519929
+EBUILD libffi-compat-3.2.1-r3.ebuild 1621 BLAKE2B fe3088a1f8e06c881e766fee6d6c02aeefeb634796af29c1b44f06b62fc27a0a95d9921e54d9fba3542e0b025fd294dd6aa7ecb062dcd389027d75cf8740ad78 SHA512 2c07cac551cdd72a85451b6d2a6c346f3b7daa286da47f8160909aff2fe942302cce7289fbae84961ef00510bdb9f8e93c3c0b155fe8914b5698b6d8aae23d10
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index 8e6973d9985a..6617263b7ec8 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="6" # libffi.so.6
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 55320ecd7047..759df1fd665f 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b
 AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
-EBUILD libffi-3.3-r2.ebuild 2340 BLAKE2B 7b7b24adf408d6424471e5af71ab01cfda1f704c70c7d69ae51896646e6c9cfa66209352a91f602fb74e990ef1c121289c2e56af35a1c2a99f897654a5a8ca02 SHA512 0a60f79ebd87bea1b52691d79f0eafdb83dd3af3b6e39b0265ed3ab11e53abfb527dc297a2d344d5313363bc16772f2638d9a31c5a05a07babcf96e7232b3097
+EBUILD libffi-3.3-r2.ebuild 2320 BLAKE2B 7bf3693eff63238cf41dde905056b1c04853e30b39a3a90958f9b5dbe3ed6c7cce516a170a3b521f6c165a093af8f984825db9cc3e7a7873d7834a07f1753736 SHA512 332c038e122e358daa9beeec04a9154e13f11b8d1bacc81faf7654239263e2429750e9e7ef912b7bbfedf075cc3b5174fa8f4cdf9196acd137e4e7a2e319ae50
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 438d54d74f2a..d6512f716d5b 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index f963a43a6594..e4ae15435702 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -8,5 +8,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r6.ebuild 2974 BLAKE2B 571139ca82110bcdd8230fdee2608074f87235cab8e4bf6ff8d0ff78fec27e63232986ce800fdb7eb9d7d2804fc2d8d13d2503e1870c6801447bb6b562f88188 SHA512 e8cea1cb8da6547e26a1d0e99137bb306f33fb64cb45648a42b123e909c05962f6fd95de2a026fbe3f98f81e5b4f8306e72ed956fa82b4aaff9d856cf943e0e5
+EBUILD libgamin-0.1.10-r6.ebuild 2975 BLAKE2B cb257e9e2c3c6edde80de20c28633b3a9f100f53dc742e2ee859f644bd377b1fceb60a80565e894370cbe6802fd1dfbdf3ab421198f5e3ac5de88b9b7d7f3adc SHA512 bc15a0af58508a6190f248898ab65e37cd9bc9870a595cce1adfc6d8f3f7b0047fcda24c3ca21ec242ee3def111d75e7ea8546ad31437c0a7fe1b23de9265ce8
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index 00553e79c540..e5dd8a9130fc 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux static-libs"
 
 RESTRICT="test" # needs gam-server
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
index ec9537771ec3..5048a8c333b1 100644
--- a/dev-libs/libgcrypt-compat/Manifest
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
 AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-EBUILD libgcrypt-compat-1.5.6.ebuild 1579 BLAKE2B f26ac0ca693137e4da03c95543446ceab4de5d4bf2ac18e3b2b578db777a8225d52cd83ed66fbd33f03f14cd3e56c3fd53174091648a8a554d91070773a1aa16 SHA512 eda6241debf8e3c4a94672eedee87b134ca6613ba815359da5b11daaf20c4b40cc5b703719cd8ec0fb9c899a28a638cede50e2e49bc0982a9c7199c06c6d3960
+EBUILD libgcrypt-compat-1.5.6.ebuild 1570 BLAKE2B eaa5277562b9375cbb0691cdc7460eb21ac2b3868518275571bac62a8b3aab7d820388fcac0b3e28dfe12a43080531bce3a35b82fd1c2c49e3bc75b819fd68d0 SHA512 07e2cb8b5bfe58cc3fc1088f171dcab24f9c1641edacdc529f470f7810f0a379a1982bcbe6f5ab59ec62d988368564388785dfa7bbbdebde8889b0272f59e1e1
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index 73e53e817c2e..128dcf3aa2ec 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="11" # soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
 	!dev-libs/libgcrypt:0/11
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 0c111d210ef7..d210b09536ef 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -2,6 +2,6 @@ AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
-EBUILD libgcrypt-1.8.6.ebuild 2254 BLAKE2B aeba9610c3e1bba20dbc85b0e30db3e09d7b01b53109a6774a257a3fc9ad3bc9be98870ca57f3c5e5b1b441b5c8fd84cc8693d434ef779968dcb21b21bde4213 SHA512 35125a4c00736481b637a4ac7acab58ee34d8fe55d45e2593897c534fb04fdde53b1e985e153cdc7fce76e3bebd76af8c6c2e0726338d396acb7bb4b83704233
-EBUILD libgcrypt-1.8.7.ebuild 2263 BLAKE2B 24f6b374a5d7465d5347d61e2017cb0302d2d6c657f50ee53926b1d8f0d9140e7082c5946e623541ad4ea94675a8ca5648b466c80938e99bce398d4863706ab8 SHA512 5b38998a62bfa2cfabb7327cec246dae72cda70cdfb46b0c6529c0f3e8775932a42467bbe0226bc160fc226c8ccc5428c92b28004a0b14759c38595d7f0928a5
+EBUILD libgcrypt-1.8.6.ebuild 2234 BLAKE2B e19b2353b5fabedacfc3aa936d23abe935c541fd684e6e718850d8def526d396a172fe7e476810b9c0db64751ab35ec21a80b9ba3720854ae4a305ccc6f05f95 SHA512 f495065b135949e9068d5695ed7a632ba743798d0e303017974871a66a25cc5598a17fbce44029487d20e18318f47e157627647ccfcc805e8be173b104623ac0
+EBUILD libgcrypt-1.8.7.ebuild 2243 BLAKE2B 1c92d7ebf5b306d877be3121c904a1e072e2cf8dd132944dd9a8bd3d0ba4cd41634f96955b063f3aa54acca259f8d66c2945b6d997626b652fb42ac0e27a9a41 SHA512 3841ab25fd203ac92b2b98ece4e2ccebc9f67c7cb3faabb2527e5adee7f2b07340ecea294738dd7e3cb4bae32ddb8c858ed2e788f0371d44ab51759382ec83ea
 MISC metadata.xml 425 BLAKE2B c695b3057b3db22d3daf36a70b3d6000b55dc9c7fd4ca3a6274dde8a03c15976152bb7c44e6c4f01c11a98122f646c9660fd6d9e8d5b36041b02d63b27c97d0d SHA512 5d7c60f28eb813fc9f758cc6aaa07fb3a1e3ebe77ce89dba2f8fc56907a6d17affa252e92a2c2edd302ffa83d8d54f64f1b002411c418aae8e9cd3de19458c14
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index d716211b8e20..fe147aa0b123 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
index 8b917525e367..d3d9b405a532 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 3c3ac5f3bcea..f1c8f4f5042e 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,3 +1,3 @@
 DIST libgee-0.20.3.tar.xz 678488 BLAKE2B b35dbad89ebac58ab382a1733d7add2e6fcf1e1ba3a194f20ceb6c33b5cd01d18251147af0e7879e12951bda308597ef64776a9ba4eb3d2b86309136fc709713 SHA512 c7dd32bc02ea9f0f70e7593bc5625139802a52674e5aa07fe6fc815a78517f25590419b2da00e194bf7bf5f1505a138ba133d6dba67c44f9cdcb38389825adf7
-EBUILD libgee-0.20.3.ebuild 677 BLAKE2B 8b872d01193bc3587584d56917c3f72f484a8f4a6fe8e46175081c1193387714bc9366a07d722f31360e47f5bc7321424cdefb6ca28f8105a6b6acb4c9192ac6 SHA512 188ec20da58f446492660669d598355de59fbc513f28e00f512410358910b2fde17c401a0c4d9865a7e56c3c2d46c5913872080525a221f9fdddbd98d380ddbc
+EBUILD libgee-0.20.3.ebuild 676 BLAKE2B cf10539a60968b946876b6f0afd2711d10cb1bc6ca808811e9dffc852c037d439623f6df047fcf1e413772ac4c8278c9260cd6a25bfbec4e4655ac185258841c SHA512 accc81319287a22cd861f2b0cec938cbca66864814fab81896162df849d02f1b444005588ba632045c20f708e3083e24dfa455247c7cf7497d3eca2c7b9a1263
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgee/libgee-0.20.3.ebuild b/dev-libs/libgee/libgee-0.20.3.ebuild
index 5239bab99826..1fc2c61ea356 100644
--- a/dev-libs/libgee/libgee-0.20.3.ebuild
+++ b/dev-libs/libgee/libgee-0.20.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index e5030cefa579..74dce346906b 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -4,7 +4,7 @@ DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca913
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
-EBUILD libgpg-error-1.38.ebuild 2098 BLAKE2B e6fe3a7061d14093f0a4d40bb5b52c09f7deda0c0a9c0b99995830f4438f9b16c646208db39cc775851f68407582fc4615e784182bfbd3f68d7d4647cc681eb7 SHA512 1bd54aa4ce63b8fd33d21276bcd64305bcd7c3c152475bdde036cafe43d053dea509a4bd56acc41188b07ba6458fb78dbfcd7c13e4ccb4f7e5e2d6e0ec0f55c8
-EBUILD libgpg-error-1.39.ebuild 1670 BLAKE2B 190511d2ebedc9abf79b1a52cae589963fb147ceb790f71584ca8f8d9ffa0282c83f814947dced30d179a6ffe5a7d974f9fd6179b18ea76e70aa05fee9c4bf9e SHA512 a41a686a938549a108ec2bf59a36e1813d5fddb0e35e25b10eafbe13371496ce94bf8f721f9ba58485a629afcfdf7a7f42640996e5c739d11f4a4dcc04a63c74
-EBUILD libgpg-error-1.41.ebuild 1670 BLAKE2B 190511d2ebedc9abf79b1a52cae589963fb147ceb790f71584ca8f8d9ffa0282c83f814947dced30d179a6ffe5a7d974f9fd6179b18ea76e70aa05fee9c4bf9e SHA512 a41a686a938549a108ec2bf59a36e1813d5fddb0e35e25b10eafbe13371496ce94bf8f721f9ba58485a629afcfdf7a7f42640996e5c739d11f4a4dcc04a63c74
+EBUILD libgpg-error-1.38.ebuild 2078 BLAKE2B c571751e19d709608ef8a75a8bdceb4c4fcee6665858e048c2424a4e93aac88a4a4f49c855fc8b70ff2a9261d2d68e2f38a94ce6b2e602578f592fd0ef18ed78 SHA512 d2aeaac9f57c665533d57298377776928a410e35a3cb2128968a8385d8a7ce92816fc217bb9889c81d001a7deef76d0a21ff5fbec885e04054381f0194030cdb
+EBUILD libgpg-error-1.39.ebuild 1650 BLAKE2B 265d2709fbecb9780d0783f9866afe5d8597c60ee9e515cdb087a324c1e15e152310718b69f3676d103a2c6a497eb7d28b7681b14d7e5864379cb35073ad9710 SHA512 1f4201633bd3e8cd1a839b949904bb9610a675e82faa54021f1a59f1deafa6eedbe6822b2738bd826df2ce9b39aa846ee17065584f43313dcd04c87d7343ed07
+EBUILD libgpg-error-1.41.ebuild 2150 BLAKE2B 84d3b60290162d42128f44a142ef1e563af6951811e4c292b048f31a9c2b7b031c47f5ef86953e4a013773dbe132c8061789e5e498ad54bb304e43742921c8d8 SHA512 932b7175852992a595ee61ba9b1c6a75a59a7561e62b2d997df2ade36905ef3027d4c21401e3ac235d0f3e5b2672f018c0d3fa5bb48f782d5b6b39b283dfc5fd
 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index 4baca344efba..a27a868a101a 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
index dcb9068911b4..7cdaab3047ae 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
index dcb9068911b4..be7802c9db40 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
@@ -32,11 +32,26 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	if use prefix ; then
+		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
+		sed -i -e 's/solaris\*/disabled/' configure.ac || die
+	fi
+
 	# only necessary for as long as we run eautoreconf, configure.ac
 	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
 	# not a pure /bin/sh script, so it fails on some hosts
 	hprefixify -w 1 autogen.sh
 	eautoreconf
+
+	if use prefix ; then
+		# upstream seems not interested in trying to understand (#584330)
+		# https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html
+		# again reported as https://dev.gnupg.org/T4474
+		einfo "Forcing -no-undefined libtool flag ..."
+		sed -i -e 's/\$(no_undefined)/-no-undefined/' src/Makefile.in
+		eend $? || die
+	fi
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 1e73fed60cfe..2d9ed1c20bed 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,5 @@
 DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
 DIST libgusb-0.3.5.tar.xz 41340 BLAKE2B 76a99e6877bddbc7000f13f9099456101b8fd125866b841823dd543b58196e10be80fe4472153c9ff42ad2a4faf53d13d22bdecd9f5c2bd4fd21578abbc38cad SHA512 4c709a3c5215342b12b42f393aea6945e2048d4a7b137ec5b6e11b54c1ea9b8a59ba31b9110bfaf10e8924a7b41eaf5b82c417252340d012db400e8eb4c9dc1c
-EBUILD libgusb-0.3.3.ebuild 1476 BLAKE2B 328320f273a1faf71c2fdde39fe741b3ebb4b726fd660f674a6594c2800c61216a584b2a88c678bd24053eba5f3bd3a6b734854b184b4a9835eb1b907ca9aaa9 SHA512 8ac7f62f2179863c310c1b5caba41858bc55d2bab6fdfbe06802f9924a2a6c610ac54269336683adfead3649e691640abfccf1bb05fc899a960de9ee9e724b89
+EBUILD libgusb-0.3.3.ebuild 1477 BLAKE2B 1384a0af7a44ab3ecd9c18aac872719e77c2a0b785045d1f58002d1187735dcfb1ca1fd209a64ab05e28ab8ff194cd2d3dc566dd07eb27fc91c51ac69f6d8c5c SHA512 973501c489c7b109fa5c42ae1608ac396ba4677c06ee001c99f637ff98652dd8f3748fc4b2f967cb2550ba322f540e801386573271ef2512445f429eeeea8467
 EBUILD libgusb-0.3.5.ebuild 1696 BLAKE2B 7ea898e299bd636a13b1263101c7f07e15cc820ac88b0ccb266695b222de5b1e814969af24161ceb78f56db790c553910d5a3a257fa47f8e8f20a54940abc4b3 SHA512 0ee3b01bc01a874ff52cddc6095b75a363f0aa5d4f5679d3519ce00f88f1bc5d0b8d5fe3987c7cfadf26f6ae590d13338d63dfb5d17794ce12e7e5da6de32c77
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
index 364b24314774..54f4646d9e52 100644
--- a/dev-libs/libgusb/libgusb-0.3.3.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index a30824b4b1f9..e6b0d80a475d 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,5 +1,5 @@
 AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0d1eaad48c1d5b40e774d368923f764b6030a090e414fcb9851e32a9d582691dc70fc04da4d67386db53489db2feaed6895 SHA512 0318b24af8671043ee9e5c547734f6f768ef21b122b23ab95f7d1a5dcfe6c2c9579db87633a765e9bc83915d2097d3e2f3b6320cdf094106e3bf87b72d05d461
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
-EBUILD libiconv-1.15.ebuild 1930 BLAKE2B 8ec64369acbf738d5be4cbcdca066e5139c4733d20e3af65301024ece6d5cc6bf82b34cd417b5af321c3b3dc26270b5770a9795edb6eb2f819835cb9470c59f9 SHA512 33ec58e29e55c537003b652508b7b31324d82ccfa0a54cf0b9643d026e278be3cf79983c71d18ed45a0619670184c216765e71ed979595ed74c7fbd652d03ab7
+EBUILD libiconv-1.15.ebuild 1910 BLAKE2B cab434b0f833a32c15a254ed40dbdd9bf11682d9c4e784f3ceeb35680c90bb209fdef48edaec0ac033e07b1f8c0616097034ae2a831bdfedf8dfb4a75648c237 SHA512 90feb871c417ab405f4c3ca50ef76cf31e42c1e75d6647bac2c9bae20f540c93adbbe6321cd84950a88ed5f8621855f533d6cd96eb363f3f13fd8559ea3f47ea
 MISC metadata.xml 465 BLAKE2B a9451430b40c62c22fa244871d26561960f697d360e3e46300f0512556d07988d73beb7e2eb468b94c9df71aae8aef6bb61c9e59ca9ea451bd86d1acfdbb8ce3 SHA512 a7f901242b5bcc60c070d40e4271e6d6a8dbd2e152a29c0b408ef43d5140a3ef89e90062853066532cd6d64db687aaf41ff553a56449865f1b84f37158cc389a
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index 146ebfa72093..e836ac8165f3 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 4e323892359a..56065a24adac 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,3 @@
-DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0
-DIST libinput-1.16.3.tar.xz 594948 BLAKE2B 6fad03dc8ab0280435b89a1049ed019d29e795279273277c9cad4676f484856d2677845ddc1c5102f2430645053a77c1cde48bb32530d4290ade576843a51ded SHA512 cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39
 DIST libinput-1.16.4.tar.xz 596028 BLAKE2B ad2160d83bcbdd65383272e0c4b35e35c7b46a6d0c771d7c0188c92b204d57dae73d0820bb93f662f155c1eab19c0195110f5a18a68de890c808925d5c056814 SHA512 a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee
-EBUILD libinput-1.16.1.ebuild 2230 BLAKE2B 74ca4324289826313f0d01cc08308062483e5c4d204f87f30abe91d2eda88b1278fad9b62a4901c1fbf6b749abacb0f5f92e3b7c52708023c6435392244a46fa SHA512 6290bda45e9c91dafe2a38e3d08c5c83e46c88f13ba186184998c41b8d91f884768d5d12d70fc1072763ddce9ba7545e892699cbbc190e16d757ce32c1833c03
-EBUILD libinput-1.16.3.ebuild 2238 BLAKE2B 5282a6ccdf93a3d7de289b4daa66a22b81ae1dc5101d94936ba227ade8fef918cc4363f7af79d5bd8b981e3d3dbc07a7973302a44d9b2953789a9f90416838e3 SHA512 aa7ac4b79f3aa8ea5d9ee7e7356c8cfbc8d7d0005bef446084a0d974dbf413d3c30dec25a4cfc595efcd60ea653cebc63e2236662a3fac5483eada9950929ec8
 EBUILD libinput-1.16.4.ebuild 2238 BLAKE2B 5282a6ccdf93a3d7de289b4daa66a22b81ae1dc5101d94936ba227ade8fef918cc4363f7af79d5bd8b981e3d3dbc07a7973302a44d9b2953789a9f90416838e3 SHA512 aa7ac4b79f3aa8ea5d9ee7e7356c8cfbc8d7d0005bef446084a0d974dbf413d3c30dec25a4cfc595efcd60ea653cebc63e2236662a3fac5483eada9950929ec8
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.16.1.ebuild b/dev-libs/libinput/libinput-1.16.1.ebuild
deleted file mode 100644
index 9fba9ce31fea..000000000000
--- a/dev-libs/libinput/libinput-1.16.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.16.3.ebuild b/dev-libs/libinput/libinput-1.16.3.ebuild
deleted file mode 100644
index b1b38d10476a..000000000000
--- a/dev-libs/libinput/libinput-1.16.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 5e8733e89516..c516d62de055 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -3,9 +3,9 @@ DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dc
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5ce1ae76f9c35587c830c064a4b712284df4645cedf054a41e66ab08d14d080c4fe1d316a108b997207b78148ed579 SHA512 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
-EBUILD libintl-0.19.7.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f6cae563c15ced09bd0d99dcedd0e6ae060fdda2791fc6cb08aa591d4c78e448a1f7537405e9f3026d64b4e4a99 SHA512 08610710f1b663df011eece6851d5271fdb7244083aac56df054ad979c98bb618e9d48b650cecbcf47de5c33b68dc511c414496cc11559c9a2c851ec0400eb22
-EBUILD libintl-0.19.8.1.ebuild 2096 BLAKE2B f1d13ca94e12dda5357c4bc11a87c88ad7409f6cae563c15ced09bd0d99dcedd0e6ae060fdda2791fc6cb08aa591d4c78e448a1f7537405e9f3026d64b4e4a99 SHA512 08610710f1b663df011eece6851d5271fdb7244083aac56df054ad979c98bb618e9d48b650cecbcf47de5c33b68dc511c414496cc11559c9a2c851ec0400eb22
-EBUILD libintl-0.20.1.ebuild 2107 BLAKE2B f7999e94d7a092fac43823798096e030e46738c1ce0eb76999661012c48a93d63b95b879b1f6733afcc6ea8013719ed8103084c72156ea720894e4ea126e4ce4 SHA512 074d8cd9fdaa7b0ecf6be75091be3857f8b040d567f03b448fb6828a8b30051abb0f437b1662899451c72cc6b4f2817dd76547a29ef2e279dcbcefff7cb7e2fb
-EBUILD libintl-0.20.2.ebuild 2109 BLAKE2B 4692a8a6d707bff990209ca6735abe61d8d23b8a61c171762d3317b200f23099c8af19c7692ec94c921543effe2e8995c95159cfcb653ab61f46a84f1bc66b6d SHA512 997f9e19526577f26cd8026733625f0fb4ef29058a3d5cef2a44afe0e73d0419cffd786b31783e248c207e20d80c2716015918b715a3b9b86a71a49a50bef626
-EBUILD libintl-0.21.ebuild 2100 BLAKE2B d564119bcc97a2bf55719f1cb753a93ffde8a7adacb3d864e6663699ba1db49a6a042b3f60a07e616a54146ab675c21553dfae56cb4f7730b4c5fe782b1531c4 SHA512 88adc43804e87b4ca93272943d57a2d00ed3ead6eb8144b2125a2cc33dd64decb90faf8fa7f2628a18076d4f597cd651f480e7365549bbf9a9136338aa9ca0f6
+EBUILD libintl-0.19.7.ebuild 2077 BLAKE2B 5bd4cc493b70f4bf27c5fe15891eef7f9770334651d221c8937954f0b6d949371e5f3db5ab915e7a55ac3c84a9069ccc06ea2488413c04accab6c0c9291845e7 SHA512 79e6430cfb400db41bda11a110e908626e740140ae6afb124a25da8a201b7c877b2ffd080cca7d9a5254c72307af5e59af15158d5ae4fd7f1b3ec533cb947842
+EBUILD libintl-0.19.8.1.ebuild 2077 BLAKE2B 5bd4cc493b70f4bf27c5fe15891eef7f9770334651d221c8937954f0b6d949371e5f3db5ab915e7a55ac3c84a9069ccc06ea2488413c04accab6c0c9291845e7 SHA512 79e6430cfb400db41bda11a110e908626e740140ae6afb124a25da8a201b7c877b2ffd080cca7d9a5254c72307af5e59af15158d5ae4fd7f1b3ec533cb947842
+EBUILD libintl-0.20.1.ebuild 2087 BLAKE2B 75d09fcb3827dcc1bf1dd3c71ff50c3a92346b0ef3153c9d0e5a5c86bab9ea6167e28938d258cbb3a9810a09738747931524f41849afda20f567ce43a2d4bf30 SHA512 f31616ef32f0748395fe0b91790410cc8c02335a3714058e8803f7276fbf9e01cb3f9c3632548f4d260aa081c44d859c4737a46dacbc00bc66012051bb1b4298
+EBUILD libintl-0.20.2.ebuild 2089 BLAKE2B f11cbccb5ea3978758ced874fc73f020acc61d404aa5a356ed731470d431950c6cbed8724645d51c02d44405ce83abd392985e20ca7e01856b5443080e4a2c2f SHA512 fd31d85f995f989f0723c39425b94dad8fac357ec719a84907bb9d29733615d152b4fb9629ad03ec7eaba1426c15eda71742f8a44e91adcac02fb9cddde02203
+EBUILD libintl-0.21.ebuild 2081 BLAKE2B 70867b846db3e6f7913e02fb6cdf968ee5782c156e04b3cd363100d004c8f8083cd79bccea007c6e4d38ca4c88de7ccd140e8a5a4d2d0f6feb50c90995bde894 SHA512 fb53cc230474aa2bd69d5b2f1400525e603c7a2a6ab6f1916a443a3b543284285d33194d4f865863e97b857d9d6e80aec06f2eabe1c36d41ad2c2df6fb249f08
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
index d3833d165dc0..08ceac26f099 100644
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ b/dev-libs/libintl/libintl-0.19.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index d3833d165dc0..08ceac26f099 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.20.1.ebuild b/dev-libs/libintl/libintl-0.20.1.ebuild
index 83b7e5e77b3f..9c0cb3e7b011 100644
--- a/dev-libs/libintl/libintl-0.20.1.ebuild
+++ b/dev-libs/libintl/libintl-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.20.2.ebuild b/dev-libs/libintl/libintl-0.20.2.ebuild
index 381e47de63d1..fdb10fbe42dc 100644
--- a/dev-libs/libintl/libintl-0.20.2.ebuild
+++ b/dev-libs/libintl/libintl-0.20.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index 349df2d47e3c..8d04abe3dd8d 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 4d9608539586..474ccaac6fff 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,3 +1,3 @@
 DIST libisoburn-1.5.2.tar.gz 1564700 BLAKE2B 5c7a77f427adff46923f9dc8833f40db36f6ac1ee3b0e58d0111a03ee5c7ae5cc60d613f47d4bb64b848feeb24599b424284cffdbe5c1eebcf7b5e3c58b19b53 SHA512 b481aa5ff20bb35ab0ab19f3f4f3ebc4f2baa8366a14a5afe4f262788441679b6501e140e182f4e80045c747f1cf48db40832d8d5cd064e58a02de2882536897
-EBUILD libisoburn-1.5.2.ebuild 1832 BLAKE2B 797a89b40ee736d59413973e44b55a15523b58c3718c8d10edb984d14e4c6ddaff54c6b7fb144aefe15537067a9da8f3665466c81951e38869d2e33261cc9c12 SHA512 a5eb9eb66fdc7649a1db65c0017d92d859cd47776961d6f15dccc896f098e620f2d5a5ac029daf833cff16c061578aea994b9366e09303d362a961b502de1352
+EBUILD libisoburn-1.5.2.ebuild 1833 BLAKE2B ac256b90ba3b81d78cdc0d06f02454203b1a961616e5c00820f1092a3021be875c96e79f2eb0c642a21c6ed4ca1e7d1c0a3ae962ae78d6ec30ee4f6bcb6c1cab SHA512 a8e7d0e64616cbafcda65ccbb59977270beabc0c0042a3ad8af4ce7af40896c625c4050ba4a6332139f7c9b7da494013e511ce0ef877665d7138b2ba385c3965
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.2.ebuild b/dev-libs/libisoburn/libisoburn-1.5.2.ebuild
index b9bd7d96470d..cdad7cdcc5fa 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.2.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 22f8c97b3650..46727f7f51e9 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,3 +1,3 @@
 DIST libisofs-1.5.2.tar.gz 857346 BLAKE2B 25e03054e2bea2dfdbe07af77eed07a94e98288d059873c6fd06dab9b7dd3985af585a8938a11bb6834034a545fad4240546bd307ba83411d566b2a3dfbb7c70 SHA512 65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab
-EBUILD libisofs-1.5.2.ebuild 959 BLAKE2B 193ee719589890a0099a5b2e25273ebac56517687b8f159f748a26d829ebd2b7d2ef6d9b40bd368ae716933e14b4b54b28f6ac07a8d56f5591237bb0fc57a82a SHA512 1ead49ead598305fd89aa135042cae5f03b96dd34dc4906edafb4d7c76553a82d45e9cfe60abdd78d4e9e690ed1b9abdab5b3c432e2d52d4f8fc835103d81e68
+EBUILD libisofs-1.5.2.ebuild 960 BLAKE2B 2484974ebec23a28c2dd5308c671a90a3f6ddad3aa85175796bf50118e1537be24cbcedff6c450ab2ce71ec39eebfa895d2b25518e4ae863029a501b5351289a SHA512 a8b19668e891970ce4e5b77f57ede6f8d9b8d718908098874de505208a86dc4dc2ccba51e6eddddb5d1bbe1da28cd1f0f1e9bd39d8e4041c60b8d3f6e8a8fc1a
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.2.ebuild b/dev-libs/libisofs/libisofs-1.5.2.ebuild
index ad408bb7c646..85ba5030dbca 100644
--- a/dev-libs/libisofs/libisofs-1.5.2.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 8dd458267272..fb70889cebfc 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,8 +1,8 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
 DIST libksba-1.4.0.tar.bz2 651319 BLAKE2B 0e3f49fd0d389d905ff75ddad6ac1f3d158d2d4d9f47d08c14d11e3fdc07aa3f661e7ea53612770269b4e08e7b61af2d83a1679874daa0605638454059cb3321 SHA512 7c1666017ebfa50b5663153dead1e019e0ee342c4f44ee8f644fc749e82dcc983237ef0f557de9de3f7908dc90405d967a4db2e36e04fe0d5a09edf49f8a0c8d
 DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721
-EBUILD libksba-1.3.5-r1.ebuild 776 BLAKE2B 9b948e3df0c84119d0c0974a26d4cf459492e282fa5efa49557de21707ef0b0f9897979a3745a9ef62143c0c2d18ab316765df1e5748d4bd93beb40579ac97b8 SHA512 2470eac50d217d0f55aafb00bc7472838d41b908360f82171854b71830c694ab3ea020733fa40c73419517655e921a31cc8dd79c8afdbdb335eb333a014d1da6
-EBUILD libksba-1.3.5-r2.ebuild 1040 BLAKE2B 8c46f984ce2c32ef10474865be55b553b43aa17f001b484a82eae18efd0d66f4f7e7c9472c91d3980de836a72c105f1e4e608715405da25bb74e5f43bfc51319 SHA512 372baf48e452491a1e3855c344a8f8b54b5c8d17c9463d48cbacf0303449dea5d3acaa51b7fa4fa269fef80b0a51ddd49288c338d78e645355a565f511947484
-EBUILD libksba-1.4.0.ebuild 1066 BLAKE2B 1e1b1bafe5833bba24cd3d3369be1c70f6ea466d4ff789455eebcb397bd5beb46a057bcf09f93f76271430d13a3c3e3ae1a46eb273f8e7bebc478cc73d6ff8c0 SHA512 216796c77a8b0451f97724e14e9f78223eba29a5327395f843e0b0e33627180850e981dfb1cfb83e34b0458473ae58efcb24ed2d17e688786feab2e1e087ef3c
-EBUILD libksba-1.5.0.ebuild 1066 BLAKE2B 1e1b1bafe5833bba24cd3d3369be1c70f6ea466d4ff789455eebcb397bd5beb46a057bcf09f93f76271430d13a3c3e3ae1a46eb273f8e7bebc478cc73d6ff8c0 SHA512 216796c77a8b0451f97724e14e9f78223eba29a5327395f843e0b0e33627180850e981dfb1cfb83e34b0458473ae58efcb24ed2d17e688786feab2e1e087ef3c
+EBUILD libksba-1.3.5-r1.ebuild 767 BLAKE2B 03d071b8440343eac2e2259466e9116dcf212ae0244df4b8a02ba875e7d0aa97c3eec425b46075904c143f79d25aa6b61aa496bff2bf9dfc66fc3f5af376f43a SHA512 73e9ce1795dc7d8756b6ede625761daefb1daa39676e4e463a4c1b8bf6a08bc5d587df78d0743f0f7c0be63b9bb3c83d439a5615ab82f7598f11ddc601cb2480
+EBUILD libksba-1.3.5-r2.ebuild 1031 BLAKE2B 3a72128d35b8b9dda8af96907ffbf6e665454375afe7f524caed1606426b33504027a610b80fe6351e66ce638ca0028896d07271189838440246e26432d95f7d SHA512 5ccbb8dbfc084bc212402b66b232d3fd198eb44849240a7604def935b51a6dcac88c25d455c25a500acc7c55b48c68fbf4c488327d937086e08ecb81a8c9cf06
+EBUILD libksba-1.4.0.ebuild 1057 BLAKE2B cc2288b86acdb811fe980e395c10dfbc9e94037d78446fecb6ee4a4231f1a98b9b54f2e4dcdaf386a1b1ac6da1ecf1a9b19e3c6a5da2d537c74b230baef3b921 SHA512 4fa79322d85cb07c76d2037efb0b207827f2d53b590b612c21e5ceb91d7d027cb8f092aa2877550fae061442b57fb5f8ecc96e45a1ab73f62710395d73e66965
+EBUILD libksba-1.5.0.ebuild 1057 BLAKE2B cc2288b86acdb811fe980e395c10dfbc9e94037d78446fecb6ee4a4231f1a98b9b54f2e4dcdaf386a1b1ac6da1ecf1a9b19e3c6a5da2d537c74b230baef3b921 SHA512 4fa79322d85cb07c76d2037efb0b207827f2d53b590b612c21e5ceb91d7d027cb8f092aa2877550fae061442b57fb5f8ecc96e45a1ab73f62710395d73e66965
 MISC metadata.xml 252 BLAKE2B da45974cde6a1708a138afe22c68a85a8ff108b4fa2761d3552c4c9200dee3f548bb3a351a70b3129e574e21b52ca9dc2028776ca644f7e0d5a7c82ed6dff0aa SHA512 1b195c0e35c6cd524cbb5e1088f3a634a1917095d133ce81625eef7b8ed76532a9e3dc7b364fcc3f65a13767cddfd194512104586e4a55487b1ffa067cfad3ba
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
index 0e5be029abae..fb4badfb8d95 100644
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
index eb6afc87408c..d94c5b0d78d4 100644
--- a/dev-libs/libksba/libksba-1.3.5-r2.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libksba/libksba-1.4.0.ebuild b/dev-libs/libksba/libksba-1.4.0.ebuild
index c2943f6574d1..4c8977ca8725 100644
--- a/dev-libs/libksba/libksba-1.4.0.ebuild
+++ b/dev-libs/libksba/libksba-1.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
index c2943f6574d1..4c8977ca8725 100644
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 4d7012285708..10b6303e339f 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,3 +1,5 @@
 DIST liblinear-241.tar.gz 559122 BLAKE2B 793ef45fc652d6f35908465e754e0aed6568125e74e68ca72466c4d71cc0e30746a999e978521c09a3ada079698f59f2bf65a430679538b7bebc133a258f2588 SHA512 a9ca47b051e28046829a3f355a552b2f5b270dd706170e1d21db1509ef09eca55e2d8ff29695d9e8192baad8bcf50aa76e75a3683948c726f2c9b915a3e4bf27
-EBUILD liblinear-241.ebuild 1459 BLAKE2B c2053330cc42af2e9e8e7efd0cd676f2d3e99dd9839e2a8c60215a142e098adebbbd2a6e60f5a1775179dac886de5d5d905c27fc473885e5546b3a9000b879a4 SHA512 61ca6696331498d62a5d983d23122158e7bcea23b4a7bcf50c0b7ef8ae64fc637e025222bb4488b1acfe329e169d4b0ed4503c33142a18c4f208ba933acc6d4e
+DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
+EBUILD liblinear-241.ebuild 1460 BLAKE2B 7c405bf7eabc8cb614c40ae4c63169536fe132e3c1ac91955b967b96579cebbb73efdf6ae1c8ebf2bb18356a583b90e3ea47c519c400d9a1a01c98f05c383165 SHA512 a99d207552413aeb873083b98e95c5c6b758a17b7565ccab03b67db429c27c66948f19ca61cbf8cb02fc99ffc49264ed7ba77b73408ad3da13a6dd62a41d5dcd
+EBUILD liblinear-242.ebuild 1457 BLAKE2B 9a946a004581c809af2d482e457fd1b5c01b33cc01d58ce767dc4f4ff2eb3e2af1485037baed08d432420fb5277f97e2aa649cbbfebf1422eb80f484e7579a55 SHA512 00c05eaf719ade78da75a78d5e8890d8cb8b3cd1734c08fcc0de7d603720cf785e10cee1ca26ddaa363dad60b2e15e2cdb5d5f8a2449eaefee3351359b0065a4
 MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-241.ebuild b/dev-libs/liblinear/liblinear-241.ebuild
index 94375db456f1..45dd62fa8788 100644
--- a/dev-libs/liblinear/liblinear-241.ebuild
+++ b/dev-libs/liblinear/liblinear-241.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/liblinear/liblinear-242.ebuild b/dev-libs/liblinear/liblinear-242.ebuild
new file mode 100644
index 000000000000..a26af094c70c
--- /dev/null
+++ b/dev-libs/liblinear/liblinear-242.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Library for Large Linear Classification"
+HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
+SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^AR/s|=|?=|g' \
+		-e '/^RANLIB/s|=|?=|g' \
+		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
+		blas/Makefile || die
+	sed -i \
+		-e 's|make|$(MAKE)|g' \
+		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
+		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
+		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
+		Makefile || die
+
+	# fix install_name on Darwin
+	sed -i \
+		-e '/install_name/s:liblinear.so.$(SHVER):'"${EPREFIX}"'/usr/lib/liblinear.$(SHVER).dylib:' \
+		-e '/LDFLAGS/s:liblinear.so.$(SHVER):liblinear'"$(get_libname '$(SHVER)')"':' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS="${CFLAGS} -fPIC" \
+		CXXFLAGS="${CXXFLAGS} -fPIC" \
+		AR="$(tc-getAR) rcv" \
+		RANLIB="$(tc-getRANLIB)" \
+		lib all
+}
+
+src_install() {
+	dolib.so ${PN}$(get_libname 4)
+	dosym ${PN}$(get_libname 4) /usr/$(get_libdir)/${PN}$(get_libname)
+
+	newbin predict ${PN}-predict
+	newbin train ${PN}-train
+
+	doheader linear.h
+
+	dodoc README
+}
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index 93adb287ac1e..2c890e3ca1a7 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -1,3 +1,3 @@
 DIST liblogging-1.0.6.tar.gz 593393 BLAKE2B c2ca93225b7594c2c064f14e83f475cf2f3dbf608e77e103759371e81e0052e49624740c35f29b7bf9cd1872f4f85f286a2c903f503bebb170a5337d0dfe0677 SHA512 09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964
-EBUILD liblogging-1.0.6.ebuild 810 BLAKE2B 4722b70856779bed1b9b36bc5ca921b4f49e63010394096944cf212b9cf06f607155e796a590ad831ddc45add6a51ce6ceb1100a2733c54140b1a838962ac669 SHA512 4b50aeeebd01692ede1149983ebfa7985544fbe00f2f8c8d083fa5e14fd8ec5133ab03b89416ef01e945da2a6813c20f39b9e63535b5b88fab792cbc757592ec
+EBUILD liblogging-1.0.6.ebuild 811 BLAKE2B 8da3ee3747ef3fbd718ea07bbaa00642bd2515c4897987a714958f681b8329c38d2d6b5c9b79a3d9535d8fd111cd57c3a175cdef4f5b42675522dbf3b1ab572d SHA512 5857f7acafaf7fcdfd07ca4962e57f2587e018d0d0d65829855558ebdb84c1abce2ff4953320bda7294516c3445c6d8571c8a4388e154046b7ed492658e5299a
 MISC metadata.xml 793 BLAKE2B a792a73849ac1ed083474948d176fe1329e0685cf4449f4e56a7b3e759e7aa91445a3fa27e39f56c443824c9fa976b501ccc23295fa1a90289ee834930cf5260 SHA512 9e59f30ecb23f2c5662cfea50f03286c7d4ee7250068e17e0a808d3a10334bdd80295cc192ff8d3e8ce62fed0baf041156de62a2e981019054f1d5ef9a05cbc3
diff --git a/dev-libs/liblogging/liblogging-1.0.6.ebuild b/dev-libs/liblogging/liblogging-1.0.6.ebuild
index 5974f3ede556..984f20ee1e7e 100644
--- a/dev-libs/liblogging/liblogging-1.0.6.ebuild
+++ b/dev-libs/liblogging/liblogging-1.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.rsyslog.com/liblogging/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/0"
-KEYWORDS="amd64 arm ~arm64 hppa x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa x86"
 IUSE="rfc3195 +stdlog systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 615b327a73fd..7a11337338a5 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,3 +1,3 @@
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
-EBUILD liblognorm-2.0.6.ebuild 1520 BLAKE2B 4d3848aefddad33d7f0f9cec516e70095a6caf1b15a518385ddc05ca0601b63fa19d6c712e61e710e32e5a5c34eab235753d6bd77a7dde070cef5e3ffce88c53 SHA512 d72bb7296a73416532ddc29698e0522d50eda5d09cc20221986b35f01a1de11a58fe8b4531a4a9fca9d984d8f579af3ea365e18de97c69f004c8f0b3d693c51b
+EBUILD liblognorm-2.0.6.ebuild 1521 BLAKE2B 82fd6c76b213a4b25da93b4861f5ec3031cea456a475c0b05bbbe68030488999ef6837b09d9fbf998c53e93844fb077e894b6787cd062c8baec8c5a6272861e6 SHA512 6b29928192b90f1105d38327e6ed33e5441f6a5c7bcefc5f65752379a8aec5016c5caed4e05dac91628be09b88d459133bdd48c4eeb5e24768d2cb3d0fb900fa
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
index 4454eb1aea10..0ee542364f3b 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
+	KEYWORDS="amd64 arm ~arm64 ~hppa x86 ~amd64-linux"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 4eb3bc1cadd4..4b6aeefbdf73 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,5 +1,3 @@
-DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833
 DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61
-EBUILD liblouis-3.10.0.ebuild 1582 BLAKE2B 87c3210d127199e2e9616e7fb9b16e768b2864f1d614b2ebfbd65bd7cf19786b468d2a1cf36bbebc371446243a94c3c62dd0f718604ca105f6cdbd6abd9d2e90 SHA512 fc13a3605413ffd844f3ce0312fc38df619339cf0f56cb00a9cfb782765c835db3b0131c92d9367f51342585438b2cb7e609b78d295e6e2a2baa06152d26ba12
 EBUILD liblouis-3.13.0.ebuild 1745 BLAKE2B 6ecb01c6907bf344200bbebc85506e3cdb3bd40256a84e882fc53134ed556ff6dbf4c06861a7b14abac7741cb5d6e9e058f7f0c9bf6c5ff0a0da00c972c79ed5 SHA512 bbd644940b639556eae499a4d264278481e7f1af5d4fd9e31a516efa1612497f2ceabf20cb0431a0a0034de514703813d99efdfaa3596195caf9e6183692ba66
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-3.10.0.ebuild b/dev-libs/liblouis/liblouis-3.10.0.ebuild
deleted file mode 100644
index 4aa446669163..000000000000
--- a/dev-libs/liblouis/liblouis-3.10.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE='wide-unicode(+)'
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1
-
-DESCRIPTION="An open-source braille translator and back-translator"
-HOMEPAGE="https://github.com/liblouis/liblouis"
-SRC_URI="https://github.com/liblouis/liblouis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="python"
-BDEPEND="sys-apps/help2man"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-
-	if use python; then
-		pushd python > /dev/null
-		distutils-r1_src_prepare
-		popd > /dev/null
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-ucs4 \
-		--disable-static
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd python > /dev/null
-		# setup.py imports liblouis to get the version number,
-		# and this causes the shared library to be dlopened
-		# at build-time.  Hack around it with LD_PRELOAD.
-		# Thanks ArchLinux.
-		LD_PRELOAD+=':../liblouis/.libs/liblouis.so'
-			distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		pushd python > /dev/null
-		LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \
-			distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
-	HTML_DOCS=( doc/liblouis.html )
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index a791b9d33d6f..2d2224e0f21e 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1,3 @@
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libltdl-2.4.6.ebuild 1119 BLAKE2B 7517adf789818c0f291323feea6b73a985add960b4aa7f30d945ec16c4982ed83eabc263da7ea78ed4727125796f67496e0f5b7da3cfb7b924a6f624c38812f0 SHA512 9623f2cc6bf27e471ba497c6de7b9bb22bbef06d182821a761e4cc51fe2081f68175b43898a089d55d67a432d754b15588246841a3999e5a39d0b5ad9787a7d2
+EBUILD libltdl-2.4.6.ebuild 1099 BLAKE2B 259536f710a50fa9421c78bebd4d95e1c1f06a0bcb621d59325e252a6406b77bb7873a59d8d4f4802465646c7046a6ccbce96a60112ae9a1e828fa9d7d531b61 SHA512 99afaa66a41c028f8b23092bed7319e44a0d46f0826194c5f8b7bbbfef9156093ab7657f817beaea4d0785512410468283ee695ac38ea7c1decd5d32dc82ac3a
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index 802a381eb96e..a9eab9b5e8dc 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 536f5b254304..0921be93418e 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,3 +1,3 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
-EBUILD liblzw-0.2-r1.ebuild 474 BLAKE2B 1113eaeeb3f775158c0c9626dee6343e1fa0e3863ca6defc3a0d87bac4b850995d36c1d0472d918a5cdd39893c593be6bda7c8da05272cd009b96f616e1b5791 SHA512 102d78cc3d3b52b1e3be6de1e470ec206b0203c15bb9a8ff6ecfb4b1db9b3b25bed183bd146d1a83c0532f5f641de49024d69ed95ef3216f88e7e679d6556fb8
+EBUILD liblzw-0.2-r1.ebuild 475 BLAKE2B feb1b5ff6c6a9e16cab04c92114682be0e44fda1eb0c4a0d6180d35afdeabdae6083e81c13d23ff0d86d7829bac409d919f38ee222cc1c5c80889dafa97f63a5 SHA512 8ad04869d1d2ed550f6d85f5d24187dff06276abe4af086eecd7dc9755c2a85c6dd34e1da6f8f895d76bb4af810e03fdb90f3c31af6edc28cacf4996b689e5de
 MISC metadata.xml 348 BLAKE2B d29da512394e29b4b8060614f619581eddd64eb7fd3273414ddfc6bf715d17040f4cddde699fe3bd56c3eb96fcb74cc9109cdafab0f46ff38b4ec00743a1b8ba SHA512 aa6d3d2945033b6643c9f1ee7a643826ff39d61fdd880a4d8dc0fa5a8790af120908b8ffab70ec32e88ca4d025bca9606f6f549adb49df1130105abc9ecec3bd
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
index ccfc8b9e57c6..cf4eda2ecdfd 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ~m68k s390 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k s390 x86"
 
 src_configure() {
 	econf --disable-static
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 368c688c7eee..8e615322a5cb 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,4 +1,4 @@
 DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e
-EBUILD libmaxminddb-1.4.3.ebuild 626 BLAKE2B 6ffb01b7caad7b8738f4e781e0ac979716b6bfc8b35832edc011fe34cbb1c91ddce5a0934b6808a105c5df52d8c8c0d56d928acb5797c92ae996bc1931dedccf SHA512 b618e648bcdbcb73a4d8c31e9bf597f2d52c18c0a1b307b0a2faf3970b9aaca447bb72c1e3e0ea3a289980bab2bb72f145207f309db5498631312e905bae32ce
+EBUILD libmaxminddb-1.4.3.ebuild 627 BLAKE2B ec59a52f9ddffb0faa9ab6a33416905cfa1f13dbbfaf62fb870c248e671772bdc07bf3b93c3236f582d29224782b03a8c75b951af17af9960dc344ab583d6469 SHA512 c41b3a52fef686e2652538711f40f05467239df7915ed2cdc5aba6968891764ce3b41a82b03452077e99c4ad0a746dbc3bc5e956f0a6846f5af0752ed9ef1c5a
 EBUILD libmaxminddb-99999.ebuild 599 BLAKE2B 2f281f45f33c357d7691fff9ee23543188caaf053f26eb2042480bf686bd3fe3198f666b898aa588ce9fb8e0ed90c5dd9e83264e1167fa9b8833bd6acc59b012 SHA512 498788586fa32e19ca8757386f65d0b6299fd5301e5fdecbe6aa9b71ab5f1b0c12faf325b2bba13875cb9a65222bbff7031daa272dd12c70c5893ce10f82a842
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
index ecd39d177aeb..ccc7b3b23ecc 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index cf47d9237fe0..427be84192f7 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
-EBUILD libmcrypt-2.5.8-r4.ebuild 959 BLAKE2B 907c87f5af15caff055e56e4f94d3a568503042da355b845ffdbc9dc22627f7efc3966b0efc80e2527139c1bd148b68f56b4001f5d46c00941c21d42f2f799de SHA512 0b40d16dd856f88fb08aca44eaf216fa11643f634a620bd67ce739f204f3cd6f5027dc74e1ace5448d27183854f7c036970dc1926b661ef964339a3d08a116d8
+EBUILD libmcrypt-2.5.8-r4.ebuild 960 BLAKE2B 2085893b6ddcff10aa129e991c1ac6d441367d0d070eee8a78afef108c3296e6cebc471dc6279a972177466fa4ba8b6b02b7b47c4c27c5fd9378569397f3eb85 SHA512 adca9287cfbee280e8ad33050081e64638caf275d938153ff7c1a5381f913c821d0f6acc80cc34578ab6fd268abac2012c0d2d8dac24052a189f395bff2b4569
 MISC metadata.xml 248 BLAKE2B d2f70b047cdeba6294940f0b4f8c4426c9b7eda93baa14e9bee35b9807c8b7ebd991c7aa726bcfeb17cc68960d335145e857f49d83d1db265935d81e9c5b07e5 SHA512 03ae18ecf8f19984fc4398e0e972bd2a52c033d7d94970d661015c76ede0c81191d9a297dfc7a04a58c1c4bf1cdd0b158236a1255c17232c58b234aeb26653a0
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index c1af4559bca4..1e82aff9eeb9 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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 ~x86-solaris"
+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 ~x86-solaris"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 2351612166cb..bf23845268f6 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -2,5 +2,5 @@ AUX libmix-2.05-fix-pattern.patch 415 BLAKE2B 7a203b13fb8718ceccc8f173c08306bef0
 AUX libmix-2.05-gentoo-r1.patch 8328 BLAKE2B 56c32ae2f6d8c69a461c360bc8a2f73d642b9031ab216e296b99a89074883a057ec82cd9470dd145ee97a4d6e20d80ec4aebfead90c6cb4f53418aee9dbf48db SHA512 24043efc6a7ebdee97425e63e97bcd298d0e920604277bdcd176c22e20119cacd6ef33a296df815cd98ae327bd149003e3e34c33f939d96bee71be3bac79bf75
 AUX libmix-2.05-libnet.patch 509 BLAKE2B ab9f57a1f49750d32f77095824637a9588dd8234b90cc5fc906c29105c1df0547552488a38d54ffe48755b0a27e8a46b30fc4553ebead19ce2f806ca5006398e SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498
 DIST libmix-205.tgz 79860 BLAKE2B 35f2480c609ed62bb0f277cba38e325cb387acf250d78d6db81dcf83cdc8002be9482d834d14f3e026452b493f4794b0a9ffff42b5ba3cf15b1263fb5ebe59da SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec
-EBUILD libmix-2.05-r7.ebuild 840 BLAKE2B cba916d314742d27f94384cd32745ea99e480c1397d7b752be5b639d04a86f45380e69aaf4f4e267963dc97bda33c23992a20777e6d81562342bda1d81714503 SHA512 98764e31f545b3bea7842aeacd7d845f93d2288cf8df337f9b38941aca4a1cba791578d766c006e7ec006401bb332ca802b640d29115ecc07053144a63973ba0
+EBUILD libmix-2.05-r7.ebuild 841 BLAKE2B cfad1986e93b2ecea28b6c62cee7a9b5c43478cd5465c3905429361f1ac9bae4a0c85a40ce4f9abefacb8d7b5512e6406b111a9c9c867c75a5f95e084999d8a4 SHA512 25bc2ae7c30f6f373ec305aee9e840805871e01543527ef7c6427e339c379898ac32c4ca2a9206c17e4d5de5b5e11c8c12b5198094f6a05cd3180666868c8ce7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index e40aae85cb5c..4e57713d01d4 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 50cdb79265b5..c35261338548 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -4,6 +4,6 @@ DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcb
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
 EBUILD libmowgli-1.0.0-r1.ebuild 483 BLAKE2B c83cb9f1d09109a13fdacbf9481f704f7a38f640a965c2a7dd29a67de1d3a2b9241ea081c82334339d542b8ef529eaea9bdd96c0ae9162503788d66b0cc59446 SHA512 b2fbc1149ae966c598eaeb16ae0db8ca44e1579616f223a4300f7259d77f0db35ef0df347b8e047dfc91e6e1a082b6dbf9f510267c2603b9cb0f713ae7b0fd59
 EBUILD libmowgli-2.1.3-r2.ebuild 1114 BLAKE2B 18d816b12322319a019182ae1d1ac2c7cd19f3690e0a30ae67c8a1281d4b39bbdc1c4e302ca505f891bf39e52eb5c2373dabf78a360aabfb139d015c5db13703 SHA512 ce585e821c518bca43b6fd3926199f0e20245515f34b6b4afbe9ea5e1242e8f516259bdfc80cb712a7db947b4f49fbb2e146b5f0b9ec10e9010cac97f508b337
-EBUILD libmowgli-2.1.3.ebuild 768 BLAKE2B 2ba06b85fb6c734b51d9aca2acceccbbf064bed72fc96733f041216c4b6f524b78abc1fb062cebcdf405a5c1f886666930354fd12a67d87272fec0c0cac45fcf SHA512 e273b120af4cac325069cc9a50e90fdc1aa2e694117b9a0ae18e81e91e2e50fd85b79e8963286bfe4ef2ac10c9aa4711884a5e8e97e2e3bb970f523e9387313c
+EBUILD libmowgli-2.1.3.ebuild 769 BLAKE2B 4c2f4e0e237a3d294868faf88e15b82345736727b6621bb3fa246cfb16712306c61d210db9e020e410a4df45174f1eeb8723807c848026958f143846889dd4b0 SHA512 42debf88cd5b2f98780ebc6acc366b54ddac8f8cdfaf39c27413bac980065d20e57e5c246f17cfead6abf87b101de9c97868fdd3a579d0b48e74af4c2cafb194
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
index a88e8a947421..3aeabd34e0da 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 7da3a24bfd85..e38375c9a9e4 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,7 +1,4 @@
-AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
-DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
 EBUILD libmspack-0.10.1_alpha.ebuild 1637 BLAKE2B c9a493cd294f8a7ad550c202289e032567e8a68b2d4e78ccab53b111a872a7258305b2895f0dc1789c10562d0d8fc8d2aab4ef7a87d8a08bdbc3e8bfa6d57134 SHA512 8cb2368af6156b34cee97cd05750cce4c1ec2cc8285e69d17472cfed31e14b61db047c671004dc5d3b7254f3af422c4d5e20745cdb4e6bd018d6e0238cab8518
-EBUILD libmspack-0.9.1_alpha-r1.ebuild 1680 BLAKE2B 38c7a31937f88a905232b0c4eb28a115ee9bf464ea4cb7dbd5302d1720d3fd44674953e75eca05d94ff15727647d63d11cd7649889cbd0ef27f1a24e7e60e449 SHA512 6ea352513bddea74aa92dbe9f95972413d82e9add64755743be29a9b6695b41ed2cad0c523c164c1949b52924a46763424207aab1d45c6bdddb97fa67c426e52
 EBUILD libmspack-9999.ebuild 1604 BLAKE2B 4ccbda9a8108a4b6381a908229c87e5111faf33e67d507f7cf079012842cd135aca9c3fe968e363d213cb6819ff6af01927b745994a6b75248ad6963196fb48b SHA512 2025a1a6422a0703bd3d95611e3917e25ac8797fd88255e839684c5ba5efb4418b493219c278fed94c94b686d4b3995a99b140de4d262d5dfc0ff4dd0c9655e2
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch b/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch
deleted file mode 100644
index c134fa0760d0..000000000000
--- a/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
-
----
- configure.ac  | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/libmspack/configure.ac b/libmspack/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_INLINE
-+AC_C_BIGENDIAN
- AC_TYPE_MODE_T
- AC_TYPE_OFF_T
- AC_TYPE_SIZE_T
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
deleted file mode 100644
index f4e6fbcc16b1..000000000000
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
-	inherit git-r3
-	MY_P="${PN}-9999"
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
-	MY_PV="${PV/_alpha/alpha}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
-fi
-
-DESCRIPTION="A library for Microsoft compression formats"
-HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug doc static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-fix-bigendian.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		# Re-create file layout from release tarball
-		pushd "${WORKDIR}" &>/dev/null || die
-		cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
-		rm -r "${S}" || die
-		mv "${WORKDIR}"/${PN}-source "${S}" || die
-		popd &>/dev/null || die
-	fi
-
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-		cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS=(AUTHORS ChangeLog NEWS README TODO)
-	use doc && HTML_DOCS=(doc/*)
-	default_src_install
-	if use doc; then
-		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 039378d0128b..1ade077ccc67 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,4 +1,4 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.3.0.ebuild 810 BLAKE2B 9ace7528a660f8928bfdcb659d6b5009f32997122965fa787ae6c524226af5bbb771c19b76287e451856bdcc55507969b2d15e35d3e010978d47853f16b105c3 SHA512 3f3ed3adb6353cdf3434298d82c24a6c6f0a44b84b09afa90f94b2ffeddf927ccb57faa7b378ebdf1c95e1ba1309bc8371e7787dcfab582325a8d06e8fb6b694
+EBUILD libnatspec-0.3.0.ebuild 811 BLAKE2B 6d1c574502cc70006314543ee428fc4abec1efac10740a28b52f642854cc51dc82d6aa5248e8292b8340a23c88a02c7eb9ef4bd69192993152dea1d79c9fb6f5 SHA512 ce54556828c45f5675a4ad57d05bc2247b315a5829e72141511f9c32d4981552f7e51394d5a11d44e01de78097c1ac9fe26862a5f4fc4e05d9f0ae1fa0858305
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index 90bb1fab67c6..02722757df79 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 3eab5ef8d8dd..503131a83559 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -4,9 +4,9 @@ AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-1.1.4-r1.ebuild 1151 BLAKE2B 4f0985dfaccfe22881176666c5d0c0226e36151bf38bec832a98e5efc2331dc8e1a299219586acbf64bc3b3f505bba1cdce99708f1fc265c6a950fb61cb03c6d SHA512 6b1a666cfe7c5c9c4ba11aa5be790afb8f912503e55578bbec683f0a8861be2c8854be40f3f83b53d071e42c3bc9616902d0202d59639912512236bb82d7a053
-EBUILD libnl-1.1.4.ebuild 1130 BLAKE2B f82bb5df7f1a038dbcd7fce4ba45647b7977b6afbaf72a607dfa1f45b2d4d3e7f922af597d03f5f6ede83c2b041228b723f1a8b1b629f6ea566cfb1c56cd433b SHA512 3e1b6edc66c242d55914af818ed8f6177282cbce83287d92deedc9a4f3273c3542e185137559bf3ae88dd9c399a2bcf6e38220e15b302c6be63c521617527e51
+EBUILD libnl-1.1.4-r1.ebuild 1147 BLAKE2B 29d60f85790c2c8bddaa0836363299f787fa0dd959d307277835923eb54fc7fd65238351054fc49a170e94a71c821b11d6ff34540f906e4baa1282f999ba3c08 SHA512 e0214fad2e204eaca33f53b258640d0cfdb194eef40ccc9b6ee7dad85d711f547ea750c168806b4631f8f1fc56597bd0740961f4f1a804341918b7d388c0c8ff
+EBUILD libnl-1.1.4.ebuild 1131 BLAKE2B 06b433e6fa9c2a3de5c29c51350648c7064555da51e3d4ef043eadc6cab5af3520bff1ab22afc05b65e90cc93ea95d57f4db37ebce7e82507bee6970d01fc0f1 SHA512 f721cc26d35867cb129d374a9e6cbc80e667c4432ea15ce4df67c13d23a57ceada4ec8e6bdad2b1bed78e0d19270db2ad1c703d00d3c33e44da7b48702fb239c
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
-EBUILD libnl-3.5.0.ebuild 2387 BLAKE2B 9ec0d860e1faae60b7820a2324725f208add864e8db8d3a6fbf4aab700bea990034926508b4d48cdb3b8743d0fea299f43e17157caeab3a30d4d6751249edba9 SHA512 c0f4debc883331a4f06b2f31cf36eed4cb85c9e8b6f72140773d61c5c3e0dd74ad93a8fada4d83f8c475e8b394ee3e13d9a94cbd6002398c93cbabecf3bdbed2
+EBUILD libnl-3.5.0.ebuild 2388 BLAKE2B bd9f4dc4c521c7da0196259f9339c201ec47f5d6e77f22df1905adec346456c1100ca604b5356d565278a36f941a0d8ab8b177bd748528f0939ec54ae5a7396a SHA512 fbffd9ec3a895c710f1d7661d12f3017d54bc25f1b1e38226dbbb94d14859fab776d1c7c21aa9607235f7455409800b9fad018061539be8244c8411f66d116c9
 EBUILD libnl-99999999.ebuild 2429 BLAKE2B 2eca6e27b7712ffd35e72df536ddf2740ef67f4af222d55f8db5fdcb4ac9046ff7545207869b71754d17e9302e0f3c8f59a61bb5f54ecd4d26bfb8319975a647 SHA512 72d03036db53aefcc25ff84ec27dc1f83f5f703f2f80196c45ab0d60a164f088c5a1bfe024404620739ae7b1e2270ee9b27db6ca8b4960f3b3eef73d7eb7f736
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index b421d2bac3e7..92fd60327864 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
 SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libnl/libnl-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild
index e4f09ac226ad..fbf023486940 100644
--- a/dev-libs/libnl/libnl-1.1.4.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
 SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 6a56b881381b..b59acf1f18f4 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index c8d0240ea488..0a49d591d618 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,5 +1,5 @@
 AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90c0b4a793561b127a8658ab4bfa354cd8ad5124655a305ae6f4437c504092492151b18b02c7c32fbacafebc8608bd5e82c SHA512 f77100d5e8270cd137b3061904009c8f9f37648e85fa2d82bbeec08d58886dc7a8544a39331ad7854b9db17890092944a74ca12fadc73c24fbc40feacfc50e73
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
-EBUILD liboil-0.3.17-r2.ebuild 1614 BLAKE2B 5999d5abec97d9dc1e1e55b67a4993b059127d70dd1aea69816862a789253584579685b99c4841e11230e676db623fe5c6e2217e9f9409aff9c00dfb9d127b6a SHA512 94d1dcf06059cb34061f2f0641cdd2e4385d9a807ebf3a1920cdb28adf3727f9d93fbea5857873a82f1da3572fb7ced62838c372f29dc531038f5284fd207d81
+EBUILD liboil-0.3.17-r2.ebuild 1615 BLAKE2B ef0d16ccbdb46965c45409f40777080dcaa3693b0a15f912b9ddd89420f005e7abecf5c558fefe2a247cf5255acd9576311da3336b169ff047bd424a663d31a0 SHA512 6882d9c204a676eb2f397aea4e1848f5e6a5dd19dd40bd13102e8f094ff8365e61d6a292041244f97e9ad7f96d472910be431d549b3da96fcacdf5da29c00dbe
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
index ccbb009e4de2..2b3380a432f9 100644
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index 06e679c22311..e042a0cf8543 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -2,6 +2,6 @@ AUX libotf-0.9.13-build.patch 678 BLAKE2B 59437afb9db0600ce6b3b7fd61f0ee139de11b
 AUX libotf-0.9.16-freetype_pkgconfig.patch 1021 BLAKE2B fe4e25b4c90c1b614369158bcdef2babdcb9c44cec81cff9c25b33d33614be99f689b209f0c19722d201c6289ebac3f5c758b9c080c84c1e57aeccb535b95ca3 SHA512 5aaf5fe70f5498859e6913ef274c47f1bbd339ea02d7027ede543a3ef0e88109ac747e03dc852f3a5a22df538a5d04ea7e9ba2bcdec899ee5063738fad57666a
 DIST libotf-0.9.13.tar.gz 388832 BLAKE2B 73d15db54457afe98016b3958668fd5d62e81c8f53d34bc8ddd6ce5c18e54085a9d3ff1648e2170c7a97823dcbd9ef117f3e66befbea272dd98193baf63d6039 SHA512 86ddf071df371ee44910afc02432352356bfa1c2a55b44274c95fc4e7ec4fca982a7fcde35aaa63a8cb332e98388a9faf9a94fbf0f39e85668630f77d841ef31
 DIST libotf-0.9.16.tar.gz 423979 BLAKE2B 838e7c855f93ebb30bcccd1d3055f662da1736bb85fa398f9ffe84411249f63e4f66908b55534c2f07446b45ae7912745a92bbf0404f8d62eeb3a9119a604b37 SHA512 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4
-EBUILD libotf-0.9.13.ebuild 879 BLAKE2B a3719983bf6de5d6f16a404e833c1749cb42dcac97b3308e8081bec6fd61e637e24c2219e7ddf7e6e91cefab44ef8b72b79d023aa76239298ee4868e12e988f4 SHA512 415002854bcac560e0be0e43d73486e4d40617f541f4abb3968d9aeb48e25adbd659f7b2de7d0afb4bddabdf16e79640234eb9e13a07909d65a33d2b89189d57
-EBUILD libotf-0.9.16.ebuild 980 BLAKE2B 9d80c500688e5ffdbdf88c663eb091eb93cb4cb62a1b84f78296f09cbfc6a1d67f74cec22e1914eea7d61fe18b58514c5bc7768ce6db8edc6c8d8078cbfcd3b8 SHA512 e7db42bfe22d204651b31639a8a9846d64d83335e67e29adee1c893098454aa3c00ee34f4752dbc07d09d8b343308da2c7f4292c6d6542a8b7018d7cde2515e1
+EBUILD libotf-0.9.13.ebuild 880 BLAKE2B d962c91bfdc89354a5ebac62bc84a798429883c7cdefd69231bdc1509366eba49b3fc2efa9fcfc9de74eda864c8dbac301ab298cfdae73b9343bfe9bf05e5537 SHA512 613184bc7a21e0813339eb259589f815b2f0d0509df55da4ca6972581988d7d885f08b00dab2c7f66ae0397f5cd0f4e879e0860205f9d1cbecef7cfefb5f537b
+EBUILD libotf-0.9.16.ebuild 981 BLAKE2B 6e49a7562feebaf2c01f78accd5eedee7b9f27563114455f3429ea427fe4d125deea355ece3e769fed0735c189cc1c5b1fcdcde7bded5254d500d5cec3f8b5f1 SHA512 30d0348bfab4d007e78d68789ec9c452ae4557568d5b267aef03787eded1e0e423c06b75a552e0a8638013321b0557d0792b8a5a09cbfd304b0f88a942bdbea5
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/dev-libs/libotf/libotf-0.9.13.ebuild b/dev-libs/libotf/libotf-0.9.13.ebuild
index 6f7645ebc314..5cac4a4f2d99 100644
--- a/dev-libs/libotf/libotf-0.9.13.ebuild
+++ b/dev-libs/libotf/libotf-0.9.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libotf/libotf-0.9.16.ebuild b/dev-libs/libotf/libotf-0.9.16.ebuild
index 36ea187d50d3..0f3d08cc65ba 100644
--- a/dev-libs/libotf/libotf-0.9.16.ebuild
+++ b/dev-libs/libotf/libotf-0.9.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs X"
 
 RDEPEND=">=media-libs/freetype-2.4.9
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index bdcfa4e9e13d..961ea7afe6d3 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,5 +1,5 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa72c914e9356c13547d71e0f1000ef4b6b7476cfba7cc3376b44b05c2bb0e7a88a267c13702222a7d2b10e9a78 SHA512 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
-EBUILD libp11-0.4.10.ebuild 784 BLAKE2B 5d1fbb3bc9e54e6901a4c6ad4a8cf14a88f8488fdf5be7370ce4c970c80e1032722ef6773a77c1a4eab9949194e834ae5e8a6572c029b80babecbc55104493a5 SHA512 e5fc6cab83014394893f4c380777d0c2a2b09e8c6ba9db8b99eb0f45e80b0194a429a12ab1f2911af7f0be2447e8b45ba00b04554d084724a4a2043200557f32
+EBUILD libp11-0.4.10.ebuild 785 BLAKE2B 038e6ae02bff3e0f11de2f26871bbd66fd30ff208235c89cfab2d430cf4989ae0c2cd110394f7305d9470695e44b8e6bfa9c70339fbff2eb989d0b1d6b0e19e2 SHA512 0ebef2ac6fb23ca3252e628136cb1c30942e1a01214c94dacc1d02367176ccb3c44afcabb6719cbe1054989188b80aa8b4a738cb15c4ef0f75a887dc09d3cb6d
 EBUILD libp11-0.4.11.ebuild 792 BLAKE2B c7e8284ef4f67d1d72aa184594d5ba7a883bec4ab79420c25c1baec9aaaf331134d9e450b3b89ca592029a6f4d1536b6b9ba05d4b312357ebdba0b57b6a18809 SHA512 1e772b0605053409f8442dbde0cd4480a783722507254f2b4d4d3942e65f27fc39ad7f9b2bfb596da5598cc1c6874167de1e8e94535b4b244a2b103632a68da7
 MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index 929da98f274a..7903034316f0 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index e7839ca3a4d9..4d6c8247d235 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,4 +1,4 @@
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
-EBUILD libparserutils-0.2.4-r1.ebuild 937 BLAKE2B 8f702013bf78c4771326fb56cf0bd41b0a07efd1c108c807273a55eb7cbb5a65eeeff7cae424294a85372c52047023fdffe2989a5cb55da109c283c371808cb0 SHA512 ef7601781b20c47c8f7aeff69aecc49f06583d62abc6ab3662ea9f76f39720611b3c987887f1bfe7f19e0d5f979ee1996619d8b732c36def7220c91812f255ed
-EBUILD libparserutils-0.2.4-r3.ebuild 862 BLAKE2B 6ff802a020d3d720424df15377a0a1253008af32fed55cfad7cb1a8ceef1c3a73f9c82579b417feecd5aed9298e0e2c75d975fe5687eba4de48825ea31086aff SHA512 07cbf8626eba2521bcc858ab86955b0ce210644396825856cb3008351312514cc52057588cb2403c81bdace5d33f77e4b7f5926c6fce6a7f83a6bac755aa7387
+EBUILD libparserutils-0.2.4-r1.ebuild 926 BLAKE2B 9ca877b42e5ec18999b631c757e789b3cd065bed250c0759b8ead0ec309f5d5d0bd5a330023590eeae369c299ee7fb6a8d76e5afcb6a36784b5d786178df0c0a SHA512 7213800d743699f75b296afd3c1033b92c30907635ad22d425dd80015558e90ef1ea9f5aeb123fdec4275229e4e8e80ccaac7e99455cfc5e43c345a5f61668cd
+EBUILD libparserutils-0.2.4-r3.ebuild 851 BLAKE2B c0c9d50d9d7f65e4c61fbfd1c3006da4cb3531d04486cc608de9dc7600712450159872f870b70296c168d9b3321b2e7b7d05e065b0ebe7a1ff7e6eb1c0bf7389 SHA512 89ec2d15c39c106b937a3b25e20a2d62a4ce7ff5deade89730aca75dafed9c7614c27c8c978403fbcc0d1e464093940c75f29be3622c890870dc1156f2cc6c1d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
index b20ac07e4842..aeb14abc754e 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~m68k-mint"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
index 2db3934a6268..9cab84c8f96e 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 4a75fe027e55..1dcf043445a7 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,4 +1,4 @@
 AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f829ff2086d93041dfc872e301a19a234c8da3b834fb5c0da3b510b0f63fff7fc07c1d6680ebfb964ba3dbf1a58b302abb14a393da36a4 SHA512 ac9f6155d055b25bcde26bf11450cb07618d7194e0a2c28e0c38dca4190b3319fbfdb85c97f01210dc7540a708fd4f8879853350d66ae382b54c4704e2e7028b
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
-EBUILD libpcre-8.44.ebuild 2604 BLAKE2B 08d15a211ab7fe13bbd54169b38aed22d5fabcda04e8c438d862ef6ebe7d94cd4aee9e194208874e1a6089c80ede92da2caa8a639df8d8ebf27ed907c165ca78 SHA512 e17a2ca257f39192453b693090590a7c824f1490a23922a288bda28da26eab84f2c522440380e10d8682520f71c87596bb84352176520c5fe17e9c33502d5148
+EBUILD libpcre-8.44.ebuild 2584 BLAKE2B 45855a61186d0f979aa98832190cab305c0ffc8fcf9a3f73615083e9c947f8bb2235f6d6c3edc956d8334ffc49ddbea0e09f6e1ba8018ce2b2101409595a6b71 SHA512 750911c62284c9ab9011068867160f8b816de74e1104210f2a477fcb3dca83987ef9d8d0370b79c56d8fed5e5ba983f98aa8b10851bb6ca2bf633e321285e62d
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild
index 737d3c29e1da..1e2d3f6f81d6 100644
--- a/dev-libs/libpcre/libpcre-8.44.ebuild
+++ b/dev-libs/libpcre/libpcre-8.44.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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 ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index a46fc6596c13..90ad570be4e9 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,6 +1,6 @@
 DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
 DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
 DIST pcre2-10.36.tar.bz2 1722310 BLAKE2B 5c70b7b1b0644edbcc29d3486fc0f3e2d0cb4822f4f3f3e7df603b4f4e27656a2e7f71389628ceb9bd7acc746ce4b626cd2a128d894840b22796841d1269765f SHA512 fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
-EBUILD libpcre2-10.35.ebuild 2540 BLAKE2B 1ec8e89822b0cee2e43d790bb8993d1038209e3a8ba595f3d360c615790ee45503429d81d537ec01ce9be4f86c05b218e1d4247922b710e9e468d3214e3e473a SHA512 42ddc0dc7e35d383452750fef2afbb1a4f8560b4e838f97519b5aaacd78c3d24f0cd9e4bb6d8b509791a2fa831e33304559656ad4ff607c870d2f13df67f6ae9
-EBUILD libpcre2-10.36.ebuild 2549 BLAKE2B 69af16a0f2fe4eeabf3ec257065dd3779399fc1eedefb7da8f7e6073a0d59fb7b2878983630aa0b706de88b058064eccbbec4901154e36ef7225bf0b7f071a91 SHA512 73c60c002f9514380964c0a98f5604376e4ccb7abc64fdfbade3fa3bdaee37b9b12a99cd704810b414a2a5bc1150cbfaa9dc5835f2a5e168219b4748b53e8767
+EBUILD libpcre2-10.35.ebuild 2520 BLAKE2B af3a4078fe9a715a184ab0ff7ce6098dad0c65e2ac1ace06d30043d0c31fce4205b4478525bf2900f98c1b416b606f08c2b14032023b62c5ebb66b5561d863b2 SHA512 933458f5d08e0d2804ec38ff2d3a09184d412c3dab06cfddb71f814ba764db5dc1c3513805c20472811c52009293c69967437445eecd94879e53d98ba41c9465
+EBUILD libpcre2-10.36.ebuild 2529 BLAKE2B 30b63f857252b40b4e5d36611430de838fba15238e963a51870f4d6a5daf5915bf359540bf5d446c82fdb8a5fe618ce3d47380b03019a4e073e50b02f483dd75 SHA512 dc1bdefa2d5784f7e94d97ba2790746d435c63b13c5080350a6705272b1ace23c81fd19852eee5d22c09c07bc85b778712faaac0ecd8471a52b21676cbf9e915
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild
index d57510107cb4..c9663707c551 100644
--- a/dev-libs/libpcre2/libpcre2-10.35.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.36.ebuild b/dev-libs/libpcre2/libpcre2-10.36.ebuild
index 89944f501ccb..fb78c5ed26b5 100644
--- a/dev-libs/libpcre2/libpcre2-10.36.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.36.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index c67d57c5c25c..fa08776256c4 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,5 @@
 DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
 DIST libpipeline-1.5.3.tar.gz 994663 BLAKE2B 57365ac07d1b61462eaea3be0ae1136f8511ea54484b1fcbe734796da760ced062a43cfb13b69eb24b521448253e603c248c59306f3fb3d871641a17530dcf82 SHA512 db0796bffbcdd8e875902385c7cdc140e3e0e045b3d0eba1017e55b4c66027c20cc2cd0fccaf52f59fa941d0925134011317b9c27986765a1ec2a73132ebaec6
 EBUILD libpipeline-1.5.2.ebuild 670 BLAKE2B b1059dfc0555227bfc9a26fd4c45c2a3fabd89dd75db054946f6b5f6a4532b334e7bded0192d56d0a054061913d9a9197510846accf9a14ca1ababb6825d97c9 SHA512 2a946a55cfc00674e4f350a3260738ab32296fb2cbac6f45cb46f508de58727e0f5b8ac5074b8fd11d84b8563381b170c05370b96f6dedb8e7c27bb9874c6f2b
-EBUILD libpipeline-1.5.3.ebuild 671 BLAKE2B d0e3ee6844e56f819944e7accf935e33007a2e4ef936fd4aedd8a284291725cd891f69d9636326cd0bc3610ed5aa966ae452c1a11aebf70928feaf67d2ec5fa2 SHA512 df6e5e91b95dc2cea03f62f197b0a188268a8acaec014db86411424bf56ac01ea3e7592cde01c0eeaa229cbd8e22df7383395aaeee597d920d233aa403a80694
+EBUILD libpipeline-1.5.3.ebuild 670 BLAKE2B b1059dfc0555227bfc9a26fd4c45c2a3fabd89dd75db054946f6b5f6a4532b334e7bded0192d56d0a054061913d9a9197510846accf9a14ca1ababb6825d97c9 SHA512 2a946a55cfc00674e4f350a3260738ab32296fb2cbac6f45cb46f508de58727e0f5b8ac5074b8fd11d84b8563381b170c05370b96f6dedb8e7c27bb9874c6f2b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
index 6b55072447b3..40e6f17ea638 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 579bc800393e..290f16f09a8f 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -2,6 +2,6 @@ DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac
 DIST libpqxx-7.2.1.tar.gz 691486 BLAKE2B ef1b12e436e33a26faa8f5acceef8d5ab1063b0618798fdf881fe38ab101da6d78989cc30c1e24f60fd81dd4f4034267e8b220b7b1d1932793028abf7e17c614 SHA512 baaa53f12aa87f512bbbe7494c915242cda8508b43414b79e6cd047dbd61902cbe54cb34af13d75bdccd70bdbafcaca155b4ccb426d8b831bd4df46e9a57e3a2
 DIST libpqxx-7.3.0.tar.gz 694012 BLAKE2B 35770599fcb3131081e08c18d96b753cc6d412c6ea8fddf5617df7da2035cf8ee3a031b7c14d592e0c9560e1e1074e633734337113ed0b3943e519aa44806307 SHA512 897af8e1c0ab12df745116e5387d3c31fb8800b6c599f49413ddcc67df7968fb1922c96896c818ce3f34d9649fb6c1d2ea59784f8765fb765481b156be44eaa2
 EBUILD libpqxx-7.1.2.ebuild 2024 BLAKE2B 621549d79c7cc9da9dac463fa6be48af6a1d687ddc8368d0fa67fba5c2978a9cd036db4927cac5c64545020333b07c79206e1ff382fa43b7f7da890f0fcdac00 SHA512 15a9a65617d82b0e6d146eb0497ff669ed8d11bf86b5aa688f186ca93dd0d5cd6c734f99d3e786865dd71f8cf614b7908c87d21af0bfd978103a5dfe2e9aa2d7
-EBUILD libpqxx-7.2.1.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351
+EBUILD libpqxx-7.2.1.ebuild 2026 BLAKE2B fc93c73078cc3c7854910f4b323f7b044422dfcf2a12ffe75012d2a4dd207297ee4de4e08aefe9bc6f58c30ec85abbdd92972d47a9527ac90e7044d56eab9a3b SHA512 3f3aa006dadebe3722959ae768dc5ab2c06f70ef4e55a376a9233de8e897be7867713a877008b46457d72d835235876044215193ea5fe3f15d9767de8dbeb37f
 EBUILD libpqxx-7.3.0.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-7.2.1.ebuild b/dev-libs/libpqxx/libpqxx-7.2.1.ebuild
index 1ce7f1510f3c..a03988420215 100644
--- a/dev-libs/libpqxx/libpqxx-7.2.1.ebuild
+++ b/dev-libs/libpqxx/libpqxx-7.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit python-any-r1
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 23824b51ae34..2e528c34d0b1 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -3,12 +3,8 @@ AUX libprelude-5.1.0-fix_awk_error.patch 3243 BLAKE2B 2be6fe51c2edfd85b851f7080c
 AUX libprelude-5.1.0-fix_gtkdoc_1.32.patch 416 BLAKE2B 9717541a0d57a0fb97a7f4f2b9d466d65f8091e96707cb7a20e61ce3aef925d44b93a71f03d90c074592e0bf91a133c7a2b87996ceabb10810a3795a595d874c SHA512 1b35a8b5af4701c51e3d9a20eaf501cf81f429b2f2f16c0d8fecefa51a3438b35cf237db3c4696c56e53a2a87b0663a08a73d72edac207ae04b067ef2c4dc6fe
 AUX libprelude-5.1.0-fix_py38.patch 322 BLAKE2B 0dd047f4a6c634b4f4f7c01aad619634228898a951c2ea629c07a5df087f8998df27f532ea9d893df2b233ebb0dde094f1acd6c5bb7b95a6688fdcb5e805c449 SHA512 b35c74578a2e00358a7da8f7301f9c4d1055e53c99bea71cc3ef90020a93ff7d0d41f1cf6d3ea3a5c6fc18a3ca1bcc9ed0baafdd8110c1fa51db34e005a1c874
 AUX libprelude-5.2.0-luabindings_liblua.patch 611 BLAKE2B 8541a59228a9e8d0b35cc22ec2d26f3f01a91348fd7eb293f68c637b1ca176c86cfa28578d28b8c290f76bf8b4adba2ff5f7da7a8fd16ee4b846730c4cd04b56 SHA512 1a45fc0fb71850769e0b23c0b1ce8eae0912bdb3398baaef91b631b622fbd7166a11cc1f501d8dfa063b8dc5230c41b3e521b57792d8c865b94d9a6efea2c995
-DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
-DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
 DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
 DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
-EBUILD libprelude-4.0.0.ebuild 1723 BLAKE2B 83c34a0ae5a6223ee01fa76551b11c38cc77b48734a1cdd491e0593d94a690916804b36334606040c1f5aedea99074cee8a1273b4a03d5a767ebb55ee5f6e207 SHA512 1807a5c6905f69d40d3b309a43993c0214bc5c8cb22a212933288fb18463c528a2b7f4bf515eb3f7d4283114f23ed0c7ac504dbdde064ed74f93ab7ed39bb0b9
-EBUILD libprelude-4.1.0.ebuild 1724 BLAKE2B b5e68d2e461b569adc28ed64572c895c6f0b87ab8b8fd3aef014d980b6e4335cff56b2cd84e3e68e2e285b086fb00ee67f967745da62cbc9cea3fd3d582435be SHA512 e06bc4ad530a1235d017893f067ceb6cdfc282cdb4aad1398a66c3579d727699566322e7479f58a6eb2b4c338c4d0a13c5df6b69152d7cdb4af8a047ee1c38a6
 EBUILD libprelude-5.1.1.ebuild 2008 BLAKE2B 98c88b500c970efc07c29de27b6dae8011860f915cd3121613c751548078d34961681e9d6252f9646f952d34744770661cf856520291b7d3233e84f3c51e36b5 SHA512 0946b61534ed9da3a16ae6f972f581f02188a9ba64763fc81fae7ad237fea1b5c79371f200b6a83eba50ea3737d227939cfe296f5b6276e522a7deb49cd757e2
 EBUILD libprelude-5.2.0-r10.ebuild 2064 BLAKE2B 296f12c0d9d66f15bd9861cd5cf8479a42c353deeed7e08d797c3b07b47691bf2b59fed720ae68325be69efd89bfa850544e67cf501f08b3b401ac12ecd08951 SHA512 e08374052c20ad7a8bc5fb996c6a5bce4cb581c91c55213dc4ae1d038aac939cfc113fd4ed16385f05979689a85f8af287da647ea457d0a8621632fd51f67d6e
 EBUILD libprelude-5.2.0.ebuild 1951 BLAKE2B e522b51c691b1d0f85750b4d2affadd7a4d4a5a2d28b7fc54f83dc89330e03a7849592eaac2109668011608ef2a0b1e39a253cfa5b4c25b07b22ef50abac226f SHA512 68bb5a3a20f1f36c812640e6096a862e45501a2f0f12f5337f36610e922273a0511264e5b69ca798c0ea53e42dd1bee6e84885d2ddeeaa3c2248617f0250f691
diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild
deleted file mode 100644
index 9e81d89702cb..000000000000
--- a/dev-libs/libprelude/libprelude-4.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24 ruby25"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua perl python ruby"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.7
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-python-bindings.patch"
-)
-
-src_prepare() {
-	default
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		$(use_with lua)
-		$(use_with perl)
-		$(usex perl '--with-perl-installdirs=vendor' '')
-		$(use_with ruby)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild
deleted file mode 100644
index 89be5ea06931..000000000000
--- a/dev-libs/libprelude/libprelude-4.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Prelude-SIEM Framework Library"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua perl python ruby"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="net-libs/gnutls:=
-	lua? ( dev-lang/lua:0= )
-	perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.11
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-)
-
-src_prepare() {
-	default
-
-	# Avoid null runpaths in Perl bindings.
-	sed -e 's/ LD_RUN_PATH=""//' -i "${S}/bindings/Makefile.am" || die "sed failed"
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		$(use_with lua)
-		$(use_with perl)
-		$(usex perl '--with-perl-installdirs=vendor' '')
-		$(use_with ruby)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index b115fc98ddf3..fe4abe300c39 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -1,13 +1,9 @@
 AUX libpreludedb-4.0.0-fix-python-bindings.patch 1075 BLAKE2B 414a9308a10b2c0aeeb12b462c8a972341161c308bfce2ab9c94d25a63dc14f01f2ed3484f690b994e8f509262f99406e19c25ec9a70ee5eeaca3b7c5823c055 SHA512 61309ae2d68aeeca5321fb2592f7d01e57b00b10ed04e63d1c011aa96115855087abd0fb4687f09d04b01b488dda840bef08cc9c1d0ec714064c1322f9589a2e
 AUX libpreludedb-5.1.0-fix_gtkdoc_1.32.patch 431 BLAKE2B 243bda8c42be083a0c5d38bf8a9f6c5553b4801b527212e38b8b3f81096656d6ef1592f9b86c3ed39b5767addfde71bc796c90e90fc046b4759fc092fd02c491 SHA512 afd38dfdec1f946946ad3f7ca17f5e5c7a0c16bd4a296b639132ec801cccce23594c047b7936bbcb85c28dd9ca9eef7a302b92c3bb4aa71305b33ae0fb700688
 AUX libpreludedb-5.1.0-fix_py38.patch 326 BLAKE2B 1d568b80b66dd919d990233fdb2602a5de9f68055524c0b20adad82c6b0844bcb9a62af55d4ae538b8e3fb63f3d56c7948e164cec21f5eb9a0e135897a666709 SHA512 7068f2aed2eb79186dc3eb77845fb828d3b6e5d7ae8bc809352c83f0e19d342b77459d495cd568d022df34299c43082fa23b7e49754a17207d63b3a2326ca301
-DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca
-DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4
 DIST libpreludedb-5.1.0-update_m4_postgresql.patch 20562 BLAKE2B 5db9a213c47296b308a641942e41c82eb9642dc7817ac1134ac52c8f24e38b68e0dacc5adedc30ba0611e84c97bb51f444b75b2b98884c0f21312da58f40b6d8 SHA512 24881cfe0e471e934fc9b1bd64dd901303f68615e1700ce92d6bc7324b28587aef8cc05be9cc7c2545f86666064607d8113c5273381bf9306ef69f569ab9d1bf
 DIST libpreludedb-5.1.0.tar.gz 1374511 BLAKE2B 569324a5ae484b1d13ac729f25a2f7f8924a8dced923859cdc393289acf0c0cf098ae6e0f9f572a707c85aa9af4a27bbaa0927e20d610b423e2aae86718d232b SHA512 9e45e0f7a945eef254f8e59c0c7212c6afca897584ea8f2c88e16478fde448abdeeb991828cc2482373d2c735e1229f1a11fe9780e40da1a8aed867fe158f481
 DIST libpreludedb-5.2.0.tar.gz 1372810 BLAKE2B 5a6bed23eba77591b8e97bb3c6f2b321970c94f88fb86094146a1a3fa64cc0f0c97ca1d1488b2202ab7042207ca2ca4f74029415ef1ca6ea13c84d158a23473f SHA512 357e3ce69927ed405bc757774466631d34cad9b53031be6ce456238dd8aef3781471ecbb36ab4a3131468f4686a635095aaf837d23a0efc9db758322298e7744
-EBUILD libpreludedb-4.0.0-r1.ebuild 1617 BLAKE2B c628a418f913705392514b549157ffb7b26e3386d7344ff60b1f6118f3d12126b771de65fbac3a77fda0eaef465a63bc2efd83975ff68e5fff6c34353e4b8904 SHA512 fa971d8b86862e3f584cff7aac1a421896fc49723b2289b0610bdffadc04a372a7d61a9dd2c2424c386a821eaa884d6941c13028f0a5d5c172aa62146419745d
-EBUILD libpreludedb-4.1.0-r1.ebuild 1625 BLAKE2B c56a5c27a6eed2be65c14d9c634679efe5b9d171cb1e89b814ff1edb7e1ae88113a1ec81424c7cc747b6367d9e4cd3821f017a42c25dad26503574f1b00283f6 SHA512 b5631bc895aec95f79e54c1cee2c90f0be8cf346e0c54b2ee2b41f0f18373c1779a8b29890d110da6274b36ac8d721dd619e84500df0815da5d3a81715dc90c3
 EBUILD libpreludedb-5.1.0.ebuild 1879 BLAKE2B 68870886dbf2cefbca7697f2c565d6d1d66fd7a8fc96101afd6049880063a7768eed4fbf6660f1ab528e02bf1c8735641564f794c4ffd01bf28751c5cf306e54 SHA512 6d9dc4b0d65182ebe251a65949cdab613bd9508e024840327bbabf2113a7afeb8bdb584abbf2e37cbcb7af194d041e824994e3f66d672745d2747f32bb83381a
 EBUILD libpreludedb-5.2.0.ebuild 1876 BLAKE2B f5dbadce7ad720bc40f76175a5eb52899be785d0bbdf810b17add326ab1ca65c63e30012533dc46e7fab0e7e38c8de0a4db86dfe7f6ff2c1b49a6c1e8107606e SHA512 1e1d95e94c31ce6bd48749f1f63a57122d91a1398d7e72b2aae1287137b8afebd07cd746303e2503e428c1ef6edc4ec539a5af5f0d1c6691046a16c0b019f5fe
 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
deleted file mode 100644
index bf8921fc1f25..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres python sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="~dev-libs/libprelude-${PV}
-	net-libs/gnutls:=
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.7
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-python-bindings.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		$(use_with mysql)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
deleted file mode 100644
index 2cc2fe00385c..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres python sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="~dev-libs/libprelude-${PV}
-	net-libs/gnutls:=
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.11
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		--without-python2
-		$(use_with mysql)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-	)
-
-	if use python; then
-		python_setup
-		myconf+=( --with-python3="${EPYTHON}" )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 4cbc42cc8e39..f9c6fc038447 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 831 BLAKE2B 5b018580287da0d3b4fe344db128fa982de6dd7af8375bc97906099f6fc4be746b5e0fa03558514433cafced92b2ea19c98a07116055e64ee97f41f08e1287cf SHA512 37eb66f2e164610a739aab8c7d1d8ac1cad722ef7d7292e04c277e479b6000943e3dba3120adbce89d9964074bdbbdbbfd45741fee1ed7f6a5ea81845558a972
+EBUILD libpthread-stubs-0.4-r1.ebuild 823 BLAKE2B a9f8695eff8fbf1f600fc8188baff2f44a7c585dd4452bd7d653d6d542377ab61a05843877143f69e06d6a499b6ac4b7fb17e90fbe51d31435c7c18ecfbb40d5 SHA512 b2222c69d76857b97fbc8f4f328a536abd7d1e360b400f6b956c2d9d33f7d0907c183f578868e8d4387a91372b1f9e03782e9d1953c510bb2d09761e567147c9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 5857572bd62d..5214fe03a0dd 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 71e77812e30f..fb2510b51b2c 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -2,7 +2,7 @@ DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee498
 DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262
 DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b1cedd09c40e65063d65208b50bb95aa5f00ce3c050d4203b4720b2ce63a9f1d6eee7100fdf85c50e7a15457a52010 SHA512 6a796c58aef9d91fe85f3815ee523a0dcafad59f33c83e5c20c62d4e4337c21c2d223dd0d6a88f37cf86d14a8e55facfa87c651990e08d9522f7cf78b0d17446
 DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9
-EBUILD librdkafka-1.4.4.ebuild 1652 BLAKE2B d6b1f200c1beb20fafd794334ec4412dd962c818cc4d1ff340324ee804ab4edcf6654aecb95849555221d1795ac273ec90d3b10e9a48b37bda19f050a5f1c2f8 SHA512 5bdec28dbb294c2f5ea1f1b44de3ada493d3a1ef688362f9c0de377bfbae1db7b34e0357baf416f6585e2e50cd6c29b2efdaf39c3d400ec9d93cd5b9d5c38559
+EBUILD librdkafka-1.4.4.ebuild 1653 BLAKE2B 2f0a5d2b1df78f090be40b06b8213483729e7d74c44a942b43e0134c27b3d467bc89530ffb87ee47c88094ff14f7a117475e8e6998ac0a3d04f63519624fed56 SHA512 750ca1610433a16dc37b65a07461250b93a3865ba6138f37c9b4c552d9796398d7285be8671dd121f7f41921c6f5789fda61e232a6fe246f2799005bc80a45c3
 EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
 EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
 EBUILD librdkafka-1.5.3.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
diff --git a/dev-libs/librdkafka/librdkafka-1.4.4.ebuild b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild
index 719b22ab5511..141ec0f49725 100644
--- a/dev-libs/librdkafka/librdkafka-1.4.4.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.4.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 3d8c4deddf13..9f54494423bd 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -2,7 +2,7 @@ AUX librelp-1.7.0-missing-files.patch 10718 BLAKE2B 83c4621bbb5e896464d0ec3f8c2c
 DIST librelp-1.7.0.tar.gz 532967 BLAKE2B 19e3eaa05aa7a53b4701eaf96b3be6d8467c7f5c0de0bc1ba81fcb6d6ed6529146140a32b05fcdb47330be2b573a9d84779ea519dd9cacf50d3b7710d523b808 SHA512 e9d71f27d5c50b043254a3f1b0643e7172e5678b6a5a7dddb9d4a9e3afa3ed0adf818a4e868960c1607da5f63430f163f9e76c882ed5460149cb1cceff42b4bd
 DIST librelp-1.8.0.tar.gz 539467 BLAKE2B 3d1d396059955d2b83a21a42838b56c6a18cde296e6b7c4beb79ba9a8d222d7e5d738419b87b24ed05da553cb16fd827e8820c4c81c50d5a3770ad745efe3ef5 SHA512 aa3e02010cdd4587ff28987f00291708e752b2e2f5f37f5a5239bda6992f55cf428cf1b6e06847062be31844cfdda6b654bcbb9024dff943d140b405ec93c0f4
 DIST librelp-1.9.0.tar.gz 540477 BLAKE2B b42e35e2f3e310cc4a978a6d2f0a127317414d93d87bede5e1bbe69e3031482b4d895bba2256668d383911e2ef55cc3086a44d8bebb15ea56c6ebd28e64e545b SHA512 3cb8cf2707cff662bd0b9100c737458b6b96820db7e362094c77cdb50455fcb944d7760921e0b758a3a6cd15d685f488a976fe909de034c289635c660caae723
-EBUILD librelp-1.7.0.ebuild 1463 BLAKE2B de9402cd394cf7145ddc3c5717ed2db22e353b5777ac02ee180775a3af635b81934a495d98a834b68165f5015c2f934c492d741fcad981d190e24f0051b54a29 SHA512 c2f623dab29b0d4032b8f0cfa4456b565a4d5f99266f926da16c93c2b2212f616640fad68fcc3f8a748e97e7af49c7926b1e4bc24bef2367a53cdbcc89ea7717
+EBUILD librelp-1.7.0.ebuild 1464 BLAKE2B e0afc040ba39bf541e0eaa702d8ec5fc86342dbd3bd763527ff2a77ec3a0f857d83a37c133f19e7f9b6cab4957bae5c86dd297c414edb9889bfcead7f66d864f SHA512 0b878bd6ddc0e79cbac1ec3bd03aa0f60dc8aaa406f6d2ffa80b0c9dfd9026f66d5a0d4f57b919993e395b764173872885ccd89c453302fab20cfeb71bdc22ab
 EBUILD librelp-1.8.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
 EBUILD librelp-1.9.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/librelp-1.7.0.ebuild b/dev-libs/librelp/librelp-1.7.0.ebuild
index d8057cf1adfe..a67ed3f6e945 100644
--- a/dev-libs/librelp/librelp-1.7.0.ebuild
+++ b/dev-libs/librelp/librelp-1.7.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.0"
 
-KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 3ab70178edd9..ec821e2ea863 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -15,7 +15,7 @@ EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b0
 EBUILD libressl-3.0.2.ebuild 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
 EBUILD libressl-3.1.3.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
 EBUILD libressl-3.1.4.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
-EBUILD libressl-3.1.5.ebuild 1701 BLAKE2B 3d426584f6c2b41d75e3f280d7afcc051ced97438a2c75cb9bb18c201a6873c6eec6c28b7c7d7344359f581206bcb8862c30d147373f76afb57eb79ce6b56b74 SHA512 d12f07c82be444b7059c17c7a4013b15a86537bbcc65fee23a61894f17d33c6ba554a38572b88f7437238f6c22d6330719a5476a5f573321cabad686562b07e9
+EBUILD libressl-3.1.5.ebuild 1697 BLAKE2B 3ba25c3976cd351c7551745d6713c484898930d3618a3530d649d39684eb2ef7713239cdd58c8ea1361a7d4e203fdfed71acab7d2ace5fd29723ada307d912cd SHA512 9a492cef92e90941c334522f494504018139fc88bfec721cda493cce9900a87b30bb50206c754535083927172d3038c63cf15199c044f8def76c94de6aa8eb2d
 EBUILD libressl-3.2.0.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 EBUILD libressl-3.2.1.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 EBUILD libressl-3.2.3.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
diff --git a/dev-libs/libressl/libressl-3.1.5.ebuild b/dev-libs/libressl/libressl-3.1.5.ebuild
index a925dfee996e..968f9b8418ad 100644
--- a/dev-libs/libressl/libressl-3.1.5.ebuild
+++ b/dev-libs/libressl/libressl-3.1.5.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either. However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/48"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
new file mode 100644
index 000000000000..904b2ba16a21
--- /dev/null
+++ b/dev-libs/libretls/Manifest
@@ -0,0 +1,3 @@
+DIST libretls-3.3.1.tar.gz 431233 BLAKE2B b935cae7bdd2e2338099dbc830e2773198d5d4ed12df80b89291d0eb8ae68549e36413c79ba1373d8bce8fd857c4a291fbd9bce30c819cc182bd5b68ac7b9527 SHA512 ddb4eb7c2c7e9cbb36ced17424ea0e08863488e6b3e18cd462ccc52b2eca685b5299f79ed6ba58ad4da2d742b61fa4857109a19137a1ee4c6cfdb48463080f4a
+EBUILD libretls-3.3.1-r1.ebuild 626 BLAKE2B c1b65f17b2f9c13d7aa755609935297d1528ce33589f4a8d57d36ecf42e02207b4ba1b4ce6e517dd7d6dd09edb8f86f00200310115690b773ece89439c52d43b SHA512 bdb9df87e5d330f0bf7caa4db936edc43204f5d78d67aba970c970bec68e2a05124d0db92573492ddc566bf228046ea33de9988d52e7e47f78e12ba32bd969fd
+MISC metadata.xml 360 BLAKE2B 5cc82f43a10ff14c4f5a8defdd77defdc89b74370d49775b3fa25226ff25303f3ad276a91f90f44bb1a58f4a29ea4936a9f3bf455c16190de039e407442bf596 SHA512 c250f62e9f43df69fda74d9a276f4ec7f314522ee3a7b32cee360339bebbf7c6bf63008b433e45fcc441d01d6a363f8447a38edca9243eede7e1b6146e7b3c70
diff --git a/dev-libs/libretls/libretls-3.3.1-r1.ebuild b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..a3cbd00751b2
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
+HOMEPAGE="https://git.causal.agency/libretls/about/"
+SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}
+	!dev-libs/libressl"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libclangformat-ide/metadata.xml b/dev-libs/libretls/metadata.xml
index 915f00227065..0dfdbe6bfb7b 100644
--- a/dev-libs/libclangformat-ide/metadata.xml
+++ b/dev-libs/libretls/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index 8735c4c20efe..cd332b006888 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
-EBUILD librevenge-0.0.4-r1.ebuild 1131 BLAKE2B 66b4dd921674a97e05cd57c1a3748b04c999be9094620ab3f97eec9127a03427ac03569e69e0452c98e1717e1cfb5dbe5e099c6bd0196d7cc27bae74b69a05ed SHA512 95d7723f6abdf48ecdf7173feac4627ee1efec515d05a2228c961075492e284193da0748315f5a9c0fb175e4e4a0c5d7713b7d0f82b38bb1fdd1d4b50ca9ee77
+EBUILD librevenge-0.0.4-r1.ebuild 1132 BLAKE2B 68a3a33fb35da3887c07b2add3cc5cf6e55318f076530540388cc101032ddf455cda1af9336c043b1d5a1cff2c367f208e7efa2bfda199c3a1382635a0eb3304 SHA512 6eae4014722af847914d570ddb236b020202dc2afa43da1716b246acad760bb1df8bf7949cfd302b0a015c859760dafa2cd91bc3d57a95fa3c56006150adbee2
 EBUILD librevenge-9999.ebuild 1188 BLAKE2B aa0340450c8789d5416155a9225a8b7b10d9322ef32946b36fe8433f69a7be02bc6d78126dab3917fd087b8a0eff80a6109fa94700b3d73b86b18b7bd88a2fd9 SHA512 46f2b70a4b88cb7da3791158f11ed2dd254e6cb2e8ac3545cd811a3b45af384d20c0f56e489b415a6eaef375e8613066bab77934f31a0595e8d7d40c7d765865
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
index 0081867a0c2e..8a05ee3828bd 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index b82fa7d8a375..bfaa9821a45a 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -2,7 +2,7 @@ AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edf
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
-EBUILD libsigc++-1.2.7.ebuild 1020 BLAKE2B 4a0e128fe3c38b560a9b0dfaae0c7082de216812457bbb2353c8fb41751e098cae3c49207899428f30a780aacdf40b9177a99ec193ae8bb45a6f396e919a8e6d SHA512 d1a6143530faa508319b099b2e862f9212fc9e091c83f5e23f400aff4249a674f6251aaeedf4876a8e3242905820f07e67d00521d852d71cf0707d0abbb45239
-EBUILD libsigc++-2.10.1.ebuild 1595 BLAKE2B 8476d67d22ba99a8c6b66a44ba841d2066a4ea6e1c5894cbea1e393f42e0fa03a29f72d0419f5f4db13f582cef1a5ea7ff2116ee62b8e7e9f587495da311895e SHA512 b797be5a64fefbc7438f838b4d6957f407ea1d8ecfbe9ce6e96679de449fe7ce6278f4ab90591810be082452c10deb0eea50780219a20ea46faf58e731be3fa8
+EBUILD libsigc++-1.2.7.ebuild 1021 BLAKE2B 2065eece99aaa2b32cdc436f1937e4094c6625aedab1edd462e407a1cf3c1f4468075728be277611ceedf872adf6ed92ccad1d23e6c17f9088a9657e6408ab3f SHA512 f5683c55d985c4240e948b933e7d758f25dca68a75e3db88b5e65d16dc1061dcce3251a3016318cbe6c0ce911973c03a1f951982a45e9f471b1ac79f324952c4
+EBUILD libsigc++-2.10.1.ebuild 1596 BLAKE2B e38f5a9fe49ac25f0d5b169c31a742961cf2f5cd096ae950a4f9aef13c1e0f8896b67fe38da650d8fea5ae78c3a5d0b414a0ad85f0711e8a239fa04868a407ca SHA512 ca2ac8b4258bebfaa727758ba92ded9393dba38a15e8b6ec9ac6fc927af4a993cf648f62ce762367cc4edd7d0b8dde265b3ee3575463e561f07bc76fa8ab237c
 EBUILD libsigc++-2.10.3.ebuild 1595 BLAKE2B 0a9b863d248c45eb5b008a20f56c145fbdf29ecdf8251b1a76dcfafa1ea9090f32a07087a63dea42c9a5a2e954dbd363e7f3b184559c7018a5108285a4da5f74 SHA512 50109e5c11b98facac6270047abd9cde1cab31bd89b024d9f4bbe482821ef3714c924e801391ed5ee7c69027e16ffbb619d0a808cdca983cc058ab5686724303
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
index 343cc0cc0674..25b6ed8ce022 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/m4"
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index ae83beb1b896..f9366ae1ce03 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 97201e24866e..c9f8ec6a3a80 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,7 +1,7 @@
 AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a538a7a2d9c04e777aa49bdff15db9439f4cf835a42f2c7cafe6d560ca4c957a0d57cdb00b3b3f68432ff8528ede15927874a62c6b64e027 SHA512 9bf6ff64bff1dd8550b97bbcabb7ccae24bae7af200dde7c296a237c4c149cb78e42bc7fcad3c76554ceb550ab39ce65134b53ad1e521dc6229f0141ab047cdf
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
-EBUILD libsigsegv-2.11.ebuild 781 BLAKE2B 9fcb5a39cbe8c4c0ff161613385f10e23021c4a087eb8b350030ebed213552054de62bf9b211d827f3bf0baa659cbdd5b8471d987ddbfd705072862b163b5d2d SHA512 38ab96136b00e68c20a28e775c0240d9a973ab1182d91f82a6d3bed1f845d240d05a102eab55ae9da286ccef8498f911f19de28bb25ceb4742be79723b0be845
-EBUILD libsigsegv-2.12-r1.ebuild 769 BLAKE2B 6dc56c2deeb15a2360cde52e7243f2f249affd9e758791cef356ad9d00304618456e1fb1d3e5dbe92ddbf6ac3208c4402e540e6282d187a3dd3249bdf10232a0 SHA512 fbf8714d687b72950578595ea40f72f625a483300ad97a2205a357a67a331170e11b8e840112276b065f316be6e861f093eab7b0e08676edeaa33d7f8bdda6fb
-EBUILD libsigsegv-2.12.ebuild 782 BLAKE2B 247481f0016e4f4ef75c64e5b6b901d9be2f527333c7c98c3edc686058818d86627294f35f084156858e932b1b13201b417c13ad84be5ad18267130359efaaa9 SHA512 ac83e4d6423da9e98b0d88416a6cceaabcd00e5799f54769e8e4980dc4b3e277c3adb8a4b89123d41748ed218d2c64935da5107ea1277553a408279ee4b5bc86
+EBUILD libsigsegv-2.11.ebuild 782 BLAKE2B 754a8ea3b315fa08ce9110575b6ad59dfe97839fe4ee1c6e5595d46d1f3cfcbfb9f8f809dfcff058e415da3934f42bd711d66fe5c6b97c3896ec43a9721df564 SHA512 4bff00e8c8079ec168a538991bd352346ebe261751ee75c7e4a0e4999f34e5eab0bb06e2cd142fbe9c5f805d484d698cbf846ab251285511e6c9b3d8631c9eb9
+EBUILD libsigsegv-2.12-r1.ebuild 770 BLAKE2B db0b0b9abe8b4f3d76cc87ae174f1795fb853eaeae3d9959bf41ea0f4c2b0b9d9997013a4748b9cb6f50a67e6545b5b1fb8fd49be10ff9d14d53329a926e6b67 SHA512 a8b811a6195b4bb7dde9e91261fa58fd8635dde77707c64fc95dd90fc02843960d3c133866057d53e510b6ea4f2a42ee982e88a3e6743d4813a99724579ad388
+EBUILD libsigsegv-2.12.ebuild 783 BLAKE2B 07eb8022f799264a44d6b707535adf3dd5e725e4f2b5f415eaa4c51d588376ce785e316d7cbd4c08273d89ed433d36e19c06b90479fe9f2785340da40aaeed97 SHA512 615485bdbcc7f520e345edcd7f10cd6af0bb40f24edbd154f3a9300c8e551ef37d201e67cf5e20875ab439ff2640efd0d3e2fcdf5e0eb1a8164471afd194e8f6
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
index fd9d21ceee54..3780a67e0757 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-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 ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index e026bced4a8b..2a79204ed13a 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-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 ~x86-solaris"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
index 2922cd738aeb..5f18e87d0604 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-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 ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 41b23ca40c47..1c39368fd1bc 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,4 +1,4 @@
 AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
 DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
-EBUILD libsodium-1.0.18.ebuild 1293 BLAKE2B 2d89dbca673bd4fd6e96ab0a6d3c0a593d1d1241b79eee192ed4e7fa9fe42198ffa11e6a084dd8123e2552bad7fd022b8473fd82e525cd4f1009fc7843d66d7a SHA512 ac3c70c9886ca828288d108bd977a30d77c434936eff09ff03019461328dae5142f410b10de7f04b060b3735735f474d223a3047fd0f801ca94b9c07bd10d37a
+EBUILD libsodium-1.0.18.ebuild 1294 BLAKE2B 5725d374a2a95123d1e33f54e5e8173875dfe9212f58a0dc5a37fe56d758e2de26085a5fa91a93147ffbd43f7ede886aa75f0c4058f6b7a3aaf63145c9b282ce SHA512 90f66f40a40b994efc7c0bca40a4d6b5238f733a0489821e1b8bbaf7f7c1fb3345f8c5479643fb09c50e8f9f7546892a090ca3bbd0a470ea3c720605aa887ae6
 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index 245ff4ea74a0..181638171400 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index 243fb4dbda8e..7c4a803b2104 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -2,5 +2,5 @@ AUX libstroke-0.5.1-autotools.patch 734 BLAKE2B 3590484c7a4b96b7faa09eb7e2267365
 AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5a34133b6a43d30f2e2862158e0756ea8ca8654ca6f450219c9222cc3612fefddf6170922f410a9c1119f48439acf5daff SHA512 bfe54a1c60c381e01820f46998c1ade66bcc5b816d20d8736334cd097f94fd06921c7ef17ae42e1f4f47090a7a9a6db2121a9960c140ad7dcb4d5ac3acf6fded
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
-EBUILD libstroke-0.5.1-r1.ebuild 740 BLAKE2B 378f3d67aafe339e3b8860a726ce744a51d617adfdf6c841d961b792c31fbf554bb3076b263374da91b359727b9f25d18a4a360c8040bea05d42be8efd283431 SHA512 f18e43d3fc667fe0920daadd33a6909087b9ffa1732ad806f456b8c0f75162854a5f9789450f94106607d30b82d744c903b0a74031a3f767e02791581cecf470
+EBUILD libstroke-0.5.1-r1.ebuild 741 BLAKE2B 13a400777d866642d5e15407324fed25f9fba69b698c4fd1639f2e878ce6bb862b5d2625f836cc651287d33114b134dcb84d954f2b887f76c53b03968d88a4dd SHA512 6e82b79427f8db3f8c7353e4a37ff6a924e2c097d72512729d64a97748349d0a048124e80a2dcef8bce59031612f169a653b8970ddb2b7f6f707edbef7772306
 MISC metadata.xml 261 BLAKE2B ed5cc49462c9e948e13f3455fbf209661aa04522f3753db7c674bca0528d7a384beefcbdfc5fcc0542dd08361d7953c06cbd19753bfe4dca2ff649ebc283bbd7 SHA512 318bd063baaa5dd560bcfdb87ab4d60edfb4dddf69884a84ef084a38399cf2ba84e69b432c816cce8e15d3dea253f395f41a1a654017a6eef30478ab8961cb51
diff --git a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
index cb4bde34cb74..de679ffa9ad4 100644
--- a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etla.net/libstroke/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 9d92179d21cf..4c220caa8847 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,8 +1,10 @@
 AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bdfd06cd5684c07fe2a8a466698109dd68c0626615d20636d230858e5a2868dd450b5fabcbb4482e6814a2b3d032bd89f8 SHA512 6a6321955805eb1b80a7dc6baa528a9594f2d37a640e4166839fa9db9d0e2113a64dd33f08682c03a1a840836c76a4e62e384c9cfdd798442ee024ff88c1d8e6
 DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a
+DIST libstrophe-0.10.1.tar.gz 520649 BLAKE2B aa5cf0c972d7ae8731752f351dc3c1d6d230b8a1411417a81126543dd47e79e324a8c258cbc4c2e608c748d62211dcde3802cb92bb3612c6a33bcd2209182a90 SHA512 1ee3cb76cdc76711b4928d69fb8add974ab8359b729ec12003d73530c93492f4e8d208cacbd50f8db7509bc01f56a9f945348bc3a6fdd18a7080b751fff8a783
 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d
 DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5
 EBUILD libstrophe-0.10.0.ebuild 1091 BLAKE2B 92e16fd9289e8273722995302d698793b8534750f4622b0cd603f4096133292bb2b7da6c99f1d5f27202349bbb74446f11f55db621eb8299f3da62e2806dafe1 SHA512 60c666e19088958b26149161ab4464b786659eaa2a219ab7b38be3f7eec73f97dc927f67ca6472726e79be0773391ee1f48844ad18db6658143688709eb50188
+EBUILD libstrophe-0.10.1.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
 EBUILD libstrophe-0.9.2.ebuild 1150 BLAKE2B 307a9eb08191ad50f3c9c43d6b9ba6ad1f4ea695a9ca904355218f359a50cd4cb49d41c170b058d9aa898a2e9a37a00fa6b561928d522ee437e35ce2a15e93cf SHA512 00c14fb2236618196b874fc16ecaa8c58e12996f702c76db46ebaa179fc0920a989c3492657e85c0e54f4369acde9e1a3731df08d048bedc30dc390892a939f6
 EBUILD libstrophe-0.9.3.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
 MISC metadata.xml 591 BLAKE2B 0706dfaeb6ebcf44525e7ecfe772c8496020da59ed5b3024775e41a79ec0ac5861d118e136d45187f819e70ac7e2bf360bf210d159167aeb1eccaa75747353fd SHA512 d05b0612eae08214749144fdca408ae9b630cd9763762fec74b46639d7faed460c2c4cc07e278453c637376e78aa50eafdf137a6143f7ded355358ffb292fd60
diff --git a/dev-libs/libstrophe/libstrophe-0.10.1.ebuild b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild
new file mode 100644
index 000000000000..5757ff621942
--- /dev/null
+++ b/dev-libs/libstrophe/libstrophe-0.10.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
+HOMEPAGE="http://strophe.im/libstrophe/"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="|| ( MIT GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc expat libressl"
+
+RDEPEND="
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	# shellcheck disable=SC2207
+	local myeconf=(
+		--enable-tls
+		$(use_with !expat libxml2)
+	)
+	econf "${myeconf[@]}"
+}
+src_compile() {
+	default
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( docs/html/* )
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r examples
+	find "${D}" -name '*.la' -o -name '*.a' -delete || die
+}
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libtimezonemap/Manifest b/dev-libs/libtimezonemap/Manifest
index 63eb4cbdfc00..13df211471d1 100644
--- a/dev-libs/libtimezonemap/Manifest
+++ b/dev-libs/libtimezonemap/Manifest
@@ -1,3 +1,3 @@
 DIST libtimezonemap_0.4.6.tar.gz 2872895 BLAKE2B ec9da9efe4f58cd7c3cd6cb502ffc23d1331f8b8352021d30c4157d4a6fec983702c049725af672136f332e450191e03bb0c36c752cbd496c37a7e0bf64c4514 SHA512 3cbd4f577684254a91f1e745ecb49e58fe3c75e28c172a6115fbe68e7868c33ff4c68b80ef1d7f5c759f67d288e29a2a057e00e1788a57c4e55e0cbfef351761
-EBUILD libtimezonemap-0.4.6.ebuild 645 BLAKE2B 4b832ceedbedd387acc7988ff02d9f039ccf437b17c5bfe4b184232e573932fb0d3c05d52befefcf3061fd41252586ded5dc946bfcfa4b53e0cd89f6fb7e44bc SHA512 3733132c9b5ef62cae0b0538be8f65fb385057994cb433602bea8d9d9787270546bcd3a94229558b435dcf7d90a386115919a087f9ad725ec6cacca72349f25a
+EBUILD libtimezonemap-0.4.6.ebuild 653 BLAKE2B e5228540f84301ff92ae51cc94636ef60176fb86f4ef9a0feff54f3d8dedbf360ff7d947791b2128a732cdbc90b1afe08cff460e561bf365c00aa52582362eea SHA512 76a5c72fe421bf3f56f43e37a27f6a6b802b0f388d8ed0a5b961d5245c7198b1d2df8d7e970de3488bed4171c67930c744fa0a4b8aeb51d6859f015425f4fc66
 MISC metadata.xml 453 BLAKE2B 0ddfa1215414fea50844dcf5a72a5de4af39eca0b275fb95cccef077ba2c3717f0fa94e77ab8afa30196cd9f8c668b06ca9d09b5ba0974507d6dfb5a740544b3 SHA512 b0cf55d87a8efc69b49ea0f172016de1d6d9ed3fa9b86fc3d9713a42d2a36b4886bb5973a352fe0ab4ddeec8637dfa61f85c536a367de0a38a5e164f025bce1f
diff --git a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
index 6f50ee3b5599..24f2ad972b79 100644
--- a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
+++ b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
@@ -7,12 +7,11 @@ inherit autotools xdg
 
 DESCRIPTION="GTK+3 timezone map widget"
 HOMEPAGE="https://launchpad.net/timezonemap"
-SRC_URI="mirror://ubuntu/pool/main/libt/${PN}/${PN}_${PV}.tar.gz"
-RESTRICT="mirror"
+SRC_URI="mirror://debian/pool/main/libt/${PN}/${PN}_${PV}.orig.tar.gz -> ${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 DEPEND="dev-libs/glib:2
 	dev-libs/gobject-introspection:0=
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 710feccb5335..17452da97885 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,3 +1,3 @@
 DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203
-EBUILD libtommath-1.2.0.ebuild 1584 BLAKE2B bd745a6e56474e1a331966ef3543158297306ec8fde22164aae322f17822529bb27423b523c1f4ee18eb6bde22b33c4399e888e12e56e39996294fe2dbb88c10 SHA512 89d58d2435522a5e240ed3942da793723c77733f90edce7045c12c9b7bd47d6dc275567d6a062b8f01f2f6e895de09709a4e48f820469a3d4d610aef36c39dbf
+EBUILD libtommath-1.2.0.ebuild 1585 BLAKE2B f123da425bb36308e34464716ca257e797068ec23828b72f9fedb4ea6c39dd7fffb935ea6e73cc2011926f2da0554a7502252a9184e0f10156fc29f5615fd71c SHA512 0c4b2213c2c50a3a798566911300974934f8af8ca3fe74a3fc54a6d74c4407a675d37f8be775d1b00cfc67e9e13ebf958f76bb5afc14da7fe69a203dae1302bd
 MISC metadata.xml 3301 BLAKE2B c9999812b8504393673c8890cfcca6436eead1a2ce16d67000f2f0d2ebed6c993e654c720205ffc205ec248a9df1ef38c3a6c7389157fcef28eb407de94239ce SHA512 8f4beb6e7745581094557241bf74a7fd90d32e0091a6da59647887127daf99ec3dab6987811fac2863914504989549dd8d3bc79d88af7f1008c18e3eb9a5e03f
diff --git a/dev-libs/libtommath/libtommath-1.2.0.ebuild b/dev-libs/libtommath/libtommath-1.2.0.ebuild
index e8d9134439eb..63c4f21009ca 100644
--- a/dev-libs/libtommath/libtommath-1.2.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 162d61e5eca8..1b15c12de841 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,5 +1,5 @@
 DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
 EBUILD libucl-0.8.1-r1.ebuild 1243 BLAKE2B 3a846ca9e36f8569185d9a92e2832b3569cc19f67aa5f4aeeed721c05e18c8a156759e778a81fe8d810364f1a1e77963d6896133d4a3c2cdf2e8f548d68267cd SHA512 a0b9f074d9539f5274ad98acff55ceb14ed823e6f6ae7fd2aa07e26855044857348e0e78f282b5de0e5c29b858d2db9a257101219e2a57f96f0e81d9d09bf5b6
-EBUILD libucl-0.8.1-r100.ebuild 1448 BLAKE2B 7da82d9389bd40244080445583f291882d1e722bb089c9f97642afa76821c046bad7da5f40199a8234bd700e2278d51c6971ed31e72a0fc56789059490bab625 SHA512 0a38bdc4e3118288411b06e63a5ed221581d3c40dfec5da03c402bcb82132470d28e0deff58621455a7787ece53e4ebb4944df4c7de0ad9bd02739969c1e4cf9
-EBUILD libucl-9999.ebuild 1448 BLAKE2B 7da82d9389bd40244080445583f291882d1e722bb089c9f97642afa76821c046bad7da5f40199a8234bd700e2278d51c6971ed31e72a0fc56789059490bab625 SHA512 0a38bdc4e3118288411b06e63a5ed221581d3c40dfec5da03c402bcb82132470d28e0deff58621455a7787ece53e4ebb4944df4c7de0ad9bd02739969c1e4cf9
+EBUILD libucl-0.8.1-r100.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659
+EBUILD libucl-9999.ebuild 1489 BLAKE2B 5bd2911235afbca80b88695bac836b3141f3ecd7e27836a95612205ae7306d67db9223c12113481e321e8011731228e13073f331e5c4272c9ae09cd614d1f40b SHA512 4413d6a89e7b40cb5e2ae7d0a6f9bb295f98cbb9e27b5df234ac54b4ba14727c4b21f83de092a730cc58da3d9c8c8c328b4eb990f7ecd75c8f7e5957cc0e8659
 MISC metadata.xml 955 BLAKE2B 9bcc770371005f7b55c644a987e100572fc6c044ca38a862c817c1fd135864f1ffeb38b3a053a66bb1819ef0dd38f3a27432152779349f7b2af9528448ecfada SHA512 7742b29ef3cd909660e795a35859924f449dc18000ebdfc414e7620b9bf900112dde4ea053648b9490f45a56972a357c5a9645afcdc04211cfb4c3354fd1b8df
diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
index 66e66cd2dc80..d576b86cdf0e 100644
--- a/dev-libs/libucl/libucl-0.8.1-r100.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-	lua_setup
+	use lua && lua_setup
 
 	local myeconfargs=(
 		"$(use_enable lua)"
@@ -50,6 +50,8 @@ src_configure() {
 		"$(use_enable sign signatures)"
 		"$(use_enable urls)"
 		"$(use_enable utils)"
+	)
+	use lua && myeconfargs+=(
 		LUA_INCLUDE="$(lua_get_CFLAGS)"
 		LIB_LIBS="$(lua_get_LIBS)"
 	)
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index 66e66cd2dc80..d576b86cdf0e 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-	lua_setup
+	use lua && lua_setup
 
 	local myeconfargs=(
 		"$(use_enable lua)"
@@ -50,6 +50,8 @@ src_configure() {
 		"$(use_enable sign signatures)"
 		"$(use_enable urls)"
 		"$(use_enable utils)"
+	)
+	use lua && myeconfargs+=(
 		LUA_INCLUDE="$(lua_get_CFLAGS)"
 		LIB_LIBS="$(lua_get_LIBS)"
 	)
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 5aab0b42703a..f66db94c1b5f 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -4,7 +4,7 @@ DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0
 DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
 DIST libutf8proc-EastAsianWidth-12.1.0.xz 61760 BLAKE2B 2df2f75a9a2dd150044a5028d1863acab00ecce4511794d2e69259f3a06c20741beb1a6191cefa19e83f9511aafcf5b268d15e0b9db7c2342413dc91c4d3592c SHA512 ff5fc3ac705cf9f7a3aacc6bfd808bd4feab802c7098d8dadcefe6f6639ed82589ba67a37a3a93ff2605aa96009fefc470ce065c9cf84b47370fa17f9a16ea18
 DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 762 BLAKE2B ffce340873038469117109c93b891b742115b10f5cb6b3c4d5e6406c2d9116aa9fa2636c6aabb53d4490e31686c06d240720b8c6d1090ffca632095fca085a5f SHA512 9491e8c77d198d407cb93904f7ef210f176a848025157f46b6403b196910f9c09efea851a59780e493a122311a91ca8573365c05b913f05d60288e843d50a21b
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 763 BLAKE2B 099b8bc2f67ac32c5c4df88ac68c641b1fc51185b4e13df6c38ad32a4fc9fd23c850affcb64143d93bf6caa589a8d4aa7ee1ce0b77cd899a4b9ca4335369d75a SHA512 f26ef903568f966e6e28021f38376a3588d43f7103695d5b2c1eff1602e55a14954c0a4ebfa404e3e4fc3066c4ac69ce81e6aca81ff6e180174c22675f545f41
 EBUILD libutf8proc-2.4.0.ebuild 1761 BLAKE2B 1f8a7836edf339f2d96000272219aec6960544ce2d2065e38a06a2e4b8ec0ac7ddd05525ec3259a299049be4c937f710ebe9208f262769d8c0eb8dbe366f862b SHA512 6e1dd47063329a1cb4e8e6b2b23f3f1f6810eb6e0e362ac7f91d4475a035f2233c3c20ced21046e1ad3807f6384f7a03c6f57e0bdc28256b3948d9543cded30f
 EBUILD libutf8proc-2.5.0.ebuild 1311 BLAKE2B e5ca29fb70142e745db0b3eb5230a1e737566e975349e86ca93735a7e54ff4d9edf233008aa40597801fe1fef4075dbb81022f3ccc3d23864ac8056860a2799a SHA512 c38ae48a2208092665de10674300580027b3a75d4fef0c8982e0efa8737ace823787ccd4ba73fdd6c1b0c3d0feb41b81ec0572ffc0921d1f4ad43bc6d0cd10c3
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index 6b9420aefe1f..79c37a8b69eb 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index 48276095c3f4..de03e7748a1e 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -1,11 +1,3 @@
-AUX libverto-Wflags.patch 800 BLAKE2B c933153042d1d66dd41e4cd307a6e1c6ac96c77d147e0574b35e75dfab5e42278e73177648e49524ce22b3da3829b92a69cb79d8349eeb883780da086de41c04 SHA512 c8e05cfdf7537624b844731e3bf595765641745ce18d88ac4e1cceb80f6ae6bb1a97480bdac50f7d222b334e7226a495c5bbe33d6d537dc8d79ca825fd90fb52
-AUX libverto-libev-c89.patch 392 BLAKE2B 265d2d37db847cfbd495d26ea7ce93e7fa244960c99f4758a7b6a6c7d315b84788def5a0254a80f0ece1b2ca08b188da8e215d2bdaa672796aa98740c1051ab1 SHA512 a9e1cf3206f350ecb7acd1b77417d2cea387396ac7dd68e30fd3b0ad097a677bee4d6735e8fb9abe95ed2758206e226bb85e002a5a9974865b87f8b01d59b619
-AUX libverto-load.patch 2058 BLAKE2B b0a5fc276fe34cca97b6622f74ce22b56faf4f0a88cf5fbd0d47360a660e0a29927d17dbfe47afbd0c72404843f3847466f199e0d865de4f3856f3fb133878c8 SHA512 caa4d4d3be591e9e025f7a75e1cb20190469888c35563b332244a7c6a0191147888a19415ca3fe33171336e4b7361c3dc75d62e1c60380892452c13c0e1b8490
-AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21ab777ab58da2098132118bfad24701b0bc1dd47233ebd247836be9812e9572732fd666a08ea70fd0cd4992845492af SHA512 83cd538542af376f3875e00cd5732d779b4b0aab920d0d63ead89ffe47c513ee4e55651c8c9e18adb95118b67ba964a7e401b3691992a5c012202962fb3b7abe
-DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
-DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
 DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740
-EBUILD libverto-0.2.5-r1.ebuild 1506 BLAKE2B 5849f6a5689d62b5d5e7e29bdcb3e012332996ab6c48f89ea91d36000dbb12bfa38c8fcff00bd1db6dbb745a36edf4c348c23b717d2308fe425b0d6b31601db3 SHA512 78cf8dfbb97b286b1bd71b8918346b0b513021979dfc0043dde5ef62aa7d747f48c2f8f54f9f86c8c2195ede84bd3d36018e823ad9c02a685d4eb42ed97fce29
-EBUILD libverto-0.3.0.ebuild 1728 BLAKE2B 0d62b343c892c3585949dd7bc2d5f5f1fe6d3c2007eaa68ef7ac3347bfe6a6a07cc71baa671ec79769b0daed0c736a46bab8e022b12f96390180c0227ae2bc0a SHA512 dfeb4d5922be73a243070242a6bb75c2e111fa1f29989b4a191354bc82eafef8433764c7da34daa291fed0c6374952cb324a52143ecb35e1b8d8c074d3275ed9
-EBUILD libverto-0.3.1.ebuild 1445 BLAKE2B 100f9ecf28b2b01b0803780e5004d4c77d0038b690e6e369c7c250ca75cb0f33da1ed7b8a4ed4d39b41202b4de0fdfae3da3d233dd7c02dcef24a26a9de38b01 SHA512 bfc2a99e1c7de79917f050f89654fbaf3fdeaae623a0e4716e4cfe3f8a2da548a3df2c03eacd09f5c28e432e3a2eb3bc0cdd0cc2578783a25e3e1691678ad1f3
+EBUILD libverto-0.3.1.ebuild 1443 BLAKE2B cacdbf318729ba2892c90e7703feee3091124c8365697299ad82d67e7a4e1b4ee75ef353f61686fc1fc0b2481e6579bed76932451693b29cdd3abcb0662badf7 SHA512 029d81916ef31582cf7375f4bfe859d3e77ed93b34ed144eda2d9f1a1eeb81df42f2db00a9316f12cd1c8d75ccdc00a6049fae600694a7892876d9073083d606
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/files/libverto-Wflags.patch b/dev-libs/libverto/files/libverto-Wflags.patch
deleted file mode 100644
index de403720dd62..000000000000
--- a/dev-libs/libverto/files/libverto-Wflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f3935464e3a823539394dcb4669a6e7a889a95ef Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 31 Jan 2018 18:21:04 +0100
-Subject: [PATCH] Turn off -Wcast-function-type
-
-The glib event library forces all callbacks to the same type, even
-when they have different arities.  Turn off the gcc warning for this
-gross behavior.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4084965..dcab593 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
- 
- AC_PROG_CC_C99
- 
--for flag in -Wall -Wextra; do
-+for flag in -Wall -Wextra -Wno-cast-function-type; do
-   OLD_CFLAGS=$CFLAGS
-   CFLAGS="$CFLAGS $flag"
-   AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
diff --git a/dev-libs/libverto/files/libverto-libev-c89.patch b/dev-libs/libverto/files/libverto-libev-c89.patch
deleted file mode 100644
index e63c032b0c89..000000000000
--- a/dev-libs/libverto/files/libverto-libev-c89.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 09ee123..b7b5908 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-     [AC_USE_SYSTEM_EXTENSIONS],
-     [AC_GNU_SOURCE])
- 
--AC_PROG_CC_C89
--for flag in -std=c89 -Wall -Wextra; do
-+AC_PROG_CC_C99
-+for flag in -Wall -Wextra; do
-   AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
- done
- 
diff --git a/dev-libs/libverto/files/libverto-load.patch b/dev-libs/libverto/files/libverto-load.patch
deleted file mode 100644
index 94dceac5d69c..000000000000
--- a/dev-libs/libverto/files/libverto-load.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 7989b3c6bdfdeb8770d17d8717b4a0cd48e79386 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 24 Oct 2018 16:57:11 -0400
-Subject: [PATCH] Fix rare leak of DSO in module_load
-
----
- src/module.c | 31 +++++++++++++++----------------
- 1 file changed, 15 insertions(+), 16 deletions(-)
-
-diff --git a/src/module.c b/src/module.c
-index 1f1b7c9..0b59034 100644
---- a/src/module.c
-+++ b/src/module.c
-@@ -182,7 +182,7 @@ module_load(const char *filename, const char *symbname,
-     intdll = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
- #endif /* WIN32 */
-     if (!intdll)
--        return dllerror();
-+        goto fail;
- 
-     /* Get the module symbol */
- #ifdef WIN32
-@@ -190,16 +190,12 @@ module_load(const char *filename, const char *symbname,
- #else /* WIN32 */
-     intsym = dlsym(intdll, symbname);
- #endif /* WIN32 */
--    if (!intsym) {
--        module_close(intdll);
--        return dllerror();
--    }
-+    if (!intsym)
-+        goto fail;
- 
-     /* Figure out whether or not to load this module */
--    if (!shouldload(intsym, misc, &interr)) {
--        module_close(intdll);
--        return interr;
--    }
-+    if (!shouldload(intsym, misc, &interr))
-+        goto fail;
- 
-     /* Re-open the module */
-     module_close(intdll);
-@@ -208,9 +204,8 @@ module_load(const char *filename, const char *symbname,
- #else  /* WIN32 */
-     intdll = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
- #endif /* WIN32 */
--    if (!intdll) {
--        return dllerror();
--    }
-+    if (!intdll)
-+        goto fail;
- 
-     /* Get the symbol again */
- #ifdef WIN32
-@@ -218,14 +213,18 @@ module_load(const char *filename, const char *symbname,
- #else /* WIN32 */
-     intsym = dlsym(intdll, symbname);
- #endif /* WIN32 */
--    if (!intsym) {
--        module_close(intdll);
--        return dllerror();
--    }
-+    if (!intsym)
-+        goto fail;
- 
-     if (dll)
-         *dll = intdll;
-     if (symb)
-         *symb = intsym;
-     return NULL;
-+
-+fail:
-+    if (!interr)
-+        interr = dllerror();
-+    module_close(intdll);
-+    return interr;
- }
diff --git a/dev-libs/libverto/files/libverto-verify-cflags.patch b/dev-libs/libverto/files/libverto-verify-cflags.patch
deleted file mode 100644
index dce747239dc7..000000000000
--- a/dev-libs/libverto/files/libverto-verify-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5bbe8b009d6daa809f679fd1d25c270abba468b4 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Wed, 31 Jan 2018 17:52:39 +0100
-Subject: [PATCH] Verify flags prior to adding them to CFLAGS, not after
-
----
- configure.ac | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b7b5908..4084965 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,8 +8,11 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-     [AC_GNU_SOURCE])
- 
- AC_PROG_CC_C99
-+
- for flag in -Wall -Wextra; do
--  AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
-+  OLD_CFLAGS=$CFLAGS
-+  CFLAGS="$CFLAGS $flag"
-+  AC_TRY_COMPILE(, [return 0;], [], [CFLAGS=$OLD_CFLAGS])
- done
- 
- AC_CANONICAL_SYSTEM
diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
deleted file mode 100644
index 12650e13dfb6..000000000000
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="Main event loop abstraction library"
-HOMEPAGE="https://github.com/latchset/libverto/"
-SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="glib +libev libevent tevent +threads static-libs"
-
-# file collisions
-DEPEND="!=app-crypt/mit-krb5-1.10.1-r0
-	!=app-crypt/mit-krb5-1.10.1-r1
-	!=app-crypt/mit-krb5-1.10.1-r2
-	glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] )
-	libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] )
-	tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( glib libev libevent tevent ) "
-
-src_prepare() {
-	# known problem uptream with tevent write test.  tevent does not fire a
-	# callback on error, but we explicitly test for this behaviour.  Do not run
-	# tevent tests for now.
-	sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with glib) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with tevent) \
-		$(use_with threads pthread) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog NEWS INSTALL README
-	use static-libs || prune_libtool_files --all
-}
diff --git a/dev-libs/libverto/libverto-0.3.0.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild
deleted file mode 100644
index 7786a2f773cc..000000000000
--- a/dev-libs/libverto/libverto-0.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Main event loop abstraction library"
-HOMEPAGE="https://github.com/latchset/libverto/"
-SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="glib +libev libevent tevent +threads static-libs"
-
-# file collisions
-DEPEND="!=app-crypt/mit-krb5-1.10.1-r0
-	!=app-crypt/mit-krb5-1.10.1-r1
-	!=app-crypt/mit-krb5-1.10.1-r2
-	glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] )
-	libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] )
-	tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( glib libev libevent tevent ) "
-
-PATCHES=( "${FILESDIR}/${PN}-libev-c89.patch" \
-	"${FILESDIR}/${PN}-verify-cflags.patch" \
-	"${FILESDIR}/${PN}-Wflags.patch" \
-	"${FILESDIR}/${PN}-load.patch" )
-
-DOCS=( AUTHORS ChangeLog NEWS INSTALL README )
-
-src_prepare() {
-	default
-	# known problem uptream with tevent write test.  tevent does not fire a
-	# callback on error, but we explicitly test for this behaviour.  Do not run
-	# tevent tests for now.
-	sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_with glib) \
-		$(use_with libev) \
-		$(use_with libevent) \
-		$(use_with tevent) \
-		$(use_with threads pthread) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1.ebuild
index ec855cec439d..8ea4ef46aa16 100644
--- a/dev-libs/libverto/libverto-0.3.1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="glib +libev libevent tevent +threads static-libs"
 
 DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index a660ebd3e2ec..adff40b04975 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -2,5 +2,7 @@ AUX libwacom-1.1-configurable_docs.patch 1281 BLAKE2B 33a4ed7776580f3146351e552f
 AUX libwacom-1.1-match-with-autotools.patch 854 BLAKE2B a89d65616346b943b4566c1619b6f1af45f6c9543e35f2722a114623480de7391a2cc3f99ee62ff214662ce61c3d0dfc48ff163173bd138cc433b94a43c73078 SHA512 abab5526cc4c9190bc8546d2c4c590d8af41d86a180ef87aaea8509c061837dfb81ba6fb9d34348c9ec63ebcb8736191549feb921b2f6702ffb2184a783b887c
 AUX libwacom-1.1-meson-add-private.patch 694 BLAKE2B 98330d479d1e24de0ad3f4c055be5c07a3581592cfcd3e8d122ff1157691e7847f18a11ec43ab8433ebaa8d2442688772e32fab2c063f74aa5d44d55ba2cded4 SHA512 32bb46c24145f06f3bcfa6e55322ba1ca2df859bd47f8d35725e9a361f9a74f0c0c1d6a221792dc9b20928cf82f393c74301dad159cb490ce14064f0c0e8c86b
 DIST libwacom-1.1.tar.bz2 502696 BLAKE2B 1c2e03b00eb3b17dea2d5cd3e61afa4b7f36dcb727f07bb1cc42631febc9d1939bdd2652d6fd1f0d020815cac1f937c1daddae3019ac9aa01659442cdc8b9054 SHA512 8b63d9bad18c27f8078711408a7b79c70086cd0c64fe692ee693d53d834dff8ab45631eabd206f0dfac80d8cc86c14b5833831b1b99b06e34aacd235176d266b
+DIST libwacom-1.7.tar.bz2 513320 BLAKE2B 36cead331b8d79fa629803441190de2c28e22c0e70822075d0ff31552f780e93d606ec2229a2fee744d9e6b91eb4879cb5a202075caf6adf1301b07502cefb7b SHA512 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066
 EBUILD libwacom-1.1.ebuild 1021 BLAKE2B 577fe004acb6e80e80dbb40f15ecd1d8d3cc0821c6b63286adb419679aa8ee91104ff62904125b5485848d6e1e4dcf14c519661026a318c8967b358b3f0aecdc SHA512 433e73ee88ee25a5fb70079bd3f8226819a805d5f16c48017dbfd164bfb7c3b7d448015ea3841e45c4adc1aecf8116f58763958d34de398843aff81bd4c6fc91
+EBUILD libwacom-1.7.ebuild 1368 BLAKE2B 26ad7167edb40eb97405cabfdd43766615e5d2085b13d7117ced28f83cdc05f09e7168390fe55d3b3b240ecdeaa7d98e02308142fe6abb5a0b5e65cf06879467 SHA512 ddef8cc3392f7210d4053b7f157eb979e0088f3357406c7b5c994ad7e223b7177a0e4dcd2d665be4c8a591733d3bb55ced00eff46f788453be33bc1bfe25bc62
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-1.7.ebuild b/dev-libs/libwacom/libwacom-1.7.ebuild
new file mode 100644
index 000000000000..0c54c6c491e4
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-1.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-any-r1 toolchain-funcs udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	tc-ld-disable-gold # bug https://github.com/linuxwacom/libwacom/issues/170
+
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 3d78ffcca306..0322e6d88bad 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -2,7 +2,7 @@ AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
 DIST libwapcaplet-0.4.2-src.tar.gz 31492 BLAKE2B 1c3b74a15fddf895ac63c15302737915fcbff89d83e990d779d2874778d00c3ec453a7bf0e362f942216c68a3e006c6318ace83164c49cafede73af1ae7a2808 SHA512 296a5f4471366b58089632c10943c0a1c1da8bd3b54231f2204b1159052b5bd5f45769fb2e12e438a29bf39aeea9719773d0b38fbf40fce193c2fb4f0f70ab09
 DIST libwapcaplet-0.4.3-src.tar.gz 31766 BLAKE2B 7a51b27911192b0697d6eebe9e98abf720a76daa0e0ce0eb6148186e21e36d3b1853d3b24c8fa325ecaa4ed69d8262a9282ef77ba028d316dd16a225a6766d64 SHA512 b4cc8b0dac86c87b1806acfcf5c4734955eb797cb04ea67f764bae32fdecfd3ee4d8ad0f2f3f0a1813c9684b7120dbb97ecf11f29de0d60a7bd45d96c1a451cb
-EBUILD libwapcaplet-0.4.1-r2.ebuild 801 BLAKE2B 1ef469d0b68d673ac0da023f6a5a70cc61aff43d17c7c7817ca51439ddb1c72ebd8ffae447352060626c2ef7df9405b8873331306bdf8390ffee17cddc2f5aa3 SHA512 04340ae18d8a0aeca656d17450614d52b867be13d1a07d0e3a2c96ea0ed3421fbdd7d3bc9c217d6ba76517a3a069102264fd2a041f5a1e156faa3ef5a2d76863
-EBUILD libwapcaplet-0.4.2-r1.ebuild 813 BLAKE2B 2a01407f8f0e41f694b78d286a0d4781c39c4651661dc2747f764fc8d92613878610f45031374ffe8f3c27658d3e892cf571e480de0f442ef573dc824f79d213 SHA512 68b123666f50cf309fe00ba5fdff3577868dba72413c71d63ad93f8ee9b087cc3c140ce1502e9d00529ebb5fea79574138afbaba849119dd38d44f77e2fbd571
-EBUILD libwapcaplet-0.4.3-r1.ebuild 813 BLAKE2B 2a01407f8f0e41f694b78d286a0d4781c39c4651661dc2747f764fc8d92613878610f45031374ffe8f3c27658d3e892cf571e480de0f442ef573dc824f79d213 SHA512 68b123666f50cf309fe00ba5fdff3577868dba72413c71d63ad93f8ee9b087cc3c140ce1502e9d00529ebb5fea79574138afbaba849119dd38d44f77e2fbd571
+EBUILD libwapcaplet-0.4.1-r2.ebuild 790 BLAKE2B 453612a1a3b03327fd590e56e5e5ceec3f9afeea26d0ba8e327f85fc86647f3a5a75980e1cce28fb1135bc3c4d89cd63908867abeb48badec38d8169ef8d7fee SHA512 64612fbb38426a4dfcf1e79f159c47a2c8cdb695ef15455272ef64b167b4080744f475ce8d9ca4e53377e5fadaeb71596b4276233e0c462f83dd82b242fa2a5d
+EBUILD libwapcaplet-0.4.2-r1.ebuild 802 BLAKE2B c9df38b6c3d96a78d9a63e701a65010393a429dbe80305b45d7165b4ae9ae5680bc4f928b82741cd2abf8682fea5f8d5d7f712bd1ef4d009051f1541a1c0ead1 SHA512 87a0226039479bde3b6c3049ce6d6d14ae8fc5021d8d32ab62e7706c8ba95ce7a9b3c9e62babbc378ee1a5b941df95dfe8a4c084c328d2b4cd49c40c2a33b009
+EBUILD libwapcaplet-0.4.3-r1.ebuild 802 BLAKE2B c9df38b6c3d96a78d9a63e701a65010393a429dbe80305b45d7165b4ae9ae5680bc4f928b82741cd2abf8682fea5f8d5d7f712bd1ef4d009051f1541a1c0ead1 SHA512 87a0226039479bde3b6c3049ce6d6d14ae8fc5021d8d32ab62e7706c8ba95ce7a9b3c9e62babbc378ee1a5b941df95dfe8a4c084c328d2b4cd49c40c2a33b009
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild
index d553e7e2201b..9744331eb3b4 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild
index cb74894bb4bd..4bfd12648e23 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
index cb74894bb4bd..4bfd12648e23 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index 0d884bd93fb1..108d123108af 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -1,4 +1,4 @@
 AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c0353bed955ca377e4fe1c84b02343e191945203db500722a0efe15a263885952a526eaa7121231054d27e4d86bb72c937f019d52f8c SHA512 265ded0f9fc7448021281eb48ed77977eb2f8f6275a18ba329dc9ad5a8c7e41585add4cb989af34e8f135a8545b1548763253204ab5905f78d90c9852546aa25
 DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
-EBUILD libxdg-basedir-1.2.0-r1.ebuild 932 BLAKE2B 4ddcf915507dacf3825fbacfb00a9382788b697428f96301ba9bd0a857407bce56b7a88fee9b8da7b7e09500c2b76d7a4e0fcb4ef1b6afb1e2b80f4ed0687c87 SHA512 3367b047997e09db8f30fce3e75af7d4f07cda36fe88190f5222b677fca4031d28284d42efba2a2733850ca51804330ebb91243c0ec2520e34036cc362c83b1f
+EBUILD libxdg-basedir-1.2.0-r1.ebuild 933 BLAKE2B dd058ba94ca0432d6fb3f15245bea89acec6d2ed600c524623e453716c4ab9e680246a193de0e3e6f303417eedc50f9104fa5eaa66a40b7cbe7e0b898f7bbe89 SHA512 78845dd0c336fc25521e43598055e856bbd878c86c8d7c50a987b18efc3dd895e78ea9c00dfeb3cebd4305c5713481053abc939e70cb017f38924f100822e227
 MISC metadata.xml 258 BLAKE2B fbb6080ca66a25c598b8dbd1366020c736e21b80c080dd1ab706a48379f2a5e9e1f1ca3dd6835a3c462f8465702b3277e5c30653e5def11a1bbe2f497d502b6f SHA512 2186459dac52b0c063cc8a6d83c1895a1dcb4d1cef3c5c0a50d2658ce8cd4140cdf50a28032a2add1f71ca6a03bfb80c9293c8c0af668623741f5b6f90b38f7e
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index f7055c8310b2..025e69060d40 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/devnev/libxdg-basedir/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 0a975328eade..f50499b81c92 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -8,5 +8,5 @@ DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r4.ebuild 6928 BLAKE2B e85035300d8e2e8b998542fc5e6466f48bc2fc6d74c78d5fa6f1b5f1abfe4fb2c7fbf80f889c9b6bad210e8b4a7562c754419e1e55de26843223f74ea594daff SHA512 145287d7dde68419fa4ef5d0daf190729050baf4bbdadf367d98d0afd1ca0177a13004f4727ac3b65bcb670f24651e4d75b511f5f979f9f9156d953f2f47e35f
+EBUILD libxml2-2.9.10-r4.ebuild 6908 BLAKE2B d716e0159193bb5b67a20874bf551b5c2fd37fa7660f8cdc903424cde854728f5194d57f46efc2213555aca8a19a64ba6284433160496be12035cc33769ed77e SHA512 76eaae73b0800a566d016e350bcab4c3476431cde773ea56a67c898c2c7f2fadf93bc3e90d791dd1e1827f48b9190f954aa6719fb7d03cae5333106d311f96b7
 MISC metadata.xml 457 BLAKE2B d83c1b1fbb559e371c443c5ddcbf68ad857290b583b1a3129e4c635fea981658614be234879f42111fa02704bab6477fda3bc474ea2831743720c4f368306489 SHA512 4d2640aa0935f0101a4bfee0ee3fef776cb163c9fc7535ed962619f4f319f93eb0fb168518f3e8d38742e9735c9c777292ce4d0e2b165e834bbb04fa3f07cd9a
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index 65f752d81b4a..bdedb335d721 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 4740a09360ad..bc7b59cb8162 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,3 +1,3 @@
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
-EBUILD libxslt-1.1.34-r1.ebuild 1565 BLAKE2B b8918be6938410d428245f337972801959edd442487ce335d4c57f9fbea27bb5e361b9e1e39f85385ab9d245f54062ba1dac1ecfb0cc20d84c67b4177bcba6d9 SHA512 21ed88bf6a0639304cdb33796a3c6df08725644ce563a146f670014a31cdf5210e113080e9c695a2615509befa590bfdea9c70f265fad8c1a9c6e31c627ab881
+EBUILD libxslt-1.1.34-r1.ebuild 1545 BLAKE2B c00930bc2080a406a4378a64a8330929b7c565c75e4a3fc74f434a27d04b12adc32b96b21bd077de6918672fca413347123bbfda4d5cdaf4947e852be5993f8b SHA512 e32fd9bdaa58f95262fcf812bb00963f8c605ecd6e211e1b9e5909abeed653397d74b1f21d6a0d1cb58dba27835541d8048e636609faed109559b6086f89fc7b
 MISC metadata.xml 457 BLAKE2B dea5177b6500449022319ee718e279c698edfbeff13027dbe4db1318126dd693560435a864245898d4f55cbdeb4d3f9605dfe94c1053b3b76dc96f5c80456709 SHA512 d03eecaadd8414b7d2bc73e7a0bb2f91317cc6647f584a8b94346d37ded1b37a32651f0e8c46d308861f18fef94641265b0058eb740c5bcb4f91eee6cf4c05e3
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index c7c189fff425..fc0d8e0d7726 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index 9857dc6fbf74..8c3557822fad 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,5 +1,5 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
 DIST libyaml-0.2.5.tar.gz 85055 BLAKE2B 71d1a002b8969db96af9e942bf67944acfdf2e740744b1abceacfd1c3bc54d8936d7048760aa81f1cf22518241e9f45ecf95c76d6ac41eefbdf04eb40e16a618 SHA512 a0f01e3fc616b65b18a4aa17692ee8ea1a84dc6387d1cf02ac7ef7ab7f46b9744c2aac0a047ff69d6c2da1d2a2d7b355c877da0db57e34d95cd4f37213ab6e7e
-EBUILD libyaml-0.2.2.ebuild 1029 BLAKE2B f14f2e827272f14ffeb16f7094851a68a0fe794452c759d042a8e0b3b0c6701ac17bc85b0a0a16f9637b57dce2d5748b6d044a8c764880145c749bfb259ed03e SHA512 7d483f399e28f03da3f4681b0a54d42f16a939be4c024caf77dc372e502a0cd3143b0f81f8ba5fcf7e10dd605ebef631f0e9163c1f9de1fe5644e824c492cd56
-EBUILD libyaml-0.2.5.ebuild 1038 BLAKE2B 5b18f8df90cacaa34689a80860981e8b02155aad8f5362838c99cc89fd271c8c5d5dbe4c97b513d36c06fc7e14dd7c4f9fca0a6c8bdcf1273ec4ce15443fcf24 SHA512 aa75bc8199194dfb9aa6ed2044c249650bd9fe2e8ebdcd0ee46b9f573289976e006dd5ccd7953337418e2ef563f1ea6fee736ba90b0266ad723864042bbcfc04
+EBUILD libyaml-0.2.2.ebuild 1002 BLAKE2B 765ac4c48b7664c75c53db18ca84b92c0a5a5a05f2d87e5cee121e399b5c8f10a1d150b6c5f4bcd5517387f5206a927d71b4afe547a5f13d0ba9f9826485e69c SHA512 fd04b5a476487e211a05f1ee2e5b4f2fad0681b147431bc4f356b948ee92f01fdef9bcf4a36c77c87762a70321cafe8cd7432c7965e1b0d21027930146830dc4
+EBUILD libyaml-0.2.5.ebuild 1011 BLAKE2B 914ad2464ce3c9cd8c0583a75911d20a5e452eb98a67c3b0ebfc6d7898bd14c5c7c59b2186651a3144c0d58cfbea980f45ecf531d737d77c0c04806e1dca10d2 SHA512 6e5a8220216b3061e1c4a528c02be3ee860da198919b7761d26e2d0940dafefcf4dd55eaa89f4973aac38cfce4e1927580399d9387ed7fbc4a6eace25609db4f
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index d98952acd461..08134358ac13 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -25,7 +25,7 @@ src_prepare() {
 		sed -i -e 's: tests::g' Makefile* || die
 	fi
 
-	elibtoolize  # for FreeMiNT
+	elibtoolize
 	eautoreconf
 }
 
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
index 91cf1a6a176e..d059951e2632 100644
--- a/dev-libs/libyaml/libyaml-0.2.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -25,7 +25,7 @@ src_prepare() {
 		sed -i -e 's: tests::g' Makefile* || die
 	fi
 
-	elibtoolize  # for FreeMiNT
+	elibtoolize
 	eautoreconf
 }
 
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index d5ff712c8cb4..db7b5d7ca501 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,5 @@
 DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
 DIST libzia-4.24.tar.gz 630318 BLAKE2B 83792c75e776b039788d46568a967690e10086b1f5daf3304a658721f1139bbed65b41a8fdcfe213757d342287696c383be7668be111896388b292086ca2cd0a SHA512 e7952822861d7702494309d70e9d7385c5dfa929b521387bc81883d4316a5fae96c5776b00f81da6dcbaa2965fdf30ac8a8a1b9963806d36454ebd6886ddcbd1
 EBUILD libzia-4.23.ebuild 963 BLAKE2B a2193135182336fdf555b83670eb02a97cc10aca94a4058b8cce044b3aafedc0c4126534ca3fc47ba5bfc3e5297def41c702de85a173ac1e678597ab4cd7a55d SHA512 68eddffdc4734b8e54f38e886f9bb8a510927210190c538f935f0da982b4ba850e4fa3234678804392c4ba21931d8f1dde5859aa1ef7817ea87c09573704a4d7
-EBUILD libzia-4.24.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
+EBUILD libzia-4.24.ebuild 965 BLAKE2B 8805cbc629207604f0c86ec56006c7da1ac1f1524f903cef9f6e847a259041fe638381cabde739183e2a033e131b14f3a299baf5b07657431d59f3b88b479bc5 SHA512 4942e7626e8a464d48642e6b313cfcb2368f9e081a8e4359cebee692333e6f2a2ef42f1e9d15e619a2c0a440e01787054bda2274174af82b8f347e082b77aaa0
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.24.ebuild b/dev-libs/libzia/libzia-4.24.ebuild
index 4977fe81e7dc..5b0fd3c5e716 100644
--- a/dev-libs/libzia/libzia-4.24.ebuild
+++ b/dev-libs/libzia/libzia-4.24.ebuild
@@ -17,7 +17,7 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	media-libs/libsdl
 	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
+	ftdi? ( dev-embedded/libftdi:1 )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index ad49dfe12f15..58739cc08776 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,4 +1,4 @@
 AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
-EBUILD libzip-1.7.3.ebuild 2411 BLAKE2B aba7f01e2cd8b8fbe4c0898c48dd16fc610ddf32b507320bc4af2a7a958ac4eb5cc74ae774c7195704b0451f4a9e0b3b579fa84b65c5d0a6da5eaffb0b565147 SHA512 db47ae37eb8de90e5a858a5d1cb3b45083604143bea55996a781aa6efb5e26360cc8107f86c552c1be0aee2463d4227df9a04b0f5f20cdb972bb533a8c82aa0d
+EBUILD libzip-1.7.3.ebuild 2412 BLAKE2B cdcca7705fa08996e782963be9ccb6f27aa5852354282d65f0d6bf5fd69e49086befee7fefc06fedffc02c6d9ed37c5b985b93977c7e5989e755522b0cb2f7db SHA512 b111c3219bdf999ef3ad2ea47fb0bf36af86c4e9a6c13045e59d9dffb64c7acb815a21c0734e2944b0edac048e6ce370cfe63c940fdd06e328d45c369fbe8695
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild
index b79772c27f86..9b1dc59f2688 100644
--- a/dev-libs/libzip/libzip-1.7.3.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 gnutls libressl lzma mbedtls ssl static-libs test tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index fbdfdb30047f..526a61910eea 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -2,5 +2,5 @@ AUX lockdev-1.0.3-add-autotools.patch 1344 BLAKE2B 7248172afeeb5b78ca5626d20604e
 AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac62d4e45c56865c2e7c8c8d896143afae2e767eac3fc878fc8281656db603cb9bbe5a7ae3dfe62a164b8023493cca0 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
-EBUILD lockdev-1.0.3.1.2-r3.ebuild 2107 BLAKE2B 84c174533a0037c7543da91d27c7814379f6d0b865aaa8752260faeb9c69992944086e3eb1bf79b6e301e1f35e211ae79de46268df6fa7c94a12eaff44d3e8e3 SHA512 4ca5695f2b47a789c63ae142617093eb22dc91caad01b3aa5bbbd7e8085bf31051d0932e38c615f8c81b4b57aa800e2bf2d1486312ef25da8f0a811747de6a3f
+EBUILD lockdev-1.0.3.1.2-r3.ebuild 2108 BLAKE2B c288fcf22e901249114c408ab9f83922600339f8fdf351e4c3d0a5243eb6499ad87359b438d0c1cdac4025c759db3803930a43d149e2f31d800392692036b117 SHA512 51e3ea7340728cd4c59bc32bd14c2f7949704fc1423c6e022279c2e429cd5267fe64101293ee71a5d204556024d0e654505f7f8a9f1993aa18461f6cce8aa6f0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
index 6183868489bf..06cc4fd7efc1 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="perl"
 
 DEPEND=""
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 5b07456741e2..64ddeb779021 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1026 BLAKE2B 96489628f775340ecd3dd4e6ad820b085a3ba95d79d2b89b0fbe6585857887d4634bc4ca307e3d5d60f6656e42f294b1cc708d12b8375f2f0e0d38db0fdc3aa1 SHA512 3fa27c365516b462bf81da48603020d46e3fff30d58ae48e906a7789f6b36ef5b555fd2816ccc6862337adfbea99fbf87eb303054eb6d6b4abfcc4ad4908832d
+EBUILD lzo-2.10.ebuild 1015 BLAKE2B 723fe0ff9eb96fc4e67ca575bad3b7624de4662da020a338be2bff1e9ff660dc9dd5295da1736ccaa0737e23ce3592db0cd887ee5dd42519d49e6c4b49e54b0d SHA512 64f5cf65660f7918a196b7334bc2414e254f6e592fec1149aaad3a9a32750fad9c7e0f50736e1984015c9e99b56c3213e37037f670e92566b21ff94597fc40c2
 MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 7f72ec374ac1..c5378e56d220 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index bbd8e387e19d..dfb93160e16a 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,3 +1,3 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
-EBUILD mm-1.4.2-r2.ebuild 675 BLAKE2B 51f536a32952ef1f25aca83db8daac78b7c073a4472fd6d09918f750249a34c30efba16538447bc96900197abce95ff3366b248563734166f1c53eb5ae9e4583 SHA512 61f9fccac9f966d059175702487bf13c159f5e0a9461d9605d30bbc4820211199482a208b475be6ef12ed06811d3f1b86161ef012e7131efa8c1fe9655a9200b
+EBUILD mm-1.4.2-r2.ebuild 676 BLAKE2B 536eefdd1293a703221436dc4a15d13c841f369a121363abdaa125ad9a2e9720878e26f17525d37338b03fd0dbfb2f864cbe3feddc5f9a794be05d504050c3fd SHA512 236bacf95dba530b0d9272d84306a2462b6d84a24a963447e4ce233e1002d76c78bc3d8b339f0f18e4bbe2ab9a4f9b5cca90948e072d1f73ddb59ebec695f33f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 3a5530eea121..ddbbd173ac9a 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 872cafdbf56f..d7d56ed6c129 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -39,6 +39,6 @@ EBUILD mongo-c-driver-1.16.2.ebuild 2540 BLAKE2B bb6de7ee9d45012925342455a1b5510
 EBUILD mongo-c-driver-1.17.0.ebuild 2493 BLAKE2B 7b32636dba41d0baefd313d353f2ec5edeeddb7a233eab73fc2ce9d120b0554276a9bda73c39d5e25977655c97d9c3157caa6276d709e307d38e3b1af60937ba SHA512 3b2fcd5f061d97d0bf3c9b31823b703d201bffab759ab9da93ffb68d96cdbb8fe82f0ce5c92516bf83283bf380543ef4df5ff8e582a4f4672bdd1a9c6bc8199a
 EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8
 EBUILD mongo-c-driver-1.6.2.ebuild 2070 BLAKE2B b2a25755c6a37247c42f41134684387b2e584a241a411fce98c96f057ef18c050bc4e8ec3aadc4de716fa7369ca797ca75cf9ac2fb39d3dba0827190d9cad2be SHA512 22a44789068ec7277d10feb6d41b82526b09aad1213ae8b9827131e63df1d78ce07704f295178cfa085a6c6c645f7d456150caca51265b00dd8bf6cca2c6f42c
-EBUILD mongo-c-driver-1.8.2.ebuild 2128 BLAKE2B ef502986fe7b125c8abd168119797b89706209b0f6c7a2f99dbf4a0e9de93687babc79d504e366ba4bdad52215e2f5c4c72f259f81ea3bd70c627591389cf9dc SHA512 87607915dab15ffbe9f2dea28a243d14ec5c20d7290fd9018a57a7e31cbe4bc62b731f236da06d246823b070ea2230b588159a8001e792ce7273f492452811fb
+EBUILD mongo-c-driver-1.8.2.ebuild 2129 BLAKE2B 138cbaa6afbda5ea53dd3e039e17aa9ba84aad005f372e0568d82c5a373b1550f38ee8da005b00a788ecff5e824f3c5c6c1e3dab2839f3f009531a859749f98f SHA512 35ed648328d28eac36c4cd5ce03301220d9677fd0492f2d9a5d1b2d33d859817f38a1374dc7ec273e6fd59bcc5aa0480729a38ad131a5db4e723dd7c606b299d
 EBUILD mongo-c-driver-1.9.3.ebuild 2131 BLAKE2B 59aa363b4bffd5ebcabf8644341884b9cba4caa7afbe03dbaab01c08aff11c29b2d1b3b4e3f109a0f792b67f8b3d5914b59d8aad48c9c2ab065c36820a8fb3dc SHA512 eedb120627a3a4510783b42dc03985a595bc2ce1e6cfe75fdec9f1748ab506b9549a2a8a5e0d7db05d2fef5032a115d03eb798dcb8f2982fa2317dbc01783633
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index 044a37200616..e67b5edaaef3 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa ~s390 x86"
+KEYWORDS="amd64 ~hppa ~s390 x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND="app-arch/snappy:=
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index d99664bb1173..c5f4a511543d 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,3 +1,3 @@
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
-EBUILD mpc-1.2.1.ebuild 925 BLAKE2B e004095824d4c34af521daf27d5d991cf61471e7954f035136455b1210d9ab2cbdbf62512b4508285b3f95f2017007ceb4d773e00ce551c6f38c939d0ec9d420 SHA512 741a78c01d227fee1872eefe0438f37bd7d71c4893b69aaad4bc4726018cd358338a09350f9a6e4ad0d863bc282315fce2094dcd8ad126a3a85356f39253f7f3
+EBUILD mpc-1.2.1.ebuild 905 BLAKE2B ed4a1c6a6ed1478fbb8161055c2941ef22a4b297310994246ffa5301e9261f09b516271fce00f1d8d42f4a9d3cae2e2d26094473823ee722869e9c1e2c14af95 SHA512 cdade188ffd739b98a0b272ff07f24157dc6ef53ad3f1d04b97ef36472fcd24befb44d1b54d5c95bc4ddfec9206bfafe2fea93289dcbd1008f5b4c0cb905c7ac
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
index 5fa8d2838fbe..48d434423d9f 100644
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3" # libmpc.so.3
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 537f8dcbb9f7..1764124aab54 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,3 @@
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
-EBUILD mpfr-4.1.0.ebuild 1060 BLAKE2B 4d0f9dcdef015199f74f86f7c7d3a69caff4ab2a3c371eb53573e324540c029381f8b47542fabb6d683681455807770c329817a244fb76a34ea7398b6e56f926 SHA512 1a3f47bac2a5050fcfeff0db74ce05e9168e17a73771c026147cc22264d3172c6dfbcb11bf67661b88e94d0a4664073acdaf1f0050c68fe41addea9a1fb90037
+EBUILD mpfr-4.1.0.ebuild 1040 BLAKE2B 3b1678d44e6b19217f07c0112f6656d95c560cf321920597e64cc83faf9c1db2acd7829e2465d0dbbd6af9a8bf429ca358ea2fdbf51db36c59d79e3ce7ccea5e SHA512 dceac3e1a251350ab5f0bc45dffa314228e8fe1bf8df894c228546f741c3a862b3758aa4738bdfa5914d876068b3cdf876ca401400f7f8b88b4d21e49390e0e3
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild
index cc7640cfe2f5..05bae0f875cb 100644
--- a/dev-libs/mpfr/mpfr-4.1.0.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 328d6d03bc77..37f6f19d5ee1 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -2,8 +2,8 @@ AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da13
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
 DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
 DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8abca56ce40c755adf352bdc2a79584b1e1c0e50f5ede0ac54794aabd6883601c53593b965aada744502789db SHA512 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
-EBUILD nettle-3.4.1.ebuild 1790 BLAKE2B 556d39f46ddc010db277004599bc6ac59ee28192b05eb5cc46ca0c1d12349f9255a2548705000e6728a9c9739556665a52800ad5e8f2424c538f28124c0286ff SHA512 b3152d8e5f2569afad23587361ae302846d357f02956b9222642b1f9ae3267b52d6ef0ecf43ae53c0269c0c1cb677d9daf04127be88805417eb9d77eda230bc6
-EBUILD nettle-3.5.1-r1.ebuild 1751 BLAKE2B a6bb47e9a8df3e48403a94e801491b833072bdacbcb6ae84ee806854ea947424452ea16dfebabc5023a7ab7ab72678b8c704f4a003e0bcd420109dc2853cc7ba SHA512 b2f8977f00c4bfa283336978c3376b9fd30b2b19524f97d279ef2109bfdd2354610f6c7872f6c85a366cb198b9b05df66b345d5f8bf10399ac8f6d74a4b0e07a
-EBUILD nettle-3.6-r2.ebuild 1803 BLAKE2B 99529ed7e701fdcb8cb391f9d94f302eb96ec02ebf94bdd49795d92b18d13221a5524f3eab55e9ca4ebcc3b10bfeb7b092b6a183244d4e71feaf390ae23b5762 SHA512 06c5c7922cd14e0448b368884dd7847b1bdc69a4340a0899cace6a18d2887f1016ca4317e866eaa246aade350c874f964ca224ee56085942d94f9a44b08f96ff
-EBUILD nettle-3.6-r3.ebuild 1727 BLAKE2B 42a74d27da5189bef41e6f19ac5c9eb6627711fab377c6643d779442333879d12a48ad80231051b7bfb51940f47634bd93f23ffd87ecd88827598bf840700367 SHA512 6b8339c1bb2c5692affb5fe00e0130eac84726b42ff3925b51ae82a53c4b75d873b512e4990db019ed1a14af6084aea5ef13831c5fa8f0eeae12499b7b2b77cb
+EBUILD nettle-3.4.1.ebuild 1779 BLAKE2B 4688d97836813edce2738671f464f20821662cd00a93fbc501b5b301afda57cad4af7e1c2553dfb69360e622eeb3be3e0c520d00b8966b4effe25939eb13365a SHA512 a458a35d2de2cc28b94d37723841fe5efa993c88e40850ad519e43bb7b9ddc2f7f81e4a96f8d6379d12e3b02fce83c0be3c70ce48a37a047396f3e2cb57344a9
+EBUILD nettle-3.5.1-r1.ebuild 1740 BLAKE2B 6ecd449821e733b91ac36fe401a3cdc326c3e0f9c9e9f4501bc0d03965458296ed66719e43d4f594dce20d15aeb04d3bd262bfcedc31d403f3b4f5d3f6217f06 SHA512 e4f4536f8def163dfadb74c648226e691e38e7b8cfc30103c82248308f0e558122d8518bb18a701b8ad889d173bed796fbe11533dc087b0ab9fb40a031f2e28a
+EBUILD nettle-3.6-r2.ebuild 1792 BLAKE2B 999473f1d1d1220c2778d2f89f3e33242b3d01a5099d801bd7a64ac105bc155df05d86ba50256b7c087ce3b767f4421e9b3b2e3098f8b7494cf43a0c9ac796c5 SHA512 cb8575eab80fee6b3865e705efe014a250fcfc5b3e7c2e53481051c22abbbad9c99a2ca8c5bfd3af7443b1ecb191e5fed9875f119c7deab0f46ebc50abe4ca99
+EBUILD nettle-3.6-r3.ebuild 1842 BLAKE2B 9a4cc9b9f98eef21fc4e3d78acaf20a06c6b45b803b1672be412d50b548c6aec27f3d1561789412a7be534b03d0bb18fc2c6ac3696a826e7861f5bb52efe95b5 SHA512 0d80e95c6cfec4dbac2c9b39feb4f85277991def180093bcb4f8249f0a504e0e26b69dc9533ff9b2b0f3ed862511691c03f4fd33c4e4d772e8ba9a03d9f3101b
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index 1aae4439bfbb..bb7dcdf6c2ad 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~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 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nettle/nettle-3.5.1-r1.ebuild b/dev-libs/nettle/nettle-3.5.1-r1.ebuild
index a0e936df6498..acb10fbbe9af 100644
--- a/dev-libs/nettle/nettle-3.5.1-r1.ebuild
+++ b/dev-libs/nettle/nettle-3.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/7" # subslot = libnettle soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~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 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index 57e545cca866..8a4d2ae81beb 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~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 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/nettle/nettle-3.6-r3.ebuild b/dev-libs/nettle/nettle-3.6-r3.ebuild
index 3466041bdca4..6abf981738a5 100644
--- a/dev-libs/nettle/nettle-3.6-r3.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris x86-solaris"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 1b86e6c805de..f143f7db706a 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -2,5 +2,5 @@ AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca05
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
-EBUILD newt-0.52.21-r1.ebuild 2258 BLAKE2B 1ce1f0487b95b79d5cd10d6d59122e1c9a7b6610016eb1b671f751de56f6f1827d6c7b9e650394a1b939e84cd06e1e71df803ba8057a4e33426a138de092374c SHA512 0e983781b1d73e15c83a9f47de10b46e05e00d8b2be23f676b230b6f771eb0069c52288d7d1d7db4f169ca97ed60d0bfa851f7348c30bfc756a1d3fe06a6ae6d
+EBUILD newt-0.52.21-r1.ebuild 2259 BLAKE2B 62de592f2725c148b0ba000132ef84e40c7e14d83490507d6c332ab2634e7e13d6bcce60b913bda8ebca08f09ff6387ca56101222aa00f4fbe5852bcae99971d SHA512 97d55e11122fffcf113865fc8de3b566d852168391e4b7d36709180a440dfc79203aaf56620cbc38acd25355b7eb262bb20b0f82e72e9f9444c88de344583b1f
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index 9a198423fc11..7962178930af 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gpm nls tcl"
 RESTRICT="test"
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 7a3133c35d9a..6251f27a3325 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,8 +9,8 @@ DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7
 DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
 DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
 DIST nspr-4.29.tar.gz 1078192 BLAKE2B 748456a0d31a33b1b32ed66b15658df3541304855941887d873a672124e77326fda42e9895ac65e237c6e4f09d4c7af9615a3c6fe65f85845a6caf23cc99caf4 SHA512 ba5ac275fe0beb69d7a7674c9ee9e4429bd5761daed285edd975ccc829af30d062bf4a0f5e44361e3bd191f21b1905f96ab146d53b55324020f13ecb3c05609b
-EBUILD nspr-4.26.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919
-EBUILD nspr-4.27.ebuild 3939 BLAKE2B 6ca8360a5ed7711cef58d81c9db313ecfd57dc76ce48485f3427e84ecccb21069da57547385ef3c7a25085c1caed77f9bbb86f7b9b6b2ebdd7452893f0287b91 SHA512 0ad73faf242f7b8813d1add48629132d4276b618f63860a134576b757dbf14b253bf642f404a57d87bf8978ea896e75602dddb9b14a44241469b1e0466e09150
-EBUILD nspr-4.28.ebuild 3930 BLAKE2B 93e41000e906be98a34555fa1970189139db9d4b0c23dafac29ec4e5db93965981d614e15886333665db3d255ef3545a48efe7819755e973497d22367681d292 SHA512 b6edf7eb6685ec60f549c4ca542146fc02673c59369d6c691dbfe98106e319b7c0bc2817629296a447bfce720467f64c290106356b5eb26348227169d0841919
-EBUILD nspr-4.29.ebuild 3931 BLAKE2B 6bcf1dddec05c282cb21ad29e293098d348c71b01e8731f2eb79aeb23f976a3f31afb8d770b979b43e0eec1f493ccf510577563469618624193c86e2a18c4ed8 SHA512 5668b57eb9c9e191489ee9b39a2f58276ffa185e8c6f0dbe6cb47ff03eb7ab9e9cf8f312bfb0d4ac27795068150a4562f636b71b6e825c4c8cc782abef267f61
+EBUILD nspr-4.26.ebuild 3921 BLAKE2B b1fa8482ce50223ce9e839bafa2d677cf92af04fc6f10e6d9ab1a89e81b7073b7a062ee763e141c8d31cca4aa5ec6c4ced3beca3f82f2a14d6bced10222e48ca SHA512 676decdad6e975560b396db51072838033c4d13c81d89a9ae9d5a85f744a9a3f7d304fc29c9f230a88b02d75b2264dd380eb69ef3c730bd5a50bb85f74624f67
+EBUILD nspr-4.27.ebuild 3930 BLAKE2B 57fd41821f9e2c9d1970617153cbb4de779528a1b293e5daeae6b97796a483824c7265a1fe86d14740ea783d1b0e803503911e0e3ebf50c3a39e7593506e8bc6 SHA512 510c4a2a77814332f128e4c04b4d3d3a6650497844b6f06765de515856067728ee413e95b035300bb8b7c40df7e34944d7d70e181963fd876b9f2d1d7dd19b33
+EBUILD nspr-4.28.ebuild 3921 BLAKE2B b1fa8482ce50223ce9e839bafa2d677cf92af04fc6f10e6d9ab1a89e81b7073b7a062ee763e141c8d31cca4aa5ec6c4ced3beca3f82f2a14d6bced10222e48ca SHA512 676decdad6e975560b396db51072838033c4d13c81d89a9ae9d5a85f744a9a3f7d304fc29c9f230a88b02d75b2264dd380eb69ef3c730bd5a50bb85f74624f67
+EBUILD nspr-4.29.ebuild 3922 BLAKE2B 0091ad29cd7ec2810bb14108acc1418da9fdfc69d551ea6010d3b305c3fad9524a7b27ad838246a3551284a6cb8bf65d60e711b442cc64f7e7fafaa097bf6cc6 SHA512 106360a563824b9fc647ac4ec12e5913685d9df527b45b63b5a27e41becc8b84daeb979aafca7135c67f78453b6c8dcff9fa91445ed08e74011ed91617434da4
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild
index 22a70f0cfde8..3c3fa8f9f175 100644
--- a/dev-libs/nspr/nspr-4.26.ebuild
+++ b/dev-libs/nspr/nspr-4.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.27.ebuild b/dev-libs/nspr/nspr-4.27.ebuild
index 0c02c60c9fbd..01b8025b7191 100644
--- a/dev-libs/nspr/nspr-4.27.ebuild
+++ b/dev-libs/nspr/nspr-4.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild
index 22a70f0cfde8..3c3fa8f9f175 100644
--- a/dev-libs/nspr/nspr-4.28.ebuild
+++ b/dev-libs/nspr/nspr-4.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.29.ebuild b/dev-libs/nspr/nspr-4.29.ebuild
index d16b52ec47cb..af4f0fff6cde 100644
--- a/dev-libs/nspr/nspr-4.29.ebuild
+++ b/dev-libs/nspr/nspr-4.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 935c74c94351..ead3adf5fd79 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,7 +1,7 @@
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
 DIST onig-6.9.6.tar.gz 926459 BLAKE2B 7a5fb49b35abe11fb91e7e4529855411fa0eb357897a2b327ddb5696a2c1e5f9fe7eb653fe84dbaeeff9c77e5489fd042d65e84f5b8e3e907bd30d60a0b75914 SHA512 eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc
 EBUILD oniguruma-6.9.4.ebuild 1506 BLAKE2B ee403b48d1fe7194b4780ba5dc8221dda58a63e6bdef9acd6aaa1b872520e5dd942111b314692f595ac5e492c4990f2a09d5a1d7f520bb4567f777a8bf68b1d2 SHA512 e697c3c94b3a1de3cea291e07933bdfce5f4c4a6c0c4148c23e3b25f252a0b741b4e8cb65573daeaaae23a0321aa14cb664e43af5e5471d06840677e8c2cf42b
-EBUILD oniguruma-6.9.6-r1.ebuild 1506 BLAKE2B a40ade4c00a47ba79b03f21f02ca641153fffd1f262b60946cee62e77212243024b70fa794f53936e71001d43a25c135d5a3f12a1aeeef02501b299dcc4740ea SHA512 a18a9b97c2beec525ef292f82c7e54c05ffc5af1c1d70bb1b73abe58c650a941b82d78752c75ed6c67e09540825c67216bd77e7487b598f847f251687201431e
+EBUILD oniguruma-6.9.6-r1.ebuild 1500 BLAKE2B 80c26bc80c4b0a7ce800bd5d858af6cf4b72c2622c03e9237157577b99bc5ce80b37bc7d157aff0885903d5b3b077fcd5ac88c25ffe9c3116b3f8f5c49193bb8 SHA512 0e6a8ff24ee2cc71fd986e007c3c3787c45fdf243ec55e73b6383e522cc23cc2ce2a636281e70543954eb14c2e8ec634218db6cf22c530dca19a96c98f26e46e
 EBUILD oniguruma-6.9.6.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
-EBUILD oniguruma-9999.ebuild 1162 BLAKE2B 4c5643a2f49e351065eff41cabd6b3a28caa9f0f1c34b14be1daf7718d15b30c7f04f6cb02f04a1470ddc33eff61a25e26948e6b433a848f25d7363f24e382aa SHA512 d77b7cf3064ec297591da2a8fe874578461d7d55c734ba1bdd22694295338cf483a796e44a5733728ef01dbb60c77123cb90bbb87cd3e3b9c1b81b1617fcf769
+EBUILD oniguruma-9999.ebuild 1152 BLAKE2B a501302d3a207054c966c8fb3bfc56fef6a301e8e33ffa406d4a2c5fc40d63d12babe0733a43322a7aed4894ab82f215a586b7f8038b4d38f0f73db6c855cc17 SHA512 1e261ffa3fa322957e5cbc4d78e7f7cc7b690f35e68af298d85bbefd673365a134d2b7c3637a741b427fc95b658e7e942f9cdf3a8958edb501d2098906ca025d
 MISC metadata.xml 899 BLAKE2B 3410f5e417f4f7e946b8f0485d39a9a03f8f007c3b37f329958939674a6d4648719d9d0366c4de2f06ded2a8e5b5f088f3830fde351a5f0c4a3b40f58b7ba01f SHA512 ed6a20a44390801a201994802059b22e4df1b2d3735e36cefb60ef91990d19a63486f09f5d5915d0f4d88f18b376df62a20a4b0dfd37ed77256691077f490ff5
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
index e0a1c8d371cf..7cab6aca0170 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 if [[ "${PV}" != "9999" ]]; then
diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild
index 4c0eebf2c0ca..405b066a532a 100644
--- a/dev-libs/oniguruma/oniguruma-9999.ebuild
+++ b/dev-libs/oniguruma/oniguruma-9999.ebuild
@@ -1,27 +1,38 @@
 # Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit multilib-minimal
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit autotools git-r3
+
 	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
-else
-	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
-	S="${WORKDIR}/onig-${PV}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="Regular expression library for different character encodings"
 HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
+KEYWORDS=""
 IUSE="crnl-as-line-terminator static-libs"
 
-DOCS=( AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES} )
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
 
 src_prepare() {
 	default
@@ -33,11 +44,12 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
+		--enable-posix-api \
 		$(use_enable crnl-as-line-terminator) \
 		$(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index 280e595715d7..d7ee9eaa095f 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,4 +1,4 @@
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 1724 BLAKE2B a10ebca4f33d7cdeac1addceb84e6bd412adffa1d3ca54afd13d6563c9fba702018d4dba353bb851b6a711520f9a3e7d870dbd6c60abe25ed1a37d33a2714bc1 SHA512 6e18385f71b4f2e47f40f1beec642b34c162dc5a7a584ca9194890533d8a7f72d11477f560c0c38d31426a198901fe22159febf2fc55952ebc26d2a4614ee83a
+EBUILD openct-0.6.20-r4.ebuild 1725 BLAKE2B cc4ca9e888e1b67f5f6c486ce34fdc50b54a11b37d17d85935e026e9b41e4998fcab32cbb8a642938f9a052b77980cadba2e906bb39a71cd14b3b450d4319f6f SHA512 0f567dfda5421d78b3f680a717622c7252a2a9f667e65ae42f2ec13f8ae2408c98c64bcf86ca01756811649abc25d0594807da7252fe6c4af6d9e90d7be456e8
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index a41bb1c04b9a..a9c60e5a3817 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
 
 SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 9466aaf1c786..7f3fdf1de3ce 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -9,5 +9,5 @@ AUX ossp-uuid-1.6.2-php70.patch 11172 BLAKE2B 8cd653ff28f8eafb8f47eefb830a18bfa6
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
 AUX uuid-1.6.2-php54.patch 6096 BLAKE2B fcfc58f1c1e1e7b00b669a212d6154db0c2512da137c1cf43efc6703c0e7cbe3623cff2a30607e971f25a8bdd59fb5fc18b7532397ecf7cfbc9ce05e98011069 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
-EBUILD ossp-uuid-1.6.2-r6.ebuild 3019 BLAKE2B 23ba6fd1e19d0057b6d0e2d57ae11986a18402faacc0ee111431f34e67cfa3e2a86d060ebfc3a7759057328d2e4510e5ff2fafd9cf35a39f378ab22c91dac00a SHA512 8c647fd6559371fff5b59b6e7c267161b1881a5c6d82c64d0c64e74c52319df63687d8e4a6d95cb97250d7d4694bf891d238c13b18f6d4930f245b9c5f8c0555
+EBUILD ossp-uuid-1.6.2-r6.ebuild 3020 BLAKE2B f3b55d4170a24e617262d60c5ed225ed256367b01608411c7aa2a8e2626c98adb58ed7681495b15af7a3392aaf5dac2872d582561382e18b713805239f59f410 SHA512 79531a09e1362c4341a36485375a102b3030fff7f2c508da944f80b593967f19ef3d3743e8f3a1f9ec6fcff0666176e5e3dcaced36ac7e9f34f7fe7af708c490
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
index cf38079f83a0..e8f0b33cfa1f 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="+cxx perl php static-libs"
 
 DEPEND="perl? ( dev-lang/perl:= )"
diff --git a/dev-libs/pakchois/Manifest b/dev-libs/pakchois/Manifest
index f8043cafa1d8..ceb0dc8627b0 100644
--- a/dev-libs/pakchois/Manifest
+++ b/dev-libs/pakchois/Manifest
@@ -1,3 +1,3 @@
 DIST pakchois-0.4.tar.gz 371126 BLAKE2B 41195807192f077039d7397bcaced2f3def57170135cf53f9addf23bae8f742ce76689fc5c4fa7a49ebbf182a38036dc0f7012e676d7c4906e8cdc7af664a501 SHA512 b4322cf58124aa05b6f34155a4eea753c6eae2fbbe57436491caf0549d79598c95f4d4fefa4a823ead341ab66a9e1a3f437d5278e449ca0d088a4a971d244160
-EBUILD pakchois-0.4-r2.ebuild 587 BLAKE2B 7782a575d00d4020fa1820749da1b6473bf9a50457b52192caebdb0977a71b0dd953e03ea8e93bc184b3cd6f3e68a79073c7275e9b2d6c408d84f8602183170b SHA512 62ca19e4fd37434e60cd3a7bf9a62b7543c5fb457bdcee7753b70eed81e2bbeeda87b5a24d86708098adfec3ea55b735fd03a5305f0a4c6200802a60aa788a98
+EBUILD pakchois-0.4-r2.ebuild 588 BLAKE2B d75cb606a4308c2fb04477afab30c6ce9b65f3f1889cbf17b085690b07017929f9b88751b0539ac5b5d12503c7b466f820c618b4a88baed85655b8699735e1b4 SHA512 2d9e7ccc28811a1d21c2320c8537a77c4e618106ac0a486acfce0699858c57af45a944dbe524c2e3d83aff020e69c4f523c455e4362640f7087fd59ee4575e45
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index fed0ff842a1f..69c58db7d15f 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.manyfish.co.uk/pakchois/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls"
 
 multilib_src_configure() {
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 7b5975871a8f..1fb65a719818 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,3 +1,5 @@
+AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55bf72f444ce6def76cd858fe2ce58f7c4d5d305ab7ef3c150204895fcff8c3f662d78e40941a5344827ad587ff SHA512 076bc724a09edb3c1d1962a686da9e48d469a3fbfec056e1abbe401f80b9b2eee67aee06afdb7fd540c3997ae6f9cb6a33f63f713c5ee88825f75c6c488c581b
+AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
-EBUILD pegtl-2.8.3.ebuild 459 BLAKE2B 759adfc2254e76720502caaea090d943e176eb7d910e939d58b94c4b6ae489dd02498d5a85501045d40c5e89dab7e11c3c806e47de85ca881fd2a68955c66ad4 SHA512 09f6ea0d459982f3d135b19e4488d6adf8541f0fc39095d358b43ee0e94d0f6c98e3e9d62138404aa0fa27fbd0181d3b6c9734670969a5f92b6a3ba23f9d64f9
+EBUILD pegtl-2.8.3-r1.ebuild 721 BLAKE2B 4c454e690b9cfc3e0821a777b54d4fb70177661da034ff04bb041b9eaa1e2d60ec3b9b096316340375e759c4b8d089d597a228822042d1c20de0f8b7612a6b63 SHA512 156a28795e95171d63f2f8417b1986fae280f7ebfe1424e452e2f9896955b2cf74723e4de521ab1c9e7d318aa7011627af413d4162514bb84c762a132e823bc6
 MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
new file mode 100644
index 000000000000..140e1f5cfbb8
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/CMakeLists.txt	2020-12-27 00:00:15.886046938 +0100
+@@ -78,4 +78,3 @@
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pegtl-config-version.cmake DESTINATION ${PEGTL_INSTALL_CMAKE_DIR})
+ install(DIRECTORY include/ DESTINATION ${PEGTL_INSTALL_INCLUDE_DIR})
+-install(FILES LICENSE DESTINATION ${PEGTL_INSTALL_DOC_DIR})
+--- a/src/test/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/test/pegtl/CMakeLists.txt	2020-12-27 00:07:19.122766830 +0100
+@@ -123,7 +123,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+   if(ANDROID)
+     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" -DTEST_RESOURCES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../../.. -DUNITTEST=${CMAKE_CURRENT_BINARY_DIR}/${exename} -DTEST_PARAMETER=-all -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
+--- a/src/example/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
++++ b/src/example/pegtl/CMakeLists.txt	2020-12-27 00:07:32.970832890 +0100
+@@ -48,7 +48,7 @@
+   if(MSVC)
+     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+   else()
+-    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+   endif()
+ endforeach(examplesourcefile)
+ 
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
new file mode 100644
index 000000000000..ef418e44254e
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
@@ -0,0 +1,43 @@
+From a3a292c2ba66bf09b4adc4cee8fcdfb1b1386067 Mon Sep 17 00:00:00 2001
+From: Daniel Frey <d.frey@gmx.de>
+Date: Mon, 11 May 2020 22:19:31 +0200
+Subject: [PATCH] Repair warning from GCC 10
+
+* Backported patch thx to Fedora.
+
+---
+ include/tao/pegtl/contrib/rep_one_min_max.hpp | 21 +++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/include/tao/pegtl/contrib/rep_one_min_max.hpp b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+index 7ec4639e..ee0a3782 100644
+--- a/include/tao/pegtl/contrib/rep_one_min_max.hpp
++++ b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+@@ -45,6 +45,27 @@ namespace tao
+             }
+          };
+ 
++         template< unsigned Max, char C >
++         struct rep_one_min_max< 0, Max, C >
++         {
++            using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
++
++            template< typename Input >
++            static bool match( Input& in )
++            {
++               const auto size = in.size( Max + 1 );
++               std::size_t i = 0;
++               while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
++                  ++i;
++               }
++               if( i <= Max ) {
++                  bump_help< result_on_found::success, Input, char, C >( in, i );
++                  return true;
++               }
++               return false;
++            }
++         };
++
+          template< unsigned Min, unsigned Max, char C >
+          inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false;
+ 
diff --git a/dev-libs/pegtl/pegtl-2.8.3.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
index a2ead2df29fe..ba9a54cdf773 100644
--- a/dev-libs/pegtl/pegtl-2.8.3.ebuild
+++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
@@ -11,9 +11,22 @@ SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/PEGTL-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-gcc-10.patch" # bug 733678
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index b99dba98e053..6a11fb598ed6 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -2,5 +2,5 @@ AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c07134
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
 EBUILD popt-1.16-r2.ebuild 874 BLAKE2B 881c6fad5ba54ce1d2fb79035fc4820adb5f863fc0f5f045481c51b089fdc528b1ff43546f59ed67e918dd8a93a3102db542e928fa58bde91904bbc1350a26b9 SHA512 dea4a0fb8a4a121ee6d2591d017e431095532e76dafb00abe6d2e07584dc626d44eb7fee0124942af9e1d811e01565dd1f9d5db7615c9f1840fabd2fa08c1337
-EBUILD popt-1.18.ebuild 1079 BLAKE2B 05ea397c999d232e7317fa37815c42547dc7c3281409c62267c40e6939cdacafdccbeebdaa611f462ed3e0771a1431ca17f1a56923927b671ed3baf2e9f0916f SHA512 c9d53be850cdc09fe0d09bb48a98c22f0ba4f7a70a5bfefd4fd42a056239ccaafa4ce000a3be2f7fda64ed125c2c563862cd9f70ae89029de4982602bae12ac0
+EBUILD popt-1.18.ebuild 1059 BLAKE2B f955ce21004234b918742fdacc776f88e648c309fe737bc2ccd5aea322526a91545f1fb16ca168dd9af0a5ebf00b637ec2da7b2cc8b7ff31e8e0b4211e19b242 SHA512 5035ce5b551569a173b8d607003da2f40639de4db76efb01be433695d850f72f21ac7e7696feff23202a90d11588bcb9ff9ddb691fe925bb034014461fb8dfda
 MISC metadata.xml 347 BLAKE2B 1b9847aceced4a814bc94e483d32082dd6c2dcd4b99c48c8e2cfd062cff0d2f1a0fc102a7b7c4ba3f620db6837d61a880b0cdd395c7e19348acf0e2831640d6a SHA512 ab5ebecf77f7aee7c2de528a7e6b84dde079d33d020fa910420001b6a8dc63ca6c014f3d4122794d7e9099e3d7d53de60338a4fbca563a90fe6a5d2747f50d2f
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 695f3cf1db4b..0d4fea8214fc 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 53e57c4e4e00..1119559aa0f8 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,6 +1,6 @@
 AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
 DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
 DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
-EBUILD protobuf-c-1.3.2.ebuild 975 BLAKE2B e6692ca39ad4ebae30d6f78fb770e7c0b7c75277d784f3b9c77f3dd9810e11d1be30901241deeef494426ef02d28b52e9364cf09df4f8cc03fcaedce6e0f9d98 SHA512 24aa2f2b915d4fc48a6608ffd61dc666c9d4505ab33ec8256a3d8718549dbfcb1dfe7371475b1cec5686d82ecef22e84084376d6e2673253ae375047c47f8c21
-EBUILD protobuf-c-1.3.3.ebuild 975 BLAKE2B e6692ca39ad4ebae30d6f78fb770e7c0b7c75277d784f3b9c77f3dd9810e11d1be30901241deeef494426ef02d28b52e9364cf09df4f8cc03fcaedce6e0f9d98 SHA512 24aa2f2b915d4fc48a6608ffd61dc666c9d4505ab33ec8256a3d8718549dbfcb1dfe7371475b1cec5686d82ecef22e84084376d6e2673253ae375047c47f8c21
+EBUILD protobuf-c-1.3.2.ebuild 976 BLAKE2B fd9d077375ab6355a98d33dea2a30233a3548d453062c9c5929ec1d70e74f01277347309d1c352894dea4b94886d917408b1469aa77d7cab5ef2695ac7a81611 SHA512 b1189e57806c7124a3a8c6d44e7a192618f196425b2dd8bf820df1f126e111747b838d9e13991666c6f20d7afdda5cc009ad239637f455088620379acf242fbb
+EBUILD protobuf-c-1.3.3.ebuild 976 BLAKE2B fd9d077375ab6355a98d33dea2a30233a3548d453062c9c5929ec1d70e74f01277347309d1c352894dea4b94886d917408b1469aa77d7cab5ef2695ac7a81611 SHA512 b1189e57806c7124a3a8c6d44e7a192618f196425b2dd8bf820df1f126e111747b838d9e13991666c6f20d7afdda5cc009ad239637f455088620379acf242fbb
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
index b47188055827..f6604b26b18c 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
index b47188055827..f6604b26b18c 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 01881d5b8daf..6528392e1a65 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,8 +1,5 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.11.0-disable_no-warning-test.patch 965 BLAKE2B 81f55d1dcfeb8035e3af2a5d818c4d252953bf6845209ee7a6811c91a528731e01e94f0783934c5b079edffbfa5c08af9e6dff17dea13a0ad0e74b30efc670fe SHA512 49dda9e67f8ba8bab932278b265970c3ddb1aabef6ddc9d690908fe7068e72ba9092d97efe4d72c22f7fbaeb51ae3b23b9bb52acb2f2e4bd6fb4a0bfc7c7dfd4
-AUX protobuf-3.11.0-protoc_input_output_files.patch 10318 BLAKE2B 4abd17ab2d2da06b57b14ef8d120195370032c4c3906fff97a6dcedd7dfd67b15e4350576e496da180fb15244d62b4288872c15f9df04d406130bac972e1b33a SHA512 496e7b200ede27b761c7c4ffb740174c7f0271acc19ba39ca1962d981d1177536d8934f9d726124c90bc3bc437d00499458d845ffb88dc449466116e53065fec
-AUX protobuf-3.11.0-system_libraries.patch 6352 BLAKE2B dd224c42e13c08b3bec554b23548e515b33dc411bccb61cf8ed7835808fe6632daadbfbf136661f805aea8409a6cfee3c38f375bcb05385d015abdac70e597a9 SHA512 a0c2873930ffdeb219b7679edef49e903516ebf0e00708e71d14eccded4c2d2fcc2284c7a67813d6a2d5b5914ca17f5065ec3b72e4649ca2acf8c60b8ab871ae
 AUX protobuf-3.12.0-disable_no-warning-test.patch 965 BLAKE2B 77ed571f16f9fb2d333d656f56c28e512f4e78984a47740644c7d7b8fec8b26d29d2c1138e0c73fda027ff916871f80447683d959e0fef9bd55471b89ee7bf19 SHA512 6fb45b1425428054795d3a0898b993d9ef2f6b0b4da048b411cd62e3a3fb3114abb0c382c7fdf8f7eee1a02fafc89c0f452dcbfaaa8bc283f0fb6a3861c88ff6
 AUX protobuf-3.12.0-protoc_input_output_files.patch 10321 BLAKE2B f248067eb23303ee5eee4ff3f312cc882c804dc4c2233f4a4cd84377ce7f8bfb35df1e4e794c7d1bac1b84a2723b6cac4a49b3af52f402964ea388ea3458b35a SHA512 137209ef76dc6d3517f4e50845572aa0b79d7b5c0931134b4017f783f13bebd37ee5a6b34f26d70bfa8f601563adb42ea7efdc75506754ef8ce08f86f536d601
 AUX protobuf-3.12.0-system_libraries.patch 6352 BLAKE2B 17f24c6cdcc845dada12424fe987e214d3be19b90c82abbb12829287811bd9e46757df3ae65db49b30b47aeefdd8ded79e15e01483f2222b1fa3e8f3ef1d319d SHA512 76c41f48c9661a30aac0cd9e71f52101e3068725bd8e1b0f46bea113115233739849978750f063241fd45b2982d41a8da7b0e972afc3d4cd517943d533fffa91
@@ -10,15 +7,13 @@ AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad
 AUX protobuf-3.13.0-protoc_input_output_files.patch 10321 BLAKE2B 3973d819c43f30d81d162b0ff167582f2983ca2752b33315e7f0b462068d437b8fe7b6faac9d3dd96f17740919ed51b19837e75b96791d765f347415ae893fcb SHA512 5812e471f83ec368886e2682f84ff5c92ad6b2a897e1cba3a1b8fbf291c0349d411ac06bc013d514fdc42eb40559f6d78bcebbe5826ab1efcbb1f851db1b74e5
 AUX protobuf-3.13.0-system_libraries.patch 6352 BLAKE2B a615d54449fe8bad5d9c7f0b4f03c0ded27c3fc4dc7d0fd6fc78874e65096731a5436a2569396ccd13c5f185bf73823eb70274e71c1bc35cccc820a2318ace5c SHA512 4a2f0fdd2512c8e8abd108bfb986d788153c2ccd761318fe05aef49f268814f2f6f35350bf2fadaafe3e5250521739cc5660f0106437f75831a8704fa755f817
 AUX protobuf-3.14.0-protoc_input_output_files.patch 10684 BLAKE2B 79b86a293fd48e3694327e772dbb7e7ecad2ceaa4d719e2eef5a6221face7bbc26ed00d1efdf9e73dedb9b437603ba6560b5812bbce1c4585bf2d4813afe3aa0 SHA512 35f0ffad2ed3c3d37ba832be4bafa59577e91fba7bef862581369ab92d8c4d3dd801f2e5ec486d989d5e8dfbd04d52d0a869aaecb62c716696a8e3ff6fb9c4db
-DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-EBUILD protobuf-3.11.4.ebuild 3019 BLAKE2B b8efa8797e32842f1009580492a26fb0557a9555713875012d13aa4de247417c81c451ea0c6eeaf8a784a497591a29afa6516422a48c29c87e1e962d4f945617 SHA512 0955a68f5d0aed9a963c43aaf04f649a019dbf2a93f38f3561f7a276dfa8b3877291448dbb3680b89b4643d3ad6b1d3f621504614171c001ca6373eb9bf03cd3
 EBUILD protobuf-3.12.2.ebuild 3020 BLAKE2B a75798fd86e9932be6945ece2b4e8f74656104d96e144a5a6f216b1e24f0b502b3eac2eb49b27a9aee13e67b9cd1fc9822a75c7ce787538a176111ec94520cd2 SHA512 6f5eccb00c57a2915b540f238d3ef838b9f2bceb3eee3aa517a6cdb15f662ac81c335dac719bd05050004c8bcc5e94d8578b9bef76e48a930eaf1a68f823be1f
-EBUILD protobuf-3.12.4.ebuild 3215 BLAKE2B 7a1325827898a6df817b6c5afecf49a5440825c76467497bd0fb89e4fc80b47b84730c384d2d7a9df02970286b4887a9280bf0ec2e3b6aa19de12e32316c2e2e SHA512 e68cf52f1f68c1d18c1b4bfcb537b95e843028f7b50ec5ba12da6fd6e5ff04da534f5ab71634c2159a30c272e6c5039e0f79df72f76e5e2ad325fc1fb5e17d69
-EBUILD protobuf-3.13.0.ebuild 3209 BLAKE2B 6442a74986c7bd194fea2b504891e395f887ab18b0c0c3256682f81d204207c990751c7777d5fe0f6b28769ca10985f0aa494f7f2075787f93230ff74486b751 SHA512 11b53689c211e6c7906b39e6e31e3ebb8ca67975521527b1a90bc95215d1461a3ca1089ee6eb65a6b161afc2948c281af0a2e1dd21c5c2b80e3e83d77fc70cb4
+EBUILD protobuf-3.12.4.ebuild 3216 BLAKE2B 00884ac0dbfbe0f0219278f0af46510a8c706a01e5085266913f09438b03883a39b681100867b1fd5dc9fd4e7719b22c1e881c1513ef9b2c09242a221a19fcb5 SHA512 194f2956012785bf70ecdcc672ae57cbf80c26ea527a24acc221095a2c814e917eb26ac22aff33d5915cc2568fae11d99c1639f734f2f1da043c950a686c7631
+EBUILD protobuf-3.13.0.ebuild 3210 BLAKE2B 6ad4aabf63162d03ef99ef68e5d34b351fcf50e0a20aa280e857d91983d81cb5066b819a344dfa829218c2cf6d69f0314298e18043b4fc8a4734df03c42dc51e SHA512 576217f7ea29f88605a0ece76c6008695256cd2ac204b827e5f74ce91c03ec35d5b798f26960adc22783667d6a64e19a870544d804c80fa43f954bda296009af
 EBUILD protobuf-3.14.0.ebuild 3021 BLAKE2B 0e35f27fba228ee5504205dc82049e03b35326a7d0a299e83d11a43b5b5e48ed99663334c031c2a69554049bd9f8e4ba07ea83e2e506379ff3bda9ce7bde6161 SHA512 9b284a5ce2666bcaf7d1fae8dba283b4ba00afe6337e167e7df0c67a1d0af31b15aafa10f0fa1f017a0f8d836bf99c44903b52c3385888032439667442160b19
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B d57420114a77e371e0d1b8aa311ab56f9e44df7c3eb1c6d32dd15b04e840d1e4b61c178317f596616804d740e1c903c7fc8a423f72d1a63b16d62f2fb4b393ae SHA512 e0457cc8e279393eae5f8a6b8ac194688e27e6fc89ec0a54e9c266f86f7bdf5ce83b024002954e30386600b9abd4d4758347652f5087f4a81a67103271883b4e
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch
deleted file mode 100644
index ec043e3865c1..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
-
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -714,7 +714,7 @@
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
--                 no-warning-test $(GZCHECKPROGRAMS)
-+                 $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -901,4 +901,4 @@
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
--        protobuf-lite-arena-test no-warning-test
-+        protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch
deleted file mode 100644
index 0e22b34efc3e..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -938,6 +938,28 @@
-   }
- 
-   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+    bool success = false;
-+    int in_fd = STDIN_FILENO;
-+    int out_fd = STDOUT_FILENO;
-+
-+    if (!protobuf_in_path_.empty()) {
-+      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+      if (in_fd == -1) {
-+        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
-+        return 1;
-+      }
-+    }
-+    if (!protobuf_out_path_.empty()) {
-+      out_fd = open(protobuf_out_path_.c_str(),
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-+                    0644);
-+      if (out_fd == -1) {
-+        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
-+        close(in_fd);
-+        return 1;
-+      }
-+    }
-+
-     if (codec_type_.empty()) {
-       // HACK:  Define an EmptyMessage type to use for decoding.
-       DescriptorPool pool;
-@@ -946,13 +968,20 @@
-       file.add_message_type()->set_name("EmptyMessage");
-       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
-       codec_type_ = "EmptyMessage";
--      if (!EncodeOrDecode(&pool)) {
--        return 1;
--      }
-+      success = EncodeOrDecode(&pool, in_fd, out_fd);
-     } else {
--      if (!EncodeOrDecode(descriptor_pool.get())) {
--        return 1;
--      }
-+      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+    }
-+
-+    if (in_fd != STDIN_FILENO) {
-+      close(in_fd);
-+    }
-+    if (out_fd != STDOUT_FILENO) {
-+      close(out_fd);
-+    }
-+
-+    if (!success) {
-+      return 1;
-     }
-   }
- 
-@@ -990,6 +1019,11 @@
-   for (int i = 0; i < proto_path_.size(); i++) {
-     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-   }
-+  if (mode_ == MODE_COMPILE &&
-+      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+         << "decode operations. Ignoring.";
-+  }
- 
-   // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1650,6 +1684,12 @@
- 
-     codec_type_ = value;
- 
-+  } else if (name == "--protobuf_in") {
-+    protobuf_in_path_ = value;
-+
-+  } else if (name == "--protobuf_out") {
-+    protobuf_out_path_ = value;
-+
-   } else if (name == "--error_format") {
-     if (value == "gcc") {
-       error_format_ = ERROR_FORMAT_GCC;
-@@ -1786,29 +1826,50 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2123,7 +2184,9 @@
-   return true;
- }
- 
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+                                          int in_fd,
-+                                          int out_fd) {
-   // Look up the type.
-   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-   if (type == NULL) {
-@@ -2135,15 +2198,15 @@
-   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
- 
-   if (mode_ == MODE_ENCODE) {
--    SetFdToTextMode(STDIN_FILENO);
--    SetFdToBinaryMode(STDOUT_FILENO);
-+    SetFdToTextMode(in_fd);
-+    SetFdToBinaryMode(out_fd);
-   } else {
--    SetFdToBinaryMode(STDIN_FILENO);
--    SetFdToTextMode(STDOUT_FILENO);
-+    SetFdToBinaryMode(in_fd);
-+    SetFdToTextMode(out_fd);
-   }
- 
--  io::FileInputStream in(STDIN_FILENO);
--  io::FileOutputStream out(STDOUT_FILENO);
-+  io::FileInputStream in(in_fd);
-+  io::FileOutputStream out(out_fd);
- 
-   if (mode_ == MODE_ENCODE) {
-     // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -288,7 +288,9 @@
-       GeneratorContext* generator_context, std::string* error);
- 
-   // Implements --encode and --decode.
--  bool EncodeOrDecode(const DescriptorPool* pool);
-+  bool EncodeOrDecode(const DescriptorPool* pool,
-+                      int in_fd,
-+                      int out_fd);
- 
-   // Implements the --descriptor_set_out option.
-   bool WriteDescriptorSet(
-@@ -420,6 +422,13 @@
-   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<std::string> descriptor_set_in_names_;
- 
-+  // When using --encode / --decode / --decode_raw absolute path to the output
-+  // file. (Empty string indicates write to STDOUT).
-+  std::string protobuf_out_path_;
-+  // When using --encode / --decode / --decode_raw, absolute path to the input
-+  // file. (Empty string indicates read from STDIN).
-+  std::string protobuf_in_path_;
-+
-   // If --descriptor_set_out was given, this is the filename to which the
-   // FileDescriptorSet should be written.  Otherwise, empty.
-   std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -95,7 +95,7 @@
-   virtual void SetUp();
-   virtual void TearDown();
- 
--  // Runs the CommandLineInterface with the given command line.  The
-+  // Run the CommandLineInterface with the given command line.  The
-   // command is automatically split on spaces, and the string "$tmpdir"
-   // is replaced with TestTempDir().
-   void Run(const std::string& command);
-@@ -2491,6 +2491,17 @@
-               std::string::npos);
-   }
- 
-+  void ExpectBinaryFilesMatch(const string &expected_file,
-+                              const string &actual_file) {
-+    string expected_output, actual_output;
-+    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+    // stdout on failure.
-+    EXPECT_TRUE(expected_output == actual_output);
-+  }
-+
-  private:
-   void WriteUnittestProtoDescriptorSet() {
-     unittest_proto_descriptor_set_filename_ =
-@@ -2585,6 +2596,19 @@
-       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
- }
- 
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
-+  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  EXPECT_TRUE(
-+      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-+          " --encode=protobuf_unittest.TestAllTypes" +
-+          " --protobuf_in=" + TestUtil::GetTestDataPath(
-+              "net/proto2/internal/"
-+              "testdata/text_format_unittest_data_oneof_implemented.txt") +
-+          " --protobuf_out=" + out_file));
-+  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
-+      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-+}
-+
- INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
-                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
- }  // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch
deleted file mode 100644
index 8311ce8b22e9..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -11,28 +11,10 @@
- # Always include third_party directories in distributions.
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest
- 
--# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
--# because then "make check" would also build and run all of gmock's own tests,
--# which takes a lot of time and is generally not useful to us.  Also, we don't
--# want "make install" to recurse into gmock since we don't want to overwrite
--# the installed version of gmock if there is one.
- check-local:
--	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
--	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
- 
--# We would like to clean gmock when "make clean" is invoked.  But we have to
--# be careful because clean-local is also invoked during "make distclean", but
--# "make distclean" already recurses into gmock because it's listed among the
--# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
--# cd to the directory again and "make clean" it will fail.  So, check that the
--# Makefile exists before recursing.
- clean-local:
--	@if test -e third_party/googletest/Makefile; then \
--	  echo "Making clean in googletest"; \
--	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
--	fi; \
--	if test -e conformance/Makefile; then \
-+	@if test -e conformance/Makefile; then \
- 	  echo "Making clean in conformance"; \
- 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi; \
---- /configure.ac
-+++ /configure.ac
-@@ -223,12 +223,5 @@
- esac
- AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
- 
--# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
--#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
--#   too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([third_party/googletest])
--
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -708,19 +708,11 @@
-   google/protobuf/testing/file.cc                              \
-   google/protobuf/testing/file.h
- 
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                  $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
--                         -I$(GOOGLEMOCK_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -812,12 +804,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                       libprotoc.la                                   \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
--                                         -I$(GOOGLETEST_SRC_DIR)/include \
--                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
-+                      -lgtest -lgmock -lgmock_main
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES =                        \
-   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -838,11 +826,7 @@
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
--                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
--                             -I$(GOOGLETEST_SRC_DIR)/include
-+                           -lgtest -lgmock -lgmock_main
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_test_SOURCES =                                           \
-   google/protobuf/lite_unittest.cc                                     \
-@@ -854,11 +838,7 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
--                                    -I$(GOOGLETEST_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES =       \
-   google/protobuf/lite_arena_unittest.cc \
-@@ -868,8 +848,7 @@
- 
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
-+                    -lgtest
- test_plugin_SOURCES =                                          \
-   google/protobuf/compiler/mock_code_generator.cc              \
-   google/protobuf/testing/file.cc                              \
diff --git a/dev-libs/protobuf/protobuf-3.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild
deleted file mode 100644
index 568a3f45c37d..000000000000
--- a/dev-libs/protobuf/protobuf-3.11.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/22"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.11.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.12.4.ebuild b/dev-libs/protobuf/protobuf-3.12.4.ebuild
index 163d17cfe649..1229fc8ca166 100644
--- a/dev-libs/protobuf/protobuf-3.12.4.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.4.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild
index 591ab50c2919..5ae0b5a2bea1 100644
--- a/dev-libs/protobuf/protobuf-3.13.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.13.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 06743dad1a61..47cb8db700ec 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -1,7 +1,11 @@
 AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9
+AUX rapidjson-1.1.0-system_gtest.patch 1270 BLAKE2B f34691f9449dec16c1c1852cb02a0652db195901bdbb811e682ee3f012b58caf436a3a317b9459d3a4a74e6c267d8110b06996689bef0d019c247e91957bbbec SHA512 2ae498dae5e10503edff590b470cfaaecaac78cbdef15a03cd647e3bf6d1dbae286bf381383e2524ea1c8655f377a68df899f4204dd4c31b3414faa1444d18cb
+AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb025d0d79cfdca175168d8ad88d947cdf0ffd7b2bb7150563e6adc4f6f43c9e1513f7066e99ab41ffe151bf3503f2e279c1baff535 SHA512 edce6fa3433380487c321ba1b735f08c237d058abb59167b055985272acb83be863650141fcdca5c099b3f3b81f342531b8088e6ef66f71389f2d830b74074e1
+AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 EBUILD rapidjson-1.1.0-r1.ebuild 1099 BLAKE2B 355d7cc8a583a2fe0ba2d033376f81d4f8cd6879461afdc03b6caf2ed947fedfd5eeb389cd546c0a978c66bdfa4be120e815140b1e0e9d9910fe4909af318430 SHA512 373409249dd5530a5619e1c5d7c29edea6246c1d238b820d98d058a0a1afdaa62311d8ea61ea99c02c971866fbdb626a8d9e68ceb78e18e1a5e1aa3d046e8f71
 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189
+EBUILD rapidjson-1.1.0-r3.ebuild 1337 BLAKE2B 1ab8905bb9168211eba005d25ca10401f823568120b859a72b7537eb4a3af4cdbf4a8821d8619552c3cd399510285af36becec2a121c3e890ac73f78fc2e3dbc SHA512 801a54f843b9ce7d5632c9da060b651b88987b9686c6bd74fec7a624ea7469c41e81c6f0439dd8ff4a2db6ed380eca994b66c2488f4706b0f086a3f8c2f40623
 EBUILD rapidjson-1.1.0.ebuild 907 BLAKE2B 6d3d531856301c37083b50f0d9a2454b305df7f02e5fee3ba22b3063943afc726f976820fc8a081d77cca87b0f1081e37165962cb272d585dad73eae855c129b SHA512 d049d8687b714f5d12142da93ab170a2a9081f7a50181347c5b6ff1f5096eac40fd231fa65072f30db705b008130990d10f51d68ff7f9c2ac943c5829a2efbee
-EBUILD rapidjson-9999.ebuild 1163 BLAKE2B 40c820e4a248819e0c9452d691d36900223da3ae76f86c83a90985e7f6ce923f07f7d8550d7fef1be1a280ddd9613e68ec53c80635fa9e0415ba74ce47c69659 SHA512 a4fade593c5943b556380f9c41f0d9a4ce0bb8b2c2ca1bf9f779af6de599c49e479ee7e6d04dc7c501be45c6257e24553b7206bf7fdff634283430b924f031c2
+EBUILD rapidjson-9999.ebuild 1341 BLAKE2B f985212651256604f3e2ef7c58581dbc21d95c4b2d53a25847a70403520956b30b87cc3d9d18d316004d8dbcce96b906aadb7bdb28a8b15e0d84f370bf500b6c SHA512 0c4b5c74f2510a8623e09a2b10a7e564ac1cda70875d061ef2a02e4fe0dfe219b8118295c1a996399e00a9919f2af4cdab77e2a100fbd492a6efd74280183302
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch
new file mode 100644
index 000000000000..bdc720e8cf86
--- /dev/null
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-system_gtest.patch
@@ -0,0 +1,44 @@
+--- /CMakeModules/FindGTestSrc.cmake
++++ /CMakeModules/FindGTestSrc.cmake
+@@ -1,30 +1,9 @@
+-
+-SET(GTEST_SEARCH_PATH
+-    "${GTEST_SOURCE_DIR}"
+-    "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/gtest/googletest")
+-
+-IF(UNIX)
+-    IF(RAPIDJSON_BUILD_THIRDPARTY_GTEST)
+-        LIST(APPEND GTEST_SEARCH_PATH "/usr/src/gtest")
+-    ELSE()
+-        LIST(INSERT GTEST_SEARCH_PATH 1 "/usr/src/gtest")
+-    ENDIF()
+-ENDIF()
+-
+-FIND_PATH(GTEST_SOURCE_DIR
+-    NAMES CMakeLists.txt src/gtest_main.cc
+-    PATHS ${GTEST_SEARCH_PATH})
+-
+-
+ # Debian installs gtest include directory in /usr/include, thus need to look
+ # for include directory separately from source directory.
+ FIND_PATH(GTEST_INCLUDE_DIR
+     NAMES gtest/gtest.h
+-    PATH_SUFFIXES include
+-    HINTS ${GTEST_SOURCE_DIR}
+-    PATHS ${GTEST_SEARCH_PATH})
++    PATH_SUFFIXES include)
+ 
+ INCLUDE(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(GTestSrc DEFAULT_MSG
+-    GTEST_SOURCE_DIR
+     GTEST_INCLUDE_DIR)
+--- /test/CMakeLists.txt
++++ /test/CMakeLists.txt
+@@ -8,7 +8,6 @@
+         set(gtest_force_shared_crt ON)
+     endif()
+ 
+-    add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
+     include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
+ 
+     set(TEST_LIBRARIES gtest gtest_main)
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch
new file mode 100644
index 000000000000..071a3d2392df
--- /dev/null
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-valgrind_optional.patch
@@ -0,0 +1,21 @@
+https://github.com/Tencent/rapidjson/issues/1808
+
+--- /test/unittest/CMakeLists.txt
++++ /test/unittest/CMakeLists.txt
+@@ -77,12 +77,15 @@
+     COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
+     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+ 
+-if(NOT MSVC)
++find_program(VALGRIND_EXECUTABLE valgrind)
++if(VALGRIND_EXECUTABLE)
+     # Not running SIMD.* unit test cases for Valgrind
+     add_test(NAME valgrind_unittest
+         COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.*
+         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
++endif(VALGRIND_EXECUTABLE)
+ 
++if(NOT MSVC)
+     if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+         add_test(NAME symbol_check
+         COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0"
diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch
new file mode 100644
index 000000000000..b40a39fb13db
--- /dev/null
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.1-valgrind_optional.patch
@@ -0,0 +1,21 @@
+https://github.com/Tencent/rapidjson/issues/1808
+
+--- /test/unittest/CMakeLists.txt
++++ /test/unittest/CMakeLists.txt
+@@ -78,12 +78,15 @@
+     COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest
+     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+ 
+-if(NOT MSVC)
++find_program(VALGRIND_EXECUTABLE valgrind)
++if(VALGRIND_EXECUTABLE)
+     # Not running SIMD.* unit test cases for Valgrind
+     add_test(NAME valgrind_unittest
+         COMMAND valgrind --suppressions=${CMAKE_SOURCE_DIR}/test/valgrind.supp --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.*
+         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
++endif(VALGRIND_EXECUTABLE)
+ 
++if(NOT MSVC)
+     if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+         add_test(NAME symbol_check
+         COMMAND sh -c "objdump -t -C libnamespacetest.a | grep rapidjson ; test $? -ne 0"
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..546127329df2
--- /dev/null
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
+HOMEPAGE="https://rapidjson.org/"
+
+LICENSE="MIT"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/rapidjson-${PV}"
+fi
+
+DEPEND="
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-7.patch"
+	"${FILESDIR}/${P}-system_gtest.patch"
+	"${FILESDIR}/${P}-valgrind_optional.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e 's| -march=native||g' CMakeLists.txt || die
+	sed -i -e 's| -Werror||g' CMakeLists.txt example/CMakeLists.txt test/unittest/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DRAPIDJSON_BUILD_DOC=$(usex doc)
+		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
+		-DRAPIDJSON_BUILD_TESTS=$(usex test)
+		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+		-DVALGRIND_EXECUTABLE=
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 7abb247fd71d..081c33172b8d 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -19,23 +19,26 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/rapidjson-${PV}"
 fi
 
 DEPEND="
 	doc? ( app-doc/doxygen )
-	test? (
-		dev-cpp/gtest
-		dev-util/valgrind
-	)"
+	test? ( dev-cpp/gtest )"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-system_gtest.patch"
+	"${FILESDIR}/${PN}-1.1.1-valgrind_optional.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 
-	sed -i -e 's|-Werror||g' CMakeLists.txt || die
-	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
+	sed -i -e 's| -march=native||g' CMakeLists.txt || die
+	sed -i -e 's| -mcpu=native||g' CMakeLists.txt || die
+	sed -i -e 's| -Werror||g' CMakeLists.txt || die
 }
 
 src_configure() {
@@ -46,6 +49,7 @@ src_configure() {
 		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
 		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+		-DVALGRIND_EXECUTABLE=
 	)
 	cmake_src_configure
 }
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 82cb3a7d40ee..e86a63944f10 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,3 +1,3 @@
 DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
-EBUILD rasqal-0.9.33.ebuild 1705 BLAKE2B 9304dfaaea72b6c08e2365af95010f2e58638431ab0d32961c8fa44c03bd25eebf4adfd3003f5962f181aaa7bee410eb8435bbfd253b8a69b10e47f36a54961b SHA512 b30147de82552af1c2dd84f33c1b8998d764d04dafb725b8f756b5349e1c6265d5475583802944063cb9c9337af5de678df566ba9419d43932fb93eaa2fb26cb
+EBUILD rasqal-0.9.33.ebuild 1706 BLAKE2B 5ff1bca830df27e006e7d83d8bdc205b7e886f3ba2163b25198278bb1dea7254bc45dee32ab7f5bb7e0ab9db5e9b81e43b09b74a7c562cef5a5449636fde6271 SHA512 ca88a54790168ed62ea58e34de676a3b142eda261ce8630429a6158f24935e9767880f23775ef8b5738fc9056b0a96941d66cb23683db0003933404de6f80db6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index c56a9255e3ff..78ef01d39a04 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index e0116b513a1f..bb636e45f50a 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,4 +1,4 @@
 AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2529 BLAKE2B 3983034e689daf393e1b8b0ed8e9033156502af1a36d9f2eac90dbe9b787b4798b7451492a63c57cd1488464ceb25f2700d6e8d980db8ba7c1abc0831f2c4908 SHA512 9c8fdca31f8b5a704fbe31bf24bb3cee63296afc525bea857d27e47829262b12d8c5ef9a399081e7c6585a70cb9d454eca1c5d03852af998f87fa58a086918c7
+EBUILD redland-1.0.17-r2.ebuild 2530 BLAKE2B 67e24da1de10b664242284fe8da55f9f9dd6820de0793542716c50a49f7776bc8bf0eff52ee1ae694f73fdcdf582d72f099bd2708418fb90992c7fe990e2d41e SHA512 4599e7aaf32e21612498851647cbe6b8ea5f40df746c6230bc9cf21f6d6ab3f654189ba853a83e44a3d2a8660d3f7863978dfa26a9340f1633538fc579aa1c71
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index 0e970fb8f4d6..4b5f75099a81 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 915d17006517..1b5a53c9c5fb 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,4 +1,4 @@
-AUX shhopt-1.1.7-build.patch 1884 BLAKE2B 1854a892ddc14d7202efbb4ebf20778a10ae1c490a40b28157e313c711fb946a925f61a71cc2f3919f6f55718636d05486e79e89f730575528bc3b0d2894fa34 SHA512 79eca8ada571f2f514d540a4c52fdf9503764f67422173bff160ed3ca04b0578c0a88a147234ffaad7a5ba94ab7d265785277062b25438abb888c92fab99d4a8
+AUX shhopt-1.1.7-build.patch 1751 BLAKE2B bb3fd0376bdf0da0c1a26b1472f9edd7dc21b628bc89577a3bb56fbabb3555667df70837cf47ce4361d369112972912c4388b55a4b28ae35100c82da3015bc60 SHA512 ba11cfd9ae4d75d676b15e2ab7a1d017f59193908e4e0b51ca2d5b2dc8fcdbce9e839d6835d5a05761464c7177ae20be5c3ef059e4d2a52f100f0b949811e089
 DIST shhopt-1.1.7.tar.gz 9923 BLAKE2B 4f9fb23a67c03caf6c56227729a681eac3ee9c78e16f56d6fedd2b1cdbe56471150d9e91ecf84945348078d03102aa7e7cc98b4cf11dda6f5da79d1edc48b96d SHA512 bd985d50e87808b5c6993496ba3e7c255d47895d90e108f03fd72bb273e786730898048af3b30ca29cb5dbd058f2ea178ca73b6362211c50aa0eb75f743b5ec8
-EBUILD shhopt-1.1.7-r3.ebuild 662 BLAKE2B 65f8672454fc417d5a421dd742b11e4fd1a45959456b1139dda9f0c0ba9fbc9669e5b02b09d89cdac5146768ae4f16d952b233094475423229426a5632ec1789 SHA512 f2833566926e3b1ff808f0b10785d900a83b44afc1f457a7204b0aa9308281ab62a15f906c4e57217029ddda1547330c71f4221203e17b451d830be21fe7cbe7
+EBUILD shhopt-1.1.7-r3.ebuild 641 BLAKE2B 4109e69faae2724e469d002de54d35270dfd3fd4f3cd6f79b640847d3b18d47ed80c5fc7aa97700865f8cc1e9f2b7e2401be4ec04fd64eb74b413430b29935a2 SHA512 6c8f5fe4f91dc898fbd576a81f6dc1177eb178ea57c58c1cb2bfb2a60ea7da27ff0abc2db8366b0ab695fedd83dcdca66287c413250cc189b198e53bab3e3df8
 MISC metadata.xml 341 BLAKE2B 738802ec66db2e5052eb57b90dd0076cca1afbdca62fa325f920f0ec6f4ff4b78f886402783ad6f97c7b10e4e2ec10bbaf1bf2bc8823bd48d048c35141a6cb77 SHA512 276ee6e17baeb1981c1c912b4f281d7eb71b171492d00d5ce522c3d6defbba4eef3dd87b43d4ec02eda21cfe148f2b0dcbe04d7dbd9a42918168844b563427f4
diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
index 3405511e2238..954011994bc9 100644
--- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
+++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
@@ -1,12 +1,12 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -5,20 +5,15 @@
+@@ -5,17 +5,11 @@
  VERPAT		= 7
  VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
  
 -# Define SHARED as 1 for Linux shared ELF library
 -#SHARED		= 1
--
+ 
 -ifeq ($(SHARED),1)
  LIBTARGET	= lib$(DIST).so.$(VERSION)
  LIBTARGETSO	= lib$(DIST).so
@@ -15,69 +15,55 @@
 -else
 -LIBTARGET	= lib$(DIST).a
 -endif
-+
-+LIBTARGETA	= lib$(DIST).a
  
  LIBHEAD		= $(DIST).h
--TARGETS		= $(LIBTARGET)
-+TARGETS		= $(LIBTARGET) $(LIBTARGETA)
- 
- INSTBASEDIR	= /usr/local
- INSTLIBDIR	= $(INSTBASEDIR)/lib
-@@ -27,12 +22,12 @@
+ TARGETS		= $(LIBTARGET)
+@@ -27,12 +21,9 @@
  INSTALLPROG	= install -m 755
  MKDIRP		= install -d -m 755
  
 -CC		= gcc
 -OPTIM		= -O2
 -
--INCDIR		= -I.
--
+ INCDIR		= -I.
+ 
 -CCOPT		= -s -Wall $(OPTIM) $(INCDIR)
-+CC		?= gcc
-+AR		?= ar
-+ARFLAGS ?= rc
-+RANLIB	?= ranlib
-+CPPFLAGS += -I.
-+CFLAGS += -Wall
++CCOPT		= -Wall $(INCDIR)
  
  # Object files to store in the library
  LIBOBJS		= shhopt.o
-@@ -43,21 +38,19 @@
- # don't worry if you get ranlib not found errors.  This probably means
+@@ -44,12 +35,7 @@
  # that your ar does an implicit ranlib and you do not need to run ranlib
  # separately.  This error is harmless.
--$(LIBTARGET): $(LIBOBJS)
+ $(LIBTARGET): $(LIBOBJS)
 -ifeq ($(SHARED),1)
 -	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
 -else
 -	ar rc $(LIBTARGET) $(LIBOBJS)
 -	ranlib $(LIBTARGET) || true
 -endif
-+$(LIBTARGET): $(LIBOBJS:.o=.lo)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $@ $^
-+$(LIBTARGETA): $(LIBOBJS)
-+	$(AR) $(ARFLAGS) $@ $^
-+	$(RANLIB) $@
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
  
  # Note that you may need GNU's -liberty if your libc lacks strtoul
  example: $(LIBTARGET) example.o
- 	$(CC) -o example example.c \
+@@ -57,7 +43,7 @@
  		-L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt
  
--.c.o:
+ .c.o:
 -	$(CC) $(CCSHRD) -o $@ -c $(CCOPT) $<
-+%.lo: %.c
-+	$(COMPILE.c) $(CCSHRD) $^ -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(CCSHRD) -o $@ -c $(CCOPT) $<
  
  depend dep:
  	$(CC) $(INCDIR) -MM *.c >depend
-@@ -73,7 +66,7 @@
- endif
+@@ -66,11 +52,9 @@
+ 	$(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
+ 	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+ 	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+-ifeq ($(SHARED),1)
+ 	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
+ 	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+ 	echo "Now run ldconfig if necessary."
+-endif
  
  clean:
--	rm -f *.o core *~ depend
-+	rm -f *.o *.lo *.so* *.a core *~ depend
- 
- chmod:
- 	chmod a+r *
+ 	rm -f *.o core *~ depend
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
index 1d63a8b89ea7..3710e4d865d3 100644
--- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ src_compile() {
 }
 
 src_install() {
-	dolib.a libshhopt.a
 	ln -s libshhopt.so.${PV} libshhopt.so || die
 	ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} || die
 	dolib.so libshhopt.so*
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 51e09972e282..1b415514843e 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,4 @@
 AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 DIST libstemmer_c-20140325.tgz 129506 BLAKE2B 46040a864b8111bcca1c858a16081542a9900e435e6154582e422e1687b8230b0a5f63c7e349e1ef47128eaa898891df7b87fd2a4d97d0c1304fb8af7ebb627b SHA512 938eb12d4fe9e229f21536a6cb8a4322e0b664a7fbc15685e7ad46b4a6ccdfbefc55cc484f86bc738791d6f3e6d1b61ba777a4332a62cf76a8b0a5efd2c2762b
-EBUILD snowball-stemmer-0.20140325.ebuild 1387 BLAKE2B 5f9b92fc96de39eac24a85f966fcede127b9e8f6ec19a4c1a025a439c7ea127bb4e17123fc7b4a3e1ae1da09fa781e6e844c3f86085e41b6e0cee16194756c0b SHA512 99ee101af35c24a080d82b9e06ea7d0c8a5d8d13725ab5deb3ca4e37b5408a7c287083134c1f906c5ada4235b06a48e86e91e96588c2932561ad12c3d33b9d3c
+EBUILD snowball-stemmer-0.20140325.ebuild 1388 BLAKE2B 2d39f9f0cf4d67f5b01cdd85a6452934054c72656036294f5044ca1ded557ec3b58ef549187b548780e8fdc4883067e5263381fac9fbcab2c2e253cf8159b82c SHA512 af42e7b0a519f6cc02ea70834a5d5a90960f447f40cc65212ad283e0af1bc2daa1a197404a9690586690986c824c807b713e225ae20ca25ac9f0d475b9a33b9b
 MISC metadata.xml 215 BLAKE2B f7ca08c496dce81653514ebb4de27022bfa50165d664a6ecd7201dae8a9914470fb4f2909cff468fdc235772b0ba86ba3f80cffa4f9051484992a0d6ae3e4367 SHA512 e92f7c910939f1ff7b7cd5df19679d7c08f9b62d58a9dd1dfda4e97d14772ea23a569d822bce780cc09d407165ea203a872f6137f00c1b2ec0147df7dece0829
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index 17e23fe54c29..2f285b7eeb73 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 
 # This could be used to package both libstemmer_c and libstemmer_java together.
 IUSE="static-libs"
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 81b9190c05f1..28532265d889 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -3,6 +3,6 @@ AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-EBUILD tinyxml-2.6.2-r3.ebuild 1487 BLAKE2B 9c7f40fa6f75d18464e3ec02bbbb8bc1aaa34627051b9794bdac8b6fd8a9aa90edabc4048964e53d231a98432f130149cc1be5e2a342226ffa86e6a7e189cdfc SHA512 0385f65ae7835d5686a3637a4a8e01452cfb48049d5b9bb7ff85bf679844b0c3f9893f26632f0c2ea8ac2be7df5ee095747738ff125432a46fda5bf55e8eeb38
+EBUILD tinyxml-2.6.2-r3.ebuild 1488 BLAKE2B 6f872747463e41d95f012e73770d36e426e649dd0119dd1780d9036c2f2b3da101cbbce071d3f4a1360e0bc094722a4eeaa2874c9329f6c36cef5b79ca416132 SHA512 44cf4a4f85502f7dcb8552d92466b287b470ea54997fa53ace9aab3e07434b95988d1de3fc31819a9b3d7c12526d038fb78cd23bfe6a7a79927bfacb6ff0104b
 EBUILD tinyxml-2.6.2-r4.ebuild 1582 BLAKE2B 21d9c20a0a2dafcbdaa8b1f0c2b8e5554994c0aaaa1261b55cce51419c78f29e37dfd54064aa8fb71d65ee3f2b12401da905c8b29747dcc196ae65f9c7a6c462 SHA512 679f45bae383058ba1428bf31a30f808a48307bd2fce3998d530b1a233ac24d99067408c98ac1ba96df6ca2a73e345ac14996af02c215051d009bde86aa4918c
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
index 8d6a4874c45f..6d275fc384c2 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index c387c6b2040f..c17a6c44cbb2 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,5 +1,5 @@
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
 DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
-EBUILD tinyxml2-7.1.0.ebuild 606 BLAKE2B 7980b36673f2a60aad432f55140272d670894ad51c50256d14559a6f54f6224cd6df4a7bf668c64a2d26fa8a9f141cbd6dee2b4eea81390b694a34fe5163f664 SHA512 8352ffc9ce6d44da1703252801c86b03dfbe93952c601932892d25759bc28f36ce29e24abe2391d8cff778a09cd7690a1774903ec8b72ad9833b71357f460cb8
-EBUILD tinyxml2-8.0.0.ebuild 606 BLAKE2B 20410da267fd7ee41bcd1cf4b37c12199de192b1c588ea40fb5cb2a3ccb9f0a09b133360a8886901b3455b83bc100703b03a8b56a6221af1c06955072745c001 SHA512 c67dd61a76206f878a3211f4182cad1365a478d8734c39cc24653dc5c51b59542db625e47d3c4f99de5ca51db2a9ed62e7a942e76f39e76215c39014c94253a5
+EBUILD tinyxml2-7.1.0.ebuild 607 BLAKE2B 503cfd0921e8cdaa93e6455267b4d5ce3b385de81507bb8d8d95562ffe05a23956283f6831af7877649074552eecf81674f0840956e27eca0941ca5cf2359445 SHA512 ab1b4b699b9251bac89c2d416d3d6706468fb1c21f57ebce68231f11737599c435fc6b63df99f7d6140e39b46a6df9232772c89d8402a66e9fd1a56df0c1f4ba
+EBUILD tinyxml2-8.0.0.ebuild 607 BLAKE2B 0a6cd9fddf8c97db19fdad657bf52cb0a8a089e4997d9046c8441486844f83a29c3255401ca4e1df04fb79f9e9e2178f8c71d172776da3ebb4126dc7841e4769 SHA512 55a49d33644a136883bc37e14203fe02a3d3ebb4c0c1ebbe803a97da6f82b90b637b0ab3c787d05385fc9c4487179f20e3cf7c7bbd5db3c2a17f9aaf8d0cfcbc
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
index a9d54f3bf0f9..aa5c4ab1b175 100644
--- a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/7"
-KEYWORDS="amd64 arm arm64 hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
index 29231399aa61..c10fc8217190 100644
--- a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/8"
-KEYWORDS="amd64 arm arm64 hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index e6bafcbb2ec7..27a35e1a685d 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,5 +1,5 @@
 AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74ac490ce4ffa59d1494d879d9db481b89b0e3ef3a2a4601b8280ff8f1c54f4ccdc00716a904bff291923c4aaa02c SHA512 9f45299ccd21cc4e78946ad22963d4505e9cd430f49f275fbb742696029530e7e6eb848b0ae4bf55bb5e2a2ee77d3cf272b02e2a6a2ba7c3bd69f68816e300b2
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
-EBUILD tre-0.8.0-r2.ebuild 1454 BLAKE2B 95bd25dbcb07107500ef0de52c942e08e8c0031f8d40327508fcc24cad81108363e8311dc0cad66a07f0d54b53a073eaffdae928445aceac9ae88ea804ae8ae6 SHA512 9f2f38f70562649863608633b0d96ec4c21968eb8e20ccfc9404a57f5f0520e165bf00aa1343270531277a30171606d4c7648e231e4c6f28342908bfeaef30f3
+EBUILD tre-0.8.0-r2.ebuild 1455 BLAKE2B cd1c67ed4394b42a7b1871ebc6cd8fca2cb6da5be5f96491d6a20996642b1aca718db842331e12b3d3d3b7dc175faf43ec2e2839a12934a4c1f0398fa4c1f738 SHA512 cf184d2a734a97224c4ae03f1a062bafae034d3355430523448a0e3e5c8007fbeb87fcf7ca0c825d67c802e32f36cd7b69ed632e4a786243d67f388c8eb79f0d
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index 734f35f78699..47c0af16df64 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest
index f17e99698afd..523fcba2e46b 100644
--- a/dev-libs/ucl/Manifest
+++ b/dev-libs/ucl/Manifest
@@ -1,5 +1,5 @@
 AUX ucl-1.03-CFLAGS.patch 4187 BLAKE2B 1f59a598cd58d53b25ecb57cf35720a56de022d19c0b57d749ec7cd35b88d8549db712affecbd5902bf98b9b55d375c6b16107d23c3ca126c57ae5ed4d3dbc6c SHA512 4d9b608b2b19cecc6693beb73c5f775b6f1ffbe1e1138dfe77a1318891705a10319e4e728f193f68555bff55a3a24871ec58c2823c487442559987dcb392a890
 AUX ucl-1.03-x32.patch 6437 BLAKE2B 285d7efd85f631752e208f95dc9be4ed8904da63d0e0a20b3bed1f62bc08b6ba0f155f33d1ab9ef3a9f883f4068fa49de4bb286fb73a7aee5638005b18b31348 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef
 DIST ucl-1.03.tar.gz 534881 BLAKE2B 98df000bcf445963b901acf88b5d1a1065fd6f3eafd1b8adbda5bfe7ac1527b979252ff9d1e8474785f6f23a1a7452e39bf47ebac9216fcfff862625769cabd6 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
-EBUILD ucl-1.03-r1.ebuild 1156 BLAKE2B d26b7cca67f63112f5abc4896c8849135e8d8fe3c47c19763233ef71035e4f6b070f8be3ee7b076a3380e8556bb8b1262e660028edf74a31b81c2b094ba51362 SHA512 a2e4e0f66f91dc49c62238b41a483404f16812476d1f414d903bc06f4d4bd6603e3db1db21c521a67253123eff65f77c44b99afd38a2917ad6ffd74d75290913
+EBUILD ucl-1.03-r1.ebuild 1157 BLAKE2B 2400b7b0712ae856586b1ebd4c8963b08b8cb2baf22c82c21a4c5515af5ed0c62f37e981021c82738cc9cd1c673c686e1cfd1861d4b70e67fafeb0bb4e02fedc SHA512 c9211cb26760210e5bb9b10aaeee4104becfb49e32b2a774879451d7abe5239a65ac5e3c09caa0416815480012bf5729d1929b616339cc09057ad19c758e7bbf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 9828287020db..71e1cac0a157 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DEPEND="!!dev-libs/libucl"
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 2148fac4c39c..6fe0dbdbd459 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,11 +1,4 @@
-AUX ucommon-6.0.3-disable_rtf_gen_doxy.patch 373 BLAKE2B 40496f603ec50786007fc97ac0390ecf29b2a296ac77f16d91c8861e7b98725c03aff488697ed9e7492c56bd298b920aab8eae0425e1bfaca574860517c33f46 SHA512 e486d3fc9d6235979d0d1e75aa1f90b5d525d3b7806de2a80737a825c62e1b6b94ef5976609a9a7654ea82bc5620ad62232ce61310da393617c5e5d98e6362c0
-AUX ucommon-6.0.3-gcrypt_autotools.patch 1712 BLAKE2B b1c8a0385c931fd1284c4cbe7ec412367566b360b4befc1fe75dee6f489215f86dff84c0612b0535204d83b89aa220b8082fcdab521023c83dfa466215b74298 SHA512 57c2d80c6795fa890e3ece384f92da3d8f7d216c91e72920ebccd5fcb1358e41932cd6fc6861ce009305f90a00ed11fdabf6df7b5c7e216ddbb0a6916e163f69
 AUX ucommon-6.0.3-install_gcrypt.m4_file.patch 4902 BLAKE2B 5c56eb0d9e397a653eb1a932e49cdce0c30fbe52f98f8d1b7403c27f53f5371da6f0bde83dff18250bfec5c9d3817bedb803d49344183e0dc5cb117e688dea6a SHA512 13604093ed0dba4064a8868785309d1de645dc0d010940febbf29166f69302c7272293bf161514396064d4f2ef0805dc6bb30336773568b0e5959ef76c1a0aad
-AUX ucommon-6.3.1-gcrypt_autotools.patch 1258 BLAKE2B 894f22a1755bf0d41fc3148a9c4ae8721ae7cc6307ba925493fa1c7896142219f6738f5d403a62ffacb5f0b44e95a9d8fd78528e5e7c3d470129b4391e8cfe0b SHA512 7bb6ce14558c9aec961b83fbba7efa38eeff6bb165d0d66a68436eda10e2d209e7d340e13fdc1e5e453f1a091a045aece50ead78ad5634a81d2d123d1a166e78
-DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762
-DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24
 DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
-EBUILD ucommon-6.0.3.ebuild 1540 BLAKE2B 6b8a686eec4fe95ac91d5a6e0f00a0a5ae848ce27939c332a1c2fc093b19492e444c3af325bc14b7e1cfb6cff7331fa68fc6ed8147e68f83c33d8bdc2e52a2c6 SHA512 6b56d6e4f20d048881783366276a09820a9c0bb269f8d65acd3e4b4b968a9e966b49bc3cf7564ad5da53eb7268e6af9336c5d7d23df7a10cd86f1b58ee64a71c
-EBUILD ucommon-6.5.7.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
 EBUILD ucommon-7.0.0.ebuild 1484 BLAKE2B af9da035d218d5893778df542e1c4e268448f49490b74977a3e22d7a0f7fa04392cc416c58fc1dc45d7ae2ce35df4b608b1ea48446ee107352a110c7c96fd9dd SHA512 63a6e1f23bc2cb0ad097fdb13716dc40e28e9d3792f4561ef94afd2130482d7b9a0d88ba5f9680510d3a1ad7a205ef59e903b2c2fe7b525e3874929ff02c5fd1
-MISC metadata.xml 316 BLAKE2B 8c4be49ccdfcd5353854b5b44e7cab7917695d50af5cb0e539b4a5d58fc31d3d6a98e77af95d0254324ba49f39d64d05a28adf2edbc9a71512c1f8e14bd2f78c SHA512 8095298e0382cc3e245df76d9b5bd4f27c9cf803aafc5b3fe9a9d63c94733192287a0d0348904320f07ec3a24edc9c437f09065b12dc3226f7acbe1e055c774c
+MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch
deleted file mode 100644
index a872f54ffe23..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Doxyfile
-+++ b/Doxyfile
-@@ -37,13 +37,13 @@
- GENERATE_HTMLHELP = YES
- GENERATE_TREEVIEW = YES
- TREEVIEW_WIDTH = 256
--GENERATE_LATEX = YES
-+GENERATE_LATEX = NO
- COMPACT_LATEX = YES
- PDF_HYPERLINKS = YES
- USE_PDFLATEX = NO
- LATEX_BATCHMODE = YES
- LATEX_HIDE_INDICES = NO
--GENERATE_RTF = YES
-+GENERATE_RTF = NO
- COMPACT_RTF = YES
- RTF_HYPERLINKS = NO
- GENERATE_MAN = NO
diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch
deleted file mode 100644
index ff69e836a9d9..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,6 +8,8 @@
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- AUTOMAKE_OPTIONS = no-dependencies dist-zip
- EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
-     *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,8 +37,12 @@
- UCOMMON_LIBS=""
- OPENSSL_LINK=""
- 
-+AM_SILENT_RULES([yes])
-+
- CHECKFLAGS="$CHECKFLAGS"
- 
-+m4_include([m4/libgcrypt.m4])
-+
- case "$with_crypto" in
- ssl|openssl)
-     ssl="openssl"
-@@ -664,7 +668,8 @@
-     ;;
- gnutls|gnu)
-     if test ! -z "$GNUTLS_LIBS" ; then
--        SECURE_LIBS="$GNUTLS_LIBS"
-+    	AM_PATH_LIBGCRYPT
-+        SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
-         SECURE="gnutls"
-     fi
-     ;;
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -9,9 +9,9 @@
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
- MAINTAINERCLEANFILES = Makefile.in Makefile
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
- INCLUDES = -I$(top_srcdir)/inc
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@
- EXTRA_DIST = *.1
- 
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 pdetach.1
-@@ -27,7 +27,7 @@
- scrub_files_LDFLAGS = @SECURE_LOCAL@
- 
- mdsum_SOURCES = mdsum.cpp
--mdsum_LDFLAGS = @SECURE_LOCAL@
-+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
- 
- zerofill_SOURCES = zerofill.cpp
- zerofill_LDFLAGS = @SECURE_LOCAL@
diff --git a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch
deleted file mode 100644
index 7221890a9b7c..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,8 +38,12 @@
- OPENSSL_LINK=""
- MODULE_FLAGS="-module -shared -avoid-version"
- 
-+AM_SILENT_RULES([yes])
-+
- CHECKFLAGS="$CHECKFLAGS"
- 
-+m4_include([m4/libgcrypt.m4])
-+
- case "$with_crypto" in
- ssl|openssl)
-     ssl="openssl"
-@@ -598,7 +602,8 @@
-     ;;
- gnutls|gnu)
-     if test ! -z "$GNUTLS_LIBS" ; then
--        SECURE_LIBS="$GNUTLS_LIBS"
-+        AM_PATH_LIBGCRYPT
-+        SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
-         SECURE="gnutls"
-     fi
-     ;;
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -10,9 +10,9 @@
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
- MAINTAINERCLEANFILES = Makefile.in Makefile
--AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
-+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir)/inc
--LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@
-+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@
- EXTRA_DIST = *.1 CMakeLists.txt
- 
- man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
-@@ -21,7 +21,7 @@
- 
- noinst_PROGRAMS = demoSSL
- demoSSL_SOURCES = ssl.cpp
--demoSSL_LDFLAGS = @SECURE_LOCAL@
-+demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
- 
- args_SOURCES = args.cpp
- 
diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml
index 72a1c4cf8f6f..c5adddd4b3e6 100644
--- a/dev-libs/ucommon/metadata.xml
+++ b/dev-libs/ucommon/metadata.xml
@@ -5,7 +5,4 @@
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>
 </maintainer>
-<use>
-	<flag name="socks">Build with socks proxy support</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild
deleted file mode 100644
index 9c0884fe1ca6..000000000000
--- a/dev-libs/ucommon/ucommon-6.0.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug ssl gnutls"
-
-RDEPEND="ssl? (
-		!gnutls? ( dev-libs/openssl:0= )
-		gnutls? (
-			net-libs/gnutls
-			dev-libs/libgcrypt:0
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.3-disable_rtf_gen_doxy.patch
-	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
-	"${FILESDIR}"/${PN}-6.0.3-gcrypt_autotools.patch
-)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-
-	# Aclocal 1.13 deprecated error #467674
-	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/ucommon/ucommon-6.5.7.ebuild b/dev-libs/ucommon/ucommon-6.5.7.ebuild
deleted file mode 100644
index e8e90402975e..000000000000
--- a/dev-libs/ucommon/ucommon-6.5.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Portable C++ runtime for threads and sockets"
-HOMEPAGE="https://www.gnu.org/software/commoncpp"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
-
-RDEPEND="
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=
-			dev-libs/libgcrypt:0=
-		)
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-
-DEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	${RDEPEND}"
-
-DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch"
-	"${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
-)
-
-# Needed for doxygen, bug #526726
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Aclocal 1.13 deprecated error BGO #467674
-	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
-
-	# don't install latex and rtf documents
-	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
-		-i Doxyfile.in || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use ssl; then
-		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
-	else
-		myconf+=" --with-sslstack=nossl ";
-	fi
-
-	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
-		${myconf}
-		--enable-atomics
-		--with-pkg-config
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
-}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 3630b4215334..e252d025277e 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -4,10 +4,10 @@ DIST userspace-rcu-0.11.1.tar.bz2 527799 BLAKE2B b81ab5b3fd23e5666d422c1f627bc3c
 DIST userspace-rcu-0.12.1.tar.bz2 527626 BLAKE2B 56fcea0fb81573dc55a0a80064e92ea837efdbd8743879d599424b4f6b140c0e9b0a88ff9a42d9643fa25e914a5fc67e1a26e101c25aa5c67582caa5da4d746d SHA512 c0c14eede77358904dfb10774390fd86b4fa9e0ab25d278c869728d40eb263bfa7e489b20ce7198169e71d74fe41bb5018fc1553a5e0654840c9765e088c83db
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
-EBUILD userspace-rcu-0.10.1.ebuild 700 BLAKE2B ca8548ae18248485c2c1f8c6c8b1b2c43916c27d0efd5f164cafd7335a051700905301b1eaf588e40e16f98c019309ac95519cb9136ca2e4dbf642a30430b961 SHA512 e639ee70cdda9c5c3d6cb34495f185ae3180fb6b2be45c74bd6129b206cf530fd8a79e5f9619c3a869e49ecad6f133d5b010ff3fa729fe491158299412ca4600
+EBUILD userspace-rcu-0.10.1.ebuild 701 BLAKE2B be57518f89cac0573946ed0b4fd4dfab7f89c21046f5ee1a39bf77ada69b6177ca3465421e1185755d19307a6c15bbe8304d28d4766f703bf62858f73c50a0d3 SHA512 3e961d874e0dbbe16bcb7d4f74f02e5fb3aa8aa82387a7f7199f1e3c2b6a3b7528bb13c974077e8b2c7041fdb10831e7e0300ecc0ceeb3cbe69e136cc0d8590b
 EBUILD userspace-rcu-0.10.2.ebuild 707 BLAKE2B 590e0ca861bce65d2fdcf719bf7c286109c3210bfa2a5e81a981fc2f0db7409807a334dbd6d72fedf75c39009f6760344b8163adb5b90cc54efcfd00702d9473 SHA512 5fc4eb2befa1a2f9e4bbc1bd8b0c5febb9f172e304f46687389b8c9bfd705ab2b66707c5cbad0165f918993e0bf10fac93e0ff05241133b58cb38fad0c67e2a8
-EBUILD userspace-rcu-0.11.1.ebuild 699 BLAKE2B 19b729b56e2ac2538a6c4b2c9135f056728aabe4fbd0d3caf1eeb4e085d2f49c34bddef89d486b881c25616e691a517c8e4688d8aa84e1001ef6de0fb1352a30 SHA512 4d423df40b44739d883c85aaccb4bcb1a715e0072dec8b98279c057d30673953f04ee0667424634c56665afcf2fc1c11342120b1a894031595609dd56e1e1ba2
+EBUILD userspace-rcu-0.11.1.ebuild 700 BLAKE2B 34b0c77a1c001de1b7f17576d566f844342bb83f5a03474ec40b1daa7bba38736ca42bf4a4a29d43f7ee5fc94e634387b8ebe35ac44c48d08401776d27643096 SHA512 f1fec987b003fdf73bcc179e96b4a82e4a0159348a52b07cc9d439eda42f608d4dfde931f022889f6f04c9d28c9e7dc828ca7554b5f9129ddf0cf0baceb18b07
 EBUILD userspace-rcu-0.12.1.ebuild 707 BLAKE2B d6df7f445af5b7bf3d541b24650ee6c91c26a45f670d4c98b2cf6bd92cad8b3c1f14582012f4a7c8f429f3224ecd5eb7b44f3aa5bc4e8ed7a4edb4337e54538a SHA512 b9c0462a8a72b9e0590fb77128ae6692ce20ceeb5346bc2f069541d6b8779e4ee5bde9baae9577551dff8552c0a4dd0d4922cf1f96a5e8507e71aa754709eea7
-EBUILD userspace-rcu-0.9.1.ebuild 767 BLAKE2B 640626c84e8e8d73c952c60c5ef1ae254b962f8ed6c267cae337b09f6fc02052c32c9f4ca80496b8f19a30909726af0a594c7bc19b5d64c9761072d52b090393 SHA512 167061897eb085a5ce1a23579c432cbe67863774efbc878c7605fb4626bc051b30080ba4e348d0f91aae8f4e8286d6636fcd05282791f796e35f4e855726b663
+EBUILD userspace-rcu-0.9.1.ebuild 768 BLAKE2B 7948591ffb013f689b5903d5017f8db99366b6cd214d5042b776ddb175f9557974992d4133c9ef763906ab6ec699292b5995c26186052776b0004906e6eabf60 SHA512 ba53d992aa6f9c54603d1e7ad85fcd79b169b132b5b497b4eb63a42f3672a475db0a859c39d6dad573af1ac92535f113093277d84145fa8c0c120bfac710d075
 EBUILD userspace-rcu-0.9.2.ebuild 773 BLAKE2B daa3a0f6575c41a25c92932d4823b5387b4c9895ca984373a8a2bd770b078986c6519a0ebaa360544437878a335d26694bb48c8cd3308ac672f9514d9f0126a6 SHA512 6e1ce7780fb22d2f0d382f3d3af5872162c6ded4f434fd1b300249bbc410b1d431beed61469b3c6a1a55518c2843a095da1308963f60aa95c1eb0bb36989c4ad
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index fce08c01159b..31b1212593f7 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs regression-test test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
index 66b3fdd54941..fa94af45224e 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs regression-test test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
index bc6d535ebc8c..29f07a0559d9 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname version
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 x86"
 IUSE="static-libs regression-test test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 2ba7a0400d31..4abc5b74ef0a 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,6 @@
-AUX uthash-2.1.0-cflags.patch 250 BLAKE2B a42296b08231b3eb31ce0830cc07e0287ad2439c9fa239ffea3a3594f3265e3299a8800c2d44387d05666685e4b5b980306e1ebac23c2b663620d8f19f348f8f SHA512 79ad3d9d4efddc51307b6e9ec37925c46c01fb0bacdfe7343fc08a4a99278de09bdc486b59c2348116ee7b5eb5cce47935953a182f5f520f713b6ef43c9f84d4
+AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
 DIST uthash-2.1.0.tar.gz 191782 BLAKE2B 322661aca33e8df27ec3166cd16549b11f49a6f9eb12f11c78f44b75baf5d9f208825028fb3b89a380277de5784bf2d4c41a6cd2ff070b1d3cd667ec074a85d2 SHA512 c8005113a48ec7636715ecec0286a5d9086971a7267947aba9e0ad031b6113a4f38a1fb512d33d6fefb5891635fdd31169ce4d6ab04b938bda612ebbccb3eda0
+DIST uthash-2.2.0.tar.gz 191356 BLAKE2B ca07634c30f49fa21af5fed9ed254351d038ca9f831b2c3f3fb545ee451833aaec9e1666572635e2fd31d6b791fb88800e7d870aba2cda0cfbeddcba20d969a9 SHA512 441ee907adc39c9b7e9c1f478966b7e8ddebb94cb6d5db9d2db409aee9a5e237033ee8cef3fed1c719fea01c7cfb5991554ac89f5a1e59241bd5c6eb4854cebe
 EBUILD uthash-2.1.0.ebuild 649 BLAKE2B 3afd91e81a06ac12ff967a8196d81282596a9b5d3db5d8dcff8cbc1e20efb48839df081406f96f29b997c0184907800d3abaa6df79be0700f98e54554262c9af SHA512 47043056937f33b1fb8f74f56c6ae22dd23b684069faac09058a4a48511f3069287c4472ee9afee643d9a6bb6184bf3d08057094cc32576f09e18db20dc14a90
+EBUILD uthash-2.2.0.ebuild 660 BLAKE2B c12c11591b1d99d4ac3f43692a4306124eb287d828c52b553dcc38e67d6c3d6d9f16b7d2fcc11c615a2957117001b177d26ed83c8fe83761d08117c616d2ab79 SHA512 f644a9570054680464c26e09f821dbaee64fd17703dd80f0b5fe5e1b14a4b5580e7542dbb26960d67135918a6567ead5c23a1b2e51490b90794d68042784c846
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
index 588ec26078c0..246a5827afae 100644
--- a/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
+++ b/dev-libs/uthash/files/uthash-2.1.0-cflags.patch
@@ -1,5 +1,5 @@
---- uthash-2.1.0/tests/Makefile
-+++ uthash-2.1.0/tests/Makefile
+--- a/tests/Makefile
++++ b/tests/Makefile
 @@ -18,7 +18,7 @@
  CFLAGS += -I$(HASHDIR)
  #CFLAGS += -DHASH_BLOOM=16
diff --git a/dev-libs/uthash/uthash-2.2.0.ebuild b/dev-libs/uthash/uthash-2.2.0.ebuild
new file mode 100644
index 000000000000..d8c9c97693a2
--- /dev/null
+++ b/dev-libs/uthash/uthash-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An easy-to-use hash implementation for C programmers"
+HOMEPAGE="https://troydhanson.github.io/uthash/index.html"
+SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-cflags.patch
+)
+
+src_test() {
+	cd tests || die
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	doheader src/*.h
+	dodoc doc/*.txt
+}
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index 266f427e8fc9..640dd001b4c8 100644
--- a/dev-libs/uulib/Manifest
+++ b/dev-libs/uulib/Manifest
@@ -1,4 +1,4 @@
 AUX uulib-0.5.20-shared.patch 2729 BLAKE2B 22870e400a4bf64fdd30b03f8d699666eeb7832e1110347295123bab7cf196d3bc30c7a4bbb0fe1d42f45606adf8522e134611f827d2ce403bf27fbd2381e1dc SHA512 bb8c93c59077fa00dec75734f27effc3370c9b1aabea476cc3212d6388a94127d1d6678dd98e73304c7fd2dd3e7212764e7abd08201ae9e12544f39aacabedc9
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uulib-0.5.20-r1.ebuild 763 BLAKE2B d1dda86b6ba16de02870da6dc5d3287618c82d0977b1a03570f0b6b0a03b14563ace31b80a3c164ba81f7b3fb26146cbff1c01ef262f08b3b57eb7cc5faf5d4d SHA512 d224814524cb0a181548c01c9433fab3e4371010500d32b09da61e87f044dc0210578b391641e16dd10f1536bf953045d7070a8f813601a3998bce7d7be8b6b1
+EBUILD uulib-0.5.20-r1.ebuild 744 BLAKE2B 52ab626e54963786f7d0826f5c78413d17016443d522899e25cab213394ff04c756a4cab975445d73e755c74e55ba634a605545dd961c191007421d7a45d265d SHA512 9af4a6d6db959a4c1af592e892f38b4b894fc31fbf49a411790fd116d0ef134a0bc730a50a76512768a6a31382177a711c94c650674779e7c1e2c5ffba189562
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/uulib/uulib-0.5.20-r1.ebuild b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
index 57df93bddf11..62e9ab67e4bd 100644
--- a/dev-libs/uulib/uulib-0.5.20-r1.ebuild
+++ b/dev-libs/uulib/uulib-0.5.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~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=""
 
 S=${WORKDIR}/${MY_P}/${PN}
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index cc2bf0c34a6e..97b902ddf8ec 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-protocols-1.20.tar.xz 111684 BLAKE2B 2ddd3d0b0dde94fda4788a1fd6631b6fcf22fb134e74a55f2c310ab4b72802d3b069d294e3d7b68ea6ddfdb0f944ac9011b73a9678e65eec924135822f697087 SHA512 d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977
-EBUILD wayland-protocols-1.20.ebuild 795 BLAKE2B 28a11a33e59bcf4891d8213fcc141f86fdd39452cad906dff2a70d2deffbaa3b350b2995208d9cc58eb94b44c8af203e8d772d1b8a3d6df0969ff91da0b9e76c SHA512 f4fb793db9f9ae2248577f295580ddac67f15b20a0c1e692658e8fadda746e3fa619c4e97a6bfd2834cadd34d366ec201fc98ad42785eee27e3db76b6398146e
+EBUILD wayland-protocols-1.20.ebuild 796 BLAKE2B 5f4f23df6c3c68e321f4ea504e36051ce0ec86a077c8164a5d707ebd138d6fcc2b99eb48bc291110593e13f0dc2c3429234310b87c293a92aa4162436df13a31 SHA512 61fcf021f16f35aa01778a6b6e3ed6e507b5ba74a2948155bcd76afec04b18eedc2ae9582f3af182d147a1ab430255d15f3d3609631b49dee763c8f8d6e7ce5f
 EBUILD wayland-protocols-9999.ebuild 797 BLAKE2B 274c9c89ba60e38e61dce64166f211de987b029cb4592544063d39c1b2ac3baba8af8b214a338839747b7a59475bcf81fbeac8503ee6446ecd4e8ccdf0a758da SHA512 0d02e092e3257afc3077d6e39ba218ed8614693feca0420557cc0ac1511f62a9cd8b43bc9c890e9e47b889c684e1b3fc2c1e82489164a4940205d87a5d097b04
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
index ced84988d5c9..b7cea107f247 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index 4985a45671f3..fe154d7f82d6 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,4 +1,6 @@
 DIST wayland-1.18.0.tar.xz 453968 BLAKE2B ee5b3f9dff07fda85b4d64bc753aff28c4a012184eb3a4bae8e3be0fb74324f12e9ea4e3dc049e06a11c7302e3c6b1e53e49109c814381641568d92b5572eed9 SHA512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
-EBUILD wayland-1.18.0.ebuild 1745 BLAKE2B 55810fe6bb4dc95414fa1d51e1b4b6e135aa5b9f0fe160c7f1591276e96507c470867c0ff9a27ac8718a253fd837eeea1563b2b1670cce85088a57403b55d675 SHA512 77b7d0de1af0d77d8a7719e0b16b221bc3640eb5b453983cb8e4193e970865413279f6c4408cc63392c373934428d8f9bad6d43729b0529c9dfceee0ac623143
-EBUILD wayland-9999.ebuild 1717 BLAKE2B 21a7642f0ae18c9e50bac5e57c8515a1a3a366a33ca20077e6a1254b18757a8699c9d011bfa3ab50718c0c434c06c927b0b0586c051f48790d620945d10622b7 SHA512 dc371930037866a40ea11849594bec8b58ef157c3b9853829c07bae99f3e20c7c0aec015c5590308c51e7cd633d8aca7eb84ac6d3b1305ab48c6e32927b29477
+DIST wayland-1.18.91.tar.xz 453500 BLAKE2B 6e234fa637bf4329fcf37c7372e3d02a50742812e2f61477ce302da4c2a1b9377874b0e4e2da899c726ede417081c4d459e40863169352825dd38a8fe0dcf267 SHA512 5ab770c87507e8248aa5197a253f27f3cca984bf1a69c52b438e9aaf512e6b0d841321f81c20643a49ef62eeb6c8b3a6391eadfee5c8822c3cf0d63bb0a8e0f8
+EBUILD wayland-1.18.0.ebuild 1746 BLAKE2B 4877a6996f909af202d7d8f80d638197a0bc305a6ec6de32a01d099fe9133f211f09123889dc779de1b63421921e45a5a7ba656e093b8d0ee8a9c14df0c10b41 SHA512 8843d5f526a0c142658fa22c0f4b771379f5ce3b48516510790914c11815219900b8697a07d18af44cb5103a86e3c756d9244e344abb5d9976ec11d93eb8fd7e
+EBUILD wayland-1.18.91.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
+EBUILD wayland-9999.ebuild 1818 BLAKE2B bfa53844b83b095da346fcdb3307fb4b437a5c90ff463cf87506aad22f963a0bdd94c3d2f256cc6a7f7409d87ab3a8bcf9e834abadd58791ff0616240429015f SHA512 b138f58a8397c07fb2135f43bdc6f293525cf2a8fd91f92509e2ff57102f811196572524804be39591b83aedc291202ebd5a7a0fcd1ca45215b2b9c6a9c382bf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.18.0.ebuild b/dev-libs/wayland/wayland-1.18.0.ebuild
index 2924e39d6f0e..e1e301322771 100644
--- a/dev-libs/wayland/wayland-1.18.0.ebuild
+++ b/dev-libs/wayland/wayland-1.18.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 inherit autotools libtool multilib-minimal toolchain-funcs
 
diff --git a/dev-libs/wayland/wayland-1.18.91.ebuild b/dev-libs/wayland/wayland-1.18.91.ebuild
new file mode 100644
index 000000000000..c3d2b584f4ca
--- /dev/null
+++ b/dev-libs/wayland/wayland-1.18.91.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+	inherit git-r3
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+inherit meson multilib-minimal
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP]
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+	)
+"
+DEPEND="
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:=
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(meson_multilib_native_use doc)
+		-Ddtd_validation=$(meson_multilib)
+		-Dlibraries=true
+		-Dscanner=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+src_test() {
+	# We set it on purpose to only a short subdir name, as socket paths are
+	# created in there, which are 108 byte limited. With this it hopefully
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x
+	export XDG_RUNTIME_DIR="${T}"/x
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	multilib-minimal_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/wayland/wayland-9999.ebuild b/dev-libs/wayland/wayland-9999.ebuild
index cc89001c551d..c3d2b584f4ca 100644
--- a/dev-libs/wayland/wayland-9999.ebuild
+++ b/dev-libs/wayland/wayland-9999.ebuild
@@ -8,9 +8,9 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
-inherit autotools libtool multilib-minimal toolchain-funcs
+inherit meson multilib-minimal
 
 DESCRIPTION="Wayland protocol libraries"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -20,12 +20,12 @@ SLOT="0"
 IUSE="doc"
 
 BDEPEND="
+	~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP]
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.6[dot]
 		app-text/xmlto
 		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
 	)
 "
 DEPEND="
@@ -35,34 +35,51 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(multilib_native_use_enable doc documentation)
-		$(multilib_native_enable dtd-validation)
+	local emesonargs=(
+		-Ddocumentation=$(meson_multilib_native_use doc)
+		-Ddtd_validation=$(meson_multilib)
+		-Dlibraries=true
+		-Dscanner=false
 	)
-	tc-is-cross-compiler && myeconfargs+=( --with-host-scanner )
+	meson_src_configure
+}
 
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+multilib_src_compile() {
+	meson_src_compile
 }
 
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
+multilib_src_test() {
+	meson_src_test
 }
 
 src_test() {
 	# We set it on purpose to only a short subdir name, as socket paths are
 	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
-	export XDG_RUNTIME_DIR="${T}"/xdr
+	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/x
+	export XDG_RUNTIME_DIR="${T}"/x
 	mkdir "${XDG_RUNTIME_DIR}" || die
 	chmod 0700 "${XDG_RUNTIME_DIR}" || die
 
 	multilib-minimal_src_test
 }
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 8241cd0f98f4..341cbd27c6eb 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-8.0.0.ebuild 3660 BLAKE2B 3a0d81693f81fc132b4ffde6d5b13f77c2e7c61b0d9518523fd2106559708dc23f5b4be8158fd1417e68d76837f21b835818b01bedf6ac757f5fb064339f0347 SHA512 c17c246ec8b0a1159bf45747b58d8e063c939223c37b23a92242ad6649f97b1e16f8c6ff3a15bb50ef7b5679a907daa266c7f794bf63c7ce2c2a0b60e816c3a0
-EBUILD weston-9.0.0.ebuild 3724 BLAKE2B fb4cc1b0ed4cc8ed15b0d400ba4626b6e94a05e1734b24738a0321915bef767773885873e6dd1ec720229a0dfd475d86066c83e22110155671719d2d9dd310c3 SHA512 a68943c5a130350f185d347e7dae37cb2ed6a8341d251df84ab28d20a86a4921b4ce5a7d904c683583b7e2becc6bda10e122ee41107c61c6663266112d13c39d
-EBUILD weston-9999.ebuild 3716 BLAKE2B 537fe56673b83e0c843be35ab95b1e154570a1bbb02a9cbede05e119de27e5e130fae91372c1c239ca5b77c762eb26db6e0c9e83523202d98e0aefe97f19ab45 SHA512 bd8b946e7dc6488b9f7586cdb263e64bf4bc87fc9936d635b79df9a27929fd621a26f1e2e918f2924bc3e11e7a0665934229cb5f5334503e1c02553fac273ab0
+EBUILD weston-8.0.0.ebuild 3637 BLAKE2B 1f83a82dabf0a8a983ae5ba19f758fb70523ab165e779d582abc0168136d3b0fdb5d6bcf78fc931dd4d737d42b66811c7d9e74994ba03d4689d6aeb0e352054c SHA512 dd22694d1a80c1df40f47b5162bc452c0ec7c50cc286a92e4d7b3e2ef31bac7b3bf1f74f25e268a72da489c2156027a76f8a7764d582b094c3a42f85accedf49
+EBUILD weston-9.0.0.ebuild 3704 BLAKE2B e517fd2c192018236784fcdcfeb9277ae3126d27403f410dbcfa71446895798a84fddc1915a36e16848637e196ef33b69351b629d938fc6b846c041ca2d54dd8 SHA512 3e20b62dc59cb5185cb124a23a4c2997c8f3db3096780f5f271d1344217e3ae10a629a8c90014ec7a94867e56f382e58c73425f5a7c7781e4692901c611d7e72
+EBUILD weston-9999.ebuild 3706 BLAKE2B 82ba0bb4bf3889b07f5e77fca64f5ef4a09b6a395b2d2f481864c739a8aa8c67eab59a431e0bc34d499d5869f0c4565b756703ec064610c434124513a367327c SHA512 c4a69d7b0e83b7d29fb70a15e6e7e10bbb0f64185ab45f668f43cd9d44e14f5f8bcbf84551cc3ced92f05cbe9865a09008fce5dc66f41a26c2adec8786ce84a1
 MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/weston-8.0.0.ebuild b/dev-libs/weston/weston-8.0.0.ebuild
index 494278ed2041..159f8af3b1b1 100644
--- a/dev-libs/weston/weston-8.0.0.ebuild
+++ b/dev-libs/weston/weston-8.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,9 +14,8 @@ inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
 
-if [[ $PV = 9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="amd64 arm x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="amd64 arm x86"
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index a65a36db98b6..fcc8d36a421d 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,12 +14,11 @@ inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
 
-if [[ $PV = 9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 097c7f0c70b9..ccac939f6d31 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,9 +14,8 @@ inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
 
-if [[ $PV = 9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 43fbb0e3a25d..f733bdbf8273 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,9 +2,9 @@ DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
 DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
 DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
-EBUILD xapian-bindings-1.4.14.ebuild 6447 BLAKE2B 8c879c77362dd1a6de377899e37a7a45f3b10c84b3f8f30a85f37818b0fef560ba4ef76151ea231b9ef305025cddf8f18e6bd2dfa785b86d7a13fa5ed245b276 SHA512 acef1bef8b5c6d23899eca4960b1565ebe289b0b73dfaa551c27ebda73160e51eeddf53b9e2628f729b524a3e1e35646b41018f4e47f76bc834c49aa848faf0d
+EBUILD xapian-bindings-1.4.14.ebuild 6448 BLAKE2B cfb76c3b3fa1a5808430789933fc3c058d4ab194e461b14247d5e6246041d61fbb15a9c451462be0bb1b673e824f44fcc1482e07eddf5b33e034e3f6340bab0e SHA512 281d799edd1ea70c223bc9d2076b8dd5b50899c5dcf93c78ae5c79cc6a8d8b0b933036f8c06384a4170e3dd477c186b349eb5f94c19fcc87e0cbedd822d1108d
 EBUILD xapian-bindings-1.4.15.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
 EBUILD xapian-bindings-1.4.16.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
 EBUILD xapian-bindings-1.4.17-r100.ebuild 7014 BLAKE2B f5a2ccf4b25e8e62e5bbf54578486bbc61f48f262360a5c71b36de94062e72a61d0a6e866aa5d5d54b22f35787778ad862b84fcb814a6363e81af7b110bee342 SHA512 d92f9d3069ef48e7437d3bd994424e90e70104d86964eb4e6adcda156cceb71fe75873b38a92d724a32b94775e179cc3c165df38a49077334625c944eff9f9d3
-EBUILD xapian-bindings-1.4.17.ebuild 6447 BLAKE2B 4c9f93b886563f6010bd2e60e7e429bc9ab7b914cb6c367a354e6c5dcf0e1bb1ce8f219a069b6ef9e40cad932b4e69bebd815b2878964bc333921485b21e65e7 SHA512 ebeebfb7223e7efa49b06ad076a82a99d03b836f18bd5dcb69ca512c4f5ac762443ea1e2ace41693e9bebe53e14810c5df4f1d7fa9b1c0c2c1d449e824ed4b4e
+EBUILD xapian-bindings-1.4.17.ebuild 6448 BLAKE2B c73e402c5cc3a778b75a1d947f2f58f3e3dee124a9055389dbaf52bb21f20a0e822db890e4ba476a481d55d017b19510ac408f436ded9264e751ae2b8fcfedf8 SHA512 e9247edd66581d0df5deec39203efea46173fe4c392a6ab4410380912c88702dfd10cb28dcf27dafa86a80169052fbcbbf30e00e9438c220e948a4b1da231ceb
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
index 9afbf0ca6ebd..589e120cecc0 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
index 6332e29debb9..103b05542e9b 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index f2d3dcdae4b2..881e67312a55 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -4,8 +4,8 @@ DIST xapian-core-1.4.15.tar.xz 2988752 BLAKE2B d68d69cdc55c1b62a746620fc90f02881
 DIST xapian-core-1.4.16.tar.xz 3041132 BLAKE2B 2c009bcdec05542ceae9354e47e8ff9b971ec87d04caf8058711fd6952135620c353f2feabcd869313f55194409944bc7374ce69d626f948461963a7790c3953 SHA512 3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B 976319adb17d73cfb5aff1c29c7febd4c50b9a399cd2a554ac463396b20890913f1c86cbca6ab5d0c7c1185e0b38ca41949102fc7ba704090647dd78f2522805 SHA512 bf3a8c9ad433c52b6ef74479220b693044483dd5aa8d8b09ddfd244cf6f4cf6e0b80c30f1f67901a725cd783baa5dc623080c15a8c07dfdebf13269af37820d5
-EBUILD xapian-1.4.14.ebuild 1797 BLAKE2B ce7eaab77ce89e4e1ca4c5bcdfaafdb88525dc4cc1dcaa830d63ae7ab378ad1ae8eed60fa35760c74a48ceb282fc024c601fc6230bea8f94373313ee6f97409f SHA512 0f7b6d5b74f3ecb5f7a5a3dc9f7ed3e32e32254ce0c940e7de70259322191fe030cb9b1ba043ac4ce7a62dcc62f4d204cebf3bff71edfed15cce6c42cd121a7f
+EBUILD xapian-1.4.14.ebuild 1798 BLAKE2B 8722898cbf9c08322d60ed017c76530d5c3863f858ebcada1f6d7e38aedc9413268cfe3cb5f2b07b4bc5e3e84a8011ef6ccc952b0bef976f0a440355f4d0680e SHA512 57d55a724bdcc02ae6122676bf885075b00b19cd6e77d1ab8c9a816c9d7258b6fcee4c055e3cb91f12e7469d9acfabd275f79d848554a1ca19c888d8e4463c08
 EBUILD xapian-1.4.15.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
 EBUILD xapian-1.4.16.ebuild 1805 BLAKE2B 5cd7b053f147e4813c5465c556f02f4c790f99ce032a1cd9a436967a43d7336da8134fef307632e6e24a8fc7582a7af8dbd197039889f6e348a2a4a250de89ac SHA512 4dda1f50d9d5908be95344dfdb2049381befdde663e17cefe0209a628fb830bea5183fb637013188f938be74fd3c70f6d33bf5c072669cf357a2028ea63172aa
-EBUILD xapian-1.4.17.ebuild 1815 BLAKE2B 728ab4011e273a0d17709c7bb559e228687de210be5d3fa92d6f509fe3825e861c944c57adf963d0a619df4c98889a29280a880ab38015aa51786a9c96f92dc2 SHA512 144baf4f4e350d30f73cbf3f3936d1c4235c99c656f8d60480ad9e7bb14df91593b5bfc3204f8ed3a42612c59fb7007761f428b40dcacb644895df01a623aa9b
+EBUILD xapian-1.4.17.ebuild 1816 BLAKE2B 809243dcc9cd4381c065cd8f3a17cd5359243bc98811c8400fa9920280609996e28f493311e8333c52cd8ef03c79df2f91eeef0bb517c51172504594c2c93efd SHA512 15115ebfd00d4a5a40c7faa8d0361e046d16618c591cba4192fc0c527aa4bd8081840813914eaa063865d15d76d8cd3ec57820191d1cb57ac969e60df1cd64ef
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild
index cb7643fe28a1..f6ae79205eb5 100644
--- a/dev-libs/xapian/xapian-1.4.14.ebuild
+++ b/dev-libs/xapian/xapian-1.4.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17.ebuild
index 5e5756e95b7d..59b45ca14067 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index f0fb8e74b4b2..699b2047e1be 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -3,7 +3,7 @@ AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aa
 DIST xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
-EBUILD xerces-c-3.2.2-r1.ebuild 3058 BLAKE2B f1a78ed5f63f4cf075e834869eb5c9a9eea6a04303045704bfee06b1b772c8591e42bde551ffe4e67e88033adeb70516adf708ce0dd204c8b6d320e8c1510101 SHA512 a82817fe5f0735e5ae4d50509104675e6773e2f375355d12b66ed1379527eaa72c0ed443d045c80f8048378a08b868bba706325779c843a7c234a7a49c536e35
-EBUILD xerces-c-3.2.3.ebuild 2934 BLAKE2B 1630cf8cafc12ad4ef2924febd21891629bc0d9c963936711f01e492c52d582be42d8a40008d516d302234b1b79c4cd9b517ecabcba476c4d523cbc8e4f9f0d4 SHA512 d13356e7351c9766370500397833a123c49848d4ae883f4d91e535d9e729c27257cba0aa29f1ba00afb5849bd76ca21989b9694f2c199a855bd93787e1e5b402
+EBUILD xerces-c-3.2.2-r1.ebuild 3059 BLAKE2B d7f4ea69e1dbb36ab4d974c3218131ba5eef86945b5e7d869ff3a0c69dc0141845c4afca5e39468f6960a729a7e90fb3f7d4ff2c6eddb70831f7e3560f392639 SHA512 5823e3135ce771049f6d89fa746d347a16e2cefa48dd8756313a59efbd181775802fe49fd269a5b9e5a389b0818e2c815999f69db2167dce831025e06e52815f
+EBUILD xerces-c-3.2.3.ebuild 2935 BLAKE2B 3fa694164e0c60346116670b1d93305c975b9cb383928e004e6daa2caa6a4a623eaf14bdf1d6bce2b6e4e304710efa74eed06117c43d5a170f5c938a07983eac SHA512 28f98b041d03624c23b21ae6bf8d483cb53318bd657d3e571c6a5d4ee72d0c87460a4306b68090db177a3a25a0abba4eb28b5092fce6ca3f3facb1500bd95981
 EBUILD xerces-c-9999.ebuild 2942 BLAKE2B c4fbaebdc301f12035ecca49b3b25308f647652cf84cb24e6b8eeb8e69db205ac53ba20d7460af12f9c44a571a86351526f2785c0cf6489665560d9b96f811ec SHA512 89c5ca69e61d4ac7e5984e5ae502a3265dbbab9d098501adfaecf6d21c1c24df7deabd419e3b2a8fb772c6d4f5aeae5416f9cbfd03f3daaa5ed9248e2a1e27eb
 MISC metadata.xml 638 BLAKE2B ae192f7a87ce73aed62967b02b1cda8535ac655b4e8763e7b75697c816f30b93b6bfb0b807d573f3ed82a9238bcb5234a1532151d98f9a30877884432916b816 SHA512 db2089786b68371bca8dd6e51ff820ac63245eefc5080e5d6f05b434bb2ee1a6831d439221f71b4d088e7d7cb22c9a68f6e67cee253923f13850afe6f7f021bd
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index 65f5851feb4f..9671a52d453a 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz
 	https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild
index f0c894c9ed8c..9c89e65548c1 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index b07bb79e2e1b..7c1fa37db7a7 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -2,7 +2,7 @@ AUX xmlrpc-c-1.32.05-Wimplicit.patch 593 BLAKE2B d26e051b264d2db4c52e192a5a904c4
 AUX xmlrpc-c-1.39.11-cplusplus.patch 374 BLAKE2B cacbc4fc8737d5e3f675a9579281fb44367fab1082340162e9d9929f6b829c612071b8535b36fa41a4f22488e0717febaaef64e4c51e7abf4fc46772aead1278 SHA512 b5182181f7c0ffa150c977b6e206c2fbfdcd979369dbf55b2c4197378edb7136629df02bb7cc5f89df522451fef3c04a7b901dc3f34bc895f55020f8d5e03ef6
 DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
-EBUILD xmlrpc-c-1.39.11-r1.ebuild 1925 BLAKE2B 2c6eb5d35f5e29c3713c11e84cd801779cfe64bbcb63009e2a08bf402e4d9927887997d600589dcd1183178c06778911a5bf89f189a342bd18e6576aaa495d8c SHA512 3ae94668dcfb4358c2c4ca4b118260f628fa291b0eb46898d8f77ee19a4aeab78beed3ecf2c05b12d7146384db0cd3fe8297663f28373f96d13fd35e998cf362
-EBUILD xmlrpc-c-1.51.06-r1.ebuild 2088 BLAKE2B 25c7ae2e9d6ce68902723e3403493b56c9293aa9a5839b9e402c35bc083f0875464017a1ac8bd3159650109ba4cd4245ab0475c92359a7a759f5e905d3cca6bd SHA512 38aeec2db597ccfe1e463922e29c1dff7145ed53dc7ecf0d5c23d57ecb0f01cafeb4a5861593c4110a45dff79635c65f0c6418f174a4f99099b717c7bdda2c5c
-EBUILD xmlrpc-c-1.51.06.ebuild 1831 BLAKE2B e54027f4360634776911ef4cc002ddbaee3d76b03a6a82422640ca1e844a2ccf9a0531f3484ca15f4b37739984ac82f1e7d049d11b8d9ddfc36642e66ab6f186 SHA512 56d639bdeb38c9e35107053a5873ec6c0dcc5c16d4750875ef0ec457eb086ba41e88b914ce3de03d72c6c265f2d9df937e44932deb6662657794074a4583b067
+EBUILD xmlrpc-c-1.39.11-r1.ebuild 1917 BLAKE2B 358f9d2a6eb3e8020e463dc7eab3a029c3352f9707d535de884d5caad88e5679b20c0c3216ad58afc7c6261c9c23fd18ccd17b0adc2f63370817cc3ed4aebc29 SHA512 d55225c45aa316f30d709089e66c332e529e2815e81b550519fa135ac42b41ad43b2992ee2fd1d09b27357537d0460273ae5fa2a0691a07bf4c1365368498b14
+EBUILD xmlrpc-c-1.51.06-r1.ebuild 2079 BLAKE2B 2f95f0c56e483ffba094cb9efb797e2c280d44f54563a734683ebac4014fc926f26fc9a35101f6637c8fbec740cb9ee3064ebc716b3c0ac8eb0a9a8a80fd81d9 SHA512 082f1fe63051a105ab04f37d025dd0e167b1d855c15c1dbb366cc87b965316aa109614043260a4e2dde78143a094c4975c836e0d69f3db742b86fd573388aa19
+EBUILD xmlrpc-c-1.51.06.ebuild 1822 BLAKE2B 32dd01275b7006d14a2cd21f365bee08d45b8de09eada993ad406f1409c6a3b901a88e5fe393815721ec9cbc309d5f06cbac12f1d3601195bb594684404fcc3b SHA512 36b4d0ffd96387dce5ae9d1d0959b9e814113f405d8539765e5f44328f18bc110d7a181dc81d4ee274b2ac145e2d8b18e0384b6ba2aa0f25b18465d42c3cf52a
 MISC metadata.xml 669 BLAKE2B 04f88706453ca3f6c7960b6a8d9fa0201cc620386d00f5e709070095e58f689ad7492d3b2a0effc9de985f642f55a347f3678f734170d36e141f1eca231612de SHA512 6009e48c681fd9a98054a37eb9ee78d87eff527d617094b55d6f3af6fe59f81328a03ccec47ab7fc1b4e54bdec50629b76b522e8943e2be43c1adf57e74caecb
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
index df34a37daf78..b48bfa55a1ef 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild
index 70b804cf7378..4d8c6b23b155 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
index 18f980a2fffb..a2a2b0b1ebdd 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
 
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 68460a41aa2f..be46a6dae5a4 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,5 +1,5 @@
-DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
 DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
-EBUILD xmlsec-1.2.29.ebuild 1353 BLAKE2B 64427acb8bcf6aba37d11de040607f442f94113cfef9f008af73c6d0a4a03163f859b312bab27a5e865673c348460191878621e74720569bc64c5faa5208d62f SHA512 2349f8d6fa5500a6400d51387d0996730cb7c8efea7877cb087e4cb750cd7e8ea0cd236feb6752bc8cc895f226c8ff21ee85abdd280a73f85c606ca4709cf20c
+DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
 EBUILD xmlsec-1.2.30.ebuild 1400 BLAKE2B 33a78b6d284196e366c67719cc2d0e292696e761c297fc0bc2e3cdfb13cbd3fd732ad3ebb5b1ffc7c3ef4d1992ad368dee5f392900849e1970e7db67730f1f29 SHA512 8dd204f7d770a323c0f1943c555cabf67fa9ae3a83d89fe325f23be24b21cad29f62565cba9c8eae733453b76c1547f022ccd2a263edb85a2aba0ea6efb0b6cd
+EBUILD xmlsec-1.2.31.ebuild 1405 BLAKE2B 0f41b67a723a978e8510ef16f2a3455d7aaac2eedce8ceb16a5d2bc91d14642b5f05f6112eb205d88a9faa040697e51a50e711c97bca6e9b4ff92985476190ec SHA512 7f09fa4ef386bfa3f1a7ea1f27dec14a6a21eb02e22fe159739ac2554c825d03f58a96162c8f2eed7ac31507a5a7180aa896869d0c644e8a210a402101ca12b2
 MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
diff --git a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
index f16790f667b9..2da2a8e15d6d 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
@@ -3,15 +3,14 @@
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
 HOMEPAGE="https://www.aleksey.com/xmlsec"
 SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
@@ -37,10 +36,9 @@ BDEPEND="virtual/pkgconfig
 		)
 	)"
 
-S="${WORKDIR}/${PN}1-${PV}"
-
 src_configure() {
-	econf \
+	# Bash because of bug #721128
+	CONFIG_SHELL=${BASH} econf \
 		$(use_enable doc docs) \
 		$(use_enable static-libs static) \
 		$(use_with gcrypt) \
@@ -53,7 +51,7 @@ src_configure() {
 }
 
 src_test() {
-	emake TMPFOLDER="${T}" check
+	SHELL=${BASH} emake TMPFOLDER="${T}" check
 }
 
 src_install() {
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 7e57f36e07fa..b0a79f325ed2 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,6 +1,6 @@
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 909 BLAKE2B 2824f0d48b5d0feb1eaff2c4c18fd98712d87281944889ca93d6a34346af2b2aa9a7111e8222b82fd18ebf3b728e567ceca81cba1889d02c15931c1c6867c606 SHA512 81d6cbc442f3061c1a260f678fa89e2c9a4d76af34f7f86ffe3515f0e98af48dab2d1c2e867b1b189c44188a85242ce6495da9e0c47d7a0be652b5a70b09df65
-EBUILD yajl-2.1.0-r2.ebuild 944 BLAKE2B 74f55428d0b788c854f3240dc6bdae11dd28462b1b479a1294cff921f54a60cde52dadaf04b0dd859b3e7d2240c26492507c107807f0b6b595b724a112727959 SHA512 7b29a8359dccf6727efe3fce76bec141650a698e3b1ee0221df630923b84135b73be3681051c52e43ff5e2272d60c433fd9338e0a375f8118721f6bf223f4de6
+EBUILD yajl-2.1.0-r1.ebuild 910 BLAKE2B beb0e2a122544298592c4aadb5a59c633ee4285c4bb61f8ab2cba8228cbf05a11da53457b21a2ef5e1b3da7fba65c1fcba5a7fae6892ab39c44a8f2e7aabfddc SHA512 9e9c11a1ca325810f9105ee35b24cb1a22d94bbbb8ea9c754bda674ef6e4c7b62e937176bf25f97ad03af28c3f10dcdfb1980fdb2c173f216cbf07fbc5e3c9ea
+EBUILD yajl-2.1.0-r2.ebuild 945 BLAKE2B b5c5984929f393799a16c5ab1ab61ea48a71840ae204000e290e440723d1e9c6f3fd3de5131f29122199025fa2b01cf54baa357fdf1fc0a0fca61f3483e805b0 SHA512 e215181b8e5c14125c398c0d1266a3b67f822b9bfb48623b1e8c3828201d81b33200bd139bfb835146766180fac84519faa5e0752e07dd1f219d852596618224
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
index 8c07bc2cc99d..ddf79d372ccb 100644
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-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"
+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="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index 73a574fef1d9..4717cf934f4b 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-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"
+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="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index e80224062328..0096262227f3 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,4 +1,4 @@
 AUX yaz-3.0.47-icu-automagic.patch 899 BLAKE2B b6eafa42b369a76f085efb0b89424c4c182c1604a68bebd7f8fee47a925fdc859973bfceab912b8aeeef2aab288f326fadc0ba2fb63e6e13d047c9811ea326d4 SHA512 55185162a381ae3cb7a880568b2a0a04c1b2f7d8e579e1494df0c2047d021648bce15d223f99a36f59e8b1a14fea161a128a2c01ea7f0e5b2e167e09cf6f856e
 DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
-EBUILD yaz-3.0.53.ebuild 1392 BLAKE2B 795f2ae8dfbf27acadc7b7520661380351c0e658080f613b95e9a61879c6e407fd4d3003fbbd9c049e87ea964af3ca6e2724dda3b9b43467f36ee910d3639eb0 SHA512 dc0930cfb4c05fe26a7cffd1bc42e493e7accdaa23c2dbb9b644fef60cb987d798f3be575b092b9127d7d10b263095d2858b590dff75014d8dd13df2545bbe99
+EBUILD yaz-3.0.53.ebuild 1393 BLAKE2B 6dc7470244c53d8d4bba4f911304c970e3b0c274b35dee69a7474cc18b7a76bbc8fce6b0381d7113ae63c7a91f3c0872ee4b82c60eb01471bf4e7e0029738a50 SHA512 e10540ac9a9ead5a2ce30bc2b02de603c040aec505092c7cf1f6f8e327d16fe2996529fd8aecc0bf2c6561280f20ad5c37847bfb87467cb25feba5361d7f5498
 MISC metadata.xml 256 BLAKE2B 318bf6f45e4874d05ebcc06bd5a382e319a403f7b22f1b51bf1e04da415cafa199ce19e824b373cd38ad831c20d3ca3696d61cb68bda85b4c5c17d60ce32194d SHA512 60f3694b1a080bbe91b43f5164f21459526f0901618d68c8d77f942813ef8338b31cfbc585a73e56cbc5d8ab18f91ec9ad97814f6b98f6443b5ccf06fd68f4d5
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild
index 5b9556845422..fa044ba4bf87 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-3.0.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="debug icu libressl tcpd ziffy"
 
 RDEPEND="dev-libs/libxml2
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-libs
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)