gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /dev-cpp
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
61 files changed, 504 insertions, 671 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9ee36bd49737..f8fc1d428708 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest
index 9ab8f511b2d7..ac7e044b0058 100644
--- a/dev-cpp/aixlog/Manifest
+++ b/dev-cpp/aixlog/Manifest
@@ -1,4 +1,4 @@
 DIST aixlog-1.5.0.tar.gz 14080 BLAKE2B 20042e44853da950cae80787e8b9692635f0935ff0b559054faaf6ac41db4de7ddef1ab071b4244f1338b81fa559ee9445aa643050f9e250587cbbc0aae5db3e SHA512 28556feac1fa804b8a4dc047471e0a6d4c4fb7d81487810d55b09dd1be878246b8bf9f2097b76a980284318823c287bd0a93dd7a3124425a1ea9aced757152b6
-EBUILD aixlog-1.5.0.ebuild 579 BLAKE2B 6bdd774dd8338321b95bfaf295e441588891ef855c09fde505d806038d60ecdf5954be7892e5bec4a40867b62d5e70a1fadb43343ea5ba0e0fdb3b94e619c37e SHA512 9040235c6ab6fb773ad2ddb42ac95d958554a0b8a7754f31dae49cde44eb8eee0e6e96759711904e67c27db7f287f63520c01897e81ac938273a5d8126e95901
+EBUILD aixlog-1.5.0.ebuild 584 BLAKE2B ca1d492323bbf4f5b867c2359b1ebdf6ae3fc70feca7b47a7761bf1b8351b83d5339810e91b4df2ef10fffae684faec4a13b6b9d98dd9465dba16147ad7e5a0e SHA512 8980088e6037a7b621cb9739765becaf09ecb7597817ca0787ffd3e75ba63f00f5b3167f98ed4a62fd2ba7d884925d59c54baf4735bde98f106aca0d8d09d8eb
 EBUILD aixlog-9999.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3
 MISC metadata.xml 499 BLAKE2B 7dea962d454843ca3cde921a8dd30fadcb75f163f8ccf16a51b0d3de5176e8f6cae4788271f9924d5edd79e3e7b4ebe118e55f7397b8b5a8a8d1ec03d2a44241 SHA512 20dbf828621fdc1a4379192ed16d3f1e37bb8c5fe9974638f0b8e7c330d007133a589f5e8d23560d19de3c7c5eaa52c2d1e98d61be9326a998376a45c8f866b2
diff --git a/dev-cpp/aixlog/aixlog-1.5.0.ebuild b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
index caf257c07eb3..e49c384fb94d 100644
--- a/dev-cpp/aixlog/aixlog-1.5.0.ebuild
+++ b/dev-cpp/aixlog/aixlog-1.5.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index db7706810a39..507b0872ec52 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,5 +1,5 @@
 DIST atkmm-2.28.2.tar.xz 689944 BLAKE2B 24a71e98af483ed5a5a0c517fecca775ad0206b972fc3906b9b002910ca07dd1d1ae1a9aa6f044231470b484d36d580d8d263ac7b8ddee668d3a0e1845bd47b0 SHA512 df20b89b603a6ae419db24b21acbd6a9d0e91c07e374b4b774f6a67581ce1581affb0d079a264f0d7f2e6d8b63210639dd7aa15e7e94fb5904d161e9a2aac286
 DIST atkmm-2.36.1.tar.xz 736828 BLAKE2B 5dc5d8fb9a29fe16bad0aea7737110df08f10504b5994239015a85ebfd98b6e38414259ecb6819e1dd9459fdf49e0f6b85c5ed9936802bd56d5c154c91443add SHA512 23c831afac6bb9a0f9f2e622f8f9ffea29445a33b1cd650e0c07ee77e60b28ae5ee978c029e8e0f9b94e9ff4679d69ebde833f15e0a5403d97914cc7ccf98a6a
 EBUILD atkmm-2.28.2.ebuild 865 BLAKE2B 324a1566fd2b8777d454470ab9fdc6d0ae3b269c5b5f4893388999fac04f4c66bdc70460f91158ac28ff3f9b3038ca1a4f76500aa38b68831fa7f38eb7b02226 SHA512 9b8c5055cfd5f588a122b6f98a0064a863f98b5da9b4c1426ee0286c565b7f4e06d3cf2e140f69bbfc3941d4279e4ca94f4a70c467e5b0903696033af762ed20
-EBUILD atkmm-2.36.1.ebuild 863 BLAKE2B 8360bffc96c0d2fc657ce0137e7211264d48a7574068f6b9e9e0c651edaedd63f89b1f174d2e98125d274476a124b43dc7910a3d3153e54f3a4072cabc72e494 SHA512 d6955f07a9d272934107da1f01c350eb27e03d3bd435f83ca0d6ec07b513871c66c83adb9c6324d44767d56ef9f2d472e1ac553c9bfda7bccf90c53e5695a87f
+EBUILD atkmm-2.36.1.ebuild 870 BLAKE2B 631f733b36cbf9965df026de54b9a6719885fd99e8fb3cf67b6c09f87abe919f5af8dc9a8fdff9669fbd8c1b07675e73fa476df54ae1d9d02cde9791f166f03d SHA512 4780dea881a29c1e65ae9c225965e8cca0c8f737d56f8da644c081caed3936efea00b3e0889be0e829413619798d2f0c47d30c3b1bc682cbbe47eb27f73e2823
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/atkmm/atkmm-2.36.1.ebuild b/dev-cpp/atkmm/atkmm-2.36.1.ebuild
index c22677a95a15..985508042c4c 100644
--- a/dev-cpp/atkmm/atkmm-2.36.1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.36"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 2961bfad8f98..d5b3854bbebb 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,5 +1,5 @@
 DIST cairomm-1.14.3.tar.xz 604572 BLAKE2B a626ee20a229c4597622e7ead3320e5ff971632548488e970b877712d5579731093a14791a13416bec783e180a4f8432be1a743c7a5d77af2fdf30fa36ee3caa SHA512 8dc8a0de733904742c54d4935b596d4103f2e498c6735894bc6a5a81eb4962c6ea944bad94102b18b25850f78e948d38f117c566b197bc76da23a4e88b62ee4e
 DIST cairomm-1.16.1.tar.xz 580020 BLAKE2B 219e83fb328a73cc7c5801aa155156e65245fbccfb3899d98573266f78f9f489ef968fac3c8c577fa98fbdc61af6d873293783c41dd00046e5db327443bdeda2 SHA512 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757
 EBUILD cairomm-1.14.3.ebuild 1032 BLAKE2B 3c73be20cf646e8532abfb8312e028a5ba9757e327b04d80d2235bdb8df97f5346493b2cf9740275a753c164a478a8ce491b6f9a357339aa974811338cbe2c1c SHA512 16cdcbc0186dd32edd347e026348d16a816cc13ed7009faa37bcd96099a6c45d7b6adb3d6022f316b6b31e14ad8fecd1b1b8f985c92a8b3171efd2c221d29903
-EBUILD cairomm-1.16.1.ebuild 1027 BLAKE2B 5e78cc33ed762377e41c51c2f430e6fde5e18bf307263de24ce327a980bb10344066077fdf735e38b35acfbf8e9a4a84ce03c5c9b7612b8f42413bdafcb01eb7 SHA512 d71bcde0148760e91e90dd94601c9d42e25eea23d87ddc79f4606ca5e0d7a1c8d2846ba2d0e961b4cf1b471271e02dcfb9a056e53d53aac9efc5980ba9d4adaa
+EBUILD cairomm-1.16.1.ebuild 1034 BLAKE2B c4880c3c45bbd490e7eb0994fd8776afa3fe4040ecca8f5319309d257d0e26354db002881bbe1bb2d5fbcb4764aa18b8e48fe7a76e46839fe460a45805b855f8 SHA512 c9bed5df9e8811ed69464fcb80eee2ae36430fd515ddf04f090df0d6d40e586bf27932bb8d9f686787f23f77af2681b579b270f7f9263531c5503ceea8b88ac6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/cairomm/cairomm-1.16.1.ebuild b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
index c0f5c8564e53..715ca5acea49 100644
--- a/dev-cpp/cairomm/cairomm-1.16.1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index ab181d9a4d3c..caf4b37d86ae 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -2,8 +2,8 @@ AUX catch-1.12.2-glibc-2.34-sigstksz.patch 2667 BLAKE2B 890af64dcf7fb85d02a00d22
 AUX catch-2.13.8-musl-tests.patch 854 BLAKE2B c593febfdd8d18912a0ceac2d63c3af21ed917df0b8ba416fe6d40adee5c2f5472c282e5c325fbd98ece23b27ef6b1975bfc4855808c8e7df86ee08c06a79845 SHA512 7a54bc2c06204203da6277866f793adcf14edcff915a12f3ad75b0b5d919dc06bcc5798188d3b002a0a872e2d8589178123c9960a25d0ff42b7be227be52fddf
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e
-EBUILD catch-1.12.2-r1.ebuild 889 BLAKE2B dcc10c4f7ac2ed34d0730b9fd7bfc5cd21eb6d1f5326a8a3a1d712f6525620aaebb56927f81c62b10c9094b9b2f6ef04f843458fe594af5c6066552ad3ea845f SHA512 4d8d7cca3f745ac8094c4a585d61881a3de3ebb91413f226a0fed59d4d57ec8aa1a4b808f419610849466136c53c3ac9b742a558f91b7845fd0e664e947ac9ed
+EBUILD catch-1.12.2-r1.ebuild 896 BLAKE2B 185ad88f37e5fc1b66d865be02c20989fd215c5ff50a63c6e91ea3fdc1af497b1f499693e24e66b980c367d387aaa328feffb3e11a37513e0191a43236e6c0d8 SHA512 b076e9b7b233dd067b55592382798d7ad7a85666e46a287ba5de688cbbedc9c6226b39a5c448821bb2fb6ba90c654cb33d111aded9e4a38d82d8d3f402bae1f2
 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
-EBUILD catch-2.13.8.ebuild 1004 BLAKE2B b7077bf5ce2bffb88e87fc8d908d9d31008d8c46212ff320c5f9f7d6ec684709d2ad7e5fdf2641ffbc587060c930113ae1067d0fb9a5832c588ef32d23e24bf5 SHA512 daa0d00d72fbdb0f82e81bc36b84d7779afd96043be8ed132e2463bb3a6c1a2dbf44769a736d8b2f194c248cbfdf094cca260971339e32a99148352e03f0c7cb
+EBUILD catch-2.13.8.ebuild 1006 BLAKE2B 6698242f1fff2033252d4d8c3c16b43cde4ff3ccbf52faa6909e91354957d270a8ee3a82762a1056280d3d0f3b8c7b189fd8741b924e5a0de7c1465db3071ed4 SHA512 fb1a340c0e175c53e32eb1e5ee9f5e149f29a24e3fffe2de2529e85dec1c88a9e333bf1ebe069c5f09d5b6935da865af4f4b66b7ae2dc6a78c01ea50af72b6df
 EBUILD catch-9999.ebuild 929 BLAKE2B dab69a496e41ace27c41efa0e48567b945ccaa2cef1089dfc5acf09f16260c6dab24dcbf1e5653740dd4f956cf0613822718cdd579d0bef08ef94c41cc5b0089 SHA512 235ac11bd0b91c18f92e2be38b0073c8b6dda575c6aaff4938821f7d1f6b38a2a44363ab30351bf3a64afa60850aee35738e72f209aef9bbde45ba88a82646c1
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-1.12.2-r1.ebuild b/dev-cpp/catch/catch-1.12.2-r1.ebuild
index d458ced709de..42c555075f8c 100644
--- a/dev-cpp/catch/catch-1.12.2-r1.ebuild
+++ b/dev-cpp/catch/catch-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/catch/catch-2.13.8.ebuild b/dev-cpp/catch/catch-2.13.8.ebuild
index da5fb3105081..170be3f4e3d6 100644
--- a/dev-cpp/catch/catch-2.13.8.ebuild
+++ b/dev-cpp/catch/catch-2.13.8.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 858107de1657..0873be08774b 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,7 +1,5 @@
 DIST folly-2022.03.28.00.tar.gz 3616507 BLAKE2B da003701abe599f20ac87a2785fe9a4cd4a8896d182737eb1eac6384f3d75a792225b426febea7cc4ea99aac1a1f31eb7330e0a297f43ae7d5aafccd93784560 SHA512 6eee07b3e82247c3c8672442503e9a69a1c4607604269fc0760e11a2d0e5595029e6995fbe7c970d2052a7f228f6b92112630e6d5c624369fc52e5ad1823ef74
-DIST folly-2022.04.04.00.tar.gz 3629241 BLAKE2B 6e606c7412a8c2dcf731bf1373d3ed33680b07641109fd5da066bd648961d9608d82496322496bf6334a8576ae2394a36603ba8098e972c9b949a989f04baa4f SHA512 923cab43820b75ef7f614a3e62d278ecb3a64beeabefee64d6fb113fbbfd368b69a2a90015706ba58e68967eb9bbf97052678edd1f2d6d4d466792f08e547488
 DIST folly-2022.04.11.00.tar.gz 3632587 BLAKE2B 13820f6dc600727fa97603181be97a568cc8b3c713659717592853827dac050d5f1f6d98178e3054871233b48ac18f713589bf43b36ea29445cad557ce13bacf SHA512 7aa0be95d6f8b21aaa88558cf5921c526ab5a8c8121b858eb6e7ea19946d7a82dff06d90b7a365cef5c56a43d8d57af8d01b8b11b27262fbed9ee8c9e701b5ac
 EBUILD folly-2022.03.28.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
-EBUILD folly-2022.04.04.00.ebuild 1485 BLAKE2B 0696360aaa605a07df06bec136bf49bc1a22ffcb41bb2bf7e1b2368e3e54903ee00c3e154cd4149b3095c2d61a3613af692b6b21db2817add77dd1412a5a2cbc SHA512 b14b3324d6b5581b3d0e9c0db630c8fc0708e13a52c8e9212dae6f87a0676cbbc5f94f1f2d8f2509953e9b587bcfda052f536289f7ea4ff6b657d1cf2fe471f5
 EBUILD folly-2022.04.11.00.ebuild 1878 BLAKE2B 856316039333e2173c99e112dd042ec7e81ec417582fedfb79383c84df4c1bc80bc1af259016c6c734667465ab102c98c7ea54e973d9239d52e0c14e7704bcab SHA512 6228518ab204e7a92b75e369be105dfd0fabf40066c87ebd39bfb4848211435166791facc6789ec0062e3442b73b9437f27243c263127a8853dcc2ae4963c524
 MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
diff --git a/dev-cpp/folly/folly-2022.04.04.00.ebuild b/dev-cpp/folly/folly-2022.04.04.00.ebuild
deleted file mode 100644
index b644181fecc6..000000000000
--- a/dev-cpp/folly/folly-2022.04.04.00.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="An open-source C++ library developed and used at Facebook"
-HOMEPAGE="https://github.com/facebook/folly"
-SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="llvm-libunwind test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/bzip2
-	app-arch/lz4:=
-	app-arch/snappy:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/gflags:=
-	dev-cpp/glog[gflags]
-	dev-libs/boost:=[context,threads(+)]
-	dev-libs/double-conversion:=
-	dev-libs/libaio
-	dev-libs/libevent:=
-	dev-libs/libfmt:=
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	sys-libs/liburing:=
-	sys-libs/zlib
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	!llvm-libunwind? ( sys-libs/libunwind:= )"
-# libiberty is linked statically
-DEPEND="${RDEPEND}
-	sys-libs/binutils-libs"
-BDEPEND="test? ( sys-devel/clang )"
-
-pkg_setup() {
-	if use test && [[ ${BUILD_TYPE} != "binary" ]] && ! tc-is-clang ; then
-		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
-		ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
-
-		export CC=${CHOST}-clang
-		export CXX=${CHOST}-clang++
-	fi
-}
-
-src_configure() {
-	# TODO: liburing could in theory be optional but fails to link
-
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 25ef182c25f8..fd7a04d0ff29 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,7 +1,11 @@
 DIST glibmm-2.66.2.tar.xz 7603104 BLAKE2B 5696391bd5dbb35f8c961250af6d9b2644e900ac6a800054e9e7630cbf4882c17ef1bf8cf322e89a3bdbe613d13d4a045920bfc1071442daa3afc78afa8cd759 SHA512 097af6b140a5af3e52cc2c5d251475a5aa923d0c528c3cbc97f31d3a95868bcb3aa2328047ca94a55ef7fd188f271917dfe29faa86f477a441f0a024284216f9
+DIST glibmm-2.66.4.tar.xz 7606108 BLAKE2B 5ff069110701d315c5d639e5efd824eb136b73fa29dc6e3fe5aead675e87b335bb2cbbbad2d9187285ce7086014aa316c07b672d88c5ba5fdaa3b8888e13af0a SHA512 9b1e0c09a11182384313ea4a7ba484ebab894528e08169a610387f207b5a7f8db9338466cd3e9eb3fa55e1c12817351ea27c39d6503208af67ba619f9d249c75
 DIST glibmm-2.70.0.tar.xz 7874312 BLAKE2B 5d0fb24444b8764e3f972f342a540164debb841f74e5d27db721feff9baa70c9ff5821b26642cb8c5da048f9a1271b1ed7283d9f0338ba0f184be396981310e3 SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518
 DIST glibmm-2.72.0.tar.xz 7921092 BLAKE2B 5f4fc6df527c6aa99886d5afe3233e15a37319b1c9f7814c9edfb574abb9b0f1b04b887d2a275c113382b0b301df7d3a22fc4398bc61746bd353e73015ec8770 SHA512 73b8a7a3848e6c5c9b532547002e44dd77ffc1ff80a849772cf48ad5aa14965bd6d50e01b2597320a578c3655bc1ef42804c0f2fed3ac632fe0218f8ae4788ff
+DIST glibmm-2.72.1.tar.xz 7921260 BLAKE2B 4078c2a6a12257a84844d3fa70c8b6a1a28b7c184f7bfbbf2adc882806099f7211378d6f7a23b1bbd18514ced9ada56642eb4ff877ee23cd70b4ee6b1a270510 SHA512 aa52c7b73e8f3437c2da9e8da74f84b9f07c7aa40a5fa232a7418b4af19575cbde01f6cbe9fb3fc3227bd9281a9439156a51d10a0c2c1a1beca226c7c93fe660
 EBUILD glibmm-2.66.2.ebuild 1256 BLAKE2B e850bb1ec055ec7e830b4aceb303b8b8fedb24c1acd9de5bd5932fa8d61760fefcadea24b95c0a4a24c1f0d211b8921202060796d7e63c1b4075264fb9d6e6cb SHA512 ff78e19e8bb53abac62e36fdfda170a063d966f1a49af1aab43148cde9a304122b6e3be5b6b052fef3d518c312402e1b312fdedddd3dea6b13c5b2db92ca526b
+EBUILD glibmm-2.66.4.ebuild 1301 BLAKE2B daa194a837d1aa29048ca1cbc60043e32ebf2210ffc056736ba324d30dbdff0647c61ea18704d57886f23337bcc374abe440061bfcb99c3eec6e982523030bdd SHA512 cb34cec5086417501d2dda3f675a210e60c4e32748d092ab0fe5b80ffec6abca6b9db08deb733f0da91e46b00d12f25f6a1341f1a8d670ffedcc98b6dd6e4d3e
 EBUILD glibmm-2.70.0.ebuild 1212 BLAKE2B 58cd0a0cbb861d29153f8dfb1e28a15531cdf1fb1c75e46281d48a742f1a1c1bb051268a69f810d24b4f7fb2b71f40526b50407641ca387e033cc4fad6826042 SHA512 094d370ff18425a9cd353eac2193bab1722145a79a087d475487b3b158e6a715257435f7a8862dbe2489d3fc07a66b0ebd3bfdb936c989d0fa09301a6cd8159d
-EBUILD glibmm-2.72.0.ebuild 1213 BLAKE2B c9d8e296f675cd533228378e74c781a937ce4577104d8dd1c1c5643e017a0506a222eacb628307773f4a079356ec5a53c5a85225208cbd5939711ed7bb22504a SHA512 78cbb5d13c452eae9f9b3373863a0030a4ff71660df658a0a72879e9504ddf9e8c46a42405f063629cf747541afc742ddc8f2f3a5c6f3178e5edc3531d6aa5a0
+EBUILD glibmm-2.72.0.ebuild 1220 BLAKE2B 0f0a6c63302ff1ec8575b7ab4b05f9f0e19dce3794c6ee6050123231a2b9634375da2fa0e557363ef1412096d9566d04b500040620d07e9ab4870daf2f53c197 SHA512 7274568100b5ce24189ad54fd5bd5c8ac51950d7030d76657394cf5c17408f439faec1fbb5b1bf94d1851e27bc93203da0406619f9b7e01c51fb10478146f91e
+EBUILD glibmm-2.72.1.ebuild 1220 BLAKE2B 0f0a6c63302ff1ec8575b7ab4b05f9f0e19dce3794c6ee6050123231a2b9634375da2fa0e557363ef1412096d9566d04b500040620d07e9ab4870daf2f53c197 SHA512 7274568100b5ce24189ad54fd5bd5c8ac51950d7030d76657394cf5c17408f439faec1fbb5b1bf94d1851e27bc93203da0406619f9b7e01c51fb10478146f91e
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/glibmm/glibmm-2.66.4.ebuild b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
new file mode 100644
index 000000000000..00ffe3f6dccd
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-perl/XML-Parser
+		dev-libs/libxslt
+		media-gfx/graphviz
+	)
+"
+
+src_prepare() {
+	default
+
+	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
+	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
+
+	if ! use test; then
+		sed -i -e "/^subdir('tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dwarnings=min
+		-Dbuild-deprecated-api=true
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use debug debug-refcounting)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/glibmm/glibmm-2.72.0.ebuild b/dev-cpp/glibmm/glibmm-2.72.0.ebuild
index ec1190baa58d..f40448c218b4 100644
--- a/dev-cpp/glibmm/glibmm-2.72.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.72.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.68"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.72.1.ebuild b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
new file mode 100644
index 000000000000..f40448c218b4
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.68"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.71.2:2[${MULTILIB_USEDEP}]
+	dev-libs/libsigc++:3[doc?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+"
+
+src_prepare() {
+	default
+
+	# giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
+	sed -i -e '/giomm_tls_client/d' tests/meson.build || die
+
+	if ! use test; then
+		sed -i -e "/^subdir('tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dwarnings=min
+		-Dbuild-deprecated-api=true
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use debug debug-refcounting)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index dcf48e4f18a5..f6bdd3a3ea0b 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -5,6 +5,6 @@ AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3029 BLAKE2B 3b46cca54d2f
 AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec021d44496c72beaca0239445eadb4bd11f022d6abdfdb5b97bc9e8bebc5f79255999bf655fde5572009e6fa71e7d8a0af785581a574cc5ec SHA512 db883cd941cab39954f06a75929520c94d824344de81c712d495d03bdd438a2cd79a1d975330848c84f0b482bcbf8c4fb120c45171e51c37dce960bf9cf4c2d5
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
-EBUILD glog-0.4.0.ebuild 1145 BLAKE2B b5ef97d1fae34eb7ee04acce16fcfc0fa842e2eccffb3df84aee526ad45498d94ce25aedaff1067296359dacdd66cf2d65c5fed9a1f2456728d400f35fdbfda7 SHA512 f5d75698b1ba54da2471bda2d21a8058094101bbf127b0cdfd13dfc148994045794838564298dceabd027248830302fb53ed275ddb3afc41a52b961393b547b2
-EBUILD glog-0.5.0.ebuild 1441 BLAKE2B 36b65a05f64470f316bef75c6cb33717856f047eab30b9b2f47194660e1184c675edd25ed2bbaf383842b5e804cc5e589a84f54d4aaec411703c31806781434b SHA512 80ad142349249550929e1eaadd4215e535333dfcffe2488d801373296985c788562cc443340497256a930fae8a8c83913caffbd8ff56ef88a0a2a5fd52903b2a
+EBUILD glog-0.4.0.ebuild 1139 BLAKE2B 4aad89f7c76c7744037cc2a72db92bd321a9c686022accacf55efb1f37b76a594b245f6d018f0f48cc246b3f281f7d280cf8829ae89dacfbe2eb224a311e553d SHA512 d80010ebb2d0a530b98bcc1af9a4b6f0c9c2ff94be9e9172e068ab0e6d5a2a501e72b6aa3df8c7307356cc92ac4062a5b2467948c916a0b109a57fcf1aff987d
+EBUILD glog-0.5.0.ebuild 1507 BLAKE2B de2012593bd10050ea564cc85a8ae1d9145d6db530b5e5cc45598b3f9ce79088a72bb0195ff2f282e06982922db55c986f0801046a55937f6d7c51c8a92536bc SHA512 dabb3a29f2573140d5dd44dabf052713b99ef33988161b86b505587d71b805cf073009c781ec66b5f7f9ab4499a9d00cdf20b239323f794c4c1c114964004aa3
 MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3
diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild
index e48bfd350451..9b10f2e2fc95 100644
--- a/dev-cpp/glog/glog-0.4.0.ebuild
+++ b/dev-cpp/glog/glog-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 # -sparc as libunwind is not ported on sparc
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gflags static-libs test"
 RESTRICT="test"
 
diff --git a/dev-cpp/glog/glog-0.5.0.ebuild b/dev-cpp/glog/glog-0.5.0.ebuild
index 88123b2be536..b3672874b744 100644
--- a/dev-cpp/glog/glog-0.5.0.ebuild
+++ b/dev-cpp/glog/glog-0.5.0.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gflags +libunwind llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
@@ -54,3 +54,8 @@ src_configure() {
 
 	cmake-multilib_src_configure
 }
+
+src_test() {
+	# See bug #832355
+	cmake-multilib_src_test -j1
+}
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 708fe5a96fd9..6eafdc2c1f5a 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,7 +1,5 @@
-AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc33314fa15b0bdf78baf6672915befe2c14c695681701975dfb3d6572b2254596789dc1cc2010db2bd391e1d26f17a3a83d6c3aa96a9252a0fd1ea3d5 SHA512 406f1f6e900b0fe2c042cb6d219f20586058e1e7e1af38ffa7059f0d5e6b24cebb7b034237d154d9669a9a860497a36b3c7a0308a0698af23bb07cb29cf38851
-DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
+AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 606 BLAKE2B dc5282aca513bcb82e7ed90e432ca1ee758953955a30f1dd17bc0c2f56a46e7ef846c209186e561dfa6d7e7f7541ee03db5b88dcacfac649e0ff2a3f41bd7870 SHA512 01ab820bf5a100905f24be2a9f866b98e9e6a90686ecd0b93a85d42d9290bc6cb74e6fd218e78a48c6dcc69d410fd2dc9ccf7aa50903fe86e7886af1b97c25fa
 DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
-EBUILD gtest-1.10.0_p20200702.ebuild 1833 BLAKE2B 68116cb37b4f39dc0c8d2b1d7132c905c207a04b22af6c3c921882f877b85eeb0c6d734905ad4da1837abc5fa952340c666072fe3d25ad5a190f5587f80e4a6d SHA512 cbd8d53c88e299235cff7c7e1517b40d8a1ce03dd099511357677797a3826b82edd011153314e2518e87a15ef0cbf5bd7331081f981f6621695d4c4f5051a3e2
-EBUILD gtest-1.11.0.ebuild 1890 BLAKE2B 7d27c3ca1d3cfcbdcdc5d8730d48c6f1a75e1a8de89ebaeb93d6a14e70aea59c11641fa8f7e4f6eb039b7bdf23bb8080cd9ab2a0ffde4f61fb64ef57fe937103 SHA512 84a857c4a5d1e4eee302e2fe055740ee57474136a9a7d003417d214117ce8803b0229b73691e17703f8c62871f11e74b1d9af6c9127de5400ec370993a6ca5e2
+EBUILD gtest-1.11.0.ebuild 1897 BLAKE2B 43a23aecd23edeae15270486d794428bb94ce2b419412d76f31666ec190c4839b0614f9431c8e8f005f0128885bd38b3e28f82dcd280c3fb43068ab9790cc616 SHA512 9d6da775fd0d39ea025852e34a4521a1dfb35a28a1263363404cc572e576c3c779f34351e8f37551a3e36b405e26c62765f7a3bce0e3485c1b2bbec97bb6fc7c
 EBUILD gtest-9999.ebuild 1898 BLAKE2B 79ce4ea6d5691411bea3f6b18d890e323040948e3b34c9bf538cad4d666efed3741b6114d5b36bc2190ae155cc18a16c50d98acf17a96328a66eb7c375c2e56c SHA512 7c9ab9fd7d1491bc36032df95b952f0d5cb53742df962fb7c270fc30886b3db9ce317123231344078e8db600c8335f9a4f542426daa5840eb7a22bd517fd3448
 MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
diff --git a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
index 3e06777ac9a9..0c47681ba347 100644
--- a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
+++ b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
@@ -1,4 +1,5 @@
 Bug: https://bugs.gentoo.org/692464
+     https://bugs.gentoo.org/834068
 
 --- a/googletest/src/gtest-death-test.cc
 +++ b/googletest/src/gtest-death-test.cc
@@ -7,7 +8,7 @@ Bug: https://bugs.gentoo.org/692464
    if (!use_fork) {
      static const bool stack_grows_down = StackGrowsDown();
 -    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-+    const auto stack_size = static_cast<size_t>(getpagesize() * 10);
++    const auto stack_size = static_cast<size_t>(getpagesize() * 12);
      // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
      void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
                               MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
deleted file mode 100644
index 58067c7a096b..000000000000
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{8..10} )
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib python-any-r1
-
-GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/googletest"
-else
-	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		URI_PV=v${MY_PV:-${PV}}
-	else
-		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
-	fi
-	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}"/googletest-${MY_PV}
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
-		googletest/cmake/internal_utils.cmake || die "sed failed!"
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GMOCK=ON
-		-DINSTALL_GTEST=ON
-
-		# tests
-		-Dgmock_build_tests=$(usex test)
-		-Dgtest_build_tests=$(usex test)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use doc; then
-		docinto googletest
-		dodoc -r googletest/docs/.
-		docinto googlemock
-		dodoc -r googlemock/docs/.
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc googletest/samples/*.{cc,h}
-	fi
-}
diff --git a/dev-cpp/gtest/gtest-1.11.0.ebuild b/dev-cpp/gtest/gtest-1.11.0.ebuild
index 7d212e72266b..b2c3ebbb46e6 100644
--- a/dev-cpp/gtest/gtest-1.11.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 54d0e22bdfa4..c3ab64461291 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,9 +1,11 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.5.tar.xz 13540488 BLAKE2B b55c55e4bb56bc835be9c09dae59ee103fb0ae80ee99bb54c36c366686f4f1a0309435e91c2e323d7ebfabf7922b76ac85de6a1132c53ab708ba17be661d834b SHA512 8cc5aed26cc631123a5b38bc19643cf9e900beb38681b29ead9049f6b8f930f0b8ace317b8290279ab89cad85075dcb66863174082f77a2b67e4d8bd3c29de49
+DIST gtkmm-3.24.6.tar.xz 13530384 BLAKE2B 74fdf054a69a483a25234d30cc8cb920a3c1c8609601802d92bf7c57fcdc468d29bedf32b34997fbcaa5f72a07e467bc68a0c87a481b071d95a3a068e9fcaac7 SHA512 d6fc2d0689baca2b968820d1af86cc0b175b6f38f720d315bc50663d30bd0a841da57ac4336abec236542fb2893b28b2de84087419b73aba58b41f07568d4d93
 DIST gtkmm-4.6.0.tar.xz 13910344 BLAKE2B fd46c2e0fbda32daf472cae00591ab2cff6027dc0dfeee627ab1e3ac8d44066e702781ba452926dd808b30de260f9f6700242b0d80abd91b2b3ee5faef6eee17 SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199
 DIST gtkmm-4.6.1.tar.xz 13911284 BLAKE2B a456d19a7a5146f6a4ba93a77a053318353f14152488703c77c5a5d8532b1caa074954af875559bea8739022e4ca2cda49ed6a424946362bf39c0acd94a3a69c SHA512 87867deb2b4b0e50841e42d5957f9030c31c4ec1178b71a884a84c3c3aca178100ceb011729559f8f8f761dbe241c3cf4d420cc16c5b5aedcdd1d78f582d006d
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
 EBUILD gtkmm-3.24.5.ebuild 1372 BLAKE2B fad17eb7a7aa67b1fdba65d42558bc5facef1a28b036635bcb2ec2813114ce259f3200d9b6aa06f0fc78353b1abbd8ed0fe9bee2668786b90b06e3e818d9db49 SHA512 8b8d26eb6b3d15c159ba466ee12cf28dff55d5c95622c31647b8a85cf65c4caf820a8e135019fc97cce7ef2ba10710b8ebdc0450568e8bc3f54299549a3df89c
+EBUILD gtkmm-3.24.6.ebuild 1415 BLAKE2B 175a528429867bc8753e7026a16e4d63ec1e2ab887e8bdb8205c8d35ed8262e11d48862a234b9945df03b6a4c3f087faa565c9b99df22c55c96f644256c87a1d SHA512 f8e159b266e669d4c83c57e7c7b41e7a21ef473e15c23c6bf65df1d62c0ab9fb554072497655e5cb53c790c6b080e762102abf7404392710b4b331b6a438f33f
 EBUILD gtkmm-4.6.0.ebuild 991 BLAKE2B 7299f8bfdc1dcc8e9ddc75d251540368555f09c9c32112dee19d4f0c4151b9f655cde42b8bee58748225743369d58754252cb96b1041c3801d9a6fab684f0027 SHA512 516c52e0839d3ca3349358f32b167ee5e6bc9dd8cf59da58e42f6eaa1a542b6a5e75c2f3d649dd99e29717d0a1b2327995d7a682905e1d1c6339fc91242ae3bf
-EBUILD gtkmm-4.6.1.ebuild 992 BLAKE2B f0ab512aed881459c4c4c2804aaa90b58d161be5fc8c8f8e468991a6042aa63a0f356b4218dcbf2889c0c8f6a35dc61710be4bb9a9dee18d98e0fb42449dbee8 SHA512 a4648c8a24f80ea069b9ac063c73bc1a6bc664ce10a6e313e3e080ab11f913a135291d0ece42431b642c0f258d054b25c8be413b2a51444cf83219b6b273a9f7
+EBUILD gtkmm-4.6.1.ebuild 1010 BLAKE2B 8232ba0f7ec7ba3104902a85f586c099844075992c65ff8361013792020c331cf13853681811d27c8a71eeb2bbad0d4f17b806e965cbbfc2f32947ec3809dbc3 SHA512 d3ce76e85b7177bec6a54326da5e1570d6fe3b38be0e34ec2a8e3c9d3df02b4db59a7cb3460c0e89ed8b28edee9918847f64b34f6cf2f29d42ebc13b5801b41f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
new file mode 100644
index 000000000000..8abb75354caa
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson-multilib python-any-r1 virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE="aqua doc test wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/atkmm-2.24.2:0[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.12.0:0[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.54.0:2[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/pangomm-2.38.2:1.4[doc?,${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[doc?,${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.2[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	${PYTHON_DEPS}
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dbuild-atkmm-api=true
+		-Dbuild-demos=false
+		$(meson_native_use_bool doc build-documentation)
+		$(meson_use test build-tests)
+		$(meson_use X build-x11-api)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
index e5644c7e4ae2..a4abd9972d69 100644
--- a/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gulrak-filesystem/Manifest b/dev-cpp/gulrak-filesystem/Manifest
index 7dc7737d7b3b..e16f5d855385 100644
--- a/dev-cpp/gulrak-filesystem/Manifest
+++ b/dev-cpp/gulrak-filesystem/Manifest
@@ -1,3 +1,3 @@
 DIST gulrak-filesystem-1.5.12.tar.gz 209661 BLAKE2B 9eb0bce08659396f3ef254b0ad772ae9ad29654aef3c90ab1f9eee1c4f830544ad947680e072fcf7d3c251a3afb77447617610c49931d50743444a6b88b4745d SHA512 2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c
-EBUILD gulrak-filesystem-1.5.12.ebuild 740 BLAKE2B 6617035e474771b5993c5fd1b75814fafd50286920a2f6b93cd8eb4f09c55279a6fa0c1835cc0a298627f04fe4520268b873946cdad837814f097bd32e709199 SHA512 a7330b18a18cd12d4405ffecdf841d55f4aff5aa8c92d7b86af77aa4d07171fd15a04b9638c77bf4b0762dcc7b41ad818299a4db266e556c520b888420d79874
+EBUILD gulrak-filesystem-1.5.12.ebuild 738 BLAKE2B d8091a59a0fe4aa9845c4f755dfe37327539912c0a4c7c6461dfdf37176c018e77ed6cd73e85d3fe2d5083adb3bca29fc9e1232b217416435994c6084afe7eb4 SHA512 86ecb7f6b300af180fb4ba00c4651a1c7add2ed8814c95355139762d1e77ca610d1526a0dff99264e95294dcd560baed0595d91d7e84f8aed18ce339c41ef7a2
 MISC metadata.xml 330 BLAKE2B 00186bf8c44c6d7268ff44a6914530d56ef344300d10285a84b3a705e9f463e74aabcdb8bd4375d5e094e662565dbeeca882d33e72f24ae35392c63b7d63377f SHA512 9e84dee6929db5525f13d961bdf17b2db795f5f8cb4211aed4b1d3286207b8935e9a4276a7c0ebe09317347f64e8a54a835d2f607ae47b737462bdf9dbfc1c79
diff --git a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
index 15eb354118a3..35894094c0a7 100644
--- a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
+++ b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gulrak/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index e88160836824..2232c8e29f2c 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,5 +1,5 @@
 AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915c3fc3e934415026bbc8e19bd8d50b6e3e438f1942b0345832ae6067f7ffaf714d3b99efd3876c6774966cb0cdee05f1dc87788b37c072199d5c714cb937 SHA512 99333059c069f09c59281a7f464805eb41cc6da627dd11ac7dcc565fd688532f162776897ebf506c50e58f17dc7a9486214cc1ec683cb8b2c7efa8b767574410
 DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
-EBUILD highway-0.16.0-r1.ebuild 942 BLAKE2B 9fb7283832fd7064ecfd2737d2211788004763fb9ce97a70af64ca9867d50c42d2cd0f34e32608179cc3950aa59cd1a2e5f5d22a0eb5404a1b03355ceb5f41d0 SHA512 320e54fbba2da543642ea3d01c355bb2ece387aa5f96cfaffed33ef480285ab57fe89f1a96308d14dd4b73d1d35391f77e8700002b6733c6ac72f5589a5eb892
+EBUILD highway-0.16.0-r1.ebuild 939 BLAKE2B a6aa0fde15b40bc750c41156ea0c5b8d1fb93f3d3395fa2cd1c72f40f62e734483b0a3a04edf3515356a009670aed9358c6cf964fa4b5503a4c84d4062005348 SHA512 21a03d073418a9311f506ae9fde3b001e2d7f251d8100d0aa6a54a257d5bffd5c76152a228387d0eeeb463852e6527752783d7c0775f36e1abe8910fc73dbc35
 EBUILD highway-9999.ebuild 834 BLAKE2B bb10c9e76cac9a5149824c3f7def1928cbb19db5f7612aa22b8d5aace561483cb7d391e95a21be12edb73c87b3ce5e2a0ae4bb652ea8cfc2f9976b9afecdad8c SHA512 68cf57994bbed31f0ecc10e876ab78edef1af6c1af5be91e2d6ee7758b962799104873795d7c6ce443a2b4cc68c2324823b4e0d8233ca95eeeeb61b042bb5487
-MISC metadata.xml 616 BLAKE2B d7aed88bf99a4e1370c0007e2eeb0d9e8a64c888cf1ef428f5096e40d75497a7255ceeeb73b68d7bb3afe44f65073811759dbb61f2270d4a8fdbc0721c7b27dd SHA512 855f548c51686530649f9eb1d5a8f4441f8dca8377622acc3cd32562b58556000dec77ba7c162e8f00443e85b75fde81d2cc900c1741ed76f815e3521d2602e4
+MISC metadata.xml 617 BLAKE2B 85392a8a226aa984039fed26796d0baf6bdb38da7084932e59ec6dcf882ba11863066adff2caffcb34b2b9f337b539c64498cf48c4eea43364ebf2522ea9971f SHA512 5ec72623048e7c940af745ca256671402dc2126004b2be29e01891619c119f847ba1ed72b99f66ee44b8076510833444f5c733a9724e1b9eb13bc58a125e16e4
diff --git a/dev-cpp/highway/highway-0.16.0-r1.ebuild b/dev-cpp/highway/highway-0.16.0-r1.ebuild
index 52fb0b16d961..98782f199f51 100644
--- a/dev-cpp/highway/highway-0.16.0-r1.ebuild
+++ b/dev-cpp/highway/highway-0.16.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-cpp/highway/metadata.xml b/dev-cpp/highway/metadata.xml
index 717dcaf45afe..211c94e70a5c 100644
--- a/dev-cpp/highway/metadata.xml
+++ b/dev-cpp/highway/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
     <email>dnovomesky@gmail.com</email>
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 363516ee2a15..7fbf05445eea 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,12 +1,4 @@
-DIST nlohmann_json-3.10.0.tar.gz 7006504 BLAKE2B 2ccb2e50a46a8579b6a848f6fee35ad1ff11a1491157bdf5d343133f24d4468ddfabc4fe4e9909b47011d52b3604566d5d7e275f0731c8d91efd1e1b9c545ef2 SHA512 1531780110260ea4cd8fbe79d860f1ea46fa8377d520669f938ddb5f8a4b11fe550fc7d2d978a281d5ddcc511447d160a2f68c06583672496c57c6672a4036a1
-DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed
-DIST nlohmann_json-3.10.4.tar.gz 7062443 BLAKE2B 7f526d12c4ce8148c874c76d280090ef69ae3adf817b63758bbcc23ff9476e119ede90bebc397b9bb84b54012f057e3e010d643c595b4699a8ecd437a5a3f913 SHA512 f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835
 DIST nlohmann_json-3.10.5.tar.gz 7021996 BLAKE2B d4219d2f3168341eb8bd8f84af364e53f6caae67aa080b1ca0479216a98ee0256d5436243273b3c12ccdca904b4b17dbb90cf445fc273424d7dab6d2b95632bc SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2
-DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953bb2f6ecde437eaed87dad46c108daa4b21c662a047e7d4e7c180179df9e7dfb71f545f3e42b2528201630d9093539090 SHA512 e0eb4727bea993af984f832e069d03a21219befae0f24ee49e67a1144cf1e8428dcf2e37f683aedb8d14118545d5087f2b7d822a576944cef3e590a12be51642
 DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891
-EBUILD nlohmann_json-3.10.0.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
-EBUILD nlohmann_json-3.10.2.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
-EBUILD nlohmann_json-3.10.4.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.5.ebuild 1703 BLAKE2B 77bbdc5037eeb1c93ac89b08d46beb650a2686b0658acac15a6ae07bf0859c8e62332f85cb348c542bb7173282e5dcc198ec26691d600fad8e787d162d5c8cfb SHA512 218a275ca8c3dec9b69cf7517481a5886fdf514a141c101f79cdacd14e6f306f80306292a0732b63c99d0ea2c7929397296089b267a940191e0d7e23452b2c9a
-EBUILD nlohmann_json-3.9.1.ebuild 1564 BLAKE2B 5a5b4e28ec5a79e1f263a7a79b28ff000cfe8b62d56e1d1a6c29ab3fc11deff72e443dba409dc68b431b1e85f86a521f6b2383c8fdda66b6cb656178d2e49c47 SHA512 5cbf13fff01f5e1da5d594e86a3c2c22b135785579391c2d4d6067d95572a9fd0109b5580ae67ebadba745e4a1c8a06f789efdb0c17df0babb6161bbc7beda9c
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
deleted file mode 100644
index 39a2c4c723af..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="
-	https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
-	# Tests are built by default so we can't group the test logic below
-	local mycmakeargs=(
-		-DJSON_MultipleHeaders=ON
-		-DJSON_BuildTests=$(usex test)
-	)
-
-	# Define test data directory here to avoid unused var QA warning, bug #747826
-	use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		emake -C doc
-		HTML_DOCS=( doc/html/. )
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-
-	# Skip certain tests needing git per upstream
-	# https://github.com/nlohmann/json/issues/2189
-	local myctestargs=(
-		"-LE git_required"
-	)
-
-	cmake_src_test
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
deleted file mode 100644
index 39a2c4c723af..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="
-	https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
-	# Tests are built by default so we can't group the test logic below
-	local mycmakeargs=(
-		-DJSON_MultipleHeaders=ON
-		-DJSON_BuildTests=$(usex test)
-	)
-
-	# Define test data directory here to avoid unused var QA warning, bug #747826
-	use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		emake -C doc
-		HTML_DOCS=( doc/html/. )
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-
-	# Skip certain tests needing git per upstream
-	# https://github.com/nlohmann/json/issues/2189
-	local myctestargs=(
-		"-LE git_required"
-	)
-
-	cmake_src_test
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
deleted file mode 100644
index 39a2c4c723af..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="
-	https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
-	# Tests are built by default so we can't group the test logic below
-	local mycmakeargs=(
-		-DJSON_MultipleHeaders=ON
-		-DJSON_BuildTests=$(usex test)
-	)
-
-	# Define test data directory here to avoid unused var QA warning, bug #747826
-	use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		emake -C doc
-		HTML_DOCS=( doc/html/. )
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-
-	# Skip certain tests needing git per upstream
-	# https://github.com/nlohmann/json/issues/2189
-	local myctestargs=(
-		"-LE git_required"
-	)
-
-	cmake_src_test
-}
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
deleted file mode 100644
index 727db8df498c..000000000000
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
-TEST_VERSION="3.0.0"
-DESCRIPTION="JSON for Modern C++"
-HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
-SRC_URI="
-	https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )"
-S="${WORKDIR}/json-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="doc test"
-#RESTRICT="!test? ( test )"
-# Need to report failing tests upstream
-# Tests only just added, large test suite, majority pass
-RESTRICT="test"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( ChangeLog.md README.md )
-
-src_configure() {
-	# Tests are built by default so we can't group the test logic below
-	local mycmakeargs=(
-		-DJSON_MultipleHeaders=ON
-		-DJSON_BuildTests=$(usex test)
-	)
-
-	# Define test data directory here to avoid unused var QA warning, bug #747826
-	use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		emake -C doc
-		HTML_DOCS=( doc/html/. )
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-
-	# Skip certain tests needing git per upstream
-	# https://github.com/nlohmann/json/issues/2189
-	local myctestargs=(
-		"-LE git_required"
-	)
-
-	cmake_src_test
-}
diff --git a/dev-cpp/opentelemetry-cpp/Manifest b/dev-cpp/opentelemetry-cpp/Manifest
new file mode 100644
index 000000000000..8e4932b524c3
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/Manifest
@@ -0,0 +1,4 @@
+AUX opentelemetry-cpp-1.3.0-tests.patch 2937 BLAKE2B 179c6828a429d8d16ea8a8ff38044da8377922e74422b0a2df8d66e5648ddc8eae87e66ed2ccd8bbd6d4a356a37867c406988568aa8ffd538a2ca26161ab07b9 SHA512 fe8eae72b984bb5730fe095fef2a07a6e5dfdaa4c9b752e7ab5b3170f1c1054b1e888335e51257c52d2955b0a4d5ed80fc206c875fbb80990fa13f9f4ad1759d
+DIST opentelemetry-cpp-1.3.0.tar.gz 710030 BLAKE2B 56aa3213fd9c9ac5266197c2ca417f5ff181ca28016033c9320e63122eaf9a53bdb265e1778227a9036bc42f8837755a3009cb23610268bc03b9fb24b3844c82 SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836
+EBUILD opentelemetry-cpp-1.3.0-r2.ebuild 966 BLAKE2B 256f46f7225b64a79a3e13e9582e0bfb275c5a22cb79f8f6ff619735dfe7a5ef6d4e6a8f2406fce71adb93ec546822c1366e9baa556f7e6e6322f168fe46c776 SHA512 83996a9639d03457037372443af6b48e4d0c75ec60cb8e9e4e9a29223d9b0081c1e9ec2150431e407290f22ee31cb5fcfe111eb9ca0b29c0988eff6eb3af7bfe
+MISC metadata.xml 396 BLAKE2B 4f1e0d0edd6e3c57c5e01d8428a4203113e0bbabb1c9e02c03c99998ce839edf422bb058c28fc0b1adec6655114fd89ef11dec4897cbde4fef61d80bd11fbaf9 SHA512 f56f523cb2b99bb75162d06a0be09e662cfd64b5b58b5f92f61d4384319285f0614965ee3d585e16067249b4b17f01bef566b34e5bbfd6faf5ba2574c233b982
diff --git a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch
new file mode 100644
index 000000000000..a1ef0ff1d3cd
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.3.0-tests.patch
@@ -0,0 +1,92 @@
+diff --git a/ext/test/http/curl_http_test.cc b/ext/test/http/curl_http_test.cc
+index f8d248b..9a5be49 100644
+--- a/ext/test/http/curl_http_test.cc
++++ b/ext/test/http/curl_http_test.cc
+@@ -187,50 +187,6 @@ TEST_F(BasicCurlHttpTests, HttpResponse)
+   ASSERT_EQ(count, 4);
+ }
+ 
+-TEST_F(BasicCurlHttpTests, SendGetRequest)
+-{
+-  received_requests_.clear();
+-  auto session_manager = http_client::HttpClientFactory::Create();
+-  EXPECT_TRUE(session_manager != nullptr);
+-
+-  auto session = session_manager->CreateSession("http://127.0.0.1:19000");
+-  auto request = session->CreateRequest();
+-  request->SetUri("get/");
+-  GetEventHandler *handler = new GetEventHandler();
+-  session->SendRequest(*handler);
+-  ASSERT_TRUE(waitForRequests(30, 1));
+-  session->FinishSession();
+-  ASSERT_TRUE(handler->is_called_);
+-  delete handler;
+-}
+-
+-TEST_F(BasicCurlHttpTests, SendPostRequest)
+-{
+-  received_requests_.clear();
+-  auto session_manager = http_client::HttpClientFactory::Create();
+-  EXPECT_TRUE(session_manager != nullptr);
+-
+-  auto session = session_manager->CreateSession("http://127.0.0.1:19000");
+-  auto request = session->CreateRequest();
+-  request->SetUri("post/");
+-  request->SetMethod(http_client::Method::Post);
+-
+-  const char *b          = "test-data";
+-  http_client::Body body = {b, b + strlen(b)};
+-  request->SetBody(body);
+-  request->AddHeader("Content-Type", "text/plain");
+-  PostEventHandler *handler = new PostEventHandler();
+-  session->SendRequest(*handler);
+-  ASSERT_TRUE(waitForRequests(30, 1));
+-  session->FinishSession();
+-  ASSERT_TRUE(handler->is_called_);
+-
+-  session_manager->CancelAllSessions();
+-  session_manager->FinishAllSessions();
+-
+-  delete handler;
+-}
+-
+ TEST_F(BasicCurlHttpTests, RequestTimeout)
+ {
+   received_requests_.clear();
+@@ -271,17 +227,6 @@ TEST_F(BasicCurlHttpTests, CurlHttpOperations)
+   delete handler;
+ }
+ 
+-TEST_F(BasicCurlHttpTests, SendGetRequestSync)
+-{
+-  received_requests_.clear();
+-  curl::HttpClientSync http_client;
+-
+-  http_client::Headers m1 = {};
+-  auto result             = http_client.Get("http://127.0.0.1:19000/get/", m1);
+-  EXPECT_EQ(result, true);
+-  EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
+-}
+-
+ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
+ {
+   received_requests_.clear();
+@@ -296,18 +241,6 @@ TEST_F(BasicCurlHttpTests, SendGetRequestSyncTimeout)
+               result.GetSessionState() == http_client::SessionState::SendFailed);
+ }
+ 
+-TEST_F(BasicCurlHttpTests, SendPostRequestSync)
+-{
+-  received_requests_.clear();
+-  curl::HttpClientSync http_client;
+-
+-  http_client::Headers m1 = {};
+-  http_client::Body body  = {};
+-  auto result             = http_client.Post("http://127.0.0.1:19000/post/", body, m1);
+-  EXPECT_EQ(result, true);
+-  EXPECT_EQ(result.GetSessionState(), http_client::SessionState::Response);
+-}
+-
+ TEST_F(BasicCurlHttpTests, GetBaseUri)
+ {
+   curl::HttpClient session_manager;
diff --git a/dev-cpp/opentelemetry-cpp/metadata.xml b/dev-cpp/opentelemetry-cpp/metadata.xml
new file mode 100644
index 000000000000..c4293b76629d
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<use>
+		<flag name="jaeger">Include the jaeger exporter</flag>
+		<flag name="prometheus">include the Prometheus Client in the SDK</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..d37e2bfc376f
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The OpenTelemetry C++ Client"
+HOMEPAGE="
+	https://opentelemetry.io/
+	https://github.com/open-telemetry/opentelemetry-cpp
+"
+SRC_URI="https://github.com/open-telemetry/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+jaeger prometheus test"
+
+RDEPEND="
+	net-misc/curl:=
+	dev-libs/thrift:=
+	dev-libs/boost:=
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-cpp/benchmark
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# remove tests the need network
+	"${FILESDIR}/opentelemetry-cpp-1.3.0-tests.patch"
+)
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+		-DBUILD_SHARED_LIBS:BOOL=ON
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DWITH_JAEGER:BOOL=$(usex jaeger)
+		-DWITH_PROMETHEUS:BOOL=$(usex prometheus)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index ad960da0cad2..1fa8d2779686 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,5 @@
 DIST pangomm-2.46.2.tar.xz 674892 BLAKE2B ac86ef1a229dca29eeb41d3751128bed56d182cecfc6655a478b5a7473d10782fe98cdfee4db6f5afbfe9fb8adbf0e646004aa69c4c4058191078c7b5716434b SHA512 79cad137ec9f22e57a177332df6c6e735aa3baf81df36fc706e81e7a89f23ce3179337507388f65a0d0a74733990dc3547c50243a4559dfd0bb065b1828c0474
 DIST pangomm-2.50.0.tar.xz 753592 BLAKE2B 0db7d43fe2d23e4cfc2b083a4d832c7875c63a261c6b10c62898bf428351ea7d8d05136a46f9498cdb78c51a0223ca988cbc3481041b997dc5d6a9f16f02ec91 SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477
 EBUILD pangomm-2.46.2.ebuild 929 BLAKE2B 8e06a4e676dfd9971200c4f08dfa9edc17458b16377190ceb506413248c1596ba11cb1edd993a707411f6d591df8b6148323c2b65f191e65becad5e4bc8228da SHA512 42395588c0a5b79a147ea6b69fbfc4a2a6f64922261fd6302a86ad4dca27c867e3ce9f8aed3575e9a440ba816ff8bd18eb9e2b1868aa933ba9cf1fb8516b540a
-EBUILD pangomm-2.50.0.ebuild 940 BLAKE2B 677008eba5cf3fa3784cf80cde6e7750ed9d929335779db5679563c1119a6b21e5dc803bda209d520067c8c8b385bb54cc400002bbf57df3030cacfabf38d2ec SHA512 56c299bf32e0c6e5a57ce640412af926dec7f6001ed2ef95671ec6184482b430d8d1cb0c5f127b0fe6e7a399346781ba2194578522a7887419c93c40bebc77d2
+EBUILD pangomm-2.50.0.ebuild 947 BLAKE2B 594e529f16452f81bf119be672bb05dfedf599c88e26f0fba49c764f4b4ecc83f9bc84458d6d804a584a092651b983bcfe9616af262ddc9cc2b4d9b76b9a90f4 SHA512 b8940b9c0883c1504238c6cee86b43933cb27376122f3b4fa6eb2415cc5f55834f5707d046076cc41c24a745e3d1a60de08873377510d7694603fb5e6f9547cf
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/pangomm/pangomm-2.50.0.ebuild b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
index 0e562fa01831..759433faaf69 100644
--- a/dev-cpp/pangomm/pangomm-2.50.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.48"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest
index d3961fefdb47..067089e7c267 100644
--- a/dev-cpp/popl/Manifest
+++ b/dev-cpp/popl/Manifest
@@ -1,4 +1,4 @@
 DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
-EBUILD popl-1.2.0.ebuild 589 BLAKE2B ad77b6139e8b0576eb14901e284ac24a3b77d4fed9a5d23ec6018ec8271fbc8358db206f27882eda72fff57b2d706854b40680942cebd7b9e03a0c7f63d50b2a SHA512 290766a94a8723385349252bf8150da44c7c8c17e648ef137addea251191486ac996657ea60e1413815eadb893efaffdfe41a514c2de0d96607f52830134cf6b
+EBUILD popl-1.2.0.ebuild 594 BLAKE2B f8de862b9b830ff891ee1c12d1d0976f8ac32b31fe2a270557d531b3c40d854c678d54377a3bd52aa71dd9f4e0c57a0377bd2eace3faad07ae9604f9ecbdfd54 SHA512 46043453d7eece64fdf1dce54e3d650ec7999ff16c24e3ddbc0e437d78b924d0576199586c0ec2546530723a9788623c4588e54a03de1c93402399738e8616d1
 EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c
 MISC metadata.xml 495 BLAKE2B eed70a06f91e5f2f284f708828dc7bf9313c37916a7fd45c86365a5d0ab5d86f45ccd2ffed49a546564cc0611affe73418387fe35ec62d8c2a8cfdd02b1bd6c8 SHA512 dad065db7693040ff15613a3b33978ba8ce3fc5119e1bc0e7f9bde36a263bbbd6302af634a47c358331811a9d318aef119901825195ffcbc86d9b7d5293e7252
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index 5728b4d18b10..c042e0f356b2 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index 596ecc8633e2..26b4b9ae3255 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,6 +1,6 @@
 DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
 DIST robin-hood-hashing-3.11.5.tar.gz 177134 BLAKE2B b114c1d68ff2eae4cdb526e67def750a11056c2b5c400eab0870fda7c81dde5cf3bb168ea13ed3d34f2e57edffea5c58cb79ffb5328ecf839c723c71f54676d3 SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489
 EBUILD robin-hood-hashing-3.11.2.ebuild 492 BLAKE2B 18958ad16e59d345e69cdd24f4fa2c31a870b90a16241ae252dd9b8973f668b0db46e139ebcaff5be559b524a504267a99b3ea1e202d80c9fc8f99e036b70bd4 SHA512 54c7c9921bb594cfb46c4b5bb7b5233ede6438f0734678f753236faf98e040d3a1a68e4e87c0da2f1ad473d975195f0efefeb34c4d17c24112cc4c67051723bd
-EBUILD robin-hood-hashing-3.11.5-r1.ebuild 606 BLAKE2B 1881149c302b751d85fa43e62889e95b14db2a8259d27662a00c21820fdd6b9bc32241fcfee98c52894f75f30da93f4b18cc7d35be5d99cb2341322b2e466ef0 SHA512 530bd15d8713006f6314e656731749648753e5316d08b86d63b1451510076796e3f3e95c0ede5739dfa76b873e965baeedde3fbc0c61cfca7e1f5197866405c2
-EBUILD robin-hood-hashing-3.11.5.ebuild 607 BLAKE2B b615db6a41521b1491cdaa5e06966a641e9c9191614be51070636cab1ddee03a44b9e2cfb587669c9d2c5b2a24029c2f117c1c41711a9e5ab4b2ba5e86ed8321 SHA512 308fc84a03f4a0403d9f9ddfbf3d1d5ad17b435f772be80a588ea3b9068b2f470ed569a3c88de863514531da59564b37b9464d6d73c283663b3d633224a1a39b
+EBUILD robin-hood-hashing-3.11.5-r1.ebuild 579 BLAKE2B f5313b2573217034005f7f1a2693b79049603428baa6fce954b1d31a78065051ce8c86097cccc5baa0c035f726f600cca390e39fb10d43b95aa6285bf6a82975 SHA512 8e9636c322105249e96370a50e17d6711ebc41a8afd780551c62ae5b80ade5f13aa53ea6ef205b53fccf4385842df27e10b1a1c4c400c8df586b2552285cee03
+EBUILD robin-hood-hashing-3.11.5.ebuild 586 BLAKE2B 64a47f110761d6b0f0a31c45846463bbf4f3650b15a50069372247bb3386e5bad6b52466fe1869d8e32884bfa5895d9d70807071f3a627cbbc49dbf763d45a25 SHA512 6ac86bb1f27fc69dd6ba21c71d451138aac2dfa4543fd46567e4f37bcaf73ddf957d84efe81c4c98df825376eac7dad9b6f9d85b7462fa83b2f09a5f3ea22d02
 MISC metadata.xml 432 BLAKE2B 13444b194ca3577792724af24a8cab24ccb905027261334a26115b099ee36f3cd5b5ecd4d1dc71f03ef33962ab3c068d627c7c85baa8e212007339c27c2a97f1 SHA512 0a915db4e5e7b6ef284e8c798fba99b351c725fc8e18158f4176d0a8211af2215058ad59124780c11cdd3bd9d7a2a2a084131aa92a9921e50aaca76c7c86a154
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
index 152d26b69823..93c98ccdaa8e 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
@@ -15,9 +15,9 @@ LICENSE="MIT"
 SLOT="0"
 
 src_configure() {
-        local mycmakeargs=(
+	local mycmakeargs=(
 		-DRH_STANDALONE_PROJECT=OFF
 		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/share/"
-        )
-        cmake_src_configure
+	)
+	cmake_src_configure
 }
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
index 4fff4a53f17e..6e42350ec553 100644
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
+++ b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
@@ -15,9 +15,9 @@ LICENSE="MIT"
 SLOT="0"
 
 src_configure() {
-        local mycmakeargs=(
+	local mycmakeargs=(
 		-DRH_STANDALONE_PROJECT=OFF
 		-DCMAKE_INSTALL_LIBDIR="${ESYSROOT}/usr/share/"
-        )
-        cmake_src_configure
+	)
+	cmake_src_configure
 }
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index 218decd5d4af..eabbe4007414 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -4,6 +4,6 @@ DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f
 DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
 DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
 DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
-EBUILD sdbus-c++-0.9.0-r2.ebuild 3411 BLAKE2B 8e7b14f2ec70e2ee909da1226f76da1bd7971929445179d297b526bc2f832e57494b2cbc956035f42297f3c6170846734f70667f8ef30c93d9816d360ee71037 SHA512 a0065880261759f12d64da291312cffe88d10f90152142f9e96d36b8e29d4c2ee0960a097ee57966f6e8917cbb6833e595a73ce193835f90b7ba477d5b5439b7
-EBUILD sdbus-c++-1.1.0-r2.ebuild 3462 BLAKE2B d2a76de3dffeeeabf285ae3ec97cc09381816d0ab43c3f19be3066125054cbf832fbbcbe3760132ff72666cb4808bc6a6c85f09d2b48a32bd114ce5e3bae007a SHA512 ebb1b7b65fc17f3d09923814392367a5d9348365ced15a51e1511ba8e8227b46b78df511dfdd339e09bc0c5b471722f82db99d570b442cc3bd0276c9855c1efe
+EBUILD sdbus-c++-0.9.0-r2.ebuild 3469 BLAKE2B 1abd4ff6a344b55e79510e5506df4b01232c64fdecb265f5b7afdcd767294df666eabd62ea6bce87b4d33c594d8b92ce0ea8581ffdd258fc471576f2818f089c SHA512 d537ed59a00e831288492a5d4c8e4e457cfc777d7f8962cfa2cd16ddfc9f71e7f95edd47753cff78aada05784d0805b96063144273d443091ea63aa8218883be
+EBUILD sdbus-c++-1.1.0-r2.ebuild 3520 BLAKE2B 5adfd61f3debf7679caf87cfaa7166acd268a6524570e8e1ea682b4c3dddc99f017511f75eb25f15c82c59949d0da34db8543f566bdbfef4ee886740886bd47a SHA512 3a67d68f49109a85fffdf978867252b7cd5229a4e37fa0143fc35113e11b041f5cb0cf9528dc7c6d0e0f11459d24859ab10c83f89cc6e7425048042e262ac275
 MISC metadata.xml 418 BLAKE2B d05d643aa8ee2b37ffb36fd99116e85e714e0e64ef830cbee4f24e2e09315a24c439e0fcc8f0b4c5516860e4dd13730682c3d50a1f65dd1c2954628793791ee9 SHA512 b75a5467a9b29405732dbac6c9e18567f7b37319a4fbffc2b65098ea2d1c3fdcc903834080e6751ef41737290352fd7ab2d0d68296675fb19f5520b81625fcbf
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
index 0dcc953b32f4..c5d7db3dcb17 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
@@ -81,7 +81,10 @@ src_configure() {
 			--includedir "${SDP}/src" \
 			-Drootlibdir="${SDB}" \
 			-Dselinux=false \
-			-Dstatic-libsystemd=pic
+			-Dstatic-libsystemd=pic \
+			-Dgshadow=false \
+			-Dsmack=false \
+			-Dutmp=false
 
 		# systemd doesn't generate the needed pkg-config file during configure.
 		BUILD_DIR=${SDB} \
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
index acaaad6ab19a..17152a67a98c 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
@@ -85,7 +85,10 @@ src_configure() {
 			--includedir "${SDP}/src" \
 			-Drootlibdir="${SDB}" \
 			-Dselinux=false \
-			-Dstatic-libsystemd=pic
+			-Dstatic-libsystemd=pic \
+			-Dgshadow=false \
+			-Dsmack=false \
+			-Dutmp=false
 
 		# systemd doesn't generate the needed pkg-config file during configure.
 		BUILD_DIR=${SDB} \
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 1e72e17fbd67..b5058f84379a 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,13 +1,15 @@
 AUX tbb-2020.1-makefile-debug.patch 2640 BLAKE2B 98e1d88f279452898be78fb53235427a5c45a0056429e07acd5bc273a48c7214dc8df29c72cba344688f650fce25bba06f6f9e4dfbf1091260544e95159cf33d SHA512 9a29ff67321b75efe10621bfe924e89a5c51d4e7327e20aa69018aaea590189ed297b9ab94bd3b48172d0b093e3d2aaebfc7088b480364f6f6c7802a27d3c1e4
 AUX tbb-2021.4.0-lto.patch 9710 BLAKE2B 801b7886af6ec02f118add4607c22b26cfafb14997162d5d4e72ec3b48d6ab5ea03995c6a02957331b65172b2d18d932b59bf655352dcbbc178aa508613681f1 SHA512 d65c84a3246dcf5a7c799fd87566834842adfd104bca2c0b0cbd9e2dcae0b900a189154ca9d9c95351c32ff9014cee15f0eb924228e486b58fdcfc624b12d46b
 AUX tbb-2021.4.0-missing-TBB_machine_fetchadd4.patch 645 BLAKE2B 8a769caed4817413f8e8d11ae3264a75769826989e3815cf24fa856d601ded1ffbd7edd772aa268ca0f8afa15f9fab8bf1deb019635f2355377367814c62d5ce SHA512 d84bed45b82cd63c8afb1f22e2688a7e298014997fa3d1107d7a91b1d4a0f7a54a42cfa38841a051c6a0ca6721182584472f34362c97edba02e3131c77230545
+AUX tbb-2021.5.0-flags-stripping.patch 1078 BLAKE2B 32b5463980ae8841ce551caffb91d5bb20a70af4d93d6c0d9e45bd235f3948599c42fa779eb4c53a6994275d827c0074dab8cb2e66313989a1ffe067e48b12c3 SHA512 22460e212ea506bfd13765eb9557d21cb19d4fd9f42e195ed36f12aabd6e9b4c24a218a5bcb55894f45ce0f118de89287751913d386931bd9cda3a389bc04345
 AUX tbb-2021.5.0-musl-deepbind.patch 982 BLAKE2B a605db66a697ce4cf826448ea843529464b224882708c26623acdaa573a07ca157d562c0e03e12dc8480871f3327daca144a0bc238a5a15421b17966c429c9fd SHA512 6a6deca9d6ac037704e75abaf1544627c369057636214fa0a9c573fc190900226fab3760d8b5afe3ac7ac456bdaa105f0912173d054fe2eaa6dcdbadcb9822d1
 AUX tbb-2021.5.0-musl-mallinfo.patch 931 BLAKE2B 7e77b6bed7d0a8422e45499317fd02ea080e94575e96c0610e1503633a296855095b675be1b679d4b97c8e50e72736d71582c30a91d7630c02b0c98996d2abb2 SHA512 21555821262a29b904ff3c0c8a023459c5c2ae0df11d17e0e2ec36d680016a0a2c4808ad257e1a3fabd78046e5ac795f5906aed129c35e40c257251957722723
 AUX tbb-2021.5.0-musl-setcontext.patch 1409 BLAKE2B b7dbb2379cdf8c27fe704850e9ef9d9630719c3031d7f5591e973648c5e299f90b25684aab7af95a56038dde3e490e6711f5a443e016404129d92de549f9c55e SHA512 558c917326408818cd0c1d8169fd958533dab9470e2a04621ff396de61c8a371a68c9f4a2d9f1e91ed79bd57605be3208e4e473e80cb3f38db526a673ff3468d
+AUX tbb-2021.5.0-x86-mwaitpkg.patch 1975 BLAKE2B d072f7dfa7f1fbe5986c409147419d782abd1c21e602a8555a696833c7c919f2e6996f8a2fd1e61fb6d3ccdf00f0ce5ee9b78ad53770a06f632cb6029bb74029 SHA512 de952018c2b82634f02f38754d0cb92d31229b9546a135ac54d43b53ad2d0a74ba3bd02946e856c29455438e539a0cf5bc3fb4eae35aa0774baa1faf723e8b61
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
 EBUILD tbb-2020.3.ebuild 3328 BLAKE2B 49da765405909bdf94c7e315ae00b4503113db99ea1c13e411a5349bd52b816b36654e06a2cb7c8d10b66caced270f8a7bc2d9c569296ecf4f99a91accf2301e SHA512 19edba39e17bf21471309fb769a3ffb0af06b6cbf61f3523767b8980ea2655cca96edd6191ace397610d9e2460a2e684361077e57b82393500950255dd0a7c8a
 EBUILD tbb-2021.4.0.ebuild 1003 BLAKE2B 60f60e47a512ee0a715cabc1f7bf876aa8f4be338cf3563ccc5aeb6b4f8c83dc6671e1fe168a96c2e856c95912fd5766021040ce593b5d656e95136f7afff5e2 SHA512 27a5925c68d5f369753c72e4cd8bb472cdc9e21758e7b3e1d144afb374f12d92964b1721d39c885c6da9500aed0aecee17914ffc87a675721e7b6a5d41c43a60
-EBUILD tbb-2021.5.0-r1.ebuild 1275 BLAKE2B 72e0c6204e656d5ac9028e2ce9cd85977186ca4cf091e625219b7112088acaafad716489caf289cbcd6c41a4de52a8866e8a8e060dcefa33194e3d0c4c4d8087 SHA512 38cec889d464d496890acb94dfe8fea0052a865fd42dca5e40fcd3b4699236b58f6427de267c38b6cc89fda558d4b47fbf103193c5bfd19453935df7e205fe12
+EBUILD tbb-2021.5.0-r1.ebuild 1401 BLAKE2B 8ea211e11e41bed9902e9801d7a707d9d33687ba8cbd4a501c039550a771a456db9c5b65ce363380bdb404cfdb69786e0c9df3e1a89bd483b7f6c5e717139de3 SHA512 e8729d979a480ebbe6fccb7086aef1492649637c78600c984104f491dc98e77ffe3dc1b481d0da7d8d1f64aa2ea77889f14c2a3e704648d3cdb731d97a082aea
 MISC metadata.xml 688 BLAKE2B 5bd4c0fa3ce3f055bd8265a2133ad2b4ea6de984ccf295544f3013851b02a1f1d577070c2ecc1e2748fa8356d3d25278e9a8649a2523763eba6bc7e6ba830f79 SHA512 93b90fc74511f35e02dd7f7c7b3aeb08d2e4c88e2af852fcce40bdb780a3828975955b751542b8a9d3aa0561155858b91842f3cf98c713dcb08c9ce2152f0fe3
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
new file mode 100644
index 000000000000..4252ea446423
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-flags-stripping.patch
@@ -0,0 +1,27 @@
+https://github.com/oneapi-src/oneTBB/pull/716
+
+From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001
+From: Christoph Erhardt <github@sicherha.de>
+Date: Wed, 5 Jan 2022 15:13:32 +0100
+Subject: [PATCH] Fix overeager stripping of compile flag
+
+The existing regex strips all occurrences of the given string from
+`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a
+flag. For instance, `-Werror=format-security` gets truncated to
+`=format-security`.
+
+The new regex makes sure that only whole words get replaced.
+
+Signed-off-by: Christoph Erhardt <github@sicherha.de>
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag)
+     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_OPTIONS ${_tbb_compile_options})
+     unset(_tbb_compile_options)
+     if (CMAKE_CXX_FLAGS)
+-        string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++        string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+     endif()
+ endmacro()
+ 
+
diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
new file mode 100644
index 000000000000..83f119a9acd3
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.5.0-x86-mwaitpkg.patch
@@ -0,0 +1,43 @@
+https://github.com/oneapi-src/oneTBB/pull/609
+https://github.com/oneapi-src/oneTBB/issues/370
+https://bugs.gentoo.org/842762
+
+From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001
+From: Ilya Isaev <ilya.isaev@intel.com>
+Date: Fri, 8 Oct 2021 10:18:16 +0300
+Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option
+
+Signed-off-by: Ilya Isaev <ilya.isaev@intel.com>
+--- a/cmake/compilers/Clang.cmake
++++ b/cmake/compilers/Clang.cmake
+@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
+ endif()
+ 
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
+ endif()
+ 
+--- a/cmake/compilers/GNU.cmake
++++ b/cmake/compilers/GNU.cmake
+@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
+ endif()
+ 
+ # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
+-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+     set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
+ endif()
+ 
+--- a/cmake/compilers/MSVC.cmake
++++ b/cmake/compilers/MSVC.cmake
+@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
+ endif()
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
+-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
++    if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
+         set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
+     endif()
+     set(TBB_OPENMP_NO_LINK_FLAG TRUE)
diff --git a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
index aa3f0e7c26e2..4235949bb77b 100644
--- a/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.5.0-r1.ebuild
@@ -32,6 +32,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
 	# musl again, should be in.. 2022?
 	"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
+	# should be in.. 2022?
+	"${FILESDIR}"/${PN}-2021.5.0-x86-mwaitpkg.patch
+
+	"${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
 )
 
 src_configure() {
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 031e997325a5..b65ae0401ef8 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,5 +1,3 @@
-DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
 DIST tclap-1.2.5.tar.gz 4140723 BLAKE2B e3b48dc602ddd64887ca7764008e2ac406866fd7c17bd5b6f31e248b43f18ed6b1c8415fc29a505b3035befcb9716b3259680c7e53a51ad9df107e1cbad92eea SHA512 3b5b3d76e8ff21133001f5f9589fa6ec143729909bf0b9cc9934377bce178360c161fb5c1f4c4d9e9c74b09cff3d65f1d5100e61d4a732283524a78b6f236b10
-EBUILD tclap-1.2.2.ebuild 610 BLAKE2B fd4849d00f2452cc5240171e5b3b7bf3fb3024f5eba499c8d3a9bd1aaed9eb63062cd443208416271d80e4b58c8bc7a16d6233bfbff6faddaa6478f993a7c7ac SHA512 58fa66874b16d6be1bfa8059042b8c61017e4baf54def88599e3fb49968d399fbb59bb71ccaabf08c3af07e7f31ffc7cc069f49420061415781eeb1f3d362deb
 EBUILD tclap-1.2.5.ebuild 609 BLAKE2B c597716ae8344d8f0291dbf81503b6e2b158c9413567eadf43c906454822d9bccfc64534b68d0c0259da99a0a9fe93d9ca8fd974e118acb2ae36efe0ef470a32 SHA512 10832c1ac77dace290a0328563b68be990474537a1fe59b1b919f8165dbc1b26c60310c72182165c9cba59ab37b6de0ea37d82a006763a98be0702bc7a4b066e
 MISC metadata.xml 243 BLAKE2B 5e16a9fdda387cc657f2bf36698c5dea7ae7b7219933e48e90a2a3d786710ea96fac0f842767dd766f50db0d4b0c216456259c1e72d638355ad9d09fcb021434 SHA512 46879cd7fdf95e39dc5fc0e8f6a9d811bba3092fbced1cb3f3c6da50462303c6014c42d4f998b77c9335b38f7135ed66cbf0b75ff651f0d11406c89e28424129
diff --git a/dev-cpp/tclap/tclap-1.2.2.ebuild b/dev-cpp/tclap/tclap-1.2.2.ebuild
deleted file mode 100644
index 60b7212faf46..000000000000
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2007-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Simple templatized C++ library for parsing command line arguments"
-HOMEPAGE="http://tclap.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf $(use_enable doc doxygen)
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 558e42c8d086..58148d09b236 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1,8 +1,10 @@
 DIST waylandpp-0.2.10.tar.gz 187273 BLAKE2B bc6dd4503665d7fd04ac78e6db26aefe1ce1974bfa33ed751fe3714a3838af90340cef77c53cef95d519c423c639d93c2e15e1fc602301b254d56ca029e021be SHA512 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99
 DIST waylandpp-0.2.8.tar.gz 181950 BLAKE2B 186515308d2e17e39e61f953fcf43df6bcff45a965d6425ffb71f0314fc091d241a975d0e7a61e988091ae7491cab56e163b6bccc0a2584b79b5bd5a7f8573fd SHA512 bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
 DIST waylandpp-0.2.9.tar.gz 187141 BLAKE2B 0bf1bf62ccc792444d21941f15b675c9584822485c9869b66c40bcddbaac5716dcc25bf98e6110fc549f5f10c1197c9e5188c72b10cb878ba8e133a0e55b2db8 SHA512 abe683c236f3b082fb1bd64ce9cc93e4362040f41b31a42971a280fadc8a7ef06a47c6a02cb5201a3f4f864ccdc8a113a8d9a855ca99b42bf1fc322e2593648f
+DIST waylandpp-1.0.0.tar.gz 203510 BLAKE2B 939262f61051fb242e779fa4817b262af2de6acef50b53a55e8565e6305e84fbf297adad02d27342a39e2a1be920443cc6dd50711e2c584b3322fa1e90a7051c SHA512 64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039
 EBUILD waylandpp-0.2.10.ebuild 772 BLAKE2B b51d2c384a30ed30120215fcc1980fdf22e32e78f5f12c701d95b8469fa88ae00922193ad9f7b987eb682d1a742379e3d38efe95ca0ec7e7ef47b77649a062ed SHA512 50a7bc3d744b1efdec9e5539d44f2a992b7d549595d3e2a5c30af98ef968ce529b26fcb41e5962abd91264a8b59455503c7bec01cb6a11380a5d081ae4b9f4e4
 EBUILD waylandpp-0.2.8.ebuild 769 BLAKE2B 03b184b095d853fe38dec739137cb57662cbb8ad25eb3bb83212508428fbb8eb5faa26450d85294120b95f95616b5de1b3ebdd9efc101fef76428860966c79d7 SHA512 80e782e136bf63b4dfa8df2a391deeb0ea58ccd2edfb8fe687e85b452ec7915bfc5e45f8e679353157a23b9cdca0d4c7fbfc2c4c1c07a8ec8c4173027b47ec37
 EBUILD waylandpp-0.2.9.ebuild 772 BLAKE2B 512c1627e7c6234d179ffb30b10200f38c64ff4b27f6834558654f5490cf8352ed294f0261e1d02ab4792d7df20ab80ead88a7b2029852f7707db21b8c2bd361 SHA512 43077068b57a54a18221e6f6e8c986b834b62681340141ec36c6e17985eaa80f391e9ad761e2f4ba48928cb75ac744b9107dcefdaf115852c0302fcb7a1d6e3e
+EBUILD waylandpp-1.0.0.ebuild 772 BLAKE2B b51d2c384a30ed30120215fcc1980fdf22e32e78f5f12c701d95b8469fa88ae00922193ad9f7b987eb682d1a742379e3d38efe95ca0ec7e7ef47b77649a062ed SHA512 50a7bc3d744b1efdec9e5539d44f2a992b7d549595d3e2a5c30af98ef968ce529b26fcb41e5962abd91264a8b59455503c7bec01cb6a11380a5d081ae4b9f4e4
 EBUILD waylandpp-9999.ebuild 772 BLAKE2B b51d2c384a30ed30120215fcc1980fdf22e32e78f5f12c701d95b8469fa88ae00922193ad9f7b987eb682d1a742379e3d38efe95ca0ec7e7ef47b77649a062ed SHA512 50a7bc3d744b1efdec9e5539d44f2a992b7d549595d3e2a5c30af98ef968ce529b26fcb41e5962abd91264a8b59455503c7bec01cb6a11380a5d081ae4b9f4e4
 MISC metadata.xml 402 BLAKE2B bcf8f38c837191d5b398b7679d82bca3039b7b407db3b89d2e0bdc7f15ee809484e12c6a2f60688e63bf8038954d01f1bbc30a8584d250918e28883d3673ec9f SHA512 53a66bb7c703917687d2acb7b95ac10f092669b46e9ecf5861e50141e89a4994eaeab6c6d4b6f7e4c0cd700555be5ef1b6137fd5a610530cf5d678bbc1bd346c
diff --git a/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
new file mode 100644
index 000000000000..ed2592fab36d
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(ver_cut 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-libs/wayland-1.11.0
+	media-libs/mesa[wayland]
+	>=dev-libs/pugixml-1.9-r1
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/websocketpp/Manifest b/dev-cpp/websocketpp/Manifest
index 3aab1fbdb793..5344cabed370 100644
--- a/dev-cpp/websocketpp/Manifest
+++ b/dev-cpp/websocketpp/Manifest
@@ -1,10 +1,7 @@
 AUX websocketpp-0.7.0-cmake-install.patch 970 BLAKE2B 2099c37b65d3f685f8b9745d92b481bb6a0434e6305e974c6f613ae44e70e1fa9d7bd577f875ef12228e506361409666099ce024578c5c524cc8fc5fbdef4b70 SHA512 c8b34b80890d8dc828d64e391e9541f7ebd6a18c79d3a5b91c72835745a11bafff110d04e8d75a2df2dba8b65ca1856050009a4eab3871cc2470066f9ad82f44
-AUX websocketpp-0.8.1-boost-1.70.patch 5976 BLAKE2B f3bccde47637c8938b1a0acf95d855692256434be130fafc34311bbbb337c655022b77a301f4524029dc2841e2a47d9975f7fbed3ed004b9bd1ba65d87c6bf30 SHA512 34df3fc78415e0fac8d73a2afb2faa2e1e2bfd6e2ae6458e48a89354dfaeb7f3a8d95c5e5e0ffa2f8d096508e5a9636184b403def95501d027f2c68f5e096052
 AUX websocketpp-0.8.1-disable-test_transport-test_transport_asio_timers.patch 1227 BLAKE2B 26ac496842e4e23d254ba908679399ff8907253434430c887290cbd3b3beb14aaf69834cfc0b8f326f13c0f63ec7da535f0c8b438d20d7c1d2d4b5d5d2afb5cc SHA512 1ef7f2b71dcbeb386cd27bbf97f599f0c056b014423090ceb28e336c0f1527c6f8d6b04931144823c1d1deb14781508a0a6e869f69a9a232978851634f35fa0c
 AUX websocketpp-0.8.2-fix-boost_find_component.patch 950 BLAKE2B 16e80dcdf6a0af95fb7ac8b1c52fd9205379da13787dbd3d023a79a2c6e611ca093f49acc4618d7db0c2397126e4e6ec2cb1633116be658347f2403faee16d7f SHA512 192fd716040e91a6912407778a1c7a208a29ceaaa48aacb0fefddcd622d2ecde68093aff837b0cf4c3d8dc40cd9a5f4714040aa2264a1f8a01190b174a2a12b1
 AUX websocketpp-0.8.2-fix-clang.patch 1042 BLAKE2B 8d453efb82fea72a0a4b2ed5ab7ec44975ee963cbb99cf0c69bcd3ef2eb4482334981c711e9f0780c1f59353b74cf8543528d9889d2cac51ad746a59eae28ab1 SHA512 7c7fdbe70627cd39a4936fb0118a3d347753a1c6150c8801544b753ba4b5cd8c653043035fa164e31f2a41d09662d4abb4429140c14e42e2a195094e06574766
-DIST websocketpp-0.8.1.tar.gz 699468 BLAKE2B e5769229b400d2f42e69541b07cfba17dcc82cdad20685a52ac1130c2fc4e94764a38d2e4f7c36101b11705e10c67eb149ba2c30750e7a6f63696d52c272fed2 SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c
 DIST websocketpp-0.8.2.tar.gz 701364 BLAKE2B dacee33832f493d465afe208f9edea1393414a22c8db8f8c86b8f913521d0d8d68b95673a2e82b7479acfbab1ac541eda2d713a55d5de387b3879461d5884df7 SHA512 b2afc63edb69ce81a3a6c06b3d857b3e8820f0e22300ac32bb20ab30ff07bd58bd5ada3e526ed8ab52de934e0e3a26cad2118b0e68ecf3e5e9e8d7101348fd06
-EBUILD websocketpp-0.8.1-r1.ebuild 1327 BLAKE2B f7bd8864f76bbb9a8f10520d64a64283a74bf6390d95a0240f5a2d075b9d476a49e7a54835bf6311bba15131f73800c4a03b5cbd4b1a7863d0e6dc35b68657f8 SHA512 dcc5ce6f4f13be6d6b880daabe9d9830ba33096afdf5dc6fb576e32394ac5a5f8f90cb79dc121faea8792926fd02554a278ce156e337e10f91d07b1562e81802
 EBUILD websocketpp-0.8.2.ebuild 1276 BLAKE2B f4f85a38bbb97ec17fe946332ad990208542e8bd9f4e2a3dbad052fd9a397f9b7b6f49f664fce33890898f26bb045c975f2d92f6377472c109c798242a05231f SHA512 fdacdf448f1055403013b42242294667c51a2a4c1c3ffc02af8e781a1f618f95364dbd8c0c230a37e507b7538bf794b652397c2f86f4a5afae2bbf76ec078209
 MISC metadata.xml 252 BLAKE2B 4beafc2dbc69f457e4880196afd696198e1d4006e76836d7581c4a3098bf68d58da79344c88974c92a63303dbd0199d5de0bfd984adbc358ad92da2a9edd96a4 SHA512 20cc70561adba76fc4ac65953dc2a2dfc4b8261d6a56bed78d00b7aa8e0edd507bc851bf7c1dba138b55175dd1d1bb8b4f853fe96242046dc7611ab10cfb0a5b
diff --git a/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch b/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch
deleted file mode 100644
index 40ae155307d2..000000000000
--- a/dev-cpp/websocketpp/files/websocketpp-0.8.1-boost-1.70.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From c769c9238ad62178f506038178714a1c35aa2769 Mon Sep 17 00:00:00 2001
-From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
-Date: Tue, 16 Apr 2019 08:38:01 +0200
-Subject: [PATCH 1/2] Replace make_shared with new in some cases
-
-Replace make_shared for asio types that take a lib::ref as a parameter.
-This should fix the ASIO change (boostorg/asio@59066d8) for 1.70,
-while keeping it backwards compatible to older boost versions.
----
- websocketpp/transport/asio/connection.hpp    | 7 ++++---
- websocketpp/transport/asio/endpoint.hpp      | 3 +--
- websocketpp/transport/asio/security/none.hpp | 3 +--
- websocketpp/transport/asio/security/tls.hpp  | 3 +--
- 4 files changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
-index 60f88a79..1ccda8f3 100644
---- a/websocketpp/transport/asio/connection.hpp
-+++ b/websocketpp/transport/asio/connection.hpp
-@@ -311,9 +311,10 @@ class connection : public config::socket_type::socket_con_type {
-      * needed.
-      */
-     timer_ptr set_timer(long duration, timer_handler callback) {
--        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
--            lib::ref(*m_io_service),
--            lib::asio::milliseconds(duration)
-+        timer_ptr new_timer(
-+            new lib::asio::steady_timer(
-+                *m_io_service,
-+                lib::asio::milliseconds(duration))
-         );
- 
-         if (config::enable_multithreading) {
-diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
-index ddab2c74..4b719a97 100644
---- a/websocketpp/transport/asio/endpoint.hpp
-+++ b/websocketpp/transport/asio/endpoint.hpp
-@@ -195,8 +195,7 @@ class endpoint : public config::socket_type {
- 
-         m_io_service = ptr;
-         m_external_io_service = true;
--        m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
--            lib::ref(*m_io_service));
-+        m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service));
- 
-         m_state = READY;
-         ec = lib::error_code();
-diff --git a/websocketpp/transport/asio/security/none.hpp b/websocketpp/transport/asio/security/none.hpp
-index 5c8293db..6c7d3524 100644
---- a/websocketpp/transport/asio/security/none.hpp
-+++ b/websocketpp/transport/asio/security/none.hpp
-@@ -168,8 +168,7 @@ class connection : public lib::enable_shared_from_this<connection> {
-             return socket::make_error_code(socket::error::invalid_state);
-         }
- 
--        m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
--            lib::ref(*service));
-+        m_socket.reset(new lib::asio::ip::tcp::socket(*service));
- 
-         if (m_socket_init_handler) {
-             m_socket_init_handler(m_hdl, *m_socket);
-diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
-index c76fd9aa..04ac3790 100644
---- a/websocketpp/transport/asio/security/tls.hpp
-+++ b/websocketpp/transport/asio/security/tls.hpp
-@@ -193,8 +193,7 @@ class connection : public lib::enable_shared_from_this<connection> {
-         if (!m_context) {
-             return socket::make_error_code(socket::error::invalid_tls_context);
-         }
--        m_socket = lib::make_shared<socket_type>(
--            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
-+        m_socket.reset(new socket_type(*service, *m_context));
- 
-         if (m_socket_init_handler) {
-             m_socket_init_handler(m_hdl, get_socket());
-
-From f810ca2e800e9b55be41c5911cf1d1185fcd516b Mon Sep 17 00:00:00 2001
-From: Stefan Floeren <42731906+stefan-floeren@users.noreply.github.com>
-Date: Wed, 17 Apr 2019 10:06:18 +0000
-Subject: [PATCH 2/2] Fix missed entries; fix testing
-
----
- CMakeLists.txt                            | 2 +-
- websocketpp/transport/asio/connection.hpp | 3 +--
- websocketpp/transport/asio/endpoint.hpp   | 7 ++-----
- 3 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2786aba9..951de975 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
- 	endif ()
- 
-     if (NOT Boost_USE_STATIC_LIBS)
--        add_definitions (/DBOOST_TEST_DYN_LINK)
-+        add_definitions (-DBOOST_TEST_DYN_LINK)
-     endif ()
- 
-     set (Boost_FIND_REQUIRED TRUE)
-diff --git a/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp
-index 1ccda8f3..57dda74a 100644
---- a/websocketpp/transport/asio/connection.hpp
-+++ b/websocketpp/transport/asio/connection.hpp
-@@ -462,8 +462,7 @@ class connection : public config::socket_type::socket_con_type {
-         m_io_service = io_service;
- 
-         if (config::enable_multithreading) {
--            m_strand = lib::make_shared<lib::asio::io_service::strand>(
--                lib::ref(*io_service));
-+            m_strand.reset(new lib::asio::io_service::strand(*io_service));
-         }
- 
-         lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
-diff --git a/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp
-index 4b719a97..94509adb 100644
---- a/websocketpp/transport/asio/endpoint.hpp
-+++ b/websocketpp/transport/asio/endpoint.hpp
-@@ -687,9 +687,7 @@ class endpoint : public config::socket_type {
-      * @since 0.3.0
-      */
-     void start_perpetual() {
--        m_work = lib::make_shared<lib::asio::io_service::work>(
--            lib::ref(*m_io_service)
--        );
-+        m_work.reset(new lib::asio::io_service::work(*m_io_service));
-     }
- 
-     /// Clears the endpoint's perpetual flag, allowing it to exit when empty
-@@ -853,8 +851,7 @@ class endpoint : public config::socket_type {
- 
-         // Create a resolver
-         if (!m_resolver) {
--            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
--                lib::ref(*m_io_service));
-+            m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service));
-         }
- 
-         tcon->set_uri(u);
diff --git a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild b/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
deleted file mode 100644
index d7b8d0935b9a..000000000000
--- a/dev-cpp/websocketpp/websocketpp-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++/Boost Asio based websocket client/server library"
-HOMEPAGE="https://www.zaphoyd.com/websocketpp"
-SRC_URI="https://github.com/zaphoyd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-RDEPEND="dev-libs/boost"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-cmake-install.patch
-	"${FILESDIR}"/${PN}-0.8.1-boost-1.70.patch
-	# disable tests that are timing sensitive
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1461069
-	"${FILESDIR}"/${PN}-0.8.1-disable-test_transport-test_transport_asio_timers.patch
-	# https://github.com/zaphoyd/websocketpp/commit/36b73da8958927f975b3d01a062aa6c0e149d97f
-	"${FILESDIR}"/${PN}-0.8.2-fix-boost_find_component.patch
-	# https://github.com/zaphoyd/websocketpp/commit/2c355d9ef0f3ed73fa96d0c6c31293086df36d74
-	"${FILESDIR}"/${PN}-0.8.2-fix-clang.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CPP11=ON
-		-DBUILD_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /dev-cpp
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)