gentoo resync : 24.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
commit: b49088575eb777ced2551f484da86317332d6087 (patch)
tree: bf9a151cf2d61956340d555659ffc098ee1da466 /dev-libs
parent: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)
80 files changed, 469 insertions, 374 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ef227456bd56..6a1fe7cce566 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aml/Manifest b/dev-libs/aml/Manifest
index 9e27dddea37e..ef2270eb0d5e 100644
--- a/dev-libs/aml/Manifest
+++ b/dev-libs/aml/Manifest
@@ -1,4 +1,4 @@
 DIST aml-0.2.0.tar.gz 20358 BLAKE2B 4be63726ea9069cbfe36fbf04e3a0b2229066d7df039aea1a41fdca27700d012fda9eda348115f8c0ef9d3f201640123722d0b96bc7b171841d920357a292152 SHA512 196cd891fdbaad47340d8b4ca9eb62a7f9e6b0969ae9ad744a3c9ea110a532691d53a1e39fde583bad0f8fdae4b51c3a4243bbdab65e952e5fc79ceb6efc3262
-EBUILD aml-0.2.0.ebuild 535 BLAKE2B 3ab2c148d97b733405e6ae622681e48834944564f0fcb7306337938440205765c1c45d16e9dfbddcd9f9dc85d99a0c093090fd4d45e3647e6b3f869a673774be SHA512 ee09a25d9331fe35d9f867780b05aadc03f18fa53ebb70fd69f6782e187dc7829f1112366b198fdbfb810147de3498ca3c4a3570caab942551f506a0925b018e
+EBUILD aml-0.2.0.ebuild 547 BLAKE2B 69e6def9bcd3f4cd7c1974f37e1d82a5cd27d0dda1844d101f9561eac3c97b6ca02f41a78d7e48002749b83c6595ec62e3e921ceca4b33d0575be26b3b701e27 SHA512 62b1069313afe519ae724d78e6fef94a7427a31e5faa2d5924c972d5b9b684b689c5b1beab181c88ab26daeb351c3c2f7af838e69707917d54323cece303f70f
 EBUILD aml-9999.ebuild 535 BLAKE2B 3ab2c148d97b733405e6ae622681e48834944564f0fcb7306337938440205765c1c45d16e9dfbddcd9f9dc85d99a0c093090fd4d45e3647e6b3f869a673774be SHA512 ee09a25d9331fe35d9f867780b05aadc03f18fa53ebb70fd69f6782e187dc7829f1112366b198fdbfb810147de3498ca3c4a3570caab942551f506a0925b018e
 MISC metadata.xml 462 BLAKE2B 1c1838f2f464d371ccb3a48603a27369cb26f7ba44f35d68e2b892ccbe5e738701192c71b150e013dd9bb3ceb2b80123a4c385e79d8e3deb82957bee13b3e3ec SHA512 e761cac28b27f3616965dc90439f7f43f3bf887f84fcb9c810f579f6ee3cb672b0382da667db5887f4503730c85b03925fb2ad4b41f432db23b67e0ff1cfbc19
diff --git a/dev-libs/aml/aml-0.2.0.ebuild b/dev-libs/aml/aml-0.2.0.ebuild
index db62c0b53724..0a91a702137c 100644
--- a/dev-libs/aml/aml-0.2.0.ebuild
+++ b/dev-libs/aml/aml-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/aml.git"
 else
 	SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index 147aa8cc03bb..5c0206ebfd1d 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,5 +1,5 @@
 AUX bglibs-2.04-stack-buffers.patch 1676 BLAKE2B 356ef239c23178b5f07d80776279c0e91a35af07623c977d051217317496e796a337dd81df5bffa828296e78a007bdb043d73d195a3bfb74116b7751b1c2f42d SHA512 0000b26a5c781b3e68253b6aa8642f1b8d0fe99d4c6cef4a776a33b83272c1ea218ae91845ccd7ba291be6a17b719513317dba32fbeedcba42f469ea65b85b85
 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
 EBUILD bglibs-2.04-r1.ebuild 1686 BLAKE2B e54a329c71f42760d20e7b1b0327b99030ef144472eeca6a167154bf8e9ac1e53f5601ef1499b5a91d85ecf68265a6462202ad1b5aae7ff6e28672caac0387e1 SHA512 466298718dfff3cb09a1bd18100ebe97eb4db210988e798c126dac0c2f3107fcdc8ba1c47c80957bd2f4d3dbdcb35f124a371d43e1385d457bd8785200162916
-EBUILD bglibs-2.04-r2.ebuild 1802 BLAKE2B 97ca0f1bc6f622fe26f9f15ac46af422ee5130466d0db6a867a5a58dd4f101ab2464f86591a5c3ad40769007dedea63a96a099e5afeb49bac6e660f3f2413859 SHA512 ee4d7a9b135e22acea601a28b8722673e4c82020fc1bf3a40d9a5480591545642bc7929f9f836d56762a0672076060b0c7de540721d090f568b378fafdb6b6d7
+EBUILD bglibs-2.04-r2.ebuild 1809 BLAKE2B 1f9eeed207ca0e03c7f8090e46f1bcdf1be2eb40a353d53f4de9f76491875b207b1bd32b4e738c4d41e61db099483a8fa079b69d68688a90ed3c9f3da08a2df3 SHA512 7d4d970e9ffd3baf1875aea016b43f0fa3cc7a164a7b2c2f794fe349df59243d74b9df89d96eba67e89a8b4d8a0b332915e54edbe95f61c51af51b0862387fe5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/bglibs/bglibs-2.04-r2.ebuild b/dev-libs/bglibs/bglibs-2.04-r2.ebuild
index 2ec52132c373..d4451b3dde2d 100644
--- a/dev-libs/bglibs/bglibs-2.04-r2.ebuild
+++ b/dev-libs/bglibs/bglibs-2.04-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 36fea0ca131e..144db510c5a3 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,4 +1,4 @@
 AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c7aa12594148102498c7d0ed3216af95712f0daef5e9484d1faf368b93b2b014832ead5466d60d139e9ed7bb2bd1ed02 SHA512 81ffee2dc4a406e980025402dc3f8bee886cba9f305312e03c735d4b47e69887e90240274ae1949ff9900ba2a66413d33e7ef7a9ebb83a3dc9d2769f3d008395
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 EBUILD capstone-4.0.2-r2.ebuild 1527 BLAKE2B 1afcf5963366645ae26665381d21655b2445b3a8cb11d864453571332acd48a421d9f9d6a936833fc1c3f80da10d39e70661971bc65d4abf5e8eeca98b2a3345 SHA512 bb6f532018d891fb4155fe869b8ce41b61deb1d84b133507bc42c98217273e6e75aba355708e6693372292de662655951fdd908bcae87c8c891ec1b750261211
-MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
+MISC metadata.xml 247 BLAKE2B b525987287ff88d452c8613b12ffba15f27ff0589d1a819f9e0db6e428d9627e4be2e6d40e0104627228cb66b5af5a98471966effb069dc7f9e99015143c335f SHA512 16387584191a882c7d76c971aabcc8796c0bcba7bd213f5d4952c34c5939c8b426f6a8cd32c1b3b2ac386c2fac13a855af14e385e1235fe138791c54ceef500b
diff --git a/dev-libs/capstone/metadata.xml b/dev-libs/capstone/metadata.xml
index 506ec45bd2c7..a75ba5dd10cf 100644
--- a/dev-libs/capstone/metadata.xml
+++ b/dev-libs/capstone/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">aquynh/capstone</remote-id>
 	</upstream>
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index c0ee3a70243e..ece5d1d7295b 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,6 +1,6 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
 DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59
-EBUILD cdk-5.0.20160131.ebuild 1188 BLAKE2B 8d21e272edf3f5f2aaeabbad9cfca3c109f29f97cc3a5e32c1a944d0313aeaa058ccd1f9920112c2771619574f15382e368ed967dbc719e328fba05c86e9dd95 SHA512 e368a257d963bf96b67796306abff10d9d2c3a0812b04e35f6f0be2d8302890c450d4c38114bf2431fbdd0d92d3f6c9c9689aa145159bd075c789ae94c9ef488
-EBUILD cdk-5.0.20210324-r1.ebuild 1371 BLAKE2B e11d215408de731a943950f9ae1c9c40e41f4c72db57efb7b13a82877cf96f1ee0165241d6eb90c78cd100e6215dec4063ce6b58851bd5851e44753213f0d4c7 SHA512 b272b94c8843b79243d6ec30d7ea6e49af6c0e070bc0cfd5a58e5e2e38a1a9bf3c4a169253eaa8fbee1753b70a7e36337cc264e2d706b36c7a735fafde6c4f65
+EBUILD cdk-5.0.20160131-r1.ebuild 1184 BLAKE2B e291fd42419df39f3dedf3482235634d0841d0fcea6188c2f248bb6ed346482c2c47b6e2e2995cc66d2705811bfd805a82accaadcbde06c190f51e302c03ede7 SHA512 5ff631f36aa0a2c53d189556236e084b8b76fc8d7ab423d8874319f511b4fe05a96b41f4840824764979fcc33bf798f71f18b9fdb4715604a40d8be1f044fc69
+EBUILD cdk-5.0.20210324-r2.ebuild 1364 BLAKE2B 8e6e6d527b0e25ee45394ce0a8565422661f02114b518c37487f98e03b3c1cc66f99c3d98a0f57cb5b172543db021d57703838f8e7f8844b014f906f1b0000eb SHA512 4ca91d3f9f62a7eb6482405fe528c23b43dbced89d7c75ac254b362bf06fd7bcc359d394abad85fce0a9d6a7ee8d79792ee690e1a5a80cf1dbec20f83af417dd
 MISC metadata.xml 257 BLAKE2B 79047e3de318b37a708a9b29a4f029450dec552f2fa99fc580cea6050eb164eabb0abba972a6fc77bfe21c1c2f4ae437b4753239953c9af1875159c6a39d1519 SHA512 2406cd8512460b934f3b6caa65f52b454fb3946491481e04ba3e11c45206dd9dc38df1d8881c459e9e518e19dfac798388dbb11339e274e75f88b3e3d5f9d057
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild
index de65e39fe0d5..7f12ab36a255 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/6" # subslot = soname version
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs unicode"
 
-DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
+DEPEND="sys-libs/ncurses:=[unicode(+)?]"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-libs/cdk/cdk-5.0.20210324-r1.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
index 6aee2fbce644..fc2b2af9182f 100644
--- a/dev-libs/cdk/cdk-5.0.20210324-r1.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
@@ -12,10 +12,10 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples unicode"
 
-DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
+DEPEND="sys-libs/ncurses:=[unicode(+)?]"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index 0e215a8dbe62..967920dc3184 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,5 +1,5 @@
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.5.0.ebuild 764 BLAKE2B 56ebf126c5ef4afdea1cf16305fa663248ccbb43a6994ee43cd0e4025b9feccb348bb127f5a3be93e82db8d622a2f4d57012283c2cd269b080910966ef736373 SHA512 95a2808f91c2d6d639ed63f3c5a3a578d39dde0bec657ecb30a32498c292bff8ebfb90a93ea77bdb403cfff8a9b5f290f50438220bc59b73732a533c0c03e8e2
-EBUILD collada-dom-9999.ebuild 768 BLAKE2B 445d45af488bcb04be8b5bf919826d6196eca8166c6833044962fa523a73efce07e5e9f13e1e8f171d6d8d05a3926138947b25e32053eb5db729abe788e789f1 SHA512 eea520b3c82603ef29d117a127b7055c27c48880045704f43e070e90a1bf0bf2270880926c5299489351773910bda245a7533b9c5981e977b42e24bb4cc1ac45
+EBUILD collada-dom-2.5.0.ebuild 769 BLAKE2B dca7e0ce0b524c1f5705f70cbf839ea2848e8ccae522750d51fcc98c435b42b28386d30259da4c4c8d349a29387b9173b0d995904da3d5585dbacc867c7dda6c SHA512 829c1f7a5915da1daeb48e98b20245f1f5a59f9164038f40c2de04facab8b2fa99d34b2c88200b2486cd91793ecf9d00f75cc6b49bd83af6c3c5a07df03edb2e
+EBUILD collada-dom-9999.ebuild 815 BLAKE2B f3763344d2c9d316b441e9d3e17895e08234db223997c66a31ea7b09f1a87f6979fe1f30fd465367a8525b570eaebceb51618708773b12d59ee4ff720822628b SHA512 58fcbf44de6f3856bec8a9938012419735dd3c200f1800222290ea927fb977dfab40c0d16ec25c8356df6146a637ea29b31922c27fc8de41696f009e80263b86
 MISC metadata.xml 402 BLAKE2B 34446b3bb91ea6d424455de22a994a55c33f3ce088c7e8ff4307a25816c0d685d632c4b5628c939dbf5901cbcef7d2e143bcf45f64f7046c3419f0b7fd121935 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index f6d4152a5a7a..dcecedd6ab00 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index e9f30a02de0f..2aa42f8ecd6c 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -10,6 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index cd901dba21b4..de595cfd31a4 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,3 +1,3 @@
 DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7
-EBUILD concurrencykit-0.7.1.ebuild 730 BLAKE2B 22ac382e83982281ee3c8c0104949fe0ab7addb98307e675b408cad11d01ff83bc6e01b98bc09fe7b855dcbeadc53b2e15559e5a51a8ce84787339d58a1be958 SHA512 a19040a3ff4c709f531e81c8edcbfc36ee5a7efcf6c0f4a995a6093d7fde36a5df2db0f4e86da99274e733721256b6ee9289ba501bb1610deb63181b2ce57461
+EBUILD concurrencykit-0.7.1.ebuild 697 BLAKE2B 7fdca10f1783de1478600d79b21845c563fbccba1965e41524380a582d635b9088596ac5aae293c85fc7e9cf2a9f18016a1ef5cb7a6b19eaf262b5483f63e943 SHA512 46683f039a119d8c680b6766ca9449a90f30bae15821a0d8690242e923cff083dae9ab35c9997292e96478b5f548fca97f149c5969847c1fcf3fe19211fcd57e
 MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
index f1b6903eb0a4..110318f4711d 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
@@ -18,12 +18,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # The 'libck.so' has a name collision.
-# See #616762 for more information.
+# See bug #616762 for more information.
 RDEPEND="!sys-cluster/charm"
 
 src_configure() {
 	tc-export AR CC LD
-	$(usex x86 'export PROFILE=x86' '')
 
 	local myeconfargs=(
 		"--disable-static"
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 50b3a7b22178..9e3902c5e8c1 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,5 +1,3 @@
-DIST dqlite-1.7.0.tar.gz 157454 BLAKE2B 3eeaaf5bbadfc09803e70d38fcd3ab23c212dc2700ad8ecdde720932b0ad2e32016503eaa8a738139a178bb926a7818497629699ec68eec8c2111f377b40b4a3 SHA512 bf94568b1b52b0d94ddf78a3f975e277a5baa0f553c5c1d175b7e58db3d44478a1b3f8ef962259175b29d774b2eb6ed6765874dd0d461126b3268abbdd57949e
 DIST dqlite-1.8.0.tar.gz 158026 BLAKE2B 0e3bc8badf6b7e0447eebd86069785dca51c4dfda527ee7b838da971830ad65e443c130484b25c901aee5ac4e14c81df84756734aac3fd58a2fdbc67a664c1fb SHA512 4b32a8f8414aabfcc53d7f6ac0d121201076d7021a7d244b7cda316c3e3349e1b4da04cca31f2e3ca7605a9357895374fce0cce076b40eaebfc29a94d42fb38f
-EBUILD dqlite-1.7.0.ebuild 812 BLAKE2B bc674d8d9d5527bde955a7b37881b4ae06f5c7e70cd5ac41ace2f61a446639744042537919119ba1b9411743e265080472c051bf9f928815fcd4944e24fc018b SHA512 d10191b3fcb221d1302f2acbd7ed1632e4a5c077094a9b53a8c3e1315dd083e373e3e3ae3c4bc8da1eb0f6b08b7ac2510a37ae288a463203b0824a7879dfb9af
 EBUILD dqlite-1.8.0.ebuild 825 BLAKE2B 626c27cbab3ecc4404db2a11be24ef9580d22fdf591cee5cde46f96af5cb22b8e342c4fa61dffe9cbd93ce2950e528a7ad7749451a27f85ef100697278539e4d SHA512 7f8be2214215586c26ababbdfb88a9ef65ed5bb95b308223ab0accef58391ed7baeef49549380515ca6c36a9f6d2f99a300e020aae257962f72939c13250d7f1
 MISC metadata.xml 864 BLAKE2B d4b41f296b83ca318affe7df6ae3eba7b470d75bcdf343ea701890e43d62de317aefc1b4f47a939cd909ddc002201a6f77cb7662afdd8ad601f010ba0a8d16e9 SHA512 086eea8b0a1e5c58b26321bc4db1466437bda4e7129757efadc49b751a9ff2b9472b72ab83881c8e9aea171a052f9434723f27b4ccd3ae4ca15f21f165a1ca92
diff --git a/dev-libs/dqlite/dqlite-1.7.0.ebuild b/dev-libs/dqlite/dqlite-1.7.0.ebuild
deleted file mode 100644
index 68b083517b59..000000000000
--- a/dev-libs/dqlite/dqlite-1.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
-HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
-SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libuv
-	dev-libs/raft"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/raft[test] )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-sanitize
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index cfde982c3c61..605909b2c391 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
 DIST ell-0.40.tar.xz 524256 BLAKE2B de7326cfc7d00970fdeb5f19e38b9c68e6443544f5a6397aa031a7dcd0d61c77ab72303ad51d36e8fbc2c34c954631636f7f42bae0c40cd75498882ab78e2c85 SHA512 bc721e300e5b689dc51f794019e731eb252ad74dd199bec7685373ffa32ad42950aae9e36cb74d3b6590016c046589acb3ae8c009c4a14bd89331913392e923e
 DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
 EBUILD ell-0.40.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
-EBUILD ell-0.41.ebuild 1255 BLAKE2B 2f1cab8b6a2f77c85d80dee309aab8c74984638556a7eb88142dddff5c339014046bc981205c70b6401e5181ea3b8134356e2fd831a315822db894bf3898e03d SHA512 908ecb88433c7ddac197aafe986edac040a944a73bc46ac9c0c4fdc56c6f0a029ec15b1974754a9295acc91355ec22c5be520ddda8ab8a18cfdbf3a27a3efe9a
+EBUILD ell-0.41.ebuild 1254 BLAKE2B 12d13783c1202d3979cb998aa11f2a26266c5bffb7ba9d21e9ef2c9a2871edc2bd77ff9471436876ac2974e5570131b96b0d58bdb29b983bae904791388249cc SHA512 8249eb77f7fca4a6594a24cb436382019884c0eb04ebc447e8bfbc0339729e4390ce8bb7cdba57f10a6fffbea886c7eee8d9e4344443069cd983de1e5e50addb
 EBUILD ell-9999.ebuild 1257 BLAKE2B 27e21a66e146c9c55d06dd774124a30c14b5a3c26f571645667ed5660f0bc70e23b1fb27c68a740e6693870b6bbbc62e5eb3d930ae1b7bb5f05464c59d8f8e53 SHA512 cc5ea49eabe2db020d458569fa5cfda3e37602e63706c51772d8af7358a38ab5a8b62e9b5a95ebbc84276f70ceb852c406ff3051d46e32413d9f91e1680ac5e1
 MISC metadata.xml 336 BLAKE2B 119f1779bc0632481e1053d02f3fc56df9504ad591e057148c5885d595538d5b3d16fe0b76361a2051433f710228b85af866ea0694f695fe0268f8990dd07c15 SHA512 16de07f5cf33c2a9d44817f75a005e035ad51718af1ae4eff6c31519858294dee82286ec5a80ed87b0487c8deb352d1e46f4f53a0ffb06c5a4f9d3f27e704284
diff --git a/dev-libs/ell/ell-0.41.ebuild b/dev-libs/ell/ell-0.41.ebuild
index 1275d91a1a22..80020563ed51 100644
--- a/dev-libs/ell/ell-0.41.ebuild
+++ b/dev-libs/ell/ell-0.41.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/folks/Manifest b/dev-libs/folks/Manifest
index 394cb34aee91..69e101aa2cca 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,3 +1,5 @@
 DIST folks-0.15.2.tar.xz 489236 BLAKE2B 63bcfedb88205b37c6e9595c3e0c34f7fc869045648e04042cce9300776e4b7d102f91312434545581882f0959502be7ba1bc2f77d50ec2af7f649444da9197d SHA512 c327e39b7cf32b72db3f84504f8ec2a4bc2d98693ca5ff21c3b544e37b58a1df9241dd1be541a39be83468b62dd0f5d7b5a3a0ca4bde5e94d1e075d77d3be505
+DIST folks-0.15.3.tar.xz 491432 BLAKE2B f11123a2c41c4a36c002b26f3c3616d62e4a74bbddbde84643143404497c8e3c31d8cafc8bff0ba4714606259aaa6f7adf352ba4bb98a20c75a181ee68bfda3a SHA512 dd54aef470990974bfc9b22fb83c868ca9674608ccfddeea1bb7507dfc77d7d12a43d43462957b0bb99bf249c13868ba7326f7fd7e38de8802a3ba54e33d8d58
 EBUILD folks-0.15.2.ebuild 2208 BLAKE2B 9bfcddb38405b7f34d2b9f6f032d44aeb1c8409b6fa34ec27dd95dc220bde2c3d8780f746b381c3321d588c6c3a8611f59165cfcc2a35a2ba57943d61983a803 SHA512 776f71fdeb56953d5160098482a649d08c1e15723d941263fd017bf1c46f807abcd3ce8d7e8b4651e646e1d919cdadb042b2888a1f904c3839492ddec8cbd1f5
+EBUILD folks-0.15.3.ebuild 2316 BLAKE2B 637616d6bab73a5703193937030e7587b47d7cdb73092da3bd01374c7aebb71e93e667c2c8c712dcd19251ad87dd639a943801a66f1aba951381f93dd14a49f2 SHA512 d59eba53c12a660b14332adebbca2a43d7bae978fe96d593848a14d4838cf51c4528c9b0202a847729f8ec4ca86c71594d124cbc2eb78ec380a7341edd73c749
 MISC metadata.xml 395 BLAKE2B 3d62bb67ea7cfa05371530d79d4953a1b8c33a1c17e6545dea2bc5736c5f751180f495d1966a403a77c84247a4b96a752d9505c6412138df382162520d235f2a SHA512 9097dde175eab9cc701a05ab5435ce6aedaeef984ec05392f60806ac12d16563f837b916cab1018a9440d427e17722381e27763060073d329704291910873cc1
diff --git a/dev-libs/folks/folks-0.15.3.ebuild b/dev-libs/folks/folks-0.15.3.ebuild
new file mode 100644
index 000000000000..dce27502ec32
--- /dev/null
+++ b/dev-libs/folks/folks-0.15.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.48"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/26" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds +telepathy test utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	telepathy? (
+		>=net-libs/telepathy-glib-0.19.9
+		dev-libs/dbus-glib
+	)
+	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
+	dev-libs/libxml2:2
+	utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+	bluetooth? ( >=net-wireless/bluez-5[obex] )
+	telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	eds? ( gnome-extra/evolution-data-server[vala] )
+	test? (
+		sys-apps/dbus
+		bluetooth? ( $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') )
+	)
+"
+
+python_check_deps() {
+	if use test && use bluetooth; then
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth bluez_backend)
+		$(meson_use eds eds_backend)
+		$(meson_use eds ofono_backend)
+		$(meson_use telepathy telepathy_backend)
+		-Dzeitgeist=false # last rited package
+		-Dimport_tool=true
+		$(meson_use utils inspect_tool)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" -t 5
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 5f0133b850fe..2562b089c783 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.68.0.tar.xz 1019732 BLAKE2B 2f99cc9cec5ea05f1a5fa4473d1ad424cc1f6b097075f798e89cf740519db180417a3f0de37afc8a0cf0771436a9d9f7d6193b69289dfb47ec077d33a7d27c91 SHA512 d2e64c119aa500b624a57baa2cebe9126ab100003d98b771f4fb51cf92748635de352997f702f40656f7c665f3dfedfbfa19912cc7a2d039d254555243bbc381
-EBUILD gobject-introspection-1.68.0.ebuild 1985 BLAKE2B 47669d04241b47e67472aacb1a11d3b0224bdb0f35b718f3b7a644b2393f4646986f3c67c5d181a9d0be1dd77bd8cd235a28209f85727466deda9a9921868b2d SHA512 132e50447d4443f867030a953a33bd56daceceec282ba3068b62d7fbb0fc9bb8436d0d56ef6a58c3ad5b94adfaf9c3a32429c9211d259ad67d175bb2918caf8b
+EBUILD gobject-introspection-1.68.0.ebuild 1961 BLAKE2B 55f144f8d0590b66cbf656efccf5c97bab4f4c2bf1da0df6bb900705a1ba4d50e7f710ad761b4ab09d9efbe17238ff92f476f86926eb21cac9b1c2cceed5b6fa SHA512 5e2dc9919beefdccaa9914ab144d64e7b5bea1f0355eddf4c24300853828b026ebaa9c580ee22dcb7947f3dcb394059944db5570692529815180db5e972b1c6c
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
index ebd5522e0fd9..fec54fa1772f 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.68.0.ebuild
@@ -24,8 +24,8 @@ RDEPEND="
 	dev-libs/libffi:=
 	doctool? (
 		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		')
 	)
 	virtual/pkgconfig
@@ -42,8 +42,8 @@ DEPEND="${RDEPEND}
 	test? (
 		x11-libs/cairo[glib]
 		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest
index e76ad4d54c91..f6b080d16655 100644
--- a/dev-libs/gumbo/Manifest
+++ b/dev-libs/gumbo/Manifest
@@ -1,3 +1,3 @@
 DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1
-EBUILD gumbo-0.10.1.ebuild 979 BLAKE2B b9bc5db4466ed5304c153c959d648178503c911133dd361f9ceb0e546950aea09eecafec69fdfef9670a848f7baed8ba72457e8416317e1410580ffe837b884a SHA512 d4abdf75b0d5a983525a96e47fd139ce9b41597fee9e7792d50249f8b382e4702e916281ee8c8540eb609893425390b2796861d2247378ebf3a845656798f666
+EBUILD gumbo-0.10.1.ebuild 986 BLAKE2B 9ede93e1d7d87dc5ad7b9f4fd39e2536ead35591d79530ed8bd5bd438347a6346ed090ef32419c25d282b1bba37a701478e7de42010fc34c9a1592a172642c09 SHA512 0744e9084faa6909ccb45b32e170d02da1c060d3a4de1be653736cf9cfc7732f77b65ee0f4b2fedc23b0db9027cef453e689895ae28adcb86bfe8415ba903455
 MISC metadata.xml 316 BLAKE2B f653d0ab857f07f4dc00630d5c795c86920514c04e51d0e86eb761d3f8298b8a4aa6ece91fe387fb1ec1e94b46cd8429405dbfd9303d1c591d155a0521e1547c SHA512 64d8505048d0a0eaae29a8078d340ae290f9bcd2971028e069fdca2f3dc503cec644109a9d695f7e63ce4cfdb6a1e6375e49292580aad1b4e61a46612cfc7c25
diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index 697dac747048..95eaeca08e51 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index c236ccdf0feb..f3b07e9f21e8 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,3 +1,4 @@
-DIST imath-3.0.1.tar.gz 527715 BLAKE2B 45d8f6524fd2505bdb3318f571c44228c9baf6df869d194d4b90a9c045f1dbb8f905253aeaf6b6a9254e4b0c0c19d753b7e4ae068732f0367fc936d4a111520d SHA512 40cdae81d624636b3dd7eb456e6e205e5b7adf7aed17f6e9168374f8830f1b5755dcd32ac790f94e768513d06ab96d94a2bc57ec80a079e4ac94a3857e5e3988
-EBUILD imath-3.0.1.ebuild 2020 BLAKE2B d5262619ae26b056fd9a928d2d4b93c42903f08f05071a4ab80d01976bca76608804c449efea366b58bee1b202fe0eef18ca898748ed3f2209bab88f9d7c539b SHA512 273ad60e56c3818056361c537d100a7a534ca1a20b5f515df4c00cd2eac2200675be76d71da66dbcbc960d80cd0315829b482255bc29f5e40b3facfc0701da84
+AUX imath-3.0.5-0001-changes-needed-for-proper-slotting.patch 7130 BLAKE2B a041a7ce654c32443457b34d9c2c4d0d919b9fe373971675ec265218dff7f8a2b470a44e7af44d27cb4d8c8c4b8f3e405b4b9762e7f8cfa8ad84db9c37f4baf0 SHA512 6407eaf9041105da66bfd70fa6e8b99813f938636dfda10b29aa078c445244b0f188f097bd4540ab3e1f1113faff6e1e7531df5ebbba28b7ab511ebbdae297a4
+DIST imath-3.0.5.tar.gz 528503 BLAKE2B c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6 SHA512 df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2
+EBUILD imath-3.0.5-r1.ebuild 2289 BLAKE2B 4262a992f53e670824e0976453694ed8e7d5b478455f1e3ab9d8f77ac74f092af448304b0ed30d826c37a8c6dcb4d6be38627307b5e05ebca7ac3fd838f90e91 SHA512 01a5b0ef91106c795c6a9c94654b3a82747671fac4458c48d29122d60182526cdf0f113958ca72eaa6de1f4f784e7a7e17539e5920bb686981c67688c77fdd58
 MISC metadata.xml 819 BLAKE2B 20d1b4527861c2c01c4e6b9f413f539b6119934932ec3c8d1a7a272f52a9579832f230279de518fee775e104c6f2f149479b6dc774567e28b612676b0ce6f399 SHA512 06d1832ce88a1a1c83ddd09687a242fb109c43e3d38d4d3d8cd236308d11a649a9f060c7fd7af7c69a209b560cf1e541e18212ce62309357186183d749304031
diff --git a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
new file mode 100644
index 000000000000..74d0f2dff7d7
--- /dev/null
+++ b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
@@ -0,0 +1,161 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 20 Jul 2021 19:18:20 +0200
+Subject: [PATCH] changes needed for proper slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config/CMakeLists.txt                  | 6 +++---
+ config/Imath.pc.in                     | 4 ++--
+ config/LibraryDefine.cmake             | 8 ++++----
+ src/python/PyImath.pc.in               | 4 ++--
+ src/python/PyImathNumpy/CMakeLists.txt | 2 +-
+ src/python/config/CMakeLists.txt       | 4 ++--
+ src/python/config/ModuleDefine.cmake   | 6 +++---
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index d51c25b..63cc98d 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
+ 
+ configure_package_config_file(ImathConfig.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+   FILE ${PROJECT_NAME}Targets.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/config/Imath.pc.in b/config/Imath.pc.in
+index df11cfd..6eb4f40 100644
+--- a/config/Imath.pc.in
++++ b/config/Imath.pc.in
+@@ -5,7 +5,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ Name: Imath
+@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} -lImath${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
+index e9ff904..00e5176 100644
+--- a/config/LibraryDefine.cmake
++++ b/config/LibraryDefine.cmake
+@@ -74,8 +74,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     PUBLIC_HEADER
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
+@@ -88,8 +88,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+       install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")")
+     else()
+-      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+-      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
++      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++      install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
+     endif()
+     set(verlibname)
+     set(baselibname)
+diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in
+index 8e8de6f..1902660 100644
+--- a/src/python/PyImath.pc.in
++++ b/src/python/PyImath.pc.in
+@@ -5,7 +5,7 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ 
+@@ -13,4 +13,4 @@ Name: PyImath
+ Description: Python bindings for the Imath libraries
+ Version: @IMATH_VERSION@
+ Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt
+index 7b4f6b2..8f7fd70 100644
+--- a/src/python/PyImathNumpy/CMakeLists.txt
++++ b/src/python/PyImathNumpy/CMakeLists.txt
+@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
+     LIBRARY_OUTPUT_NAME "imathnumpy"
+     DEBUG_POSTFIX ""
+   )
+-  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+ endif()
+diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt
+index 4f796df..15d7026 100644
+--- a/src/python/config/CMakeLists.txt
++++ b/src/python/config/CMakeLists.txt
+@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+   COMPATIBILITY SameMajorVersion
+ )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+ install(EXPORT ${PROJECT_NAME}
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+   FILE ${PROJECT_NAME}Config.cmake
+   NAMESPACE ${PROJECT_NAME}::
+   EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake
+index d9a8907..ebe1a95 100644
+--- a/src/python/config/ModuleDefine.cmake
++++ b/src/python/config/ModuleDefine.cmake
+@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
+   install(TARGETS ${libname}
+     EXPORT ${PROJECT_NAME}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+   )
+ endfunction()
+ 
+@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
+         LIBRARY_OUTPUT_NAME "${modname}"
+         DEBUG_POSTFIX ""
+       )
+-      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
++      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
+     endif()
+   endif()
+ endfunction()
+-- 
+2.32.0
+
diff --git a/dev-libs/imath/imath-3.0.1.ebuild b/dev-libs/imath/imath-3.0.5-r1.ebuild
index 72f012bffe05..dadfa6007aa2 100644
--- a/dev-libs/imath/imath-3.0.1.ebuild
+++ b/dev-libs/imath/imath-3.0.5-r1.ebuild
@@ -3,46 +3,46 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
-MY_PN=Imath
+MY_PN="${PN^}"
 
 DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords):
-# ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x64-macos ~x86-solaris
+# ~arm ~arm64 ~mips ~x64-macos ~x86-solaris
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
-SLOT="0/27"
+SLOT="3/28"
 IUSE="doc large-stack python static-libs test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
-# libImath.so conflicts with ilmbase
+# blocker due to file collision #803347
 RDEPEND="
-	!media-libs/ilmbase
+	!dev-libs/imath:0
 	sys-libs/zlib
 	python? (
-		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
 		')
 	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_MULTI_USEDEP}]') )
+	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
 	python? ( ${PYTHON_DEPS} )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch )
 DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
 
 pkg_setup() {
@@ -50,15 +50,19 @@ pkg_setup() {
 }
 
 src_configure() {
+	local majorver=$(ver_cut 1)
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
 		-DIMATH_INSTALL_PKG_CONFIG=ON
+		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
 		-DIMATH_USE_CLANG_TIDY=OFF
 	)
-
 	if use python; then
 		mycmakeargs+=(
+			# temp. disable for finding libboost_python310, #803032
+			#-DBoost_NO_BOOST_CMAKE=OFF
 			-DPYTHON=ON
 			-DPython3_EXECUTABLE="${PYTHON}"
 			-DPython3_INCLUDE_DIR=$(python_get_includedir)
@@ -81,10 +85,10 @@ src_compile() {
 }
 
 src_install() {
+	use doc && HTML_DOCS=( "${S}/docs/_build/html/." )
 	cmake_src_install
 
-	if use doc; then
-		HTML_DOCS=( "${S}/docs/_build/html/." )
-		einstalldocs
-	fi
+#	if use python; then
+#		rm "${ED}"/usr/$(get_libdir)/cmake/${MY_PN}/${MY_PN}Config-gentoo.cmake || die
+#	fi
 }
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 2889dce55817..5480c0d9e81e 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,3 +1,3 @@
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.2-r300.ebuild 1076 BLAKE2B d62530a41be87998e0e32901852bb08797ff6457774cd49e9fcf6e582a4ca89456ff2d7b35a5cfe09d393a90dceb9039ab454050ab0addf1acfb9f9c03ac06fd SHA512 1142db1016034ebafdaa85765df21e35380bdf127d0a2311494f0cea73d1972a4314696890e9262b1a88877375d7d04e39311268d215681da8ef0839072bc6ab
+EBUILD keybinder-0.3.2-r300.ebuild 1083 BLAKE2B 5772ddc971d3977f9fcd369315c1e7224ad1a0462f357bd4c252fd057395377b25104ca939326735e38fba028068b7a87eafb72a31300a4ce6d43531d9cfc3ef SHA512 092a90118acf2310ee6ee1b70f839139fb70eeb9e5f5cf5bac27d507c35c354bdced44d1564d30cbaf525120c72e507bf7d1457d6502ae410fa429cba6c9d413
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
index 832566c0f6c0..5e606445e31c 100644
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="+introspection"
 
 RDEPEND="x11-libs/gtk+:3[X]
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 2df55cbacd84..d3ce1dcd2173 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,4 +1,4 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
 DIST kopeninghours-21.04.3.tar.xz 63212 BLAKE2B 8f16566559b529ca44aaa0cb6b8267cc4d253c82e336d210cd240191ea5b60e029d6acd914053707c010bf94628cfb43e9fa0cc5625f275808426f75ecaf8e6a SHA512 d368cdbfe9dfcd82a847b932ddd244bdabfabdf1d44dbf6fb371f3af294f538d77d9f955fdbf1d9a34a2f18e84e649ac32e4b6e296cd7a8cc84d0238ca89bd6d
-EBUILD kopeninghours-21.04.3.ebuild 1270 BLAKE2B dfb8a0fa97a7b193fec15c3576fff63bd2dc253c31dfa44a10852b1aba57e95e3df170a518df482b46c929eb5f25644756f61643de4005a04a65e1badf0222e6 SHA512 b8c2fd7aa936f4d14eb73208d7cb5362786cf7087c3b333adb990a723638513c3a12254395045612a873b30adb01c5d4d1dcb979fd7034448541700f44aeb861
+EBUILD kopeninghours-21.04.3.ebuild 1264 BLAKE2B ef8b08e6a92d355253e141eb183b51201ced6d5f10e5de8211f3670839b1cd028473bc32f3c1111afe7dc218644fddd874ff817aaf5a9439781c839e6b253030 SHA512 3d17d9b782ac4ba28310b991e5ced032acaf12df68e6cba68392089f40d8f0a09d02e189a5789fce48856f4bcc25b707e4bdf97fadfc5e3eaf9ffad332557132
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild b/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild
index 711c6c4bcfd3..63347f08801b 100644
--- a/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-21.04.3.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	sys-libs/zlib
 	python? (
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index bcf549ef1ed6..5db1d36e6fb3 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,4 +1,4 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
 DIST libarcus-4.9.1.tar.gz 31967 BLAKE2B 2ee827c3f1f592ac1efa7557a2cbfa9cf9fd2d43a7be7fd803f94f7b51c9a03be1078d3df319e1bbe2bc37b6ec3a1c6f16996c4e3b6251dd06f6031dd32ad2a9 SHA512 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd
-EBUILD libarcus-4.9.1.ebuild 1371 BLAKE2B 12a630a06120be5e05d505e33b3978399f484c7608885c06d41add4f9e121e8465749403fe30c2694643f01534f119b0963c6379a707df91af263fb56acaf75c SHA512 d73af44d77a3bbe1ab08ce1f50ceadd55cbeebd3fa44690112150fa8bb33339aa2b6a226d211d326ccef43f9442c9fe493b66bb450156c26e0068016431f903b
+EBUILD libarcus-4.9.1.ebuild 1357 BLAKE2B 9c7cf901543a6e13c8e1cf6861a028c81cc98048dd725b5981c1dc0a1c023d5482fde9d4188d971057454e175b60b8619158bcf387900e6eba7e0a7f113e1a79 SHA512 b165f573c87c6daa209b225686d0a12081a0f69b2feac846ea3d00017529f8164f00855b7476ad031ad425954f6636f4e542966046e02ed35c503d604e67a977
 MISC metadata.xml 1285 BLAKE2B 49a2e165b06fde2a648dcd05d2d4da13bf0205fa5ceeee17f7e71672913747b44e82bedaf4e8bb8f12d58c2678ed20366325ac6b396d4c833a69fd94b5b946d0 SHA512 762d61333089b3bf0800ed9578c7d231e0a996cd0c8577c794cc8e745fa46caf9f3e2ab21465a84273c0185c598ec55875e11345d982382020d002f277382117
diff --git a/dev-libs/libarcus/libarcus-4.9.1.ebuild b/dev-libs/libarcus/libarcus-4.9.1.ebuild
index 79e8a85d03be..8a82c33b9bb0 100644
--- a/dev-libs/libarcus/libarcus-4.9.1.ebuild
+++ b/dev-libs/libarcus/libarcus-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit cmake python-single-r1
 
@@ -22,8 +22,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
-		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
-		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+		<dev-python/sip-5[${PYTHON_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )
 	')"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 04759dc181da..b56ef52f9753 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,3 @@
 DIST libcharon-4.9.1.tar.gz 151243 BLAKE2B 8557efe4667a83297a4bcfc8307e2322a379e52d50ad1648d873a923e182b3be1651a13c7402ac041fd134036a75a42e825adf2cc27271af218db44af7e48473 SHA512 41d611f8d3bf0f762a38a00c159104df04b73cd5c4f7e9ebcfe3ac9cdd0c8e31e505c4fd4ef8f8a6f1c02bf882bb3e14ea4e92c8b15169a91cbd1815e36310fa
-EBUILD libcharon-4.9.1.ebuild 1780 BLAKE2B 548f44d9e88c4dffb7e8fb33b07f1f14919cb8782606de09a981b9b02943599d18913aeb4ff522c686a6d7ccd2d137d7f93dc1c2e15b5c86f46db554788fd7e8 SHA512 f90f3be2952f83df4b6f36b97aaeee492f1b4c74e72384fc89320f69a7c3c45358e2435fbe6579f5cbf952f83292b538b0e01cb936c8c468e7d858c1552a4bfe
-MISC metadata.xml 1209 BLAKE2B 358ab202ad4dcc96b472845c6f853cce633599231488d21b7cf86b90ff31e07378877679c7942d17c9c019743a326faa01951b50a9dffcf2d46e461920d5f615 SHA512 d3f74eb75b386d226e802179ebd66cc528ece495b2da4ef9c5bc75e98f988891b737eada2b86cb51863e5ccff7aad87af9dda4212f53b75d6f388db82578726f
+EBUILD libcharon-4.9.1-r1.ebuild 1746 BLAKE2B 46a4e224043798f5f327d6b0d6b3033145a210cc5f3b80e4387d7e39cee3e8a9bcf8ff707c0fe76c6b1b20a00318eb4153002d7a89417572a8a117f4d5163447 SHA512 fe4d49ecb8b11c9e814755711628eaa3d52d5be73c24bf0c88b909d4c11d868831b360309c7072a4a6b4e746fd8526338a0287da640fa277cc6d2fc5e8fc7ab1
+MISC metadata.xml 1139 BLAKE2B e7c439e1dcf4a3b38db358da52f8efd013bcd71034607ce83e71eef05a43545cb39292ec49fc63b9eab5e00801d4c6f20894a8a2e497a5949a718677489a5366 SHA512 ca081c25e18b793fd91101fe5dd94420a7f9483ad76135b944b9d05c425bc2855c17fa58626c951cf27936f4d941c23110424255b71a980c974af62c41943ddc
diff --git a/dev-libs/libcharon/libcharon-4.9.1.ebuild b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
index f7557d509131..8bb7404534a2 100644
--- a/dev-libs/libcharon/libcharon-4.9.1.ebuild
+++ b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake python-single-r1
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/Ultimaker/libCharon"
 SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
-SLOT="0/3"
+SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="+client +dbus test"
@@ -31,7 +31,7 @@ RDEPEND="
 
 DEPEND="${PYTHON_DEPS}
 	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
 	)"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -61,8 +61,7 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-
-	python_optimize "${D}/usr/$(get_libdir)"
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
index f522947e90f4..572a52741db4 100644
--- a/dev-libs/libcharon/metadata.xml
+++ b/dev-libs/libcharon/metadata.xml
@@ -21,9 +21,6 @@
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
-	<slots>
-		<subslots>soname major version number</subslots>
-	</slots>
 	<longdescription>
 		Library to read and write several 3D-printing related file formats including G-Code and Ultimaker File Package (UFP).
 	</longdescription>
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index db60f0ece15e..88b99e997ef3 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,4 +1,6 @@
 AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41
 DIST libfido2-1.7.0.tar.gz 517426 BLAKE2B c7ad55d1402808ad12dc999b0ec67161a5fe82dfeaeed362c35f4183144af9bd2771c1e3318a731db46fd8fc21ccd0737024b72c8dd3c754e34625118817742f SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe
+DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
 EBUILD libfido2-1.7.0.ebuild 981 BLAKE2B 492d7d3e41da8cf0102d55c9684f476e734101085ae8b3db2ebd440a0d0f7a4e892e45f2ee632f3dd9192a9df8edbd464f2f601a7f7b65129b7bfd0b8e78755a SHA512 b8156159a0a503a94eb5b80f24baeb7ec94f08d5beb8f60ec09e761f280371743447cb9883de4b36bf14900264d620acf843b2640330ed8d15e832dee3d48860
+EBUILD libfido2-1.8.0.ebuild 988 BLAKE2B 7fa3f17d035bb8a6c68c561b8c53b7d414a39e5649250fc7aa1afc3d724930537bfe8516625283b571b79fd08004f1a0c8f16b17f55ae03b060f1ff65c23442b SHA512 9b34b0926ca1210ac1d62e59894b3dfbd25fdf8bdd882a986bb2adf7cdb72ae04d5fc8a07f0d2081d908b095b1f0a9633c1b01a0091a369fd6b7314a21417fcc
 MISC metadata.xml 330 BLAKE2B fe16e7735c17510c8a41691a7dd619d9d62c96f58508979936877acf1c261f402e5219decc02dafb97e7b171047b62981c616abdaafe24a3acad1a6893da3725 SHA512 4eb35ebcdd1831a7fbd6e00336dfbcf6e8697ff95e68b68686032b1251fec090c22d3096666ed48833c5b9a8e9afe10bfbddf592834095a3ee9e95f1ec594c52
diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild b/dev-libs/libfido2/libfido2-1.8.0.ebuild
new file mode 100644
index 000000000000..21c57df89552
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.8.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nfc +static-libs"
+
+DEPEND="
+	dev-libs/libcbor:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:0=
+	virtual/libudev:=
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/plugdev
+"
+
+PATCHES=(
+	"${FILESDIR}/libfido2-1.7.0-cmakelists.patch"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNFC_LINUX="$(usex nfc)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm -f "${ED}/$(get_libdir)"/*.a || die
+	fi
+
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest
index cf13b9cfd8cc..6a662e920023 100644
--- a/dev-libs/libnest2d/Manifest
+++ b/dev-libs/libnest2d/Manifest
@@ -1,6 +1,7 @@
 AUX libnest2d-0.4-add-disallowed-areas.patch 4671 BLAKE2B 1b57d9a00f9ad5df3d0396d039bcf64570dedb0da939ad60a6eeca199de280a413fa80c4fb6edf976b920634243ce1f8da6a7c00cf08930a6309c4955f48f7e4 SHA512 1915a937b91c1e3d06d4a0b5914d706f84da171cfd2ebf161b0017e67a5a28bbefd80d7a290348735b4143e4b67f421c5d611831af1b89b76371327d74d11508
 AUX libnest2d-0.4-add-soversion-to-shared-library.patch 901 BLAKE2B 32d77c3c07059f4b2b9d58715a799395943560ebd7a738f585f43907bd21115e3f297fe6df7f0b3b1801c5b04d7e2e16eb09aff642a26edb5b35339dc2440eb9 SHA512 1d367a09a9f0ac51347c3a3dc440eb772b877abf00acd92a9ce166ecc4a9b537dbdbbab254c3b742c20b48fc5bee58b79811504921ec15a19700d8bcacee0d4b
 AUX libnest2d-0.4-fix-cpp-version.patch 205 BLAKE2B 3fb0503ec974b00af5d9f48a87be245bb1ed560034bee1ac6ee045074762e4d51a903ece3a15969a3f5d50ddd8c0d3b771cff97196bf25c056058b8cb4edad44 SHA512 c05cdf4fa075b16c694fd7279e25d4f9533f339318650db55d486528def6c697529a51135eafa7bb2a2de07bc8d7bbd520565b356316c135d3814484bfadd855
+AUX libnest2d-0.4-gnu-install-dirs.patch 812 BLAKE2B 98072c6fd6547ed138a23a8aa0d48df17d588b773d7ef16ac382da18fa1328c975c843d897829db4a1d043b4845a453ab86cd5d2d9686444422e651c996bee35 SHA512 4f0785271dd62d241ff38954daa77603121ae0f434fdd1644823caecdcc794202f11608527ed27f4d63815dc5ff435aefb98cbbbba79cdce6ed0ce2f2805fbb8
 DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c
-EBUILD libnest2d-0.4-r1.ebuild 990 BLAKE2B e90a03cff6a4404503bf34f0e75427de49df2791079bc31f3861f1a5e08121495d92cf28873b053aa35cbf23895c20c222d79a9104a64ef88e561c1382d20564 SHA512 0e7c2be102f24169570fbabbb0ae28fc9caba371f60a85e65244dc8dc36f0355402e28848e413a2807cff3c6d27f2bb6fbb31b893c2fa73856be96cf8a2c803e
+EBUILD libnest2d-0.4-r2.ebuild 1072 BLAKE2B e11178120bf9d91b67fa81079be0b0f697e9a834a3c8488d926003ec741ce58413279b6633b6518571e8c6239f0d36ebfabaabc323014ca21827a5eab0938fe8 SHA512 3348f9019b95f7537ec4aa38e8620ff0baff53c6603159ba63c21f3741eda445800738ecee855500245672b1e14ea503a9ece140bd7589e40c2f85f70996c362
 MISC metadata.xml 1406 BLAKE2B 013e0c6f04e1ebe734d744f1d31924404c43523e73697f9897a9e3b2eed6cf7e8e82722e98eadb7e7416b9a58823c3879ae51190ff211dbad13a295eb209b170 SHA512 36b1316bead34cdf259a8de5834f9d95b6b1fd4a7b65fc979da51a0f725762c5ebe1b9300a7c7826a6dd2ce30affb4b42f10f59e7d590b31fcfa49c6e375ffe9
diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch b/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch
new file mode 100644
index 000000000000..34484426f302
--- /dev/null
+++ b/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,6 +114,7 @@
+ endif()
+ 
+ include(CMakePackageConfigHelpers)
++include(GNUInstallDirs)
+ 
+ write_basic_package_version_file(
+     "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}ConfigVersion.cmake"     
+@@ -123,10 +124,10 @@
+ 
+ install(TARGETS libnest2d libnest2d_headeronly ${LIBNAME} 
+   EXPORT ${PROJECT_NAME}Targets
+-  RUNTIME DESTINATION bin 
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
+-  INCLUDES DESTINATION include)
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ export(EXPORT ${PROJECT_NAME}Targets 
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}Targets.cmake" 
diff --git a/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild
index 721bfa9f47c3..88a93621c9d5 100644
--- a/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
+++ b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-add-disallowed-areas.patch
 	"${FILESDIR}"/${P}-add-soversion-to-shared-library.patch
 	"${FILESDIR}"/${P}-fix-cpp-version.patch
+	"${FILESDIR}"/${P}-gnu-install-dirs.patch
 	)
 
 src_configure() {
@@ -38,6 +39,7 @@ src_configure() {
 		-DLIBNEST2D_BUILD_EXAMPLES=$(usex examples)
 		-DLIBNEST2D_HEADER_ONLY=$(usex static-libs OFF ON)
 		-DLIBNEST2D_BUILD_UNITTESTS=$(usex test)
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 	)
 	cmake_src_configure
 }
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 8c715558defd..d5a882f1051d 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,5 +1,5 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 DIST libp11-0.4.11.tar.gz 500433 BLAKE2B 6a12d8bc0551b3ef11857c0e60a33ebae4f8dfa72c914e9356c13547d71e0f1000ef4b6b7476cfba7cc3376b44b05c2bb0e7a88a267c13702222a7d2b10e9a78 SHA512 37eeeab09cbef7e1498358f2c614f4ec6cb9f37bc9b19e6e393fc0ed3c47ebad8d484b5f5cf428c76ffdf25d08e337d5148d0ff517957283394111dea83352f2
 EBUILD libp11-0.4.10-r1.ebuild 722 BLAKE2B e14c3b3aeba1c543d44eaf0f20a86aafe71f98708611f19ff0976dcc7f6268f5483de65061cbb9ca95990c3cdd9897505d2a1b444dee0e9dd2894a2824cbab83 SHA512 4e0453e386b440591cf95e47b335a9817c014dfdd4a084eedcd86e2b57443fbd334cf521c8325a473bdb645c03693ac487944f6219bad6915f0f0c13d7d8b35f
-EBUILD libp11-0.4.11-r1.ebuild 729 BLAKE2B 64e4db925136c268df67aea58c593d42f6b1737f42068c6a0c004f6032388db6fb1378b4356bbd44784e0ddffda0157e43c09d1a02999c8fcff083ddb169a695 SHA512 e38c13b78d61009df4d0e2d706f06e3d7b2ca5820ead60f73a62ce53f176b9cc84d68c2fbc7ffb57ce0115d848da888b6a77928b85cfc3dfda1e29b25113eee9
+EBUILD libp11-0.4.11-r1.ebuild 736 BLAKE2B 75ecc0ba01da649bebddc4ffce44f1c6286dc76007587ffa088be89b7d0942897001f0c348da3f74afb9782c4cb43d751bbd54872cc26d436b6ebfd61a24c552 SHA512 a37627dc1a05cbe053b0d4928c4858505969e412b20d01698326d92ec9740f006bcc14de5ef5af90d0014559a3645c14930199b84d5df742a48e7addcfb1290c
 MISC metadata.xml 688 BLAKE2B b48943e8dfbbacdf23e8ac46500a04daedaf1d518418b87d73887ab8fb0bd660b29f725431c484fda26bf9dedf42bd5a468f2ccc4e0fd275984a934c37630856 SHA512 9b3e84e121b963a5510382d4994d32d5cf4dbdf77ebc7340e4b17dc960034f89c6d3114b011de93c44a97f67433934c293cc6552518e0b5e333f63ad26b709e8
diff --git a/dev-libs/libp11/libp11-0.4.11-r1.ebuild b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
index 17e3b7767447..084aa509f96d 100644
--- a/dev-libs/libp11/libp11-0.4.11-r1.ebuild
+++ b/dev-libs/libp11/libp11-0.4.11-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 37aa22a13f8f..a515448831a3 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.30.0.ebuild 1967 BLAKE2B 7341b999788c5f064aeb6c9c5a230603196b4dfd4a4c8280cfd9dbb6fa2406bdec4fd2594c60b23a925ea48bab9a29b7c2a0bdc80ab838e5cc7ab2a0fbb6a8ba SHA512 09f8a95941f6dafa3dfb524a05188507ff8d3dbe743acbb6366ba39ff0fbe28f01a2fd06a6eca86a479d5f0f8d58724b88db4ef2a3d57f99bdc8dac8e4670d29
+EBUILD libpeas-1.30.0.ebuild 1961 BLAKE2B 10d5d84a8efbf5c79fd9ad1035bcd8166c12092832632d562204cfb3ea1710b37d7515f0d9862c982e73c40f950ac6a238c297f3574425817171077257da43c1 SHA512 f10067feafc3522603b273d85c2c6fb236ba5f0c771e5e32ceac2956b611eee3cb98e87518d97d3a1ddc13de90fdd17399a710628826958d172eb5747e7e3aba
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index ae87e0986133..3f2417f8d987 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit gnome.org lua-single meson python-single-r1 vala virtualx xdg
 
@@ -33,7 +33,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index e03a480f175e..1d1430bc731f 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,6 +1,6 @@
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
 DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
 DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
-EBUILD libratbag-0.15.ebuild 1982 BLAKE2B d5c71bc1c69abdf478bf56082b359c714592d91740b401027e276008a6e7f9a260643babf51d100b05a5c4a1c30423eb12e1038ca26a9403388c0ec6a1f264a9 SHA512 5c5bb4e1a5a47c89a758f752d6d5b93a241436348462e2ff9cc6f023910b8c08c8b2a9623195b5203b9507e097cd788b1607cf5413606e255f7136664f0ea6d0
-EBUILD libratbag-0.16.ebuild 1982 BLAKE2B d5c71bc1c69abdf478bf56082b359c714592d91740b401027e276008a6e7f9a260643babf51d100b05a5c4a1c30423eb12e1038ca26a9403388c0ec6a1f264a9 SHA512 5c5bb4e1a5a47c89a758f752d6d5b93a241436348462e2ff9cc6f023910b8c08c8b2a9623195b5203b9507e097cd788b1607cf5413606e255f7136664f0ea6d0
+EBUILD libratbag-0.15.ebuild 1958 BLAKE2B e4bf7db7c49a78ac78abeffbf1afc38e6acdfd069db6e8812cf5e593f52d085f5d5cdfbb8f570774379ffc3cea6f6534faab6e60c339905df5588898f379e195 SHA512 76b0afa674f72cb36f08d8479735797fbdfb8cbb22f0cd22de065918e25beca60ac27886b0e8bfc40ce0a235ec3a0076fbb05cb0e2e21aa7c9c2bb477cfc381d
+EBUILD libratbag-0.16.ebuild 1958 BLAKE2B e4bf7db7c49a78ac78abeffbf1afc38e6acdfd069db6e8812cf5e593f52d085f5d5cdfbb8f570774379ffc3cea6f6534faab6e60c339905df5588898f379e195 SHA512 76b0afa674f72cb36f08d8479735797fbdfb8cbb22f0cd22de065918e25beca60ac27886b0e8bfc40ce0a235ec3a0076fbb05cb0e2e21aa7c9c2bb477cfc381d
 MISC metadata.xml 623 BLAKE2B 9927622eaaa6c1dac2628439bf9b923ae0707fa6cb8d5ec7869bed62d8630d4ca10d9ed0f7a330e887fb4683467928c6280decbd6aa2f3fe25cacd24dec7425f SHA512 ffb3bae021b48df16e0a0123e0d74d6ba2152bdef2fc8e9512ec3218430b0b4090811fa25d9200a3868700b8ddb0cd2a59047765952a577b0315bb62c74944a7
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
index 91fa0ecda28d..b46974b3385e 100644
--- a/dev-libs/libratbag/libratbag-0.15.ebuild
+++ b/dev-libs/libratbag/libratbag-0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit meson python-single-r1 systemd udev
 
@@ -31,8 +31,8 @@ BDEPEND="
 		dev-libs/gobject-introspection
 		dev-util/valgrind
 		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-evdev[${PYTHON_USEDEP}]
 		')
 	)
 "
@@ -43,8 +43,8 @@ RDEPEND="
 	dev-libs/libevdev
 	virtual/libudev
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 	')
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-0.16.ebuild
index 91fa0ecda28d..b46974b3385e 100644
--- a/dev-libs/libratbag/libratbag-0.16.ebuild
+++ b/dev-libs/libratbag/libratbag-0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit meson python-single-r1 systemd udev
 
@@ -31,8 +31,8 @@ BDEPEND="
 		dev-libs/gobject-introspection
 		dev-util/valgrind
 		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-evdev[${PYTHON_USEDEP}]
 		')
 	)
 "
@@ -43,8 +43,8 @@ RDEPEND="
 	dev-libs/libevdev
 	virtual/libudev
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-evdev[${PYTHON_USEDEP}]
 	')
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 98039ea24399..798178034ea9 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
 DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44
-EBUILD libsavitar-4.9.1.ebuild 1756 BLAKE2B f0972d130215142144664b4837d9eb1918e49d723080e418f69e935684bf9f86ea47b3aa234e04b28313af1f80e27e51c97ac9a0b9ce24e95012ef9cd62fda4a SHA512 56aeb94f96fbf8fe9987663842c57a702a3b85cd6de9fd0b4749c64d6f6932dde408b0908acb795087a1e7002a3d60fede1f9a402487b8a7b48bf8b5b3fdd8e2
+EBUILD libsavitar-4.9.1.ebuild 1750 BLAKE2B 10d57551bd2703e242b1c8b3a3baac10de4975d9983f3d7f4acd83e29f89134d280385699a3bc95faf8ec289c2d7d068f8938af6f2ea863ae301482f98202086 SHA512 6df6f66f81c11a6d8c5b70a175dfb2070ed1d29aa64ecac11077fbbe37a86e8a706162f431b0473324d87e86d07306736c74aacd978345b28956d559330fbe76
 MISC metadata.xml 974 BLAKE2B ac8e144ae33fea171c6a64d8a04f1876a3a3145b952e285fdc3f0553b8c5cf9c03a36a3e3982b88fdcacf69d668b9df8d156292a687fbcb65171700517bcd772 SHA512 8ee0d54dc6f627e57ea7b980df32aab3fb49bf73888c0d69a91c9f8962df159d6145f19892d4b922e8fdd673dd489fa72f4f3128bb04d0089d4204a6f060d0b5
diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
index 999341bf1c3c..c2659976510a 100644
--- a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake python-single-r1
 
@@ -24,7 +24,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
 	$(python_gen_cond_dep '
-		<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]
+		<dev-python/sip-5[${PYTHON_USEDEP}]
 	')"
 
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index ec9c0743e6bc..8f3e3b46b561 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,11 +1,8 @@
 AUX libutf8proc-grapheme-test.patch 882 BLAKE2B ed3092be0d7e4e81c9dbde765d4a7cbfadfce266bc71f00dec83f1897436c3c1e759aef06d58136e7bc015861062d26e17b5b4989040bfef4d28d652e0f756eb SHA512 34f3d82bff1a6d0de9cae56b78af8197f103d9c6a4eb9bc912b28f84be8ecec2a7859758a5d1a9d4f5b7593c3f1e17c12f8ca6fdf980916327e3cff718bdc6d9
-DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
 DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
 DIST libutf8proc-2.6.1.tar.gz 182903 BLAKE2B aa2545136e084a44b2e3470e9395c15327b8d6fbe48e3145336366e208fb0e2565961c302a9117f8275e5b8a218d48a7059b5c1d2cfdff11e8341dc1bfb820a9 SHA512 9a09fe58a63c8c7983b8968b9b2c82f3d188724ed125097ea0de6a18d87569c678e226dc5de183108e47b3f068117e6bb352da1c3d24ebfd8018fb0b2346592e
-DIST libutf8proc-EastAsianWidth-12.1.0.xz 61760 BLAKE2B 2df2f75a9a2dd150044a5028d1863acab00ecce4511794d2e69259f3a06c20741beb1a6191cefa19e83f9511aafcf5b268d15e0b9db7c2342413dc91c4d3592c SHA512 ff5fc3ac705cf9f7a3aacc6bfd808bd4feab802c7098d8dadcefe6f6639ed82589ba67a37a3a93ff2605aa96009fefc470ce065c9cf84b47370fa17f9a16ea18
 DIST libutf8proc-EastAsianWidth-13.0.0-r1.xz 68808 BLAKE2B e8bac9804aa195ebed82ba51f164166976e4feb2f8c3699847738bb2a320f2a00eada1743bcbadc398dbf7998a47d6f4de5826e278eba86a198748eb59abb7e9 SHA512 f74345a9f509865705d55f18a0f258346ba261d8b9a59e5fc4de51b84ecad6d1fcc9afa0af312b09fb76bacdf5f597b0f2a965800a18c80f65a604a0bc64d3d2
 DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
-EBUILD libutf8proc-2.4.0.ebuild 1761 BLAKE2B 1f8a7836edf339f2d96000272219aec6960544ce2d2065e38a06a2e4b8ec0ac7ddd05525ec3259a299049be4c937f710ebe9208f262769d8c0eb8dbe366f862b SHA512 6e1dd47063329a1cb4e8e6b2b23f3f1f6810eb6e0e362ac7f91d4475a035f2233c3c20ced21046e1ad3807f6384f7a03c6f57e0bdc28256b3948d9543cded30f
 EBUILD libutf8proc-2.5.0.ebuild 1304 BLAKE2B 72b5926b5a75057ccf8edf2f8137faeea319e7346b9785b2977ec1d7460e8f6b58e759b27cc80be449b0d4fa366953a1c48228bbf6b31d0615e658250326bd23 SHA512 209ad6a8d3360e90f8bfe02e94771dede789dd9d403f2917d6cc0c82cc0c01b4a59f415f8db072b92cf0b2d6cc501982d0a3659ececcf4acfe228dc654b2031a
 EBUILD libutf8proc-2.6.1.ebuild 1421 BLAKE2B 2181d7b0fb6e532bf5699d855c4c6d7035c352c3110a8498dc64e0655e28b577c8d5c8e7b4a5cc6c501685b80ae6255b40d7c491e585032287a6d177785859ad SHA512 dff03a28363082c6b2b1441ef4bfa6bb1f86b97aabd68d40378e4ced3cfd6dab87684e4f42bf23218829b71321d286f8b4278cbd5bb2ca24ad8861ffead572dd
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
deleted file mode 100644
index 38e2c5e109a9..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
-HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
-SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-12.1.0.xz )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="cjk static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( =app-i18n/unicode-data-12.0* )"
-S="${WORKDIR}/${P#lib}"
-
-PATCHES=( "${FILESDIR}"/${PN}-grapheme-test.patch )
-
-src_prepare() {
-	if use cjk; then
-		einfo "Modifying East Asian Ambiguous (A) as wide ..."
-		cp "${WORKDIR}"/${PN}-EastAsianWidth-12.1.0 ${PN#lib}_data.c || die
-	fi
-
-	default
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		prefix="/usr" \
-		libdir="/usr/$(get_libdir)" \
-		install
-	use static-libs || find "${ED}" -name '*.a' -delete || die
-	# This package used to use netsurf's version as an upstream, which lives in
-	# its own little world. Unlike julia's version, it puts its header file
-	# in libutf8proc/utf8proc.h instead of utf8proc.h. The problem is that
-	# revdeps are *already* patched to ajust to this. As a transitionary
-	# measure until we unpatch revdeps, we add a symlink to utf8proc.h.
-	dodir /usr/include/libutf8proc
-	dosym ../utf8proc.h /usr/include/libutf8proc/utf8proc.h
-}
-
-src_test() {
-	cp "${EPREFIX}"/usr/share/unicode-data/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
-
-	emake CC="$(tc-getCC)" check
-}
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index 8d09639ea026..b0403632b476 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -2,6 +2,5 @@ AUX openct-0.6.20-automake.patch 786 BLAKE2B f37d39bdbc0c1db10ec7058536d0d34ac30
 AUX openct-0.6.20-slibtool.patch 1353 BLAKE2B b8a5747258cb7d5ac8bacda87c9eaf2f177e202490c162594aec6559f13c65e562b887e6c8d056c1ce5ab247e80c51ca6610654e61b2c593e7b13e22e458b43a SHA512 34ab2345b44424d9868c95a9af862d03603647b824e1d84a1f35a8171249b2beba7fae9ae3a4d0468d9029cf6c748c02fb2032e30462640eb42ff08d3cdd3868
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 1868 BLAKE2B ebbf993782fcd0d9e1d8d355a7896a85e26660e516c856c33677db34424f28a737f8d30ddbbf3ff292c16cb404247d02d6dd8b3f3d54140e1ba565d4c0fea6cb SHA512 1680b4bcf2ab446a6998af48a5a3abff32860620784403ec240e1962a2fee5163e810e67de601439720ea613f9de5433c007338a6923ee3a2889b440db240dba
-EBUILD openct-0.6.20-r5.ebuild 1855 BLAKE2B ba2a8828594d5784ca5af3ea60b36a7eb634b4cedda257b471d46da4fa171b7bd3b0e49eef192481a97480d229a36141708425611cfd89a11b73d9906bf4d777 SHA512 b71aed457d41defdfac52b1a98832dcfe38b9fdb5bd92148aee8baa2193f97b8e0d57d309fc62b7bb598007877c6e6c3ab161a033e33d311b2e947eab3f86533
+EBUILD openct-0.6.20-r5.ebuild 1853 BLAKE2B 430ca0c8412c357c5287b1a0b330e0d4d49cd0d1630c8ea1435ca60f6ae69867c7953011ca079dea330da43e9d201439d8a27f57947e767effd75cfb27577c13 SHA512 753336d9c282ff6675a3af83068d4e94c56d5ba291cefdf57f4671d76514ba20c268e01f9c95bd142f75351022aa150953ce10e0583e5b905d21d457b11938bd
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
deleted file mode 100644
index f73005a37633..000000000000
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic udev user
-
-DESCRIPTION="library for accessing smart card terminals"
-HOMEPAGE="https://github.com/OpenSC/openct/wiki"
-
-SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc debug pcsc-lite usb"
-
-RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= )
-	usb? ( virtual/libusb:0 )
-	dev-libs/libltdl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-automake.patch
-	"${FILESDIR}"/${P}-slibtool.patch
-)
-
-pkg_setup() {
-	enewgroup openct
-	enewuser openctd
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_IFDH
-
-	econf \
-		--localstatedir=/var \
-		--with-udev="$(get_udevdir)" \
-		--enable-non-privileged \
-		--with-daemon-user=openctd \
-		--with-daemon-groups=usb \
-		--enable-shared \
-		--disable-static \
-		$(use_enable doc) \
-		$(use_enable doc api-doc) \
-		$(use_enable pcsc-lite pcsc) \
-		$(use_with pcsc-lite bundle /usr/$(get_libdir)/readers/usb) \
-		$(use_enable usb)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-	rm -f "${ED}"/usr/$(get_libdir)/openct-ifd.* || die
-
-	udev_newrules etc/openct.udev 70-openct.rules
-
-	newinitd "${FILESDIR}"/openct.initd openct
-}
-
-pkg_postinst() {
-	elog
-	elog "You need to edit /etc/openct.conf to enable serial readers."
-	elog
-	elog "You should add \"openct\" to your default runlevel. To do so"
-	elog "type \"rc-update add openct default\"."
-	elog
-	elog "You need to be a member of the (newly created) group openct to"
-	elog "access smart card readers connected to this system. Set users'"
-	elog "groups with usermod -G.  root always has access."
-	elog
-}
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
index d72b32674b28..b240704e94ee 100644
--- a/dev-libs/openct/openct-0.6.20-r5.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
 
 SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 17db0c72f352..53e96cc410dc 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -9,6 +9,6 @@ DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab86433795
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
-EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4945 BLAKE2B 68b7267977a3fb5319c05af867706c2929df497b76732059d9d95dbf4af9110f6949574771a58220aa92e281d6d2581fdba639225eade564619e44d47a793897 SHA512 e3f5c1f2998b7e0c0dc4cd0c0e068e1c0ddae237a2a7852b497f9492ade24b6ebf8134bc433035accc3a7d9467cf615e20d0a2b79da9e33bf46c6f80d34b18c2
-EBUILD openssl-compat-1.0.2u-r1.ebuild 7756 BLAKE2B 807839a953f771a269573eee0dcdbf0f25434aeb98c958adf40a53ed0abf773b3b0563149353084026d273a48aad6d5cf925adfd9e72f2caccb2cc2f02e8013d SHA512 76d29fbefdcb46989cbd84e52769996c3faf14547b765ca1d2ec3a549652ed95ba695a93b8c6ec0c914eee00f8728ae04f5757fa4bac520bbb95591914cadabc
-MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
+EBUILD openssl-compat-0.9.8z_p8-r2.ebuild 4983 BLAKE2B d1d4e37b0b7f0226cc5c76894c28e14319882948621f9afb55979c3714894bf0bdbb4cabce3eb7b9070f353714c93fdbdfbd7fa4a368c9f50d49cc941c4d79df SHA512 85535f889a0fd5cd0d623beaa9b9b1df9efc6147e15e381985b5fd394614d5a52b350675f124425f2ae94b73f8303a0877bb26b2e09b998349b5fb5a942abb7b
+EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
+MISC metadata.xml 1051 BLAKE2B a60ae074a8c078361de540fa05f6fdb66755e3857a710b4bf921bf784b3779804d9a054677c8032c776fda2863641d02d728b78c9041195fa259ed09d31e25b8 SHA512 204bf9326b8c119be034be5f028c5d69b066ab04de04417ff12c81f01e52980341ba3a86f3dc9ccee63e97acc3f905f458967800f2a88fc035b1ee7c9d51feea
diff --git a/dev-libs/openssl-compat/metadata.xml b/dev-libs/openssl-compat/metadata.xml
index 8419c576d834..5dfd9a9f2f95 100644
--- a/dev-libs/openssl-compat/metadata.xml
+++ b/dev-libs/openssl-compat/metadata.xml
@@ -11,6 +11,7 @@
  <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
+ <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
 </use>
 <upstream>
diff --git a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild
index e683f59fccfc..3b77fd0b9f48 100644
--- a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r2.ebuild
@@ -19,12 +19,12 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 LICENSE="openssl"
 SLOT="0.9.8"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
+IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test tls-compression"
 RESTRICT="!bindist? ( bindist )
 	test"
 
 RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
 	!=dev-libs/openssl-0.9.8*:0
 	!dev-libs/openssl:0.9.8"
@@ -128,7 +128,7 @@ multilib_src_configure() {
 		enable-tlsext \
 		$(use_ssl gmp gmp -lgmp) \
 		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl zlib) \
+		$(use_ssl tls-compression zlib) \
 		--prefix=/usr \
 		--openssldir=/etc/ssl \
 		shared threads \
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
index 4ba9941176cb..ee152f0d89e7 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r2.ebuild
@@ -39,14 +39,14 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="1.0.0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla tls-compression"
 
 RESTRICT="!bindist? ( bindist )
 	test"
 
 RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
 	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
 	!=dev-libs/openssl-1.0.2*:0
 	!dev-libs/openssl:1.0.0"
 DEPEND="${RDEPEND}"
@@ -205,7 +205,7 @@ multilib_src_configure() {
 		$(use_ssl sslv2 ssl2) \
 		$(use_ssl sslv3 ssl3) \
 		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
+		$(use_ssl tls-compression zlib) \
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 95fbdc138dc6..c3e0997dacce 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,7 +7,7 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
 DIST openssl-3.0.0-beta1.tar.gz 14878832 BLAKE2B a2c8d8cbb226803e78ff00fcbee355f41da90275830714e8c0aea532309ef0b98c27f6796119e2942387a9e92afd917d766faac7b5ea65a36326c368790b8055 SHA512 fbb650638a7ca406b0b5d1eafcef0ca431172c8b255adaf7575325d9c1545dfdacf8e9550b8bec4e1ec73759a02c9efbd729a07e9959932564ba81be61238d5d
-EBUILD openssl-1.0.2u.ebuild 9895 BLAKE2B e3120c9bacee4a6cf6e00f1fdc0e480df1e28ca38c9c901d14f679a4a6a5cab074f1bdefbd9e94a28399e2ce7f14fafcc7261146a3fd95bca92427fff46ab361 SHA512 ccb2f8c173cfac5adf5aef9d61a5894168f3092f626d6e6b09cc91e29592765975eef243cd1d42b4693abbd568bc836cc875242476ab6ec00df143cfd394a080
-EBUILD openssl-1.1.1k.ebuild 10292 BLAKE2B 65992f0284bae36b470dae1c979ed0cd6794d147e9c5981f43822e32be87ac4cb51db517141d20b77c5fba104a068893b838f91cefbb24e57af22d1377534c3c SHA512 cb43106f639e268230e406bba3eb0e742c8daf6bc6584faf72a7138ef82213ac92d4400360957a444d981b09edae091081a84425feb76156095d11449f4a4962
-EBUILD openssl-3.0.0_beta1.ebuild 8188 BLAKE2B 78941fb8fade63cc6201cc9e22d3ccd3f277080e97768f9fd7f4c7d0395d793e10072778ceb2488ad2cb6c4be0918f54c61ab60ac08435503cf9344f4a78f0e1 SHA512 61cf8a9e41cabd08526c9b1e7b7cc0e20e6ba839f2dfe85aef4773e950b41eb31642c8092ddb0c1a1bd3f4b6260d8c6f91552c064cb77fb4c2208dabef16c6c7
-MISC metadata.xml 1354 BLAKE2B d18c8fdbc725d1c3dc63d7431f739267e4932a42e5a6df706abc0e77e96fee79d4b18679e52ce6f8db3afe6c33bcbc88c43b866a3136856800510abe4b359050 SHA512 15846b4760a40d2e36759c09cc00329d1cebbbdf7f7ed779fe9e9d3e81e5a1641458566baac753ad99380024056c54611502f07c6b8335f51025131060857e70
+EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
+EBUILD openssl-1.1.1k-r1.ebuild 10330 BLAKE2B aa105dcbc590f454e98b83f8fd72dfd2e8a88eaf9eaabde4c4fd97aa746cabfda1bb66c3752e5288b41bb83caf9e3feb571d848e81dc7348bb08e16748370dfa SHA512 1395224f18af894ea0da4b2191d3ba006d23de4d5d9917590e6c426977dde260149b72278cec3ef1bd437ea2ee84b6c9003bd5fde5afc8b892e82869397ac563
+EBUILD openssl-3.0.0_beta1-r1.ebuild 8226 BLAKE2B c402e43b11b5bba8245c3ca473fd09a643c405d11e87f78c0cb9e410362f5329d8c61a42b41de429ac7a552f1c116f53a77611e38013cfd83d65e49a48df28bb SHA512 87c308d72b48dead282bd92a9ad981480a60ca12e93c528982607d94649571139c15eb480b5a80750fce8709ae2dbed08216274ac756452bd69ca683b532312c
+MISC metadata.xml 1438 BLAKE2B 2a55417670eacb436b450bd2075e6fca79413a6fa16947efed6dd824b465b81b1ab5869ba33e0ea734e644d5c51cd686b3f950b6787b4cdaad5b2e6feb42fab0 SHA512 8031ae2212e7d8217dd4a50be2564a1102f4ea067af07b722a22ca02f779f7973932fde66e69f957f0c1a9ac88b6f868b12c42f2172835e432b6eba9033cb633
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 44e5433a4857..350be7c07b0f 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -12,6 +12,7 @@
  <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
  <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag>
+ <flag name="tls-compression">Enable support for discouraged TLS compression</flag>
  <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
 </use>
 <upstream>
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild
index 65c297883822..a54fa8fc1b08 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild
@@ -38,14 +38,14 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test tls-compression +tls-heartbeat vanilla"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
 	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
 	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-lang/perl-5
@@ -197,8 +197,8 @@ multilib_src_configure() {
 		$(use_ssl sctp) \
 		$(use_ssl sslv2 ssl2) \
 		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-compression zlib) \
 		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k-r1.ebuild
index 1e98af8f7039..d212bef1be76 100644
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1k-r1.ebuild
@@ -28,12 +28,12 @@ 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"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
 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}] )"
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-lang/perl-5
@@ -222,8 +222,8 @@ multilib_src_configure() {
 		$(use_ssl asm) \
 		$(use_ssl rfc3779) \
 		$(use_ssl sctp) \
+		$(use_ssl tls-compression zlib) \
 		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
diff --git a/dev-libs/openssl/openssl-3.0.0_beta1.ebuild b/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild
index 396083b136aa..f07fa0d1b072 100644
--- a/dev-libs/openssl/openssl-3.0.0_beta1.ebuild
+++ b/dev-libs/openssl/openssl-3.0.0_beta1-r1.ebuild
@@ -22,12 +22,12 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0/3" # .so version of libssl/libcrypto
 
-IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test vanilla zlib"
+IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	>=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
 "
 
 BDEPEND="
@@ -176,7 +176,7 @@ multilib_src_configure() {
 		$(use_ssl ktls)
 		$(use_ssl rfc3779)
 		$(use_ssl sctp)
-		$(use_ssl zlib)
+		$(use_ssl tls-compression zlib)
 		--prefix="${EPREFIX}"/usr
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
 		--libdir=$(get_libdir)
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 1d0858ea5344..67b2724a17f6 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,7 +1,5 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
-DIST raft-0.10.1.tar.gz 318911 BLAKE2B 42ef22dfc89f05a3a9f130011c0f906201126a1615f9a60648587e014bbb63e038b3afd1593c2c07b046c3c35ef07deaa45cdce58062707409e4dbd3a9f7516e SHA512 6fa99d9dbb5895299c5124f5c8cfb544cf1bccae4ee196bc8011cd4cf9c632cd896f8cd93181409fbaf7da115235c72a4e10568080dd9957eceb978784dc0f9d
 DIST raft-0.11.1.tar.gz 324285 BLAKE2B 10e62a392bdbb98f262068ad2bcfbcd24488918fbb7d4c3b13101c3d771ff8b9d592bad31bfe69cfcb4d6e9c93e1d38da24d11a3167d37208906af4e354c9280 SHA512 5afbf0f7e325ed242c5a37a39038818395c1b39184e2440bf89db6662dee73b9abaa8fac0efc28dbc3478267aa66fd94e908e320a061fb5b343735e111dbea86
-EBUILD raft-0.10.1.ebuild 947 BLAKE2B e4d3e25da43405151a90881c85258f31ebe2c3ec6c96815dc0c087b5194a01ceba99b4f35f0de7bae722748250c4bf49fff722faedf69df053d476bc2fbaef03 SHA512 dabc7bf8de129eb4846d76a22b3b8c8a7035d1bacc5046ef62edbcd984512dd64a721a623cc447705c8ace934528146f667e22e1e00fc7916bde9abd24e46c02
 EBUILD raft-0.11.1.ebuild 994 BLAKE2B 7c284762875ea9e977a7f4ac566aafff54b97e0fca8689b9393a1978a26cdbf63dbedef15649b239e68070b5bf9a5ab8465e1deda62d4b420cc276c489b11c39 SHA512 f7fa73af072b80fd5dfef7eb7ded840a8780bcaa37b03f3cd8e88ae9c1557da7af117d70e2f60c2a7c921b087c20b8378540b093fc195757a26b625799b8e46b
 MISC metadata.xml 812 BLAKE2B 677320549c30e675db900f01856b6ac4b86f18de7efd42a6008574edd7a14b762246b81aead5184e060734a53eb1eea007ecc5f79c9bae704763e483fe7fb7f9 SHA512 890676653a112bdde09b86488b99415f4cc10658809dd5e63ea3cecd197ba66b225d487f0f9557f38ccaedb50058940ab141871fc4a3e880dd8118e4b49d3fd6
diff --git a/dev-libs/raft/raft-0.10.1.ebuild b/dev-libs/raft/raft-0.10.1.ebuild
deleted file mode 100644
index 7d5c828a261c..000000000000
--- a/dev-libs/raft/raft-0.10.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="C implementation of the Raft consensus protocol"
-HOMEPAGE="https://github.com/canonical/raft"
-SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="test zfs"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libuv"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
-	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
-	)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-uv
-
-		--disable-benchmark
-		--disable-debug
-		--disable-example
-		--disable-sanitize
-		--disable-static
-
-		$(use_enable test fixture)
-
-		$(use_with zfs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 170600789845..1bf0b39de5ca 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -11,10 +11,10 @@ DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485
 DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
 DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
 DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
-EBUILD rocm-opencl-runtime-3.10.0.ebuild 1991 BLAKE2B 02a1c528bf0e7f6af7859fa2d61c9902401ccc7f669fa2f1cf4fd0fc34c754dc75ae900ccb495f583f464030628617c14ee0c5179fefdbf77ce66a7544523de5 SHA512 bcf6e76c6fa5627d8f6db89221bf3cd6502207a85f742a0cdc0fd72564f8943c44c80debe7fdefb1587cf5ba18c824facddf4f01733fc3d515f06965be0e825a
-EBUILD rocm-opencl-runtime-3.8.0.ebuild 1990 BLAKE2B cc2505fab0d3b8c7f3cb811830adc6e5c29a6c936bd285fe4efdd2aa7ca23270835776e83fd779bbb38fdd12a58c325c6f77fa4da11bb1bdb658ff01c7d85421 SHA512 128038aae836ee3ac0835b479a1268d3a261f575a127e0c0f515d78c50c900856d37353f46e90e320202bbf5917c8380e1551b09cccb6259840eebbfc069d114
-EBUILD rocm-opencl-runtime-3.9.0.ebuild 1990 BLAKE2B ae0db60899859a06173de28df69df907a874e26e83961fe35773b5fe09fa9edf55ccf079da04cb014d422622185fcd4c3dfb1d9f6a76219c69b9443c7ebb42bf SHA512 a269a7dd54e293f331a79866d2de78e0778ffb8ce58206d335fe275b4cb8af31b65d909363463b0927d3c2356b172bd8ee952af36baf704cb80d1aee71516072
-EBUILD rocm-opencl-runtime-4.0.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
-EBUILD rocm-opencl-runtime-4.1.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
-EBUILD rocm-opencl-runtime-4.2.0.ebuild 1796 BLAKE2B 493013e856298206f753e33891220313e106e37faccca7678a2668cff70e25e60f1a8c2b5455f533d28056c86c55c4e57fa1a0a4ff51679c137d73f96821ba99 SHA512 f5dafbe33a855287be71923f0eeb34dac309500af75b71ad8909628611a85d6e856308c4c179dc719a0fc9d0573a4083fe7f648da96306810d1dbd5d51391ad1
+EBUILD rocm-opencl-runtime-3.10.0.ebuild 1975 BLAKE2B 1be32b341a154e80d5fa01f5a4e963a08d9cb11b98dec5b5424d456055c7c8293d5a96de1a857058b439a2efe049460e184a5b91a25ca8b44c8f9e917870cb12 SHA512 9c74ffffeb237346f0e96d8ec3a396ce1311a2224cc10c2b68ac789a6c7c67a9c0a5a3a37a43cc1860f63989c67e5fcef143010e1594002de14e294188cdc845
+EBUILD rocm-opencl-runtime-3.8.0.ebuild 1974 BLAKE2B e04cd94dbf0b11b0068d5d6e9aa3e259f2cd170278abca539befb8dd116bade2524f5e52ebad59ed4edec9ef1af05cc48bba96462c1bd41e01db6b4eb4da8aba SHA512 81727360ed14a6883697f915193771747e2922b87c5f47eb9acfc8a968fc7363a2b195d89407dec114d1ab7d2372ea6b0d1cb2a1844ef0fb7f95e5172c3ef077
+EBUILD rocm-opencl-runtime-3.9.0.ebuild 1974 BLAKE2B 95636ee89b8056cf81abd44a5458fc135fc81d17b3a8802cf060dbaa5247542651c674ad2b84316ffa2912b4b56ad7bbcc661ed6e268e2366806631dad054369 SHA512 42c743b29a80d62040ddf2d140c128c10e8aa39daa63b7d62604d8df04a37298d54a461b506cea9495a640b9ff60b858cdd1aa2cb5926c9240d1a4316ed4aa5b
+EBUILD rocm-opencl-runtime-4.0.0.ebuild 1739 BLAKE2B 4af344262491b692e45535184c33201a7085b395909449d5a2cca815a35b1040aaa3bdbb6271aee93e9e6da041869942781224374c5fae2c2b5a8df0fa5d8e3e SHA512 d08a9770744f18d6d606f6b0daad2ac66dcb65e1a87a421f799b04050bfd8e62171a1d3fc89034fa66b38e239c36b60ea7fadc18dbf687d4ae8b9e449e1b63ac
+EBUILD rocm-opencl-runtime-4.1.0.ebuild 1739 BLAKE2B 4af344262491b692e45535184c33201a7085b395909449d5a2cca815a35b1040aaa3bdbb6271aee93e9e6da041869942781224374c5fae2c2b5a8df0fa5d8e3e SHA512 d08a9770744f18d6d606f6b0daad2ac66dcb65e1a87a421f799b04050bfd8e62171a1d3fc89034fa66b38e239c36b60ea7fadc18dbf687d4ae8b9e449e1b63ac
+EBUILD rocm-opencl-runtime-4.2.0.ebuild 1780 BLAKE2B ba3430b4bab99d266abeccaf4d76eee043ab531305b40a77fcefb85d985de8bbc21c67ab605523af6876230596e6000e923033b8b55e4ecba9612b8893fd4604 SHA512 6439753e5d7d071f9917d5b88f5ef4699a6d3ce06cf9ba32f001722cd943b1db75fc54c13e8b2b356b203709bfe93af1b8f6a660f892bfb5dd50a366e85ad79c
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild
index 125321094992..380f4a17847c 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
index a340ec574c82..f8c3f470dda6 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
index cd1f935e955a..9f7e86747252 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
index d3a5d3f5ef89..dfce52688c20 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
index d3a5d3f5ef89..dfce52688c20 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
index 45d99cb43091..43fc5daf8b59 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
-	dev-lang/ocaml
 	dev-ml/findlib"
 BDEPEND=">=dev-util/rocm-cmake-${PV}"
 
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 2bf886429748..a60ff72161eb 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -3,5 +3,5 @@ AUX stfl-0.22-pc-libdir.patch 866 BLAKE2B bdbc18572fd5104ee04af672b9d493bb3271a8
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
-EBUILD stfl-0.24-r3.ebuild 3135 BLAKE2B 266e28cb632ae61ab52fa68e8007572d412e207adca047c3043c84c9a66367ca788db3d28b739c9fdc83511487c12b4af9b471998b43c5c08eeadf51a16694b8 SHA512 45e9ecf8795606a11199a5964f0a392912c76292eb3d3567c76f2e0b5030b090ae036087a9fad0ed50acebeb507884c2f26dcbc7913cb204c8addbd161df1c0e
+EBUILD stfl-0.24-r4.ebuild 3137 BLAKE2B 63e9a0e0ba6caea6b0adb8987ea96a2ea65d13f26b47178fbbe0b3020ae249f2b7250f2e4b258fec2a16d12484a42064f5ad16437d1c9595a8551e7529ee3e2e SHA512 688d7d2d1d779e8e9ee52107038fbb7945bc7078345a8c571975a4cd39ab16f16140f58ca0572dece066eaf66b01218e66b91064eeb791e1f9c51d31baddfa05
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r3.ebuild b/dev-libs/stfl/stfl-0.24-r4.ebuild
index fb1a4eb91c6c..5a3ba87236dc 100644
--- a/dev-libs/stfl/stfl-0.24-r3.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r4.ebuild
@@ -18,7 +18,7 @@ IUSE="examples perl python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:* )
 	python? ( ${PYTHON_DEPS} )
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 38f013c74825..8dde0db8b6d1 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,5 +1,5 @@
 AUX tomsfastmath-0.13.1-export-fp_isprime_ex.patch 297 BLAKE2B 4147cc95152298cfbbd88416d11e298b95f574d7bf083900a2b0e72069764f4efcade6b074fb632abfb8f92a4e15b2e71de9a9578b2e65d0c63e4e258923a4b2 SHA512 33bb97d9a33d8bdb81a6a2df5b1727430a421bcf73df292b965663be532e30a4d815c332ee63b9790e04425ed80e58a30d9915a746cc265d98ad71a10da8bc34
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1-r1.ebuild 1718 BLAKE2B 66c98cdf7cc8e794e4118cc83d9ac787b09208951dbcc838c4587ba1f741e6a2f449362edef396d97c8acdc4d0bf9a3e2e34ac6c7c02490eeee0c3ffc038eaee SHA512 9f2750ec9e26af20dee2cde2088c5e67632364054f23445244ea8eb45a1ff960afc3f5602b2c5de3b69010f9cb818768d9c861cc35791f8cd533894f7009ecdc
+EBUILD tomsfastmath-0.13.1-r1.ebuild 1725 BLAKE2B c8a5807133b732b2f6803ecfc94cd2f659d8beb639a3ebf076f91d74e724774f3b9e2dd7e02e02ea5557714fab0c78c7b2401147478b7fa0cf3fa6c7191291db SHA512 9cf93d1630b2214613b93b3c03524a37a853aa0ed196591db777ec40221dd663a1d1c4d450996864330b203791ca09c94764ac99df2869da88460b57a45410bc
 MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index 7cde2a6d3e58..c369b6ebb419 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="sys-devel/libtool"
 
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 1516387a04bb..c653da56f9d0 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,5 +1,5 @@
 DIST userspace-rcu-0.12.2.tar.bz2 529440 BLAKE2B 808cc088e0c16098e1b99bad00f599a01ed9b4a02ffccfe5b8020f56a616fc9af3e0c830f788c44d6c89fc1acdb444659ea6ac713736d38d226bdc5a1170f511 SHA512 97031a0b5fe30e75e54f50d2170fdb2618e6d9b526aa5f6fa53e59251a548dee95e85c909aafb3989175c7306a32fa9e104beb12adf0710f5f1eec924fa177aa
 DIST userspace-rcu-0.13.0.tar.bz2 608434 BLAKE2B 11b5d13f4e1a577cc33ad430eb387b26cc2db2ba9ff32c7a09f9cb6c8a418548cd87c198ab4b63be3df884d8e3878046ba817106ff2f07cbab86dd60c9bb1d34 SHA512 7288b5a4a2dca6a75ecaa8553b942b9e7be9cae25776d2448fb0b0c950af9919c369791839607c6c1e6cbd32bbd1e1cafc18ee753f0e3bdc2ed7b65488612580
 EBUILD userspace-rcu-0.12.2-r1.ebuild 779 BLAKE2B bfc53650395398c8ebb43ad109e5df7c88a734f5cc7fed739773ab809633b7e17539917c0c5ed5343011a4f55445793282a10c9746af50a1663bc86d32e3819a SHA512 1fb8b6b228730da7ae4424c5032b340670ad50a55bcfbb46314d0baea017300bbf3c568095912b23c40974ad9bfb78faaef192a67eab466e8e1605a736327aaf
-EBUILD userspace-rcu-0.13.0.ebuild 786 BLAKE2B e596980c7b6e89853289cf2585eda6e4e1b534ff7742e48fdadba1a386bc5048d70293cfe63e5fa00ff04e5b9d4a8d2541b540a72947775f35c7e288bf2c15bc SHA512 6062091a19b76fdd14ae51eb4580bb183b0b945fd399aecf7c55c7d5cbd1cc6ff01128ee098cd9996a8bd49bbc89d02e640530dc8af791bc03e9a22b529c28e7
+EBUILD userspace-rcu-0.13.0.ebuild 793 BLAKE2B 1a890de11a1b39086214c29512a54b9f116b028d07d852d6871bb15adfa9c5a70f0547302298fe966354d7c249dc96a9f2f9a14b1dfd35aa2bdf4b3f88d28fb8 SHA512 910a2d2957ba773ab3956e21f3eddbe2ea19b89fe86d0511dca298749c2483861a5dad19ea996185069e5fffd60cd73413ea8c6c742dc1e159e590622457a035
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
index d5a84522a542..d4daaa3c8906 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="static-libs regression-test test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
commit	b49088575eb777ced2551f484da86317332d6087 (patch)
tree	bf9a151cf2d61956340d555659ffc098ee1da466 /dev-libs
parent	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)