gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /dev-libs
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
98 files changed, 1210 insertions, 810 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ef809724c3b2..cd36e0c8a645 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest
index 4de7c81deccf..5b44bed99e78 100644
--- a/dev-libs/OpenNI/Manifest
+++ b/dev-libs/OpenNI/Manifest
@@ -4,7 +4,7 @@ AUX jpeg.patch 704 BLAKE2B a3261b7834fec0134929782a8283840bf9a5c2483272f57598c93
 AUX soname.patch 670 BLAKE2B 2fa9843c9be26474a9ba7d5a45ce258ff97ac32ffd4e32c23d572de94f9b7b3722e8f6a61ec5f6ed7d96837eb7e423163536960f07a5b4ecb86c96835ef841b8 SHA512 422c90b220b9366320f2513798d00c2d8a17b0db0ccb87150038c2f237d22c7f0d28206e6d00a7c73b758b6b021886a666a8860586f27fe9b57ddb14094ba7f4
 AUX tinyxml.patch 828 BLAKE2B 33698417dada91b4dbefe81de4f41f0fb9990478a1b0db9e4cc6fea4bb6951c49f7bdf09830cce81c4faf87213318fd0137e8058a7f4dc83b5ed9d688ec2655e SHA512 97cdcbbcd1d4ab4990c7a96ce21c4da983347f73c8064959bbb66d49cc9cda5e293b0273f19d1595ef5b26a6c32267b54cdd45fd4a86b2d8881501a3cea5724a
 DIST OpenNI-1.5.7.10.tar.gz 23378582 BLAKE2B c3532e3fb03bce9a30c94dc950591064d7b62d9eec8d5321c4dc65433be47652f9323a12401b8cbe4d3b81516120712720c1497ab51f220889b26fb33a4fcbc8 SHA512 f7b6106198c4314584cf327744e9d8b193ff9f2e8d416769aafb2aeeda0593ccbb37c3187ed75f1960d2ae8e80e8f30e0fced9ff82e20fe6f24c54246f77d512
-EBUILD OpenNI-1.5.7.10-r1.ebuild 2511 BLAKE2B 5daab8302831e9b5d8ea458e0e8b7549be14b5f35a1160e7d855b2b51d2dfd1a2e513d7e58b25f8c34f62fa34c61bf87c5d8676df5d9260f546e0373e3b096a2 SHA512 f1e1f672e815617d7d17421a98de866ab2796b2149d739cce8e948b5ccfd7a0f2b8ba2ad2ad05771aed004bc476907a7321d0eea021fed5bcfdab74d6e26decb
-EBUILD OpenNI-1.5.7.10.ebuild 2473 BLAKE2B e3a90c1a8a86b3c41272ba282b9522bc366d33533bafd1a3d4264662afaf84a1fd12f0f2665e89a306fa2d9a61bc0e08ea271c7513f0f3465f7bccf6e2ad8bff SHA512 c64a68f6495f0cfef657c6ec24104ec9af66b6d3ab5624c74b72faa3681c6b3a6d68775b6cd3e8d46f1610b081f26d9ef3cf7e027182f6d5940a7b212ff7ad8c
-EBUILD OpenNI-9999.ebuild 2483 BLAKE2B 362b271856cc9c01c4f4e4459404581b6611496de0c449fc5a8f4ef309a5230aea4695468692867d30e3dbbf9f205a8e09f4eacbdd9c439abd8a538022da45d3 SHA512 84ee0a656058d83265ab8ea7ce5774242571d6b31cd3df46788c81aaf7b34e2608d946ae2d638e965ebb9085dbd658fd8963ba581a90b035d8ae159cfb826a83
+EBUILD OpenNI-1.5.7.10-r1.ebuild 2498 BLAKE2B 524576e390587ee8c7a051fa78fb6806b0be1c51ccd1e5e8fc2063ff9632d34e96ce8984aac5e691a83d714f05ad06ff0d69bfb810218acd354acd9bb5ff1294 SHA512 881211b35d60046b2eb1594865a85f4e6070af649d04f10b16ee86cb2531bba4fa5cc295d573fe54520e9569a24d13c3e6f7d74e3d1dc53d93480fe30aabffa0
+EBUILD OpenNI-1.5.7.10.ebuild 2460 BLAKE2B cb3cfb1ef28422273209d13442ddf071f8704c10dc5f5f7fe52b6587587572dbd18c22cc80a1a99e4c8fc6e8abae1e0587277852284a846d0b1c1e83370ac4a5 SHA512 d4a442961664d0e1577189cb4d80bf75ca07fbf6ee3a4f599fc13be5513e3014c300d56da4bbe79ce09bfb857f8ed5461fada2658e603958d3c5beaa3a7a3acd
+EBUILD OpenNI-9999.ebuild 2470 BLAKE2B fbbb6d29dbfafbb2fa95256914522a3042141079c7f8eadeeef63a1bb2612366b39ee21610e28d1f71c71808da49dae448746843f54d3e9ce9269b2c4fda0840 SHA512 ea64a6708fc796d7adad7fbe4f132647e280b1afe6768aa6b5a5c59376314ffc8280677d337c73593887f375cb9149dce104e58b5559364c54c62647d116d066
 MISC metadata.xml 337 BLAKE2B cd1617fea5ee8e8c5a39708ca2fe56342ac9bc77d7bd6a82ee1c2a3a81b16d5af8e4e90d916164fc9e998d523cfac65bdf5ea03e80e6e3f64c00a35bee310186 SHA512 31029665f81cf415898ab97a48804b3ddd5efae31f7800348a7b96dfd3a7faf1d4ae3275f039a8397040c6a3c83868252671ce1dcd35b6f1135d221b325ba5b8
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
index 674ccb33fff4..da575a346132 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
index e2c08a5c23d2..b8c8b9916996 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index 2d37b651a917..c25f316b655b 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/OpenNI2/Manifest b/dev-libs/OpenNI2/Manifest
index 7522a3054c43..0423adf4895b 100644
--- a/dev-libs/OpenNI2/Manifest
+++ b/dev-libs/OpenNI2/Manifest
@@ -5,6 +5,6 @@ AUX pthread.patch 977 BLAKE2B ce3989613ea9672b67deecd0ca35f5f4bb31d8bcd6cd46985e
 AUX rpath.patch 569 BLAKE2B 5a9433fb5ef61c73c08b22d942f8f9a4b5340bf3e8f7fe834f56025dac0d4a65c17065a0e8151d36c2fbcd7651a3e6c4d4c7579ad1dfff6f552877197c619345 SHA512 86adda790d6814b0339ff969e262b78282c977ff4dc16268d4e7831e1086886aefee5c37c5bae9e97b7caf3e9f22e922f87e429e586fafc8e5503b4f99ef4adc
 AUX soname.patch 674 BLAKE2B ba4b8038016ced8d573e57257cbcc7a61f175ec29a720f2d86c04aeacbd5608d315ee54e8ef260daf1548788a59ebe2cafe0d911cedf58b7eae9f8c0b9c6dec6 SHA512 fec4ab17efd29e1fc05a880584aa63559d311a248ef6def36af9c7c652f93aa0ba77f600115f0e4093b7c5c0b446955a4d36d9663196882f5c460a26d99498be
 DIST OpenNI2-2.2_beta2.tar.gz 8681740 BLAKE2B b5191fefd93a5b10e43412d4f0c1ae095a5168ea788d0e2b325daff3ee0329a47f3341c0d712c3a186d23cb3f9fa03478f3342acbd634502cc92aaed0d97d185 SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f
-EBUILD OpenNI2-2.2_beta2.ebuild 2480 BLAKE2B 6b4bfaa43358a8925f1a40fdf0d740d6c9682ab7d0ba160d0ac6f90715a6f600a8a164d1c7f8cf89d0b0c4a45e560d812ee8bd518b71251bfc25851e74f89a46 SHA512 d92e928bac12f12eea2479c9067b0a4a940f670874cc1d69aac3acab090e22a4d63f2e5af246916f5165687b43552fe9c8c661f9e25d5f78d12d8149329e0059
-EBUILD OpenNI2-9999.ebuild 2421 BLAKE2B 059eb2302c07dae2a1a3aa8f5ffd0ec81cbedb418c5fc3a483c1c885fda0bfe704a056f58453f8eb80b49c8908604998e91a7ec1d2982c44e73d637a213af156 SHA512 f92664c6028c0c40f4a5329dd5cb93fef6fb193e1947a60588e24bfc93ff3588b8cb2ef643e9aba2dd302d2b3d7680ceadbf472c48dd4d21bf8ecc22dc0a4561
+EBUILD OpenNI2-2.2_beta2.ebuild 2467 BLAKE2B 423da72f842b6339a040ca9926b9c2fc88168b113e24f699f2d1aad193d3616973286bcfd39bfa8a7dcb11beac3d0727a66f84ffcfa8cab68197f372a3498fdc SHA512 7bb1fe06b12856a9f5b02e05c1265293c1b2d76a8847d20ba4dc6b674997f93697af1eda983b3040cb38dc1044fb7c500c59b8ae0dc38b9d85312300a05df468
+EBUILD OpenNI2-9999.ebuild 2408 BLAKE2B e4d0c8e4cb8aaa514bb43b38a83d73da1fe345fe3366410049721c969f12bd37432bebc4c423ac6940efae9749af018c9dc70594a2da2a6e649f875681cb9b90 SHA512 7b5545ce7b267f9499c058fdc6214700f20b7a2024b2b55f19b4cd38d17a695c3ed16a7e5896b4403e754ace51075347aa207cd0f64fdc133d904ed015186f99
 MISC metadata.xml 341 BLAKE2B 5cf0f39369a82aea80badc678a0766aa9f9d2d2fef2108fa27bca9f7233d443371298334b356ba6253edba043d941a0ce821e23f5c1a119cddcedd8e79b1c9b7 SHA512 414b64e60046dc1628494ab50ae5f4c5594b9fe71daf7cdc844428200e6122bc471e27f982fa4eaaed6db6f93fb53312118a35dd52e01c576e8597f3e21b23c8
diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
index e3fb3e2b667a..84eacb9fa589 100644
--- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2 flag-o-matic
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
index f9609af50af4..7754345b7f20 100644
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild
+++ b/dev-libs/OpenNI2/OpenNI2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2 flag-o-matic
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest
index caec5a5ad05b..27e9a56c22f0 100644
--- a/dev-libs/console_bridge/Manifest
+++ b/dev-libs/console_bridge/Manifest
@@ -4,6 +4,6 @@ DIST console_bridge-1.0.1-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f
 DIST console_bridge-1.0.1.tar.gz 259480 BLAKE2B 78df3aeaba2e7589166709e7c43a77ac021d22d0db8d379f320455a9d532b247083ff86c3e03d7f9842943c3c98f78cfb33d7920a2987433f822a05ccaf23866 SHA512 913b7ee1d5401c6324eaaab1f8a54d5ff6df4eedb119a1cd00712f223750d69313047344aec5887920497c7b456cf6cb88e5f756bfbbb5ed8223ec758cdfd021
 DIST console_bridge-9999-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c
 DIST console_bridge-9999-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab
-EBUILD console_bridge-1.0.1.ebuild 1703 BLAKE2B 659359edf3b720a1f1b522d7b7c82490f12d3b13e78baf800b980663b6fb14723e3e7583e594c8b4644cbe6b984eb7507b7096862efa4b27788ea077acafdb9d SHA512 6c5396dc581d061536be6a29d27f864ca2d420ade806dbcf7fa1a13316862aec7b03fac1d0fc0de7fa370e25ad087184c90a51c953997dfddf47af0d782dd20d
-EBUILD console_bridge-9999.ebuild 1703 BLAKE2B 659359edf3b720a1f1b522d7b7c82490f12d3b13e78baf800b980663b6fb14723e3e7583e594c8b4644cbe6b984eb7507b7096862efa4b27788ea077acafdb9d SHA512 6c5396dc581d061536be6a29d27f864ca2d420ade806dbcf7fa1a13316862aec7b03fac1d0fc0de7fa370e25ad087184c90a51c953997dfddf47af0d782dd20d
+EBUILD console_bridge-1.0.1.ebuild 1690 BLAKE2B d8525f60b52477f8d8f1e207745493bbe4ca041ecb141c5838e90e2862430b71e61ceaa3156c140ee472225cc881e7ab08497f02d28fafc73baa3b8c65aa24e0 SHA512 174d7a98c79695cac6d7d9a0feed363673e0e3c0baf70a1b5c5b13a154a5d4f1f87c6f43844392ca8fe5ba4c33ccbeb5242beb26fe1be927c967cf415a0a5625
+EBUILD console_bridge-9999.ebuild 1690 BLAKE2B d8525f60b52477f8d8f1e207745493bbe4ca041ecb141c5838e90e2862430b71e61ceaa3156c140ee472225cc881e7ab08497f02d28fafc73baa3b8c65aa24e0 SHA512 174d7a98c79695cac6d7d9a0feed363673e0e3c0baf70a1b5c5b13a154a5d4f1f87c6f43844392ca8fe5ba4c33ccbeb5242beb26fe1be927c967cf415a0a5625
 MISC metadata.xml 342 BLAKE2B 27f453549abc2dbcca6275e79549c765f3802eccc8161d95baf12311844a9a2b4b42ad7f20e84ca07bde29048436dcfb2b9644b88f30f5a2889b50516afb1e10 SHA512 a438639c10d92d4ae5b4b54b7dff6dcdecfe829544dc7480dd830f38803efe0207f142d5b6177aafb1b170979d11dea590d85d75ac7814dead2edce720367aaf
diff --git a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild
index a93aeb6410c5..495e31259084 100644
--- a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild
+++ b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ EXTERNAL_PROGS="
 	https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py
 "
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI="${EXTERNAL_PROGS}"
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/console_bridge/console_bridge-9999.ebuild b/dev-libs/console_bridge/console_bridge-9999.ebuild
index a93aeb6410c5..495e31259084 100644
--- a/dev-libs/console_bridge/console_bridge-9999.ebuild
+++ b/dev-libs/console_bridge/console_bridge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ EXTERNAL_PROGS="
 	https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py
 "
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI="${EXTERNAL_PROGS}"
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index 4fd68577b521..2cc0996cbad0 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,3 +1,5 @@
 DIST cxxtools-2.2.1.tar.gz 821324 BLAKE2B 95139a3862a7c2e6652b475527bf0946e0921e0e80fafa0731c3a9ca3dd57a9383ebde080eebdfb80ae572aa5638316ddcf81e032195e162e3aa58289675e643 SHA512 b6dc3f63c39fbbc35af973eea668a44d30673140c72bfa7efbdc21a71816be2983e85312b9213264d4f5162c3e420eedb41974bacb7fe8176f2a069b6f8f6f7b
+DIST cxxtools-3.0.tar.gz 1079247 BLAKE2B 536680373e194dbdb6a79bdb09960830b6aad34c2657a0024b218321154de81653f1e47db13abfcf13f0179fa6f85e0a30a4b97f0e64ca0ac5f1cc7be003270d SHA512 839be18a8bf40c1cbaa016ac50ddacfd879d1f9bea6521209c65790d67d5ee81377519aac2fb373a5de154a293e33185401848e41a697aa57ad6aa42d4854250
 EBUILD cxxtools-2.2.1.ebuild 527 BLAKE2B 93a451544631790caa015e69682d33cdd35a8227300a1bb45f9db233450a6cc47da2eaae2be2bf17d620eda62d5abec10d967dbc1cccb7511d5d4ef13e8c2dc8 SHA512 9e191e97d2ddfb7e02843896d3c3e191e0b3fa7628e4a417e980bae2320774bbcea0c391f8b32eeaf8dcdee44068e6a849f9fc863daeee814d56a7fd6db6d3f3
+EBUILD cxxtools-3.0.ebuild 678 BLAKE2B 590ce72d8498f55b3b41e8a8be4d422a57af427d0fbedfa43ad955ccee3b126cc3137372590f0dc384389ada519d64b052da27a8779ee940207d3975a33c4718 SHA512 5b055479448d32e975ee60e22a371e43289cf357251236c5bfa5b2b409e83e93df6cb8d60912dc96340e33ab56be1157c2c4a3f23cc5df3d39d9de0325eb4945
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/dev-libs/cxxtools/cxxtools-3.0.ebuild b/dev-libs/cxxtools/cxxtools-3.0.ebuild
new file mode 100644
index 000000000000..74090a93a518
--- /dev/null
+++ b/dev-libs/cxxtools/cxxtools-3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Collection of general purpose C++-classes"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS )
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-demos \
+		--disable-unittest
+
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# remove static libs
+	rm -f "${ED}"/usr/$(get_libdir)/libcxxtools{,-bin,-http,-json,-unit,-xmlrpc}.la || die
+}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index d28b862ed3e6..1c4d3160c232 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -3,6 +3,6 @@ AUX ell-0.35-add-rawmemchr-to-missing-h.patch 1195 BLAKE2B 2ab70a003b79f10f755ef
 DIST ell-0.35.tar.xz 506400 BLAKE2B 694df293ce5fd31581cbdd9c2f6f3806a07a23ffb76cf04d6c13f1eebc8af5228ab030f3f1f6d68e1f234c4f1c55a6a1c41e93c41957c19ffc57255e86a78b26 SHA512 a61fc6e8b16627920a24a4bc271549863042ba27489039311009b7e16fe04bb88debcdcd239603cb471b78674a57851ee5ab8ee16229ebdf77850e0945410179
 DIST ell-0.36.tar.xz 515888 BLAKE2B 094ccd94a73a0c9f4ffbf72f65137e4328c868f2bbf7cb0226502d2efdec7e7618dca0e73547d7a9d4cf9e0d01222f067ed5bfa053dbf38402a625a0044187fe SHA512 2b21220171e3be36e7f2779d78ebd1cb783c52813408d1cdd9ff742e30b426830f26b44784f2c96cbcd5f0cefc9152693795a16e6861087c45ef7539a86b944c
 EBUILD ell-0.35.ebuild 1482 BLAKE2B f490d92fb666ec44e189178e659336df949c25c55f99ae7b370bcc1af48772a4d1bf24c0a9beacaf6a0140ce2cdf9b39448e44f8a294a0a570bcd12ea73b623a SHA512 2d859cc5e33d61c44c4dfd4f0be3820d80840a12ee408d49a228deb379256b2500f58e04625f08c58773b758f94139fbe7e5e7c65ecf2c1833b62a7d67be9ef3
-EBUILD ell-0.36.ebuild 1255 BLAKE2B 81943d181741d3dd8e4bba50802057562b6b028d9ca08e0a004600fc25b97912ca1e8a4b75ecfa67e76e7d8b33de01b0a61297a0248874016b4e7010ee50c9aa SHA512 00b510711c700b90f79b13cfa363a3f226dc17f7b7a84cc81ad31fa76367e5bb39a101c5cc9112c7c5652595177ef16078429e6d8afb0c03e77ae8fae0f5cc67
+EBUILD ell-0.36.ebuild 1253 BLAKE2B 39c42d8c149bcae4b0ce4c886c2c83141d02a8dc8d0ccd2b4cdc2ae8af80befaf9af2f1a8b242363ea83a6095ee9616bc8eb2de37cd7d1e30ac6e99e7a7274e0 SHA512 67b5dd3428f4db0ae63145963c5678d2c75dd07150f771d3f31c9e09e004477115d139bead25bf188f0b59035408e1f0a9caac976601dad1be5d9453c6ce7ae7
 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.36.ebuild b/dev-libs/ell/ell-0.36.ebuild
index a2fe3280af5f..163c92118f1c 100644
--- a/dev-libs/ell/ell-0.36.ebuild
+++ b/dev-libs/ell/ell-0.36.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/glib/Manifest b/dev-libs/glib/Manifest
index d243c7bf1266..e3fc789423a3 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,9 +4,11 @@ DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005
 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
 DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
+DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
 EBUILD glib-2.62.6.ebuild 9409 BLAKE2B ca6214157f5ce328ab0409ea26a73465c4fd864ef858977fc965e482b56ce4377956389942083de128218461ef6a59498e158aeba8a012b5a90e4500b847f2de SHA512 000882ab5032724685e78d64b12078e86a20b545cc2e0f0cffe476c420c35bd768607bd3ea8392575c5d3f116351a9453f34d0e103d8bc4761fe7ffb9d216781
 EBUILD glib-2.64.5.ebuild 9994 BLAKE2B 85e7698b2251b35f1be32e301ff386ccb7e3159eb6ecdb7e00504433bacfe6b283cbe1a62d04d2e6d154f0a612053ecaedfd2df1172860ebeb3ca041e25e7f10 SHA512 3c68fbf65fab4212a90213c5d97ccb250115f3c80f77fb7d0e768d7d30d770071298a7adc6de8c83078d21a18d74640b01c7f0013cfd414c77f849e18c4e4c3a
 EBUILD glib-2.66.2.ebuild 10109 BLAKE2B 0127f5bb4351d90a2355a12171eecbdc14425e09d60560f33ec6133b544ea3324381860e45ac4191abe7117ef4ed959872fbf6ccd70ba3331434d4f9802358d0 SHA512 0aed523c85564c5027d7b5b94b822814fee89531df97aeace3cb15c632ec938ab5bca136a1c9b5f659d487179e69674dc3052d4892322be1e55e7e29ca09856b
 EBUILD glib-2.66.3.ebuild 10105 BLAKE2B dc3129fe5286630071d5ce7ba28c4fb93fd36fe82058603c94a6eb4bf3dd28d571248f7e2f276b974fcdb8f0e4188a8eff4e3f2876956176812e2f07366adba9 SHA512 1b782096b36df0f6092c71a8d61d11b16a0b8d88968a4102e006c53b5f340f9415e58bc4b6dd784f243b256821269981e504d8e5c45c1d3c786c1610734085c6
 EBUILD glib-2.66.4.ebuild 10448 BLAKE2B 1eaaed679481f49c4c12a4a8c3cc5aecf156c68707ebb8356b4ff8aaf130eba85f67aab62f67ade1a98cdbe2960f76541f460fb753b9335a26f66884c38ae40f SHA512 68c35dba7eeee598ed0fbb3a8d6a62d347444b51f5e17eef57cdb99b21079c7d6f86cf669251092e775a52c799b7a872f9f1f0c53b46f99a71c8bd874824b178
+EBUILD glib-2.66.7.ebuild 10445 BLAKE2B 1b6a39c637f711e63d4a4fd63c8cbaae7335c85f7b861c1a9873026b0a684681508c4b77f1f5c5d589dc24b59acf129e5cc249b1fb80c585b07417f71b0b6c39 SHA512 f85092ee048f18f51518c9e8d99be7586a1032714491b74780134a2c7ff95cc7b518e0ef9642c46eb9e35af1ca6db567a99c11ebe74ec19bc68eaef6ed889078
 MISC metadata.xml 1098 BLAKE2B f2bd17f50d68c553b9040e954c0ef91edd29a3f1f7731bc7f45e3a936f702209985d111ad376ca0b51bdb4736d9ee508151fbb57b273a32beb1148aa027226c6 SHA512 2745b70b29ba0517144343f5d3f4b7c3389200b1ecbd2830e29bd9a90ca59ebeedf4d66b26a3241e3d3a3066f9a26ae223d075b9b2b82d67e4642e784f236c20
diff --git a/dev-libs/glib/glib-2.66.7.ebuild b/dev-libs/glib/glib-2.66.7.ebuild
new file mode 100644
index 000000000000..ff43d5108617
--- /dev/null
+++ b/dev-libs/glib/glib-2.66.7.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof 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"
+
+# * 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
+# right now, thus it doesn't matter if non-native ABI libelf exists or not
+# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	!kernel_Winnt? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	xdg_src_prepare
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/ilbc-rfc3951/Manifest b/dev-libs/ilbc-rfc3951/Manifest
deleted file mode 100644
index 1d41e3c58692..000000000000
--- a/dev-libs/ilbc-rfc3951/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ilbc-rfc3951-asneeded.patch 368 BLAKE2B 63ee534e58ce3cb791711e14797942b14bb5295c8e91e90e64891d40469e18fae13729a10b308e101f24eb06fd5afa728889b866cbb5f97fdc1f56ac2a7d1edd SHA512 6450bfce84f5fe9895117ec45dde903cef308bb7e8a24171874091582a67754be380fed534e779b8158c3880319d8ddc774a4a94135b6deb83b425dc430f5954
-DIST ilbc-rfc3951-0.tar.gz 330306 BLAKE2B cf8c56d9fc3dd2dc6a2dd241f3b0cddb7e7f6cea126056d2ab94aaf8add382f1bc1d9b03c9a91110197e0d82253ca8e824cf37bc1622af26fdf0939204736c35 SHA512 7828a9c5a193ebdfcb383d1edad0868afdee0f71d1a8a878c7d9ea2078fd63f57d31b34ae2cf4890d5abc28c8f5f4ee940c665a126f0512d1e79c4f76a72fbcf
-EBUILD ilbc-rfc3951-0-r1.ebuild 756 BLAKE2B a110fe3805f788f54b75f9a732d05fc9c8a0eaecbe6ebd77979b95f57a429d6d66dfc336ad417feb5a13aaa9f8a2b14a9246cefcad2357b0ff893e1e27e66fa1 SHA512 6937a8ca54d5b6d261a6cb0c87e31c48e21dc2ddb19b302ff12eec09ecd7a5711b26f6c808d4fb620296da36b0a162850a6eb9dc8fbe64f3185da31a2fd0eba0
-EBUILD ilbc-rfc3951-0-r2.ebuild 793 BLAKE2B 6f130149de0736f4980aa48e915d16069a7353752b0ca2f49b632b29d8f717ed5f64a700d55ca7d993092ecf8ecf5549c2cb4a6f20d29142bf4240adf48f6532 SHA512 afd29a17381b9b67fabb1cff1582069ca41eb3c13c7e263c656f0b8cc5f714cba0818e87f883700e31719e4cba2def608acc060fa1b2b81ed5fb9d04324d28f9
-MISC metadata.xml 239 BLAKE2B 9d90102c70502e3f729b461b00c463f8958602cf2464e9834a5d680a802a46655051b741c47ec0eed98fb758f8a9e388a982c2db65bd644205a4f9bbd6a8d638 SHA512 c9696a97f8ba113ea6badf5fcb179b749639703ddea443d6d8170f0982214e59bd0bbe58b5e99f847c953df2d772d0bac6b2dc72f89b146ba55ea69e177a7615
diff --git a/dev-libs/ilbc-rfc3951/files/ilbc-rfc3951-asneeded.patch b/dev-libs/ilbc-rfc3951/files/ilbc-rfc3951-asneeded.patch
deleted file mode 100644
index 115d339dd861..000000000000
--- a/dev-libs/ilbc-rfc3951/files/ilbc-rfc3951-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -10,6 +10,8 @@
- doCPLC.c     gainquant.c      hpOutput.c  iLBC_define.h   lsf.c          syntFilter.c \
- doCPLC.h     gainquant.h      hpOutput.h  iLBC_encode.c   lsf.h          syntFilter.h 
- 
-+libilbc_la_LIBADD=-lm
-+
- ilbc_includedir=$(includedir)/ilbc
- ilbc_include_HEADERS=iLBC_decode.h iLBC_encode.h iLBC_define.h
- 
diff --git a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
deleted file mode 100644
index a2aced074624..000000000000
--- a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="iLBC is a speech codec suitable for robust voice communication over IP"
-HOMEPAGE="https://webrtc.org/license/ilbc-freeware/"
-SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz -> ${P}.tar.gz"
-
-# relicensed under 3-clause BSD license, bug 390797
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/${PN}-asneeded.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r2.ebuild b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r2.ebuild
deleted file mode 100644
index e0e5d1ce1547..000000000000
--- a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r2.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
-
-inherit autotools
-
-DESCRIPTION="iLBC is a speech codec suitable for robust voice communication over IP"
-HOMEPAGE="https://webrtc.org/license/ilbc-freeware/"
-SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz -> ${P}.tar.gz"
-
-# relicensed under 3-clause BSD license, bug 390797
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/${PN}-asneeded.patch )
-
-RDEPEND="!media-libs/libilbc"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ilbc-rfc3951/metadata.xml b/dev-libs/ilbc-rfc3951/metadata.xml
deleted file mode 100644
index 9e1628707c92..000000000000
--- a/dev-libs/ilbc-rfc3951/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>chainsaw@gentoo.org</email>
-<name>Tony Vroon</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/jthread/Manifest b/dev-libs/jthread/Manifest
index 9e815fa3d331..9cb8228c5494 100644
--- a/dev-libs/jthread/Manifest
+++ b/dev-libs/jthread/Manifest
@@ -1,3 +1,3 @@
 DIST jthread-1.3.3.tar.bz2 8514 BLAKE2B ba24fb73f5b02e64af81f889401cc81acaf8c6d60fcfa0316b92e9356b36f8ec65a9cbf0fb999867ef2b590fe15a46136f165739279b14805d26dce8d55b1b0e SHA512 87c57db51014cd1af87cb4a7f6ac1ccfdff699cf72ff91ecbdb30702c844aad360768261d7bf6391b96639cc17f2fae29f3f3506a333b4ce6ed8a9ba64239e6f
-EBUILD jthread-1.3.3.ebuild 709 BLAKE2B 8113dd23cc9148d0771c5e0eea1285baf4744a566189818c51e7913ded5462d97551054c44601500c6c8d99982061e79fa53cd6ffdc3e4bcc3636e15a12d3d87 SHA512 998332ba561ae05249794502f8f5f286b9bea046124e0331c707c1f2adef2c270b64877acde8ecc6239a343f05e8c4fccd66ca8fc846ed1bd67b4a5c2e660ec8
+EBUILD jthread-1.3.3.ebuild 722 BLAKE2B f149f2b9161cad7172117f5e2d60e7d5efbd57fecf47b49c313706ecdd069448347d91971889b6ec021668a0b76de04f775c8efa63967888c41eb40efb3a3300 SHA512 bd9ff6a733a3bc74d62e9877d2e3cfafdef314e562503604434a98e7ea7956eeb8e7e00d3327305ed40310b223d611511c6db5c4a70bbdd9933d610a1576a82c
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-libs/jthread/jthread-1.3.3.ebuild b/dev-libs/jthread/jthread-1.3.3.ebuild
index 165ed9f222d5..3a5c2032dd48 100644
--- a/dev-libs/jthread/jthread-1.3.3.ebuild
+++ b/dev-libs/jthread/jthread-1.3.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="JThread provides some classes to make use of threads easy on different platforms"
@@ -22,5 +23,5 @@ src_prepare() {
 	if ! use static-libs; then
 		sed -i -e '/jthread-static/d' src/CMakeLists.txt || die 'sed on src/CMakeLists.txt failed'
 	fi
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index f3bb6075e318..a43eda66885c 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,4 @@
 DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c66f80e807035f709822f241ef74f64085260678772580cb82bcceda83b4b3c31b92393f8d70f24d54f77f7ba224 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
-EBUILD keystone-0.9.1-r1.ebuild 1988 BLAKE2B dc949308c7b5222461974cdd9e8edaa75312ad24d88bb6cab068a835488f5a072f36f4744ce2ff7af31a2bf0d40845473b752a9a49608d782939b7b2383b76e1 SHA512 032f9647185496e1054374ba1ebfcb0ed702846791845617864ff666f1138f7033aa4ab46c56921721c8932569deef7b06893214a6ee7adb1f385ac3427cdb39
-EBUILD keystone-9999.ebuild 1988 BLAKE2B dc949308c7b5222461974cdd9e8edaa75312ad24d88bb6cab068a835488f5a072f36f4744ce2ff7af31a2bf0d40845473b752a9a49608d782939b7b2383b76e1 SHA512 032f9647185496e1054374ba1ebfcb0ed702846791845617864ff666f1138f7033aa4ab46c56921721c8932569deef7b06893214a6ee7adb1f385ac3427cdb39
+EBUILD keystone-0.9.1-r1.ebuild 1975 BLAKE2B e377bd45243d07ba66bd3d06f4319189c62d37c4c2a94e192f60d965c15e4f418490cc9b805ca2b1daa016b1a76279791990998a4c8d9bf25dff700eaa7dcb9e SHA512 900867295aba6145779ffdbd166d797a63e8b104bd3a2bf27ad8c3cbfa0e1ea6efb02a29962f7439c5285480263ef29bb121a9bad212b75c693d74a86a09716b
+EBUILD keystone-9999.ebuild 1975 BLAKE2B e377bd45243d07ba66bd3d06f4319189c62d37c4c2a94e192f60d965c15e4f418490cc9b805ca2b1daa016b1a76279791990998a4c8d9bf25dff700eaa7dcb9e SHA512 900867295aba6145779ffdbd166d797a63e8b104bd3a2bf27ad8c3cbfa0e1ea6efb02a29962f7439c5285480263ef29bb121a9bad212b75c693d74a86a09716b
 MISC metadata.xml 256 BLAKE2B 3e4f2745a843bada1b6d70aa80041aa3235d81b928ad329e3e01d8dbfc65c4408e73b7f0a2ed11b838fe25dcd6c20e2ef6461a3a9a08a81176eca079e22e203d SHA512 2d6b8edd67d5030357e85c8262e76ef07bae042f07c1061f4883554436236790086cf77b27d0fd107ebeeb2f4d9f30f47be0d831c907e4cfc84c2e99bda188d5
diff --git a/dev-libs/keystone/keystone-0.9.1-r1.ebuild b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
index ef59c54b435b..7a76969465cf 100644
--- a/dev-libs/keystone/keystone-0.9.1-r1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ HOMEPAGE="https://www.keystone-engine.org/"
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index ef59c54b435b..7a76969465cf 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ HOMEPAGE="https://www.keystone-engine.org/"
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index cbd2b36b88af..cca6df39e56c 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -2,5 +2,5 @@ AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c
 AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
 EBUILD libdnet-1.14-r1.ebuild 1505 BLAKE2B c56665847b90b14919528c753e2cc87d311d3c378c32eb26c2389e59c5a4d883c00d03e1fdf9702195f1d50608fc85958309e56dd041c51e94588b20de91f861 SHA512 9d6e0f8c10d8b0cfd24b13462caa2e47fe49ec04b52f029d1de20939be26d0c5617b37fc65ad9c7566f2a6ed3c2cf9e58d78a5594b0793f5460f2110806b9188
-EBUILD libdnet-1.14-r2.ebuild 1552 BLAKE2B 08235991e92a0d66f72a857ff14da37675d54bea6920d482b9d7f372f6b1ac2467e68701869e9ee3b836d4fab657118ae2e93d58a6935f83232bad324c294f56 SHA512 718018738ff97196bd78c923b9034278c8fad1396f31395f3a514e348c5604205920c06c698e6bc802d20aa5aa2932214e8b5a975adf9752867b1d7172ab91c2
+EBUILD libdnet-1.14-r2.ebuild 1550 BLAKE2B 30605f217b906b6c6ee3ee4a8ba3a009c613947a2178a3771a0a1b8752e753faa365e387338006021b925888742819b52736615723990c3b761e02b47c73610d SHA512 0aaadbf54e4620754cd0031a628e4001d3743c8ab01f45518c817cfcd6f57450b8e9126bf3d6c7a1076d3789bf3d367045ba7fff75e50149cf94d7a8ac48c50d
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
index 1b5ff4c27888..f1fa7a9b02d5 100644
--- a/dev-libs/libdnet/libdnet-1.14-r2.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index 793f1ec1c76b..82431ff396a7 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -5,5 +5,5 @@ DIST libebml-1.4.1.tar.xz 70096 BLAKE2B 9b4ae80bcc2184f018c25f1a644acdf9e79c5ebc
 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 594 BLAKE2B b83fcefa006b8d180ad9556ab51a4a3c623df1608dba85f70b4004ea6bf47b6372c724c27bace7c1aa72d71a5875dd25daa1eb61ea9afc672bac9f617173edca SHA512 74cfaa253181ad4bd3b261fcaeeca70512b0d7a23df344fe63ea92dfba6f78bf3acdbda15c3f4e704f8ac91f97b9881c850bd40c6912f402bc1b97b81aee6e9b
-EBUILD libebml-1.4.1.ebuild 593 BLAKE2B 8382b7e46f03893a9dc8e391a135e273310ddbd72fe67fde73c5c39bcacd923de3f2ceea20bec16856f8d5c18be8cb1b3eb4fa27247508d19864cdd8353974e4 SHA512 312bbd96232c5d202e0d81e7d176cb59739646858b1884fab3cea467857937b76dcadd167e885ef364313e3ea479d9b122e021caaf5c544cbdc77554d95d0566
+EBUILD libebml-1.4.1.ebuild 590 BLAKE2B 7620d314df2222094c2356142fb93a2944c1b21595d09e5b382bd0ac24922369db1b8161634de11a7a53ddeb4f94bc3ccda7c15252b7e876221be8ceb5cefe57 SHA512 6d26aaadfe821c31d9a9daf07b83815156cf31f4dcc6a38a2a1b6690c3e34475683c78b92137872244114f4a8b21697ffb68c9b05068d4877a3accfd58581c90
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.4.1.ebuild b/dev-libs/libebml/libebml-1.4.1.ebuild
index 6bab6b4c17bd..be4140b75697 100644
--- a/dev-libs/libebml/libebml-1.4.1.ebuild
+++ b/dev-libs/libebml/libebml-1.4.1.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"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 701a6651d15c..8c1791edf491 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,5 +4,5 @@ AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d7
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
 DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
 EBUILD libical-3.0.8.ebuild 2329 BLAKE2B 072647dac4c4201e08c647feda8eff2a57810055beae2074c3d05bd249d708d1b64609304955fa270991c154bfdd9a141aca47e00b49c74f2f4d8ebe149900d9 SHA512 6bd7a557255734399a525bb9b0f47c834fd711ec2f27368d5e6c6374dfdf13ac5804caa8656f74c1283bc07cc5a6e9a4291d78ce36ffc3f64393dce9c1d52d9a
-EBUILD libical-3.0.9.ebuild 2264 BLAKE2B a33d4bef7c3f18830a72d7510fda246845c637977f2d4ba81468587dcad224919cf0884c4ae12c022ffdf2b2856989f2ea40743a5568ab710161f6bbd11a3860 SHA512 da281b2a85b3d77d1abb412bf78d593d18605962843046b4c3131dbdd8a756738bb81fa525c023a0b9e188c49268078f9a79b0153e23faad90556ceb41d2457e
+EBUILD libical-3.0.9.ebuild 2424 BLAKE2B 2ebb58db84d5ba8c6d676fa8f92fb71176f206bb2981bff4c2fd23873a1e02cc938e35f20206051f36472077118804a4d32200767e535658fc5ac373568ca3f2 SHA512 6909c5eb88a2e59dbbd9c2153363ad07448083b5fca78d1cce9380a9029b8a0bedcaa41cff053391681a75ed1409b583bcdd8241e34112fe129c1a55098e388a
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild
index a8a86663276b..27c9d5a47a41 100644
--- a/dev-libs/libical/libical-3.0.9.ebuild
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="berkdb doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
@@ -25,7 +25,10 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	introspection? ( dev-libs/gobject-introspection )
-	test? ( ${PYTHON_DEPS} )
+	test? (
+		${PYTHON_DEPS}
+		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+	)
 	vala? ( $(vala_depend) )
 "
 COMMON_DEPEND="
@@ -50,6 +53,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
 )
 
+python_check_deps() {
+	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index be993b7d0806..672bcd157ead 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,11 +1,3 @@
-DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
-DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5ce1ae76f9c35587c830c064a4b712284df4645cedf054a41e66ab08d14d080c4fe1d316a108b997207b78148ed579 SHA512 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d
 DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
-EBUILD libintl-0.19.7.ebuild 2066 BLAKE2B 5925fae4985e0b0d813dd96e0199b89f419255bbeb1d352faca32aea68da710125dac072009af426a29336b01d69f7d4c0cd62f328496a27fc570916385d3e34 SHA512 c5c8a5f0818de1fe8f5750de154b94d8cc541f6ca38935658e629d62b396b6900077db6d3982702c1a378227a5217013932feb094d42683eb23049133c4812a6
-EBUILD libintl-0.19.8.1.ebuild 2066 BLAKE2B 5925fae4985e0b0d813dd96e0199b89f419255bbeb1d352faca32aea68da710125dac072009af426a29336b01d69f7d4c0cd62f328496a27fc570916385d3e34 SHA512 c5c8a5f0818de1fe8f5750de154b94d8cc541f6ca38935658e629d62b396b6900077db6d3982702c1a378227a5217013932feb094d42683eb23049133c4812a6
-EBUILD libintl-0.20.1.ebuild 2076 BLAKE2B 40837a95b780d8c589bca58d29e1699606827574fd06642c220b15d01abfeedc22b1c5c2f1fb14f23568c3ebc5c127c69a6338832f53b383c104e4e2de1d4f50 SHA512 86281e50bf35478c471a40f5e0264826a57805b99e652fd35ca18538b12ddb6cacdbb5f53f0be2fa0f3b9407eda6cecf1c50aeeeee52bb0ca1bf0bf9d54270a2
-EBUILD libintl-0.20.2.ebuild 2078 BLAKE2B 1f5208602b5e867b09755991d9afd334872b8cb18a0b9f063d9dc3ac48eb9fa7e71904dff97cae2809caca7ea26de5c32ed910dce9b672e3f59f51c477a79a51 SHA512 1e9fe2597e8c7f1a2eb1296a81bc5610771a6f0274dbaa851e1f1a59ea1fbb618beb586aba3d6857b66e7d2ca3e1580bb629c2e8c6d96b7c193975fe61244c23
 EBUILD libintl-0.21.ebuild 2070 BLAKE2B a924a4888d3ff1848ac1dfd490699b0a65356b2e8e999fafbab5fd326ccba136126acc591b7e1bba598813e84f21cfd2371e09c0c557d5722f1482d39f190e70 SHA512 faf1fba22dedd58f9bf957c46a0a464c9581eebbb6d55bf199bf4491b3697e73763d5bb16740bc03810af44b609c63bc793e0fd9a711f26817145af1e38d4fff
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
deleted file mode 100644
index dec3e8f51eed..000000000000
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI="5"
-
-MY_P="gettext-${PV}"
-
-inherit multilib-minimal toolchain-funcs libtool ltprune usr-ldscript
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-src_prepare() {
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# We only need things in the intl/ subdir.
-	emake -C intl
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
deleted file mode 100644
index dec3e8f51eed..000000000000
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI="5"
-
-MY_P="gettext-${PV}"
-
-inherit multilib-minimal toolchain-funcs libtool ltprune usr-ldscript
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-src_prepare() {
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# We only need things in the intl/ subdir.
-	emake -C intl
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/libintl/libintl-0.20.1.ebuild b/dev-libs/libintl/libintl-0.20.1.ebuild
deleted file mode 100644
index f5fe90548381..000000000000
--- a/dev-libs/libintl/libintl-0.20.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI=7
-
-MY_P="gettext-${PV}"
-
-inherit multilib-minimal toolchain-funcs libtool usr-ldscript
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-src_prepare() {
-	default
-
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# We only need things in the intl/ subdir.
-	emake -C intl
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-
-	rm -r "${ED}"/usr/share/locale || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/libintl/libintl-0.20.2.ebuild b/dev-libs/libintl/libintl-0.20.2.ebuild
deleted file mode 100644
index 0dc5bb897e35..000000000000
--- a/dev-libs/libintl/libintl-0.20.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with sys-devel/gettext.
-
-EAPI=7
-
-MY_P="gettext-${PV}"
-
-inherit multilib-minimal toolchain-funcs libtool usr-ldscript
-
-DESCRIPTION="the GNU international library (split out of gettext)"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="static-libs +threads"
-
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
-# Block C libraries known to provide libintl.
-RDEPEND="${DEPEND}
-	!sys-libs/glibc
-	!sys-libs/musl
-	!<sys-devel/gettext-0.19.6-r1"
-
-S="${WORKDIR}/${MY_P}/gettext-runtime"
-
-src_prepare() {
-	default
-
-	# The libtool files are stored higher up, so make sure we run in the
-	# whole tree and not just the subdir we build.
-	elibtoolize "${WORKDIR}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# Emacs support is now in a separate package.
-		--without-emacs
-		--without-lispdir
-		# Normally this controls nls behavior in general, but the libintl
-		# subdir is skipped unless this is explicitly set.  ugh.
-		--enable-nls
-		# This magic flag enables libintl.
-		--with-included-gettext
-		# The gettext package provides this library.
-		--disable-c++
-		--disable-libasprintf
-		# No java until someone cares.
-		--disable-java
-
-		$(use_enable static-libs static)
-		$(use_enable threads)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	# We only need things in the intl/ subdir.
-	emake -C intl
-}
-
-multilib_src_install() {
-	# We only need things in the intl/ subdir.
-	emake DESTDIR="${D}" install -C intl
-
-	gen_usr_ldscript -a intl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-
-	rm -r "${ED}"/usr/share/locale || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 6ed05254c73b..79ca89470d44 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,5 +1,3 @@
-DIST liblinear-241.tar.gz 559122 BLAKE2B 793ef45fc652d6f35908465e754e0aed6568125e74e68ca72466c4d71cc0e30746a999e978521c09a3ada079698f59f2bf65a430679538b7bebc133a258f2588 SHA512 a9ca47b051e28046829a3f355a552b2f5b270dd706170e1d21db1509ef09eca55e2d8ff29695d9e8192baad8bcf50aa76e75a3683948c726f2c9b915a3e4bf27
 DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
-EBUILD liblinear-241.ebuild 1460 BLAKE2B 7c405bf7eabc8cb614c40ae4c63169536fe132e3c1ac91955b967b96579cebbb73efdf6ae1c8ebf2bb18356a583b90e3ea47c519c400d9a1a01c98f05c383165 SHA512 a99d207552413aeb873083b98e95c5c6b758a17b7565ccab03b67db429c27c66948f19ca61cbf8cb02fc99ffc49264ed7ba77b73408ad3da13a6dd62a41d5dcd
-EBUILD liblinear-242.ebuild 1451 BLAKE2B 94fb3625cd49cd5fd35c114bd47a57ecd80d676caf82cc74367798368dd52f77a8cdbe94f9c40899ed7192bbb96fb799ad78f9590ec683b7b36d37db8e1b847d SHA512 7424b77a748ff2162ba25984694b5e1734e14f91bbcf264f76ca0e0cfc25a40495cf76d29cb3b511a85ae849f75d85319621076de2a7e34ad3e34e4610df7382
+EBUILD liblinear-242.ebuild 1450 BLAKE2B b5cc50baae5858e1ed68b6b4faaabee6b6e57301d0111b62e3615def56bce1d07d3bf909a133e445fc849d1899dcc8fdcadcfdeb22b6b96d4dde90aab594f190 SHA512 56360ecc14c2ffe1bf2712057b139e801bbac326c00194d53ff26c935db8be48c507f774e425bd5e9f6779bb4df022f09a16c6ad498e9a9369161dc3221b634a
 MISC metadata.xml 320 BLAKE2B a4ab81f29b93f305fc5a005917955d67596886df3a9ee7708734714ca0c052297d4bf18b68cbe6de7f42a1e0f4f6052a1b0a93390c17bbe554bc3f536db5b251 SHA512 34ae964cd916b9a3cf711def8a12c20c4fb7642d569d07d019abc12804f013c90081da4d5b1802a0cd8fccec98c5929554766ac575d992a9fdce8d574f2d311e
diff --git a/dev-libs/liblinear/liblinear-241.ebuild b/dev-libs/liblinear/liblinear-241.ebuild
deleted file mode 100644
index 45dd62fa8788..000000000000
--- a/dev-libs/liblinear/liblinear-241.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-
-	# fix install_name on Darwin
-	sed -i \
-		-e '/install_name/s:liblinear.so.$(SHVER):'"${EPREFIX}"'/usr/lib/liblinear.$(SHVER).dylib:' \
-		-e '/LDFLAGS/s:liblinear.so.$(SHVER):liblinear'"$(get_libname '$(SHVER)')"':' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		lib all
-}
-
-src_install() {
-	dolib.so ${PN}$(get_libname 4)
-	dosym ${PN}$(get_libname 4) /usr/$(get_libdir)/${PN}$(get_libname)
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	doheader linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-242.ebuild b/dev-libs/liblinear/liblinear-242.ebuild
index 3ed96b71e97f..3556ac556556 100644
--- a/dev-libs/liblinear/liblinear-242.ebuild
+++ b/dev-libs/liblinear/liblinear-242.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 src_prepare() {
 	default
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 0921be93418e..c9deaeb6d128 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,3 +1,5 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
+DIST liblzw-0.3.tar.xz 901084 BLAKE2B 4aa9689f82567b5ad1ac399eed8f58dfb1964f91c74cba2b291458dac89b0c4ce6a110b24b5a8f69bbcddfb0cf14fa0f80107275c16b7553375bbf38e035262a SHA512 d7fcb5c424c87a3692a8a18cd9f4cf57a7faa4f59f01cfdeff335633fb3be6c577409d996d59273f4453eb157dd9bc8fa6ec2868dbca635147d27d3fd00016f9
 EBUILD liblzw-0.2-r1.ebuild 475 BLAKE2B feb1b5ff6c6a9e16cab04c92114682be0e44fda1eb0c4a0d6180d35afdeabdae6083e81c13d23ff0d86d7829bac409d919f38ee222cc1c5c80889dafa97f63a5 SHA512 8ad04869d1d2ed550f6d85f5d24187dff06276abe4af086eecd7dc9755c2a85c6dd34e1da6f8f895d76bb4af810e03fdb90f3c31af6edc28cacf4996b689e5de
+EBUILD liblzw-0.3.ebuild 542 BLAKE2B e8c7305dada21f74e825d192935e8f8b668af5e54aa616f5b5940eb60ab0226ab55e8f2224049fbcfad3406e1ce21803d4a380e275aa9f305def829ef12ce1fa SHA512 a0c323c35e2544ac40ea4be2ebac1b0f0087e7e281bd1968743a2c619faa71bbceeaa4394bcc38c414594fc28f19a17e1c2d58eead573a46bf9fb239338a648b
 MISC metadata.xml 348 BLAKE2B d29da512394e29b4b8060614f619581eddd64eb7fd3273414ddfc6bf715d17040f4cddde699fe3bd56c3eb96fcb74cc9109cdafab0f46ff38b4ec00743a1b8ba SHA512 aa6d3d2945033b6643c9f1ee7a643826ff39d61fdd880a4d8dc0fa5a8790af120908b8ffab70ec32e88ca4d025bca9606f6f549adb49df1130105abc9ecec3bd
diff --git a/dev-libs/liblzw/liblzw-0.3.ebuild b/dev-libs/liblzw/liblzw-0.3.ebuild
new file mode 100644
index 000000000000..ffb0f9291ca1
--- /dev/null
+++ b/dev-libs/liblzw/liblzw-0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="small C library for reading LZW compressed files (.Z)"
+HOMEPAGE="https://github.com/vapier/liblzw"
+SRC_URI="https://github.com/vapier/liblzw/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~s390 ~x86"
+IUSE="static"
+
+src_configure() {
+	econf --disable-werror $(use_enable static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 85b56c87fa6c..190fd018cf15 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,5 +1,5 @@
 DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
 DIST libmanette-0.2.5.tar.xz 38192 BLAKE2B 0eed86ac8ae5d45be8b80d14aee29f199eff23f879fda99494fa163e03eb265d95146392038cf4657f4256274d65b2a842413a87fa93ec4a5f192da64054a661 SHA512 f72b908c0282aee74a86ce27650d1b6220424e76a830645758a5677b4af6208fbf1c0354cf602c76e097735168cfa3d6bc16727ebb73a14dd650708a0a0deec0
-EBUILD libmanette-0.2.4.ebuild 849 BLAKE2B f42331170f56c44740a778eea32b77405e29ae79a6dbee0f29446fc22cab8f800337764fe53eb814e4b70b086c5c28552530c3b3e51c60446911ab744699496e SHA512 57be95d03221affd6f6a25810ad8822cdde075a22d15e3d2c39aa9300a4480d8c579db4f17daa26349153b4d60ba8d650746fd376f097322666ce31a20e537af
+EBUILD libmanette-0.2.4.ebuild 848 BLAKE2B e51749eb7218a9b57c8b985ff9fffa57c1d9e030094a7e2871d31bc098166b7317c6399687d06b98a18bb2bb5aeada4b0dc5b9d687ff5b6b29c6a503043fd461 SHA512 bd51de492690d789d2b54dd8b6393c5eb29307aa0edba21f9708100ac87a7772fcd38613c515c78fcde9795669defc0bd534879148e13557e29dd748e8f7be45
 EBUILD libmanette-0.2.5.ebuild 853 BLAKE2B 41f584636080ac56d20dc2c9780f0cf6a00686b45d6d2dde2c309cf7e27c0764a0c431e46c0faf3d7ef538e3bd2f2fd08dd1241b2100f0ae4940f79fbee33e0e SHA512 103ac11b72f7a137ffa76e02101f15b17e5a9ae133cee53bf6ea524f43fa8aac0bb08c2c1b37b97b82968d5b324a2aa7fa1928abad6999f4e9192475c0127fa8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.4.ebuild b/dev-libs/libmanette/libmanette-0.2.4.ebuild
index 5dd153d6043b..521893394297 100644
--- a/dev-libs/libmanette/libmanette-0.2.4.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 729bc379e7fe..b5577612951b 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,6 @@
 DIST libmaxminddb-1.4.3.tar.gz 602272 BLAKE2B 2974d7268201a906c1c478ee36d4ef61e5f7483fd4f91bfcc5bf92f5bc698e8dd9eef256cceeb8c3217054481827d6fbf075f479e76c6506cc1f31d707a7d9dd SHA512 7fd97678ea6ca41cc4530864276b0233acbb16208571dc4694902943b3aa7e97c683c5676ea3f2de948c67aebd083f5d073b9ae36b7e89059c17f797ffddf65e
 DIST libmaxminddb-1.5.0.tar.gz 603923 BLAKE2B 07c18f759a2d437d95be513d6dc3aaddd5dcd6f7201fdd7eba0f035c5a3221344f1e5e44253c0efdc2690cfffc5cecdaa9befed8d69f6f0ebd33588b3805443d SHA512 68c769f247156869b84a8ad0f9deec3cb79d39c0a6b8f1458461c223b9cf9967dd9d697ff4e92ac28216ef9e9f5a94908e03f76a5f70ab17636b163c17d2d432
 EBUILD libmaxminddb-1.4.3.ebuild 627 BLAKE2B ec59a52f9ddffb0faa9ab6a33416905cfa1f13dbbfaf62fb870c248e671772bdc07bf3b93c3236f582d29224782b03a8c75b951af17af9960dc344ab583d6469 SHA512 c41b3a52fef686e2652538711f40f05467239df7915ed2cdc5aba6968891764ce3b41a82b03452077e99c4ad0a746dbc3bc5e956f0a6846f5af0752ed9ef1c5a
-EBUILD libmaxminddb-1.5.0-r1.ebuild 674 BLAKE2B c9f196cddee44cbaf1c34a4f31b330518554ee4cf22f6a6b20cc13225d85ceaeeb101e50517ffc8e4f8e64547624cf120a8964412969dd6632e650101335dc7e SHA512 40543176882b4925b22b8e1839d06a6fbb16691f1f2eab4cbb31b859f15dc2e6805833bbeb1655c14ed23e18569890e57bd3cabbe06747d640bb6b22fd73a2fc
+EBUILD libmaxminddb-1.5.0-r1.ebuild 672 BLAKE2B c315939f56ca0795e3b82e087fb94d422b1ae2a1bfadeeee0104f0edd09c81fbf77f56e22c0caabeb45f12c557abba6e4fe9e2dd292af238a4123d62e51a35c0 SHA512 a60002797d17cad41d731ab210d6c87f4b71c530693118142a520cc4a43d67ed23397352b063f41a11287e623ddaee294689d6d22a18f80302eb1dc01f60f86c
 EBUILD libmaxminddb-9999.ebuild 622 BLAKE2B dcaca8ba54d66b52229e8ab3b0d64c92a4a4be70e6b130cdae77ad131f6b60a056336e64b5d494542d4c8003c32a2381549d8688640bee9c89d142d70955cf64 SHA512 311ebe39f56c5a159504636d91d791f7058ebc263ea879843eeea648e562b5e8aa55b2d42721a37e4b550d49cf41fa99bce4361054ed58df481f1bf01505bd56
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
index 16bdf7f8d898..d46d2afc1b46 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index d45b4b988fb4..505287507550 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -3,7 +3,7 @@ AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf24
 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 472 BLAKE2B 9d9c086a3f8f07ca535287baeda38018d0928c14f0601835d47f62274cb377960f67979ab6bbcad90301b212ef4e399f82f169a41aecf87c34790e3a3b6254ce SHA512 9f4b5f170de65914e4f404130b91f940139b608d67c243a180a588264e50173a1e76fe834e29bdcaaa52c6d98c8f35a2ca1ce892ca9263d77eb4478d9fe20653
-EBUILD libmowgli-2.1.3-r2.ebuild 1099 BLAKE2B 3073de9b0fffb0f032f6972a4c3eb799a2fe0257061da3b8abbceb6055af479fb335ef47cf4efcdc5bb3802f37861ff74630bb72ba132f61499c76fbadd52dca SHA512 b715e49d7ea5cf66b2b865b5cc8ab3dd4075ef7e8b4ccc8a522eccc48c7924ab3f6a0a42eec52be12557383df01d001f1f14bc75e222f7d0057bddfc5a3a3638
+EBUILD libmowgli-2.1.3-r2.ebuild 1097 BLAKE2B 6398d0f93ca750d0b313fbc20eb8964443a01b473796a54d30080539e1a339de9c951b31d86d7d9cdafc755c7521ce77753e22c54019cc1a7a32440329cc3f6b SHA512 5e81a6c4303b4bb59c577c7c8e94d42ec317fcac4f6a0adf4b0b0c50d1c150d126fadc81b7953348ace8250921010dc434c06fa24be0286fc57f86c24bd14178
 EBUILD libmowgli-2.1.3.ebuild 758 BLAKE2B 48cead860bb0f3e97ee089a2780878fd1ea8e5b8b06ed9c8ff69f5bc8d63dce275b35b51ad1b6442eaebeca6d166779640d910dda5e91866f3308f80d9dff826 SHA512 7e4d4af5c0cfc8d25b602ce8fe6fa8b29747cfd451f7b39df13b2c458a22743dd7311141da14f0729077786731be7816324480094a34a0d87a1d1728b95a7ef1
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
index 5bd42913be3b..ff19e41257c5 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index b341d9837367..b9e0d2e4bffa 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
 DIST libsass-3.6.4.tar.gz 338519 BLAKE2B 9d312e36e1ac40dcce3aa29728e66643de28da7f2244c8fc987c9a1de7fa0fa72fd5bbd4b5a218c9b53652bd0de469141dbf1b4ddecb7f98405965df946cf333 SHA512 1f79553be31949d45adf440dcbcf4b828a7e4f71c6f63f288f99451fccc490ebf0c68c58d91deabede37962e35a8cf9af8b0d60d89349fd0adea1ac061c8c2c8
-EBUILD libsass-3.6.1.ebuild 1127 BLAKE2B e694d6f57a7ba2d23f1f1723af32443f42f5057820f404dc981fdac6983b2366785cea7e4eca7ab3032bf04730eebd74c7f72416fb90999a9caa2ab21e1cdd6d SHA512 13b7ebc727b1941fb2d4d61b940f603967bf23326bd970e3bf38473a7a85e7bffef0f0b84ef23ae81b606f6c4838022ca083939fbcfe0ded9d29eca8cabf54c7
-EBUILD libsass-3.6.4.ebuild 1139 BLAKE2B 31071ab603883a07527cf4ce67dce875d181dcbddedbdf94339b8433b0144331c830083cdf04567cf2a43f62366726752708948dd4ca81837818d6b55b74651c SHA512 0194ace9ef58fcd1edbf25c21960b2ac36b5fe3a85514fa0f019f5d929ea25a38e164e5925d32b77d9a712093dc73679d31048d92941a2957c7df5e21b07603d
-EBUILD libsass-9999.ebuild 1133 BLAKE2B 7e4ad9c7f8ea73ca19d241f5bc52fa17d85ae2238aeb95cac73f637c82afc665291ac0c104bd8b5c9591d38806006857b78b7b78be988943f14e82ae30354fdf SHA512 396978da337c973d6ce96c5b913e2542243b2f75c7167bfe2bf40031861a22d1b76b559de80e9bddf99ca9365f2650ae94d79df0e593403813d1f44fdb41f38a
+EBUILD libsass-3.6.1.ebuild 1116 BLAKE2B f1174691608a060b863409ac34e986c11bb93b2c303065ea39dde346b4b4b5305629f52a1c6ec1c9b76d602610148d51a8c3a2b9c4115ba6b9c342e46ad9a8d6 SHA512 3d47a99032af3fbdcd6542675c896d330c68c8d36f1844dc5425b3fc5601228a22283812fc0b0743a261e103dabcfc2bcb5b0fd4e30a2bb5ff6ca8812f93ea1f
+EBUILD libsass-3.6.4.ebuild 1128 BLAKE2B 33dab1e807300f7a942697f794b08fc72d1568cea92737eefbccdb878159e9eed49c091ca6f6045cf4d40c64bee1705033ca43bf844275febb08681af8ed083c SHA512 e0f1d76a0c2794f7b15d4d0c34d2e9a67854930f32ab4d02bab78ef6acd59f32e601dbbc3d2103c6325ff0735157af2968ba284c2e2d77c97c51e5aea2f91164
+EBUILD libsass-9999.ebuild 1122 BLAKE2B dd8f690a7536279a14bd0bd839c7db6d19e7b64d6541aaae28b546754039b77dc1f765f40792e4e06b5a12439a827da9b0f46ce2fa1ae026a718d9c4d3b26122 SHA512 4015051e835f2f73e19f78d2d6d65146d904cc1683432065fc13c68a3860767102e11aa5be5f13dd17260718e47ebff4bd92c0908a72bf95eea7966c433bdc13
 MISC metadata.xml 763 BLAKE2B cd9a87ffa0ec968701b492d614a2183df763b8bc36ef0b4851d72ea8c162d6c1dec3d0fce2e8bd95e38d606b6cd3fc958a25e91d5fac69d11a680fa75ff2523a SHA512 be3333cf53d2704b1959fe6012837d9220a8d076a5287795a802961b044dfed989b337014b938b96755a89b23e9c66b5f760f97f31d1a54c144cc34cdf19a94b
diff --git a/dev-libs/libsass/libsass-3.6.1.ebuild b/dev-libs/libsass/libsass-3.6.1.ebuild
index 1d1364419272..a6a6a9e84e45 100644
--- a/dev-libs/libsass/libsass-3.6.1.ebuild
+++ b/dev-libs/libsass/libsass-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,6 @@ inherit autotools multilib-minimal
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sass/libsass.git"
 	inherit git-r3
-	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
diff --git a/dev-libs/libsass/libsass-3.6.4.ebuild b/dev-libs/libsass/libsass-3.6.4.ebuild
index 70fec398bd24..14f45c1d6db9 100644
--- a/dev-libs/libsass/libsass-3.6.4.ebuild
+++ b/dev-libs/libsass/libsass-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,6 @@ inherit autotools multilib-minimal
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sass/libsass.git"
 	inherit git-r3
-	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
diff --git a/dev-libs/libsass/libsass-9999.ebuild b/dev-libs/libsass/libsass-9999.ebuild
index 206e7040d5f7..f1e373f04199 100644
--- a/dev-libs/libsass/libsass-9999.ebuild
+++ b/dev-libs/libsass/libsass-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,6 @@ inherit autotools multilib-minimal
 if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/sass/libsass.git"
 	inherit git-r3
-	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 314127892549..94a33d0ab406 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -3,8 +3,10 @@ DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
 DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549
+DIST libsigc++-3.0.6.tar.xz 789916 BLAKE2B 54d8dccd245a1a2c8bde34eb937eb536b88f36ee15eedd8d2ed0ad1b19933600d04669f9082053ba20543d2195e8833b46a2056055da23fc2ceb1784d5c96cc9 SHA512 4ec5319eda5c0809f1971044152ec7aa142742941644f43ec3944b248667d5694b97a30de8ea0e2260265bbf26a2ffdefbfa8cac5016799d26b92b02411b1c51
 EBUILD libsigc++-1.2.7.ebuild 1021 BLAKE2B 2065eece99aaa2b32cdc436f1937e4094c6625aedab1edd462e407a1cf3c1f4468075728be277611ceedf872adf6ed92ccad1d23e6c17f9088a9657e6408ab3f SHA512 f5683c55d985c4240e948b933e7d758f25dca68a75e3db88b5e65d16dc1061dcce3251a3016318cbe6c0ce911973c03a1f951982a45e9f471b1ac79f324952c4
 EBUILD libsigc++-2.10.1.ebuild 1585 BLAKE2B 2e7d16b0fb2a5db23d70d37c7e12eb5b19f40d308ea7141e82915f21ce2fad6b6ae059c5642d1d7e0c82f2e7fb5a5145eb22af25e60d0fd28bbdb4aec35b9fde SHA512 d44134fedf1092686305546f4795db93107b1982d5cbfcd7a21aec02e5e356f50f1f1f4579a5561788c5d9790284065b69cdfdd2704e6c167f866e184fdd4c76
 EBUILD libsigc++-2.10.3.ebuild 1584 BLAKE2B 3c1d71f2ca4107173b5d9ac89a9ccced9caca4ad9e4a30a7a21b23ba096124cf32ca7822841e987bc1775e6874e5e37ae938ddda57fd683886ce70c4c5f87544 SHA512 723c25c68909befa473004081b6c0830d05d652bbfba005faec021df5c6599234bcd9b874033edbcf064245fb299ba7f556115578f938ce5c2a0f96e3a6f93f5
 EBUILD libsigc++-2.10.6.ebuild 1384 BLAKE2B 04c117e9167bd6cfcc22837c2b85bba7768daecfe4ed1c54247e94e072aedb87d7fa5eab6d4f675a67cb457d3dabdd06d204439c9f92ba0242112f22a31f56eb SHA512 aed2014594c5f24b5175bc1f456ba45358d03e66fd3d6f215917cefd81d468ba7317aacafefa14965a64f9feba2c668124a746b3b8d087cfd07c55d6e05db1b9
+EBUILD libsigc++-3.0.6.ebuild 1340 BLAKE2B 2a551988a508fdfb9961488986a7b1eb8d6b97c3937b3acac3a7f5318b47f48d4d7a6210d6741e3ef47f6c7767b5b4e156b037cea9affa446c7a7c54f0673f72 SHA512 6c3b0bc74194d73eee059a50ad9de20b277d81b66b57b5ea5c2f34183409ce09cc7bfc7c932cbfee17b84438c4094db13101a7211c4226a482ff22297f65c756
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-3.0.6.ebuild b/dev-libs/libsigc++/libsigc++-3.0.6.ebuild
new file mode 100644
index 000000000000..9915fc5555e0
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-3.0.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org flag-o-matic meson multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e "/^subdir('tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	local emesonargs=(
+		-Dbuild-examples=false
+		-Dbuild-documentation=$(multilib_native_usex doc true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: html docs are installed into /usr/share/doc/libsigc++-3.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	use examples && dodoc -r examples
+}
+
+multilib_src_test() {
+	meson_src_test
+}
diff --git a/dev-libs/light/Manifest b/dev-libs/light/Manifest
index e5d78c0c8d85..116f9606071b 100644
--- a/dev-libs/light/Manifest
+++ b/dev-libs/light/Manifest
@@ -1,4 +1,5 @@
 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-r1.ebuild 814 BLAKE2B 8f45a0005854034dfe385adcebace9d07c2ed5b3dfa4b214315232de93d067689da0bf74400ca2368642ee1e0f7be4107ebd6a2d19d94a91b2ae726262aca786 SHA512 daa7efc5aef76c592e1bb69c39fbf18ed434f717f9e2ec2c274521c29af5b33c5442a5fc1ae54c8cd3b9b79c814e629dbf327f5f833f36ae99cd83325794d27e
 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/light-1.2.2-r1.ebuild b/dev-libs/light/light-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..8ea699addebd
--- /dev/null
+++ b/dev-libs/light/light-1.2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools udev
+
+DESCRIPTION="A program to control backlights (and other hardware lights)"
+HOMEPAGE="https://github.com/haikarainen/light"
+SRC_URI="https://github.com/haikarainen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="udev"
+
+RDEPEND="acct-group/video"
+DEPEND="udev? ( virtual/libudev:= )
+	${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-fcommon.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+	$(usex udev --with-udev="/lib/udev/rules.d" "")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+
+	ewarn "To use light as a regular user you must be a part of the video group"
+}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 6985aa6cf8b1..cb88e93f2528 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,5 +1,3 @@
-DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
-EBUILD msgpack-3.2.0.ebuild 1731 BLAKE2B 2256630b8d27090561567db04ad47b17c77b6eaefea2df190cdc1662e54e86be47801fdd363fa8288409668f99e56f210377e6c2ea846a78c1c6291db455c4a4 SHA512 7ac3151cf3c71adf87f2c04c89ea1a3c35df335a3583fa18ecfab4327d00833d66e455700868dee23d3c3db73f69f972962eda6b19b6ba476bbb640525a58cb9
 EBUILD msgpack-3.3.0.ebuild 1750 BLAKE2B ec8ce6b3d45b0edfb7925014aad51a13da77d36817ac0a39e48accc24d2204ca9ec4725980a14b0297305739388f73475ba8fbe3346b9fdd64d37398f7691db2 SHA512 f121387110c6182b351f27f225ba8a29ddcc3ff43951e30ea19b4ab1bbc92df554d7d1acc3bc9f5ed6848014b62c5676a232aa6e2a15ec559b183769405972e9
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-3.2.0.ebuild b/dev-libs/msgpack/msgpack-3.2.0.ebuild
deleted file mode 100644
index eea2ed4f1001..000000000000
--- a/dev-libs/msgpack/msgpack-3.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Boost-1.0"
-SLOT="0/2"
-IUSE="boost +cxx doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-	doc? ( app-doc/doxygen[dot] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMSGPACK_BOOST="$(usex boost)"
-		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
-		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
-		-DMSGPACK_BUILD_TESTS="$(usex test)"
-		# don't build the examples
-		-DMSGPACK_BUILD_EXAMPLES=OFF
-		# enable C++11 by default
-		-DMSGPACK_CXX11=ON
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make doxygen
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use doc; then
-			local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-			mkdir docs || die
-			mv doc_c/html docs/c || die
-
-			if use cxx; then
-				mv doc_cpp/html docs/cpp || die
-			fi
-		fi
-
-		if use examples; then
-			docinto examples
-
-			dodoc -r "${WORKDIR}/${P}/example/."
-
-			docompress -x /usr/share/doc/${PF}/examples
-		fi
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/nss-pem/Manifest b/dev-libs/nss-pem/Manifest
index 1fe02f5f625b..0db816a64049 100644
--- a/dev-libs/nss-pem/Manifest
+++ b/dev-libs/nss-pem/Manifest
@@ -3,6 +3,6 @@ DIST nss-pem-1.0.5.tar.xz 36320 BLAKE2B c2294595d95a2de2bf6d9e68dc10955297fb6ef2
 DIST nss-pem-1.0.6.tar.xz 36304 BLAKE2B ea804bb7b45c6d23c82ac823e36244b13d9b8ef8355cf30e82cc09850e623317ddffdbf4f8fd0ffa9253cd64d47dd12aa1738a8f720b3ac0e9091dff3421fa02 SHA512 2640c30aa8b0721e479f77781da7b4984553a01bff481084ad6e028cb6c99e2441f89b7758b5fc10f7c586e41dfcab2083a7c47bd1e0ce19712d0c61ac237540
 DIST nss-pem-1.0.7.tar.xz 36312 BLAKE2B 0ac494c7925c3a3c764c1154e846426d3cdcf21f37bd03dcab40bbe00ae95fe3a1b4a1f6bd2b5fe3c6f1d95877651474a72d7028eafcb143fad5f6263beeb1da SHA512 4762e3ce9e1c77952af3100acb5a043912da7e52af714973f1ce86d18b3d80424f0760e151b7c360c14cea07d86f75be250de14ee47601de46da75583bb3b0d2
 EBUILD nss-pem-1.0.5.ebuild 644 BLAKE2B 6c953bf5e89b2f2fe668af5204a463f9aba5103e20bab64378d3b41eb1fbc66e53ec16b284ea3593ea05674f897d7659b8b8c25f8a3d3320c2209274eb495aa0 SHA512 7e6c8698937df6330d566736391717e4030fa026216a7d5f3f015e27708ac60402f551987c729ce536c0203202b4377673062f7ad4f7e5d6f3e05b213fc5f452
-EBUILD nss-pem-1.0.6.ebuild 711 BLAKE2B 74a349ad6bf0deef84d57e099c7473518c187743657e700625dc7aa18412c62efbb63c907185087a01f6edbcbf9eb575d05a30a93d3ea3453205a442c29aa451 SHA512 0105fc1eab10de04e0b256e13c199740a8c13d6f921062112e0e6124cdd7b6640ffdb3fae16ef7170bef49e41074cb209d69af84530a83c38090c18dbedb58ee
-EBUILD nss-pem-1.0.7.ebuild 664 BLAKE2B d7646f185ae9dd5e3887d9698988fe805485fe2fcff2546f16fc28af50287c0cbfd46487a7b1d5068aae29ec22b85a8b95273af97037974eb348eabfa4494b23 SHA512 d183e493306cd3c27b5a866eb2ada0b96f2a149b7161b6b31a55a5de266898c3f169077ebd5e296dd290b44890dbcfd105f749781b27b5168e7a278011d58f77
+EBUILD nss-pem-1.0.6.ebuild 717 BLAKE2B 6e91bc089f8202ebd11485f70e634698aa8b037c19d32c0412c412316e504fc396298fa8fb6477606457b924dfd1af0bdac72a263f3502e7af3abb20d581acf3 SHA512 8b0102f0110b02740e6e19790b6d7cbde13a60b5bd3beab3626fe31883c5f96672c6c8f2d93ab51b7e20fc6a1c9fec95ce8ac05f58ca86b670718074d1e3501e
+EBUILD nss-pem-1.0.7.ebuild 675 BLAKE2B caeea0fa611d95d659beecf9ee585c32065b09bcee04f8f332616b44c7de2d481fa71a62e3aa85f422ca967d125febcae86bc9a7de4a6367aa6c92703e9d4577 SHA512 0a17a3c9e184be0e33f9899cc485f496aa16ee77d136902500dd9f7ed57993eafb2723a5c54374020c48d08bd70564049a062d84f9264f90d8c5395ff71f87f9
 MISC metadata.xml 333 BLAKE2B cdd90c0d17983bf6dc3dbed22382259e079792e7294ad84af5b38d07609e184715322d2e8cb57623b13e24c6c5f68a1347cee111b089042b0a5eb11f1ceab2cf SHA512 d7c04e39d92a43fa144ec157c971250bfed9bd16e5334e1c337a3ebc29d79866c8d4832fb5c62766a74577b07b983eec96991a5531a07012fca77b53b705376b
diff --git a/dev-libs/nss-pem/nss-pem-1.0.6.ebuild b/dev-libs/nss-pem/nss-pem-1.0.6.ebuild
index fc81aed71ccc..ffac0b1d5430 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.6.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~hppa"
 IUSE=""
 
 BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
index c5826f3d4e9d..153a69b958ed 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE=""
 
 BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/openspecfun/Manifest b/dev-libs/openspecfun/Manifest
index 322fa3ac3ad3..d036b2253da4 100644
--- a/dev-libs/openspecfun/Manifest
+++ b/dev-libs/openspecfun/Manifest
@@ -1,3 +1,4 @@
-DIST openspecfun-0.5.1.tar.gz 121110 BLAKE2B 157bf05d63048d88674d4dc2657d91b0ff5b69f93659eb86a235e805893571ce9eb3dd84be63ff5ea691b8047a25417a8d7f755d547ccbc8b3956b2d2b70a529 SHA512 7f7b0dd04d5c325a99bf5a44521edaed87ba75acc8d85be64e3be55ff697a1544430d1fe4b5330d5ceb907bada26b42750cf6654fc8ed12b1738ec29fcbeb0b3
-EBUILD openspecfun-0.5.1.ebuild 847 BLAKE2B 4a8b66e01f5bb06425a5572a80f1d0e897e399c43ffe927d2fe25f3cc13d519bea71f33e37ea5aca5526d49b7caafd05105a399d80054764d6bb386fbc8bd352 SHA512 dc1de34e5d70653450dd534f3e4ea6f8ebbe8142fda62ff72aeccc9f5752261470179ab7d2883b85fbab4e31290f0dc7eff53bf21e15eb2dc90587fbd466b08d
+AUX openspecfun-0.5.3-Makefile.patch 1754 BLAKE2B 7e116594fd8f64f3d3aa1938963bc51518cd774f5640e44d03382cb73b942d545dcd4312c60aae7c6c72fca078beb1b05cff3c79dfdfd40f4f63715d0e380a55 SHA512 e57585f8274706171049c58b7b943072cf3e9e22a12973bdb021232e8e8789a02a78e62c2d814201914d8d3deb5bf57f583ffa842f7f6ae2a7f5bcc40b87036d
+DIST openspecfun-0.5.3.tar.gz 121156 BLAKE2B 4b1d883634524db9a5c1d5c2e291667264f3bc15c2b6cd1c335ef7a4748668091255c4940c54cea27ab0fd301e7c08156825bcdecfef71802b7d571d74af021e SHA512 503da7592b126cce9ecb8af5ce16c667a9b022676721063e5f551fb88c0955f465ed66df7728ed2391f068ea14b77414bfd9934c0ee38081d11b998826d6b88a
+EBUILD openspecfun-0.5.3.ebuild 846 BLAKE2B 8a4e82c5387f30b2207808473812ca9e16353a812fa2ad81a508d9a74d2306f5724ad24f3dec1e3ddd4181252f016937d7aada30fef6c46fb14c2ca6fc7061fb SHA512 1d39fad14ca2b13b56f1e5cec714720001baf66bc80b42cdbd41368e7290d897921afaf2f3abe9900099ae104270a978e284640abc299e075c62825d920b78f2
 MISC metadata.xml 463 BLAKE2B 2b6c6898e8ca4d4c4483de5364421049b3d631b1a4c09480cdb473cc2a1eb050b5de006919c2888ce97a295bcf88734072676be03fb21af3fdd23b5296f67798 SHA512 04269bd766d4549c8f5182f075d709b61ca75e170e3c2cee36ad7b172c9f0b20967ce921cba055c75c390bdf2a0b0ff36b550c76ece580d8411fcdb10ab20406
diff --git a/dev-libs/openspecfun/files/openspecfun-0.5.3-Makefile.patch b/dev-libs/openspecfun/files/openspecfun-0.5.3-Makefile.patch
new file mode 100644
index 000000000000..a7ebb8609f15
--- /dev/null
+++ b/dev-libs/openspecfun/files/openspecfun-0.5.3-Makefile.patch
@@ -0,0 +1,67 @@
+--- a/Makefile
++++ b/Makefile
+@@ -35,9 +35,7 @@
+ endif
+ endif
+ 
+-all: libopenspecfun.a libopenspecfun.$(OSF_MAJOR_MINOR_SHLIB_EXT)
+-libopenspecfun.a: $(OBJS)
+-	$(AR) -rcs libopenspecfun.a $(OBJS)
++all: libopenspecfun.$(OSF_MAJOR_MINOR_SHLIB_EXT)
+ libopenspecfun.$(OSF_MAJOR_MINOR_SHLIB_EXT): $(OBJS)
+ 	$(FC) -shared $(OBJS) $(LDFLAGS) $(LDFLAGS_add) -Wl,$(SONAME_FLAG),libopenspecfun.$(OSF_MAJOR_SHLIB_EXT) -o $@
+ ifneq ($(OS),WINNT)
+@@ -50,7 +48,6 @@
+ 	mkdir -p $(DESTDIR)$(libdir)
+ 	mkdir -p $(DESTDIR)$(includedir)
+ 	cp -a libopenspecfun.*$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
+-	cp -a libopenspecfun.a $(DESTDIR)$(libdir)/
+ 	cp -a Faddeeva/Faddeeva.h $(DESTDIR)$(includedir)
+ 
+ clean:
+--- a/Make.inc
++++ b/Make.inc
+@@ -14,42 +14,18 @@
+ libdir = $(prefix)/lib
+ includedir = $(prefix)/include
+ 
+-FC = gfortran
+ # CFLAGS_add and FFLAGS_add are flags that we always want to include
+ # They are not overridable by the user, whereas CFLAGS and FFLAGS are
+ # simply defaults and are overridable via environment variables or
+ # `make CFLAGS="foo"` on the command line
+ 
+-FFLAGS = -O3
+-CFLAGS = -std=c99 -Wall -O3
+-CPPFLAGS =
++CFLAGS += -std=c99 -Wall
+ 
+ override FFLAGS_add =
+ override CFLAGS_add =
+ override CPPFLAGS_add =
+ override LDFLAGS_add =
+ 
+-USEGCC = 1
+-USECLANG = 0
+-
+-ifeq ($(OS), Darwin)
+-USEGCC = 0
+-USECLANG = 1
+-endif
+-
+-AR = ar
+-
+-ifeq ($(USECLANG),1)
+-USEGCC = 0
+-CC = clang
+-override CFLAGS_add += -fno-builtin
+-endif
+-
+-ifeq ($(USEGCC),1)
+-CC = gcc
+-override CFLAGS_add += -fno-gnu89-inline -std=c99
+-endif
+-
+ ARCH := $(shell $(CC) -dumpmachine | sed "s/\([^-]*\).*$$/\1/")
+ ifeq ($(ARCH),mingw32)
+ $(error "the mingw32 compiler you are using fails the openblas testsuite. please see the Julia README.windows.md document for a replacement")
diff --git a/dev-libs/openspecfun/openspecfun-0.5.1.ebuild b/dev-libs/openspecfun/openspecfun-0.5.1.ebuild
deleted file mode 100644
index 40545b5459de..000000000000
--- a/dev-libs/openspecfun/openspecfun-0.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fortran-2 multilib
-
-DESCRIPTION="A collection of special mathematical functions"
-HOMEPAGE="https://julialang.org"
-SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="sci-libs/openlibm"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s:/lib:/$(get_libdir):" Make.inc || die
-	default
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" USE_OPENLIBM=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs || rm "${D}/${EPREFIX}/usr/$(get_libdir)/libopenspecfun.a" || die "rm failed"
-	dodoc README.md
-}
diff --git a/dev-libs/openspecfun/openspecfun-0.5.3.ebuild b/dev-libs/openspecfun/openspecfun-0.5.3.ebuild
new file mode 100644
index 000000000000..5fc0b9cb540f
--- /dev/null
+++ b/dev-libs/openspecfun/openspecfun-0.5.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fortran-2 toolchain-funcs
+
+DESCRIPTION="A collection of special mathematical functions"
+HOMEPAGE="https://julialang.org"
+SRC_URI="https://github.com/JuliaLang/openspecfun/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="sci-libs/openlibm:="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	emake \
+		prefix="${EPREFIX}"/usr \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		USE_OPENLIBM=1
+}
+
+src_install() {
+	emake \
+		prefix="${EPREFIX}"/usr \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 2ba0ab504c34..87fc0f8bb644 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,6 +6,8 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c7dce5b739f9601641ed2cf97894e5e13d901f0db9367aa5d7b78c552ac598aa0a3c2a3f0a438daae044e29f58d6 SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8
+DIST openssl-1.1.1j.tar.gz 9823161 BLAKE2B e5699abeca83acd82546e74a0645f2a765d51f22226f8c537d92285eb0b11e12b0a9476cbd3cb6a594e9840433d713be39884fb4dcd5c3968b36ad4f582ed23a SHA512 51e44995663b5258b0018bdc1e2b0e7e8e0cce111138ca1f80514456af920fce4e409a411ce117c0f3eb9190ac3e47c53a43f39b06acd35b7494e2bec4a607d5
 EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f97087805e9e240ad2b6495d69f0139a92db49dd6ea7bc1fed9e84387dac85d9ba0be7a5578e25242c7b668d1c44b680b SHA512 93e899d27f034ac18f5c4425f0a2c3c9b1aaeeb21adddbe60573ab3ba1e3cab68b8acf204d4ef956f1039c6e8646750c6abb7a42d11e8e50fbc948132a907c47
 EBUILD openssl-1.1.1i.ebuild 10262 BLAKE2B bf22af5fa5b25103bdefe046949fe26e6ca78dbf5f9965e2cafc4e08f927bbf8baa478296dfce2f182c13f1576e87ae3f257c18da16a1cc3cfb6c2f2862098ff SHA512 047c34d02e00529450d982dc891a9bc0319f8e7d1f3cdad70d8954f0c463b3c7621005382c091f282982337ea0f2d397038bfcdf2bfad99c16b51de466988ff5
+EBUILD openssl-1.1.1j.ebuild 10271 BLAKE2B 06b5aa9b3388f1f567d4bb882b8397e8eb776fee68e89a967bc876b18d34789aa6c2a32de4cc3a3e44bd3cb25685219459c92f6a5006c75a364c06590a23ae2e SHA512 b863d4694d1e584f0ff3004f6d76c8141c4af25985a75d89f966e185562ce8d854d7c7a4973ea5047f373476ad430aee654bcf9e2dfba53a091f716155e7a4ae
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1j.ebuild b/dev-libs/openssl/openssl-1.1.1j.ebuild
new file mode 100644
index 000000000000..e01aa8d72954
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1j.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist sm2) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index a9d8e75660ea..d43ef5b5cc07 100644
--- a/dev-libs/pcc-libs/Manifest
+++ b/dev-libs/pcc-libs/Manifest
@@ -1,4 +1,4 @@
 DIST pcc-libs-1.1.0.tgz 198204 BLAKE2B 7cd665ba6a1a69514ead9a778cb24fe35561a34ae72cd5e53b63027ae7d4261261542434e3ead68f74056f228c35fe599dd76982280d3fbd2f71f5dc957b30d8 SHA512 89d90f246300ab1da652f652c685756aa038017f5b7d57d050bb5c88e01e70b594ffaef8772230fbeb9461e07c5b1df60e85e550ec4717008159218d50c8697a
 EBUILD pcc-libs-1.1.0.ebuild 497 BLAKE2B f0647265c5d4fc49d9f1bce77ec535857bb523071dd6aa0b8dad589fa43e930e294b29c76f9f93d6803e94a2af07e12f9d26ceb92951b2141d090360c5c95727 SHA512 647442082dd5e636feeaf54557c415ef21527bbbaa5ae5a9657f9ea6ecf067a43bd4b61424f1f37911c6747ec90e70373893ecc235922b32be248df2641a3935
-EBUILD pcc-libs-9999.ebuild 610 BLAKE2B 9a9351313660db38c39196ddf23887384a88ca9c72d4b244a1dbd403ae52e42279c63b61d4e28b2a7751c6fca0341d1ab41dd031018c9dda179ad706dbabcea7 SHA512 525262c3bea3acfcdbe06987ea18fd3104ce677863425bd674123f9b302c41de7568314a4241b22b6c986e3c8bba376cdbcfcc7a9eb57946545ce8e8eb4bd14d
+EBUILD pcc-libs-9999.ebuild 597 BLAKE2B c5979d8a9c3fbae31d7b9f1fc31bc12eeda6ce80fd0d6f3803cdbe6e2873a0f80ab18949dfb961192886fd8e8c5e98850853c49bc7469880a69199fae369d85f SHA512 9a210ba6ff26466d4aa343c3d9aed6a9382a3e0d37da9a156828ab604745d68488051493d2fa5fe4642017b7d89d2e73500a0102373c82a0e13b6222eca10002
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/pcc-libs/pcc-libs-9999.ebuild b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
index d15e96041f3d..004d91f4e4f7 100644
--- a/dev-libs/pcc-libs/pcc-libs-9999.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,6 @@ if [[ ${PV} = 9999 ]]; then
 	ECVS_SERVER="pcc.ludd.ltu.se:/cvsroot"
 	ECVS_MODULE="${PN}"
 	S="${WORKDIR}/${PN}"
-	KEYWORDS=""
 else
 	SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 273ac10d16e2..79a648d6e189 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -3,6 +3,6 @@ DIST pugixml-1.11.3.tar.gz 386244 BLAKE2B 1c83b0e0c1f464d3ef2efc19decc425bac14b5
 DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38
 EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
 EBUILD pugixml-1.11.3.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
-EBUILD pugixml-1.11.4.ebuild 571 BLAKE2B 1d1dd0242255764d0332985fe220b2ac84b69bcbb716becd717aaa777ff3dfbe5abad4437beac25dd5e3e21dda4ffb8c4fc9c863f981dfaff79c64de1ab5fc20 SHA512 f2daeaf1b726589fb908754540aa0fddb3ab516636800b4fccbe6523f2331f48e62fd6cafff76efce3b8b9b384f833ad13bfbb65a3d3c1489af16a159afe5c30
+EBUILD pugixml-1.11.4.ebuild 570 BLAKE2B d48ab88ac4014ac2a5fa31e2a9adc1c3ea93100f06c97275e9c7442aef426c5d87e47ad19710e17486d87fa714cfd0bac266ec48b8ec7571b91e9b872c5a5fea SHA512 198d20b624cde5812c82b6d18d1e5b8d573712f9cf758ec21c72b99d0d024d4cfb570e5a1fede5afccdaface8a912b8bfcdecc4f6a0b2a72121f34fa0c778e3a
 EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.11.4.ebuild b/dev-libs/pugixml/pugixml-1.11.4.ebuild
index 1d132cd4eb53..3eb298da3954 100644
--- a/dev-libs/pugixml/pugixml-1.11.4.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 759689da7727..323339e2506c 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,5 +1,8 @@
 AUX quazip-0.9.1-gnuinstalldirs.patch 3853 BLAKE2B cf20bde0e7231a64756d1a05b09f7683c4b4b3e8ff0699b8bfb284cd37b05574244f7d4ec18b6b8df0eae1550fc10f6d99891e8241dfaddeac18080ce8ea11a6 SHA512 b84fdf3d79d47bb18fdafc7652df6f8f705a8bfc63628eb748ee0c94e7ad955074cfdf03c6321d58cd3ef0f04238958cfe24264e785b38f583085cf49042b321
 AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34bbd7ae3fca2b3463933b9750081090d0608e1eac095bba53a33a40458fbea6487fb6bde06d652a8417325b2adeb6bed6d76 SHA512 cf9c09b016c3a37158eeb840ef58e1cf65fbc7f98d083489e3dc47b09f22221822c0546341e7410a77428f07ff8d98c168d8ee09d07b8b37c47df6790beeb119
+AUX quazip-1.1-conditional-tests.patch 1816 BLAKE2B b7500d3300e4934fbba0256b992f7455e2d1fcb3f5e01ac26980319e41005bba814bad89f8df28cd15ae52376316fd4a73467d77b8000523918ddac3ffac0a25 SHA512 9989f879afa32d1f13dc6b49b607dac142d18dfa96727d7d621d29161fac49698ab5c2e99adfb87da2719f5f66aedad8187c00563b51decc54f55a7f5c899f57
 DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
+DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
 EBUILD quazip-0.9.1.ebuild 831 BLAKE2B 7c9fae6be60bbca4abccfaa1f9fe33ae87071e576365ecf9f2197f0cba6d4fa3a134004d93f07cb16ef6a1136d7b39ec61c1c12aaa5e56bcf6f0871a18a9f3e9 SHA512 c2e3152d2f13f9bad676af409ec288ab49771d54f17fd6891effbc025d1cb5aab1c524647817d97bfce1ec766a73813553759669dcc19d5c624722011677b276
+EBUILD quazip-1.1.ebuild 1227 BLAKE2B 15516f8b848b80e73426d3334f1e5a25cb662fee58827aec6614e7273b51a5c6cea4546c60cee7c55776958963cdf419a0881d9e90ef0673f7bc751ebc156b47 SHA512 ae431d45a562a7c43d955d90116bcb41e2ed30293efe8fc7eb98979f6e1c12e6aa5a8ecc24a25082805b6e73bc158f035e6d908ca53195dd865bf953b599cb4d
 MISC metadata.xml 347 BLAKE2B 1e86912a83f631c37ead72278d84fd3cefbce9971290275d83b4bc610739a3ec8dc87f5e7013719f8c39009ea671b0ba4ecc5da35c9cb4b9ae9222f0a19063f3 SHA512 48c3f44c6414f236058d4e3ee963b24ce5852d5742ab7ab4038b6e56a63250fbb4975064ce1f57c0a93084aa836e2c465da57170d55d7208b8032031eac19638
diff --git a/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch b/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
new file mode 100644
index 000000000000..68520a4b3b9d
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-1.1-conditional-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14230a6..22c1421 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,34 +26,25 @@ set(QUAZIP_LIB_FILE_NAME quazip${QuaZip_VERSION_MAJOR}-qt${QUAZIP_QT_MAJOR_VERSI
+ set(QUAZIP_LIB_TARGET_NAME QuaZip)
+ set(QUAZIP_DIR_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION}-${QUAZIP_LIB_VERSION})
+ set(QUAZIP_PACKAGE_NAME QuaZip-Qt${QUAZIP_QT_MAJOR_VERSION})
+-set(QUAZIP_ENABLE_TESTS OFF)
++option(QUAZIP_ENABLE_TESTS "" OFF)
+ if(QUAZIP_QT_MAJOR_VERSION EQUAL 6)
+ 	find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat
+                          OPTIONAL_COMPONENTS Network Test)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt6::Core Qt6::Core5Compat)
+ 	set(QUAZIP_TEST_QT_LIBRARIES Qt6::Core Qt6::Core5Compat Qt6::Network Qt6::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES Qt6Core)
+-	if (Qt6Network_FOUND AND Qt6Test_FOUND)
+-                set(QUAZIP_ENABLE_TESTS ON)
+-        endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 5)
+ 	find_package(Qt5 REQUIRED COMPONENTS Core
+                          OPTIONAL_COMPONENTS Network Test)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt5::Core)
+ 	set(QUAZIP_TEST_QT_LIBRARIES Qt5::Core Qt5::Network Qt5::Test)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES Qt5Core)
+-        if (Qt5Network_FOUND AND Qt5Test_FOUND)
+-                set(QUAZIP_ENABLE_TESTS ON)
+-        endif()
+ elseif(QUAZIP_QT_MAJOR_VERSION EQUAL 4)
+ 	find_package(Qt4 4.5.0 REQUIRED COMPONENTS QtCore
+                            OPTIONAL_COMPONENTS QtNetwork QtTest)
+ 	set(QUAZIP_LIB_QT_LIBRARIES Qt4::QtCore)
+ 	set(QUAZIP_TEST_QT_LIBRARIES Qt4::QtCore Qt4::QtNetwork Qt4::QtTest)
+ 	set(QUAZIP_PKGCONFIG_REQUIRES QtCore)
+-    if (QT_QTNETWORK_FOUND AND QT_QTTEST_FOUND)
+-            set(QUAZIP_ENABLE_TESTS ON)
+-    endif()
+ else()
+ 	message(FATAL_ERROR "Qt version ${QUAZIP_QT_MAJOR_VERSION} is not supported")
+ endif()
diff --git a/dev-libs/quazip/quazip-1.1.ebuild b/dev-libs/quazip/quazip-1.1.ebuild
new file mode 100644
index 000000000000..491c9969ee34
--- /dev/null
+++ b/dev-libs/quazip/quazip-1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+# Note: Please check if upstream want 2.x and so on to be slotted when released.
+if ver_test ${PV} -ge 2.0 ; then
+	# Sanity check to avoid naive copy-bumps
+	# Upstream expect parallel installation of 0.x/1.x/2.x/...
+	# https://github.com/stachenov/quazip/blob/master/QuaZip-1.x-migration.md
+	die "Upstream want 0.x, 1.x, 2.x, ... to be slotted"
+fi
+
+DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
+HOMEPAGE="https://stachenov.github.io/quazip/"
+SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-conditional-tests.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQUAZIP_ENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use test && cmake_src_compile qztest
+}
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 5f811276659d..95d566805122 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -3,9 +3,7 @@ AUX rapidjson-1.1.0-system_gtest.patch 1270 BLAKE2B f34691f9449dec16c1c1852cb02a
 AUX rapidjson-1.1.0-valgrind_optional.patch 814 BLAKE2B c12e3571050eb63da3e02eb025d0d79cfdca175168d8ad88d947cdf0ffd7b2bb7150563e6adc4f6f43c9e1513f7066e99ab41ffe151bf3503f2e279c1baff535 SHA512 edce6fa3433380487c321ba1b735f08c237d058abb59167b055985272acb83be863650141fcdca5c099b3f3b81f342531b8088e6ef66f71389f2d830b74074e1
 AUX rapidjson-1.1.1-valgrind_optional.patch 868 BLAKE2B 39e46efcd4ebea2f85b40531e46bfcf23eed894e93b6fe4cd8fcb7ac8c614d5e6e98c21c17304f3cf6c7c6415eadaa32b4c496f559f07fd56870820a027dc2c1 SHA512 a71016e4dc17d40afe18ea84c915ff52ce78a28c8e9a0d10342db34954993e2d65dbff7059c6683837334414c73ade934c805d0fa3d758358f7b236d1b57371d
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
-EBUILD rapidjson-1.1.0-r1.ebuild 1099 BLAKE2B 355d7cc8a583a2fe0ba2d033376f81d4f8cd6879461afdc03b6caf2ed947fedfd5eeb389cd546c0a978c66bdfa4be120e815140b1e0e9d9910fe4909af318430 SHA512 373409249dd5530a5619e1c5d7c29edea6246c1d238b820d98d058a0a1afdaa62311d8ea61ea99c02c971866fbdb626a8d9e68ceb78e18e1a5e1aa3d046e8f71
 EBUILD rapidjson-1.1.0-r2.ebuild 1196 BLAKE2B e1f709ff94d5cf7cb1c581cce49415cc76e221f8a2134e5b7c3f2ececd39aa7ac86e945653e331523675c02ace4e1e2256221d700141815a83b61b8fc94ca01f SHA512 e4fab2177decc21c90598409eda202ca59ed4b2c8e99e920ec8ecab72c2a5f6aa30cbd3064af6ddd6f7e388f8523a61cb38d3ecfd63a6af02d59b3aeb02f1189
 EBUILD rapidjson-1.1.0-r3.ebuild 1343 BLAKE2B ee49d50caad8fcb954051e5b29001a67fdd948090a0a584e9968d51c0beec891f14df9f38eb6496d52294f8b76e5a05bb3731659fd0cca4eae70f092e8d97077 SHA512 688f90e844e975ff8ad1b242ada5810611cfe10a957fde46d38d64cb8486d47690f7fbeb4b099c925777a0ee60024173c4d7d8042ba35d2da9f70830f4e7bd16
-EBUILD rapidjson-1.1.0.ebuild 907 BLAKE2B 6d3d531856301c37083b50f0d9a2454b305df7f02e5fee3ba22b3063943afc726f976820fc8a081d77cca87b0f1081e37165962cb272d585dad73eae855c129b SHA512 d049d8687b714f5d12142da93ab170a2a9081f7a50181347c5b6ff1f5096eac40fd231fa65072f30db705b008130990d10f51d68ff7f9c2ac943c5829a2efbee
 EBUILD rapidjson-9999.ebuild 1341 BLAKE2B f985212651256604f3e2ef7c58581dbc21d95c4b2d53a25847a70403520956b30b87cc3d9d18d316004d8dbcce96b906aadb7bdb28a8b15e0d84f370bf500b6c SHA512 0c4b5c74f2510a8623e09a2b10a7e564ac1cda70875d061ef2a02e4fe0dfe219b8118295c1a996399e00a9919f2af4cdab77e2a100fbd492a6efd74280183302
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
deleted file mode 100644
index 89b31664240f..000000000000
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
-HOMEPAGE="http://rapidjson.org/"
-
-LICENSE="MIT"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/rapidjson-${PV}"
-fi
-
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-cpp/gtest
-		dev-util/valgrind
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-7.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e 's|-Werror||g' CMakeLists.txt || die
-	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDJSON_BUILD_DOC=$(usex doc)
-		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
-		-DRAPIDJSON_BUILD_TESTS=$(usex test)
-		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0.ebuild
deleted file mode 100644
index ca44afce7199..000000000000
--- a/dev-libs/rapidjson/rapidjson-1.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
-HOMEPAGE="http://rapidjson.org/"
-
-LICENSE="MIT"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/rapidjson-${PV}"
-fi
-
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-cpp/gtest
-		dev-util/valgrind
-	)"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDJSON_BUILD_DOC=$(usex doc)
-		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
-		-DRAPIDJSON_BUILD_TESTS=$(usex test)
-		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 9f4c2886aba4..68beadc50a9a 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -2,6 +2,6 @@ AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba
 DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
 EBUILD sord-0.16.6.ebuild 1207 BLAKE2B 5dd477d558144bba5f42212393bdd61c4484f9b860404970dfa89d04570055a23059e96896e11295111a9a6ec4cea05f001f28b2361d466fecfb73e00695fd88 SHA512 7618731c519bcef759234e6c545320d120860b73aca0be480fe4b975667d437c4ee4f92f3cc8597049ec8121ae3657c2c3b486fab8ff09ea4e421bc06e3354bf
-EBUILD sord-0.16.8.ebuild 1178 BLAKE2B 391a87927e2c9891709e7957e93b1f8ae24ec227543ce7625f8b7e0c17ffa3a5f322b660ef9163e9e2496d810f0c938c84060367bb5a22d2f932a00788aa7c7b SHA512 d0f0d71cd531cbffa14f72fbd42dd92ce4605f19980f962ff2a13852c131153c4f1ca84205b0a4dbe9414430d2218e0c7610e7c56cdd2924e629271cc4ae37e1
+EBUILD sord-0.16.8.ebuild 1176 BLAKE2B 7d836ced3ff39d09a0caab144cdd30700af279d482b085ecc900a7882f6bfa92dee2cae8b576002489167ea60b4f6c45521096ccea3cc6da5465bbbfcaf0c8bd SHA512 74bd66a198b62aa81cf463ec27c43116dcc78ff8272ce78a75ca1e433e32c9bff3dac961190e8b8dd2e8b1fa912ba2c6a1bb0a9274c6b36a620461cf5dbacf4a
 EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild
index 7862bbdf87d9..f01afc0ba67b 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/squareball/Manifest b/dev-libs/squareball/Manifest
index 831387bdfda7..b591c8a3ad3d 100644
--- a/dev-libs/squareball/Manifest
+++ b/dev-libs/squareball/Manifest
@@ -1,4 +1,4 @@
 DIST squareball-0.2.0.tar.xz 231844 BLAKE2B 831952ae3d3fb14abe978b04300b6e365217ab80b2cad863d6db33dc856816121cf2688adb56c59d50db9a62322c602eda57dd1fdeb830b97b557abc1157ece9 SHA512 be039d2e2120e87bb7289e75185c9ad46452fe6ae167dda2b60944d0a32f7ff7e89504f5ddd8343e0150d12ef22d71c51ab9290e90c43a930773bd39576bdf31
-EBUILD squareball-0.2.0.ebuild 1059 BLAKE2B f538728ca897e2ddb21ef81f18b2503519938cc5cd5c18d82d3af02bddcd5db8e58271a2b174b3f70af2276bd697f61cf0500af80682e7735027c1eabfd5bc42 SHA512 7b6141f3566a503aa7779ec45ce80ebc1c71563f1aed2bdc47b9590ec3e7d9de98a45244195e6d37b98fbc8b3446a6560762eed623a4f9d8e652dbe22ab2e85c
-EBUILD squareball-9999.ebuild 1059 BLAKE2B f538728ca897e2ddb21ef81f18b2503519938cc5cd5c18d82d3af02bddcd5db8e58271a2b174b3f70af2276bd697f61cf0500af80682e7735027c1eabfd5bc42 SHA512 7b6141f3566a503aa7779ec45ce80ebc1c71563f1aed2bdc47b9590ec3e7d9de98a45244195e6d37b98fbc8b3446a6560762eed623a4f9d8e652dbe22ab2e85c
+EBUILD squareball-0.2.0.ebuild 1052 BLAKE2B 3bf262a428b7a27b51a928927ed73fea2213185fe83d4bfa1728f2d23656e7e8c33822b381fd3e7e14fea07701db4a91bbb128a4110cb975b25253744c49a77b SHA512 095ed75d8d1518ee50a9ef68ed6f61f3fab1090c61ba31ec00923dca4cec490f9f7f40d28632df569d31f6ccd7d9014140c29fa000de2f816f1f198da8748052
+EBUILD squareball-9999.ebuild 1052 BLAKE2B 3bf262a428b7a27b51a928927ed73fea2213185fe83d4bfa1728f2d23656e7e8c33822b381fd3e7e14fea07701db4a91bbb128a4110cb975b25253744c49a77b SHA512 095ed75d8d1518ee50a9ef68ed6f61f3fab1090c61ba31ec00923dca4cec490f9f7f40d28632df569d31f6ccd7d9014140c29fa000de2f816f1f198da8748052
 MISC metadata.xml 383 BLAKE2B 4e9d61cdfcdb1c7da5afe7d7f4461de640d9fa4e8f95195a87108cb823ad3bdb9d67f42ca0f45274590362c52a01cc61fca92d5e426af9ba8bd09d1f0a1f601d SHA512 8d9eeccdd5b6b77089b1840a52a5acd12dae224483a1af4a48fdd91bb9c0dd7fb16cf4a440970bb6eed3747c28d751be53740c2a27e878e2b97aa359c57d183e
diff --git a/dev-libs/squareball/squareball-0.2.0.ebuild b/dev-libs/squareball/squareball-0.2.0.ebuild
index 58abed1015b2..aeb29384561f 100644
--- a/dev-libs/squareball/squareball-0.2.0.ebuild
+++ b/dev-libs/squareball/squareball-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,10 @@ DESCRIPTION="A general-purpose library for C99"
 HOMEPAGE="https://github.com/rafaelmartins/squareball"
 
 SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-libs/squareball/squareball-9999.ebuild b/dev-libs/squareball/squareball-9999.ebuild
index 58abed1015b2..aeb29384561f 100644
--- a/dev-libs/squareball/squareball-9999.ebuild
+++ b/dev-libs/squareball/squareball-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,10 @@ DESCRIPTION="A general-purpose library for C99"
 HOMEPAGE="https://github.com/rafaelmartins/squareball"
 
 SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 2d74d9bcfd24..a8ac8610d6fa 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,6 +1,9 @@
 AUX tntnet-2.0-zlib-minizip.patch 1288 BLAKE2B 2f6ea37c36bb58e7ec2b9deec00579a86dbacdbd58a82f3516ca8db4a3f67cbf72c4558d5ca71f9973742632efd0c7bfa6062e83e46d9a8e18612dbecb26cb71 SHA512 e0aa06a15a6e4b9472cf2621236b71eab7d074a99bb82df768dce6875c99d634bee72cf15a456821cbbf7804dae247ede3f0839921a151f3750e5dcfa9028ce3
+AUX tntnet-3.initd 550 BLAKE2B b31fd930b69c62c3439096c8de229a256d3f77cb18be752902b577950bb757cb06bd0f19005b25405c263f64d0d8db5d18b0b914d552a25875620c8c44ce090d SHA512 1be6437278de9319806a7fd4ef8cfb7674e4c04b156c2342f850d8ee9aa33c4c490cb64243592f1d6605e96cb51192216f859eac2a59e7aaea8d2730a9dedc0a
 AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
+DIST tntnet-3.0.tar.gz 879598 BLAKE2B 34cbabc52eb28be051da8593eb32d66aa701785be4002056d9be34d28871ae886a87eb1d66e71393a9f9d96110a3d826acead6c6db5c6f2829db797ac449b82e SHA512 5fe1f8750e10537919174e953be92b73e12a9227c50a02dcf2f23a266304ad3ad77d29823e8cdd3e2fa92dba936c2624f140943d021790e8137609bbeb0d3d81
 EBUILD tntnet-2.2.1-r3.ebuild 1900 BLAKE2B 273821b9179d910302c61511a7cd80dff6aeb16091dfdd387776f2953a8c1fc0338ac534d3958e3adf45fbfd9fd2d7742b22cafcfb42f3255bc0cc958d5b530e SHA512 db7ced55aceb5ed38ba87107a5d2bb63aebf3471b68a87592e5bca48bd23301d35ad6fddd2fb095d3371beb8a89c2a55b73a341f474c0cd33cc1186e952a9e05
 EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 64ff6856799c154c0eeeac127883043c30e6236cbfe5ae11b151e67712dab7ca2b2e7b8fccf03e7c79a8839921389f153fad2f54ac82d6f724b4d8e86bb4b52c SHA512 8b3d3805a2498c06fd58b83a22e21b21c697743992b248e0b2b896b3c8381ab6665ad9ce92bbb6b2b3a68bea6fe67ad3748c80ba056f05e2ff0a1d35df7e10df
+EBUILD tntnet-3.0.ebuild 1456 BLAKE2B 0f50b43c9fe63257123cd0784206c2ae47174d0d27ca37e60e27e726f09dbf74a103122bbca4f243a4c3a6e9759a0dcfa8b1d635f672d2313ed4d6d464cd3a5d SHA512 40bb15dd86bf440c37c26e3690f359a743948b5bcc5f434732e1b3a45ebc021ca3a2398aed5678dbb78007a367e4e73bab624e2404c64ea1626ff825a7288155
 MISC metadata.xml 324 BLAKE2B 83eb2795b911c894a248b3180a316063c29de220de0857b99a1eecf31312a7dccd2ae90afd3cfb7e419511022cb4ca0887f45c25042b572a117c5f23c5c4affc SHA512 70796a55ef89e8b85db1524a52525c79fd11870da7b0156a0dce2c91ebc932c61b8088474661d4fe0ede77c617599ce3266e930aaea8b2e9a7ce99e9a9f8c686
diff --git a/dev-libs/tntnet/files/tntnet-3.initd b/dev-libs/tntnet/files/tntnet-3.initd
new file mode 100644
index 000000000000..b5c0f6307039
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-3.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/var/run/tntnet.pid"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting tntnet"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec /usr/bin/tntnet
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tntnet"
+	start-stop-daemon --stop --pidfile $PIDFILE --exec /usr/bin/tntnet
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading tntnet configuration"
+	start-stop-daemon --pidfile $PIDFILE --signal HUP --exec /usr/bin/tntnet
+	eend $?
+}
diff --git a/dev-libs/tntnet/tntnet-3.0.ebuild b/dev-libs/tntnet/tntnet-3.0.ebuild
new file mode 100644
index 000000000000..e09bb6e710d4
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Modular, multithreaded web application server extensible with C++"
+HOMEPAGE="http://www.tntnet.org/"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="doc gnutls libressl server ssl"
+
+RDEPEND=">=dev-libs/cxxtools-3.0
+	sys-libs/zlib[minizip]
+	ssl? (
+		gnutls? (
+			>=net-libs/gnutls-1.2.0
+			dev-libs/libgcrypt:0
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	app-arch/zip"
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
+
+	# bug 423697
+	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
+
+	# upstream still use bundeld zlib here
+	sed -e "s:unzip.h:minizip/unzip.h:" -i framework/common/unzipfile.cpp || die
+}
+
+src_configure() {
+	local myconf=""
+
+	if ! use server; then
+		myconf="${myconf} --disable-server"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog README
+
+	doman doc/man/{ecpp.7,ecppc.1,tntnet.8,tntnet.xml.7}
+
+	if use server; then
+		rm -f "${D}/etc/init.d/tntnet"
+		newinitd "${FILESDIR}/tntnet-3.initd" tntnet
+	fi
+
+	# remove static libs
+	rm -f "${ED}"/usr/$(get_libdir)/libtntnet{,_sdk}.la || die
+}
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index 2284d2bc6bdc..f8c01d65e0bd 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,5 +1,5 @@
 AUX cb.patch 768 BLAKE2B d777c9c55e81019c496c4dffbe2b113d4e0586b713fd2f6c630616a5d9e3f5c83bc23f6dcfd9bc034c78a635a92a085afc9a3f51079805c30fd2d31f8f3c59b9 SHA512 fed91e83af1c3f5c3de9e51ce7134e6c9f94a262817cf14034b390c6527cece0b867e4742a0754debfdf358c0816c9443fc0b84d9cffa531094f33861bb1155a
 DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
-EBUILD urdfdom-1.0.4.ebuild 830 BLAKE2B 32faa951a18610e5fb79205e9136ab6037bb7e6adbafbff892eb49ce71e82998515fe0b36086fc551b83c8ed25ca19e506f96a96950d25f0de0d48529b85a651 SHA512 7d5ac91d6f432b08350ebbc621679e0149aa0c8a0fcdcc06ce98ed4e0fde6046987c5ce3eef0dd6446df02eb2a278daf97aa1da264a9cd5766defe9d57c5f701
-EBUILD urdfdom-9999.ebuild 795 BLAKE2B e53a7cfe21b87fd426dee0d4b12cf5bcf313666da5793b864b31047b7e5930115f825753e838376d84d8c475e850856df3acfd84a02f6ebf0f3c05c0b249bcec SHA512 8728695c1470358941d919765221f6a939f7c095e300ac54c8a387b940012b022fa247635dbfcc484f2b988d3a72ccc50fda7b87487c196d5ef196c056305af6
+EBUILD urdfdom-1.0.4.ebuild 817 BLAKE2B d0f8f64a40174886df3ea75adf3bba0612ee7fbdba74dd36837ab7e77704a41c9e00ae66443ef9e1ec0534e9e0582a42c26d7a95f8ded4f919c808ca2bd045f5 SHA512 7957fbe7d2472168cb0beff2bc004e89e7102159bff1d0257e2b5c492b074a343facd3f2dbf280f0b5b06b3168db0a07799410e5b43b1e55ba0a3c307c11bed5
+EBUILD urdfdom-9999.ebuild 782 BLAKE2B db8f93a1297207c7333f837f524c0f7cacc2c8da6a63eb1070a14d2b1303d74326328d848f68d850cae63f38ef63f8c9eed7e7f0037748abb606abd542cfb2b5 SHA512 10acdd2b7a3785e8c2c61cfe2ae0650a29528a0a394de935bb8271915c92bf5acf477ba2aa3be58a5df74cec0fb9598351f9fe8de80e262d8234b22a45fb54ec
 MISC metadata.xml 335 BLAKE2B e19eb242410b151b76ffa335373a754a074cc060f57c4441a4da4364d8b7f1cd0c71246e48140c6ba6a80a17bf8d721d09c3b61547f83714d0d9d49ab55182da SHA512 ec4d58e41be7a83c80a5e0a77edcf8c231d783e0b4b5f8bb7c42d54da4dba495575b9ee1c32e334a11a424449cc3eba44f89d147d465ec490e4507443211450f
diff --git a/dev-libs/urdfdom/urdfdom-1.0.4.ebuild b/dev-libs/urdfdom/urdfdom-1.0.4.ebuild
index ff59cc0e6461..7b8f7b078a5a 100644
--- a/dev-libs/urdfdom/urdfdom-1.0.4.ebuild
+++ b/dev-libs/urdfdom/urdfdom-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/urdfdom/urdfdom-9999.ebuild b/dev-libs/urdfdom/urdfdom-9999.ebuild
index 6c0a7505b197..1a6ff6fe08c4 100644
--- a/dev-libs/urdfdom/urdfdom-9999.ebuild
+++ b/dev-libs/urdfdom/urdfdom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/urdfdom_headers/Manifest b/dev-libs/urdfdom_headers/Manifest
index 7b28c921fd5d..eaa738fd29ca 100644
--- a/dev-libs/urdfdom_headers/Manifest
+++ b/dev-libs/urdfdom_headers/Manifest
@@ -1,4 +1,4 @@
 DIST urdfdom_headers-1.0.5.tar.gz 12639 BLAKE2B fdd3fd0eb26027a920bfd89432ff2f50d8c8377630ff8e385b9691da46cf40a454f5e0651aa5d107ef9e96499ba6439b14aeb346b94b4c33fde699d09097a927 SHA512 c16d83282c189d7720326ed0628c4b3359a859f45157e08f78ffa10a5607d01e6f64b2caa3b721ab9fcf2d83ee1240bc6f43ab484946e7a381122b27bd057b58
-EBUILD urdfdom_headers-1.0.5.ebuild 590 BLAKE2B f95b14f76efaeeaef40226032db3c12dac958c798051ef901115668e43fa25f0674a9c27f48ab955304711a97a3fbaf97235706767d45ca71ba4bacba9c196cc SHA512 5f5a6564e12e6b73a11ba3427a52bfdfbe97cdf5f157767a4d1645b3af118a6ee29d8664423224e17caadd7096643a5963067afd1a812a2938c500ce1dfdba2e
-EBUILD urdfdom_headers-9999.ebuild 590 BLAKE2B f95b14f76efaeeaef40226032db3c12dac958c798051ef901115668e43fa25f0674a9c27f48ab955304711a97a3fbaf97235706767d45ca71ba4bacba9c196cc SHA512 5f5a6564e12e6b73a11ba3427a52bfdfbe97cdf5f157767a4d1645b3af118a6ee29d8664423224e17caadd7096643a5963067afd1a812a2938c500ce1dfdba2e
+EBUILD urdfdom_headers-1.0.5.ebuild 577 BLAKE2B de00a4607aa63323d883e960793891ba9e84f3c2501625964d9b8981f569e381b6b6d81312f7c6896fa2436b6fc4358167460ce0765c9373fd7a55af1b0cff94 SHA512 c088590813ab7651625af55511283b1679d68344c268c0bdb20ed419ad61d1198884a5cba2bf4893657639be2bf292003007165e2d686ef249b24c258fa8afdf
+EBUILD urdfdom_headers-9999.ebuild 577 BLAKE2B de00a4607aa63323d883e960793891ba9e84f3c2501625964d9b8981f569e381b6b6d81312f7c6896fa2436b6fc4358167460ce0765c9373fd7a55af1b0cff94 SHA512 c088590813ab7651625af55511283b1679d68344c268c0bdb20ed419ad61d1198884a5cba2bf4893657639be2bf292003007165e2d686ef249b24c258fa8afdf
 MISC metadata.xml 343 BLAKE2B dff4acf9fbc6c2734ac356a3a83da2557b8899e8c58dade74215241f4b563055c55e7b175dc32750f140ed6e2b217f850a79b3a401f09c28eb45f873902a115b SHA512 c12551c09865f8d8f4a833ac0ae8f694e44f507c4e89f39fdb188f5d7159aa0aa6d67c05acae217f5bd8a02d0af3a08599b18f5118a1fc59a3b4105ab6612262
diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild
index ee7031ffd523..6530d6794eaa 100644
--- a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild
+++ b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild
index ee7031ffd523..6530d6794eaa 100644
--- a/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild
+++ b/dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ fi
 inherit ${SCM} cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 699b2047e1be..6e33d2953e93 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,9 +1,7 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
-DIST xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
-DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
-EBUILD xerces-c-3.2.2-r1.ebuild 3059 BLAKE2B d7f4ea69e1dbb36ab4d974c3218131ba5eef86945b5e7d869ff3a0c69dc0141845c4afca5e39468f6960a729a7e90fb3f7d4ff2c6eddb70831f7e3560f392639 SHA512 5823e3135ce771049f6d89fa746d347a16e2cefa48dd8756313a59efbd181775802fe49fd269a5b9e5a389b0818e2c815999f69db2167dce831025e06e52815f
-EBUILD xerces-c-3.2.3.ebuild 2935 BLAKE2B 3fa694164e0c60346116670b1d93305c975b9cb383928e004e6daa2caa6a4a623eaf14bdf1d6bce2b6e4e304710efa74eed06117c43d5a170f5c938a07983eac SHA512 28f98b041d03624c23b21ae6bf8d483cb53318bd657d3e571c6a5d4ee72d0c87460a4306b68090db177a3a25a0abba4eb28b5092fce6ca3f3facb1500bd95981
-EBUILD xerces-c-9999.ebuild 2942 BLAKE2B c4fbaebdc301f12035ecca49b3b25308f647652cf84cb24e6b8eeb8e69db205ac53ba20d7460af12f9c44a571a86351526f2785c0cf6489665560d9b96f811ec SHA512 89c5ca69e61d4ac7e5984e5ae502a3265dbbab9d098501adfaecf6d21c1c24df7deabd419e3b2a8fb772c6d4f5aeae5416f9cbfd03f3daaa5ed9248e2a1e27eb
+EBUILD xerces-c-3.2.3-r1.ebuild 3001 BLAKE2B 738dedddf7d7083a0222773ce6bdc428e71b30530aa95e8a19de1871c1e5bcd8f393103deab8653743eb09b45027542b95834348540b027e2809e393187e6a7c SHA512 16c48fa20b2f7f24c168d3c8a79fff300c12e35b1a3eb9c05d643a59c1d7ddcd7f5c3702393410e03080b06f43676c1089eb7dbb356c872197a6b4ae0d7591ad
+EBUILD xerces-c-3.2.3-r2.ebuild 2944 BLAKE2B f2a91197c33a2847a3439a30995a9442af066887ae77af43ddc243e1ed0972a5041be70c592a1e35f9dc42c90a6266a087838cedbd5455cf16ee4fcb12d1ef0c SHA512 b69d04b067adfabde81dce0f2da175f5fd9647f3f6213a220770837a3a87109febfcc9072bc802bdce281a4ff6f88331b4416e714734305ce40b56f502e8fb41
+EBUILD xerces-c-9999.ebuild 2882 BLAKE2B 1d5efc807b278179b221b88e050fff78b6c275d1a3554b2aec829296060a0c9309a19dac79a48e06d3c2efe259a945352eb6a9c848c58242e63be0515be97673 SHA512 25c01f394f9043e0952f55d38fe8590d3cb7f1546cffd6c23b59c7cd5ec80a104627fd7d991c512797876ea1e4c63efe956a1b6ee2c6e51631afd4476579d1ee
 MISC metadata.xml 638 BLAKE2B ae192f7a87ce73aed62967b02b1cda8535ac655b4e8763e7b75697c816f30b93b6bfb0b807d573f3ed82a9238bcb5234a1532151d98f9a30877884432916b816 SHA512 db2089786b68371bca8dd6e51ff820ac63245eefc5080e5d6f05b434bb2ee1a6831d439221f71b4d088e7d7cb22c9a68f6e67cee253923f13850afe6f7f021bd
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild
index 9c89e65548c1..b6a53f71d1b0 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( CREDITS KEYS NOTICE README )
 
+PATCHES=(
+	"${FILESDIR}"/xerces-c-3.2.2-fix-XERCESC-2163.patch
+)
+
 pkg_setup() {
 	export ICUROOT="${EPREFIX}/usr"
 
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
index 9671a52d453a..4c29af461e29 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+EAPI=7
 
-inherit cmake-utils prefix
+inherit cmake prefix
 
 DESCRIPTION="A validating XML parser written in a portable subset of C++"
 HOMEPAGE="https://xerces.apache.org/xerces-c/"
@@ -13,29 +12,28 @@ if [[ ${PV} == *9999 ]] ; then
 	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
 	inherit subversion
 else
-	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz
-	https://dev.gentoo.org/~juippis/distfiles/tmp/xerces-c-3.2.2-fix-XERCESC-2161.patch"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	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"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-
 IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="icu? ( dev-libs/icu:0= )
+RDEPEND="
 	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:0= )
 	virtual/libiconv"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? ( dev-lang/perl )"
 
 DOCS=( CREDITS KEYS NOTICE README )
-PATCHES=(
-	"${DISTDIR}/${P}-fix-XERCESC-2161.patch"
-	"${FILESDIR}/${P}-fix-XERCESC-2163.patch"
-)
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch )
 
 pkg_setup() {
 	export ICUROOT="${EPREFIX}/usr"
@@ -80,6 +78,7 @@ src_configure() {
 	# for interix maybe: transcoder="windows"
 
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-Dnetwork-accessor="${netaccessor}"
 		-Dmessage-loader="${msgloader}"
 		-Dtranscoder="${transcoder}"
@@ -87,17 +86,17 @@ src_configure() {
 		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
-	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
+	use doc && cmake_build doc-style createapidocs doc-xml
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# package provides .pc files
 	find "${D}" -name '*.la' -delete || die
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 627bdbc2f2f9..995f942a4379 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+EAPI=7
 
-inherit cmake-utils prefix
+inherit cmake prefix
 
 DESCRIPTION="A validating XML parser written in a portable subset of C++"
 HOMEPAGE="https://xerces.apache.org/xerces-c/"
@@ -19,14 +18,16 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-
 IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+
 RESTRICT="!test? ( test )"
 
-RDEPEND="icu? ( dev-libs/icu:0= )
+RDEPEND="
 	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:0= )
 	virtual/libiconv"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? ( app-doc/doxygen )
 	test? ( dev-lang/perl )"
 
@@ -83,17 +84,17 @@ src_configure() {
 		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
-	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
+	use doc && cmake_build doc-style createapidocs doc-xml
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# package provides .pc files
 	find "${D}" -name '*.la' -delete || die
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 0599d1931a0d..289efb9e129a 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -12,5 +12,5 @@ DIST zziplib-0.13.71_p20201021.tar.gz 1151849 BLAKE2B b4caf8b6b03d8de742d4e727a2
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
 EBUILD zziplib-0.13.71-r2.ebuild 1687 BLAKE2B d25b7136cdd1649653e22168da5e7d5a634eb838e233995cbae2051f3517ea935d2188cc79c772883d8b5e91fc1aa1215e3a20f4a5e6ef09b0a6d55130cae40a SHA512 73827f6e7ede1e797731c2e3ce54927aac0856c40fb55e85a4acda4d8cb0a7088556bb422205d688efa5e19b817e5b04f5287e9944416303ed5d2d00cf864285
 EBUILD zziplib-0.13.71_p20201021.ebuild 1873 BLAKE2B 2a5ec064cf753856e95f693c3c9f9044226eae7f931f98f0fea5bd145228422c340e7ab7712e05dc98f06d9091bd5f4c7ff31fc0983a856c391887c16d7b97ec SHA512 064f7881a753eb842e0ae6b449e818652dfc2f6abc07a63230c0ea8f49c6419ca880207317d6574c4dc1790e034138448a279947c6a857cc75675eda2abcd147
-EBUILD zziplib-0.13.72.ebuild 1261 BLAKE2B a8df8b8469149e572be45c0e71f0b2ed801857839ecfeec2a256ce0def01a64c99a06921c95946fc6ed01d9e31a6134062c4fdc44b2de679fb5ffe776dc47019 SHA512 3272e295a11593f81387abc62100af10f49bcee731ca84ccecbf85829eca4764cf82f77386a3869275bd4c1bc74e4cd32d14e1a10e655621df8de68f8324452e
+EBUILD zziplib-0.13.72.ebuild 1258 BLAKE2B bdcf7833a983bc1eae81c2da26f6159c80e63d4bce90fc3d64258020eb1508b9236323d263a7f380e86d89033c3b8c0b16c70d565074154053c53f76689e7c9a SHA512 0bddcd8386ca17dc4bf8d49c68d4a9777c0f8cd8613aa10ddc5d862c0274a13e079e5a7dbeae9e2b33ba5f0f317dff6ac6bf6b2a1ba409f2a847fc625af1bb0d
 MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild
index 3ebb06f83d6c..e448080e8f18 100644
--- a/dev-libs/zziplib/zziplib-0.13.72.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild
@@ -13,7 +13,7 @@ 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sdl static-libs"
 
 # Tests require internet access
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /dev-libs
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)