gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-libs
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
284 files changed, 2792 insertions, 1826 deletions
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 259ff8899c1b..9d2276ea5d1e 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -5,4 +5,4 @@ DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
 EBUILD Ice-3.6.5-r1.ebuild 8522 BLAKE2B 68abf58e31b17fbbbe54c16e402097430eed9113d0772afbb7ba80a7fc3ec30716e12b3ceab51ae5bccb303899236f72d7a2c99a7a0252cfe9f64fb6593ed477 SHA512 4c0bc606a102cd41691d5f9208b22ee2f4d362cddbb894c1f85a6a8c4dce14cee560c287986ae31f0d12fe215eb0a9b76f6611b8c71f6fe2321cf280703f36a0
 EBUILD Ice-3.6.5.ebuild 8520 BLAKE2B 67d5abcf4caf00f020346bc43c5974722179b1b7e2540a9c194d2f29bf740f1c3a62e78c8ccf3e25b45c739baacbbe52b979f4b6494a0a53d153e2a5c8ea51d7 SHA512 afdbc69483ef0ae5692378513d2cdeeb1edc870f561f776889c2ec99eecd014b500ca42572e088bc8a6174230e9582d5645cd0b924b4c030819682400e73822c
-MISC metadata.xml 561 BLAKE2B 83daa42cf58f641a94bf0b24125dbca8cfd34d86d540cb7daecea4c089309279eb0a423f5f785efff9bafe34347fcfada2be36700a1f94afbdb6308e7d883d9f SHA512 35dcc56cb261e0f98fe6ae2da115ce7c66bd8568e9313eefb2c55d3d03cfda451d7f64738b0e50f64e01c5b7f8e60e1e0d8c6219be6b22dee45cd505a28aaa41
+MISC metadata.xml 440 BLAKE2B 4f7fe8256ea08eb9fb9a9ae4d7c768ea8f5eea45c0dd3842a1e4992dfe61c36a70b4ad9ae2d1ed5d2f1246c659a48f8a6ef8f39f08bd07674949d6b0ced6be5d SHA512 99aaa114855fdc523d8ffd334c9681f70a6859ab3dad837aa14ead4abb3e1df29d65d0845e040c8e2f9193d03d83bc8201f582c23dd7ef144d4f42e927df8d01
diff --git a/dev-libs/Ice/metadata.xml b/dev-libs/Ice/metadata.xml
index f365390e262e..b682a17753cd 100644
--- a/dev-libs/Ice/metadata.xml
+++ b/dev-libs/Ice/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		Ice is a C++ middleware technology with bindings for other languages.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">zeroc-ice/ice</remote-id>
 	</upstream>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e9d7e4a9e4fa..61ac1b832776 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 79e94264a8ff..f83c612d001e 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -10,5 +10,5 @@ DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb82
 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 4233 BLAKE2B 27a4a761bc3ab2a97de3e5c20d3d5f6fe5dfd5a064634ec9aa774063d47f1a88e5edabe94d8807939547e62aa4b640ff6b68a9ba0bf490034f1a1b194b1de566 SHA512 9156e39489f77847f9a65021219506e18559e7b21d66a799feff24a922bcce0906d4db42a5fa7cbf4de67dd2b4d701e6d734b46632d7e4e72fa0dc73ce3706b2
+EBUILD apr-1.7.0-r1.ebuild 4231 BLAKE2B 12bd618f1b5fb3a8428184f33c19498cadb9f92addcbad9508973087e94e5af3aa98dc7d1cd925f24d073889750046fff31ccf0d70e97f0f5d55ba20128c8e3f SHA512 5122c27eff77d364e5cd05db6f4fcf4c6eb2f5ce4315cd97fea5787328be118b0eb4b5fa5df36b25f41335261677446c9dff2206ac1f58bad7828ab6b055098c
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 0e9b63e9061a..3eb682d0fc11 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index ffd027284775..f67f9faa758f 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
 EBUILD atk-2.34.1.ebuild 1136 BLAKE2B 258da793056c38e69971be60bee19954c9852094b6dc54d0f936df83d40f7eebe62d3e82b0621a34ed1a5e1509d74b27b088ddf4db5665aca7a67065d1be7df6 SHA512 2484f173bfcc79ce6364e47e05b3c631f11e64212bae571b7f533f749f7efbc934d47aef4be6c7287d75002a28d5d9ce5dbd1d472011c1d9c7337cd9e3a64f59
-EBUILD atk-2.36.0.ebuild 1140 BLAKE2B 09eb3647f070ea873fd684d5c04b1e5d81054b1d1f9f5f7c6e8a6f4cf396ff450fa77d8635c9fe0c563097e6b08adff771a7f2078dd9813206b0ed998a69473d SHA512 f89cd84e5b867741019a14eee4148226bcd9f4562ba3f41c94629647019f8077f11023209925090df7c02b55ac0e2da9df304622fca238f47853a32af28f3328
+EBUILD atk-2.36.0.ebuild 1139 BLAKE2B b2d2106c8b030438271a2ec8abdb8006ba3a2b8109bb0d03eae48e67a3489a8f7995c82c2fa1e543dfc8ac9a7a335bee876e5c3fdb2a19127cbc9acff6383d62 SHA512 92607180705869f56aa963bebccda79cbbfe1cace019cb82f8d83b75c590d98c1851bf798b3dc791f4609570cc61fef7ec76d250269ce6f90505b43d275e5059
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index 1d612f6d193d..c4b58080ed40 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 06b9522c997a..5c743553dead 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,3 +1,18 @@
-DIST aws-sdk-cpp-1.7.178.tar.gz 22589166 BLAKE2B 40364307fb676a89cf2b363d02dfa95e03c6e0b02e34c3d5376820dd7721f13108bf1f1713ff5f39dfc7d98f5cd368718601a397f55c4e26a37cd62d346cbf70 SHA512 b5c969d8b0b9ca5aa7b6af762bf79647ee407cae2686b90c4acefb6a113cf4e7a582e4e5aebd2e6289685e6ac373f9f994e57cd34bd12543b2b36142e00df478
-EBUILD aws-sdk-cpp-1.7.178.ebuild 6285 BLAKE2B 8971ad0a063b5a1113f1e15c80bf609d31d81760285e6c158de066bb242591bb3a59ff8cb51525c8d411b0c1a94ae2780aa7d384a56a187e267bd46beb3e8771 SHA512 23a3d8d16ea8d8ff3791e3fd81a52e92c1035432148a8a92c089c19c90f21423cb1064a6555aeaa9ff67c6c234f62a90989814d6c172a7b91d847f0e87c719f6
-MISC metadata.xml 19182 BLAKE2B 32ba87941d8d92149ecb65a8f37f11f032690e9819bd0098e287c9679fec754539d36de4545c4a63a4059b735e1f0fbcbbce75b99395efa6ef67dbdf2b98a103 SHA512 b87ce25db7e3f4b651e6861dff4582265dce1cb42f3bcbe9457b4f25eba5f79ef5c8037c1379c92bff49e9e363d310acfd8ed9b2799115b8333f7f1b2e3a11e5
+AUX aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch 256 BLAKE2B 66653717a66f51d8403367b8471eee9022045ce5340a232c0bce9cb47fd5ce1ab58e097155048ec54d2fbdd072ebd9c9eeb63f7c9a194445c8833cffc224fa84 SHA512 2af8fbf593cd2bbd7acbdb18f994f18b516abe58a4bb9ee215a72932ec62e463c33e04733bc9be6a60539e1ac8a3beaf4b0611cf0fca97fea1eddbcaa9315e53
+AUX aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch 787 BLAKE2B c7a7a0bf1de4041b64e5afa2073fb426659a82a64b10bfaba05ae1dffd8a4819e073692992c49ed66493569dc33ca736c4a27dac2da07d1235be48cffddca16f SHA512 d3246dbbbf8e7598053933d949a1c43b5c5929049eea12aae0ef00182594aba5dea9a5b3ea22bf795d9ecd2f4a6880bc815b83ed4532c0bc94a901894704e73c
+AUX aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch 194 BLAKE2B 7f6d935c5dff0ebb0701003e6daaba0d174cb90c3f39dd6da7dbab5ac5660b4d9685e5a00cfe7977ecbab5f6d27ebb8b3ed05b839a2322a56fb813dda72e02e5 SHA512 7754c2c0a418b8af82129eaea26cea102aa3e529d40d4cecdec2ae5bbf3b7c05ae0dade1d44efd550a8d068db671d15cafb17ced049c430c1589c1cdf8c0ed92
+AUX aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch 192 BLAKE2B 10515a1e1693ee6b9948d14fbf7fc32369f4bc3cb6be700fd7eaae7fa910610d1c15fc9ef87318a6dc0e46c2a0205af759a56780c28f71c830627aa62a2588b3 SHA512 73ecd702f3c48ab28584dfeecdc75939a5bb7cad981145e75200f09c85ba7acd19a59f010f6952849385da9a0cd9f321907f61f60984d7d3d43b5e817437d0e0
+AUX aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch 1189 BLAKE2B 06e22f18204f52e85ad711f34ee592fdb1e307031fda5200890326b1ea53c2063cb9bf41f28958cce5a9882560ade1d8991e87d7bb01728ca538263ece289494 SHA512 138e71ca235d92ef0495b9442d32f622c2863f5c121064cc88b43caf422cadc32fa400d0b269f04cbba3c60b99da1fb0e218632c109a846610710f743f3eeb63
+AUX aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch 703 BLAKE2B 0e279260d96518f2bc37d2864f927db028e72b1053d382d13dfec92832e0a77ac406267b68ee7bda46d229bc0343d842dddb54ccd737f6270fd66f02d35c1d17 SHA512 27e3d293dab3663f2086cbc0c5d5f1396a6fea67762573c35bfee839f843f80fe1664a77ff7122bf79494710daf74ee2f9eef85d8c147b94c7642762c617482e
+AUX aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch 904 BLAKE2B 295c0c15811b6d2fbcb3ea450bc81160deed1812d2a41d8df4e831037c0084a083c3fa59132bd419c6d63798a53527493d8c3617452b9eed453a81d255ec45ba SHA512 5b3e062abec35fff84a651c71844c0d9ea2a4762f286114d968f2034998a18f72cd51bdd09cb70f5e3f2d51fd56feba2c79e04fe091ba55fd0d19822ee3ea3bb
+AUX aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch 3737 BLAKE2B b977ae06b5f4e2f8d2bcd4efc0e20ac003f5491d801a1a6da58758bf17ccbf107956cf1fb26fcfc03c3adccbc086e51e5bc36ff6ebda2166bce74f70bf544252 SHA512 342e65e170adef6b3dc5337fb2526cdf5d06bedd3bcadcc96860f4fd9aee6080b8f797c6694f605629de1b7d7b9e123169d843f2d6d27db35ba81cf30ab793e8
+AUX aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch 861 BLAKE2B e2853b580a3951bb2b611399162b7094fb1a9b72e965cab113737844d24cde45c32c690335829fca7cd5ee34b1aff77d370097a78891929eb9887964b954e9a8 SHA512 42b6711bcb02d36d741e3f9b79f249c6df28201ea5541814fea76b9e6bb54263a7437471591b5e081489d0d35892f70e2184a5c5c3eea5a286bbb5c3af27ac3a
+AUX aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch 777 BLAKE2B 7655be825103d59c0fece0f11c09b065baa7e4b4e15fcd50961b556aaffe91bb7e118ff32b19a1077e1c13a752580b6a624f0e4c6c7fab588c8bd7f2da068ca5 SHA512 99e11c9570d2aaf086317e7c82c45758a8e1ce6d4dbfe9ddc7c4de9a0843ac854e5f7192a3caf2915628b55e24ec7d4b4fa6f9656f08e344753bbc890952a168
+AUX aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch 1268 BLAKE2B d2bb69c98a0e90a9880962a6acb11392ba7e0610e1bedcc97cfe74cbf39fed61df24888987dc4fdb9e1b785f499fdd46e5216da24f2d081051b03e6143e84aa3 SHA512 4c09def5eddef31da4563eeeb6794af217a3badb841c8079d6caf4b9a63460b7a9fb60aa632ac4d4e622e435381705a410d698bc1d19087274612ba00db3474a
+AUX aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch 348 BLAKE2B 99321dd97a9888bab32e41797558c617410d228c64619f19a08052fabc2f9536a1bde1fcfb2232ed442ee788ef338c8cec1a46f25a74e91641d442b2e0189810 SHA512 5cfcfc0b9b13cfa57c5f28a3537a3208d0516fe6aa941ba91f90b294c5e7c95db9699430071c12db5040c3208af318eba16db68ecd2d6feb52ac1c41d2ac6005
+AUX aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch 1243 BLAKE2B f6ecdfae9a6380869f5082bd72d1ba463c052bed59c0fb754b569fa56b35bc8c67172c7669ee90492eacd6e8db50ec1a1374e3106758edfb3c8e6a6e26a9d7be SHA512 2ba7a617f4880cc632b75330afc2890bab3a0dfd0017904ac53c3bfe23535b85ee4228a79ce94c2d908d3a4e8bee6abab97836d15a59c42babdb67a6f9ee5eff
+AUX aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch 319 BLAKE2B ca9b1664bc74bb4aec09efdfd640deda357c5f10e28ed6a3716096067669643436c35b93db0cab6ac9ff0582d77c548aadddc33dde36fb5759921a93127035be SHA512 3cc6ada02f65d97a2351ea4e9700db7ebe532084cbae5934371685d9a424993cbf60e68e6b64aad0d389c9c8774602cd6132cec351e136b5de8249d00ad32023
+AUX aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch 850 BLAKE2B 9ba442243492283f95d92769541dfcd218120e94cc96d857b10380d9cd6adc876a4b3c962dbc5171776be9a02dd236ae220924be7a481f0793927c16709539c2 SHA512 8975a8ea5162a7253c2b2ce64b47848b5ae566eef95ce432df2e8046ef82b66a78ff292e0fefde07a0a128a864716abcf077a6270abb6314ba0c6bd15fc39f7f
+DIST aws-sdk-cpp-1.8.46.tar.gz 28989406 BLAKE2B 47a72d1e0578ecd28e376f3c6688a997faeeae41ba5e4ab5aeff59a2d8f592fc63746445728ab3236952cfc045dc683c816c77dfb8fbe3d98904e50013201ace SHA512 9fedc9de84721189f001a0a5fb2dd63987a366a37ec6354234b244da39929b420e6289bd319d0f056fa4274b7bc682d1aab2dddd5dc823abdf24b69536610ed4
+EBUILD aws-sdk-cpp-1.8.46.ebuild 8302 BLAKE2B c6fdc9002429aaa8edf45aca9ea01cc01bc3232fd36ac399e6e71485dec5b877d783eb3f10458a8979cda562bdd46687867d4c1759750e901847b8df2e380809 SHA512 892b43a1b5027b7a7b33767d3c8307f395b93b5f13eb8e20f70ffd45a5bf80a6fa280cb22a34fccebf2bbccca90fba87b59effc07ee0f4c7dd97a9fe787978ee
+MISC metadata.xml 23851 BLAKE2B af85a4922358eab81028ad9003a39cca87c981a2068aeb26e2be86d5da5d888e2d2611ad15861a6562cf60294b1902e7026aef2ec4f16d862078926147a2896c SHA512 4cc2bbc93a0c396d77e8b506aa0f575523ab0cee5a786774a617c3156af910e49b06abf41b17314cc32968feff4367755812bb681daa4b399ce6da73929a3877
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
deleted file mode 100644
index 1d647355d4e5..000000000000
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="AWS SDK for C++"
-HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
-SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES=(
-	access-management apigateway backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile
-	cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ec2 ecr ecs eks elasticache
-	elasticbeanstalk elasticloadbalancing elasticmapreduce email es events fsx globalaccelerator iot kinesis kms
-	lambda lex license-manager lightsail machinelearning macie managedblockchain marketplace opsworks organizations
-	other personalize polly queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub
-	serverlessrepo shield sns sqs textract transcribe translate waf
-)
-
-IUSE="+http libressl +rtti +ssl static-libs test unity-build ${MODULES[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	http? ( net-misc/curl:= )
-	polly? ( media-sound/pulseaudio )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	dev-libs/aws-c-common
-	dev-libs/aws-checksums
-	dev-libs/aws-c-event-stream
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local mybuildtargets="core"
-
-	for module in ${MODULES[@]}; do
-		if use ${module}; then
-			if [ "${module}" = "access-management" ] ; then
-				mybuildtargets+=";${module};acm;acm-pca;iam;identity-management;ram;sts"
-			elif [ "${module}" = "apigateway" ] ; then
-				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
-			elif [ "${module}" = "budgets" ] ; then
-				mybuildtargets+=";${module};ce;cur"
-			elif [ "${module}" = "cloud-desktop" ] ; then
-				mybuildtargets+=";appstream;workdocs;worklink;workmail;workspaces"
-			elif [ "${module}" = "cloud-dev" ] ; then
-				mybuildtargets+=";cloud9;codebuild;codecommit;codedeploy;codepipeline;codestar;xray"
-				if ! use "queues"; then
-					mybuildtargets+=";queues"
-				fi
-			elif [ "${module}" = "cloud-media" ] ; then
-				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
-				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
-			elif [ "${module}" = "cloud-mobile" ] ; then
-				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
-				mybuildtargets+=";pinpoint-email;sms-voice"
-				if ! use "sns"; then
-					mybuildtargets+=";sns"
-				fi
-			elif [ "${module}" = "cloudhsm" ] ; then
-				mybuildtargets+=";${module};cloudhsmv2"
-			elif [ "${module}" = "cloudsearch" ] ; then
-				mybuildtargets+=";${module};cloudsearchdomain"
-			elif [ "${module}" = "cloudwatch" ] ; then
-				mybuildtargets+=";application-insights;appmesh;cloudtrail;guardduty;health;inspector"
-				mybuildtargets+=";logs;monitoring"
-			elif [ "${module}" = "cognito" ] ; then
-				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
-			elif [ "${module}" = "dynamodb" ] ; then
-				mybuildtargets+=";${module};dax;dynamodbstreams"
-			elif [ "${module}" = "ec2" ] ; then
-				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
-				mybuildtargets+=";ec2-instance-connect;elasticfilesystem"
-			elif [ "${module}" = "elasticloadbalancing" ] ; then
-				mybuildtargets+=";${module};elasticloadbalancingv2"
-			elif [ "${module}" = "events" ] ; then
-				mybuildtargets+=";${module};eventbridge"
-			elif [ "${module}" = "iot" ] ; then
-				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
-				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
-				mybuildtargets+=";iotthingsgraph"
-			elif [ "${module}" = "kinesis" ] ; then
-				mybuildtargets+=";${module};firehose;kinesisanalytics;kinesisanalyticsv2;kinesisvideo"
-				mybuildtargets+=";kinesis-video-archived-media;kinesis-video-media"
-			elif [ "${module}" = "lex" ] ; then
-				mybuildtargets+=";${module};lex-models"
-			elif [ "${module}" = "marketplace" ] ; then
-				mybuildtargets+=";marketplacecommerceanalytics;marketplace-entitlement"
-				mybuildtargets+=";meteringmarketplace;pricing"
-			elif [ "${module}" = "opsworks" ] ; then
-				mybuildtargets+=";${module};opsworkscm"
-			elif [ "${module}" = "other" ] ; then
-				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;clouddirectory;comprehend"
-				mybuildtargets+=";comprehendmedical;connect;datapipeline;datasync;directconnect"
-				mybuildtargets+=";discovery;dms;docdb;ds;dynamodb;gamelift;glue;groundstation"
-				mybuildtargets+=";importexport;kafka;lakeformation;mq;mturk-requester;neptune"
-				mybuildtargets+=";quicksight;redshift;robomaker;sdb;service-quotas;servicecatalog"
-				mybuildtargets+=";servicediscovery;signer;sms;snowball;ssm;states;storagegateway"
-				mybuildtargets+=";support;swf"
-			elif [ "${module}" = "personalize" ] ; then
-				mybuildtargets+=";${module};personalize-events;personalize-runtime"
-			elif [ "${module}" = "polly" ] ; then
-				mybuildtargets+=";${module};text-to-speech"
-			elif [ "${module}" = "rds" ] ; then
-				mybuildtargets+=";${module};pi;rds-data"
-			elif [ "${module}" = "resource-groups" ] ; then
-				mybuildtargets+=";${module};resourcegroupstaggingapi"
-			elif [ "${module}" = "route53" ] ; then
-				mybuildtargets+=";${module};route53domains;route53resolver"
-			elif [ "${module}" = "s3" ] ; then
-				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
-			elif [ "${module}" = "sagemaker" ] ; then
-				mybuildtargets+=";${module};sagemaker-runtime"
-			elif [ "${module}" = "transcribe" ] ; then
-				mybuildtargets+=";${module};transcribestreaming"
-			elif [ "${module}" = "waf" ] ; then
-				mybuildtargets+=";${module};fms;waf-regional"
-			else
-				mybuildtargets+=";${module}"
-			fi
-		fi
-	done
-
-	local mycmakeargs=(
-		-DBUILD_DEPS=NO
-		-DBUILD_ONLY="${mybuildtargets}"
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DCPP_STANDARD=17
-		-DENABLE_RTTI=$(usex rtti)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UNITY_BUILD=$(usex unity-build)
-		-DNO_ENCRYPTION=$(usex !ssl)
-		-DNO_HTTP_CLIENT=$(usex !http)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild
new file mode 100644
index 000000000000..2ac7c4ce7732
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="AWS SDK for C++"
+HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
+SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULES=(
+	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
+	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks
+	elasticache elasticbeanstalk elasticinference elasticloadbalancing elasticmapreduce email es events forecast
+	frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail machinelearning
+	macie managedblockchain marketplace networkmanager opsworks organizations other outposts personalize polly qldb
+	queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns
+	sqs textract transcribe translate waf
+)
+
+IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	http? ( net-misc/curl:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	dev-libs/aws-c-common
+	dev-libs/aws-checksums
+	dev-libs/aws-c-event-stream
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-upgrade_android-build_build_and_test_android_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ExtractBuildArgs_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_handle_release_notification_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_move_release_doc_to_models_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_example_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_dummy_web_server_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_endpoints_checker_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_gather_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
+)
+
+src_configure() {
+	local mybuildtargets="core"
+
+	for module in ${MODULES[@]}; do
+		if use ${module}; then
+			if [ "${module}" = "access-management" ] ; then
+				mybuildtargets+=";${module};accessanalyzer;acm;acm-pca;dataexchange;iam"
+				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-oidc;sts"
+			elif [ "${module}" = "apigateway" ] ; then
+				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
+			elif [ "${module}" = "budgets" ] ; then
+				mybuildtargets+=";${module};ce;cur"
+			elif [ "${module}" = "cloud-desktop" ] ; then
+				mybuildtargets+=";appstream;workdocs;worklink;workmail;workmailmessageflow;workspaces"
+			elif [ "${module}" = "cloud-dev" ] ; then
+				mybuildtargets+=";cloud9;codeartifact;codebuild;codecommit;codedeploy;codeguruprofiler"
+				mybuildtargets+=";codeguru-reviewer;codepipeline;codestar;codestar-connections"
+				mybuildtargets+=";codestar-notifications;honeycode;xray"
+				if ! use "queues"; then
+					mybuildtargets+=";queues"
+				fi
+			elif [ "${module}" = "cloud-media" ] ; then
+				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
+				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
+			elif [ "${module}" = "cloud-mobile" ] ; then
+				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
+				mybuildtargets+=";pinpoint-email;sms-voice"
+				if ! use "sns"; then
+					mybuildtargets+=";sns"
+				fi
+			elif [ "${module}" = "cloudhsm" ] ; then
+				mybuildtargets+=";${module};cloudhsmv2"
+			elif [ "${module}" = "cloudsearch" ] ; then
+				mybuildtargets+=";${module};cloudsearchdomain"
+			elif [ "${module}" = "cloudwatch" ] ; then
+				mybuildtargets+=";application-insights;appmesh;cloudtrail;compute-optimizer;guardduty"
+				mybuildtargets+=";health;inspector;logs;monitoring;synthetics"
+			elif [ "${module}" = "cognito" ] ; then
+				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
+			elif [ "${module}" = "dynamodb" ] ; then
+				mybuildtargets+=";${module};dax;dynamodbstreams"
+			elif [ "${module}" = "ec2" ] ; then
+				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
+				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
+			elif [ "${module}" = "elasticloadbalancing" ] ; then
+				mybuildtargets+=";${module};elasticloadbalancingv2"
+			elif [ "${module}" = "email" ] ; then
+				mybuildtargets+=";${module};sesv2"
+			elif [ "${module}" = "events" ] ; then
+				mybuildtargets+=";${module};eventbridge"
+			elif [ "${module}" = "forecast" ] ; then
+				mybuildtargets+=";${module};forecastquery"
+			elif [ "${module}" = "iot" ] ; then
+				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
+				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
+				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph"
+			elif [ "${module}" = "kinesis" ] ; then
+				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
+				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
+				mybuildtargets+=";kinesis-video-signaling"
+			elif [ "${module}" = "lex" ] ; then
+				mybuildtargets+=";${module};lex-models"
+			elif [ "${module}" = "macie" ] ; then
+				mybuildtargets+=";${module};macie2"
+			elif [ "${module}" = "marketplace" ] ; then
+				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
+				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
+			elif [ "${module}" = "opsworks" ] ; then
+				mybuildtargets+=";${module};opsworkscm"
+			elif [ "${module}" = "other" ] ; then
+				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;braket;clouddirectory"
+				mybuildtargets+=";comprehend;comprehendmedical;connect;datapipeline;datasync"
+				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
+				mybuildtargets+=";groundstation;importexport;kafka;lakeformation"
+				mybuildtargets+=";migrationhub-config;mq;mturk-requester;neptune;quicksight;redshift"
+				mybuildtargets+=";robomaker;sdb;schemas;service-quotas;servicecatalog;servicediscovery"
+				mybuildtargets+=";signer;sms;snowball;ssm;states;storagegateway;support;swf"
+			elif [ "${module}" = "personalize" ] ; then
+				mybuildtargets+=";${module};personalize-events;personalize-runtime"
+			elif [ "${module}" = "polly" ] ; then
+				mybuildtargets+=";${module};text-to-speech"
+			elif [ "${module}" = "qldb" ] ; then
+				mybuildtargets+=";${module};qldb-session"
+			elif [ "${module}" = "rds" ] ; then
+				mybuildtargets+=";${module};pi;rds-data"
+			elif [ "${module}" = "resource-groups" ] ; then
+				mybuildtargets+=";${module};resourcegroupstaggingapi"
+			elif [ "${module}" = "route53" ] ; then
+				mybuildtargets+=";${module};route53domains;route53resolver"
+			elif [ "${module}" = "s3" ] ; then
+				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
+			elif [ "${module}" = "sagemaker" ] ; then
+				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-runtime"
+			elif [ "${module}" = "transcribe" ] ; then
+				mybuildtargets+=";${module};transcribestreaming"
+			elif [ "${module}" = "waf" ] ; then
+				mybuildtargets+=";${module};fms;waf-regional;wafv2"
+			else
+				mybuildtargets+=";${module}"
+			fi
+		fi
+	done
+
+	local mycmakeargs=(
+		-DAUTORUN_UNIT_TESTS=$(usex test)
+		-DBUILD_DEPS=NO
+		-DBUILD_ONLY="${mybuildtargets}"
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DCPP_STANDARD=17
+		-DENABLE_RTTI=$(usex rtti)
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_UNITY_BUILD=$(usex unity-build)
+		-DNO_ENCRYPTION=$(usex !ssl)
+		-DNO_HTTP_CLIENT=$(usex !http)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
new file mode 100644
index 000000000000..658abfded785
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
@@ -0,0 +1,10 @@
+--- a/CI/ConstructReleaseDoc.py	(original)
++++ b/CI/ConstructReleaseDoc.py	(refactored)
+@@ -35,6 +35,6 @@
+     releases.append(release)
+     changeDoc["releases"] = releases
+ 
+-    print(json.dumps(changeDoc))
++    print((json.dumps(changeDoc)))
+ 
+ Main()
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch
new file mode 100644
index 000000000000..fb6856abff3c
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch
@@ -0,0 +1,22 @@
+--- a/CI/ExtractBuildArgs.py	(original)
++++ b/CI/ExtractBuildArgs.py	(refactored)
+@@ -3,15 +3,15 @@
+ import json
+ 
+ if len(sys.argv) != 2:
+-    print >> sys.stderr, "    Usage: python ExtractBuildArgs.py <ArgName>"
++    print("    Usage: python ExtractBuildArgs.py <ArgName>", file=sys.stderr)
+     exit (-1)
+ 
+ try:
+     data = json.load(open('BuildSpec.json'))
+     if sys.argv[1] == "cmakeFlags" and data["cmakeFlags"] != "":
+-        print(data["cmakeFlags"])
++        print((data["cmakeFlags"]))
+     elif sys.argv[1] == "branch" and data["branch"] != "":
+-        print(data["branch"])
++        print((data["branch"]))
+ except:
+-    print >> sys.stderr, "No related args found in BuildSpec.json"
++    print("No related args found in BuildSpec.json", file=sys.stderr)
+     exit(-1)
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch
new file mode 100644
index 000000000000..ddd162025b49
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch
@@ -0,0 +1,9 @@
+--- a/CI/handle_release_notification.py	(original)
++++ b/CI/handle_release_notification.py	(refactored)
+@@ -1,5 +1,5 @@
+ 
+-from __future__ import print_function
++
+ 
+ import json
+ import zipfile
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch
new file mode 100644
index 000000000000..ef7a384d7e6e
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_CI_move_release_doc_to_models_py-3.9.patch
@@ -0,0 +1,9 @@
+--- a/CI/move_release_doc_to_models.py	(original)
++++ b/CI/move_release_doc_to_models.py	(refactored)
+@@ -1,5 +1,5 @@
+ 
+-from __future__ import print_function
++
+ 
+ import json
+ import zipfile
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch
new file mode 100644
index 000000000000..e77436236c9d
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_android-build_build_and_test_android_py-3.9.patch
@@ -0,0 +1,28 @@
+--- a/android-build/build_and_test_android.py	(original)
++++ b/android-build/build_and_test_android.py	(refactored)
+@@ -120,13 +120,13 @@
+  
+     validTests = GetTestList( buildSharedObjects )
+     if runTest not in validTests:
+-        print( 'Invalid value for runtest option: ' + runTest )
++        print(( 'Invalid value for runtest option: ' + runTest ))
+         print( 'Valid values are: ' )
+-        print( '  ' + ", ".join( validTests ) )
++        print(( '  ' + ", ".join( validTests ) ))
+         raise ArgumentException('runtest', runTest)
+         
+     if not IsValidABI(abi):
+-        print('Invalid argument value for abi: ', abi)
++        print(('Invalid argument value for abi: ', abi))
+         print('  Valid values are "armeabi-v7a"')
+         raise ArgumentException('abi', abi)
+ 
+@@ -140,7 +140,7 @@
+         avd = FindAVDForABI(abi, avdABIs)
+ 
+     if not IsValidAVD(avd, abi, avdABIs):
+-        print('Invalid virtual device: ', avd)
++        print(('Invalid virtual device: ', avd))
+         print('  Use --avd to set the virtual device')
+         print('  Use "android lists avds" to see all usable virtual devices')
+         raise ArgumentException('avd', avd)
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
new file mode 100644
index 000000000000..5322430bfb38
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
@@ -0,0 +1,14 @@
+--- a/CI/binary-release-pipeline/lambda_publish.py	(original)
++++ b/CI/binary-release-pipeline/lambda_publish.py	(refactored)
+@@ -39,9 +39,9 @@
+                 prefix = publish_key_prefix,
+                 config = config
+             )
+-            print('Uploading artifacts to https://s3.console.aws.amazon.com/s3/object/{bucket}/{key}'.format(
++            print(('Uploading artifacts to https://s3.console.aws.amazon.com/s3/object/{bucket}/{key}'.format(
+                 bucket = publish_bucket,
+-                key = publish_key))
++                key = publish_key)))
+ 
+             s3.meta.client.copy(
+                 { 'Bucket': input_artifacts[i]['location']['s3Location']['bucketName'],
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
new file mode 100644
index 000000000000..f17f05b3d3d5
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
@@ -0,0 +1,19 @@
+--- a/doc_crosslinks/generate_cross_link_data.py	(original)
++++ b/doc_crosslinks/generate_cross_link_data.py	(refactored)
+@@ -17,14 +17,14 @@
+         if match:
+             with codecs.open(join(apiDefinitionsPath, file), 'rb', 'utf-8') as api_definition:
+                 api_content = json.loads(api_definition.read())
+-                if "uid" in api_content["metadata"].keys():
++                if "uid" in list(api_content["metadata"].keys()):
+                     sdks[api_content["metadata"]["uid"]] = getServiceNameFromMetadata(api_content["metadata"])
+            
+     return sdks
+     
+ def getServiceNameFromMetadata(metadataNode):
+     toSanitize = ""
+-    if "serviceAbbreviation" in metadataNode.keys():
++    if "serviceAbbreviation" in list(metadataNode.keys()):
+         toSanitize = metadataNode["serviceAbbreviation"]
+     else: 
+         toSanitize = metadataNode["serviceFullName"]
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch
new file mode 100644
index 000000000000..885f94800c17
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_3rdparty_py-3.9.patch
@@ -0,0 +1,70 @@
+--- a/scripts/build_3rdparty.py	(original)
++++ b/scripts/build_3rdparty.py	(refactored)
+@@ -237,7 +237,7 @@
+         dependentInstallFile = os.path.join( uppercaseLib + "-prefix", "src", uppercaseLib + "-build", "cmake_install.cmake" )
+         dependentInstallDirectory = '"' + os.path.join( installDirectory, "external", dependentLib ) + '"'
+         dependent_install_call = "cmake -DCMAKE_INSTALL_CONFIG_NAME=" + config + " -DCMAKE_INSTALL_PREFIX=" + dependentInstallDirectory + " -P " + dependentInstallFile + " .."
+-        print( "dependent install call = " + dependent_install_call )
++        print(( "dependent install call = " + dependent_install_call ))
+         subprocess.check_call( dependent_install_call, shell = True )
+ 
+ 
+@@ -254,7 +254,7 @@
+ 
+     sourcePlatform = platform.system()
+     if not sourcePlatform in platformEnvironments:
+-        print( "Platform " + sourcePlatform + " not supported as a build platform" )
++        print(( "Platform " + sourcePlatform + " not supported as a build platform" ))
+         return 1
+ 
+     platformEnv = platformEnvironments[ sourcePlatform ]
+@@ -292,12 +292,12 @@
+         shutil.rmtree( installDirectory )
+ 
+     if not architecture in platformBuildTargets:
+-        print( "No definition for target architecture " + architecture )
++        print(( "No definition for target architecture " + architecture ))
+         return 1
+ 
+     targetPlatformDef = platformBuildTargets[ architecture ]
+     if not sourcePlatform in targetPlatformDef[ 'buildPlatforms' ]:
+-        print( "Platform " + sourcePlatform + " does not support building for architecture " + architecture )
++        print(( "Platform " + sourcePlatform + " does not support building for architecture " + architecture ))
+         return 1
+ 
+     buildEnvironment = buildEnvironments[ targetPlatformDef[ 'build_environment' ] ]
+@@ -338,18 +338,18 @@
+                 cmake_call_list = cmake_call_list + " -DCUSTOM_PLATFORM_DIR=\"" + customPlatformDir + "\""
+ 
+             cmake_call_list = cmake_call_list + " " + quotedSourceDir
+-            print( "cmake call = " + cmake_call_list )
++            print(( "cmake call = " + cmake_call_list ))
+             subprocess.check_call( cmake_call_list, shell = True )
+ 
+             parallelBuildOption = buildEnvironment[ 'parallel_option' ].replace("??", str(parallelJobs))
+             build_call_list = buildEnvironment[ 'global_build_call' ] + archConfig[ 'build_params' ]
+             if parallelBuildOption != "":
+                 build_call_list = build_call_list + [ parallelBuildOption ]
+-            print( "build call = " + str( build_call_list ) )
++            print(( "build call = " + str( build_call_list ) ))
+             subprocess.check_call( build_call_list )
+ 
+             install_call = "cmake -DCMAKE_INSTALL_CONFIG_NAME=" + archConfig[ 'config' ] + " -DCMAKE_INSTALL_PREFIX=" + quotedInstallDirectory + " -P cmake_install.cmake " + quotedSourceDir
+-            print( "install call = " + install_call )
++            print(( "install call = " + install_call ))
+             subprocess.check_call( install_call, shell = True )
+ 
+             # platform specific stuff
+@@ -365,9 +365,9 @@
+             os.chdir( ".." )
+ 
+         else:
+-            print("Build target config " + targetConfig + " does not exist for architecture " + architecture)
+-
+-    print( "Aws SDK for C++  finished 3rd party installation into: " + installDirectory )
++            print(("Build target config " + targetConfig + " does not exist for architecture " + architecture))
++
++    print(( "Aws SDK for C++  finished 3rd party installation into: " + installDirectory ))
+     
+ 
+ # On windows: Run from powershell; make sure msbuild is in PATH environment variable  
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch
new file mode 100644
index 000000000000..8596e41c5f27
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_build_example_py-3.9.patch
@@ -0,0 +1,18 @@
+--- a/scripts/build_example.py	(original)
++++ b/scripts/build_example.py	(refactored)
+@@ -56,13 +56,13 @@
+     cmake_call = cmake_call + " -DCMAKE_PREFIX_PATH=" + sdkInstallDir
+     cmake_call = cmake_call + " -DAWSSDK_ROOT_DIR=" + sdkInstallDir
+     cmake_call = cmake_call + " " + sourceDir
+-    print("cmake call = " + cmake_call)
++    print(("cmake call = " + cmake_call))
+     subprocess.check_call(cmake_call, shell = True)
+     
+     build_call = buildEnvironment[ platform ][ 'global_build_call' ]
+     build_call = build_call + buildEnvironment[ platform ][ 'configs' ].replace("??", buildType)
+     build_call = build_call + buildEnvironment[ platform ][ 'parallel_option' ].replace("??", parallel)
+-    print("build call = " + build_call)
++    print(("build call = " + build_call))
+     subprocess.check_call(build_call, shell = True)
+ 
+ def Main():
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch
new file mode 100644
index 000000000000..396d1b134ebd
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_dummy_web_server_py-3.9.patch
@@ -0,0 +1,20 @@
+--- a/scripts/dummy_web_server.py	(original)
++++ b/scripts/dummy_web_server.py	(refactored)
+@@ -78,7 +78,7 @@
+             self._set_headers()
+             self.wfile.write(self._html("hi!"))
+         except socket.error as e:
+-            print ("socket.error : Connection broke. Aborting" + str(e))
++            print(("socket.error : Connection broke. Aborting" + str(e)))
+             self.wfile._sock.close()
+             self.wfile._sock = None
+             return False
+@@ -111,7 +111,7 @@
+     server_address = (addr, port)
+     httpd = server_class(server_address, handler_class)
+ 
+-    print("Starting httpd server on {}:{}.".format(addr, port))
++    print(("Starting httpd server on {}:{}.".format(addr, port)))
+     httpd.serve_forever()
+     httpd.stop_server()
+ 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch
new file mode 100644
index 000000000000..3fd67591c098
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_endpoints_checker_py-3.9.patch
@@ -0,0 +1,29 @@
+--- a/scripts/endpoints_checker.py	(original)
++++ b/scripts/endpoints_checker.py	(refactored)
+@@ -64,8 +64,8 @@
+     strippedContent = RemoveCPPComments(content);
+     match = ScanContent(strippedContent);
+     if match:
+-        print inputFile;
+-        print "..." + strippedContent[match.start() : match.end()] + "...";
++        print(inputFile);
++        print("..." + strippedContent[match.start() : match.end()] + "...");
+         return True;
+ 
+     return False;
+@@ -109,7 +109,7 @@
+ assert ScanContent("\"cn-north-2 doesn't exist\"") == None;
+ 
+ ###################Test End######################################
+-print "Start checking hard coded endpoints in source files...";
++print("Start checking hard coded endpoints in source files...");
+ exitCode = 0;
+ RootDir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)));
+ for root, dirnames, fileNames in os.walk(RootDir):
+@@ -117,5 +117,5 @@
+         if fileName.endswith(('.h', '.cpp')):
+             targetFile = os.path.join(root, fileName);
+             exitCode |= CheckFile(targetFile);
+-print "Finished checking hard coded endpoints in source files with exit code",exitCode,".";
++print("Finished checking hard coded endpoints in source files with exit code",exitCode,".");
+ exit(exitCode);
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch
new file mode 100644
index 000000000000..c1141bdf53e5
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_gather_3rdparty_py-3.9.patch
@@ -0,0 +1,11 @@
+--- a/scripts/gather_3rdparty.py	(original)
++++ b/scripts/gather_3rdparty.py	(refactored)
+@@ -200,7 +200,7 @@
+ 
+     # shutil.rmtree( destDir )
+ 
+-    print( "Aws SDK for C++  finished 3rd party pre-build gather into: " + uploadZipFile )
++    print(( "Aws SDK for C++  finished 3rd party pre-build gather into: " + uploadZipFile ))
+     
+ 
+ Main()
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch
new file mode 100644
index 000000000000..12b910425bf5
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch
@@ -0,0 +1,25 @@
+--- a/scripts/generate_sdks.py	(original)
++++ b/scripts/generate_sdks.py	(refactored)
+@@ -94,7 +94,7 @@
+                  with zipfile.ZipFile(output.strip().decode('utf-8'), 'r') as zip:
+                      zip.extractall(outputDir)
+     except EnvironmentError as  ex:
+-        print('Error generating sdk {} with error {}'.format(sdk, ex))
++        print(('Error generating sdk {} with error {}'.format(sdk, ex)))
+ 
+ def Main():
+     arguments = ParseArguments()
+@@ -105,11 +105,11 @@
+     sdks = DiscoverAllAvailableSDKs(arguments['pathToApiDefinitions'])
+ 
+     if arguments['listAll']:
+-        for key, value in sdks.iteritems():
++        for key, value in sdks.items():
+             print(value)
+ 
+     if arguments['serviceName']:
+-        print('Generating {} api version {}.'.format(arguments['serviceName'], arguments['apiVersion']))
++        print(('Generating {} api version {}.'.format(arguments['serviceName'], arguments['apiVersion'])))
+         key = '{}-{}'.format(arguments['serviceName'], arguments['apiVersion'])
+         GenerateSdk(arguments['pathToGenerator'], sdks[key], arguments['outputLocation'], arguments['namespace'], arguments['licenseText'], arguments['standalone'], arguments['enableVirtualOperations'])
+ 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch
new file mode 100644
index 000000000000..d73fa82ff1c0
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch
@@ -0,0 +1,11 @@
+--- a/scripts/renew_license.py	(original)
++++ b/scripts/renew_license.py	(refactored)
+@@ -55,7 +55,7 @@
+     if (skipFile(inputFile)):
+         return False;
+ 
+-    print ("Process file: " + inputFile)
++    print(("Process file: " + inputFile))
+     with open(inputFile) as ftarget:
+         content = ftarget.read()
+ 
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch
new file mode 100644
index 000000000000..f451e707f40b
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch
@@ -0,0 +1,17 @@
+--- a/scripts/run_integration_tests.py	(original)
++++ b/scripts/run_integration_tests.py	(refactored)
+@@ -52,11 +52,11 @@
+         testExe = os.path.join(arguments[ "testDir" ], testName if testHasParentDir else "", testName) + exeExtension
+         # when build with BUILD_ONLY, not all test binaries will be generated.
+         if not os.path.isfile(testExe):
+-            print("Test: \"{}\" doesn't exist, skipped.".format(testExe))
++            print(("Test: \"{}\" doesn't exist, skipped.".format(testExe)))
+             continue
+         prefix = "--aws_resource_prefix=" + platform.system().lower()
+-        print("testExe = " + testExe)
+-        print("prefix = " + prefix)
++        print(("testExe = " + testExe))
++        print(("prefix = " + prefix))
+         AddExecutableBit(testExe)
+         subprocess.check_call([testExe, prefix])
+ 
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index 3995d6c12b58..d9d348be77d8 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amit.prakash.ambasta@gmail.com</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -27,19 +31,28 @@
 
 		<flag name="access-management">
 			AWS Access Management, a meta-flag that enables:
-			AWS Certificate Manager (ACM): Provision, manage, and deploy SSL/TLS certificates on AWS managed
-				resources.
+			AWS Certificate Manager (ACM): Provision, manage, and deploy SSL/TLS certificates on AWS
+				managed resources.
+			AWS Data Exchange            : A service that makes it easy for customers to find, subscribe
+				to, and use third-party data in the AWS Cloud.
+			AWS IAM Access Analyzer      : Identify any policies that grant access to an external
+				principal.
 			Identity and Access Management (IAM): A web service for securely controlling access to AWS
 				services.
 			Resource Access Manager (RAM): Customers who operate multiple accounts can create resources
-				centrally and use AWS RAM to share them with all of their accounts to reduce operational
-				overhead.
-			Also enables acm-pca, identity-management and sts (Security Token Service).
+				centrally and use AWS RAM to share them with all of their accounts to reduce
+				operational overhead.
+			SSO : AWS Single Sign-On (SSO) makes it easy to centrally manage access to multiple AWS
+				accounts and business applications and provide users with single sign-on access to all
+				their assigned accounts and applications from one place.
+			Also enables acm-pca, identity-management, identitystore, sso-oidc and sts (Security Token
+			Service).
 		</flag>
 		<flag name="apigateway">
 			Create and deploy your own REST and WebSocket APIs at any scale.
 			Also enables apigatewaymanagementapi and apigatewayv2.
 		</flag>
+		<flag name="appconfig">Quickly deploy application configurations to applications of any size.</flag>
 		<flag name="backup">AWS Backup is a fully managed backup service</flag>
 		<flag name="batch">Run batch computing workloads on the AWS Cloud</flag>
 		<flag name="budgets">
@@ -58,16 +71,22 @@
 				internal websites and web apps from mobile devices.
 			WorkMail     : Managed email and calendaring service.
 			WorkSpaces   : Cloud-based desktop experience for end users.
+			Also enabled workmailmessageflow.
 		</flag>
 		<flag name="cloud-dev">
 			Enables in-cloud developer tools:
 			Cloud9      : Cloud-based integrated development environment IDE to write, run, and debug code.
+			CodeArtifact: Secure and scalable artifact management service for software development.
 			CodeBuild   : Managed build service that compiles, runs unit tests and produces artifacts.
 			CodeCommit  : Privately store and manage Git repositories in the AWS cloud.
 			CodeDeploy  : Automate the deployment and updating of applications.
+			CodeGuru    : Provides intelligent recommendations for improving application performance,
+				efficiency, and code quality in your Java applications.
 			CodePipeline: Continuous delivery service to model, visualize, and automate the steps required
 				to release software.
-			CodeStar    : Quickly develop, build, and deploy applications on AWS.
+			CodeStar    : Quickly develop, build, and deploy applications on AWS. Also enables
+				codestar-connections and codestar-notifications.
+			Honey Code  : Fully managed service to quickly build mobile and web apps for teams.
 			Queues      : Simple queue class. Allows standard queue operations top, delete, and push. Also
 				has higher level, asynchronous interface with callbacks.
 			X-Ray       : Provides request tracing, exception collection, and profiling capabilities.
@@ -127,15 +146,18 @@
 			CloudTrail          : Monitor AWS deployments in the cloud by getting a history of AWS API
 				calls, including API calls made via the AWS Management Console, the AWS SDKs, the
 				command line tools, and higher-level AWS services.
+			Compute Optimizer   : Recommends optimal AWS compute resources for your workloads.
 			GuardDuty           : Continuous security monitoring service.
 			Health              : Provides personalized information about events that can affect the AWS
-				infrastructure, guides through scheduled changes, and accelerates the troubleshooting of
-				issues that affect AWS resources and accounts.
+				infrastructure, guides through scheduled changes, and accelerates the troubleshooting
+				of issues that affect AWS resources and accounts.
 			Inspector           : A security vulnerability assessment service that helps improve the
 				security and compliance of
 			AWS resources.
 			Logs                : Monitor, store, and access log files from Amazon EC2 instances, AWS
 				CloudTrail, or other sources.
+			Synthetics          : Create canaries, configurable scripts that run on a schedule, to monitor
+				your endpoints and APIs.
 		</flag>
 		<flag name="cognito">
 			Create unique identities, authenticate these identities with identity providers and save mobile
@@ -152,13 +174,23 @@
 			Manage the lifecycle of AWS resources. Create lifecycle policies to automate operations on
 			specified resources.
 		</flag>
+		<flag name="ebs">
+			Amazon Elastic Block Store (Amazon EBS) is a web service that provides block level storage
+			volumes for use with EC2 instances. EBS volumes are highly available and reliable storage
+			volumes that can be attached to any running instance and used like a hard drive.
+		</flag>
 		<flag name="ec2">
 			Amazon Elastic Compute Cloud (EC2) is a web service that provides resizeable computing capacity.
 			This flag also enables the following modules:
 			Auto Scaling       : Set up dynamic and predictive scaling for scalable AWS resources. Also
 				enables autoscaling-plans and application-autoscaling.
+			EC2 Image Builder  : Fully-managed AWS service that makes it easier to automate the creation,
+				management, and deployment of customized, secure, and up-to-date “golden” server images
+				that are pre-installed and pre-configured with software and settings to meet specific IT
+				standards.
 			Elastic File System: EFS provides file storage for Amazon EC2 instances.
-
+			Savings Plan       : Flexible pricing model that helps you save a significant percentage on
+				Amazon EC2 and Fargate usage.
 		</flag>
 		<flag name="ecr">
 			Amazon Elastic Container Registry (ECR) is a fully managed Docker container registry.
@@ -167,12 +199,19 @@
 			Amazon Elastic Container Service (ECS) is a highly scalable, fast, container management service.
 		</flag>
 		<flag name="eks">
-			Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without own Kubernetes clusters.
+			Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without
+			own Kubernetes clusters.
 		</flag>
 		<flag name="elasticache">
 			Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
 		</flag>
 		<flag name="elasticbeanstalk">Quickly deploy and manage applications in the AWS Cloud.</flag>
+		<flag name="elasticinference">
+			Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered
+			acceleration to many Amazon machine instances in order to reduce the cost of running deep
+			learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and
+			ONNX models through MXNet.
+		</flag>
 		<flag name="elasticloadbalancing">
 			Automatically distribute incoming application traffic across multiple targets, such as EC2
 			instances.
@@ -186,6 +225,7 @@
 			Amazon Simple Email Service (Amazon SES):
 			An email platform to send and receive email using ones own email addresses and domains.
 			See: https://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html
+			Also enables sesv2
 		</flag>
 		<flag name="es">
 			Amazon Elasticsearch Configuration Service (ES) is an API to create, configure, and manage
@@ -195,6 +235,18 @@
 			Serverless event bus service to connect applications with data from a variety of sources.
 			Also enables eventbridge.
 		</flag>
+		<flag name="forecast">
+			Amazon Forecast is a fully managed deep learning service for time-series forecasting. Time-
+			series forecasting is useful in multiple domains, including retail, financial planning, supply
+			chain, and healthcare.
+			Also enables the forecastquery module.
+		</flag>
+		<flag name="frauddetector">
+			Amazon Fraud Detector is a fully managed service that helps you detect suspicious online
+			activities such as the creation of fake accounts and online payment fraud. With Amazon Fraud
+			Detector, you can create a fraud detection ML model with just a few clicks and use it to
+			evaluate online activities in milliseconds.
+		</flag>
 		<flag name="fsx">Amazon FSx is a fully managed service to launch and use shared file storage.</flag>
 		<flag name="globalaccelerator">
 			AWS Global Accelerator is a network layer service for accelerators to improve availability and
@@ -212,20 +264,28 @@
 			iotanalytics  : Provides advanced data analysis for AWS IoT.
 			iotevents     : Monitor equipment or device fleets for failures or changes in operation, and
 				trigger actions when such events occur.
+			iotsitewise   : Easily collect, organize, and analyze data from industrial equipment at scale.
 			iotthingsgraph: Integrated set of tools that enable developers to build IoT applications using
-				devices and services that use different data representation standards and communication protocols.
-			Also enables iot1click-devices, iot1click-projects, iot-data, iotevents-data and iot-jobs-data.
+				devices and services that use different data representation standards and communication
+				protocols.
+			Also enables iot1click-devices, iot1click-projects, iot-data, iotevents-data, iot-jobs-data and
+			iotsecuretunneling.
+		</flag>
+		<flag name="kendra">
+			Amazon Kendra is a search service, powered by machine learning, that enables users to search
+			unstructured text using natural language.
 		</flag>
 		<flag name="kinesis">
 			Amazon Kinesis
 			Collect, process, and analyze video and data streams in real time. The following modules besides
 			kinesis are enabled:
-			firehose                    : Load data streams into AWS data stores.
-			kinesisanalytics            : Process and analyze streaming data using SQL or Java. (Also
-				enables kinesisanalyticsv2)
-			kinesisvideo                : Capture, process, and store video streams for analytics and
-				machine learning.
-			Additionally kinesis-video-archived-media and kinesis-video-media are enabled.
+			firehose        : Load data streams into AWS data stores.
+			ivs             : Managed live streaming solution for creating interactive video experiences.
+			kinesisanalytics: Process and analyze streaming data using SQL or Java. (Also enables 
+				kinesisanalyticsv2)
+			kinesisvideo    : Capture, process, and store video streams for analytics and machine learning.
+			Additionally kinesis-video-archived-media, kinesis-video-media and kinesis-video-signaling are
+			enabled.
 		</flag>
 		<flag name="kms">
 			AWS Key Management Service (KMS)
@@ -251,6 +311,7 @@
 		<flag name="macie">
 			A security service that uses machine learning to automatically discover, classify, and protect
 			sensitive data in AWS.
+			Also enables macie2
 		</flag>
 		<flag name="managedblockchain">
 			Create and manage scalable blockchain networks using popular open source frameworks. Currently,
@@ -266,7 +327,11 @@
 			Marketplace Metering Service   : A pricing and metering feature that AWS Marketplace sellers can
 				use to directly charge for their software along one of four dimensions: users, data,
 				bandwidth, or hosts.
-			Also enables pricing.
+			Also enables marketplace-catalog and pricing.
+		</flag>
+		<flag name="networkmanager">
+			Transit Gateway Network Manager (Network Manager) enables you to create a global network, in
+			which you can monitor your AWS and on-premises networks that are built around transit gateways.
 		</flag>
 		<flag name="organizations">
 			Account management service that to consolidate multiple AWS accounts into an organization to be
@@ -281,11 +346,17 @@
 			you would like to have any of the following modules to have their own USE flag, please open a
 			bug report and it will most probably get one.
 			The modules are:
-			AWSMigrationHub, alexaforbusiness, clouddirectory, comprehend, comprehendmedical, connect,
-			datapipeline, datasync, directconnect, discovery, dms, docdb, ds, dynamodb, gamelift, glue,
-			groundstation, importexport, kafka, lakeformation, mq, mturk-requester, neptune, quicksight,
-			redshift, robomaker, sdb, service-quotas, servicecatalog, servicediscovery, signer, sms,
-			snowball, ssm, states, storagegateway, support and swf.
+			AWSMigrationHub, alexaforbusiness, appflow, braket, clouddirectory, comprehend,
+			comprehendmedical, connect, datapipeline, datasync, directconnect, discovery, dms, docdb, ds,
+			dynamodb, gamelift, glue, groundstation, importexport, kafka, lakeformation, migrationhub-
+			config, mq, mturk-requester, neptune, quicksight, redshift, robomaker, sdb, schemas, service-
+			quotas, servicecatalog, servicediscovery, signer, sms, snowball, ssm, states, storagegateway,
+			support and swf.
+		</flag>
+		<flag name="outposts">
+			AWS Outposts brings native AWS services, infrastructure, and operating models to virtually any
+			data center, co-location space, or on-premises facility. You can use the same services, tools,
+			and partner solutions to develop for the cloud and on premises.
 		</flag>
 		<flag name="personalize">
 			Real-time personalization and recommendations, based on the same technology used at Amazon.com.
@@ -294,7 +365,14 @@
 		<flag name="polly">
 			Amazon Polly
 			A Text-to-Speech (TTS) cloud service that converts text into lifelike speech.
-			Also enables text-to-speech.
+			Also enables text-to-speech, which needs you to enable pulseaudio support to work.
+		</flag>
+		<flag name="qldb">
+			Amazon Quantum Ledger Database (Amazon QLDB) is a fully managed ledger database that provides a
+			transparent, immutable, and cryptographically verifiable transaction log owned by a central
+			trusted authority. You can use Amazon QLDB to track all application data changes, and maintain
+			a complete and verifiable history of changes over time.
+			Also enables qldb-session.
 		</flag>
 		<flag name="queues">
 			AWS Queues is a simple queue class.
@@ -330,7 +408,7 @@
 			Fully managed machine learning service. With Amazon SageMaker, data scientists and developers
 			can quickly and easily build and train machine learning models, and then directly deploy them
 			into a production-ready hosted environment.
-			Also enables sagemaker-runtime.
+			Also enables sagemaker-a2i-runtime and sagemaker-runtime.
 		</flag>
 		<flag name="secretsmanager">
 			Encrypt, store, and retrieve credentials for databases and other services.
@@ -367,7 +445,7 @@
 			CloudFront distributions or an Application Load Balancer. Can also be used to block or allow
 			requests based on conditions such as the IP addresses that requests originate from or values in
 			the requests.
-			Also enables fms and waf-regional.
+			Also enables fms, waf-regional and wafv2
 		</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 0767bdb874f5..ebec3812af55 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,9 +1,6 @@
 AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a187151eacbb5dc1be0bf0ce87ee434da40cefb8e898bae478940c3410c873b1f58c75cf915d7ebe2b90a713a0428db8842fac1be33 SHA512 c60bbe81a007b8f8a5cb197542ae3a2fc1c94c76f10d1ff6ca18576fee84106aca29c158b1c9a967f047c3ca9b527255772bd66ad859f9d49c6e94c86b61b71c
-AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5b5db300523f45e25e6bc161277174ea4c461e872f24bfd23839510a7857c44733a333cb6054b7dc183faa3e2e SHA512 90948e75d5bb6f2620a92fe4aea37d05aaf25e98430b112651aa6ad635f19f8659658ae79d16e60e27ca61ec5da92d5dd1c234c4c9e2ae0fab44b92806bcafe0
 DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
 DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
-DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
 EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241
-EBUILD botan-2.15.0.ebuild 3093 BLAKE2B 4ca321cc64517cdf9a76022660f8804f0f8c6e099e0ce0d7e1c59a2b410c3a5e6ea98ed6204c4ad039f6195581f7009e79691564237320ce882ae65bcc7ceaae SHA512 cd9b3fc8740c5e2479d85f04ab676a19bc9e0d90cce1a5d7d70fff233eeff0d4d9c8fcd2bd9c999a709a785ab25f53584d79ee9f1f0a36b6b0000c3a33fda0eb
-EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c
+EBUILD botan-2.15.0.ebuild 3092 BLAKE2B 5bf774c5c31f0905ecaaac36227d19276437067d40a759174949777470715d1625ee7991b3b15ab6f83cf3cd378b72ef40c073ad3ea68b192037204925e4c856 SHA512 3c2b6408d8432d68587fbad3130b8d03d7c84e5c307aed8dab41ea755e65ba13c9ec5566a2f779b2f491e7ee92d233e67d0f7c162ebc09ec601578fe2d279654
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.15.0.ebuild b/dev-libs/botan/botan-2.15.0.ebuild
index e0c7d9955b5e..5f9c7a702b9c 100644
--- a/dev-libs/botan/botan-2.15.0.ebuild
+++ b/dev-libs/botan/botan-2.15.0.ebuild
@@ -16,7 +16,7 @@ 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.9.0.ebuild b/dev-libs/botan/botan-2.9.0.ebuild
deleted file mode 100644
index ec3daddb3301..000000000000
--- a/dev-libs/botan/botan-2.9.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit multilib python-r1 toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
-
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-SLOT="2/$(ver_cut 1-2)" # soname version
-LICENSE="BSD"
-IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-	boost? ( >=dev-libs/boost-1.48:= )
-	lzma? ( app-arch/xz-utils:= )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-BDEPEND="dev-lang/python:*
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling modules: ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	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
-
-	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		$(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 '') \
-		--cc=gcc \
-		--cpu=${CHOSTARCH} \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		--docdir=share/doc \
-		--libdir=$(get_libdir) \
-		--os=${myos} \
-		--prefix="${EPREFIX}/usr" \
-		--with-endian="$(tc-endian)" \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--without-doxygen \
-		|| die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl python_optimize
-}
diff --git a/dev-libs/botan/files/botan-2.9.0-build.patch b/dev-libs/botan/files/botan-2.9.0-build.patch
deleted file mode 100644
index 6208ffdbf0ad..000000000000
--- a/dev-libs/botan/files/botan-2.9.0-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 86df247e4f090f984e050962ed5a4a536ec63b33 Mon Sep 17 00:00:00 2001
-From: Ralf van der Enden <Ralf.vanderEnden@deltares.nl>
-Date: Fri, 5 Apr 2019 14:58:14 +0200
-Subject: [PATCH] boost 1.70 compatibility
-
-Fixes issue #82
----
- src/cli/tls_http_server.cpp | 8 +++++++-
- src/cli/tls_proxy.cpp       | 8 +++++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp
-index cc59a71c33..0a6428cd65 100644
---- a/src/cli/tls_http_server.cpp
-+++ b/src/cli/tls_http_server.cpp
-@@ -41,6 +41,12 @@
- 
- #include "credentials.h"
- 
-+#if BOOST_VERSION >= 107000
-+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
-+#else
-+#define GET_IO_SERVICE(s) ((s).get_io_service())
-+#endif
-+
- namespace Botan_CLI {
- 
- namespace {
-@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final
-       session::pointer make_session()
-          {
-          return session::create(
--                   m_acceptor.get_io_service(),
-+                   GET_IO_SERVICE(m_acceptor),
-                    m_session_manager,
-                    m_creds,
-                    m_policy);
-diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp
-index 49ffbe3766..42ce156b12 100644
---- a/src/cli/tls_proxy.cpp
-+++ b/src/cli/tls_proxy.cpp
-@@ -33,6 +33,12 @@
- 
- #include "credentials.h"
- 
-+#if BOOST_VERSION >= 107000
-+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
-+#else
-+#define GET_IO_SERVICE(s) ((s).get_io_service())
-+#endif
-+
- namespace Botan_CLI {
- 
- namespace {
-@@ -370,7 +376,7 @@ class tls_proxy_server final
-       session::pointer make_session()
-          {
-          return session::create(
--                   m_acceptor.get_io_service(),
-+                   GET_IO_SERVICE(m_acceptor),
-                    m_session_manager,
-                    m_creds,
-                    m_policy,
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index c390554a624e..e00316b13f39 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,3 +1,5 @@
+DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
 EBUILD boxfort-0.0.1_pre20200110.ebuild 946 BLAKE2B 955d51f99410c6fad234b3809d39dcf4ddcfb9767926a0d10faa29d3617ca268f74a17186cfead644abe7c299e33ada7df528921e8e93800d4e223e647370bdb SHA512 e9d41bc6d42a6aafe88143bc18ab77a2951edf9da7979a8df27e84b3e55bf3ad88db4fd11a41d64ccb6f69d166b34048fcd2d9472903648fd0af93016cf4d069
+EBUILD boxfort-0.0.1_pre20200902.ebuild 939 BLAKE2B 133fc0a9e9dd6e125344511b1e33433bbf54213557963cc673113298f7a08228d98ffd607e5a68224ee772c23cd680b329cc1bbf6d3ce1dec7e647a67f363733 SHA512 78ba5c0ca379d97e40bfd0b34649b125de6dedcdd32b3e355e922222463e27a58ddf45950c5db1299e35b525eec85ab48661d485a96a94e935267d13a04f44aa
 MISC metadata.xml 462 BLAKE2B 36e684c3f60dbb9b8a300c2ac9e93aa2ecae94578ac292601f926d371462ffdded78318860f37407a3c4bb4753f173b298f73e8863b4eaa1e873aefab9053546 SHA512 be917138f28a526bd0bea7f17b719a93de749a923bf7fe380ac06db3ae7abc23ceac0a97504f2ca22a19f99bc0f53dac5a524e1025faa8edafcf0452ef5230ad
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
new file mode 100644
index 000000000000..970c74b5d5f0
--- /dev/null
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit meson python-any-r1
+
+BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
+
+DESCRIPTION="Convenient & cross-platform sandboxing C library"
+HOMEPAGE="https://github.com/Snaipe/BoxFort"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
+
+python_check_deps() {
+	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 8f74f307cfda..66b7c90f1a05 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -3,7 +3,9 @@ AUX c-blosc-1.19.0-xgetbv.patch 1088 BLAKE2B 45e9d6c0e3a166d7c2cb41381fa9c75ca19
 DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
 DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c
 DIST c-blosc-1.20.0.tar.gz 878891 BLAKE2B 742619a5de9696646f8c434f25e736dc3662b8215c6397d9e23f7f86ae6df78c014c8b23bfa1cada72f31b99d81b6c9d99eeb28189c529fe692b88f95da1d67a SHA512 b3da9970542c389fce4acb6ffb866c066dfbf542fadb21ed3d6a7688f9cccf89425ccdc9253a1f7172eced224ff27b78be0c9ce111b4b69ec303a61fb7c1bc10
+DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475
 EBUILD c-blosc-1.11.2.ebuild 1320 BLAKE2B b1b00873c35709d160a8b4af70c53aa1db292d114e85367840666a54af0b0f09f0e4e2b4c19960f30b1d50278c87909495ff202866b233fc28c8be231ea5048d SHA512 10b361c01cb2dedfc5889d37e4043d9b2aa2f911057a60560014b3823df73d59afee2aadc5c07452e9e0e75426d8c1d8007b9df3e020acdda7a3162ce0c3f43e
 EBUILD c-blosc-1.19.0.ebuild 1133 BLAKE2B f58035bf0c85812a52ba2ecd64372571021849a72a4efb8ffb6d7cd8a8243757091dfb1b73a7ef58546c23fbe7bfc1ebd5cc697fc1c74cfc775d53eff2ed1669 SHA512 29b1bb97a257994bda228fa6528d5a85c5ecf83495b6d30cc0696c08837dc85071260df6d78e25c92d50752a7d72288b9723e9261cbba139b1353a51c2d2fcc2
 EBUILD c-blosc-1.20.0.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54
+EBUILD c-blosc-1.20.1.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54
 MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654
diff --git a/dev-libs/c-blosc/c-blosc-1.20.1.ebuild b/dev-libs/c-blosc/c-blosc-1.20.1.ebuild
new file mode 100644
index 000000000000..894b71680371
--- /dev/null
+++ b/dev-libs/c-blosc/c-blosc-1.20.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="https://www.blosc.org/"
+SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+lz4 +snappy test zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lz4? ( >=app-arch/lz4-1.7.5:= )
+	snappy? ( app-arch/snappy )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	# remove bundled libs
+	rm -rf internal-complibs || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_FUZZERS=OFF
+		-DDEACTIVATE_LZ4=$(usex !lz4)
+		-DDEACTIVATE_SNAPPY=$(usex !snappy)
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+		-DPREFER_EXTERNAL_LZ4=ON
+		# snappy is always external
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 580c5a336ab4..95bc0a926c30 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,8 +1,6 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
-DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
 DIST check-0.15.0.tar.gz 306428 BLAKE2B fea2a169b86248a6657f890469f41cd699dd95efb91e311ccf188548a6c8c28568decf0b5f03b08aed31e14c69d50707b418e1e71c6db7e1b7938ee36aa19cd8 SHA512 efde93977a38520b3b83a9e2f678d07b916fc27e41cf839a663900c4153d645fe4274ec3b7e2dabf475457f909f61734632c97b7257c49f5853fd11d920b0c84
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
-EBUILD check-0.14.0-r2.ebuild 1498 BLAKE2B f9c8ceaf6000ce5c0878bf85a2a88f3098d40f6c77c7f928f81fd91624bd9293fc447f94498e5e475b3f699d115b80b5705169ab99560b15fa779c924be81a14 SHA512 815f57a1c3474e680dbd55b1d514daea2626fea087aef056b5d0547cce11ba9815f6ff4ef5e36d4e9b1b8264191d3ba30b40d29b882446c09ea6e90c1b91b100
-EBUILD check-0.15.0.ebuild 1500 BLAKE2B 28fe049b5786c3941f4971668e928557a4316e311eba1f1e10912288a5835d8cceea7f9d1fa5ec0f820a3ac48c6ae3d25b5218cf450ac3271b1e456e789afb71 SHA512 c35153703669b1abc6f9ec8aef1a320fca5c599d8a5ba48a423bf3e225f6a623360730292c29e6fd377e5ddf7740eebd763fcabc72df73281131c918202319f5
-EBUILD check-0.15.2.ebuild 1507 BLAKE2B 8e46aa33a062e1f98734c5e7181e594484d59921e57fce8e3acadaabc5dfc6a8b23fba210a27c85c51e17ec2493659786796b5e3b776ffef5486c449fc793721 SHA512 c3193e289ae1d6ad1d9563f052a5ceb7fd582b30f312b7e6f00e5af2d444e83eb73f6660f2a69358fb626d144e8533d5310f63ec59f939e9daa2f409f38979e4
+EBUILD check-0.15.0.ebuild 1498 BLAKE2B f3e01f34d5ae27733a0e281cfb3f95a6f44617cef468dc62bdb00b9db72a9dd555ab3c7adf016edffa962031c9994150f1c1b4ba0f00e96d0f68b3bc33e480ce SHA512 fb817b17ec6039b0b1d52d36454ebd5ca8f6fd590084ad41f168f1300b899197b6e8ff231f9f175bf162eb0d7b576ab62a2458b97c2b6f78c45cb1aaa1fc1c15
+EBUILD check-0.15.2.ebuild 1580 BLAKE2B c63410b5a9af557a974cc1e13363e5288281e4194b4acf2564ab8f1d2e91d6beca749344c8416ce7bd25e8c095bf67993d1e5cead6dacbaba17c77defad6e80e SHA512 00711d106c35f653d5415952a629432c54731792ed95e090069ecc41f29959d4ed2989acd08dfffe7b0604925a6c5ca0b320e49679ed0c81ec0cb19de4723174
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild b/dev-libs/check/check-0.14.0-r2.ebuild
deleted file mode 100644
index 565a288bac27..000000000000
--- a/dev-libs/check/check-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,57 +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 unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-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 ~x64-solaris ~x86-solaris"
-IUSE="doc subunit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix wrong libdir, probably caused by multilib
-	sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed."
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if use doc && multilib_is_native_abi; then
-		cd "${S}"/doc/ || die "Failed to switch directories."
-		doxygen "." || die "Failed to run doxygen to generate docs."
-	fi
-}
-
-multilib_src_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/check/check-0.15.0.ebuild b/dev-libs/check/check-0.15.0.ebuild
index 328072dc9820..16d464eda35f 100644
--- a/dev-libs/check/check-0.15.0.ebuild
+++ b/dev-libs/check/check-0.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc subunit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2.ebuild
index d882baeb2af9..bcc597697139 100644
--- a/dev-libs/check/check-0.15.2.ebuild
+++ b/dev-libs/check/check-0.15.2.ebuild
@@ -12,10 +12,13 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc subunit test"
 
-RESTRICT="!test? ( test )"
+# Tests seem to timeout on ppc* systems, #736661
+RESTRICT="ppc? ( test )
+	ppc64? ( test )
+	!test? ( test )"
 
 RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index ce80f2ede958..58e77813f6b4 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -1,3 +1,3 @@
 DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
 EBUILD crc32c-1.0.6.ebuild 578 BLAKE2B 4eb6adc4f997bb5375daf78cb92ed6c95872ae78d392e737b384e4849a23d664ab614cf7801736a590d66304c790eaabf3d601d386ac71ab04d173466c679b2e SHA512 8ab6cc5f97f219d0b84bc1838a810adb67c1cb3d5be390e7c3783ab764b2b899fea57bc804a3ad3d48bd8bd7fdc745b2657ba05c32a5a7e2292896ba24c17dae
-MISC metadata.xml 376 BLAKE2B 98a66d83b64fc45ea9c6e127fd18002fbe521851084496c4a2dab72fa3714f1d5eb6c495e770668de2d02d2b5a91dee35fee2c4917504d71ac4fd7717161c028 SHA512 414702e63bba2c5f4647eeebb6c59049e40d11da18aa3049f58dee2d269f5be86c851ea4f14dda36a1b4ec15f2f6afd0e516b8106dd3064cf6fa47cba9bc164c
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/dev-libs/crc32c/metadata.xml b/dev-libs/crc32c/metadata.xml
index 87e8aaf70c68..76f45cdee0f4 100644
--- a/dev-libs/crc32c/metadata.xml
+++ b/dev-libs/crc32c/metadata.xml
@@ -5,7 +5,4 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-	<longdescription lang="en">
-		CRC32C implementation with support for CPU-specific acceleration instructions
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index a97ffb1a3d21..a266e131a7cf 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -17,5 +17,5 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
 EBUILD cyrus-sasl-2.1.27-r3.ebuild 8182 BLAKE2B 70af8a045087a3b745c0bad450c7a0ed0b43a906791845988306dc6068d0d3fc7646c6d7d9882a2e5aecea28f861d552d4e4ad9c2631eba8e0fdecb2b33a0a63 SHA512 5822cdc9cd037593cade59aec6c47590e25d012aed191377a82d03842412d433ba1d933f47345533d15d9e2c72cd4853dcd6a3a13ad07a2fa88bdc57f4c86a85
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8200 BLAKE2B bd73820606a6b60d219e6effe243e3cceff02602a7bdbec3b96bc666ad3b5df62c8d37bbfb8db004bb36ee4b7a4829d5e91818afe1940cad2ddaf349bcde6815 SHA512 8df2f31035e3484c3a13569b4f7efa126226bb061c03a658341256ebb73ae2752f737e9f92228c5d59caf27d85f0e90bc9b05e83c091bf44988325544aad9ee7
+EBUILD cyrus-sasl-2.1.27-r4.ebuild 8198 BLAKE2B 4a19fd58b980442e075ea9136d17724b2493078ae456e25627b903aa1218fa4fdd6fd3b6ade9ca1622c3ca2749e493714425736b8a62b121f4594438f36a0fdf SHA512 a787ee9efc83c46011cc90803530e3a10cab90c9e1d18a24401ce996a57948d1d61fc91b96f0fbf8ef502b00ab7f2571114ab9ac29587aa62991528caf1192ee
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index edb126b67681..0427282c01cd 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
diff --git a/dev-libs/date/Manifest b/dev-libs/date/Manifest
new file mode 100644
index 000000000000..7bc8ed9b69eb
--- /dev/null
+++ b/dev-libs/date/Manifest
@@ -0,0 +1,5 @@
+AUX date-3.0.0-c-locale-export.patch 3628 BLAKE2B 25fcd214430334a2c9f95dbff685957c563bd881ad6669bd7ee7ec7dcf619256cf096b65d76c8968c43192e2dd48b9739225f97e2088a12925d8b3d878ae5f53 SHA512 31f36be9fd6bc3eb8622ea6856b2c5b3bfbfa5a7dae748613839e5432051fe32e0ebe4c6b2c31dba4a0dc4787c85e671cdf321059f26a222b6a16436c3f624ea
+AUX date-3.0.0-version.patch 312 BLAKE2B 6cbfd659c271d39b3441ce980579efb8fa2b002e482710dfafde89ab1978742fb178ed3336d284febfb143f1a81ca23276e04bca3b1a00e218db26f403283acd SHA512 c1165064c48793572ffc02a07728b0fb815f4b8610764f08e9ca53b9fc7fbce83168d39b38191db2ccac69f283b637ac12cc8c1516c99d8e1cdffe9773cd0dfd
+DIST date-3.0.0.tar.gz 822623 BLAKE2B 438a7a5c153c7c2d695fefc95bbd474ef507af2cd8182d1e7d54d482b0128c3f9c57582ed5b40ef46d8f6f5539228d20322c684b1e1b418e5ade3b4871bf4ec1 SHA512 03ba0faef68e053aba888591b9350af1a043ef543825c80b1ca3f0dc0448697f56286e561f1a2a59e684680d7fc1e51fd24955c4cc222fe28db64f56037dc1aa
+EBUILD date-3.0.0.ebuild 1599 BLAKE2B 9eb62cd334e71c10fe02b209f0b78d47fa62d73b54e1a83584c26bb25c3ef07374e95ba1d31ef0100a25bd6bb222ef22105c6001b7a7e6a77d2f31d97efdc571 SHA512 46d468e6ca99498bd2008347584eaaa13958a6ff22e071c4bddf658f1661d54cca881ac0dd3d7580df0bf68f292d1d08281bce50419f8e37286555a61635c129
+MISC metadata.xml 659 BLAKE2B 5e21f2ef7779eb58a8f2ec78005ff01f5b0df2ddaada6acbd2588f2be8ce318665735ad509e705761606917b858c4714722f3f5c261765bb0df70c17ed8b2af5 SHA512 b5ebc03dcafe026118e7b0035671890327c2a719086861ad682fb0bf3e242ac11ebcaa031ffb865e8039b5370b6e28f99d1c4baa7ccf3fa99ee0fbf9e05f7ff9
diff --git a/dev-libs/date/date-3.0.0.ebuild b/dev-libs/date/date-3.0.0.ebuild
new file mode 100644
index 000000000000..d77a0ca0a183
--- /dev/null
+++ b/dev-libs/date/date-3.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A date and time library based on the C++11/14/17 <chrono> header"
+HOMEPAGE="https://github.com/HowardHinnant/date"
+
+SRC_URI="https://github.com/HowardHinnant/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="MIT"
+SLOT="0/3.0.0"
+IUSE="only-c-locale test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c-locale-export.patch
+	"${FILESDIR}"/${P}-version.patch
+)
+
+src_prepare() {
+	# The test cases are implicitly generated with CMake code, that parses
+	# the file names for ".cpp" and ".fail.cpp". Renaming the source files
+	# disables the test.
+
+	# This test case fails due to a stdlibc++ bug.
+	# Upstream bug: https://github.com/HowardHinnant/date/issues/388
+	mv "test/date_test/parse.pass.cpp" "test/date_test/parse.disabled" || ewarn "Can not deactivate test case, test failure expected"
+
+	# This test case fails only when the CMAKE_BUILD_TYPE=Gentoo.
+	# The behaviour seems very strange, but does not appear with a
+	# "valid" build type.
+	# Upstream bug: https://github.com/HowardHinnant/date/issues/604
+	mv "test/clock_cast_test/local_t.pass.cpp" "test/clock_cast_test/local_t.disabled" || ewarn "Can not deactivate test case, test failure expected"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TZ_LIB=ON
+		-DUSE_SYSTEM_TZ_DB=ON
+		-DENABLE_DATE_TESTING=$(usex test)
+		-DCOMPILE_WITH_C_LOCALE=$(usex only-c-locale)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	ninja testit
+}
diff --git a/dev-libs/date/files/date-3.0.0-c-locale-export.patch b/dev-libs/date/files/date-3.0.0-c-locale-export.patch
new file mode 100644
index 000000000000..a4e5a9a93ef0
--- /dev/null
+++ b/dev-libs/date/files/date-3.0.0-c-locale-export.patch
@@ -0,0 +1,90 @@
+Fixes an compilation error when 'ONLY_C_LOCALE' is used to build the project.
+
+Upstream-Bug: https://github.com/HowardHinnant/date/issues/589
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,10 +76,25 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
+     # public headers will get installed:
+     set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h )
+ endif ()
+-target_compile_definitions( date INTERFACE
+-    #To workaround libstdc++ issue https://github.com/HowardHinnant/date/issues/388
+-    ONLY_C_LOCALE=$<IF:$<BOOL:${COMPILE_WITH_C_LOCALE}>,1,0>
+-    $<$<BOOL:${DISABLE_STRING_VIEW}>:HAS_STRING_VIEW=0> )
++
++# These used to be set with generator expressions,
++#
++#   ONLY_C_LOCALE=$<IF:$<BOOL:${COMPILE_WITH_C_LOCALE}>,1,0>
++#
++# which expand in the output target file to, e.g.
++#
++#   ONLY_C_LOCALE=$<IF:$<BOOL:FALSE>,1,0>
++#
++# This string is then (somtimes?) not correctly interpreted.
++if ( COMPILE_WITH_C_LOCALE )
++  # To workaround libstdc++ issue https://github.com/HowardHinnant/date/issues/388
++  target_compile_definitions( date INTERFACE ONLY_C_LOCALE=1 )
++else()
++  target_compile_definitions( date INTERFACE ONLY_C_LOCALE=0 )
++endif()
++if ( DISABLE_STRING_VIEW )
++  target_compile_definitions( date INTERFACE HAS_STRING_VIEW=0 )
++endif()
+ 
+ #[===================================================================[
+    tz (compiled) library
+@@ -89,27 +104,40 @@ if( BUILD_TZ_LIB )
+     target_sources( date-tz
+       PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>$<INSTALL_INTERFACE:include>/date/tz.h
+-        $<$<BOOL:${IOS}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>$<INSTALL_INTERFACE:include>/date/ios.h>
+       PRIVATE
+         include/date/tz_private.h
+-        $<$<BOOL:${IOS}>:src/ios.mm>
+         src/tz.cpp )
++    if ( IOS )
++      target_sources( date-tz
++        PUBLIC
++          $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>$<INSTALL_INTERFACE:include>/date/ios.h
++        PRIVATE
++          src/ios.mm )
++    endif()
+     add_library( date::tz ALIAS date-tz )
+     target_link_libraries( date-tz PUBLIC date )
+     target_include_directories( date-tz PUBLIC
+         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+         $<INSTALL_INTERFACE:include> )
+-    target_compile_definitions( date-tz
+-        PRIVATE
+-            AUTO_DOWNLOAD=$<IF:$<OR:$<BOOL:${USE_SYSTEM_TZ_DB}>,$<BOOL:${MANUAL_TZ_DB}>>,0,1>
+-            HAS_REMOTE_API=$<IF:$<OR:$<BOOL:${USE_SYSTEM_TZ_DB}>,$<BOOL:${MANUAL_TZ_DB}>>,0,1>
+-            $<$<AND:$<BOOL:${WIN32}>,$<BOOL:${BUILD_SHARED_LIBS}>>:DATE_BUILD_DLL=1>
+-            $<$<BOOL:${USE_TZ_DB_IN_DOT}>:INSTALL=.>
+-        PUBLIC
+-            USE_OS_TZDB=$<IF:$<AND:$<BOOL:${USE_SYSTEM_TZ_DB}>,$<NOT:$<BOOL:${WIN32}>>,$<NOT:$<BOOL:${MANUAL_TZ_DB}>>>,1,0>
+-        INTERFACE
+-            $<$<AND:$<BOOL:${WIN32}>,$<BOOL:${BUILD_SHARED_LIBS}>>:DATE_USE_DLL=1> )
++
++    if ( USE_SYSTEM_TZ_DB OR MANUAL_TZ_DB )
++      target_compile_definitions( date-tz PRIVATE AUTO_DOWNLOAD=0 HAS_REMOTE_API=0 )
++    else()
++      target_compile_definitions( date-tz PRIVATE AUTO_DOWNLOAD=1 HAS_REMOTE_API=1 )
++    endif()
++
++    if ( USE_SYSTEM_TZ_DB AND NOT WIN32 AND NOT MANUAL_TZ_DB )
++      target_compile_definitions( date-tz PRIVATE INSTALL=. PUBLIC USE_OS_TZDB=1 )
++    else()
++      target_compile_definitions( date-tz PUBLIC USE_OS_TZDB=0 )
++    endif()
++
++    if ( WIN32 AND BUILD_SHARED_LIBS )
++      target_compile_definitions( date-tz PUBLIC DATE_BUILD_DLL=1 )
++    endif()
++
+     set(TZ_HEADERS include/date/tz.h)
++
+     if( IOS )
+         list(APPEND TZ_HEADERS include/date/ios.h)
+     endif( )
+-- 
diff --git a/dev-libs/date/files/date-3.0.0-version.patch b/dev-libs/date/files/date-3.0.0-version.patch
new file mode 100644
index 000000000000..398b2107059c
--- /dev/null
+++ b/dev-libs/date/files/date-3.0.0-version.patch
@@ -0,0 +1,15 @@
+Fixes an oversight in the build-system versioning.
+
+Upstream-Bug: https://github.com/HowardHinnant/date/issues/583
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ 
+ cmake_minimum_required( VERSION 3.7 )
+ 
+-project( date VERSION 2.4.1 )
++project( date VERSION 3.0.0 )
+ 
+ include( GNUInstallDirs )
+ 
diff --git a/dev-libs/date/metadata.xml b/dev-libs/date/metadata.xml
new file mode 100644
index 000000000000..aaa7e8ae6e5d
--- /dev/null
+++ b/dev-libs/date/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@jonas-toth.eu</email>
+		<name>Jonas Toth</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="only-c-locale">Build only the C locale</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">HowardHinnant/date</remote-id>
+		<bugs-to>https://github.com/HowardHinnant/date/issues</bugs-to>
+		<changelog>https://github.com/HowardHinnant/date/releases</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index 1c02a44f27b8..00191ca3e73e 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -2,4 +2,4 @@ AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
 EBUILD dbus-c++-0.9.0-r3.ebuild 1716 BLAKE2B af521bfc1a4162a3b34405815d3ba69fc625ceb4af960812f8a21b84f1c06cd36c4775028e32608a0e6555e105b6d989778701a7b59c6b2e3051cbfa71ba5187 SHA512 c090408d04caf9bedcbd71f392a88552f63621b727e01be8b26edd0adb73854479672fb1f93420b4b9b676aa67477d476bb98ee6326fd15745e695854cf073f2
-MISC metadata.xml 455 BLAKE2B bfa5bb5384bf8187f5be23cbb737bb6e6e453f7bca875ec9d978ee40f0812ee38b8bb46315290f79be935f074a4075df5f954c94a06185fdf9a75771c4184096 SHA512 8c3a3e516a5401174cc93ae457b7fe8fc20fd6e7b68f24e05576c04c9dfde90055262af435b0032b82e57644a20f117aed1eea37f71b08b9cfe90b0689e14646
+MISC metadata.xml 364 BLAKE2B 12695ecb75cc83a5aff33d9d6a0cb001b3d37d8d567806d1d76c79246e94f0796ca65a19799e18c06ef4f22fa19cb434521f1f7c02b0234ac5a7f8fddd2f1edc SHA512 9b4bcacc042091d3d5c058f2cd98d48ba3fea02b4687d137d95dd6219808dcdaf964793a6d6761c29a52eb31e55afa17bb45717d85c8904312a66f6c5ce03d9e
diff --git a/dev-libs/dbus-c++/metadata.xml b/dev-libs/dbus-c++/metadata.xml
index f0a0dc194aa2..142f634f0e53 100644
--- a/dev-libs/dbus-c++/metadata.xml
+++ b/dev-libs/dbus-c++/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>
-		dbus-c++ attempts to provide a C++ API for D-BUS.
-	</longdescription>
 	<use>
 		<flag name="ecore">Use Ecore integration</flag>
 		<flag name="glib">Use glib integration</flag>
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index ad4bb3dcdf24..9c87d00b3337 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,11 +1,11 @@
-AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c
 AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.179-CC-in-tests.patch 1506 BLAKE2B d2eb6acae1af4d4f370e8653ea65a8ae834bfc531c8cf77d3571e940b29ce08be45e93ff565b69eb43a913ace3e6537bba3358ae32ffa81d727d5b94f9ab371d SHA512 bf1a91219006813a5b8d63cc8735b0956187c097cbdae015a984a6c9fe11343d45315a8df779aad37b7c71c403f13351ebd9a08de06243437cffd8903c5aa7a7
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
 AUX elfutils-0.180-readelf.patch 1210 BLAKE2B 68003ea8ad853f5c548c2e3f2005f5b258e5bfa52710522afa79fbfec9c45c3d91bc2089b002c3799f92a0ef7748ff2a2cee5c1886c838da89ffabd3b9246b02 SHA512 cac478c4b1e258830fc33b6c9c5cf265bf216026f5cd2d74ba2f331db76f8bdad93aa3b3dba1a0a57263d06c87a839376a59c5519359d781a6de0cc418ef1f0c
-DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
+AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da3fadf6eda102e109b4e70ade0893ffe33a589748e0fce9f5256d8c121c790986e46ea9bbfee467c7324c466db04dabd88b7f0 SHA512 dac276c66eba5332f952791d5021b9d61d3d5c14e073db4f559a5cf496de8337915aceaec8906b0f7734739e4d5d56714c1ca9288809c80f0f5e71e6218019cd
 DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
-EBUILD elfutils-0.177.ebuild 2156 BLAKE2B d2455d04f65331456093f5a43b9e1ec06c0ae2ee2ec8073e6db3a1451aa1e6a3ed43834c181fbc7c742d77638ea3746d9f260e8d3ba0924f2f1edc56b05c6b42 SHA512 01011fc1c148a173ad401ecb0d067e9f051d0a37e9c1bc965f7bc6b7d07ca5b69b811ddb7af613e2e95eed768adbca4ff9e16ffaf48bf513017898cb79985fe6
-EBUILD elfutils-0.180.ebuild 2423 BLAKE2B a08d3dc7956d58df7c6bd10f5ba479063b9121925ec91de1b19c215b84053929627f9d73c796c9525d496f7e2a0875a91d84792b42fcf70938d68c6a34183527 SHA512 cc800030fdadffab722b08485055bdc8973bc9cfad67841fb7020707abfb4a44223354628358da645e2f9f61effa0d2b065e9db9c021eaaf8d6c4afd617e056a
+DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
+EBUILD elfutils-0.180.ebuild 2422 BLAKE2B 40571def8e77f4d077623ad2b0c4a600b4bc70f14702facb099958a4260cc638e3ac19ecc73b043d531c3cee873fca1ad254e0c5d3bc3ba1e003edf27f786b6e SHA512 82614e2da77c393a36fa9a1a0a121743acc3db4f2d2c66521c214d3adf80c27f945403f86ac7861e87dc2b2c2ad7ac9c0a0d79662c4ce3ec29ed245f9845dc9e
+EBUILD elfutils-0.181.ebuild 2466 BLAKE2B cb089361fbb8e912888ac81f13e686161d3ccf06bae6d2705ed4e77ef38460290f5c8b389d5e9c0de298d65cfe72edc49d1c8380264bbf7572ac93296cc07333 SHA512 83d659750dc4a6d68471d7305a064802de231e69e1f8b75a662d382bf076427a19789623bd35b401d5fd7d8b4d11ced747315ec64c3a7583b850a14f2ba1cc05
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.180.ebuild b/dev-libs/elfutils/elfutils-0.180.ebuild
index 294f12aade26..a8ed95308653 100644
--- a/dev-libs/elfutils/elfutils-0.180.ebuild
+++ b/dev-libs/elfutils/elfutils-0.180.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
index e0fb96346a94..83603f15c7b3 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="http://elfutils.org/"
@@ -11,14 +11,16 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls static-libs test +threads +utils"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
 	!dev-libs/libelf"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
 BDEPEND="nls? ( sys-devel/gettext )
 	>=sys-devel/flex-2.5.4a
 	sys-devel/m4"
@@ -26,9 +28,11 @@ BDEPEND="nls? ( sys-devel/gettext )
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
 	"${FILESDIR}"/${PN}-0.177-disable-large.patch
+	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.179-CC-in-tests.patch
+	"${FILESDIR}"/${PN}-0.181-CC-in-tests-p2.patch
 )
 
 src_prepare() {
@@ -55,6 +59,9 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable nls) \
 		$(use_enable threads thread-safety) \
+		$(use_enable valgrind) \
+		--disable-debuginfod \
+		--disable-libdebuginfod \
 		--program-prefix="eu-" \
 		--with-zlib \
 		$(use_with bzip2 bzlib) \
@@ -62,8 +69,10 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
+	# CC is a workaround for tests using ${CC-gcc}
 	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
 		LC_ALL="C" \
+		CC="$(tc-getCC)" \
 		emake check VERBOSE=1
 }
 
diff --git a/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch b/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch
deleted file mode 100644
index 0ae359fe7dbb..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.118-PaX-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Add support for PaX ELF markings
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-
-http://bugs.gentoo.org/115100
-
---- a/libelf/elf.h
-+++ b/libelf/elf.h
-@@ -568,6 +568,7 @@
- #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
-+#define PT_PAX_FLAGS    0x65041580  /* Indicates PaX flag markings */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
---- a/src/elflint.c
-+++ b/src/elflint.c
-@@ -3187,6 +3187,7 @@
- 
-       if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME
- 	  && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO
-+	  && phdr->p_type != PT_PAX_FLAGS
- 	  /* Check for a known machine-specific type.  */
- 	  && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL)
- 	ERROR (gettext ("\
diff --git a/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch b/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
new file mode 100644
index 000000000000..63c0ed0cb608
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
@@ -0,0 +1,34 @@
+--- a/tests/run-test-includes.sh
++++ b/tests/run-test-includes.sh
+@@ -3,24 +3,24 @@
+ . $srcdir/test-subr.sh
+ 
+ echo '#include "libelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+ echo '#include "gelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+ 
+ echo '#include "dwarf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+         -I ${abs_srcdir}/../libdw -xc -
+ echo '#include "libdw.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+         -I ${abs_srcdir}/../libdw -xc -
+ 
+ echo '#include "libdwfl.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwfl -xc -
+ echo '#include "libdwelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwelf -xc -
+ 
+ echo '#include "libasm.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
++  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libasm -xc -
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index f24ba0f7fbac..4a02a52f9019 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,8 +1,10 @@
 DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7
 DIST ell-0.31.tar.xz 478860 BLAKE2B f8f8d109605bf62396da001bd3d9b48fd6b7a6fc94ab890ab5a56fc8afb07a216b884fdf4b624ac8f39c3196de8149c7b32790da03262400aac6f8cd8b3fb56b SHA512 e304cc3bb1355fc0671412e793530503c83b1a036bfa3dd5b0cc36cfb28684b780293dc3d81a5727e0030743529882f71ac28d3c735860f6d46477e8ccf6a6e8
 DIST ell-0.32.tar.xz 479012 BLAKE2B 909c63f590ba45e5e9aabf0e7c5ce1c44ee5b5235472071ec16c4e160eddfd38dc5383103a684c4d43e325e832965cdade5d8465990ed4c2a2aa44b52d60869b SHA512 13712ac4ff7165b749b8e2dcd5cad4cd8170600c3dca7304eb4068ee916c1187207bc24ffa5d64c9d33253d4a8f56c63b627ad0783d5ca38d78f625211fdc315
+DIST ell-0.33.tar.xz 490180 BLAKE2B fc0f558a54bd57d7866c77ba3fdd97e0f35c33fd7ca79f6209c097824b303e69924ee9eb758af3a1881e8e87ac3ad84bea20767cd824cb8366a080eacac8b4be SHA512 4f0960b757c5cae55bf46a10aabb52280a76eda2a2d55ecc92f2a1321b72e936cab47102995597e985072d032f10379fdfc4f56360e535eeac444dab8b171ded
 EBUILD ell-0.28.ebuild 1054 BLAKE2B bee6d203f5a50ffc797fb3f3f6a673e4d969c9de16e47801acbe88a1d61e1f04f9732ed76d6f0e1ab69cc39750d3e2a6af313a2430c0ae811a7192da282e3963 SHA512 c2660929dd05b053400db9f4fbfc234e6c616a63600a0bd4baccd6ef945cb06f326b1975f20e961bcbd39b5337cb96b1bbc9ab555475826d98f6cbe24e1122a6
 EBUILD ell-0.31.ebuild 1251 BLAKE2B d2dc04fd7b6dfaea9e90589b2afe412cbc3606b44b6ab8616a0496b75024238450f913cfc6df03337d72e7bbd082c906b66d464fd15077184ec848b35518320b SHA512 e994f672aef0bcdfa4331fb854378d5e22d6a38b02b9aeadeb92f93eb5b461032f39817ec5d6c21dd356e321d3004436eed81288b92a2804fd3f4071f5737332
-EBUILD ell-0.32.ebuild 1253 BLAKE2B aff5fe1be8eba5b17f2d9f7b69d415a7a6b7137d6a4ebaad0791652fb3387c6ac4a08790e9bdd8a38b481a04f7645fc23b55af996640910ee4be6e1920b0c0a6 SHA512 a46926a40af6a8e0910c379e69ec7893664acfff13f21a9a9f4e1db141eb6d5dc0ac500e2201735ab464cfaf60a9632fc11ae9a0f8bc7bb4dbf542157d4f1fb0
+EBUILD ell-0.32.ebuild 1251 BLAKE2B d2dc04fd7b6dfaea9e90589b2afe412cbc3606b44b6ab8616a0496b75024238450f913cfc6df03337d72e7bbd082c906b66d464fd15077184ec848b35518320b SHA512 e994f672aef0bcdfa4331fb854378d5e22d6a38b02b9aeadeb92f93eb5b461032f39817ec5d6c21dd356e321d3004436eed81288b92a2804fd3f4071f5737332
+EBUILD ell-0.33.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.32.ebuild b/dev-libs/ell/ell-0.32.ebuild
index a347ffb566c2..9589f04a43e1 100644
--- a/dev-libs/ell/ell-0.32.ebuild
+++ b/dev-libs/ell/ell-0.32.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${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="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.33.ebuild b/dev-libs/ell/ell-0.33.ebuild
new file mode 100644
index 000000000000..6c1b04339772
--- /dev/null
+++ b/dev-libs/ell/ell-0.33.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/dbus )
+"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 641d0ab21262..b9c76bd86210 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,8 @@
 DIST girara-0.3.3.tar.gz 72372 BLAKE2B 59171e104f1558ed794e1bb623bb5121007af0cf831524fac5170ce8e55d939d19ecb747b7bc4bb900e978d29fd987d592a0e16982a248adc5b085503ccb2b43 SHA512 2764f339c4b5744330c60fa5c8c902a06952d6c5a38589d236fe290f9934b9128527658d8aa99d42806255403b90f55ea1a85e5bd09da4b3a8f7c48be4d94f51
 DIST girara-0.3.4.tar.gz 72981 BLAKE2B 690b8de0e906e43e32b7a1009a04d4bb1d5b029924ea5b85491ec740ba4b4363f8729bd9b8498f1f25309e2eabde6868f41a689ed06dfb6aa36b081676232624 SHA512 1eca68f4f28505d897c2f7cfb8804e67591e8327feb347c66da216d8f764cb0c88028d1c4c162579a882df7db1883b834c97d8488296ea5c0a8f709dfcea1f1a
+DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
 EBUILD girara-0.3.3.ebuild 1092 BLAKE2B 4799df2f151ed1189ec9595863cf32f753d3855e218d1fa2f4ce4d26538c1397743320f772fa0a9db842b773fb644d7e7654eb8be4c7d8b4e26f1d6b05971cb8 SHA512 91f1a78a23a4685d54d8ece01d4562be77817e3d43b67d0856f32a768c38943399622479cedf39d3791833d6247df8fd144ad94db9a6ce3beaea094270e6656d
 EBUILD girara-0.3.4.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7
+EBUILD girara-0.3.5.ebuild 960 BLAKE2B 6ed5898d8a4e40ee3561f39334d1b1a9c3bc730ccdadd11981e05dfed35c536cc9588011d71c1824bbe9d94af985eecfe57944cd23f6fc6d06de8705f40e5fef SHA512 d955549560648356a68bfc129044b25b246f49de120ba46ae914cac6316ec1810b199e0f513d3c9e4ae93fc41d1c5368fde5aacba835b9be5db33b9d557a4d99
 EBUILD girara-9999.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7
 MISC metadata.xml 581 BLAKE2B 25933546f3727c17b48e8bde4136825202d34300d2a3049ceba68afeb7f2b88ea5430240fdbf118229751229c06d31aef3cf28c7e13182d008e56161eff133f2 SHA512 2b6f1590cc60c44d13394afb5c3815c227aff680f94510e5202d2b41614b6854effe32d4ade6ab4b2d36595d36fa636520e88ea514078c23ca881e00d3d7797f
diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild
new file mode 100644
index 000000000000..7009fe824cc0
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/json-c:=
+	>=x11-libs/gtk+-3.20:3
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f35635282cda..25d5dc40b090 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,6 +3,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
-EBUILD glib-2.64.4.ebuild 10343 BLAKE2B 84d82001f55a173d36d263675f0168a0d8f9cfae88c53358b722ebf9c7a07fe12a10ecde623e3e26423216a08ca74a94037727ac64c8287a3de80334dc8ce4a4 SHA512 a5f70fe09a276c7a1e4ebb6e924995b0e216879ab42fd57dc185716c3985547c1e46aeea2e2798548a33d227afc9c4cfc961fb2e0fca17b156022bc168b341b5
+EBUILD glib-2.64.4.ebuild 10341 BLAKE2B f86bfc8fff0ebc1fd53b89f98a3924cdbf814de9fe2a8cdd0a65aa5cd5a4c24d04b112cde58e1a3b5911d74de8cc65087fd09a88192c9fcbe1ecc8178748052b SHA512 d0b44d65e055f1afc22126675ed54f5168faa3b55aad5f1bf52880d71232f226924c9c888ad3dd969fa010d089dc0634abefb90c16368840ac161435e043d8cf
 EBUILD glib-2.64.5.ebuild 10344 BLAKE2B 41f17b87deb363b16093aa5ee004bd828b1d9d998206db4c30ddb0295a63e321ceef2e6864ff7f842d455b82ec4d4df04154e3492721e75d926aa8bab370677c SHA512 e2c4656c0e1cfc824c1662a7727e00fbab5f874757d32eb2704c60c7a151ea22cc0f8289d1e4dab02e7db1b24b4d89181e10c25c3c67ca2216745839c71687c4
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.64.4.ebuild b/dev-libs/glib/glib-2.64.4.ebuild
index 837596c8f777..0f764c01d3b6 100644
--- a/dev-libs/glib/glib-2.64.4.ebuild
+++ b/dev-libs/glib/glib-2.64.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 5d36854ef19e..7ff7c1324cb1 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-common-1.62.0.ebuild 931 BLAKE2B 1bf492f4c5a9d5bd608791bec1be8f923c609e234db9d0301817c192e52f79d4bd7618bb425de2f9b3c8d3954be1155aa330cabb5f90671fcdf502b29ad2efd0 SHA512 07eb34e10d5808c2a09410dc2f46f791a0df1abd1e0842c214a55b85c74bb10e2539ca29989bd8c66dcaf7290b3f715b93bece914ee928807601157b5d866021
-EBUILD gobject-introspection-common-1.64.1.ebuild 935 BLAKE2B f6c0d69b0b4b1af9d862532fa5beb0b279f17c2c3a70f2963c0f7843cc67b06cc7a958130d406e1dd641093679b0e4f425049b719f6c0eb803781d97908af765 SHA512 966ffbd4aa5b3e14559e9aaad20b282caa1e0c67217f90da46184da9339fbe8422219ef9a0dab0c7535a75cd68a20b9af6bef7992d80ce838cb4df610f9e67c5
+EBUILD gobject-introspection-common-1.64.1.ebuild 933 BLAKE2B 42bed1558e4aeff881f6a10774fb01479543975c19ff924b7b67612a3d50c1b59d8b154dbde9e74eaf0f19685183ae4fbd8d02009c1d9661c2424879d7f24d34 SHA512 69e82eeeb88c01b67444f73ca6c50f4851f254fa8131b7f2e85d45cbd2a08a3a91d62fdf3da59c967a4c3bb5fb069cc00650f79299e6b5b8c1ca5257f5ec0504
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
index 7597915c3011..160b9fff2b40 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 1ce1691b7250..189db31194fc 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.62.0.tar.xz 980732 BLAKE2B 96ecc98bea97b7cb24e2c0a0adb8158cfc8915ee8e3b980adf08ec3256d4d0f87bc92d33cce30f5b23c85c4b144d8da755e5313735091b27ff53fea45a80014e SHA512 b460a95fd7a323e9b0c9a45e680ebe98bbae7632abfa53b3e0b0ec050775cab17dde693314d6d4f8e93614c32b5587f8ce0b4a4c9ee9ba46c029ce029014e638
 DIST gobject-introspection-1.64.1.tar.xz 1000280 BLAKE2B c0248831648f6f1849516f30facac9ecade4b4fdb9dce70f93f516364c08f93d0622e06376bd7895dd25c3f1fb5b0af533d6c60f1b2590848cc6781b81a584f4 SHA512 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 EBUILD gobject-introspection-1.62.0-r1.ebuild 1872 BLAKE2B 0fd21ecbd6b20f96a1a26ce1cd17e57ce8095f857c8e168c5219fd660581b9f568c5c019408e16f3bbdf571d4c37cb638f64ca0e5e059bc852b19aecca75bad5 SHA512 b6c01c14265696bd7596911b064dfb86ae41e85006d55d071806b72c4421ac3fec8ba1405d3b283de8e967812d9298c42e5b69b5d89706c07cf8f8375397e054
-EBUILD gobject-introspection-1.64.1-r1.ebuild 2008 BLAKE2B 49bae69209a1ff169f2cde345bbe482c3651ada4e498adfc670d13b65d41cdf328f43407b5909c25b2eb466882b7836e3a91116a7b2cbb35f12b80ea7a51cbc8 SHA512 7af841ef83491e790e50f7d0748fcdc5fbf5826d5556739ef31de1b4d8446fd86ef94bc41daaeab09bfb27e492d6a5e72c2775a9b1667d06e2cbc65b97be808b
+EBUILD gobject-introspection-1.64.1-r1.ebuild 2006 BLAKE2B e4342bc36794a030d166ce478e0ace1c1430aa8cb6507b7e7c55c0d5e114dacd4780df4e63af0fac0e4f806f5da00472090c814368b8dcf6c0cabee351ade871 SHA512 930c6f396f393c15f0e487d666a1826594d07db1008a7f389cb2a5073725f1ad5bd9d9d0a93b0218f4a41a934997e353f63c7741f8bf2b67e5c40a29ba2e1c4c
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
index b8c5e60f37d1..4296dae81691 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index 504d40e2fd41..7fa57dacc3f2 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,4 +1,4 @@
 DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
 EBUILD gost-engine-1.1.0.3_p20181031-r1.ebuild 872 BLAKE2B 56d7d15c6e05c12e81ef011a5680e459ed566fa9dd99abb3b4b516e34daba57a8836f2d0727008960706e59449dbcd72720f92e44aa76c2eb3590e4f5bb21f30 SHA512 005a8592a97e4be5d05274222cd95a72f94d7c4ca8f2a1af79e39e86e2e0c38723023243deacb4bd7f4fde04ccbe97559b1d1891b6e630b54ea6f4900f4f729c
 EBUILD gost-engine-9999.ebuild 797 BLAKE2B 6da28707e72dfeb1aca295ac8572815eed38a7c9b070438e8d61978c951a6ac310b6f0f89a318b5e61ecdd7cf844462f6214ecf554e28e8cfe4ec74800e65275 SHA512 033105332abc1945bd0f1a7902dc07f172e15d950a86f366c3d9e999e62d00bb6632048ec2e61f09d600edc74896cfba431c5892f00c4141f7d8cf88eb6e9de3
-MISC metadata.xml 464 BLAKE2B 9c303e26fd69fa53be0d278f86502ced45a06a8e07a14a954ec999445f774f606e6db0a4892b325bc715c1c7062c62a8104ffdbaebfb97bc9b03f5555f0c0b3e SHA512 0b13e24bbe8d4d629a886000eee238df48d31fdc697e6ae86fc1b4d71284799f3a714df10ddee243139479a632eedd72e11235760cad0f45d9471637d140891a
+MISC metadata.xml 341 BLAKE2B fe6664fbcd10736141fcac977eb33d5f7b398af02b107c366fc06769150cc709bc7530896ee8a424bebf6dcaf6e12c37a8c1be65f7e53036d90d9159ad63d1ec SHA512 4d9d7229aec6f3ce7e6ea3a560d9ea126c64ada9dca18534d184073b0da130e2858e5ffa2eb9b34c61ce40ca44be42a043bd8b68f0446c7c41364d3a8d59ecf1
diff --git a/dev-libs/gost-engine/metadata.xml b/dev-libs/gost-engine/metadata.xml
index bf5591b8aef9..19f68dfb5552 100644
--- a/dev-libs/gost-engine/metadata.xml
+++ b/dev-libs/gost-engine/metadata.xml
@@ -5,9 +5,6 @@
     <email>candrews@gentoo.org</email>
     <name>Craig Andrews</name>
   </maintainer>
-  <longdescription>
-    A reference implementation of the Russian GOST crypto algorithms for OpenSSL.
-  </longdescription>
   <upstream>
     <remote-id type="github">gost-engine/engine</remote-id>
   </upstream>
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 6884fdead5c3..e69747cd631a 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -2,5 +2,5 @@ AUX hyperscan-5.2.1-locales.patch 793 BLAKE2B 7cb5711b7fe89fa91ec619846931d5bc4f
 DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c
 DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56
 EBUILD hyperscan-5.2.1-r1.ebuild 1240 BLAKE2B 38e188a8fdab2309acc5dc3f9cf063fd05a6ffebaea2f221c8c4a60851d0198458cbc316d72be29b99869bf44fe695d5bbf1616e597e7b065572b2f14385b253 SHA512 096881916305952a15a2ea608d6dd5031818feff132c93ff2b7dd43240920ad3af14f5739b7b280cdebc68663122d693387611241719c17e35aa496c5b0e00cf
-EBUILD hyperscan-5.3.0.ebuild 1193 BLAKE2B 3bfe5cbb0d1c80b8a4ca125a7fdfccb408b49c3ae89dbe9b15106222acaaf6e290445884a4d43b342479542c278b9bde3035d156a0483052ab0e491bb04338fd SHA512 e503cc7b9ee992e981927ba3d30890e59f3608d960dea1087a23f8240ace0155690f9bd7f7ddf635bed0954dbd9b8ef43a983626d81d77b68c20c858d5715bb2
+EBUILD hyperscan-5.3.0.ebuild 1192 BLAKE2B 52b876886117066d9ac82fe9a37ccc7a37b09b0c1495815fdb0c172648364067e948931ea19f11d165ebe2917d361f8fca81bf8bdd5efefe914cb1d03ee42956 SHA512 1c2f81a794d72c9416bd624a4f8257b14df01e8f8fba429f3b8b4dd3e39703c36da84dedcdad5ff1906121522ab7f91f5db5e9100ab1362c4a60719a15724f68
 MISC metadata.xml 548 BLAKE2B d68c6cd73543c82ec12d2b05651ef2de0a3e402a3a3b28d827e87026f5576a1db23e52fa04021967cd919aeb828bdabc931ccf2e0238294c84c0f3f1d27dbee2 SHA512 5005d5ee96a915866096f63075a5ff76a49474807a63d846151ebbb411fe0c477c3b6883d97438018a69fb78c917b190de8768a44296caf7ca11451b7cbf587a
diff --git a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
index 2b2917b71023..287e21a54827 100644
--- a/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.3.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
 
 RDEPEND="dev-libs/boost"
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index c58255ae6ed7..98e1a0aa0323 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,3 +1,3 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 750 BLAKE2B 30a28efe2fc28684d96cb1e59281627bd5162264668e0e182c22a4b269e5abb03f5bbe7da9e3cf0a90b71529c55b1beb54255d8f4cb14a35c81282dd282fc79f SHA512 2b1d0988e846d99bd0c53457a7f9b12e054521a149c87e91e07a7d7a15c6d0a1cb740710454e8f2c332ff546c1aab2e8acc94fcc2c91820e4df1665692b677a4
+EBUILD hyphen-2.8.8-r1.ebuild 757 BLAKE2B 076ede13fa695870ee4c15951e176f03dc2f37387a90048c4f9d9b56f285f0564f0bf22c5d7232f2fe37f4aea2565abc0d6ca79a14c6686884ef7e5d5e6a9883 SHA512 0eeff004399ef0d034961954c56b87e4a10ccafffd2f8b70d32fe352729f27258190613cc837e110bd6e89153d26bd3e97437c92014edaaa8b2c959751f39ee0
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index 3c23fbe56f58..3284a42cf6a1 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
@@ -12,10 +12,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="app-text/hunspell"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
+DEPEND="app-text/hunspell"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl"
 
 DOCS=( AUTHORS ChangeLog NEWS README{,.nonstandard,.hyphen,.compound} THANKS TODO )
 
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index edbeeb0c2806..f1520bf58af6 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -4,5 +4,5 @@ AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c6
 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 1552 BLAKE2B 4587d192bfce6a57bea9beac7fcb4f08cdccbb7d97f9e4fe52367fd3b1f1e46e2b51d8c31527251d0f0151e70b0dbd83068e1ed32dc8ffa0d893731b4a1e29ac SHA512 dd2ebecfb0eef87f2e44fcb874dcac8e3b500738399035af24d8fa94cd1117f6c617ff9aa2fa8c2c979b5a65b9aab58092e5d4cef8cf039a7916ba7d05350a50
+EBUILD iniparser-4.1.ebuild 1548 BLAKE2B 030c497cf62fad931f6cdc9f60b1c3df9c9bfc057f76b032e4cb6db3919d68693506a90456d9aebfa4c08cd1e943cb793eafe0eb72b61d75eccac4b933ee408a SHA512 0ea5fa4e62218420a357648610ee18129da9378fc8a1c942055f6e1af043a41b8155a1580be9087b1819e2b55a8d25f42f2b7c1d8205b2014704067f55c69886
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index 44a31f60eaa5..766b3da5182c 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 91a51a9568a2..c2246bebd009 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,3 +1,5 @@
 DIST intel-neo-20.16.16582.tar.gz 3042531 BLAKE2B adfc0aee2a315e67ccb3e4fe39ab09b618930607d3de931d1367881642d8e542385589299f593d3ab1cd6e16de7a8fce7b55fa1b4259097e15da7e55034d344b SHA512 700bee3ccf72c2bc89f5c8a75591de9dafbfe0a6480e3216258842c6b68ce1b527569d5fe1327a0a80cfbf79dca1d956820f060b602feefa83fc9b47cb46d7d0
-EBUILD intel-neo-20.16.16582.ebuild 1200 BLAKE2B 3581a6099e1188d6708b6dcedc5eb5c6711b9b42d26c31d1f5ce5140db25aed5e6ac408f9e4523b976138cddc53f62b29035d60f987a52fb466fca4da0e2d489 SHA512 0136784383570ab314f8b50196c4ac40010e845d29d812bc72a21e747167880caaa1d6f2cf454cbe14fddf6ad8005147778c201dd1861c82eb2b2e3e5267d9e6
+DIST intel-neo-20.36.17813.tar.gz 3459305 BLAKE2B 81996bb5946ff6334dc06aceed7e5f01f1ec1e417de7a600d41af43e0f74e3003b293f2981ad742e4f9df630aa81e9a21f6a0a04e9615ee4caa97fae4fe682bf SHA512 366120e785e068393bc0b1c2345eb3d2eca46d6c7485736d7e2aeece91d404f9b802230873b6f868fdd9d7a9852112a8aa216cde1210ab51d430dcef9601d968
+EBUILD intel-neo-20.16.16582.ebuild 1197 BLAKE2B 480adbc18a35ac51f842cb996f32abce6006a15907d96fc91c900a5acb053b105b8111c3bef818ca3f8d87822123fd703cf57b01fe8694706c01bbc873116441 SHA512 5eaf2f8757db684c8cc7eeca9de1446a3d15761c69cb58888ff46862d51204a5f5a8ff350a89bd80c3bcbcd969856f5d796081ca658b72b83bd821f0da63f299
+EBUILD intel-neo-20.36.17813.ebuild 1198 BLAKE2B 190a825c85eac774f52eed0205e6f758c4a071cfa19e39fa30a4569b046531481b07d1cf22d630e6c9af5c9fb133b6fdd106ae17f51987b2020b2c1a247cf00c SHA512 9876ce22eaa6685a9623e3653fde979f6450fdfe93b58e9c1dde104f64c182059c9ae9cbf52e7dc3951077030022b92f063afc0905ec265e15835bd9e96ebc8f
 MISC metadata.xml 1173 BLAKE2B 60913d5c1e3b546b4a9a8f35341761a89a4c8e1a7ed3c63ba992eabfc28c01f790f1eb006220ccb3c764a0b6325e6e8f56186a058ec9387226eb2a911c9b73c2 SHA512 f2b373b08f2b599a1dcaef3ea32157a7278c8088a247d8275f68a35730ee28d065acdf8e99287a853a0a761bc497a5e48c72c3352a8f8cdbc9828134bab6c602
diff --git a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
index dfa0c9b9156d..96c7b18829cd 100644
--- a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
@@ -21,7 +21,7 @@ BDEPEND="virtual/pkgconfig"
 COMMON=">=virtual/opencl-3
 	>=dev-util/intel-graphics-compiler-1.0.3826
 	>=media-libs/gmmlib-20.1.1
-	l0? ( >=dev-libs/level-zero-0.91.10 )
+	l0? ( <dev-libs/level-zero-1.0.0 )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		x11-libs/libva
diff --git a/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild b/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild
new file mode 100644
index 000000000000..6f29828a72b3
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-20.36.17813.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for L0 and OpenCL, for Broadwell and beyond"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="l0 vaapi"
+
+BDEPEND="virtual/pkgconfig"
+COMMON=">=virtual/opencl-3
+	>=dev-util/intel-graphics-compiler-1.0.3826
+	>=media-libs/gmmlib-20.2.5
+	l0? ( >=dev-libs/level-zero-1.0.0 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)"
+DEPEND="${COMMON}
+	media-libs/mesa"	# for Khronos OpenGL headers
+RDEPEND="${COMMON}"
+
+DOCS=(
+	README.md
+	FAQ.md
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
+		-DBUILD_WITH_L0=$(usex l0)
+		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")
+		# If enabled, tests are automatically run during the compile phase
+		# - and we cannot run them because they require permissions to access
+		# the hardware.
+		-DSKIP_UNIT_TESTS=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 1495d1a57fe7..0480a162f27b 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -19,4 +19,4 @@ EBUILD jemalloc-5.0.1.ebuild 1943 BLAKE2B c63f49de52d468421fcd74f4726b673f1e50c3
 EBUILD jemalloc-5.1.0.ebuild 1900 BLAKE2B e720371595b0652033dda4960c561a623a2076ca081deeba87bdeeb51bd3734588308a2dc2ae91be7d16637b452e4de11c4022caf330dcb76eeacdbda68d104e SHA512 1cca96a6ba7e45d3bbaae91749dc93a6ff32ab90b473bc179ef35c7f7d8ab9f89db92eab0cc893f3192b979815db9b843edecd9c1ddfa8b3f8ccee9056a764a2
 EBUILD jemalloc-5.2.0.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
 EBUILD jemalloc-5.2.1.ebuild 1844 BLAKE2B 24a281ca1f56030555daa9ff4a6579ae47ee028fc620b52b77c027e94cb043d73a64c62c7493a28ce2a3cc42f02b497135a3bb30745d94048fec2b163ccc9ec3 SHA512 859ad5e39b236d091b3761264bb1b3966f9ea81ffa107d809a8c13817e89aef5a3141be309d47807fa2344aed9cc0e6e60686342d52bacc5bdb19ac1d705f60c
-MISC metadata.xml 817 BLAKE2B d5d6f72de6d230f5f1145859729384bfabdfff47430900d7b9d814afb471effd0fd6bdfa9859e20df4568d3af63cf839732e93838c74c626a1cc03a752f0865b SHA512 2859064d9e92245d040e2056719df537b4d4ecccbb6390b6dd878dd739a82a16f31dbe4c6ebbae0fb9c907031f4beaa19a99cb28ca83bfe638b798e5a66988e0
+MISC metadata.xml 706 BLAKE2B bdd9119926d7c4f11e9c40c75588e02a954a1b593f8755de81d2e615cad500dbf24cded0313bfc9becf143f9d98d58fc93e01c71e35151c562def1dabecf38ed SHA512 9ed0e307d3141ce5ff953c187bb8a533464e0b6872f7c419fedf93ca2583e97891d8994a0df882306953681813922319040354440f1682cbb4af5b8c08829bcd
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 14624ae1ff1b..34c0f6863a53 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -1,13 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>mozilla@gentoo.org</email>
 		<name>Gentoo Mozilla Team</name>
 	</maintainer>
-	<longdescription lang="en">
-		Jemalloc is a general-purpose scalable concurrent allocator
-	</longdescription>
 	<use>
 		<flag name="hugepages">Enable transparent huge page support</flag>
 		<flag name="lazy-lock">Enable lazy locking (only lock when multi-threaded)</flag>
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 0202d62d90fa..65a74943ee36 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -4,6 +4,6 @@ AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764
 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 1094 BLAKE2B 6aa62cc278790420cc309ebcd8d720181fcba194383279553fd93c0ab0389a43408cc4b89ef6021f4969e2afc864295775f836d97d8953b8bec7956e3d43c0f8 SHA512 5157736e32aa487e16161306a12350ba850c1ca6c7aeab6b9e770767e47f90c9456c424a4609528ca4f980f3aadf3c5b1bad6072b7a7f37eab28bfa7378c1bd4
+EBUILD json-c-0.15.ebuild 1088 BLAKE2B 35163236be8dd02be52b2adfcfe667774f7cc7ab778f512782e670e1bed1dc13a7fd1122a06fa1540eae8edef25ba4060bfc2d1b5c7e2f54f18f4a5befc4cdac SHA512 a70cf49c56264f735cc7dd9611e9bf84d4ac128d79591150418c45f2890771adb5694064428a3b67c6682b4fa75cc8ded96ac1ea780cd6a0c14bfc1f7ba16f47
 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.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
index ab5e203329b9..1aeea78bc685 100644
--- a/dev-libs/json-c/json-c-0.15.ebuild
+++ b/dev-libs/json-c/json-c-0.15.ebuild
@@ -12,7 +12,7 @@ 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"
+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"
 
 BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 35d3499ffc91..471655f0075e 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,3 @@
-DIST kdiagram-2.6.3.tar.xz 673788 BLAKE2B 467c376a2979e5a8b0c33b014f0490819f9fafca7a87fa95e44c073d166424f84d82771c787995eba05b97c6c8949270cc7101342eb3a2a91ed92d89d2ddc0a9 SHA512 307b0b17c314d5c4672100e2e949c3e8faf38eee7f9d504a15a01da77434e2b6274cb1857d36ea868025499e806643e32c27bb87aa7dfbce36e8dec6e53b11ef
 DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d
-EBUILD kdiagram-2.6.3.ebuild 861 BLAKE2B 8bae841cda73ac6fcc36ff091326029e8281b208e2cefb0b2b3e37ba62d3df59fadf05b6db45aa55aae52a592884033299c2afcc3cf04f6f79b687d808b26b5a SHA512 76a8d2c8816355b75eebb284b55361dd7c2039681aa4154885ee27e8145e4cfb9b85d712c36b0219470ef4112aeff34fc50ef04d1d17d4e116a99b7d156765a0
-EBUILD kdiagram-2.7.0.ebuild 864 BLAKE2B f6c31d4ee10d7af31338841f2f8ff00f3f8f35fbd4be191c7c160559109624c26d123088468b949be9ab8dfbb49a8f0199cc133ffcd406852b3ae394ba2055d1 SHA512 ca0c9edad250edb32470e6c04373584388d2313bd9eab123d328de8ba5109474c37556794c9df17c205b6aea82a3fa1a1330035712eda0b04c32b6197433f4ec
+EBUILD kdiagram-2.7.0.ebuild 861 BLAKE2B 8bae841cda73ac6fcc36ff091326029e8281b208e2cefb0b2b3e37ba62d3df59fadf05b6db45aa55aae52a592884033299c2afcc3cf04f6f79b687d808b26b5a SHA512 76a8d2c8816355b75eebb284b55361dd7c2039681aa4154885ee27e8145e4cfb9b85d712c36b0219470ef4112aeff34fc50ef04d1d17d4e116a99b7d156765a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.3.ebuild b/dev-libs/kdiagram/kdiagram-2.6.3.ebuild
deleted file mode 100644
index 12b840ff0e2e..000000000000
--- a/dev-libs/kdiagram/kdiagram-2.6.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="true"
-ECM_TEST="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://api.kde.org/extragear-api/graphics-apidocs/kdiagram/html/index.html
-https://www.kdab.com/development-resources/qt-tools/kd-chart/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="GPL-2" # TODO CHECK
-SLOT="5"
-
-REQUIRED_USE="test? ( examples )"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/kdiagram/kdiagram-2.7.0.ebuild b/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
index 3a28eac60d9f..12b840ff0e2e 100644
--- a/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.7.0.ebuild
@@ -16,7 +16,7 @@ https://www.kdab.com/development-resources/qt-tools/kd-chart/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="GPL-2" # TODO CHECK
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 555f14bdc8c8..fb7f0b709573 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -11,6 +11,6 @@ DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 EBUILD libaio-0.3.110.ebuild 2250 BLAKE2B a1f396b417bb1b8c2579e3ca589d9e6df24818b13084d09fd480a8f64ab19eef5aa2a543f7e467786ef4177ebce3bf60b8f893b21ddcdc529e0026f14a1f6c74 SHA512 569e5ec134506b4e20f4eeb586dd88e3f2bdefcb737300fb4c6f103876207d1bd60fdb76f2e3b1b4d4ca4984a96efb1ee924d16547e1faf36dbeca28507c12b0
 EBUILD libaio-0.3.111.ebuild 2232 BLAKE2B 81065497e191a4e62b17d61df604b073522dbe9ced1ebd162081fca73765fcec638cc2d40ddf70daa11480c75ea51ef3197fc4905791721db96a7cb5721c4a82 SHA512 0f374c61ef9f6567739b5d948749184ef8e60ab5c9bf005f20339ed5199a954a64816998fcc060bd7b953fc17db02bca4654f8d426c2c088f07437e1fcb4797d
-EBUILD libaio-0.3.112.ebuild 2127 BLAKE2B da2e80cfdf58e007c49f960f6064480732b8688b681ca75398761d7bfd8a6a39f60dbd83ace23c7993c9a0466e03a608d9f00b3cb58fc091bfacb8d263db87bd SHA512 c8f0e55038e4dcfc920d1fc04993349c7b7ba7b107d0410cdf4d1a1afafed1e2f4d4db3eabd86c4cffa719ce83f72cf1a212a49525730070816ccbf320f4c48e
+EBUILD libaio-0.3.112.ebuild 2125 BLAKE2B ac8267b79002054a25bcbea0ee87bd181a5a5ad02477c580b02545fb258be3e31bcf40277dbde435f747c0e8148444ddd0d98636f66e047796b876f88ed8b847 SHA512 baf0dd21b9fa63ff80a80080afa387f359414017fd2741c0ce514096158b9135e95a0e39951f96ad8ff829c954674d2db3e136ca93a5a698b2eca9f04d7a19ed
 EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
 MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 7d8801416182..f8b29796145c 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 3464798cd596..9cf55f52bb10 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -3,4 +3,4 @@ DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89
 EBUILD libassuan-2.5.1-r1.ebuild 1258 BLAKE2B efa52147c6b3c42086196503ff9d516bb9a9fbede7d648ed36fa98a4a056dc6382428838abcb50e7fad34db24a0ad68a002d33e9b447cf34c61032b987be8f90 SHA512 d24e6d34d0c198bc52d6370c54f764ffa1c4ea20cc49badeebfa879639ac8d4c4d0ad354b2eb1a229e501986390983d02d80d9a6babfd03ecace44d24600c116
 EBUILD libassuan-2.5.1.ebuild 1060 BLAKE2B 00418cde3ff85a1d9d35a248dbada254770b7537198ca794d77186d748114c70efb25ff07bb0e501328800543406d8881f3e1b188f3f086a14ca384b62cfb784 SHA512 13faafbcaffa9da2e873816478b2d5f0411596c34503667a27ba9c8aa5c5b024453d0d070f57054fef72023a7d818cbfbaa51daece2f436187b8e8fe5bdf88ee
 EBUILD libassuan-2.5.3.ebuild 1258 BLAKE2B 76494ac9a7bf2561a31f4c15352a8e240d3f0044918fedcf3479d451bb1b1d1d7ffd8689d8f40efa234f8dcf9b4840830698b1e2dd024e1b2b94e42563c40928 SHA512 a76496460ffd556e810693a904be16a56bde374775f7e25eee9e264151087c4827301d505c9319dd7f5fde49c62a15e469618e68f728097de1045e2084598011
-MISC metadata.xml 977 BLAKE2B 25e7724178eab058abfa95fff731f32d04a025cc0882718eb5d02c40dcc7f0ef81185167ed0fa72fe050e9637fbcc456208eff1783f719cc2d153854a472781a SHA512 bbcc73e33204de48ae1001d34e4f07b8df9e1828e515da748bbc7d09e68763b7567cdb939a9298d9939e8b2693570fc898a931d080947fa8cfa2517c2610bc74
+MISC metadata.xml 869 BLAKE2B 0553da6ce347ea1413910cd3dc422a28201982403a08bdc4725c35c764b97e488fdb361980a6759d7545e474291fd26ede24883875f2feff39ff555ed63dfe9e SHA512 b9561c267faae23ed753f61024c97b2da74c48682183ad4c2291910073530a389f6b416c5ecfae9b28b593d1b48b92802d64f4c5fcc917cd6d70818e0c5e080a
diff --git a/dev-libs/libassuan/metadata.xml b/dev-libs/libassuan/metadata.xml
index 2152f464ca05..bc5f5a5f9be1 100644
--- a/dev-libs/libassuan/metadata.xml
+++ b/dev-libs/libassuan/metadata.xml
@@ -5,10 +5,6 @@
 	<name>Lars Wendler</name>
 	<email>polynomial-c@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-	<email>k_f@gentoo.org</email>
-	<name>Kristian Fiskerstrand</name>
-</maintainer>
 <longdescription>
 In an ideal world, Assuan is irrelevant.  Assuan's primary use is to
 allow a client to interact with a non-persistent server.  Using Assuan,
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index fbb516ecd731..d4d9f9bb0948 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,3 +1,3 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
-EBUILD libatomic_ops-7.6.10.ebuild 777 BLAKE2B 5224ed1784d5bd5eb3e78b805e07cb1da7a0036fcc21cb5646b6a3172a3da85c1194138ba182915cfa85c553f65404baf0cb4d4f6279b639f3fd3c8d154dea0f SHA512 036d11f91744696caf08f01ac6a54ea37ba1d5ce7d74901f08fa8d8e2be18dea9e858bc1b8c0243cff356b78ad95dacfd393bbf86885619cf0b3d325102afb8b
+EBUILD libatomic_ops-7.6.10.ebuild 748 BLAKE2B 11e69c5fe1e35dc1130906f7ef9b13e9c057cffc59d3446cc73f67996e203e6d0bac5f18fbef920c7c711db546243cec8a09c825d6f1112a67deaeb24a114d1c SHA512 755efac1ba252cb2c0c6198ae44cca168281170f028ec20a1b0d301f746602f95867a1d489bbffc98fff2c59c18a6f2ece37323b88b8a207752447967d880064
 MISC metadata.xml 475 BLAKE2B e8db314b5a92dc7564e61a4f12238f6fb6ac593bb8e50e4899c0bd86eedf542350903aefda7784e406e72b64456e75e4099215767e6897c5f6a558f24b40beb6 SHA512 d7b2e2dcc35f4c402f8305a5cc35579bbf4d2607986810c040282365a230ebd916abd2b9936c1cffd3fd616705b5b6aadeece6170467cc27bbe623af18354dc5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
index 08173bb5cde5..738cbb142d5d 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
@@ -12,13 +12,11 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
 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 ~x64-solaris ~x86-solaris"
-IUSE=""
 
 multilib_src_configure() {
-	local myeconfargs=(
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
 		--enable-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 35553af04d31..d0791aaebc0e 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -36,4 +36,4 @@ EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2
 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.9.3.ebuild 777 BLAKE2B cd5fe3826c1fdf263b86a1e7d4f4247cc5839497c04c88cfe70036a0a33a2c468f8118b1fbd5ea4248b84db948176564db724bdd3eb7951b1464a61def9c9607 SHA512 d847c9bf88596c69f281041dd6bff7b4bf9ee88e5e92f8b2fe4b16105d56ca826bb5fcd9d7f7b33ade37edb74e3c161b6b85c6060b91a7d73332d404214fb463
-MISC metadata.xml 404 BLAKE2B 09f99f8595c089c30e13406a3dfe969c444b325dd1fbbd8ced6c9f3e257556dfe5ef762bd97cc16067c9691dba04fe38e855280c2058d90e7970a01474324a98 SHA512 081d2001bcf61d7cb00a36ddaa1869cdce615fa706693efa907676e4224c297871cb65a3dbc64397f87b29c751125735b35ba595e4344a654f2682092411e8c9
+MISC metadata.xml 333 BLAKE2B 25979b807deae1e87e62fa985ffc6d01853a50340d694ac6b4383854df15c26d1c7faf3a4abefd195a7525ed95e255b9beeef5e22a25fb936244de1029fd0480 SHA512 bfe49ec533a23f950bbd560e65fdfa0c5c839d189a53ffc3135242c5bb262141f0c89cc69d7578fe9b3ea9116b70d55d1c362a1090f069e54e54bd03c51f6265
diff --git a/dev-libs/libbson/metadata.xml b/dev-libs/libbson/metadata.xml
index 3ad8263ab0cf..7310136b85b6 100644
--- a/dev-libs/libbson/metadata.xml
+++ b/dev-libs/libbson/metadata.xml
@@ -5,7 +5,6 @@
     <email>ultrabug@gentoo.org</email>
     <name>Ultrabug</name>
   </maintainer>
-  <longdescription lang="en">A BSON utility library.</longdescription>
   <upstream>
     <remote-id type="github">mongodb/libbson</remote-id>
   </upstream>
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 86d2ffec26a3..60239718c50f 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
-MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
+MISC metadata.xml 243 BLAKE2B d63a20aa244e2d01198a2c4d25830ea1a68f7fa3fcb918ac373c31e99b303cb825bc33a753324b0999290c49421076f5fcb2450783a7e13a15cac8bfa8ebd044 SHA512 010182e2f4aa6b9ba90b1cc05b0efe19e0f40188917402ff7ef6034b5210376b33a35f9a2cc921b4cd90030bd6bd8d7e632928b34e2ed91a3e3a36a1e0b8dae7
diff --git a/dev-libs/libburn/metadata.xml b/dev-libs/libburn/metadata.xml
index 21fe2e58d3b3..0d7c06e4b975 100644
--- a/dev-libs/libburn/metadata.xml
+++ b/dev-libs/libburn/metadata.xml
@@ -5,8 +5,4 @@
 <email>billie@gentoo.org</email>
 <name>Daniel Pielmeier</name>
 </maintainer>
-<longdescription lang="en">
-Libburn is an open-source library for reading, mastering and writing optical
-discs.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libclsync/Manifest b/dev-libs/libclsync/Manifest
index 15547e963964..dd99030ac146 100644
--- a/dev-libs/libclsync/Manifest
+++ b/dev-libs/libclsync/Manifest
@@ -1,4 +1,4 @@
 AUX libclsync-pthreads.patch 441 BLAKE2B bbe3115799c436d1c13a6fd638822c6954f37fada8a6f7028ae1601e761ef1705badd5daf930ac1cc5bc2eb5e897ca1eb9f1d5c0161fa6358c979948a48ce097 SHA512 de0cc37af47903ff233941b7bc16fd381949c8450da736bbfc33c3e5d4da10c18b3d477e27d4a9f11848889c5ba0ad28d71ff355b82cc077123b37be357f25e1
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
 EBUILD libclsync-0.4.4-r1.ebuild 1709 BLAKE2B e637c6ea17fcb3ae342781477093fed46a630a45033f9e946e0dbe2ed25c357acbb9b2ffe6ac6bac11ae1b3c9c266b1e95984f014c5da442007fb33ccefb1d0f SHA512 3c57c148eb81e0910959b297cd752bb403890c1cd851a1a61c14ce28dbc0c97f96d4b737949f3d645eda59e6980c933f99f6cfc9c8e333d3e026eda69d745aa1
-MISC metadata.xml 716 BLAKE2B b8e44b73deea7153c841b292216050f8e050ac80e1851c267d98196d71ac9eb55f0786ca2db185c9ed094b9948bfba16ef3bed8224509970e1f7126a23232a5a SHA512 cb7e97539feb47f66f6a9e866ad85b95611412eba80dacc665bdf38a1a148c938812285fd6dc147f58be51f6801ec56df8c054f63a7bc142ced143958551bbc2
+MISC metadata.xml 574 BLAKE2B af71960c3cb8c2f49d8de8e2aeb6206be86b8866f49e5787c49773ae762519c2da28fedd7654de079e6accdb30cd0d561ef9315907d8056a70448fe4d172beb1 SHA512 116fd38d47eb9ad20caf53d0639df9f8df11896dc776682d3f498e22431a4652d0140bfc324da287400cf6566a57b1cb25b14bb6285b348ca2acb466650f9fcb
diff --git a/dev-libs/libclsync/metadata.xml b/dev-libs/libclsync/metadata.xml
index 4b856378c566..f1181db674dc 100644
--- a/dev-libs/libclsync/metadata.xml
+++ b/dev-libs/libclsync/metadata.xml
@@ -5,10 +5,6 @@
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
-  <longdescription>
-  Libclsync is a library for remote control and monitoring of
-  <pkg>app-admin/clsync</pkg> processes.
-</longdescription>
   <use>
     <flag name="extra-debug">Enable extra debugging. This will hurt performance badly. Be ready for tons of output.</flag>
     <flag name="extra-hardened">Enable extra security checks. This may hurt performance.</flag>
diff --git a/dev-libs/libdivecomputer/Manifest b/dev-libs/libdivecomputer/Manifest
index 90fde93099f4..d3a8b639ebae 100644
--- a/dev-libs/libdivecomputer/Manifest
+++ b/dev-libs/libdivecomputer/Manifest
@@ -1,4 +1,4 @@
 DIST libdivecomputer-0.6.0.tar.gz 680425 BLAKE2B 9ed951c6cdec07929ea7a9d3b842483ea1c88bff0171bfec1ec5a1a1d21a73580f70034856c97397bd21061d01967e14477ffabdf75b10bd6a736820b17e5b7f SHA512 b199d3e7e89fb2f79e4de5b54b086ae5f8b6bc08d02513e903e8fb008c1a453cf4cd4c4b7a94b1f7053ac53cc7b9085193b0ee0682318594c27ac2cb693c9b3f
 EBUILD libdivecomputer-0.6.0-r1.ebuild 864 BLAKE2B 5106d4832ae97b7cedd007d4846a3964c0a66d3994b81dd754653df237c4d38f189bbdca85e02f40c8540c306a922c435d53328cc95aefd2ccccb7dcdf9b341b SHA512 53d9892d3c90f6168d62e4566046329fcafd244607566eaf14b113e5ae8bae0934531e21b7bdd374372f498f4d710aa59002791d14e7e7743b6897593d71c43f
 EBUILD libdivecomputer-9999.ebuild 864 BLAKE2B 5106d4832ae97b7cedd007d4846a3964c0a66d3994b81dd754653df237c4d38f189bbdca85e02f40c8540c306a922c435d53328cc95aefd2ccccb7dcdf9b341b SHA512 53d9892d3c90f6168d62e4566046329fcafd244607566eaf14b113e5ae8bae0934531e21b7bdd374372f498f4d710aa59002791d14e7e7743b6897593d71c43f
-MISC metadata.xml 483 BLAKE2B 530cd37101a8b0f199376c57b83bf1d16098c11d13550a869573d7388125f290c8ab5070685fde6c937a5580d4fdbea6a6d6cb84b08c90875810b4b60f869339 SHA512 d8b8f22b939030536510dc41a6d6ef12b8863c8897e6213dd89076d01018d532f94e85c7b017095723fdcab259e24d2fff17820d212bdf27b57462f501056191
+MISC metadata.xml 358 BLAKE2B d35618d267dc453d7446498f0d77dac8a0421dd99c7f1f8e5f6f04de46e5b15e9705df2476f84b84ccf3ab8519f50beaeacc6af0a46da729c5b13ea03a711887 SHA512 04333ba184ba31211c93c47915f49c1f11639f8a8d269ba9176fdc6a3855c585daaeb836056d8d690e9edd6c13a440d77e754de1511d135b9649a8248918e09a
diff --git a/dev-libs/libdivecomputer/metadata.xml b/dev-libs/libdivecomputer/metadata.xml
index f4838fd208b4..ca379a9cce2d 100644
--- a/dev-libs/libdivecomputer/metadata.xml
+++ b/dev-libs/libdivecomputer/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		Library for communication with dive computers from various manufacturers.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 06bb001a4699..e8fc6b09d9a2 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,9 +1,9 @@
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
 DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
-DIST libdnet-1.14_pre20200717.tar.xz 276684 BLAKE2B 829e1293ae4b5c3eb4e13aef36d0ecd7abfdf53169b25e1cc435e59d2cad1019fd94f7b0a3bc9d0d382aff051855d06c014677de92a7af01ababf748093f9c18 SHA512 75d8e25b00dfa59b9354f7e67a7685ac213af79b594584b056457181c6f98ef00ed1243a2eb47f63261007130e6eae8e91b8c1b2f353c62dea666b3eb6a3940c
+DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
 EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B 76c2f623188831fc9cbd7273ce90bb58eb2e35b19f9602a9ada16b533db237401f21bf2fc569a5a785f7d2e13057a78811a3a03d86ff1268237d3f9cc01cc38b SHA512 b8648b062ef377e0431210776add07d00dfd9647b801ad3b4a4d0a32cbdfa3a065706a66be71d137445887ba97d3588790b15b027a96e22596924bf7f01a8de5
 EBUILD libdnet-1.12.ebuild 1520 BLAKE2B ce48aaf6543ede9d1db165aee357c37447b1a75e48b23439ad2fb8b848edd003b6a1457b1407cbe6962759fc2ab20a1bf3f3ed9b70fa711b1ad28dad851f91b7 SHA512 7c7392c123fa430c97015eaf6d926a525791f0bcc51bda4c95cadc17267f52f99fd22d747b42060b9307324a601ec1d83b91399233991e87597f5bbc59038afd
-EBUILD libdnet-1.14_pre20200717.ebuild 1358 BLAKE2B fb82b3978e9ccdabb011483e80967a9124cb3e526c226d6e61cef5507879822ee5a96dafdf3b4b3097a09bf70f15315ab9e0b03e0575a52cf1596a9a00fca24b SHA512 067d9e12140cf6eea5f41a4c50799310729ae1b27139a23669b91caf402342d1fa2b5e59b17ed35a9dfb6a53e3ab7188a1f6663510e338abdd352629cd9d9039
+EBUILD libdnet-1.14.ebuild 1393 BLAKE2B a54414e2785c4a252a7d1a5115c02a2b1dfa70db2514ef11cad1763e5385123517595c2c8af4c71b71fb0d4251e23eafe9a6e48f050a49e89ae41665b7469335 SHA512 1bbad590fca8993856b27d043af0400c0e6363f129572c157c83f8f085bdc34a0ecc9d14360bad5768f36e7d645d259a5464fbab2f6b7f7169c224f3305b4a6e
 EBUILD libdnet-9999.ebuild 1304 BLAKE2B 42da11f210ae69feadac13950baa8194a817784c0c0e8bb31befc07f20bd842d81348b623137a4b8ca6b857cd45246e23d75db6a807e5710f70574cd4c61484a SHA512 9e432bb2bcee9baef6fbe8428da44455fb02e8e4b14fe3575194f2e1c1f9e5a38f8c57280350c1fc570f03753c5fe121a2e37580812d6e92af1a2e98cbf3513f
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild b/dev-libs/libdnet/libdnet-1.14.ebuild
index 3975fee66788..1208fdd5df3b 100644
--- a/dev-libs/libdnet/libdnet-1.14_pre20200717.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14.ebuild
@@ -9,7 +9,7 @@ inherit autotools distutils-r1
 
 DESCRIPTION="simplified, portable interface to several low-level networking routines"
 HOMEPAGE="https://github.com/ofalk/libdnet"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
@@ -25,6 +25,7 @@ RDEPEND="
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 DOCS=( README.md THANKS TODO )
+S=${WORKDIR}/${PN}-${P}
 
 src_prepare() {
 	default
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index bcbffd0cea0f..effcc7f46d8b 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -3,5 +3,5 @@ DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085b
 DIST libebml-1.4.0.tar.xz 69944 BLAKE2B 240c18d53ec73cc42b4cbed507e95ecc5ada0bd65e826b3f2e930bf6d4055097606b920c433ee5786112894ea6ad0eac229e784501ba14563274b7605dab01f5 SHA512 db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230
 EBUILD libebml-1.3.10.ebuild 601 BLAKE2B b86e87e70d8802cb2f3c7d1a5670f25f9f2d7167d8ba16b830300ea9e3979d7f0a1b6bf9c1e26055effa4b52f27e326168d885a47933f1a5e094c4ddb742e32c SHA512 5f777da9fe58cc72eb8e354a3d2d59cb7cab7cf411a85805cf368cafd0849ef5ea3a064ae13243670c5de8819f9185c94e6c3088acd15d589a2d2ece33e103ae
 EBUILD libebml-1.3.9.ebuild 594 BLAKE2B f6d165e999ba2127e529b26077f532c64d110d0fb481408f6be06733f573ce401f4e622d2fcd13fdda75343b84f5cde6cd962fa131f6b3bc73d930c9a0714395 SHA512 7a8f357385c3169cf83e4364f31067e6bbdd827303042412a792a921ff8be8fd8b758847202b47aaa0f611721301ebffc9eca8ad3c2bb80dd37ba9d8edc251dc
-EBUILD libebml-1.4.0.ebuild 596 BLAKE2B 7da09a0013d0d3430eb2683698abd99773869a37bd0ef2d06c124628345e3b8892ad5c4ac41e514ef9b1a70353b1c23298fc410fb6a8e422b7859272f4eec03c SHA512 2f734e59277b0a835ebb6680ee50d73f68097a695faaf23df6960b7db4fa40a82e8fd22f4dd5e021f59e9af8dbd5c26b37bc37f8343b85916c101cd52052f82e
+EBUILD libebml-1.4.0.ebuild 594 BLAKE2B b83fcefa006b8d180ad9556ab51a4a3c623df1608dba85f70b4004ea6bf47b6372c724c27bace7c1aa72d71a5875dd25daa1eb61ea9afc672bac9f617173edca SHA512 74cfaa253181ad4bd3b261fcaeeca70512b0d7a23df344fe63ea92dfba6f78bf3acdbda15c3f4e704f8ac91f97b9881c850bd40c6912f402bc1b97b81aee6e9b
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.4.0.ebuild b/dev-libs/libebml/libebml-1.4.0.ebuild
index e2f9532f0f19..02e999ad1c84 100644
--- a/dev-libs/libebml/libebml-1.4.0.ebuild
+++ b/dev-libs/libebml/libebml-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index ff447affac42..19999855b003 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a
 DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645
 EBUILD libevdev-1.9.0.ebuild 1198 BLAKE2B cb04493b3395c2936a7d7ae12a83fa2af05d3642c7751440087e978ab483d93feef05a8d1b951ad43a007b6481f8abfcb9f957811918682867e094ff8c51c1fc SHA512 eefca4687835e7d811fc7e4eaa73376989103b80f0aa32aa4c152133aaff001772fdf1de9adff315a25a99d8da7ce29e533de6439595bd4fd7a03beb0ebc777c
-EBUILD libevdev-1.9.1.ebuild 1209 BLAKE2B 07dbb14d5f73ef70b6d919c3c6ec4e4022b1f89ff3c7c0260eea80129c581e0c785648b4050dba02b3961c50e677c3d149883e3c301627f1fe5be33519a93d64 SHA512 0fa7f48f6d8cd9d14354aa630626d4a5fbafe038aaefac78c2f031891fceea8448e89a78f35045ffabd324788b12960e620f85ee62d7461f51c1eba2cf13e28d
+EBUILD libevdev-1.9.1.ebuild 1206 BLAKE2B 6a612525acd49ad28d40e74e5e5f30c02e510fb9759d176ee4921b30d99380394af7e9ba44924d2096759710c2a50d34a6f122ab9c7a84619cfaa567206ed131 SHA512 f93d55cd425efeb3d1bed7cf9b28f369be35697db681c291b910733dffd1767cf904a88aec03666d3c4a0681b092f85bab68f57136ccb7e2d925bdae7856d9d2
 EBUILD libevdev-9999.ebuild 1209 BLAKE2B 07dbb14d5f73ef70b6d919c3c6ec4e4022b1f89ff3c7c0260eea80129c581e0c785648b4050dba02b3961c50e677c3d149883e3c301627f1fe5be33519a93d64 SHA512 0fa7f48f6d8cd9d14354aa630626d4a5fbafe038aaefac78c2f031891fceea8448e89a78f35045ffabd324788b12960e620f85ee62d7461f51c1eba2cf13e28d
 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
index 8f8dd07ac544..4396ffd27b3f 100644
--- a/dev-libs/libevdev/libevdev-1.9.1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.9.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	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"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index 637aea171ed7..e45e3d6828ce 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -6,4 +6,4 @@ AUX libf2c-20110801-main.patch 1708 BLAKE2B becf5fd72a0d9bad9a6fef4d6013b2e1dbed
 AUX libf2c-20130927-fix-buildsystem.patch 1632 BLAKE2B 381a2e03ee75f0553325c4b5bbc1191d7262d0fec6d315791684a761f1be6e0749782a679fce805b1d4eb466d0f219d78bec6ef03968addaa47c3a0d1c212c59 SHA512 40191835f7b5d6a9865c68e0fb8a7168715b2f79cad069192427cc657b9664ac9f242c7b746aa821b81c33ae2c08c6d936f838b2f5228acde35d8aeb7c102b93
 DIST libf2c-20130927.zip 129082 BLAKE2B 09f818bde8888b569858784c39e93a6a11b3103039f44c3f6a1246b29efb5f8ae6e45f787ed0c2216bea383a79b9554aff30e1fbb00668bbc872b4bc30d87ba8 SHA512 1a12093dec3c250f4775eebd06f1a9144fdb956ea3162202fb67569fdd956ac5591bc563a0726ca65ea10d465efaac1c1d8024d63bc4a4b5c88bf46242607c8a
 EBUILD libf2c-20130927-r1.ebuild 1205 BLAKE2B cff5e1b623ff71ca2b39e034dba3efd11f01b99dde6f913f8f86d49d7cb223d15b13839eefacd13cd62667b32b35fac54823d685ceb7b9a478a7884de8cd5431 SHA512 cfec1b64ef22c178cd7ea30653314ecde95cee384b6580030d555c861f0215aaf6027ffedf33f547d4d9adc6274b652445f84562e81080384e9d2521feba30a1
-MISC metadata.xml 363 BLAKE2B 854c5e9e83fb984b31f4def65cb25720bacbff0522fe93e3488211611e15896e562ab86a101ea0f661ffa6de9bb15331dce1e39ca614b1987ed35184029a0d18 SHA512 3c5efbb36dba02cfa31cb0b95c78194bfecfcc128b60eb5c11983da6ac26fb0d75bc02e004443fc6365d3cf53b6d9bffc3a0342c185e61ffdc404cb8b4a3f95e
+MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/libf2c/metadata.xml b/dev-libs/libf2c/metadata.xml
index edfd7994e880..8425c0d53cb0 100644
--- a/dev-libs/libf2c/metadata.xml
+++ b/dev-libs/libf2c/metadata.xml
@@ -5,7 +5,4 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription lang="en">
-  A library to conver FORTRAN 77 to C/C++ source code.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index d1b190378c7f..6bbebda7e646 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,6 +6,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-r1.ebuild 2609 BLAKE2B 36fbde1f703bc2e49882a24f91f5d039972f0825bc2ea864c5a110ff033b897051fa9d675f2fd61624d8f523d3532f0028b2f5b6144d2779ba9f992a2a706a35 SHA512 966a1a6d4b98de9a0eb7b54fb2e54eb7fb7caf9f574806740304cdf002fae5694a0e519c96bc77e6feda9eb90bc9489e51f29acfa6afb771cb35ab41652d2c8b
-EBUILD libffi-3.3-r2.ebuild 2701 BLAKE2B 01f2eeb093ccee463a1b6c0b98d6f5e8232186314955f04a480e670a02bb289d5278086a6c7816bf7199d4741bf473216a52c08f2bbc9fbb5b4381b057a489f6 SHA512 124d97344c82a235dc5d1807856a5cb8e9dd387f12ce56b422a0f68a4c6ec031b862e06a1057a9287f2af3c63d2ee5079f95f341511aeff523960d66265a5756
+EBUILD libffi-3.3-r2.ebuild 2700 BLAKE2B 2f5669b7f15368ad63f7cd397c75281bd91897b993c1e5702d6e69043073eb28d3c7900a80d8e8453d4849e0eb92b05209b580d2f9268c69725d0526d4e18e41 SHA512 afaa4d12655e7d42f36fd7780e4928d32b7143a8c449cfe64f56d291a8745cbeab664b2b394ed0c24004340b7da81e9b2f89ea0e0992ea247e3b529a5aa64116
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3-r1.ebuild
deleted file mode 100644
index 996855591ae6..000000000000
--- a/dev-libs/libffi/libffi-3.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib multilib-minimal toolchain-funcs
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="a portable, high level programming interface to various calling conventions"
-HOMEPAGE="https://sourceware.org/libffi/"
-SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-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"
-IUSE="debug pax_kernel static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="test? ( dev-util/dejagnu )"
-
-DOCS="ChangeLog* README.md"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
-	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
-	"${FILESDIR}"/${PN}-3.3-power7.patch
-	"${FILESDIR}"/${PN}-3.3-power7-memcpy.patch
-	"${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-ECONF_SOURCE=${S}
-
-pkg_setup() {
-	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
-	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
-		local base="${T}"/conftest
-		echo 'int main() { }' > "${base}".c
-		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
-		if [ $? -eq 0 ]; then
-			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
-			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
-			die "The system is in inconsistent state with unknown libffi installed."
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	# --includedir= path maintains a few properties:
-	# 1. have stable name across libffi versions: some packages like
-	#    dev-lang/ghc or kde-frameworks/networkmanager-qt embed
-	#    ${includedir} at build-time. Don't require those to be
-	#    rebuilt unless SONAME changes. bug #695788
-	#
-	#    We use /usr/.../${PN} (instead of former /usr/.../${P}).
-	#
-	# 2. have ${ABI}-specific location as ffi.h is target-dependent.
-	#
-	#    We use /usr/$(get_libdir)/... to have ABI identifier.
-	econf \
-		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
-		--disable-multi-os-directory \
-		$(use_enable static-libs static) \
-		$(use_enable pax_kernel pax_emutramp) \
-		$(use_enable debug)
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-	einstalldocs
-}
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 88b106e035a1..19e01b0832dd 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index bfb4205cb050..8a5afb039b8b 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,8 +1,11 @@
 AUX libfido2-1.3.0-cmakelists.patch 1210 BLAKE2B a7b90def3763bc5c07511103c05917009532219dbd5fc2c2ee90e0a8c68251c938d23977449998ea98afa35900813e38b16b230379e5add15fa4ad18851134b9 SHA512 4559b85525247b1e625a4aba404f85e15802a6f75ada0d1b1a3e1c817d434d6e119fb4549147b0aa9c9af9e176f93d176c3f8ae71e4c8fdf7c0cde66ae18445e
 AUX libfido2-1.3.1-no-werror.patch 736 BLAKE2B 5eecbff49108683d77ee284d67425ff846028067ec757916422aa9c833594fe5207fe398fbf61261d4b0554fce9442d368a83be7e52bbfbabb5ae0cff0906932 SHA512 5532e3ea9be09284582e3217c2567a35bdef8c0f8efa54b172cd21e91adb61770c42632f386b0adc70d75842bc570f6b55c041bd3ef7c538ddb88e51ff20891f
 AUX libfido2-1.4.0-cmakelists.patch 1247 BLAKE2B c290dfdb1f25b241b1a51725d568169210890c67d61ea314c84100f4c0810f84cad540361105ddd3c36e1b8130eaa4d1c8c72e11b9bdc1518349eb80356a5eaf SHA512 5272d57fd384b9454c8385362a833d99e78b2f09f5fa30521d8750191800514c6322d1b5edf5bc239ff59d136a4200dbe9450180e8a8738741db0c18457b6709
+AUX libfido2-1.5.0-cmakelists.patch 1037 BLAKE2B f6e34d02dbedfda8f152a2f8081370ea5d8c23468a355329d2c44831c0a9b82a95cc914bb55e7963bda71aa65e4ce4b9849e0e1c42c397c39c9b6b67d80598b4 SHA512 c4b761174994b8db917c5a44940e4119d208e2f9625a6669c15c692ebc485e24439d549c45b271712d69a3c026dcd41005d39381dddd44b606d033b7c44d64b8
 DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
 DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a SHA512 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513
+DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
 EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
 EBUILD libfido2-1.4.0.ebuild 913 BLAKE2B 98fc338e47d6eec425b9a0dc28e66d811bf6502f831170a179a2a0d69067fde8af24b9906e4906c2421f72f5bee1429e6932573ff2c59febb84dd72ca323e256 SHA512 987c094d3bdaf4d88728f083c4485c47e2fb5e4162f27fa21503f44c224b72ca42b45ff6236130cca64e78c3161e64e81c16ad479be4142c7863046ec3fc664a
+EBUILD libfido2-1.5.0.ebuild 902 BLAKE2B b388afe810ecb1ff5077120e2750bd8f93f1efea5282ea4db36d85d8044a06c0c005f02205a0979bd2deb9bfc5736702a788514aecc8b4bfe0c2c5411ceae671 SHA512 3e065ce487c5d9709000689062ba3e90c42bb23bee28e980964b0553949c65283e1eb5c8620671d899fbf11e784336cad3b35b534e60bd43ffdc457c80123fb1
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/files/libfido2-1.5.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.5.0-cmakelists.patch
new file mode 100644
index 000000000000..df7f489b45c1
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.5.0-cmakelists.patch
@@ -0,0 +1,30 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,13 +128,11 @@ else()
+ 
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wbad-function-cast")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic-errors")
+ 	check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
+ 	if(HAVE_STACK_PROTECTOR_ALL)
+ 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all")
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -3,10 +3,8 @@
+ # license that can be found in the LICENSE file.
+ 
+ find_program(MANDOC_PATH mandoc)
+-find_program(GZIP_PATH gzip)
+ 
+ message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+-message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+ 
+ list(APPEND MAN_SOURCES
+ 	eddsa_pk_new.3
+ 
diff --git a/dev-libs/libfido2/libfido2-1.5.0.ebuild b/dev-libs/libfido2/libfido2-1.5.0.ebuild
new file mode 100644
index 000000000000..3615de97d12f
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libressl +static-libs"
+
+DEPEND="
+	dev-libs/libcbor:=
+	virtual/libudev:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/libfido2-1.5.0-cmakelists.patch"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm -f "${ED}/$(get_libdir)"/*.a || die
+	fi
+
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index c5c1c5dc1e2a..2a46beb50c28 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,6 +1,6 @@
 DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
 DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a
 EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797
-EBUILD libfmt-7.0.3.ebuild 779 BLAKE2B 0c96c292591a3f7b3b4fa4c5d078a5f66feebb69a1fa94b51f791706856b919b367a1420348312b7cb436d51b5fad7a29eec95eea8c8d4438ec0e8c5c5150a97 SHA512 f7666d7a1ad80489ebee0dbb8d6190414a885675acd3649e2b46001fba67df222ef7a2eb63c769809d841d381019ec30666194741f1bfb54f40ed7151a1606be
+EBUILD libfmt-7.0.3.ebuild 778 BLAKE2B 9e9b994e80f7e6991913d2a553f76a7cc1690fc39a8c2692ff670a59734be819bc0cd56abffa82445e8e731faa95868341585457fbe7485ec639f1ae5d8154be SHA512 a818d4846e0551fd7eac246654d76104cda35b4a1d8d16f50d4e41876223298dc6c6eb4cff56a4ba2ad6bea304d4ba995f5a984fcadd98b4da5c95e8a905270c
 EBUILD libfmt-9999.ebuild 784 BLAKE2B f8eb45e3e7e08ae2dbf3fb8adfe7d78c10f41e71eea97c9b3d7d6134c0150feeeaf55ba8cf2e52dc81fef4c5508668760dfd0c550fdcd206ce67a5e338854bfe SHA512 3bc0f2bafa17a2065cfbb9299fa816dce488ee036fab35bbbe5c9a3c4b30c56c3988c8add25d3f101a167d4897eb4e2aebb5c6f9c3407bc68233b65e537a1fcc
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-7.0.3.ebuild b/dev-libs/libfmt/libfmt-7.0.3.ebuild
index e962f1d0f13b..9e14967a6892 100644
--- a/dev-libs/libfmt/libfmt-7.0.3.ebuild
+++ b/dev-libs/libfmt/libfmt-7.0.3.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index 7417215e83a3..32ff1b176f79 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,4 +1,4 @@
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
-EBUILD libg15-1.2.7-r1.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
-EBUILD libg15-9999.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
+EBUILD libg15-1.2.7-r1.ebuild 790 BLAKE2B c7f2b779ca56a859bc7bba90cff13050946f36e3f941cea04d7bfa8523f9a4a9b42040a628171d74fcdc5e53dcbfea3fc54ecaa88c524840312c916cf67d83b0 SHA512 4865cf40233ae17987d4cce07a59e3fcca1370a52a7558c9380748be457899b6263943f2c995bee5e8f12f942eba4fff24cf9ca07d1be0b5cbe50e7b2f9b4213
+EBUILD libg15-9999.ebuild 790 BLAKE2B c7f2b779ca56a859bc7bba90cff13050946f36e3f941cea04d7bfa8523f9a4a9b42040a628171d74fcdc5e53dcbfea3fc54ecaa88c524840312c916cf67d83b0 SHA512 4865cf40233ae17987d4cce07a59e3fcca1370a52a7558c9380748be457899b6263943f2c995bee5e8f12f942eba4fff24cf9ca07d1be0b5cbe50e7b2f9b4213
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15/libg15-1.2.7-r1.ebuild b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
index 3e7892e8cce0..638cbaf73401 100644
--- a/dev-libs/libg15/libg15-1.2.7-r1.ebuild
+++ b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
@@ -34,5 +34,5 @@ src_install() {
 	default
 
 	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/libg15/libg15-9999.ebuild b/dev-libs/libg15/libg15-9999.ebuild
index 3e7892e8cce0..638cbaf73401 100644
--- a/dev-libs/libg15/libg15-9999.ebuild
+++ b/dev-libs/libg15/libg15-9999.ebuild
@@ -34,5 +34,5 @@ src_install() {
 	default
 
 	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index ae86c28eab2c..a53e4f7591ca 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1,5 +1,5 @@
 AUX libg15render-1.2-freetype_pkgconfig.patch 1660 BLAKE2B ac8e1a850a796592a248e9a5231376d906aee234a57c075af76a9c812f27f401e9e6eba79eec5dc6abeaf72968c99a39b0213bfbaf8d72e48037e0b69af35961 SHA512 f06d0d85924c543dfc8a9593e9c99ee6394f3032f57d1059d7c47698aab99b263d2d17ecfc0089375f3c59531a4f990edd11974dfd5962939b301c7975c24c10
 AUX libg15render-1.2-pixel-c.patch 686 BLAKE2B a6273daa806090247eab17e2f03f3baa3fbcd7ffe4ee502611a4ecb39134dea809a46d77243c61e949f732b9f7fabd7a7002cc0434dad7e7986da1f25dc2962d SHA512 f1d40893c1f2f17d42c9ca6941d802e0c22a5eb85d9f8167612f7bf21045c096744634ea38928ecfc30c39a6085e6b8652168e711534edf82e3d8f5243c072a4
 DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
-EBUILD libg15render-1.2-r2.ebuild 859 BLAKE2B 4ab2dd1dfcf5641df4ceeb0ed19b099db43a909442961ef6d53956f72a064757f0e8ae63ed28553a1b4e7d8344f4aece477860fd1383248323d2e913c967f5b5 SHA512 f5abaef308901205053b5a007f9d71cbec6d069aa0c4631df1b5716a1d846b5e8ee77d7aa6d13721414eb15cf70b1f44b9efdafa06035030155474348dbaa9b5
+EBUILD libg15render-1.2-r2.ebuild 908 BLAKE2B b00eef7bae1cc5c90765738005428c5a440da9d9928f4342581c290a7b883dd2733cf6e2c48589a46f6791b0bec1a357f0ba2eb3802990b0f31d901f56df1237 SHA512 3395d96ff0ad3352c7794b7ef3aa65e75c13bf4f66a4b8db2d1ea47e400331b9e53ccf01663d067b730d65a2aa762eff2cd1a62ec486d34ef03bffd8ca984b83
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
index 1082ceb99bf4..8b6133f70f2b 100644
--- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild
+++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
@@ -33,14 +33,16 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-static \
+	local myeconfargs=(
+		--disable-static
 		$(use_enable truetype ttf)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 
 	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 4867fa17caf6..52f18afb5714 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -9,6 +9,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-r5.ebuild 4022 BLAKE2B 36678416d616fbe2ce5b435bc6005705437aa247f3590b02ccc2b115cb1d8a2a8ce0b658942fb2f3e19aa0640ff1f488e5fdf131b668ee5bfa254b12c6fa0ddc SHA512 98499bc04eeaf8d7e184f9a1714e6174fdc9604e5873faccad3f031daff803c853e1504cbf1f05151ed0be24324e15cce5e5162bd7ba1767e5cfaa8b2b76360c
-EBUILD libgamin-0.1.10-r6.ebuild 2980 BLAKE2B 2225f0f08faf8cd83f1e4b9e9f9725996108d04efdbbd032084af62ded8084bfd1ef20fe81217d91411d422cf9fb4dabcb4383a4bfc169ebb0b6cf36b12c3825 SHA512 089814b7ac12b9ec6bc85ecd3422785a312d64ada7787e36739b7f275cb2c33abf1d65b40a9f0aa49e0f9f4080b8e05cfd92319ad2c201d31842438affe7c5c7
+EBUILD libgamin-0.1.10-r6.ebuild 2974 BLAKE2B 571139ca82110bcdd8230fdee2608074f87235cab8e4bf6ff8d0ff78fec27e63232986ce800fdb7eb9d7d2804fc2d8d13d2503e1870c6801447bb6b562f88188 SHA512 e8cea1cb8da6547e26a1d0e99137bb306f33fb64cb45648a42b123e909c05962f6fd95de2a026fbe3f98f81e5b4f8306e72ed956fa82b4aaff9d856cf943e0e5
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
deleted file mode 100644
index 10d4d3502cd6..000000000000
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-GNOME_ORG_MODULE="gamin"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils flag-o-matic libtool ltprune python-r1 gnome.org multilib-minimal
-
-DESCRIPTION="Library providing the FAM File Alteration Monitor API"
-HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
-	https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-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"
-IUSE="debug kernel_linux python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" # needs gam-server
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	!app-admin/fam
-	!<app-admin/gamin-0.1.10"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	# Fix QA warnings, bug #257281, upstream #466791
-	epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch
-
-	if [[ ${CHOST} != *-solaris* ]] ; then
-		# Fix compile warnings; bug #188923
-		epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
-	else
-		# (Open)Solaris necessary patches (changes configure.in), unfortunately
-		# conflicts with freebsd patch and breaks some linux installs so it must
-		# only be applied if on solaris.
-		epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2
-	fi
-
-	# Fix collision problem due to intermediate library, upstream bug #530635
-	epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch
-
-	# Fix compilation with latest glib, bug #382783
-	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
-
-	# Fix crosscompilation issues, bug #267604
-	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
-
-	# Enable linux specific features on armel, upstream bug #588338
-	epatch "${FILESDIR}/${P}-armel-features.patch"
-
-	# Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
-	epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
-
-	# Build only shared version of Python module.
-	epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		configure.in || die #466962
-
-	# autoconf is required as the user-cflags patch modifies configure.in
-	# however, elibtoolize is also required, so when the above patch is
-	# removed, replace the following call with a call to elibtoolize
-	AT_M4DIR="${WORKDIR}" eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable static-libs static)
-		--disable-debug
-		--disable-server
-		$(use_enable kernel_linux inotify)
-		$(use_enable debug debug-api)
-		--without-python
-	)
-	local ECONF_SOURCE=${S}
-
-	econf "${myconf[@]}"
-	if multilib_is_native_abi && use python; then
-		python_configure() {
-			mkdir -p "${BUILD_DIR}" || die
-			cd "${BUILD_DIR}" || die
-			econf "${myconf[@]}" --with-python
-		}
-
-		python_foreach_impl python_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}"/python \
-				VPATH="${native_builddir}/python:${S}/python" \
-				_gamin_la_LIBADD="${native_builddir}/libgamin/libgamin-1.la"
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}"/python \
-				DESTDIR="${D}" install \
-				VPATH="${native_builddir}/python:${S}/python"
-		}
-
-		python_foreach_impl python_install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
-	dohtml doc/*
-
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index bbdc72ec8d7e..00553e79c540 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/Manifest b/dev-libs/libgcrypt/Manifest
index 64e15474e870..74669641e384 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,5 +3,5 @@ AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 EBUILD libgcrypt-1.8.5.ebuild 2303 BLAKE2B 6a53021a185faa4382b2e2285fa5c2d11dd22fe58dc96997d57ecc488a147901fdf284980b817832ab74479213140f41403f0ba04f6de8a9091bfd15f502e0fd SHA512 d6a9b8a2fef2dcb37f7ce86247b2147fb3bd35d320c21e2973f73edff7c48fe7a742c6fdf54e4f884767dc5603c5fa470d7da44a6511257f2e1ed2b9327a5eed
-EBUILD libgcrypt-1.8.6.ebuild 2281 BLAKE2B a16ba640e2ab55e6fe8c08b8c58880a6b7d0b0bb22690ed782d753cd83b00b7ddf7b1c8a2ab901ab5d1661a4582f3227e5855ccd3afc3e5d9ea0ef5b06c9c1c6 SHA512 969699ee806f6c8bb7454710794cc7c404349275c43d69e246eae53c064539955870547323aac4d31a626f7c4a14139a49faa9219862d3500a7712901be48e5a
-MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
+EBUILD libgcrypt-1.8.6.ebuild 2280 BLAKE2B 998db4aa411fd93ec925e9a175d1b6f127c337883119ab727640ed096196b929b8822a4d56489513c3293e64e8c701b78653fccdb5e4ba60a00301b7232761e7 SHA512 11f08c192981573c502c81dfb7c2f396639e48904a523cbf5b0a072c1aecff2c60bfdaaed400c69f73ba17459575a69df5711ce66d0018fe755c4278d09b20d6
+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 326a5f8cd0f6..c8e40f012825 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index f034cdf8110f..84083fcd8943 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:gnupg:libgcrypt</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>zlogene@gentoo.org</email>
+    <name>Mikle Kolyada</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnupg:libgcrypt</remote-id>
+</upstream>
 <use>
-<flag name="o-flag-munging">Enable O-flag mangling during build</flag>
+  <flag name="o-flag-munging">Enable O-flag mangling during build</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 523f34a17449..7a197672a990 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,4 +2,4 @@ DIST libgee-0.20.3.tar.xz 678488 BLAKE2B b35dbad89ebac58ab382a1733d7add2e6fcf1e1
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
 EBUILD libgee-0.20.3.ebuild 677 BLAKE2B 8b872d01193bc3587584d56917c3f72f484a8f4a6fe8e46175081c1193387714bc9366a07d722f31360e47f5bc7321424cdefb6ca28f8105a6b6acb4c9192ac6 SHA512 188ec20da58f446492660669d598355de59fbc513f28e00f512410358910b2fde17c401a0c4d9865a7e56c3c2d46c5913872080525a221f9fdddbd98d380ddbc
 EBUILD libgee-0.6.8.ebuild 654 BLAKE2B c0623f735093a9a2a185597c24d3e45d8d98b8f6e523c4a65abeb83c9a96397065fc96ea3b74540a4210d27e6d2457795b26e5434e6d327c972a54fae6a21b73 SHA512 929c0ffc02ad05fb82bc2fc3ccbd2c627ed64d7c68c7400409946196fd930b70db65caff96a705c1f4cd6c4b449d7979f5239ae67c6ac3ffae2b15236d7294a7
-MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgee/metadata.xml b/dev-libs/libgee/metadata.xml
index 16b03d43fd70..39980802b1da 100644
--- a/dev-libs/libgee/metadata.xml
+++ b/dev-libs/libgee/metadata.xml
@@ -5,7 +5,4 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<longdescription lang="en">
-libgee is a collection library providing GObject-based interfaces and classes for commonly used data structures. 
-</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index 28cde4200e28..d865309be3c4 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -1,5 +1,5 @@
 AUX libgnt-2.14.0-optional_docs.patch 369 BLAKE2B 445d0c6a1632c3368f72777919ba2096aa1b16804dd141f87d8c7b8ac3350fc8354bc53423e3ca9a677a8de0c2f8710023561f4e230ce74793fc66ea899829f5 SHA512 83f1640729653bc9cee49f667f79e472727d4ba7c3d6fad3ebccc6fe412fe0a43b868582bbe2de8bcca611661cca8ba135330c1c919ea7622135ed7488b524be
 AUX libgnt-2.14.0-tinfo.patch 567 BLAKE2B 7d9b1c0b520a3f2c3d74d6659a503f554c5b7805f3e5f659bb6e0e58475f74633563d44f6667df64048bdb33437e176cf80a547b33e1939565938752e87325ac SHA512 56ce8dab03e74714ecfe0cb7dd274c5fce996d84793fff5e247ee329b1c5bebf2d933b96cc6fe916dafb4f402269d3b1b8cacda07deff4c149869d509ee5c416
 DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
-EBUILD libgnt-2.14.0.ebuild 784 BLAKE2B da9563b9951e5b9520b2e9dae2a00a42d720eaa2530d763cd35f18e56eb71415735ba72b5429f69690df99da7452373ccd22e7c6129352bb5d7227b3af663426 SHA512 d77f55cf9e8b36a8e2052a9851fe3452ef8ce545f151ff436e1111354da44a17383ba1c04a0986b759f483875959d186bbc6956b614658b3ec147b50a5a881c8
+EBUILD libgnt-2.14.0.ebuild 783 BLAKE2B a099508144eef92ce68504428d9eb684da53d78185bfb2bcb486ff73c9e2263d7273757a1b5f4ae87a2b17e5e3b44625b18903eab58628046ec688da2e222067 SHA512 c4b8195272e0aa80b06ca1006bc6af46f872e71a04f13a9d240f9742d1b2a6bae0eefb7a6b2784d54ef653f9886493b75bd6a326361a110a06d682c603df4bb6
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/libgnt/libgnt-2.14.0.ebuild b/dev-libs/libgnt/libgnt-2.14.0.ebuild
index 9373a7086c94..6986a1fa1101 100644
--- a/dev-libs/libgnt/libgnt-2.14.0.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index f60512a4c9ef..b5be1bfab10c 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -8,6 +8,6 @@ DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe
 DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
 EBUILD libgpg-error-1.36.ebuild 1682 BLAKE2B 060fea2878a9ff65e895978743bdf00435e4c275bbf2769777d52d60108358bcf02b8387671f9ac46bf8d9b2b542dd0a383950734baea3568d69fa10fc05a1e7 SHA512 77a635e5f705bdbacf5bcbb9a9bdeb26aed6ec2f7f06a213a2f1bcf84c5c15cb6072511988c95d1f7832e23aaedd42059a3481c1f55fc1e1e0b66f18343b3d9a
 EBUILD libgpg-error-1.37.ebuild 1697 BLAKE2B a788777367e04315c576a22bfb0c8ef7fc5e4c5e7d2aba90ab57079226c57a18a386162d5aac94f66ddbf8f45b65d3b8542642a94f13b49dc7d05ebe8ba17496 SHA512 cf202bc7d89a137245aec1c04dc956483ba93fe1e8ef8896b4aa48a576cb54f9ecb7eb64a7dd8eec58861e9ca3aa42feb988f3e99a87e372e8e8863cbb0e7030
-EBUILD libgpg-error-1.38.ebuild 2127 BLAKE2B dfef95bf60763c8a3aff8dfff0679bf0a2681ea0ff121bfbecde04d74ce4cde9e8b7ac4aba40adaac0077298a0bc87ec561c7cdd9d2adc8a478410f6a87a5756 SHA512 b2ba41ec7f54e6c7401412b8e42c76f992a09b8ecb0a030cadc2b3bd07de596fb82a88466733d3cd60c7b675b8077873cb425b0876da674b6a617639726309d3
+EBUILD libgpg-error-1.38.ebuild 2126 BLAKE2B 329bb8c7fec4cef54411ca382cfbfd26f621f88f6ed95ff471caa0ddab6967ad7db1d092ec443f1143c9b0fda08b34f892b4d0435f74600a632719ae0650d1e3 SHA512 c5a2d97ea0d7f038fcd9e68d1d72488469bac07015752133fed29d0c7eb7d897a2a8185dc965599b9010c2d87ce7d0236d1651a47266b67968f688502da91133
 EBUILD libgpg-error-1.39.ebuild 1698 BLAKE2B 8350db5f7f474cdc2720f9dcca24526f46b84adeacf00d5efbc4d8ebf7aca1ef9a9d5949920c3705a19d4e34b39f73aaaabdfa84854982345b12168d3c7e6192 SHA512 9ee2c9b4bf5cb08c08238d3a6e2cd54431efe85dfabfc8b78dbbb1c504900eb29e9a0db15e098660ff4382dcb39d80a6fee1e5e94ff6acc5b8eb906ac0b8e853
-MISC metadata.xml 525 BLAKE2B b2be127796014b926129f269602f39c5b0fa9ae4022b1d7492c201725c27e614e0dd6a0f8bacd1e6703309130f7e758c0bb7abef9d532c01182eb7b4fdc0a13f SHA512 48841f068de32aefcdafd5b831a90811c8006862a8aea7b9cd48e77dc3f9e1dfda00d952de9f5784a58f730ae2707eda2ca4bfc1509985988042017419a7b8b5
+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 4638e200d82e..28f7ae4c7ad6 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/metadata.xml b/dev-libs/libgpg-error/metadata.xml
index f453bb98b99a..0244f456738a 100644
--- a/dev-libs/libgpg-error/metadata.xml
+++ b/dev-libs/libgpg-error/metadata.xml
@@ -5,10 +5,6 @@
 		<name>Lars Wendler</name>
 		<email>polynomial-c@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
-	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
 	</use>
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index e5ac65cee21f..ab9134333d62 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -6,5 +6,5 @@ AUX libhid-0.2.17-man.patch 500 BLAKE2B 404b7163651258a28369458a76cdcc591ebc8285
 DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
 DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977
 EBUILD libhid-0.2.16-r4.ebuild 1254 BLAKE2B 169b8bad85fac93966d558c789456389e8451f409a216fd953f081fccbe30c2fe1d35e8cd990ede83ff8f0fd9ee43e686bcb549fe8a330f5e030374ede5c86e2 SHA512 12547eb12fc9ef71b81d0733386cf1ef9aaea9d685c6971c69a7653dc0bdf92e96f78ce4aabc8d553f0d9f7c026fd736a4210224506787310491d1ef092d88b9
-EBUILD libhid-0.2.17.ebuild 1028 BLAKE2B d4e5688269959fe25bbe241338b5188e4302e6dd4d9b0bff961697a26192e24df0290d66f03c277c111eb071cf138a4b0ea3586709a4b1fc855a1268ce73e3db SHA512 6eda25820eae4709e80675d35d8ea8110b897c196604d6b74edfb39680ee2d1471a200c6ef1806175c1b3248666046f61da9d251cd8e14feb07f3ad3f97d69be
+EBUILD libhid-0.2.17.ebuild 1026 BLAKE2B c5d659a89affd44286f3dc200d5cac4c4947732bc3eb8cbe8bbe05e76952acff8e1004a831328fbb97a07695e58b03c194081759a172e5f7e3400d9e409af639 SHA512 d9419ed0dbf1eed9dae9e45c2c60ea3789303f07823d2d49ed78d25e726fb7225c032176b6ab19c7764b3c6c10877aa82002fb0eeba8c2d0d8c47d12b8cc7f70
 MISC metadata.xml 579 BLAKE2B c06739bd7822f74c3721fb2848c6b91e2904a2731478bbdda4b7500dff9882d2d885983ad017191bf9ac3217ce1e200db82663c3dec29777f995358dc6bcab28 SHA512 5ee3274cd0351f5d4a7853a1392bc538c85b9539b1964cf420b00c7e9dcbcb20534b74b641e7c4ed7ccb2218ffea9ef42b06d6ffebf1c1402337c66a8c9c7bce
diff --git a/dev-libs/libhid/libhid-0.2.17.ebuild b/dev-libs/libhid/libhid-0.2.17.ebuild
index bfc00287f463..02407fa58f13 100644
--- a/dev-libs/libhid/libhid-0.2.17.ebuild
+++ b/dev-libs/libhid/libhid-0.2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND="virtual/libusb:0="
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index eca25283a3fe..47fc34f9c4ec 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.16.0.tar.xz 593304 BLAKE2B 959b9e5720b1aa196eb45cf772e8edc800032
 DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0
 EBUILD libinput-1.15.6.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b
 EBUILD libinput-1.16.0.ebuild 2157 BLAKE2B a85519433dd08ad44c6dde55780b2d3f3f8a1559533120b7a18ccd3920e3ec969dfef9c37a92b71773d2a46563ef0382755ef3d12b97bb6bf188711782faad69 SHA512 e3c62cc6e5a626116801a017852c5b13342e8b5850171f3698e465a84dd3743cad941790d315f5e87f2cd318c0815972d06860efa301baf60b4c8963d6f83a67
-EBUILD libinput-1.16.1.ebuild 2157 BLAKE2B a85519433dd08ad44c6dde55780b2d3f3f8a1559533120b7a18ccd3920e3ec969dfef9c37a92b71773d2a46563ef0382755ef3d12b97bb6bf188711782faad69 SHA512 e3c62cc6e5a626116801a017852c5b13342e8b5850171f3698e465a84dd3743cad941790d315f5e87f2cd318c0815972d06860efa301baf60b4c8963d6f83a67
+EBUILD libinput-1.16.1.ebuild 2149 BLAKE2B 5d6f6983f9c815fff392efb0e1b07bd20b81a97aa15a7343279438295c0ae038c4f667612214cf60167139b4a5529ba356f3f065a19ffe59753dba04c5567be5 SHA512 f7a0c14f0028ccd8d54d7b4d97209f5344f3bd23a7194d4dbac557cd092cefddea22084f7e5c59848fd5288914e6610b6db100a63a15c2bef878fbeeb589cb36
 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
index cfbdf1816876..37db73f505fb 100644
--- a/dev-libs/libinput/libinput-1.16.1.ebuild
+++ b/dev-libs/libinput/libinput-1.16.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc input_devices_wacom test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 6bf65a804c3a..79efe01b36ab 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -3,4 +3,4 @@ DIST libksba-1.4.0.tar.bz2 651319 BLAKE2B 0e3f49fd0d389d905ff75ddad6ac1f3d158d2d
 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
-MISC metadata.xml 363 BLAKE2B 47525d43d5882725cae82a4da39f6a4e3f5dfb9918fbd2cc869af4016a41db7768120db58dd68b2fdf6b433b4f571080c96642af30a3399023bedfda72f3cdf8 SHA512 3bda082ad019aac69218fe9211a5a36a43f9f4db2c0017669fd1a4ce73d24f37798c1f3368562e6bb91417fdfff0ed795e1b2684e05a83100a18cd809cc0e396
+MISC metadata.xml 252 BLAKE2B da45974cde6a1708a138afe22c68a85a8ff108b4fa2761d3552c4c9200dee3f548bb3a351a70b3129e574e21b52ca9dc2028776ca644f7e0d5a7c82ed6dff0aa SHA512 1b195c0e35c6cd524cbb5e1088f3a634a1917095d133ce81625eef7b8ed76532a9e3dc7b364fcc3f65a13767cddfd194512104586e4a55487b1ffa067cfad3ba
diff --git a/dev-libs/libksba/metadata.xml b/dev-libs/libksba/metadata.xml
index d207d4117cc4..9e5a3ec34cb6 100644
--- a/dev-libs/libksba/metadata.xml
+++ b/dev-libs/libksba/metadata.xml
@@ -5,8 +5,4 @@
 		<name>Lars Wendler</name>
 		<email>polynomial-c@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
-	</maintainer>
-</pkgmetadata>
+	</pkgmetadata>
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 23b05557b36c..b5636fce9b9a 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,5 +1,4 @@
 AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2
 DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300
-EBUILD libmateweather-1.24.0-r1.ebuild 1119 BLAKE2B 58647265c3768c597987806bc3576603398564afb9f6a48c2d9ee991f7a3eaea56182e6a51b4d1cb1c1df6f9383e902670dd1b8c7ff3d8195530943ea7170869 SHA512 7d92ba209a08f429334b3448130ffe7e1105b7b039f6ff8ec5cb9615dbdb8bc4f038e443b43431f82bf9fe87d89ba96e2cabbba1c4cc70888e73c8b6c2229827
-EBUILD libmateweather-1.24.0.ebuild 854 BLAKE2B f51dcaa5f5303761f47efd4025f04f5fdc03091811d70ba84fe9d73c49b3b1e35cbbd65925b4250364e901524f687db8e01df9700ef749cfad1624623ec986e2 SHA512 750a6ea93069def2dd8bd2e1cf6c198cf484cd6a2873c3caf67f6ebedef32c60c62b699114e066b653850f7f86a05a939e30d057d19e5d7c1be80bf287d9c9cb
+EBUILD libmateweather-1.24.0-r1.ebuild 1117 BLAKE2B dea76225a962e0f4629c92c737864dca79811059021eb91948ea4dbbe1a3ccd52e1a98398a087dcafe9cf2fd7364b8eeac85071a4ef6cdbd27f648cdb5d137d9 SHA512 f29017258f1e403cd6ad83a01f9781ec3e97755a2dd6241f5ebcf16e1bfe80494d326afa807e66a6a8c9dd472bb8d0c2e52e45ae7e89a3112228d20bb0deefbb
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
index c487fea2d969..5ab0dbf7fd5a 100644
--- a/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit eapi7-ver mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libmateweather/libmateweather-1.24.0.ebuild b/dev-libs/libmateweather/libmateweather-1.24.0.ebuild
deleted file mode 100644
index bc645287670f..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.24.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.54:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--disable-icon-update
-}
diff --git a/dev-libs/libmba/Manifest b/dev-libs/libmba/Manifest
index 222ecd36ae61..eeeaf1be4a77 100644
--- a/dev-libs/libmba/Manifest
+++ b/dev-libs/libmba/Manifest
@@ -1,5 +1,5 @@
 AUX libmba-0.9.1-glibc-2.20.patch 1039 BLAKE2B 6c458c43a164d2cf438329bbac156d9b41117d1781a2d92b998c0a8d1ac866d7a9a0822b27ffef7610bcc3776c6e054bf333339241ccbd0ca956d373b376bf3a SHA512 b0d0ea1425dd4dbba685eee62609f0627c4d8a579a566d52d1c7f333a92109cf700faaba8ed0f0697d08409feb14ceb5bebf9a799c23e9de1aef388ba1ba4b95
 AUX libmba-0.9.1-qa.patch 2927 BLAKE2B c6b6e364ee2d3eb6026574e2b9a9cb0367da714d06b44a9e0fd8429757d85a42d850634ec3e96d31db47942dd182932d0d5fc6c4b552c552fdc7b3ac11dea984 SHA512 b5886f89c4ea4739e6bfe34e9f8026946ffbbc619922cbd25bab0d7c5df3fefbaf1f198f1321feaf5bbffa79951c58b329cf1d47f4f7ee0f3014de4434c179ea
 DIST libmba-0.9.1.tar.gz 290080 BLAKE2B b46890229c1cb1c0e6a2f7c41234f46fb2e590316182944c0850d0fad098c968a738bec434dd82b3c1d831694ba9fc99719f525d83a2bae645ee0ffecc8619c9 SHA512 28696e6066cb6c54434e1a35576c1e2430e3b83a478fddeabb20ddf1d8b889edac023de15090762fb95a759ebb9d2d8fcf1b0d19ec22f6a98ef2780400456da6
-EBUILD libmba-0.9.1-r3.ebuild 927 BLAKE2B 6bfbea308623c999b26e75b4523b69ec2e5006447bec8395c2aee93f73b42d0ef3d725f1d3c96cd883d6a1f612a49fd66c4a22b8d5cf696050083e2d5a5af042 SHA512 a2ae9152465e41888b4226773b65dd301762c2b023ded2b2c80ffeeeb9bd558e71b6bc391ea839a9881105395c007dc53c53ad23ba8b841aa7781d4c890036f1
+EBUILD libmba-0.9.1-r3.ebuild 982 BLAKE2B c5bf723630cbbe32acdc50b88cbed52b9669cd362a632c48db4eefc96759a2d0efb539933a1362a4f2580414a14a848eac57e8ca140328a428c6587f237617c3 SHA512 608a53c3ce57b6297dd4d835e4f0c5120e82f6fc8397999e100889fb665bf000a1b9adf85306d89d09de62562d488029b9628bee4ccd020503549ad784b5b8b7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmba/libmba-0.9.1-r3.ebuild b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
index a44267d1dfdb..b0ffe135dfad 100644
--- a/dev-libs/libmba/libmba-0.9.1-r3.ebuild
+++ b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
@@ -37,4 +37,6 @@ src_install() {
 
 	insinto /usr/share/doc/${PF}/examples
 	doins examples/*
+
+	gunzip -v $(find "${ED}" -name '*.[0-9]*.gz') || die
 }
diff --git a/dev-libs/libmissing/Manifest b/dev-libs/libmissing/Manifest
index 09348dc29f89..9565b74f7ade 100644
--- a/dev-libs/libmissing/Manifest
+++ b/dev-libs/libmissing/Manifest
@@ -1,3 +1,3 @@
 DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec
 EBUILD libmissing-1.1.0.ebuild 4137 BLAKE2B 59aafb31b190ca6ea857cbfac6f8f33a60cbcaa22c1ba316abe516697b379ad71b8495415f7473ebb388f1b6261ac676281d48675ac55f6c81a9cfef1f145305 SHA512 e88fe685af2b37dbac4ab3bf0346c4d48874fdeda028152dbeb241cd062005e7c35a262d2539e2deedff7576c15a1af5e280c30883e5ea5ce931e5ec4200e321
-MISC metadata.xml 393 BLAKE2B 8fdadb018197632713de833a7b64d961fa8ce1b86db6996fad32484fa09eda403a7bbcb50d3502ac02888b44d56971b0241a9e0902366f10d79017d50e46289b SHA512 8b5739afeacf385f9399745c6396506060f425376e47e0fdc9ca05c59608dd9e82bee2dc385f34c27f96ad8df41753fe05dd90886a81f613a910c76d50bae422
+MISC metadata.xml 244 BLAKE2B d3ad2c32ed36561363ec9f9697a9e8cd7520ffb26089049fde24c0bc6888acff04292593bbc2e6d9e893116c770e1716cd40f52180bd22141410b5a3a532b61e SHA512 5c201b4ac1b9f4b0fbe93953e066c630ec8a7392c1eb6b03e71a015b59f8d7ac53f860da23698027c602df56ea081048157a393e69570a9b46ea4a4aa50357a5
diff --git a/dev-libs/libmissing/metadata.xml b/dev-libs/libmissing/metadata.xml
index ac8fbe340454..5cee1da3a9ef 100644
--- a/dev-libs/libmissing/metadata.xml
+++ b/dev-libs/libmissing/metadata.xml
@@ -5,8 +5,4 @@
 	<email>prefix@gentoo.org</email>
 	<name>Prefix Project</name>
 </maintainer>
-<longdescription lang="en">
-	libmissing provides missing POSIX functions using the gnulib sources
-	as library and system headers.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index e9192bf5b9eb..d298ef3432d4 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,8 +1,9 @@
 AUX libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch 831 BLAKE2B 552140cae8b31f796826487319286fc5d59972e2036bb33a8a2c6febcf0fc8fc8bea502a0d5aa3d00e0028534c1891e19ba92ee0c4071ba3fd8b8fd9bea5158d SHA512 8f572b47fa62918be88dc11028a916897aeda46691b5b4975f87227aad2141fe472fdcff3431d61c42cdeb8322aab1e065d8ac155f2f367f4c28a6ae97799271
+AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf2420f8a9f1c90010e9b40fd4234a6c6603857f463de7d469a1e2e148bdf1ac5dc620ddfc622b2fe6da64f52f9756b2e980e529a78d519bcdd9ef36cf6 SHA512 b4e35ea2cb241a48ce698f7fe094a9a55b0c901f3a9f613a308898714496c4b3b531380d81ab34651b6f24dd877341eeb1c694120d420096854daad03240bd01
 DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcbbf3f46a254e1e6982ba0e6f41443bcf70d1b944cd68e7eea7a0247dd478777afcebb5db80742312149f52dd86bc4 SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
 EBUILD libmowgli-1.0.0-r1.ebuild 486 BLAKE2B db77100a9b1cb80ab0ebe85361a3cfea16ee3d5b6ff2e88c177d88012bd10ea42efbfee56628edff10a397b2c446e18578ecb647f0608309a0de3cf324363a7e SHA512 91ab512aa3ca354f648c277c67728bbb8a5c4fa151f26989e23b7aef96058bdea4a10c7b6ac84f20df0873b339621f75ec5a20a2a953f2df3d941a4b81b877c9
-EBUILD libmowgli-2.1.3-r1.ebuild 865 BLAKE2B 1de5be867d01c3414202ca7fa5489a34ad5ff2890769c3ee9a8f76c08655142352cfd5d0936f931d78498cc5956a8cfd584c0ca775662cbfe542b00189830f95 SHA512 41e959de5c820bec3bfe29b9db71450571915ba460aa8c755616a32edceb235fffd6434ee3575998941da1f63e7743c260cecd7e91b882dd92adda711c995428
+EBUILD libmowgli-2.1.3-r2.ebuild 1101 BLAKE2B ad30f4069f29175a3c6264d1912552d6233acd8ded90f74981ba3a51d10467566c450cc7c38f5607c8f50d7869cb255c7966da65337ccb94d34ee61bb7d3f9dc SHA512 7b14216532d8c2c870e8029671e48e9cc62657138f403b64f3cc0e0dd1aef7fd25e746582d4ccea6d23d633db2fa5d373594ea3e3e2c2d90784b739d53f4f883
 EBUILD libmowgli-2.1.3.ebuild 768 BLAKE2B 2ba06b85fb6c734b51d9aca2acceccbbf064bed72fc96733f041216c4b6f524b78abc1fb062cebcdf405a5c1f886666930354fd12a67d87272fec0c0cac45fcf SHA512 e273b120af4cac325069cc9a50e90fdc1aa2e694117b9a0ae18e81e91e2e50fd85b79e8963286bfe4ef2ac10c9aa4711884a5e8e97e2e3bb970f523e9387313c
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch
new file mode 100644
index 000000000000..e49e7c2c99b5
--- /dev/null
+++ b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index dfebb14..b3bd072 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,8 +36,8 @@ if test "$pgac_cv_var_PS_STRINGS" = yes ; then
+   AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS struct exists on your platform (likely no).])
+ fi
+ 
+-AC_PATH_PROG(AR, ar)
+-AC_PATH_PROG(RANLIB, ranlib)
++AC_CHECK_TOOL(AR, ar)
++AC_CHECK_TOOL(RANLIB, ranlib)
+ 
+ LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio"
+ AC_SUBST(LIBMOWGLI_MODULES)
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
index 2597f8dcc4c6..4158cb1b6e2c 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
 HOMEPAGE="https://github.com/atheme/libmowgli-2"
 SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,10 +22,22 @@ RDEPEND="ssl? (
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
-PATCHES=( "${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
+	"${FILESDIR}"/${P}-use-host-tools-for-ar-and-ranlib.patch
+)
+
 S="${WORKDIR}/${PN}-2-${PV}"
 
+src_prepare() {
+	default
+
+	# $(MAKE) invocation will handle passing down flags.
+	sed -i -e 's/${MFLAGS}//' buildsys.mk.in || die
+
+	AT_M4DIR="m4" eautoreconf
+}
+
 src_configure() {
-	econf \
-		$(use_with ssl openssl)
+	econf $(use_with ssl openssl)
 }
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index af46af6f69bb..5b276bbca63a 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,7 +1,7 @@
 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 1628 BLAKE2B 7eed7ee09b23eda38cb2f69905a4748bfadefa66cdaf70e6907711b091b6ee8b4c4c4c3c9052c9586d3da3ea8f8124517f6b0b55a11e36f1d49296cbb3122824 SHA512 0c763034caa4f61c4e253bd80a6fc5b24728c8bf4d3eb52943ece7efc9cfaea5971292280f1e7b46a2dad42e5aa792686b9626ba12ac515a0c3982b85652bd26
+EBUILD libmspack-0.10.1_alpha.ebuild 1626 BLAKE2B b927189ca32e2165ea5767e8f4ce8dee5913a1857b23da1ad70bbf11373efc50634a889578678ef96a6eff52e75ff7349dba5bafd6d77b3504ccc2b9498bd2fc SHA512 66ffcad19d658bf34510fbf15791edb710b4cdab9c6300bc67bb33d3ed9a73e4b539f70ea0bab94ab5a8c36de1a8965eddbbc3aac49feea478f0ede375a5e9c5
 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/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
index c6e935f2e544..4301f43b21c4 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86 ~x64-solaris"
+	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"
diff --git a/dev-libs/liboobs/Manifest b/dev-libs/liboobs/Manifest
deleted file mode 100644
index 1c33bed74d7f..000000000000
--- a/dev-libs/liboobs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST liboobs-3.0.0.tar.bz2 344118 BLAKE2B db4bcee51d6616b5d1e53fae964ab882db5d38fbae2bfe61a154dbc39f0f7b67d7f6ac939f01aaa64ad71e8be2ab170fe7cda56afd7ea929794dec7199b81e8f SHA512 67191294059fc6669bcad0d7e07669b1d9f1aa59e8a56ba8697051b901829bc8ef0ac9efe654160ad722884c9a0a80214e4bc989a8a77269bef0999b3fbaad9a
-EBUILD liboobs-3.0.0.ebuild 702 BLAKE2B 0e538ae14d5f09b642ce2ee7dc4a59c55659e58a4137e9be49736820f095985ddb700ce2e91a536a5b0257f70a6beb819531f226480e132c32787f250628008b SHA512 eefadfd32a3d3e41247cd6fc28fc0803cadf9b488ae0193c9bf2c94ff0b308340f146c45131f737e7881890ac9051f92a4f242bde02cef1970f275ddf654ca28
-MISC metadata.xml 535 BLAKE2B 2feee3a77b39936313044333627b9772ebac8adb4ce2a971a264dddb4b2215676973a0a7e1447326c4016cfdf6a761e5e4d6dbe9ad7ca377f9d43b6bab5ca9cc SHA512 ec23567687491fd8b5ba96288f01c8564fedcedcf732e70806caa6e2b067d685af611fd8e8d1bfa33222d1d9f8882cd85c92b2dcdf9449a1e407d7b514257efd
diff --git a/dev-libs/liboobs/liboobs-3.0.0.ebuild b/dev-libs/liboobs/liboobs-3.0.0.ebuild
deleted file mode 100644
index bdc9cd6ef76f..000000000000
--- a/dev-libs/liboobs/liboobs-3.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="Liboobs is a wrapping library to the System Tools Backends"
-HOMEPAGE="https://developer.gnome.org/liboobs/stable/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc sparc x86"
-IUSE=""
-
-# FIXME: check if policykit should be checked in configure ?
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	>=dev-libs/dbus-glib-0.70
-	>=app-admin/system-tools-backends-2.10.1
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--without-hal \
-		--disable-static
-}
diff --git a/dev-libs/liboobs/metadata.xml b/dev-libs/liboobs/metadata.xml
deleted file mode 100644
index b2615603e995..000000000000
--- a/dev-libs/liboobs/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>lxqt@gentoo.org</email>
-		<name>LXQt</name>
-	</maintainer>
-	<longdescription lang="en">
-		Liboobs is a wrapping library to the System Tools Backends, it will
-		provide easy to access GObjects to system configuration details, like
-		users, groups and network interfaces, it will handle sessions with the
-		backend and data consistency too
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 259c04ad0436..d2d6400ef903 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -2,4 +2,4 @@ DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.31-r1.ebuild 990 BLAKE2B a9f8efca4c9eb61726390339a7caac4ffe8f2ffa65e3e7bc7886fa1ea8e526ca41e04ce7e8647ba0f6eb99a3d3ad609c72b29455e3fcf253f2727ddd3f5cec71 SHA512 42ecb020a438fe3fee377d1c3aef631c991a2985b840da07532e9abdd9fba46ecf3bc9127a8a6436611e5e399cdcb815bc6f9a5e7f190048003f3e632d57dc92
 EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B 534907ee194eff327e07f903df0f5dc5728572b013fca29e583aa3df3e852db91c3145f2f2d604b0017963d8423a0c946c2eaeff93da0785f486da939e055047 SHA512 71e1d1a579943fe2b1d53c22ed23c579745ab3d4d058033d7a789563ac0ead400039232472a116ae9abb7ee83df3421d7a43dadbca187567bd8fdac2157b3e86
-MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
+MISC metadata.xml 334 BLAKE2B 24f4025b3aae0eced15612fbb46aecd98b56aafe85a4d86d28d88bb323e5fa5f10dabed4a31d416499fefeecf7ccbdc7f4b64ad4e7e01d6dd9fe6f181fb6dcb7 SHA512 7a9ba196d23359e5fcc0b37da80ce8962f16bcc64bfba1eb2fb547dd8afc95695a5518048691de673c1db4a1b2c4be5e9b869c2e67ec65f5062fb65b89573fe6
diff --git a/dev-libs/libowfat/metadata.xml b/dev-libs/libowfat/metadata.xml
index 433bc64fafb4..35e6645b7362 100644
--- a/dev-libs/libowfat/metadata.xml
+++ b/dev-libs/libowfat/metadata.xml
@@ -5,7 +5,6 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<longdescription>reimplement libdjb - excellent libraries from Dan Bernstein</longdescription>
 	<use>
 		<flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag>
 	</use>
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index a69781443359..ca62609fdc3f 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 938 BLAKE2B 7dc85b3341b087fc97ee1eb6b34d1b067f7fbcaecfc080fef9741f64593dcfae4fd6186ab6805e6080ce9513b2691eb36f37a2851a0231b60290e3fc8a6821e4 SHA512 fa6ba1dd5c1114c073d8aec20ca766c85dc75c97e3e46c4846e23b763b93366f0f743cc0b8eceb7fb60b67fd18f937663c6670adb1d7e0964f41cd72a1eb71bb
+EBUILD libparserutils-0.2.4-r1.ebuild 937 BLAKE2B 8f702013bf78c4771326fb56cf0bd41b0a07efd1c108c807273a55eb7cbb5a65eeeff7cae424294a85372c52047023fdffe2989a5cb55da109c283c371808cb0 SHA512 ef7601781b20c47c8f7aeff69aecc49f06583d62abc6ab3662ea9f76f39720611b3c987887f1bfe7f19e0d5f979ee1996619d8b732c36def7220c91812f255ed
 EBUILD libparserutils-0.2.4-r3.ebuild 863 BLAKE2B b4a23d57d3849a22d2bc818917273bbedbfb1ece5b66944d51b52626e2510256c435eb8a4f9ef6eda082b91dfc99a3236168cb8e5a1ac719977b758a7fc1843f SHA512 85a8db18d2ab98b3f083c69de61145611424f27724da5215901f1ca192af94605853fcead36da06a721738fad7e322d9e6df6cbca9a89a956e20d5a61ae1c617
 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 41f74a09eb87..b20ac07e4842 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 ~m68k-mint"
 IUSE="iconv test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index ce8c957e8abd..952bf0c27d71 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -4,5 +4,5 @@ DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa16
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
 EBUILD libpcre-8.42.ebuild 2569 BLAKE2B f0dfd202675e5f247d830162967a57692b10a85370e77303bab3f7e0f4a18912a4ae35a0fc017447d2b264d093ebd72477a62b50a9084a251f595c1ee2be5e37 SHA512 a843f1750600b74cc6760dbe9de5acd43161cba91aa17b11ebb99df9f6a6e5f6d025e4987b4f982b1b6200bc226e5746f87332196bedde01e58d8fb7144d95a1
 EBUILD libpcre-8.43.ebuild 2587 BLAKE2B 8b46e88fb2df8c2baca19db226d61d7dfb50ff13a5184e8f077e7c92de1840f6f559907fb1de0e08d52e4e00c9fc10ae405577fd5ce9314465cf174d3106c5ce SHA512 c8862ad1f85b3d0a4e5a36050987554efcc0c5011c22e0fe19ed9de98bcaf928968a82bd55bbea2d5a177ed133074e377f8e6099e888a4a39167003b2ff1c69e
-EBUILD libpcre-8.44.ebuild 2607 BLAKE2B ccb9b0e11c01b4fb12ccbb72c24c5f31cd0392b14495f7c443e64d40b67315d1a1373b7e27dda56513e251b11083f3bcbd561974708bc20100f8b6c2bb6db3c1 SHA512 3ad999642d83ac2133ba4744fc7caa8a12e5e7efc15211b7674c31e9cb8d00857182faba5ac68382a976faefb9e2ed16b7ebc1688aa154b7d506167710d3608b
+EBUILD libpcre-8.44.ebuild 2605 BLAKE2B 14d33e43325e2015d6256e73738a30f90c76543771d9e1b5eb829163ed81d1391a03bd3322ccb3684fee6fa128daf225164a7e5eafda570796f63da87cbdeb65 SHA512 ba2cc8b95510c5ef477d1cd55b4812ee379d8db1b93b0e5280c8ddfff19e1469464791b340ec300e2a7221fb5f207dc5320e49fa7c870efe62ba4c3e904b83df
 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 013ed8025dd6..4414fde35e73 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 ~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"
 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 1b1c73fdfcbd..5038ae32acf0 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -2,5 +2,5 @@ DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec
 DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
 DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
 EBUILD libpcre2-10.34.ebuild 2533 BLAKE2B d37125e2860a9477770133820eee44d04d686771c72ace1a0089dec3d06b06ebcc6d2ad71a43f67a4b64c71d6836c7a5134a6ef2a33ab121d8bd4f938f10d9e1 SHA512 f6c09ed783695ad41e6564d1606a3444b6c2fbfd9ba643ab5287a93779fef6b0ce4407ce872ff54bca866897f58114048e938b4ffdd7b31af0fac49ed252105b
-EBUILD libpcre2-10.35.ebuild 2542 BLAKE2B fc94d449ecad26264eda49a4ed045885949d130b684b55695532f122ba5077f5fd9d6fc28c50b14fd70f71f3cf98c422f02d0612bc6270af1fafb79151126d7c SHA512 5eb8fe0bde342ada4234c785deb2490ae32641047b1169896224117df6d073936d2db6fda66b6d71ae4a5d4526422ba635ed80ff768496e343b16da5a0bb4c38
+EBUILD libpcre2-10.35.ebuild 2540 BLAKE2B 1ec8e89822b0cee2e43d790bb8993d1038209e3a8ba595f3d360c615790ee45503429d81d537ec01ce9be4f86c05b218e1d4247922b710e9e468d3214e3e473a SHA512 42ddc0dc7e35d383452750fef2afbb1a4f8560b4e838f97519b5aaacd78c3d24f0cd9e4bb6d8b509791a2fa831e33304559656ad4ff607c870d2f13df67f6ae9
 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 d5cbf94bdb0f..d57510107cb4 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 4f0b47d2b7d3..9adde6e2e744 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,5 @@
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
 DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
 EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B 33eead22f70496238c3a6f8b090545558ce421d3d1fb4bf64ffbf7baa316f1788c41d54e59144531d7fd018c45c0ece349086601319105c0d8e422a003a2eba1 SHA512 e9c95b7fa3251f5806c402ae61893bb35f8269f14b1f02f3a89d3da408fddd0825d8ed1166ae1780c3fa5031a2e99743cf554ee81869abf2214c977314e1a08f
-EBUILD libpqxx-7.1.2.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351
+EBUILD libpqxx-7.1.2.ebuild 2026 BLAKE2B b3c4317cebc6332b23c211b89bf06ddfd1e35d516c1e5b29bbc32bf9c1da073dd091f524e8e8da1eb7ae57a3b31331bd1f1b632f1aeb97b0f51f788b5fb773ed SHA512 67049bd0e8fa1af1566294312e3f75f5ce8adcaab0e53f0c9655c4b9571c17e3c85d6d3b3135616f85d89bfc6faf8afff8d87f1fbf91d87e6b07e8a2e0ba61f0
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-7.1.2.ebuild b/dev-libs/libpqxx/libpqxx-7.1.2.ebuild
index 1ce7f1510f3c..77dcda1c600b 100644
--- a/dev-libs/libpqxx/libpqxx-7.1.2.ebuild
+++ b/dev-libs/libpqxx/libpqxx-7.1.2.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/libressl/Manifest b/dev-libs/libressl/Manifest
index 0b0607beb8c8..250619157c0c 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -9,7 +9,7 @@ DIST libressl-3.2.1.tar.gz 3798341 BLAKE2B 25d4d0fa758d92fd781f39000e631d7cec0a5
 EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b04aea39fee7a509953f900d35f62d365896d3a2c7e5a53af943c184c362629c214147a5f4c3115833ba62473b85 SHA512 745a0e3f946ed03e90a876e78cab5e36c59b1c5ffe121499c0c149ad510cc47e62078bf62c0b43d7a0d2aa75c6103c1650193df8ec87ed4354f76080660f7cdb
 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 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
+EBUILD libressl-3.1.4.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
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.1.4.ebuild b/dev-libs/libressl/libressl-3.1.4.ebuild
index ab31f2041689..968f9b8418ad 100644
--- a/dev-libs/libressl/libressl-3.1.4.ebuild
+++ b/dev-libs/libressl/libressl-3.1.4.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/libspt/Manifest b/dev-libs/libspt/Manifest
index e5c0284c0300..85d38923c73b 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -2,6 +2,5 @@ AUX libspt-gentoo.patch 727 BLAKE2B a98df11f3789d5e8c2aabfd538210db025a59567286d
 AUX libspt-glibc-2.30.patch 233 BLAKE2B 4cc03c14f2d879566987f56e91c3f467120a7e49648c0814535c02b129e49f4d7185edac370f17e58428e180056dce31844a1accfa6503f0ebfde32c53571f0c SHA512 8f064315215fb99d7302b544b7a3da1c239bba21e8ffdc21b0bd05e496bb0ddd54ae5ed55c36b9fc0386026d007f19082d1eee95264edda1a124e9629c5093c9
 AUX libspt-rpc.patch 848 BLAKE2B 982a1b8d88e2a28cb6529dd4a6c2e15c42aa7f0b0bbe34d40d91a6bb45ee2667253cabb06f31bdb757dcec7d4daf066f1271aa33edebeadfda2ba341bdd39dde SHA512 ad703547047949aa338bea0bd211a7daa3448ce728cf754be6ba4c0a058e0ab631beceb044bcce0eba9fe606b741f530fb88909891b0e86ff8898cfcf04d6cd1
 DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
-EBUILD libspt-1.1-r2.ebuild 848 BLAKE2B 6b0e10ca243709ac309bd7797c1413fa2a29d7a4677300540e45dd563f83385ef54cb1ab529caf237ab87afc68bf8f1841ba4c36c22d909f42f8f2746dc4d341 SHA512 4587ee745bd24b4efaa852b5070ea4fb79c9b4440dbb7d8233c95e212ea05211c8d2624493775a5c0de5d303447e6e18d6ca15ae6419763e059193d437bff6c9
 EBUILD libspt-1.1-r4.ebuild 866 BLAKE2B 9cc05778431eaca782a70660f31b5b1283671eb42c77fcea4fcf9f10521b8e56b9b23098a0a2e09c4227942dac65260a63c9b44f6431d122f85c7200c37ceefe SHA512 2e71fbb8a15defc13c3af392da784c848961427d70f29db5b48936dba136a096a99b3e345852c0f3f6af2fde69cd6b96ab597cf4a079ed259fcdf074123075ad
-MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
deleted file mode 100644
index 6954c394f08c..000000000000
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for handling root privilege"
-HOMEPAGE="http://www.j10n.org/libspt/"
-SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="+libtirpc"
-RESTRICT="test"
-
-RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	libtirpc? ( net-libs/libtirpc )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gentoo.patch"
-	"${FILESDIR}/${PN}-glibc-2.30.patch"
-	"${FILESDIR}/${PN}-rpc.patch"
-)
-
-src_prepare() {
-	rm aclocal.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_with libtirpc)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libspt/metadata.xml b/dev-libs/libspt/metadata.xml
index 4b6896b6c4a2..6f2ca22da233 100644
--- a/dev-libs/libspt/metadata.xml
+++ b/dev-libs/libspt/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="libtirpc">Build against net-libs/libtirpc for RPC support</flag>
-  </use>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libtimezonemap/Manifest b/dev-libs/libtimezonemap/Manifest
index 62a2f8d0a87d..f84b95c2fd63 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 638 BLAKE2B 2e9ffc90fdc52982dea9cea9a7f31bdc5c9cfc12809b5da485245000913acfbef085ccf683e12b44e70e9ae202f53d6d5f798fd0c9dacf3f9d4cc9b7b18c8bb5 SHA512 ac3593e35c1eba84ccb946ad15f2e832281b32114e0127468248d6aa3ce6543abb35e067b5a570f409172acce8eec3524ff6e4a77678d98cd29b4f4186623be1
-MISC metadata.xml 566 BLAKE2B 01fedfbe030ae44dd6b98a83a49fb5ffdb7f91a78dfc7f6e5f041238726aef27b39220861b4ae4d9ec6b291734f0911ea7ecc051491b8818f8dd236881e221bf SHA512 df9ba788c73e608eb2dfcd2dd1d917340ac83e204d8ffc4e309b90035e1054faa9f107f3c8f2b398cabf988f100d886ac63a9361bba3d1fe22d4e4564f4dde5d
+MISC metadata.xml 453 BLAKE2B 0ddfa1215414fea50844dcf5a72a5de4af39eca0b275fb95cccef077ba2c3717f0fa94e77ab8afa30196cd9f8c668b06ca9d09b5ba0974507d6dfb5a740544b3 SHA512 b0cf55d87a8efc69b49ea0f172016de1d6d9ed3fa9b86fc3d9713a42d2a36b4886bb5973a352fe0ab4ddeec8637dfa61f85c536a367de0a38a5e164f025bce1f
diff --git a/dev-libs/libtimezonemap/metadata.xml b/dev-libs/libtimezonemap/metadata.xml
index 72451521d14e..3dbb34194df4 100644
--- a/dev-libs/libtimezonemap/metadata.xml
+++ b/dev-libs/libtimezonemap/metadata.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sparky@bluefang-logic.com</email>
-		<name>Matthew Turnbull</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">timezonemap</remote-id>
 	</upstream>
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index ee3a164798c0..fca05458b304 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,5 +1,5 @@
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
 DIST ltm-1.2.0.tar.xz 622120 BLAKE2B 1537dad7da5c14264f03280e9d49fa0b7e6c1c4924c805f202d31c60569b9e3bee40674301d67b0f5b049c1c2dc5ec71b6c566ff5c9b8168d16840b031acc400 SHA512 6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203
 EBUILD libtommath-1.1.0.ebuild 1513 BLAKE2B bf645873cb4e262f6244f1958369efe699b86480ea651942abe527018f846f1dc6748da60c42b1055ec41f86b25029efe5531a723aff7f24a5f77b6f257c6dc6 SHA512 8cee336bd78ba5392f3e595e76492144b59f241205aabffbb8bd790710333999e3a8fd191759aa99d5dc5f0f22f1f7f5d342a5b585d04b67667201799425f226
-EBUILD libtommath-1.2.0.ebuild 1586 BLAKE2B 8072e71caabee283462113e4dba929b09ac928f7b945cd29988861d8a1d7b23e9f4ad439a6f9fb004ab7f76fac15559191ac2ff7c79b17d3b44990cca20189aa SHA512 581e2d5fb87b484dd655d455bbc84a61a571379983bcb82c35528d75e9fc8ad49935c7c03976f77ab67c61cda478fc0cf78fc413581c2708a5e2b8a2b88393c4
+EBUILD libtommath-1.2.0.ebuild 1584 BLAKE2B bd745a6e56474e1a331966ef3543158297306ec8fde22164aae322f17822529bb27423b523c1f4ee18eb6bde22b33c4399e888e12e56e39996294fe2dbb88c10 SHA512 89d58d2435522a5e240ed3942da793723c77733f90edce7045c12c9b7bd47d6dc275567d6a062b8f01f2f6e895de09709a4e48f820469a3d4d610aef36c39dbf
 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 886477028fb7..e8d9134439eb 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/libxls/Manifest b/dev-libs/libxls/Manifest
index d446bd9e5f38..beca70622f44 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,4 +1,6 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 DIST libxls-1.5.3.tar.gz 442217 BLAKE2B 4aab9acfaab96cb25e00ada599f607e5f448820d9cb32605ccd51454fd9f819c1426810f300fbf4a1c7523d5409d6f4fcb08e827c95775f3ec95bc65d7f8315a SHA512 75943e7bd3f1dbc28cc50ff7e4f21a9b6a9c97299c7594e0807b06e0bca9cca3d83f3e52086950422d67f175ae0c7c677222a1f716c5297e2f072b8e7b4fc52d
+DIST libxls-1.6.1.tar.gz 443736 BLAKE2B 47ed31bb16a65c764ee5882435ce11701e51b6ee5f03aa57ee7991e5445dc477143df48d757c618043a1abd864c46dacedeb1a18a608db1d5ae2b8fcab4a712f SHA512 99d4aa911bc12a52698e11c0592ed8ecb16fa055d4634e6bcc3e0a3900fd8311bade70d2cc8d2f60abbe72d644b6f30757b284544ca589e85c35eeb6f158b8cd
 EBUILD libxls-1.5.3.ebuild 678 BLAKE2B 1fc9837da9af845430a516f4e5d16ef9454efd0cfcf3c40ac2f1ec0aa39b462617ff7f30396423fe079361e51e832324601f494ad63164671290a1220e8cc1b7 SHA512 124f7124d89918534327cb2e2c9d245d1614fd7b1d052b315f4d875363c320cb3f0c0e460459dc4fb3a6fd5ee88d2e5c7739e507f9b8d5406b90cbd9b32e73c2
+EBUILD libxls-1.6.1.ebuild 680 BLAKE2B 070063ec4ff0ad863a4b25731aa662a80f6e715e784d29506fd393506164f2d1d019ce10c9a1b030e767717d2dc2c7265623f05dab03efa2b7871b62cbbea5ef SHA512 d6fcef38bf9f374e22d4c2f3228a1e446d479bde04293b854f5603c5dfa93dbbb2121b521623960d2caf29f66019b6f01b746742e529465b125976631ba5247f
 MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.6.1.ebuild b/dev-libs/libxls/libxls-1.6.1.ebuild
new file mode 100644
index 000000000000..62b7241386cd
--- /dev/null
+++ b/dev-libs/libxls/libxls-1.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="A library which can read Excel (xls) files"
+HOMEPAGE="https://github.com/libxls/libxls"
+SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/8" # libxlsreader.so.8
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+RESTRICT=test # test driver is missing
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
+)
+
+src_configure() {
+	econf \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index a81d9c7308de..c559b54615f6 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -10,7 +10,7 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 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-r1.ebuild 6816 BLAKE2B 00759ab3637075af76694d3a4233f33f69d506643f2d278c0eabc74d42002203676445d58ccba1f44c336ee401243aee2ffc1c5f70fd0ae6c22265a8086afdcf SHA512 3ad9ebe99fcca3af44036746d2a40d749fbeb9b35635542916a4a85e6b4038ea5fe9f4f956df1d9b46fff4cf1a3bab9af9906d0902e5acf3c9bd05593a2c72cf
+EBUILD libxml2-2.9.10-r1.ebuild 6815 BLAKE2B 1c4619b182be59bc8448deca9af64fcd8aed9b23120b4dcb25bf592b9f7957f5902d7bc24fda73874abb8b0f71f6d16662941d1b1096810ade59a46a995b4e88 SHA512 71af1ea794074a405e5e5e046263d1d3510e157b25cbe84cfb7c0463d0a71f5845ac54333905eb6ec4ace24f57b77f5acf97acb53cefc991a85c90ab710e7fa2
 EBUILD libxml2-2.9.10.ebuild 6816 BLAKE2B 7d1574df705961e96f314c4e64a05fff9930c01164ef006e28466ea57327558db7ab1bf698798a0182d0bd3c45e15314ad78515c1651b3dd53d14209162be6e5 SHA512 517edfdc130d70de52b825c37d3ca36ecc0a4b04ceca5e7bde251d823dcf53b43ce08fced4bf06a940395fcdefe2f9ff93d6c67ad813c9ad9a6228232df316cb
 EBUILD libxml2-2.9.9-r3.ebuild 6943 BLAKE2B cfc351f4626fb77dec2032e57385fe0800d8ea79c5a776efb31549b7d7a1af9822762ae463bf08982988d740e693eeb4139c117e4a8dcb0b71bdb7dd1d8c3574 SHA512 be36f698c42bffd8d153806bef4e2820e5f8f0245abe4c5547986fab64067d3282227dccf16d7d1e475572abb952b1f57f16a4a311e18071a31a1bf4d7fbd7b4
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
index bf5c24e4ac2a..a7e1eb4a9918 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r1.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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 3aaded6d1f35..75fdb62ab7b5 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,5 +1,7 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
 DIST libxmlb-0.2.0.tar.gz 97521 BLAKE2B 7a47164503b5b682e2bb9d877622a7dcad06d40bf87d6a7cf9e21898d8444e610ba3985d6be8cf65068f0637ee44ef8678610315be2795476b2f5ccaacb098ea SHA512 cff4245a47a942dd37675921ba753858a3ee0572500a1cd7291d2a063fa7fa9d9157c167bf33694e4e0204504d7e88fbfd2873c4b9851247d6cdb338c2d587a8
+DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
 EBUILD libxmlb-0.1.15.ebuild 1228 BLAKE2B 8cfdb11b371d1c9b710147e5963003e47d48006b137b183ce8995a85d565df9fe681555000c366b4e944979400eb3306c903eacbf460b2615c52a4731b3a4611 SHA512 ae8f7237ca068cea6e17feb6aa0182a593d6d49a61cfd5a5b4a90aa013d4cb64109f983a728867450c4798aefce2dd1eaf0873c25bda356e431f770ead431a08
 EBUILD libxmlb-0.2.0.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee
+EBUILD libxmlb-0.2.1.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
new file mode 100644
index 000000000000..eef8b51f8641
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-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
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # libxmlb.so version
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc introspection stemmer test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+		${PYTHON_DEPS}
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtkdoc="$(usex doc true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Dstemmer="$(usex stemmer true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 096b76ff52e8..bcda6e9f5fbd 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -5,6 +5,6 @@ DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 EBUILD libxslt-1.1.33-r1.ebuild 3476 BLAKE2B 8c01bf27c646b31949d5c7ae74ad40df43ddc227f885757a331901c5d055f5d3d9fa09593556dca3a8f49a73f48981e8988d2756252feb7255a23dbe905e83f0 SHA512 4656d28fdd1b1ef9f6145a7bafe01e44a6c77480bd966958e48ddd4911ae43663a56e7365f5e48639a28f4e58e966616ff5bc7bc81fe2e0a3c5e02d646ac44db
-EBUILD libxslt-1.1.34-r1.ebuild 1570 BLAKE2B 6402a3f19caa0d545447eb54417225d4b9bd51d8d56a58ced09e8f4b2b00176fcb7005750ad13814d3b4e1dccbd9d3bc180bda42344efa5594cfc366b056072f SHA512 7d7c3091a9809814d3e1c0635d9966753aa75648316b6bf4558c5bbd4ceb36f9d0949bdf1c886ff82c3dd9cc948e1e92733da689fb9a433398473ff36ef4ec6d
-EBUILD libxslt-1.1.34.ebuild 3298 BLAKE2B fdc2468381664fde5436de91ab7bbf68ae349e5fcd96f5dead396a147759d27e3b77279921ef18a414b210df9ea0bcd38fc1dd5fe077f0ac2ae1b9b1fad69598 SHA512 be322afa5f6e0ade4d11e3996be808bca0313d9752c304031d43891ee388427115d298b739e09b0d4dbe1586b826ffb1529fc3cee6d2ce927a02ef93712c19a8
+EBUILD libxslt-1.1.34-r1.ebuild 1569 BLAKE2B 53889dddfff8f89a8e06131a57c2e48d1f6fe3a0e8799dc5241b29f74513a2fcc52a130d15386710fd3334bc870ed94cb6d1c0aabf1b6dfceaa98b3c5b341ca6 SHA512 9e7f57818be3dd997db77a940a8039b34dbc99d6201d4c90c28dcce59836658c17e4ea30593b7cbaf8cee237b695fc62cf45b594e68e480b24bd9bae736b48c0
+EBUILD libxslt-1.1.34.ebuild 3297 BLAKE2B b84091f764ebeb66ba56333d86f23704a6bb3a9ce6aa0b70e4d8aee00e3027dbe49f57a395bf8b1f97121e3e382c08e8c7e5f624b3ad49d8a5af89597ec626f8 SHA512 5a4249a65ad9536b6f842789e30070697f79f9d0dbb397a63bb7064dad18afccfd9abd3ab60a145be586871a82df4eb3d576b8d52cb8743e6857a54edb87da27
 MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index a444fb79effa..f5c38fbbede9 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
diff --git a/dev-libs/libxslt/libxslt-1.1.34.ebuild b/dev-libs/libxslt/libxslt-1.1.34.ebuild
index 310ccc749f6d..cbf9102e48c6 100644
--- a/dev-libs/libxslt/libxslt-1.1.34.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34.ebuild
@@ -14,7 +14,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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index 461983f86418..9857dc6fbf74 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -2,4 +2,4 @@ DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196
 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
-MISC metadata.xml 396 BLAKE2B f55ccf30afa81617e23963e2bb96cce1db4e06982320b1b53213736a79c15431da54a7ba2312c4b60226b881553d6470c0fa08a1ea88152789254208f302b64f SHA512 a373090c8dc67e0bafec51ee673e9a3c15821c7079061335ab95ec2c87cf629f57fc172fb8e17989a709b4770ab42537f87c22ac065cd24fcc1ca88a2c80bf76
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-libs/libyaml/metadata.xml b/dev-libs/libyaml/metadata.xml
index 8a69437d03d1..cee379b15409 100644
--- a/dev-libs/libyaml/metadata.xml
+++ b/dev-libs/libyaml/metadata.xml
@@ -5,8 +5,4 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
-	<longdescription lang="en">
-		LibYAML is a YAML 1.1 parser and emitter written in C.
-		It's in an early stage of development.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 6b114d5f8de7..ad49dfe12f15 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,6 +1,4 @@
 AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955
-DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
-EBUILD libzip-1.6.1-r1.ebuild 2288 BLAKE2B ac0aa25a70174fe99977e49f70beb4876a221e884411bc69fe8a4a570a9a207a2ca578c0064a1c22ea101cb8aab0e86907df5b629f2509230984cacd14aa4814 SHA512 2412dddca1bcbc6d3c5ab7550980f132ceec5d56bdcb3875a27feb539a3c648f522766fd68663d289ebfd41b8d31477751378b0e8c4371c08b437e9036f6fd71
-EBUILD libzip-1.7.3.ebuild 2413 BLAKE2B 5822b165ac56f503e6fee73215efc8121a73581254c2d68e9d50e191766df79ce2171ad4cd5f606f1ea76d98b36974eb9ebfac6645e643da6b6dfe8d56ef60c6 SHA512 3359eac6e2432bebb5ca51f5bf868f14043a401b8458d45d9cb9e16a05b564829f47a07fea728abfda1f067c293a9d229ed62b92071fbd1e09bad1fcf23b97d9
+EBUILD libzip-1.7.3.ebuild 2411 BLAKE2B aba7f01e2cd8b8fbe4c0898c48dd16fc610ddf32b507320bc4af2a7a958ac4eb5cc74ae774c7195704b0451f4a9e0b3b579fa84b65c5d0a6da5eaffb0b565147 SHA512 db47ae37eb8de90e5a858a5d1cb3b45083604143bea55996a781aa6efb5e26360cc8107f86c552c1be0aee2463d4227df9a04b0f5f20cdb972bb533a8c82aa0d
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.6.1-r1.ebuild b/dev-libs/libzip/libzip-1.6.1-r1.ebuild
deleted file mode 100644
index b8389696d925..000000000000
--- a/dev-libs/libzip/libzip-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multibuild
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-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"
-IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/xz-utils )
-	ssl? (
-		gnutls? (
-			dev-libs/nettle:0=
-			>=net-libs/gnutls-3.6.5:=
-		)
-		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
-			!mbedtls? (
-				!libressl? ( dev-libs/openssl:0= )
-				libressl? ( dev-libs/libressl:0= )
-			)
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Upstream doesn't support building dynamic & static
-	# simultaneously: https://github.com/nih-at/libzip/issues/76
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_EXAMPLES=OFF # nothing is installed
-			-DENABLE_COMMONCRYPTO=OFF # not in tree
-			-DENABLE_BZIP2=$(usex bzip2)
-			-DENABLE_LZMA=$(usex lzma)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=(
-				-DBUILD_DOC=OFF
-				-DBUILD_EXAMPLES=OFF
-				-DBUILD_SHARED_LIBS=OFF
-				-DBUILD_TOOLS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_DOC=$(usex doc)
-				-DBUILD_REGRESS=$(usex test)
-			)
-		fi
-
-		if use ssl; then
-			if use gnutls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=$(usex gnutls)
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=OFF
-				)
-			elif use mbedtls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=$(usex mbedtls)
-					-DENABLE_OPENSSL=OFF
-				)
-			else
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=ON
-				)
-			fi
-		else
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=OFF
-				-DENABLE_MBEDTLS=OFF
-				-DENABLE_OPENSSL=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild
index fe0d69415676..b79772c27f86 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/light/Manifest b/dev-libs/light/Manifest
index b5e490d5d5bc..e5d78c0c8d85 100644
--- a/dev-libs/light/Manifest
+++ b/dev-libs/light/Manifest
@@ -1,3 +1,4 @@
-DIST light-1.2.tar.gz 32592 BLAKE2B 86d2bf4a88cf61ec1b7af16510db3d26698397d5cc3ddee7f663c1f501ca6b5bf238e5f29f17142d6196908e1d444795abed41a12560c9411214d4a874c96ddb SHA512 3f876262a730ef34219e0d596065c725376218ca88a2e9f56f62a25956b9ba505168f32c5877715abf746090c053873322a3292680055cc2f5b77ec8c0d466a4
-EBUILD light-1.2-r1.ebuild 582 BLAKE2B 5b6009e2965b320bc7d391d417d49f7d9c7c2e7b209eb5f3d8bdc07a1be32b820a79e903859dd67a25fa003b334b36e9c4d777b0f99556caeab5287aa604e6ba SHA512 3a2ab39a7c4d99c2c987a7d92dc74069465d67630ad83650f9b4e4249cf2d6f52c8cc0c3cd8748b436cee329f7cb2355702385276cb9e6b5a767bf7ec81b14d9
+AUX light-1.2.2-fcommon.patch 483 BLAKE2B 466c16e726297c4b32d4c3276465d7f8f8dfd74e2a646446a6bb3a8c1168c0d81ed0c7076882660623c93f471b21ba4144144ead4fda286aaad19187030ec9c2 SHA512 e2b1662d20d9ee04b7fec20fbbadc4be1383edc7af661500dde2d11a76afe0e0eb334b4f5a1a6a6e83309478af1216e52a782a93e0b51f0afce3aae59b8c1dd5
+DIST light-1.2.2.tar.gz 33009 BLAKE2B 6e23d7f89c1dbf412943f2b60a09f9189c5420649397a286fa964d249adb57cafb2943ef610dd13470e486d9dfb51ca40289d9974760e907f794baa27963821d SHA512 5815394fb1545d1e06234c261d475e1836e4c43e47e7707b8628891d20b70db04f1661b78ca1d236d549c734430b606498fa46de060c854791b13cf49de07b59
+EBUILD light-1.2.2.ebuild 690 BLAKE2B 3182a88b9fdcb68e375dd63115ba130e5dfc73fe529ae56772eaa8962de24c982f2d9451fd5fd2837701f26a9477b05c920b0685e63ebb53ffb407ce2e60a2f2 SHA512 2c0b5dd73ed7ad4346345f931e10079102e466c230d7875056b8bd9414367b833738a24d31d99320d9e3745d2dafd3ec6066d8721455a4f1a61b878bd7669b60
 MISC metadata.xml 355 BLAKE2B 87de7a4fb6653614915e68daf6b4acf751c6e0a27b156acb5f442bfe118496ec975cba6edad9c79063cea8811a0692991d74a3d179f3ab50b538bb1f41de9e03 SHA512 9dbbe3645a35e946fcac945c8e1aa52500393e12b44db82fa8eb0fb804109b045081ba9ad808b7a5f52a9d2fca7ae303b7af7093591096f2e11c6bb47768ff76
diff --git a/dev-libs/light/files/light-1.2.2-fcommon.patch b/dev-libs/light/files/light-1.2.2-fcommon.patch
new file mode 100644
index 000000000000..6f37fc4d4114
--- /dev/null
+++ b/dev-libs/light/files/light-1.2.2-fcommon.patch
@@ -0,0 +1,22 @@
+--- a/src/helpers.c
++++ b/src/helpers.c
+@@ -9,6 +9,8 @@
+ #include <errno.h> // errno
+ #include <libgen.h> // dirname 
+ 
++light_loglevel_t light_loglevel;
++
+ 
+ bool light_file_read_uint64(char const *filename, uint64_t *val)
+ {
+--- a/src/helpers.h
++++ b/src/helpers.h
+@@ -21,7 +21,7 @@
+     LIGHT_NOTE_LEVEL
+ } light_loglevel_t;
+ 
+-light_loglevel_t light_loglevel;
++extern light_loglevel_t light_loglevel;
+ 
+ #define LIGHT_LOG(lvl, fp, fmt, args...)\
+     if (light_loglevel >= lvl)\
diff --git a/dev-libs/light/light-1.2-r1.ebuild b/dev-libs/light/light-1.2.2.ebuild
index ce2801ebb1c1..1e6fa905666f 100644
--- a/dev-libs/light/light-1.2-r1.ebuild
+++ b/dev-libs/light/light-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="A program to control backlights (and other hardware lights)"
 HOMEPAGE="https://github.com/haikarainen/light"
@@ -20,11 +20,14 @@ DEPEND="udev? ( virtual/libudev:= )
 		${RDEPEND}"
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-fcommon.patch"
+	eapply_user
 	eautoreconf
-	default
 }
 
 src_configure() {
-	use udev && econf \
-		--with-udev="/lib/udev/rules.d"
+	local myeconfargs=(
+		$(usex udev --with-udev="/lib/udev/rules.d" "")
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 0ba081fb8eff..82750533cf7c 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -4,5 +4,5 @@ AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f
 DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
 EBUILD link-grammar-5.3.11.ebuild 3632 BLAKE2B d0e14eb500342a137661236b1c4ed9ab67623a854b994cabe70ed3c3cf6e15e6aa0035380461c99ae4cc665f0921e92bcb995c264dc4d2547a1bd37c5ffdeec6 SHA512 b0e9264782da3b7bfc6aea75870fc7c789591eca23c442f29051dec5f28e0b8d5100f971e6eba143be14dfb27d06042952b469af5f6337d3c89020eea3112d76
-EBUILD link-grammar-5.8.0.ebuild 3183 BLAKE2B 7b2e16795d6f2b2258ae36a6e150fd87ca7891f2f2a5c467889f8322ab6307e34fe8cd9753d592d685238a13ece7faaaf98b99528a6f79cf194a6db2bb6e3f30 SHA512 e268634bb5e09bcfbeff498f161d47ab7e7d40390609d5da9844f7b4afb1145ed134820c0e267822707ae0ba444a27f6e3f96750c0b38b3476866c0b37f3b6d7
+EBUILD link-grammar-5.8.0.ebuild 3181 BLAKE2B 18941b1f0bd78512702cd4fb5cd213e1a93a4b911b341e8b1ab36fc7d5a14c935577bc2d07c12c38f56c5c9c539927c3793e00f51be95539b60a5741966883d5 SHA512 f6f44ee826cab91f012f18eb8a863955caf074ffe3fbf7b0d58211391f5d4b7ac651424083cdee342e26a7ea1ae9b8cc3f734fd7335ebc5610e799f91df0d91d
 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2
diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
index 6434d2d8be23..1ef3c88c3730 100644
--- a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="aspell +hunspell java python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index adf8e5504d8b..537f8dcbb9f7 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,5 +1,3 @@
-DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
-EBUILD mpfr-4.0.2.ebuild 1644 BLAKE2B 0e93bbe9c14f289fad63c5055eaee18299d4daa1297581f2bf8241e75ef711814de09a6ce6154bb1979b6e452c674d6a5a59289deb8b134752c4bf9fdc35c7d9 SHA512 7ef27262e6172f59c952e61f5b2433225066778a3b7a7d3114542dc8356de625e4a59361c0606d302250c28c23ea565990b70eb139a9d0633475d9d8071de328
-EBUILD mpfr-4.1.0.ebuild 1061 BLAKE2B 4a0c9209eea6b29eafacafaed858d004af966b52d04f1bd99cdd74e06de6546793010c71da5e2ae1210959b7e00edc5534a0cb834439e3c2d7e218998d8641f3 SHA512 f61f6bbc7b0234408d82cf79d3cfae660e2192dc9dccf828aeea633f1196e5f4569510474b3e4352134f23bc9c2054c7d5a3b5289411076a7d8cdfb338f80824
+EBUILD mpfr-4.1.0.ebuild 1060 BLAKE2B 4d0f9dcdef015199f74f86f7c7d3a69caff4ab2a3c371eb53573e324540c029381f8b47542fabb6d683681455807770c329817a244fb76a34ea7398b6e56f926 SHA512 1a3f47bac2a5050fcfeff0db74ce05e9168e17a73771c026147cc22264d3172c6dfbcb11bf67661b88e94d0a4664073acdaf1f0050c68fe41addea9a1fb90037
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
deleted file mode 100644
index b5731b6eb616..000000000000
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit libtool multilib-minimal preserve-libs
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/"
-SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_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"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-HTML_DOCS=( doc/FAQ.html )
-
-src_prepare() {
-	if [[ ${PLEVEL} != ${PV} ]] ; then
-		local i
-		for (( i = 1; i <= PLEVEL; ++i )) ; do
-			eapply "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
-		done
-	fi
-	eapply_user
-	find . -type f -exec touch -r configure {} +
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
-	ECONF_SOURCE=${S} \
-	user_redefine_cc=yes \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	rm "${ED}"/usr/share/doc/"${P}"/COPYING*
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 4)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 4)
-}
diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild
index bb16255e02e4..cc7640cfe2f5 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index b9efc5f7b756..62f35aa55e40 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -5,6 +5,6 @@ DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10
 EBUILD npth-1.3.ebuild 670 BLAKE2B 5987fb8075ac5efd02a1980ff28666e38326ca43064628cd8af7ee04bad1bd0e90768ddbadfce11f812618d2e8ee0fdbec375d978a89ef80e9d8cbb1bdb24e33 SHA512 25e0f26a55c970b4d2974668cc8452468e95775f17d6456310be19aefae343539f8cb2ac7d619481d2179ad9acfe3a2859c39ac28a084c1701dbe10ff928d3bd
 EBUILD npth-1.4.ebuild 683 BLAKE2B 046f4e47d204fc077757524f5892a6cce5b7c2cc6663b87ca87500d21b1669b3c86cb463aaab5888c69ff98856a7fd060b5e7242193757b5617b385bbad1b8de SHA512 37c5dd04b5c51de81c8ff8c50f9ac1ce260b77ec45869c18cb98251dc2f7b1862a9f0d7ddbe6b386d3d825a1f309e66ea9824839ed8011710af071be6d350d2f
 EBUILD npth-1.5.ebuild 740 BLAKE2B b7f39e56382f5ec10b21a1e65d89a7d8d9ee74e456b11ed54d8744cd40b2ee023c7dbc4aca842d3079364ff0112c636260733c50d16a714c8c538ce15f4cde00 SHA512 602fc9d468a8b382f22c703855ccb36053e1964c98af0d437ce47e2ab8bb82569f56b0077a0a9e08226c1f486fc10a4af91b5e405a1f88792037676ca6431462
-EBUILD npth-1.6-r1.ebuild 756 BLAKE2B ade7bfb1e503ba0486dad4fbf56df0541143916d2efd7f7c0fd1e13ec3ada37c7429762b1a7a4f3c9eaf9969909f5cd08362368b8ab17a209e442edc03016a83 SHA512 c05936b811c9181409258a7366e969e60da5e9282bb05c59a75c2d03393a896d34d5ad867d750227f9a157df2167d2ecbe3ab05dedf752b614cbbcc4a169a43b
+EBUILD npth-1.6-r1.ebuild 754 BLAKE2B d3eda618befd465fd6f3aa821544a806656e27e6a815fe580450e44f037066b96eb4b7002d2f5faf1c3a1e563055a3dc2c71bb3d74eaeb713369039b7b1ae2f6 SHA512 4261d0146757782d42cf9b5e5c07fd9d9ca58678910a2aa6dcd553f8d7f7136249270739ca0f70911e645db23065f70efcfd3fcb22a107906669f0b134d6e8ed
 EBUILD npth-1.6.ebuild 752 BLAKE2B 41971a4ca71f49bd3386c90c1423ccdc1a9d28208868adfe0a4dffc8dcc48f140150e3591036ae427b91a3e5801203df0cb963398de46579c012d79d707b0d33 SHA512 45030582cbeeb0611d97a7934205e4cc421c341c38c02df4fb13d18ae2b3d67231705ee793ad079aad40704311ee77f012bcd5bf9ac29e0f61b71f335756e762
-MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index 91439c59951d..7a38bb900964 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index b4b46cb59b2d..6ba87239e32c 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-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"
+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"
 
 src_prepare() {
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
index eb69cc9dc8ab..6d8195a7bb22 100644
--- a/dev-libs/nsync/Manifest
+++ b/dev-libs/nsync/Manifest
@@ -1,3 +1,3 @@
 DIST nsync-1.20.1.tar.gz 154106 BLAKE2B 94eeb647de2ca58a3f3837119ef30805f0a72a9d12c19aa705f815955723ddefa1de4d2a3fe5fd0b227ffdd70d5208ab9a300e40b2aff2591a1cef28c79b450a SHA512 d7b9be1052b7d11d896d3fade822f7b1eebbd0a772c9f6e2cd827921f1adc29ed18f7587ebc7d29623d230be384a7a2356c1da3abd53567fc934979d89c70e0c
 EBUILD nsync-1.20.1.ebuild 600 BLAKE2B cac757b2f36d018dd2a8e7f5c1d5273fb7dc3d30412dab74ffe3d606a036fe223577edb67cb3e08ec837bcca18ececd89cf62ba87557b34e9f625ccf8021e8c7 SHA512 f4b204b322b4d45a915608c17c00221ca122b48e360dbb8703d74ff3f5a5b1b524d00fac58b90d93b775caa80d0d6ba563dce4ca393486183711967d1e4f4f96
-MISC metadata.xml 384 BLAKE2B 62c11261ccb01d4913cd84ed44abed5a2ae13d362c755db7102cb412ff9c4b55c4dec5e9a5b71ac970cd83e676d2a806d20d9b5cd7f63e1051b898927b064bd2 SHA512 83954282b0ca2a61a49222fef2e018057b7d02c4d68bd826a81a96bfcb4371e60c8c90a4c792607b337885154fcad49db872351c3ec27266631bb955ede097cf
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/dev-libs/nsync/metadata.xml b/dev-libs/nsync/metadata.xml
index 2ab0dafc343e..76f45cdee0f4 100644
--- a/dev-libs/nsync/metadata.xml
+++ b/dev-libs/nsync/metadata.xml
@@ -5,7 +5,4 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-	<longdescription lang="en">
-		nsync is a C library that exports various synchronization primitives, such as mutexes
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/onigmo/Manifest b/dev-libs/onigmo/Manifest
index 7abc91caaee5..66ce046af7f2 100644
--- a/dev-libs/onigmo/Manifest
+++ b/dev-libs/onigmo/Manifest
@@ -1,3 +1,5 @@
 DIST onigmo-6.1.3.tar.gz 822127 BLAKE2B b2f020ba37c039022ee4ad0840006b7d84bd5c2b24975d3cc34a625379c478cdfacbb7247d5f2315da2e56beaa74fec5390140d4a3f0c29c66906d78d7207b8b SHA512 13ee0e97e5e7ea2a379cdfd8bab121ee116fc07495c6b3131621f6cd9b1748897e5e2c7dcf43845794b2ad4adef3b4076daf06f51aaf965e32cbac5d7bace1e6
-EBUILD onigmo-6.1.3.ebuild 874 BLAKE2B 262440b3e06a3956bfca717a13195f239952bc8a2d9ba39afad234ee548773c54ec2c221472b76000d420e8b930713d24a4f0192f17da8164760f1208844f19e SHA512 a9c29f664650d9ea42c3b8d6e4dc6bebb3395894545a86c8e1241c158cb6dda0d85f2ab08950a7aafc8d287a42b136f78a6bad00cff7698f64d635d4cf158cab
-MISC metadata.xml 607 BLAKE2B 0905f9762b2a1705657d992299cd1c793e019140257845437171497551028dc5056450daf14931e57621ddaac82216526fe0df101e08ac2e2deb26ca7467c4dc SHA512 6b734fe90fdb3ac48abdcd9941494190d90c1889ef43adeee93574c09a28b233c7eaa51b8600e2d220a3d1c54dc181e09c1a93a7d95eb76d25179faf6c9361ef
+DIST onigmo-6.2.0.tar.gz 844935 BLAKE2B 768918af337be0bbe9fd9c9f15a630ce0a74f081832ef84ba13e48f4e6ed692ff1250e20272c039d95bb4d9b847bfaac829addd7de3f50780b7620b1f105406c SHA512 651ab8c64d8b8c0d56e1549809030be79a751b9d1c06af6527f8cf6014fba1bafea593d572e1cf766099a10fb4e6506ca683ef48131f47471348b5cbd35a1a77
+EBUILD onigmo-6.1.3.ebuild 869 BLAKE2B e7cf04de463ef485df5f79c1ef3a3d9fdd82b1592511d67778b91e6a2cdfa20fb6304c1bd58fc954da6cd1fb69b08b899e2ad0e68153df73ab3c0212764fc12f SHA512 85f5a083ac4843c81a62a781d55f23e857c6c7675e7f33742c2544fa3e0ce783cd2c1844375fbf8e33c4f518ca999dacc07caadccc22512773d93b711c75e37a
+EBUILD onigmo-6.2.0.ebuild 871 BLAKE2B 3d52efc6d54a1f66ea9d9e927fcb19bccaeeb753a29fcf8d31fb57f87a2cfddddefac002516cb55c86b3b726ddb3832058c9f20a208efb1f0a66fc5d3eb4cad2 SHA512 b006179fa4f2b2ec957f546471fe994fb5b3946152066c33677a1898fb81eb19629e68354d8303dfdb323e8218b3ae999ce58ba7caf7e26dd3f870868d48cde0
+MISC metadata.xml 577 BLAKE2B cd1e0bd09e8b4a1f71dcde39b47a7dd78308786c8b9424111eddb3a6ba6b50181e6af722605db9cded62076434410325a795181a4adaaf2d837bcd74128dfee7 SHA512 7c1e07ac10f864fbc74ffdd4706792eb5978cc28449536900ab2c870d23e52f24c5de215b766238d0629cf4ef3cad77622f37e468b5295e57ec42f5912a54ac6
diff --git a/dev-libs/onigmo/metadata.xml b/dev-libs/onigmo/metadata.xml
index b1cea8c977b4..2914fe8f54bc 100644
--- a/dev-libs/onigmo/metadata.xml
+++ b/dev-libs/onigmo/metadata.xml
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <slots>
-    <subslots>Reflect ABI of libonigmo.so.</subslots>
-  </slots>
-  <use>
-    <flag name="combination-explosion-check">
-      enable combination explosion check
-    </flag>
-    <flag name="crnl-as-line-terminator">
-      enable CR+NL as line terminator
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">k-takata/Onigmo</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<slots>
+		<subslots>Reflect ABI of libonigmo.so.</subslots>
+	</slots>
+	<use>
+		<flag name="combination-explosion-check">
+			enable combination explosion check
+		</flag>
+		<flag name="crnl-as-line-terminator">
+			enable CR+NL as line terminator
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">k-takata/Onigmo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/onigmo/onigmo-6.1.3.ebuild b/dev-libs/onigmo/onigmo-6.1.3.ebuild
index 4c34afcf8ac8..fc5366e7b632 100644
--- a/dev-libs/onigmo/onigmo-6.1.3.ebuild
+++ b/dev-libs/onigmo/onigmo-6.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools multilib-minimal
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
diff --git a/dev-libs/onigmo/onigmo-6.2.0.ebuild b/dev-libs/onigmo/onigmo-6.2.0.ebuild
new file mode 100644
index 000000000000..43b020ab66c9
--- /dev/null
+++ b/dev-libs/onigmo/onigmo-6.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Onigmo is a regular expressions library forked from Oniguruma"
+HOMEPAGE="https://github.com/k-takata/Onigmo"
+SRC_URI="https://github.com/k-takata/${PN^o}/releases/download/${P^o}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
+
+DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} doc/UnicodeProps.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable combination-explosion-check) \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index a7759aeedbdd..c0c2d789b99a 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,7 +1,9 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
+DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced
 EBUILD opencl-clang-10.0.0.1.ebuild 956 BLAKE2B 832324fffa6d9cec20fe2a6ecc6313aa56d03378de7b5e74b4b3909caa1038834eaca5952694809b526bb900c93c0c58795201089924376942fd4f8d6361883f SHA512 d60bb6c2ffb172aa551dc94fbabe372b8ba2ada94eedea313767cda68be5cc0903f66b1768b32017ec2cab0125f430e74584e50a169ee37e6cf843280ad08c03
+EBUILD opencl-clang-10.0.0.2.ebuild 976 BLAKE2B dbc66762e5642ab5536170ca756c6ea3f3898f7afd259b1b972f3d3349c3d4a33cc23f8227a461bb3eb3e2d6973dbc21f07aa4895647697b9970c66ac8bf5c48 SHA512 53039c2ff047b590c8aa41ae94236518183566a24a5887c75c38ce864b450ea134fd58d2a5dc8936e03f2683cbf2abb357a4f14fe83929604b197a2733585bac
 EBUILD opencl-clang-9.0.1.ebuild 849 BLAKE2B ff47beb350350bae14ebcc1ead16831bed53855064681f3c43ff946cce77cd14117a97637f3bb7c18e9e3b3d6f91f7c9665eb9ea7927befa2cf01bdda3e6f667 SHA512 6176a5dfbd614ac9466b618ca50e4a4385097d2bb8520b85809327cc7caff722509c587532ac969883bb1deee24bdad96b1e07cb17131cd34ce4070eaff6a9ac
 MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.2.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.2.ebuild
new file mode 100644
index 000000000000..195bebafcbd4
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="10"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/clang:10=[static-analyzer,${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+	>=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[${MULTILIB_USEDEP}]"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=10
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index 2d705240a9fb..dcdd1df2f172 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -2,4 +2,4 @@ AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
 EBUILD openobex-1.7.2-r1.ebuild 1055 BLAKE2B bf58d40d55db3a9d51a0b032f3342b0ab1c7f6428db4de40aadb242a49f8bac3c5935c2e12a4d1450bbb9531311f4d6a1e138cffca2d71a720061ce62a4d44ce SHA512 1ad98eddb4b2ea6561add36053f42b7713747c96834c0111a68906ccf316ca74931b93f1e724ba1f4dd256c549e75a26e9f9c99d7ecea2ff0062367239369b45
 EBUILD openobex-1.7.2-r2.ebuild 1093 BLAKE2B e90f1bcf3c18d19114c7f52dfe168e04af5312f61b633c77df9994118ce9d68e5b419a34ea5e02bd361ab33f56261b42639346c4d2bd5ce680149922c1ccd81a SHA512 df464b66c3b92e73d7b662b3fb62cc6d062777f1dadfd1963af95feca2e7e7a90baf77d5b94ca272a4f8ad2a48be06675a8baef63aee1eb3881978dd122b8579
-MISC metadata.xml 550 BLAKE2B 4505f0b70a901fbbf3cebe1a066d4c9275853a7667abf221ff439cb6783f485c5d43a24c8abf05df5757a8578712fffbc8a1ff43e0f16f8f8507417e32654ef2 SHA512 19bbed2e27c2fd9ebf00552d3443d09bb295f81c7637d2d09850d5bfc6128f6f3a7642ae55760c36308f7fe333319d6d8324cde0fc75781d32a486abb32be4fe
+MISC metadata.xml 390 BLAKE2B 4e99b94506bfbb231f3c852ef5810db630a1bcc61406e7bd55ef424643f1bd4b4ff4acd30a291b6efdaa4c5a72d363dce7dc4e44e9f371683eb707b58541a95d SHA512 33e975ea200b31202c0751cd95f0e3757b9a7fcdd74c232e93b11c4d51458cc1780c4ba2a9c8b8cc85db7f245685b072b7dac2fd4644fa2719f9d2a6b7b673fb
diff --git a/dev-libs/openobex/metadata.xml b/dev-libs/openobex/metadata.xml
index b6f5436a0b06..9ec13c1ccabe 100644
--- a/dev-libs/openobex/metadata.xml
+++ b/dev-libs/openobex/metadata.xml
@@ -5,8 +5,6 @@
 		<email>bircoph@gentoo.org</email>
 		<name>Andrew Savchenko</name>
 	</maintainer>
-	<longdescription>Free open source implementation of the Object Exchange (OBEX) protocol, 
-used for transferring data to/from mobile devices.</longdescription>
 	<use>
 		<flag name="irda">Enable IrDA support</flag>
 	</use>
diff --git a/dev-libs/pcl/Manifest b/dev-libs/pcl/Manifest
index 77312162f1a4..eb2fb41a3264 100644
--- a/dev-libs/pcl/Manifest
+++ b/dev-libs/pcl/Manifest
@@ -1,3 +1,3 @@
 DIST pcl-1.12.tar.gz 384986 BLAKE2B f549dd9205ad12a8bd157b4e04e94e156f056e2190c25afcf3c9a0d4488d3e442f9cd3159c6ba68570bff61998b5d6b058c0cec5c57bfe00046379f09bf741ce SHA512 bf0168d8bb3bef8edc36085f6157661cc15f6587c847ed236983612e08955cd1fddcf2b95bbf6c04d275201aecc3842c2ab3679e7ebedb4f5fa9691c73771279
 EBUILD pcl-1.12-r1.ebuild 310 BLAKE2B c0ffd022d260acc7ccb0f34ac48c15fd629e1061604f55a8dc91e8a48995bff1edadf555ff998b77911726c974ba8004d4015bfdf1ebc0e878bd8fe97606b760 SHA512 615c2b1db77b03a59d3969a3c92bc12746153082040b495664a46fe182be7dbde871c38958b2a39fff937d25269625c49bb8fdbf480c9dc9912ad333fa6244a9
-MISC metadata.xml 312 BLAKE2B dfa077775d15071c5ec983c38cc443e693d0c2998b583c56a685145a523ee58cb473a872d418018e8366fa73e2cef4235315fc45c9291c93c5dbf4f1388d50d6 SHA512 e90839ce3cf7ce5848f665f2fb70b8ce8619db0c6b0b005f37765fc621a7bbec305680ea4d4cf10111220d390a622c00c43f239530640d3328fb7aeb64a58582
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/pcl/metadata.xml b/dev-libs/pcl/metadata.xml
index 1d859a5cde83..7a38bb900964 100644
--- a/dev-libs/pcl/metadata.xml
+++ b/dev-libs/pcl/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		The Portable Coroutine Library (PCL) implements the low level
-		functionality for coroutines
-	</longdescription>
 </pkgmetadata>
-
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index c917ef0a93f7..d5079102f779 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-wayland-protocols-1.0.tar.xz 38020 BLAKE2B 8064a526d3e3e4b36f7c612744285181ba96bdf4c0992ba7d164ea98e629b3456c7efedd2e3dbbf76a3cbd42664d91eea3e485bd67303e1db02964c7fc6158db SHA512 30ecbf9fbf9de7ee1d323fb43b0f4a05586e0f7d2c4d510e2300828e7a6a16e8907d8d2a835d4ecbb2d4d532641ea722ff6572403f767e0ac878b7fdb0897b08
 DIST plasma-wayland-protocols-1.1.1.tar.xz 38380 BLAKE2B 0dfeb13455932d0853084d87c8b385c7d4d51bf7de05325c0c26221dbb9c8966287146cbff6c4fe1ae45ce7bcb86bbb572852e53ca10c1aa8d00dcc012224f66 SHA512 82244fd9a6c25d8faa8aa64f57cb64ac8e589908cc3b0665ca9c8ce98bd42a8e9cae0f40484bacf3a05107c9e14613d1c9be80b363ba690d36c676ca62da8b9c
-EBUILD plasma-wayland-protocols-1.0.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c
 EBUILD plasma-wayland-protocols-1.1.1.ebuild 458 BLAKE2B fdaa37a70504a26aca77a38f81ab46428facd4bda3f1eb4250905cbb61a91fb039c4fb711575b60031d5287aa0848d71e17af85b8f37a13413ea3d44cd6b8c2c SHA512 45c8578c39c5f68af0b809e4be7b5a6aa21bb93226e0d0375c92e47dd0bfb137332614204f41cdcdb22a484cc22817f854d69ceaa86892f387fb1c9445f1de1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
deleted file mode 100644
index d5505ca30efe..000000000000
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_NONGUI=true
-KFMIN=5.69.0
-inherit ecm kde.org
-
-DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 3cff56052e18..a93b6926dd17 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -6,14 +6,21 @@ AUX protobuf-3.11.0-system_libraries.patch 6352 BLAKE2B dd224c42e13c08b3bec554b2
 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
+AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad0ce06375aedb36deeed3cd60a557e1d9972609fa5d5faa8e04c4d758a6ff0916f2a9d4c1b886a7197ded35501fbdf712ea985d442f8b43 SHA512 536b968f9a95d19236d034be3194b6d750dcb5619677817aaa5191a70370a646e4ad475a89592b6e96c44fc1ae380e782483afe4263617d7e03af2d5b06731fe
+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.8.0-disable_no-warning-test.patch 965 BLAKE2B 0183ed17104e192fbd9efb4739a41ec2d6f39e31cf6aacb141f4e5015335096321491d68748613ef18eacdc57437b111a15b5b4762b0b339c716b98dc1b7041d SHA512 37846745f1e88fda8dc84a829e266e8f8d2c98a075750b2e548fa2b8f34a97d37b6b5200e880fc29a9682fb95a8c75567b53bca532859068a7b379540940067a
 AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B 54115688e2fb6a7b8c33cd2efb4dddd777f4d536f4b078badb60d6e458766b69c915fe4091f4ca379eee59d75875bcab9837a96bc461b6a60c15b93000fa7e38 SHA512 2e18b47aa82a035a76c45d6f80de7818449f6358e0e253cb6330158bf9d5b213052b372797189246eaeebea8497b289e8a0de16441f25bcae81ab807733bcf60
 AUX protobuf-3.8.0-system_libraries.patch 6352 BLAKE2B fde8a49ac3034320d9ae03479127946b1b50a0fe64d388132a129d8cd0a5cb6eb82565e82089fd1dada83848ef494fa87eac8dec4cd4b90dde580123dbe7f006 SHA512 0264d20c585312345315364a4732905abcca569535460d274528ddb6dcef6cdcb9661804f22c8cb209a7123fb41df7974ac739baa65debe0b676b2b902482d4a
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 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
 EBUILD protobuf-3.10.1.ebuild 3030 BLAKE2B e555296b22b00886ca0557dbb90a8ca544fc650895fda3face5e32e886dea426f7c61334fdafaa6fa71a9e47cf675cc0e0f4145e9c57ede5d68fb3597322732d SHA512 18203bed470210102b6e5301a231af2c792ceb14c124a78516dce7a8af564aacbf48a94b67bd1af8b9e93baf3b04dde87021e7d18ac5da92df856e06a5fa4c7d
 EBUILD protobuf-3.11.4.ebuild 3019 BLAKE2B b8efa8797e32842f1009580492a26fb0557a9555713875012d13aa4de247417c81c451ea0c6eeaf8a784a497591a29afa6516422a48c29c87e1e962d4f945617 SHA512 0955a68f5d0aed9a963c43aaf04f649a019dbf2a93f38f3561f7a276dfa8b3877291448dbb3680b89b4643d3ad6b1d3f621504614171c001ca6373eb9bf03cd3
 EBUILD protobuf-3.12.2.ebuild 3028 BLAKE2B 2d35522c78efd3143ad106cd97ca661c421fdd6d6c4fdf78ec8d87837cd42aafba7e320c8d0aa81277db671171342d57cdddcd85658b9b09b26becc27a2ab3ea SHA512 923b5a6fd632b47bc8c5ad30fd555fe4ca3a8e0f8244bd24e6520bc02607f624dfa8018dc6813385020251b4b2621679b02bc99f567c7b492a733644184aeea3
-EBUILD protobuf-9999.ebuild 2679 BLAKE2B 9340cd24544bdb247737010b0df7828d8556a6ef691b3ecf998776367d5a03709b6943c602ae979ca32fd8f1098fc3f499a1e4fd5abe3381f3b2d5fbf5c81c8e SHA512 85c5f443349dbc55288d8d86757affb32db57790fcfe9f6209639f123034b287072349284ac34c9bb8dacb4383d2926e90a1e555cec531145d5420021ea1ecb8
+EBUILD protobuf-3.12.4.ebuild 3218 BLAKE2B a201cc755244f015986e90255fbe0d1a95e25d348a851b44c2a14fa1dcf93927f6a8b77822ef2f5bec4971583c115da71e0ff85f3ad5b03b0ef09d58c9a3821e SHA512 8b4931aa05a0571ddcc0944ecf04d2ca8335d09b9bf3f1f7344ee5afb63e7ff63f0981c720f280ef858e63adddc4d1c31de3a81d29155bcfb87e0cbe5bedff8f
+EBUILD protobuf-3.13.0.ebuild 3218 BLAKE2B c3a7389f4da1d9ff6f1628b504897ebc1e72ae02c33d713b7625cbd30ff74e4a5cc8e9823005e6d31512edbe4cb06ab09de35bd9d65b003003fc6437b2cbfab8 SHA512 6462ef2647c0ee9ea3d703afd7402aaf337ec3078fe5fe0219cd7f157101446f3df863063427863604fac0f61f8def5df61255020b095c8ab4aa7b09426f478f
+EBUILD protobuf-9999.ebuild 2672 BLAKE2B 19039df5ff9af194b335978f77c6ac9f8ed3387840e01c449e7661ce628129a1bc9de5938c453a08e21d9ce6e0d734430796aa911135a3c43c84557500da43ad SHA512 32744cffb2e57592c6475845bebc5dc221a8cd933a057699c2203205ed93828041e4b6242aa34c1e07d5f36cb24573a675ef0bbf9ab3fc56e341e3e31acbec47
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch
new file mode 100644
index 000000000000..1c583fec0fdc
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.13.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+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
+@@ -708,7 +708,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     \
+@@ -895,4 +895,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.13.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.13.0-protoc_input_output_files.patch
new file mode 100644
index 000000000000..0416aac68f67
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.13.0-protoc_input_output_files.patch
@@ -0,0 +1,262 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
++++ /src/google/protobuf/compiler/command_line_interface.cc
+@@ -997,6 +997,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;
+@@ -1005,13 +1027,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;
+     }
+   }
+ 
+@@ -1049,6 +1078,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)) {
+@@ -1754,6 +1788,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;
+@@ -1890,29 +1930,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"
+@@ -2258,7 +2319,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) {
+@@ -2270,15 +2333,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
+@@ -296,7 +296,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(
+@@ -428,6 +430,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);
+@@ -2627,6 +2627,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_ =
+@@ -2721,6 +2732,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.13.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch
new file mode 100644
index 000000000000..990081ae1abf
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.13.0-system_libraries.patch
@@ -0,0 +1,121 @@
+--- /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
+@@ -702,19 +702,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.
+@@ -806,12 +798,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                 \
+@@ -832,11 +820,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                                     \
+@@ -848,11 +832,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 \
+@@ -862,8 +842,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.12.4.ebuild b/dev-libs/protobuf/protobuf-3.12.4.ebuild
new file mode 100644
index 000000000000..c21840f05fc8
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.12.4.ebuild
@@ -0,0 +1,131 @@
+# 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/23"
+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.12.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.12.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.12.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
+
+	# https://github.com/protocolbuffers/protobuf/issues/7682
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"T is overaligned, see b\/151247138\");$/d" -i src/google/protobuf/arena.h || 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 "${ED}" -name "*.la" -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.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild
new file mode 100644
index 000000000000..ae5381a06924
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.13.0.ebuild
@@ -0,0 +1,131 @@
+# 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/24"
+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.13.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.13.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
+
+	# https://github.com/protocolbuffers/protobuf/issues/7682
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"T is overaligned, see b\/151247138\");$/d" -i src/google/protobuf/arena.h || 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 "${ED}" -name "*.la" -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-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 4b1a78fbac4b..c30e4aa6d464 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/23"
+SLOT="0/24"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.12.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.12.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch"
+	"${FILESDIR}/${PN}-3.13.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.13.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.13.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -89,7 +89,7 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 
 	insinto /usr/share/vim/vimfiles/syntax
 	doins editors/proto.vim
diff --git a/dev-libs/qrosscore/Manifest b/dev-libs/qrosscore/Manifest
index dda00cef91a2..5ed20195bf40 100644
--- a/dev-libs/qrosscore/Manifest
+++ b/dev-libs/qrosscore/Manifest
@@ -1,4 +1,4 @@
 DIST qrosscore-0.3.2.tar.gz 3963954 BLAKE2B c7553fc1a0a2f4fd3f41ae0dd8bbb8c752c790c8a79b95b9b05ee38260e1ab9b2a337cc8fdf9b9aa513cc178f1155e0f3d7e5e0238aca50c9c970b981c189418 SHA512 2f86aa156af3a00eed38160258b2c178891e134f455e5c3f93a681193ea1d526d1adb6f428b948b8f52768415daed2c4dd7fb34040ff3046eea20bed81ea4d16
 EBUILD qrosscore-0.3.2.ebuild 583 BLAKE2B 74d87edd67a61d2c6d70815b6ff399da81f954082516ae0c983f7c4749af761232261308a0d8b75d89855c8304beea6dd060867f4892122c526fb2d55bd701ee SHA512 e9c61370474c4ffbe464adcd9a4f3742ace12f16a95e8396ca7760815f82fb0d31b488a0b7dabbbe065dd130e4d864b2ec1c52748412df2ca0e494cb23a432b3
 EBUILD qrosscore-9999.ebuild 564 BLAKE2B de3ac2cf2cc1e489ae1f2603a5379c9dfc1e51b9dc028785d9b4eddbcb2d4593c0dc967a1a0e37fc44ac4fc744dd8183b812fb3e06ac652fc43a28fa571b1675 SHA512 3a004c4624d2b70b1f4b690ab69dfc9166f3806eaad17021528237fec0827ad07a8cd981ef8ed6e5009feabd1a72f63cb02d97ea1dc4cd39c7de62f9ad4e40db
-MISC metadata.xml 534 BLAKE2B 89bf4875d95b1a72b45adad56ed219d499a188c058e9d1da90736d83a19e9d80a21e713b0c8d5f26d7d983d8ae982301f968214a16a8b3e377f611e6c13f359a SHA512 cfe593f3625416af002f0584c09ec021d86f5b08a009f2e362d93dabbc7bc2b018f191d1b0932236830c5299952f28dcb775fd6d5e20acc253d2f5671956841b
+MISC metadata.xml 445 BLAKE2B 86fa57a651c7a35cb86b98da098010f90f7d7fd38575ccbc7cd5505784929284a63b048b96b5033c3f181054fef6ab059a8a8bae859f420ab7277e999af6e68d SHA512 81fe8b05cfb46a512e708751b67314b183f320de6b85a0781c2a1ca93cec51862380290d0e10a671c3716a5e20ca5087a21a4dcbe90ed20ddf7a61166c879f0c
diff --git a/dev-libs/qrosscore/metadata.xml b/dev-libs/qrosscore/metadata.xml
index bdb16316b22e..047a3d36582b 100644
--- a/dev-libs/qrosscore/metadata.xml
+++ b/dev-libs/qrosscore/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		Qross is a KDE-free version of Kross.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">0xd34df00d/Qross</remote-id>
 	</upstream>
diff --git a/dev-libs/qrosspython/Manifest b/dev-libs/qrosspython/Manifest
index 3f38a6ab3338..e8664dd1c03d 100644
--- a/dev-libs/qrosspython/Manifest
+++ b/dev-libs/qrosspython/Manifest
@@ -1,4 +1,4 @@
 DIST qrosscore-0.3.2.tar.gz 3963954 BLAKE2B c7553fc1a0a2f4fd3f41ae0dd8bbb8c752c790c8a79b95b9b05ee38260e1ab9b2a337cc8fdf9b9aa513cc178f1155e0f3d7e5e0238aca50c9c970b981c189418 SHA512 2f86aa156af3a00eed38160258b2c178891e134f455e5c3f93a681193ea1d526d1adb6f428b948b8f52768415daed2c4dd7fb34040ff3046eea20bed81ea4d16
 EBUILD qrosspython-0.3.2.ebuild 727 BLAKE2B 8479b23e37eab8b80cb3828db9071af09fa2f6aee1a0885228c0714d76dbb64f31a76ba5792dfe930b6fa74cdf424f91f523127d74b3ce6dd7bf23b2fc57658f SHA512 c14ee98c2bd8aa92d534562ffd76acb8d6b8af1d2bc5262183bcc7987e1020973a6f9bc0cb5858770bc7de84f0bdaff28c25ed9895ff8e0ba2d37c122a4154fc
 EBUILD qrosspython-9999.ebuild 660 BLAKE2B 2f5e0c20867df434608f9909d16cb2842a834b4644104d47a293eab56f53de0507856dbd51cbc4b0e5b5d6b9b6a1f98165dfb053950ec49923d58cdeec1848f0 SHA512 3fc9f3dbdc99aa9499a0be7d9177eaab96099158d2e40c56a82e02451b0f825999aa018c432e180f9e448eaa4f89928b2d44ef1d0e5344dcb7d324461601f450
-MISC metadata.xml 526 BLAKE2B a5a763b7a113725a4a3d887d0ae8cebfa846ead8e5a139702f1210873139d40343dd239a6967f163fa2173f1be75d98a74a6bd140a006e2ff113a2d99d971a61 SHA512 4d2dc02243285ce40c8e962b6bf94211369d3f968802dc6d700ac6d748f54bfabfa25a2ba746e78a3f2440145bb250327a16618ad01ce2be8033ab7998308796
+MISC metadata.xml 445 BLAKE2B 86fa57a651c7a35cb86b98da098010f90f7d7fd38575ccbc7cd5505784929284a63b048b96b5033c3f181054fef6ab059a8a8bae859f420ab7277e999af6e68d SHA512 81fe8b05cfb46a512e708751b67314b183f320de6b85a0781c2a1ca93cec51862380290d0e10a671c3716a5e20ca5087a21a4dcbe90ed20ddf7a61166c879f0c
diff --git a/dev-libs/qrosspython/metadata.xml b/dev-libs/qrosspython/metadata.xml
index 543b73607060..047a3d36582b 100644
--- a/dev-libs/qrosspython/metadata.xml
+++ b/dev-libs/qrosspython/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription lang="en">
-		Python interpreter for Qross.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">0xd34df00d/Qross</remote-id>
 	</upstream>
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index d7338bd05926..83ea921b2080 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,12 +1,7 @@
-AUX 0.2020.05.01-test-memory-budget.patch 1104 BLAKE2B 0f661f83d0adbe9c0932f01f6751ed64a00e4669e6c4a865a52484b85fff352b000cfcf798147fbe9c950f8792381b93f40c7913fde824b0bde8596ccfd2ed8b SHA512 28cb8aba6e9d74e8e63e93e4d76f85f0580ca87d70e45f15f8fa7f4fd06523c0c41b7fb50523c69c4f0fdd3691cbffb0683787cac902c1f39350c0f62ec48da2
-DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77
-DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed7c6813b4530059659e794a7a7a3ad17d6ee35b5456302d627a0524fc78151b60ed9c546c1baab699231554a0dd SHA512 b3f2ec675fbc2ab18fc4de7b8c077f110010fd4a7502eea3d802d3706681b523db551edd80c2ff188457169471899084a6b21937154ab2288ee9ac123a2b7014
-DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
 DIST re2-2020-06-01.tar.gz 403203 BLAKE2B 46270c39fdb9eda127752e97e5dfea24a6cb9ddc32bfc298e123eb29609a003fd1a7a3591e760944ec36721ee1981f9bdbbc0b04d596764922e6bbc3daa9159c SHA512 8592a5409cb087c3188023746a4121bd58972a7a21bae98022af587f6191b3096bbb5d379e622ea853ff3373c76972fb61f331354550715c9a7e77d08fba6f3c
 DIST re2-2020-07-06.tar.gz 404055 BLAKE2B 1dca93ec928ef508aa30c44889d3f451acdf1f4430dc62b05c256790cb755e30ec5fac6aca23d44ad57eb61b0971437529bf63fb89b4bd7bf1937748046e61a9 SHA512 5ff5b0fa80d28a5c1cd56e42de4392899347e083c8eedb79282763b8967d301e0d287223e2b1a140cc30f7420a4a1aed5d7be0b68e8f5d2e8813ab4bfa64c103
-EBUILD re2-0.2019.12.01.ebuild 1352 BLAKE2B 4e8b259399c02b16f7cb0ba21aba52e43c629362846f2dba1cd47cb18006938cd1b1e6943c29b64cc19581f4b0607f2478700939eb0caa0573471b3fe8db1180 SHA512 93e6743627fe5aeb06b6dbfeae132237ffd32a40c1eb1532f21dc500206f49e1620aa7a3cbd887b4e70c4023535639ada9a638d2f6c68656725dacfbeca8d932
-EBUILD re2-0.2020.04.01.ebuild 1339 BLAKE2B 5809792c1217f49d50811a794686b0bb74faa93933dfad7a19067595434457e1fed2809414011b8d7039ec1768318a6c43a7f70e9eb1d1c23208f1874f9d0164 SHA512 98ab674b62c8b9a8389d39d9fde1d97de275a5b64b868b33ac0b49023d7351a9b5ca39280fb1b2a318aa01cbbc4aaa8db17f4d760223d7c471bb3b8f36ab9c14
-EBUILD re2-0.2020.05.01.ebuild 1409 BLAKE2B 96121133cd77e4281427640ba7f39d920c4fcd9b66b60495ea4c725cd24aed5e9c6f331d2489ef8d6eb5c0b189bc482277837220c672e55f6ca1fcfeb82d3382 SHA512 bbfaed2bae84fe323a111c95015d6a4385a403c185f7b919e078fc1d57d90554f7f6a3325e94f7166a45ebd13a2f9d0dca1864a3ed1aac3bc7be9bb690af8647
+DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
 EBUILD re2-0.2020.06.01.ebuild 1345 BLAKE2B ac8742ad050636bcf8ed1cf04f08dedd105db7f28366da9e55976d2935d63544ecf3077f093794670caee6784ed082446f9b032f4a2ae836c92265f9d7fbbff1 SHA512 422480e4547f33c0827f43a248f9ed331f5ad8e7bd7ec60c96f1f396609bf4f6fb4ed8fe4be3eb3b0e687fdb2fdbb3c8d45b13a5400cb91fe79563372533c375
 EBUILD re2-0.2020.07.06.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d
+EBUILD re2-0.2020.08.01.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
deleted file mode 100644
index 3e62934153c1..000000000000
--- a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bde1ea09550a61b4a092cdf0e3ba8dca4200947a Mon Sep 17 00:00:00 2001
-From: Paul Wankadia <junyer@google.com>
-Date: Sun, 10 May 2020 07:12:35 -0700
-Subject: [PATCH] Lower the memory budget in TestCompile.InsufficientMemory.
-
-Fixes #256.
-
-Change-Id: I975c5f6f7a12dc86fedc0f3ab35f16295c18a7e8
-Reviewed-on: https://code-review.googlesource.com/c/re2/+/56150
-Reviewed-by: Paul Wankadia <junyer@google.com>
----
- re2/testing/compile_test.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/re2/testing/compile_test.cc b/re2/testing/compile_test.cc
-index 4598aa64..2096e2f0 100644
---- a/re2/testing/compile_test.cc
-+++ b/re2/testing/compile_test.cc
-@@ -236,7 +236,7 @@ TEST(TestCompile, InsufficientMemory) {
-       "^(?P<name1>[^\\s]+)\\s+(?P<name2>[^\\s]+)\\s+(?P<name3>.+)$",
-       Regexp::LikePerl, NULL);
-   EXPECT_TRUE(re != NULL);
--  Prog* prog = re->CompileToProg(920);
-+  Prog* prog = re->CompileToProg(850);
-   // If the memory budget has been exhausted, compilation should fail
-   // and return NULL instead of trying to do anything with NoMatch().
-   EXPECT_TRUE(prog == NULL);
diff --git a/dev-libs/re2/re2-0.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
deleted file mode 100644
index 0bc9c4a592bd..000000000000
--- a/dev-libs/re2/re2-0.2019.12.01.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 multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="gentoo-2019-01-01"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="icu? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX NM
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}"
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
-}
diff --git a/dev-libs/re2/re2-0.2020.05.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild
deleted file mode 100644
index aca5fc3509c4..000000000000
--- a/dev-libs/re2/re2-0.2020.05.01.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
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="7"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="icu? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/0.2020.05.01-test-memory-budget.patch
-	)
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX NM
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}"
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
-}
diff --git a/dev-libs/re2/re2-0.2020.04.01.ebuild b/dev-libs/re2/re2-0.2020.08.01.ebuild
index ef410cbb6a44..adf595f07b8b 100644
--- a/dev-libs/re2/re2-0.2020.04.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.08.01.ebuild
@@ -16,14 +16,14 @@ SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VE
 LICENSE="BSD"
 # NOTE: Always run libre2 through abi-compliance-checker!
 # https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="6"
+SONAME="8"
 SLOT="0/${SONAME}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="icu"
 
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
 BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/re2-${RE2_VER}"
 
@@ -40,13 +40,13 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export AR CXX NM
+	tc-export AR CXX
 }
 
 multilib_src_compile() {
-	emake SONAME="${SONAME}"
+	emake SONAME="${SONAME}" shared
 }
 
 multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
 }
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 2a0aed65a2b6..39836e3ac670 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -1,10 +1,6 @@
 AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a22627ea49bd46b7600c9d289847a97f428abdc036c8647d23a5e70848d97db678c38872c841183dd871a00252c7949ca0c39920c15514d96e6eb1 SHA512 c18d8a4dbad433d96d396e1065c60fe85c1c0114adedb4f6151d1aeb65a3fedb5a2b94eb2e2a1e1b272c79e65ddd2d9128ee098d133e66452ae7fead62b73892
 AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
 AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
-AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473c2aef3291a311aa4313679e076a185b21e19735438ef9a3dd8cf4ddc4dab0cd691a17502a7a4d907935889755c2626720111246e532c SHA512 e9c9bdf5ed61b24afcb6bcf912be545525d5bdb0c77c304bc146c5fb645ddae2e7e90c6f71ae79d9624eaa2b0d498fddf149fd710524969b66c0f5c3ddabda65
-DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.14.1-r2.ebuild 1323 BLAKE2B 0cc330b0b39002f67957957eb57da192b7d4703d073f7f4f47b35c5d872f165c0a0bfff43922d984d32efd32a00c19481347271a116668c5b0863a6a1b46f8f8 SHA512 9d4b1c658bb9e5a967674107a405038a1c52d4721008b21ceeb989233ddd83ff23b4b457cb4293a9dfc7c1d639cd364cbda21ce72164fb777ca27a6d9eaa57f9
-EBUILD redland-bindings-1.0.17.1-r1.ebuild 2949 BLAKE2B 3d8b6b2e5451f438beed93e2d758d13632e6178e3e5da14faf962087dea621710e73478cf143b13365991df80ea6c55e7e10f324d28200621f0fe0caa27650ef SHA512 a7cc2e80485e59a71c3bf6bf4e7313820dd463ea08d17035b2a7a8545a292e8f75afb9655c79e1f593afe51da62c71469fbd78b9c19abc2b03a0a4b11242bb1c
-EBUILD redland-bindings-1.0.17.1.ebuild 2633 BLAKE2B b190723972f27a4eaa1aa5a9895622d2964aae7f5098db9b3e06e75955312831aa897163640cf195e1759d19688fea0b43bdc8259548b68d2f7073ee8f3d3dd3 SHA512 363f514f23eaebb5333bf48bfe136bf28db77bd37176d98b1978e2a8a3cdfcbf707e08acd0023deb2e5d463b35d4b7fd16eed3ffe4716cbdf4a5f5246e247853
+EBUILD redland-bindings-1.0.17.1-r1.ebuild 2952 BLAKE2B 872f56f376ee4918f8d597a12ec0c86b8e8e3e1e72c05a58561a767011a28cccec02bc7914258b13cb8c4d6140de3e776f7476cb42671fbd55985063f3e080df SHA512 4a42ffc9335285405618fcaa1132bb11788ea19dd3efa5f0bad79df89505b486c3a833a336d23574e88625a44a044c257d8cf909a7c46cca05f741621ca1118d
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch
deleted file mode 100644
index 1ca8ded91e9f..000000000000
--- a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -aurN a/configure.ac b/configure.ac
---- a/configure.ac	2014-05-10 18:38:09.000000000 -0400
-+++ b/configure.ac	2016-10-12 14:27:04.635849601 -0400
-@@ -153,13 +153,17 @@
-   fi
- fi
- 
-+AC_ARG_WITH([php-config],
-+    AS_HELP_STRING([--with-php-config=path], [Custom path to php-config]))
-+AS_IF([test "x$with_php_config" != "x"],
-+  [AC_CHECK_PROG(PHP_CONFIG, php-config, ["$with_php_config/php-config"], [], [$with_php_config])],
-+  [AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)])
- 
--AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)
- if test "X$PHP_CONFIG" != X ; then
- 
--  PHP_VERSION=`$PHP_CONFIG --version`
--  PHP_INCLUDES=`$PHP_CONFIG --includes`
--  PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
-+  PHP_VERSION=`${PHP_CONFIG} --version`
-+  PHP_INCLUDES=`${PHP_CONFIG} --includes`
-+  PHP_EXTENSION_DIR=`${PHP_CONFIG} --extension-dir`
- 
-   if test $PHP_VERSION '>' 5.0.0; then
-     PHP_SWIG="-php5"
-@@ -445,7 +449,7 @@
-   with_php=yes
- fi
- 
--PHP_VERSION=`php-config --version 2>/dev/null`
-+PHP_VERSION=`${PHP_CONFIG} --version 2>/dev/null`
- if test "X$PHP_VERSION" != X; then
-   languages_available="$languages_available php($PHP_VERSION)"
-   if test $with_php = yes; then
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
deleted file mode 100644
index c2af4022c104..000000000000
--- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib python-single-r1
-
-DESCRIPTION="Language bindings for Redland"
-HOMEPAGE="http://librdf.org/bindings/"
-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 ~x86-linux"
-IUSE="lua perl python php ruby"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/redland-1.0.14
-	lua? ( >=dev-lang/lua-5.1:0 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:* )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* dev-ruby/log4r )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/swig-2
-	sys-apps/sed"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_with lua) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with php) \
-		$(use_with ruby)
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete
-	fi
-	use python && python_optimize
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml {NEWS,README,RELEASE,TODO}.html
-}
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
index 8bf9a0152644..bd6a298e59e7 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
@@ -20,7 +20,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 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="lua perl python php ruby test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -29,10 +29,10 @@ BDEPEND="sys-apps/sed
 	virtual/pkgconfig"
 
 RDEPEND=">=dev-libs/redland-1.0.14
-	lua? ( >=dev-lang/lua-5.1 )
+	lua? ( >=dev-lang/lua-5.1:= )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby dev-ruby/log4r )
+	ruby? ( dev-lang/ruby:* dev-ruby/log4r )
 	php? (
 		php_targets_php7-2? ( dev-lang/php:7.2[-threads] )
 		php_targets_php7-3? ( dev-lang/php:7.3[-threads] )
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
deleted file mode 100644
index c37e8cb527ad..000000000000
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-
-USE_PHP="php7-2 php7-3 php7-4"
-PHP_EXT_NAME="redland"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PHPIZE="yes"
-
-inherit php-ext-source-r3 python-single-r1 autotools
-
-DESCRIPTION="Language bindings for Redland"
-HOMEPAGE="http://librdf.org/bindings/"
-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 ~x86-linux"
-IUSE="lua perl python php ruby"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/redland-1.0.14
-	lua? ( >=dev-lang/lua-5.1 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby dev-ruby/log4r )
-	php? (
-		php_targets_php7-2? ( dev-lang/php:7.2[-threads] )
-		php_targets_php7-3? ( dev-lang/php:7.3[-threads] )
-		php_targets_php7-4? ( dev-lang/php:7.4[-threads] )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-lang/swig-2
-	sys-apps/sed"
-
-PATCHES=( "${FILESDIR}/${P}-bool.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			eapply "${FILESDIR}/${P}-php-config.patch"
-			eautoreconf
-		done
-	fi
-}
-
-src_configure() {
-	if use lua || use perl || use python || use ruby ; then
-		econf \
-			$(use_with lua) \
-			$(use_with perl) \
-			$(use_with python) \
-			--without-php \
-			$(use_with ruby)
-	fi
-
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			econf --with-php="${PHP_CURRENTSLOT}" \
-				--with-php-config="${PHPPREFIX}/bin" \
-				--without-lua --without-perl \
-				--without-python --without-ruby
-		done
-	fi
-}
-
-src_compile() {
-	if use lua || use perl || use python || use ruby ; then
-		default
-	fi
-	use php && php-ext-source-r3_src_compile
-}
-
-src_install() {
-	if use lua || use perl || use python || use ruby ; then
-		emake DESTDIR="${D}" INSTALLDIRS=vendor luadir=/usr/$(get_libdir)/lua/5.1 install
-	fi
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete
-	fi
-	use python && python_optimize
-
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			exeinto "${EXT_DIR#$EPREFIX}"
-			doexe "php/${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-	fi
-	local DOCS=( AUTHORS ChangeLog NEWS README TODO )
-	local HTML_DOCS=( {NEWS,README,RELEASE,TODO}.html )
-	einstalldocs
-}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index c9c8b73e0579..6d88fc2c294b 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,4 +1,4 @@
 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
 DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46
 EBUILD rocm-comgr-3.7.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988
-MISC metadata.xml 484 BLAKE2B 5afcf22d4b70b094748570fc3f2c756c85b1f192aabc8df86d64e3bad535702444111151282dead984de46a5de2ab04748e0a2b0252f3a3af6e32e1e60416a3b SHA512 da6dbb545060ba024ce5df3439db80210c15e9191953703c9c50b2fed11a4140303a87cc89ee0336ad81f495da0d434fedd85e6c32a1ddede525a1bc5420ca94
+MISC metadata.xml 381 BLAKE2B 4b222ab97a88e12838ec3e04cf9934f75ced11c57f28d2eb59ab5eb130a63374ab8a6558e969b817ee7c21334de7bd4defc0c47774f71ba511e4b8c05969bc3c SHA512 b35903137fd3eb2a8a23143c2d41c586d086d34bb5611b65a46da4d22719055e918115885be7efae2b7c25d4caee024eccd4472d8b3011e0231ce707e49c530f
diff --git a/dev-libs/rocm-comgr/metadata.xml b/dev-libs/rocm-comgr/metadata.xml
index 20237687f91a..8da393a1995a 100644
--- a/dev-libs/rocm-comgr/metadata.xml
+++ b/dev-libs/rocm-comgr/metadata.xml
@@ -8,7 +8,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/ROCm-CompilerSupport</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute Code Object Manager
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index cac8b58f4b7a..6904b1348f3a 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,4 +1,4 @@
 DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
-MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01
+MISC metadata.xml 377 BLAKE2B 70c60c2403ccd85e0aa3ddf762f7b7ac4e4c3f605b02007ec524afec9300c59927916f0169ad9e181bd4ea7491207ee8becde6320663bc5426b255da1941afeb SHA512 8f7ed414a90f2aaf8cf04368c24dc3b1f8360cedbc7474aa1249c29784c6dc8ad350cf47e717ee8c7662f129b8807c627bf825a5ebe8415d665a5bfe8ef15b85
diff --git a/dev-libs/rocm-device-libs/metadata.xml b/dev-libs/rocm-device-libs/metadata.xml
index e7986fbb2ae9..efc65a1fe2ee 100644
--- a/dev-libs/rocm-device-libs/metadata.xml
+++ b/dev-libs/rocm-device-libs/metadata.xml
@@ -8,7 +8,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/ROCm-Device-Libs</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute Device Libraries
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/rocm-hostcall/Manifest b/dev-libs/rocm-hostcall/Manifest
index 49155d267a8c..171274c9f32d 100644
--- a/dev-libs/rocm-hostcall/Manifest
+++ b/dev-libs/rocm-hostcall/Manifest
@@ -1,4 +1,4 @@
 AUX rocm-hostcall-2.7.0-install-correctly.patch 1460 BLAKE2B a635eb5e841db218d48fd70fe68956e13f496cc6beb33f37ad1cdc237fd9168f2f48fcec951b0904016b114008f6270bf2df3f91e2269e2db3055b9ecdc7726f SHA512 faa49431ca93dc446deed02706aac06ff7ed7f7877a9c5e4611e7b653feaf3eedaa9d1300c328f54663c082dd033a464aa90ce46b30b733573763c5f30245ced
 DIST rocm-hostcall-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
 EBUILD rocm-hostcall-2.7.0.ebuild 745 BLAKE2B 7a9130bb942e1babf6ef76200b8cbf0110f9a28c3d69c0250a90bead5bc0d7dad279aff049254906b19439ddf50de3b2cd4a812bb78ed8bd3743a696796b8587 SHA512 e7619c315836922df0569c9d7cf0c22fb73776e37fcfe1af33b85676135460e6d596cbd33a34edf5c908ea983c8915687168f4d83fb752f6e850b2a64f91fef2
-MISC metadata.xml 477 BLAKE2B ec5920ba7f035d1122905dc096529265b11b9c6f9bc5b65552d528891f76334b4f105b7339a3180760c31e10ccbca5a2454018d4ebd10d1884e27c742c6b59f6 SHA512 738e3d6ecfdae4b69714187789223b16a8483bd4e93d830af0898b5f536312011efb74f7af1f046a76dcd6169181b67dcf00a9188959551c865aabbb8e1ec259
+MISC metadata.xml 381 BLAKE2B 4b222ab97a88e12838ec3e04cf9934f75ced11c57f28d2eb59ab5eb130a63374ab8a6558e969b817ee7c21334de7bd4defc0c47774f71ba511e4b8c05969bc3c SHA512 b35903137fd3eb2a8a23143c2d41c586d086d34bb5611b65a46da4d22719055e918115885be7efae2b7c25d4caee024eccd4472d8b3011e0231ce707e49c530f
diff --git a/dev-libs/rocm-hostcall/metadata.xml b/dev-libs/rocm-hostcall/metadata.xml
index 6b2718fcba0e..8da393a1995a 100644
--- a/dev-libs/rocm-hostcall/metadata.xml
+++ b/dev-libs/rocm-hostcall/metadata.xml
@@ -8,7 +8,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/ROCm-CompilerSupport</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute hostcall API
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 70293740ac24..e85e8b86fe56 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -4,4 +4,4 @@ AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb8
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
 DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
 EBUILD rocm-opencl-runtime-3.7.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
-MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
+MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/metadata.xml b/dev-libs/rocm-opencl-runtime/metadata.xml
index 359755b2e5a5..d342e0c5e641 100644
--- a/dev-libs/rocm-opencl-runtime/metadata.xml
+++ b/dev-libs/rocm-opencl-runtime/metadata.xml
@@ -8,7 +8,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/ROCm-OpenCL-Runtime</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute OpenCL Compatible Runtime
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 42b4c63abdf7..b844e341c0e1 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,5 +1,5 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
 DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f
-EBUILD rocr-runtime-3.7.0.ebuild 1437 BLAKE2B 25380da075972243c2b6e76d751cb734c448be9dadfc9d442c3ae6c06d46ae8b3d445721be0e8778e10c06067cebe490afed9df94f3662ecb9f2ef2b54ebefa0 SHA512 8cd929b305d1a2a57964dfa01f2696eb8a176202c47ee7e0bd61cd8bdedea48212f33f19fd851988ec6f9e0e95ca79b863884f874a60cc5c1b91681d22c28370
-EBUILD rocr-runtime-9999.ebuild 1437 BLAKE2B 25380da075972243c2b6e76d751cb734c448be9dadfc9d442c3ae6c06d46ae8b3d445721be0e8778e10c06067cebe490afed9df94f3662ecb9f2ef2b54ebefa0 SHA512 8cd929b305d1a2a57964dfa01f2696eb8a176202c47ee7e0bd61cd8bdedea48212f33f19fd851988ec6f9e0e95ca79b863884f874a60cc5c1b91681d22c28370
-MISC metadata.xml 600 BLAKE2B 6bdb934a6f2602bc39dab093a9554a71463e8818181cd9bdb15f108f8d371cc515fdd165742dfe8ac4085073cccc9bbb990a353f0d860d4590049c6965c70e3a SHA512 29543e96a8ccdb2506ba33170822f1bb7399d82c82eb60d342eed616c193902ecf49d377628db010f15aae79b529a65ea1e196ec446621bb2cd9386547c5662c
+EBUILD rocr-runtime-3.7.0.ebuild 1446 BLAKE2B 8a637ca2c10a1b742be787e4b5c57192a60c2456934cffe77ec4736b58336fb622b8b4ed99cdf2b9056e81176b7cbeb1756ffba7ff30f920a65c9849ed0ae152 SHA512 694d63a3e83a134298e4c52d922ba400ff79d189c31ed06dd6f59802863e53be89e949da4fc7f2310294632bccde2a044318b458579504d4bb085c5703563bab
+EBUILD rocr-runtime-9999.ebuild 1447 BLAKE2B 413885924a93dbd1886b88c8acaa558facee7292cf6230f6efac558e3cf93eb23b3da479a2ec03022db2cd28ebf09809ce50017bf525db862275d718b5cb5838 SHA512 c0443cc9ea258c4e2571ebedf329aa35c960fad0c5f07f35304a63c14fb45d9fed8a706df66fa936252686a3cea912a268a0a8e271a42008a22d21ae4329fa45
+MISC metadata.xml 500 BLAKE2B f56d759b8a8cf351a26095b51f7c48ebd9fb72d06f0a937aa23ea6c905a04d95c1de31c5ad176f5651a3b4c6a706f22e3ace3f4ec8a99a7f293be82de25b4e2b SHA512 33ee8984ef288b26e1315ccbebb03703e3d1648db220e0b3bbbadaef38ff414c938bf01a04c69ece7672cccb268f445a11b14d15da2939729c798ef8f8801719
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index d53b83185ad3..47b3e7327caa 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -12,7 +12,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/ROCR-Runtime</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute Platform Runtime
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
index d69d702b2dee..d87d1dd8979f 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
@@ -28,8 +28,8 @@ COMMON_DEPEND="sys-process/numactl"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	app-editors/vim-core"
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
 src_prepare() {
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index d69d702b2dee..c4474b8a91b2 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -28,8 +28,8 @@ COMMON_DEPEND="sys-process/numactl"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	app-editors/vim-core"
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="	app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
 src_prepare() {
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 08125c249609..03f066d7368b 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,4 +1,4 @@
 DIST roct-thunk-interface-3.7.0.tar.gz 2692297 BLAKE2B 5a060becb1b35e4eb499de5c177b5747789f02036d6e1bbf241a4054430e819bab4c188aa83f1cec0d35c80a3c0af47298fdd1c34d272f693dac9da191d8d111 SHA512 307e88808d3c852837f81c8745181edaa46e0f205fa36b9af531661c9a6a2dee5f360eb14e9f607376f27969e438f075dd44336606803ae2f7ce597f7fe46135
 EBUILD roct-thunk-interface-3.7.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
-MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
+MISC metadata.xml 643 BLAKE2B 97a92b285d79397e3b1f8e07d4c9fcea72613261901f70b016104ee7298a62981d2f54d70404bec0397d0e96c11182e5356e64fb6a30625af2ce8fcc1f6c5e3d SHA512 27da5fd910679ae0ba469d556df2110242432726d74ac19742936a3434ea4701b04bf920e5ee42f5a2154d44c76201c5369b0d4afb2c954efb2e49e08c872c18
diff --git a/dev-libs/roct-thunk-interface/metadata.xml b/dev-libs/roct-thunk-interface/metadata.xml
index 9dd431e1fbf5..92df31aa92dd 100644
--- a/dev-libs/roct-thunk-interface/metadata.xml
+++ b/dev-libs/roct-thunk-interface/metadata.xml
@@ -16,7 +16,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/ROCT-Thunk-Interface</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute Thunk Interface
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 7125f99e63c8..bb680247daa3 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,5 @@
+AUX sord-0.16.4-gcc10.patch 673 BLAKE2B 533d63588474664a07eadeb252db0381c6001ccd73fb47aeb02928512b680e2f63b48ebe0c74f44b01343e555fbced59f935ea27352cffc16561dffd2c51adc7 SHA512 8011d15764488781d89b3ca6d34769791316cee1047f09a5f6239ad22b96d35682568cb98e94ee9143d0d4011e6b9748b1561518696dd1cedde682ea1441dbf3
 DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
-EBUILD sord-0.16.4.ebuild 1172 BLAKE2B 623b097f241e0450ecbb8310c0a7e8d41a7d0d0c5dc5adb8315521341e6740a3ed6f9f18fee8d7889d67b530050916536efc19ad4dbc91d98581f7a132d67cc8 SHA512 39d893af4b35c08b19ffea947e2560a706ba02b909824e1ef6f2e3505086a5d75500542a2e26fa89e8b04375eecb3955a9214b8cee3daca29b87e6f34bd59518
+EBUILD sord-0.16.4-r1.ebuild 1217 BLAKE2B 9fa9b0ee91d3065538178fcea4bbe730e457b551dccf5e219a0c46b5501bad601a0e5ae8e751025dfa0f9a85e8451ad1fead5658fbdba251a9f341321c326fe4 SHA512 26017a039ce937cd03778db4e141012d3dc4e3239229afb593ae171e0c1bd4b3620e996a66c19302db39422f7a6a97d78c3ba6d06e50de9321b6e1680e12ed21
+EBUILD sord-9999.ebuild 1125 BLAKE2B 39b455cafddea954aefad917eb782504eaa38f5cf5a07abdd56d5b0dc06227464c0d3dd3c2e64519cad415d6278ac4f0cf16b48ba7023b5df759dc3d39522952 SHA512 11739648e64dbdb746d2774a2632a9fd54b36af4ec147b71166ad006ef438b62618a588b9a69ac5e08b152d2644783f49773ec314da2fd4664d508e9489e2cc0
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/files/sord-0.16.4-gcc10.patch b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
new file mode 100644
index 000000000000..a793b335a0a6
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
@@ -0,0 +1,25 @@
+From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Fri, 17 Jul 2020 15:38:38 +0200
+Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0
+
+---
+ src/zix/btree.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zix/btree.c b/src/zix/btree.c
+index 78a5a0d..d830008 100644
+--- a/src/zix/btree.c
++++ b/src/zix/btree.c
+@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t)
+ ZIX_API bool
+ zix_btree_iter_is_end(const ZixBTreeIter* const i)
+ {
+-	return !i || i->stack[0].node == NULL;
++	return !i || (i->level == 0 && i->stack[0].node == NULL);
+ }
+ 
+ ZIX_API void
+-- 
+2.28.0
+
diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-0.16.4-r1.ebuild
index 39cd7d0b3fdb..2c0d0b7cfc2e 100644
--- a/dev-libs/sord/sord-0.16.4.ebuild
+++ b/dev-libs/sord/sord-0.16.4-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
new file mode 100644
index 000000000000..e1388ab2877c
--- /dev/null
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+EGIT_REPO_URI="https://github.com/drobilla/sord.git"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/serd-0.30.0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 7e1bc2020f98..0fa8abcafc23 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -6,6 +6,6 @@ DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a9
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
 EBUILD spdlog-1.6.1-r1.ebuild 1031 BLAKE2B 8f524b4048ea904c75af6305fddbdadfc7db39bad605b43f4991df718955d1ca3a753e6c116c4c9e7566c08e3da5c2be1260901a504e6af963b70cbc5a65bbc7 SHA512 c51dea37423c49256ca17d12d3882b6babe2a3653a82122e03f9bdaeb7c3fe2e11535769a410c7fb6fd89472187d40cd111e18a15e79df2ebaffd379b1ee21ae
 EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
-EBUILD spdlog-1.7.0.ebuild 938 BLAKE2B 304d4ef847cfe054bcb526bf7ddb23a89dc9a641982b579d028fbb60ec24602ca2b42988383ddcfae6d89bd522cb89851dd86cc03d66f06f067d0eb322b2dd49 SHA512 4d499f7956c71a0f546970afc8722ff06ac17df9b4f82b98e51b409e459563a85c08fca53f39bc5e747883621d74727a048be9c3db58df331424e491986c8cf0
+EBUILD spdlog-1.7.0.ebuild 937 BLAKE2B 415b5e6af56a86eb3c204d00f801cbf58d8763f7be2f9fe8a5891aca11dcb4f1b9ae5e748a5276cf052dea08b0e102c279233efd0055fc6fd3f91428d1f534f5 SHA512 714d48d21166541d80de368c508a4d299e2c4e883e0ffb819110c2ac9c722928e8105f94b37f82704b7a7f964ef7b8ec673099fdf0a8f515bef899d1c5edb129
 EBUILD spdlog-9999.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.7.0.ebuild b/dev-libs/spdlog/spdlog-1.7.0.ebuild
index 99714237d173..1c96b2168c83 100644
--- a/dev-libs/spdlog/spdlog-1.7.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.7.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 47d6bde54338..112ae61cdccf 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -1,7 +1,8 @@
 AUX stfl-0.21-python.patch 1936 BLAKE2B fc0a8f02eaa30b900652304e34f383a6587769f4ac803f2ba9420197ef492430a88a6a6ec4863163cd948c9fd8c027b50a944796ea1c342f19ad9049c46dd1f9 SHA512 33da38bee278999ec3bcc770886183c3d7ac60ab3458568a7848bc83035104290423aee54a2a2da065b9a5da639af6fa242de9f23df0ff7fccbd024099af8472
+AUX stfl-0.22-pc-libdir.patch 866 BLAKE2B bdbc18572fd5104ee04af672b9d493bb3271a8af7b383f5fb9042e8c44dbeaa760ed9c2c8f71192b891eeabae487ee096451ccdb8ae82a936e85331145c9bef6 SHA512 9ec288c174bb30060085c94f6703edb698f2e3806d872153cc58873ea838a84f9edbc07c6e5f8de4a6fd18f77ff1c1e4b1599ad598f3d0a4bba5b2c5bac73ad3
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
 EBUILD stfl-0.24-r2.ebuild 3107 BLAKE2B 90afa189006aa5d0d2ff0ef68ef756fbdc17306e17084f1abbb60b80f5a6cb6a623ee598ecde37ef80094e9e2fd9499417199209dfb01442831bc5cba104517b SHA512 cfdcd3d32d292cf15b9349fb0c2f8352e952b8bcbd6270cfda137c7995a7825866e9100060337b3bcf50892828af48c7f6d069f94e5176a72c2fb83e81f35a71
-EBUILD stfl-0.24.ebuild 2995 BLAKE2B 0f57b85f5677b818ddeff285cebc84a636b887c1d57fb587ce537cb66269500bf82916d5bdd1de02c138a23733b72e8f106daf4e2de1faeae484dcb29c61d6d9 SHA512 e213afd5c42bd6c321c82489acd6546ba2afca4e9f67ed34a8d64472bd7d1f5c8a9977d73f8f08cd5ea37f931f205f50b68246b7e0ddb6baadeda9e67ae22a0f
+EBUILD stfl-0.24-r3.ebuild 3152 BLAKE2B 0c8182aa3696f3a716c40b3407d13293713fbdd8291a7944e39cbea6ef18ed0969a90bc9bfff02499ce3e7f055b28bf2f294d705852d35e5b5e49e5d4f4bd31c SHA512 fa5d9f91716a5b2d3df73c61364b05a2ed63f1d38d958686ab9df4b8e728a86131474a156a417280049a07bc5ff693e8fece30809b989966b9ea086f848362c5
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/files/stfl-0.22-pc-libdir.patch b/dev-libs/stfl/files/stfl-0.22-pc-libdir.patch
new file mode 100644
index 000000000000..82a9529c9573
--- /dev/null
+++ b/dev-libs/stfl/files/stfl-0.22-pc-libdir.patch
@@ -0,0 +1,24 @@
+diff -ru stfl-0.24.orig/Makefile stfl-0.24/Makefile
+--- stfl-0.24.orig/Makefile	2015-02-12 14:14:33.000000000 +0100
++++ stfl-0.24/Makefile	2020-09-07 14:08:04.125833347 +0200
+@@ -67,7 +67,7 @@
+ 	ln -fs libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libstfl.so
+ 
+ stfl.pc: stfl.pc.in
+-	sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' > $@
++	sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' | sed 's,@LIBDIR@,${libdir},g' > $@
+ 
+ ifeq ($(FOUND_SPL),1)
+ include spl/Makefile.snippet
+diff -ru stfl-0.24.orig/stfl.pc.in stfl-0.24/stfl.pc.in
+--- stfl-0.24.orig/stfl.pc.in	2009-03-30 20:33:37.000000000 +0200
++++ stfl-0.24/stfl.pc.in	2020-09-07 14:08:07.784854088 +0200
+@@ -2,7 +2,7 @@
+ 
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: STFL
diff --git a/dev-libs/stfl/stfl-0.24.ebuild b/dev-libs/stfl/stfl-0.24-r3.ebuild
index 063edf019c58..f05ef3b01cb9 100644
--- a/dev-libs/stfl/stfl-0.24.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="examples perl python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -33,23 +33,25 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.21-python.patch"
 	"${FILESDIR}/${PN}-0.22-soname-symlink.patch"
 	"${FILESDIR}/${PN}-0.22-ruby-sharedlib.patch"
+	"${FILESDIR}/${PN}-0.22-pc-libdir.patch"
 )
 
 src_prepare() {
+	default_src_prepare
 	sed -i \
 		-e 's/-Os -ggdb//' \
 		-e 's/^\(all:.*\) example/\1/' \
 		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
 		-e 's/ -o $@ $(LDLIBS) $^/ $^ $(LDLIBS) -o $@/' \
 		-e 's/-lncursesw/-lncursesw -pthread/' \
+		-e 's/\<ar\>/$(AR)/' \
+		-e 's/\<ranlib\>/$(RANLIB)/' \
 		Makefile || die "sed failed"
 
 	if ! use static-libs ; then
 		sed -i -e "/install .* libstfl.a/d" Makefile || die
 	fi
 
-	eapply_user
-
 	if use perl ; then
 		echo "FOUND_PERL5=1" >> Makefile.cfg
 	else
@@ -68,7 +70,7 @@ src_prepare() {
 src_configure() { :; }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 
 	if use python ; then
 		local BUILD_DIR="${S}/python"
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index ef0b4afb661d..c387c6b2040f 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 607 BLAKE2B 0b79bacd416aacf3c65dd8498b13598bfd840a34f54cb86fe49ead553c15f2259e34d327becfcda6abd2b9b8d03e5364279a364253d62c3d2a35f0920c0870bd SHA512 a72445e10903db3982677cc594d8efddce0fbca71dae23d12c27344e3d47bdc91a2834f66377524c03e9f5868a57d259487b4fd7411a756320cb06712944bafe
+EBUILD tinyxml2-8.0.0.ebuild 606 BLAKE2B 20410da267fd7ee41bcd1cf4b37c12199de192b1c588ea40fb5cb2a3ccb9f0a09b133360a8886901b3455b83bc100703b03a8b56a6221af1c06955072745c001 SHA512 c67dd61a76206f878a3211f4182cad1365a478d8734c39cc24653dc5c51b59542db625e47d3c4f99de5ca51db2a9ed62e7a942e76f39e76215c39014c94253a5
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
index ad8cec35ea9f..29231399aa61 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/tvision/Manifest b/dev-libs/tvision/Manifest
index 7e526c03c469..4ec46f4e4265 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -18,4 +18,4 @@ DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
 EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
 EBUILD tvision-2.2.1.4.ebuild 1529 BLAKE2B 1b53eb32da985f60ae0a1175344845355f9ced9b9bd389e03d52a94728bc35cb6faca17c2926fd7e4291e1813e21f563f082d8428a744708aa7acb34a2aa2164 SHA512 6515f50efad2f73fe08445cdea72fa6995b1dcd061731ec76b15dadd26ae797c446ab45a570aad8f1c02223be30bbc9f2eb0b76fee5282c841f537093c0c0fb4
-MISC metadata.xml 694 BLAKE2B d6d43df5a039473776af219de660a9c1d288a31b401f2486c9f5366cde7173d86e18f1ca772dcbbbdbf1ec2d19e85f334714ac8f9b1dbb19340219e14fd2c852 SHA512 19b0c4d1690a4bc85a6b018d5032a5809d772b9982aa932af486223329fbe10562e287e08692a6c1d772f627d158b6d82bf6844e1365f3a248c7bc9195535aca
+MISC metadata.xml 583 BLAKE2B 1b2b6710030aab0d59417239cff1f9b87e1216c79f817effd9faf3b61529bd89ffbcbb08edb53207034995543f38f54f46f8f33446f3eca890ea35a29ec811a5 SHA512 7939f39af0d30fba7ff1ef5be4efd29abe0e78b0fc3dace42ff9011373f9fb913eddc3338e86883671d5f84a49e5788accf29dee8ba583236b5f3dc380b97ce7
diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index 8fc9090f78d2..b8828b1e0aaa 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>
-		Text User Interface (TUI) that implements the well known CUA widgets.
-	</longdescription>
 	<use>
 		<flag restrict="&gt;dev-libs/tvision-2.2.1-r4" name="gpm">
 			Support text mode mouse through <pkg>sys-libs/gpm</pkg>
diff --git a/dev-libs/uulib/Manifest b/dev-libs/uulib/Manifest
index e25927856cc8..266f427e8fc9 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
-MISC metadata.xml 277 BLAKE2B cecac90fb82fe0bd545f752051c2ce763ce3232fef47d6ec79511d72870e92c49a509f06e949671b517ba80295da3c27a10f5c72b374e59a4ad6017a13ac705a SHA512 37a5409e55c42abd634bfbf22e956a23cd8d2d27a600e02a23e304e3f7da3a434885ff8d5997091ee608a4ed32f10738911c1ad81624c3cba23a7a42f20fdf59
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/uulib/metadata.xml b/dev-libs/uulib/metadata.xml
index 60196d0e726d..7a38bb900964 100644
--- a/dev-libs/uulib/metadata.xml
+++ b/dev-libs/uulib/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>library that supports Base64 (MIME), uuencode, xxencode and binhex coding</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index fa10951c59f7..00fbfcc4605c 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -10,6 +10,6 @@ EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd4
 EBUILD vala-common-0.48.6.ebuild 648 BLAKE2B bd688604d8e7bf65b8a902423acbe2e469a81e57fe78171c9f77905190eca95b02b16c52f7ca8b3062e2aca8c94b4e5454e82bc6fa04dbba8484f9d38d526e4d SHA512 00fd28246c4cdebdfb455d08030eed513d649ba2bc0adf48f3bf27f1de140e3d9d2413c45a49dca55baf399d5a9c501d2d110c95f4c3fc8e8bf81bcbd75ea22f
 EBUILD vala-common-0.48.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.8.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
-EBUILD vala-common-0.48.9.ebuild 650 BLAKE2B efc1a39ce75ddf476c1440f554a4966299df7944bc19e24146b4e77e01c5a3ed986821720b0b96cc0d83617cbf44b27acf469ec532e61050315f923f63a14d88 SHA512 38d53bbb4d0e15043ae4b659247b83aae4639f35f123129474e3eb46665f0314258d0d60b8494dea02b908427e6c11517549a0d6719836c900cb51ea800644a3
+EBUILD vala-common-0.48.9.ebuild 649 BLAKE2B 55d9b57e96bbbb1b815f516190f292b443baef2ba5e361d0cc69ce60fe178575d73a4dbf4f5f4ae2104bb6c18f9d04ba3a510087f0f21303cd03ab66ffa023e4 SHA512 5346d8890d211752b9dba04e300340b69961b2dbdc66e30a92db618d9b008f7a8664f6c276c78705ace54483c46abe9dcb5e0dabece9c8eb232c3bf784445ed7
 EBUILD vala-common-0.49.91.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.48.9.ebuild b/dev-libs/vala-common/vala-common-0.48.9.ebuild
index 3d45bff248ad..4df82e26bb72 100644
--- a/dev-libs/vala-common/vala-common-0.48.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vc-intrinsics/Manifest b/dev-libs/vc-intrinsics/Manifest
new file mode 100644
index 000000000000..6a3b5e43ac91
--- /dev/null
+++ b/dev-libs/vc-intrinsics/Manifest
@@ -0,0 +1,4 @@
+AUX vc-intrinsics-0_p20200904-cmake_libdir.patch 717 BLAKE2B 7c3d72b87b0acc67c223a3468e96ce68c5c1a166bccacc045d73e5d29a063856b23ba959ff1e13d07333d20803cedfa3f55f490ee9ee7700c708876de1960f71 SHA512 927c89f748fa21d3ef9349749c3428014b055a88d557dfd310f2b76c7f9e263400267558a83871ab132c295a997dc0488b9df2167378b9c1dc691469e1554f4c
+DIST vc-intrinsics-0_p20200904.tar.gz 97118 BLAKE2B 7f1a4f0b3b5f8abba8972668877562fbc6835ce8cfa9e0b336541ee6db72ff1469917320b63dee7d193af89593bb318c9fcd000ba5e8d62df5729f69cfdcb9c7 SHA512 7b5f87dabcf1c093c50721390dba9c82a1f0da1a087d00af4bf1c2e080bffa531b8d16fe8faacfaeb4862b528929865263d0e84a5ebee6a76eef1436dc4e2ec9
+EBUILD vc-intrinsics-0_p20200904.ebuild 1355 BLAKE2B e4ebb93f1eb3b500027788d4dbb6d089411af2a443579ee60096b33a5e0421e3673a4503b435a452549077de2c309d18718fbd94f26ee3be4e4604c617456325 SHA512 836b14997f421581e21b2af7bb8a4866392f000610e09d792adefe85077f416fd5b3a40934f7a57e85bc1c0ebb555d6ec1f43e36be87e7a5ee9ba7936fbf2ee9
+MISC metadata.xml 330 BLAKE2B 9d8d85095925bb1363a4b5847506d2ec683ca09b552f93a74241375fe7eec80d98af2ec4de20d87c1a4d9bf61c35386934b28150b38167d15825b9e3dbb76325 SHA512 c7981ab0cf297687752233fb0425048d6b22d40867ced67dfce840f7914c8f2003787e21b31e08d80daadc2b0b05ed811bdbb5af00bf95d70bc5cd412a7be9c8
diff --git a/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch b/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch
new file mode 100644
index 000000000000..694cb1e28562
--- /dev/null
+++ b/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch
@@ -0,0 +1,21 @@
+--- a/GenXIntrinsics/CMakeLists.txt
++++ b/GenXIntrinsics/CMakeLists.txt
+@@ -52,15 +52,15 @@
+   # we need to limit it to external build
+   if(BUILD_EXTERNAL)
+     install(TARGETS LLVMGenXIntrinsics EXPORT LLVMGenXIntrinsicsTargets
+-      LIBRARY DESTINATION lib
+-      ARCHIVE DESTINATION lib
++      LIBRARY DESTINATION ${TARGET_LIBDIR}
++      ARCHIVE DESTINATION ${TARGET_LIBDIR}
+       RUNTIME DESTINATION bin
+       INCLUDES DESTINATION include
+     )
+ 
+     install(EXPORT LLVMGenXIntrinsicsTargets
+       FILE LLVMGenXIntrinsicsConfig.cmake
+-      DESTINATION lib/cmake/LLVMGenXIntrinsics
++      DESTINATION ${TARGET_LIBDIR}/cmake/LLVMGenXIntrinsics
+     )
+   endif() # BUILD_EXTERNAL
+ endif() # INSTALL_REQUIRED
diff --git a/dev-libs/vc-intrinsics/metadata.xml b/dev-libs/vc-intrinsics/metadata.xml
new file mode 100644
index 000000000000..ce94ad6317e7
--- /dev/null
+++ b/dev-libs/vc-intrinsics/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">intel/vc-intrinsics</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild b/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
new file mode 100644
index 000000000000..7ecd07659322
--- /dev/null
+++ b/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm python-any-r1
+
+MY_PV="830067832d4af0fbd5710e9a45669a02fcfb7c3f"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="LLVM intrinsics representing SIMD semantics of a program targeting GPU"
+HOMEPAGE="https://github.com/intel/vc-intrinsics"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="10"
+KEYWORDS="~amd64"
+IUSE="test"
+
+LLVM_MAX_SLOT=10
+
+COMMON="sys-devel/llvm:10=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+BDEPEND="${PYTHON_DEPS}
+	test? ( dev-python/lit )"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( Readme.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_p20200904-cmake_libdir.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/$(get_libdir)/cmake/llvm
+		-DTARGET_LIBDIR=$(get_libdir)
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DVC_INTR_ENABLE_LIT_TESTS=ON
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}"/usr/bin/lit
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# These tests only work on native builds
+	if multilib_is_native_abi; then
+		cmake_build check-vc-intrinsics
+	fi
+}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index fc947051ea26..9704187b8a46 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
 EBUILD volume_key-0.3.11.ebuild 883 BLAKE2B 08ea62d2a68987cca931a9c561787d3594764b6b9ac452f45d71c5b7a102eba24807ed878a6ae8aa79a3d4f4efc9baceed974d00f2c0e2491a4de90d43e8cf3e SHA512 6a67cab22720560ceb03e54bd4d4614dc5f3ab561a508557df71465d375f4ab4c9a5bbbb096570c2e52f4e6c8197f9addf288488e1aeaceb3dbe6c3020b0f78a
-EBUILD volume_key-0.3.12.ebuild 947 BLAKE2B b265e341c848f807784c03d85cf10c0a008c03aea734a2665a95b9c7b61fb3a22c602c9d8c9566190f09d90bb91564adb73c0f6d496702c6991cd5840ab3e944 SHA512 63828dec89462d2cce3592613e39ccd317105a128961655ce4af62e6010de2202231f47f50c16af38900b5998afecfbe123a02424df4fca59e812d120b580c2c
+EBUILD volume_key-0.3.12-r1.ebuild 975 BLAKE2B d3008a2bdc868297cf8c40c52a0908b80b667195aeedac9ac7b9fe3666f398617c95f79094d69a5fd5946552e31a8a18762908b22eed5d06d2a8680d769a649b SHA512 4903d03944d47ccae8d4cc39f0ee262db47eadd09aeb264ef530c1df7fba477647f826884b3ae7e6eca5e4a6981addcb76f839c18607e44a54d7b509642c6c00
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.12.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
index 87bc022c35c4..2a6dd33d0884 100644
--- a/dev-libs/volume_key/volume_key-0.3.12.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-single-r1
 
@@ -45,5 +45,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	python_optimize
 }
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 52218b8a959e..b24f841a79f1 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,5 +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-9999.ebuild 3677 BLAKE2B c32f558f61f94edaf234a92a25c69edb789439168f195fb680f680e0f856952b53e92fe758c1e24c224f7abcae538b7108bbc0f18a0b9dd2c82fd0b216f028c3 SHA512 8381f188bff1ddab99279d7dd7ef33e87d279df95f17a9cc146c14c626f3646e444a67b3951091e22fd7e78bae519a749554331e2c05ef970f999567508e60a2
-MISC metadata.xml 1440 BLAKE2B 146131404d49bd8011186bced3225a8f12b03e53cc7311baba9f9e412861e7260c50868f169d5dac079319b572cc3996d5565420fdc9972c698df2e5d17ad0ae SHA512 491e0cff4f9e3dc8b794a6711b5ad781c98e72bf5ec851814557b41c2026f8d6cbf39a0342f1564293c093ba87ce23ba7456530213995882098c2bc0f2736217
+EBUILD weston-9.0.0.ebuild 3716 BLAKE2B 537fe56673b83e0c843be35ab95b1e154570a1bbb02a9cbede05e119de27e5e130fae91372c1c239ca5b77c762eb26db6e0c9e83523202d98e0aefe97f19ab45 SHA512 bd8b946e7dc6488b9f7586cdb263e64bf4bc87fc9936d635b79df9a27929fd621a26f1e2e918f2924bc3e11e7a0665934229cb5f5334503e1c02553fac273ab0
+EBUILD weston-9999.ebuild 3716 BLAKE2B 537fe56673b83e0c843be35ab95b1e154570a1bbb02a9cbede05e119de27e5e130fae91372c1c239ca5b77c762eb26db6e0c9e83523202d98e0aefe97f19ab45 SHA512 bd8b946e7dc6488b9f7586cdb263e64bf4bc87fc9936d635b79df9a27929fd621a26f1e2e918f2924bc3e11e7a0665934229cb5f5334503e1c02553fac273ab0
+MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index ef151677e17c..dff0a7012a3a 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -10,10 +10,11 @@
 	<flag name="drm">Enable drm compositor support</flag>
 	<flag name="editor">Install wayland-editor example application</flag>
 	<flag name="fbdev">Enable fbdev compositor support</flag>
-	<flag name="fullscreen">Enable fullscreen/kiosk shell</flag>
+	<flag name="fullscreen">Enable fullscreen shell</flag>
 	<flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
 	<flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
 	<flag name="ivi">Enable the IVI shell</flag>
+	<flag name="kiosk">Enable the kiosk shell</flag>
 	<flag name="launch">Install weston-launch utility</flag>
 	<flag name="pipewire">Enable virtual remote output with Pipewire on DRM backend</flag>
 	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
new file mode 100644
index 000000000000..097c7f0c70b9
--- /dev/null
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -0,0 +1,147 @@
+# 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/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+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
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	colord? ( lcms )
+	drm? ( gles2 )
+	pipewire? ( drm )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-protocols-1.18
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	pipewire? ( >=media-video/pipewire-0.2:= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xorg-server[wayland]
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		$(meson_use fbdev backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use launch weston-launch)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use colord color-management-colord)
+		$(meson_use systemd launcher-logind)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		-Dtest-gl-renderer=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Fxv devices) || die
+}
+
+src_install() {
+	meson_src_install
+	if use launch && use suid; then
+		chmod u+s "${ED}"/usr/bin/weston-launch || die
+	fi
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 0b8f285ce20f..097c7f0c70b9 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -25,7 +25,7 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -65,7 +65,7 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
-	pipewire? ( =media-video/pipewire-0.2*:= )
+	pipewire? ( >=media-video/pipewire-0.2:= )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
 	remoting? (
 		media-libs/gstreamer:1.0
@@ -113,6 +113,7 @@ src_configure() {
 		$(meson_use desktop shell-desktop)
 		$(meson_use fullscreen shell-fullscreen)
 		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
 		$(meson_use lcms color-management-lcms)
 		$(meson_use colord color-management-colord)
 		$(meson_use systemd launcher-logind)
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 84923a3f2e2a..a2eada927419 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -4,6 +4,6 @@ AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aa
 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 2974 BLAKE2B 086f8a100869f89bc9bbf294c2c699f624a4fb55c028239b0978676ee0c84808c85de9f9cd8eaecb5858f9d14dc8bdd9bd11fe5c431e71cdfc986449d28d9c9a SHA512 1dddd35573dbd3687de506cdf2970779d05a13ee15cdf80e80e2bf046d591719b4835f1465c0da37ddd93a5997179bd47a02156deabdbcdc6afdcc9131777f9a
-EBUILD xerces-c-3.2.3.ebuild 2936 BLAKE2B c11fb739c9e6b8ff5e7ad789c9b9c0651dd569afc53d6a97334e5c5ef12b19f65e9cc63f478ad76606293297bf9c77347f448676bf76c415d42f0e0871ec9a53 SHA512 e119476f8a6fc10b4a4f043e530253f2035ebc264823b383090985b216a70815b95a8488fce42f0ac13a1196475d75403f160b0259933dc77450d4f82f1dbb86
+EBUILD xerces-c-3.2.3.ebuild 2934 BLAKE2B 1630cf8cafc12ad4ef2924febd21891629bc0d9c963936711f01e492c52d582be42d8a40008d516d302234b1b79c4cd9b517ecabcba476c4d523cbc8e4f9f0d4 SHA512 d13356e7351c9766370500397833a123c49848d4ae883f4d91e535d9e729c27257cba0aa29f1ba00afb5849bd76ca21989b9694f2c199a855bd93787e1e5b402
 EBUILD xerces-c-9999.ebuild 2942 BLAKE2B c4fbaebdc301f12035ecca49b3b25308f647652cf84cb24e6b8eeb8e69db205ac53ba20d7460af12f9c44a571a86351526f2785c0cf6489665560d9b96f811ec SHA512 89c5ca69e61d4ac7e5984e5ae502a3265dbbab9d098501adfaecf6d21c1c24df7deabd419e3b2a8fb772c6d4f5aeae5416f9cbfd03f3daaa5ed9248e2a1e27eb
-MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
+MISC metadata.xml 638 BLAKE2B ae192f7a87ce73aed62967b02b1cda8535ac655b4e8763e7b75697c816f30b93b6bfb0b807d573f3ed82a9238bcb5234a1532151d98f9a30877884432916b816 SHA512 db2089786b68371bca8dd6e51ff820ac63245eefc5080e5d6f05b434bb2ee1a6831d439221f71b4d088e7d7cb22c9a68f6e67cee253923f13850afe6f7f021bd
diff --git a/dev-libs/xerces-c/metadata.xml b/dev-libs/xerces-c/metadata.xml
index e56c7723c484..9734dce84a5f 100644
--- a/dev-libs/xerces-c/metadata.xml
+++ b/dev-libs/xerces-c/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>xerces-c is a C++ library specializing in XML parsing. It is released by the Apache Foundation</longdescription>
 <use>
   <flag name="iconv">Use iconv (<pkg>virtual/libiconv</pkg>) as message loader
     and transcoder (in general it would be possible to use iconv only as
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 c40bb0f65621..f0c894c9ed8c 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/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index db35e6f28cce..68460a41aa2f 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
-EBUILD xmlsec-1.2.30.ebuild 1401 BLAKE2B dbc86b8f37d6e4b88572a5f75acfceec04dcb5e4103e599a4a5f525ce22944c1d14d423d24789e5fc68208313d8abd3e27137f723d5c2a9f7ccbc09c0f05b56a SHA512 2533d18037ff6c59b6e6fc8fad9fdecf43e18b05cdfc0b379415d857fc713bd9b5ce0f9a8d8a1e249c8eecb2809feace0007fa7cf87861f05e032cd153de08dc
+EBUILD xmlsec-1.2.30.ebuild 1400 BLAKE2B 33a78b6d284196e366c67719cc2d0e292696e761c297fc0bc2e3cdfb13cbd3fd732ad3ebb5b1ffc7c3ef4d1992ad368dee5f392900849e1970e7db67730f1f29 SHA512 8dd204f7d770a323c0f1943c555cabf67fa9ae3a83d89fe325f23be24b21cad29f62565cba9c8eae733453b76c1547f022ccd2a263edb85a2aba0ea6efb0b6cd
 MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
diff --git a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
index cf4329bbd9fc..840c5677a8e9 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 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 )
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 61133af9aecb..ad580b6ac819 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,13 +1,11 @@
 AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510
-AUX zziplib-0.13.71-find-bash.patch 1747 BLAKE2B 48735330538b5ad72e8e962e09626dcb28d7bf28ad5f3877ae064f8f0113b42799674eeb53b95b248d20e6dce2b8d913bc540f98dc377ad66e82f95dde1378d5 SHA512 16ba20dc1eeaddbfc3eeb04db0fd93e719d8d4b0781d6821696f6911b30cc96a3e668b4e8ceb1751b34906a9a096da868b0e882a9b1e8f0daca0650ba59b60b7
+AUX zziplib-0.13.71-find-bash.patch 1758 BLAKE2B d4d98b1886a67867de90fc303f2bc6aab07e1c27fd8fc1827ddd30b8d8427938c4bccff14359de683585aa8ebfbc4a675ad98acf6e6fa982bb1254e4aac8eb1e SHA512 e939072da1e27008f0d23145e74cd37574426a6d4b2d578bc0a8e880054b89580bf4a48c81b70f6232251216d2f73cf5c071dfd0cb7bfd2f6f1f5dd09738efc7
+AUX zziplib-0.13.71-installing-man3-pages.patch 654 BLAKE2B c9a990258795e997c99642ba1c3489a097d07d7c90663d6205accccc87728d6861db446407f0457711bddd997bad29c82b25412286e3e52380c03bd5e4f7f101 SHA512 65cdfea81902f38af24dea828caf3bc562471ca0ee5e711b4ab6c1f344c9cf63efc09b3fc038fe971b3a2e3933fb411dbb0af65b37b5b76f75e56704d07dfb36
 AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110
 AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da
 AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d
-DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc1614222cb9607e832618e7534cb55a022f2ba3d2c6f8c6337f4bf9e80a350e43eb05a4c1708b63efa5e0ed10297a5f19ec7adb SHA512 211a83594d4043a29472f9c556d72ad486e40f28d55426b970b8b0617aca76f9dcbd4a3ca5991df943dfac1a1cab623b19aa04fb6ef7807a7740730e01926205
-DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
-DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
-DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
 DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
-EBUILD zziplib-0.13.69-r1.ebuild 2412 BLAKE2B 60415e9912525a046630ecca9f466801a3bfe29a5f48e48c937508f9ba6cda2f55974e218d3dbf9e41196798f049851e6e4c68871a09ee7dacd05afe892012bb SHA512 e7ff6954f36159d88e74fe0789d7a38b1ac22516f189170533e2b05a8bf9455c8cb459af7794be0bf81ae3af4c58a6b0abcddce8282357c5f4daf727134bd912
-EBUILD zziplib-0.13.71-r2.ebuild 1662 BLAKE2B 001c1b96f530e4ab9ae1f3051d0d2c61c81f68231d4dddac9307009cd3217940c838214b968ee8c82eb6780209a92d1ffb4a9c1b330a8dc8d1a2ec1e5669506a SHA512 5836b3101e1073dd59028988934c65f086c498f95575faef5b33a9f6436f5ff3e2b7a2769c9d9ece4dc363ae3551e68af62ea9641762ece380b8ee60fdfba860
-MISC metadata.xml 448 BLAKE2B b3c0c50b50155b120d35504fd0237bbdd681f7b98c8b9bb5df38a07102a987211861ef66c692152b625274f3957f8e3d03e1b4cb1c95410b4fc64bc9f9b04cf4 SHA512 f128ee3580c81af1a61388285aadb8481adccd9f113a734c853bc4b1ae5f9924ee12dbfa2086a28eb3972348084d5c86c81747f0deb04094322af70836c1f58d
+DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
+EBUILD zziplib-0.13.71-r2.ebuild 1697 BLAKE2B e0bd52b503282616a25e68ea19c97710dc125a7f7d425ac8e856a861cbdfe6f861364984bd89f6893ff4cc549c7014606e02f87c44133c2c4486e8c6172cbb8c SHA512 6ea9b49bf19412a20a952242ff56aa7a3d5148552e92d168ca4d61507ccdea9b2480c07afe773ef4b6ab103873a8de9e43e137fb5e6e4ef03c671e2c06ac4c26
+EBUILD zziplib-0.13.71_p20200419.ebuild 1424 BLAKE2B 3aed19e9f270d72517f7267bec8c0e85f4682578ec5a60e4ae03ddefa76adc11d1cadf0d07174013deb98e9d9f1cc33188f8071e6fb67400bb0309158a00dd92 SHA512 f3ff2dfa70c3c059c55ff6b5a1e4ef6b6102ce9ce46ac053da6c4760001c9ec0405e7b15887b008d2095334245167037bc52c5e9027ec5fe376b994d8dc807e3
+MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
index e29599c1b2d1..6c62442c5dfb 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
@@ -9,7 +9,7 @@ index 7ceba4a..c1b8172 100644
 +find_package ( UnixCommands REQUIRED ) # bash
  join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
  join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT SDL_rwops_zzip.pc
+ join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
 diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
 index a9f6e3a..2cdd275 100644
 --- a/zzip/CMakeLists.txt
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
new file mode 100644
index 000000000000..08130f958dda
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
@@ -0,0 +1,14 @@
+# https://github.com/gdraheim/zziplib/issues/93
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index b679f7b..e2887ee 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -190,7 +190,7 @@ add_custom_target(install-manpages
+ endif()
+ if(ZZIP_MANPAGES)
+    install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
+-   install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
++   install(DIRECTORY ${outdir}/man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
+ endif()
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+ add_custom_target(install-mans DEPENDS install-manpages)
diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
index c47cd2c82f84..6183ccc5b3b4 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">gdraheim/zziplib</remote-id>
 		<remote-id type="sourceforge">zziplib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
deleted file mode 100644
index 852084f7d26c..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools libtool flag-o-matic python-any-r1
-
-DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
-SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-man.tar.xz
-	doc? ( https://dev.gentoo.org/~asturm/distfiles/${P}-html.tar.xz )"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc sdl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		app-arch/zip
-	)
-"
-DEPEND="
-	sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.6 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${WORKDIR}"/${P}-patches )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	use test && python_fix_shebang .
-
-	# workaround AX_CREATE_PKGCONFIG_INFO bug #353195
-	sed -i \
-		-e '/ax_create_pkgconfig_ldflags/s:$LDFLAGS::' \
-		-e '/ax_create_pkgconfig_cppflags/s:$CPPFLAGS::' \
-		configure || die
-
-	# zziplib tries to install backwards compat symlinks we dont want
-	sed -i -e '/^zzip-postinstall:/s|$|\ndisable-this:|' Makefile.in || die
-	sed -i -e '/^install-exec-hook:/s|$|\ndisable-this:|' zzip/Makefile.in || die
-
-	elibtoolize
-
-	# Do an out-of-tree build as their configure will do it automatically
-	# otherwise and that can lead to funky errors. #492816
-	mkdir -p build || die
-}
-
-src_configure() {
-	cd "${S}"/build || die
-
-	append-flags -fno-strict-aliasing # bug reported upstream
-
-	local myeconfargs=(
-		$(use_enable sdl)
-		$(use_enable static-libs static)
-	)
-
-	# Disable aclocal probing as the default path works #449156
-	ECONF_SOURCE=${S} ACLOCAL=true \
-		econf "${myeconfargs[@]}"
-	MAKEOPTS+=' -C build'
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
-	default
-	doman "${WORKDIR}"/man3/*
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-src_test() {
-	# need this because `make test` will always return true
-	# tests fail with -j > 1 (bug #241186)
-	emake -j1 check
-}
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
index 3ba3ea9854ef..20fc04ec8876 100644
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="http://zziplib.sourceforge.net/"
+HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
 SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
new file mode 100644
index 000000000000..cc20d2152c50
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -0,0 +1,56 @@
+# 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 cmake flag-o-matic python-any-r1
+
+MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="sdl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( app-arch/zip )
+"
+DEPEND="
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
+	"${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing # bug reported upstream
+
+	local mycmakeargs=(
+		-DZZIPSDL="$(usex sdl)"
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DBUILD_TESTS="$(usex test)"
+		-DZZIPTEST="$(usex test)"
+		-DZZIPDOCS=ON
+		-DZZIPWRAP=OFF
+	)
+
+	cmake_src_configure
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-libs
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)