gentoo auto-resync : 24:11:2024 - 03:02:54

26 files changed, 113 insertions, 34 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1be943385b4b..48a98b702e78 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/clhpp/Manifest b/dev-cpp/clhpp/Manifest
index 12d5d13cd53f..4e619aa80e24 100644
--- a/dev-cpp/clhpp/Manifest
+++ b/dev-cpp/clhpp/Manifest
@@ -1,5 +1,5 @@
 DIST clhpp-2023.12.14.tar.gz 123233 BLAKE2B 2b23639ad162921e01033fbacc1c4e57d9c28ce39c55b3564f162e5d6b6d9ed0e80aaefbd62de81157e165f01897e82d0ff4943c8ee620587840f4aece22319b SHA512 a90152d2f9c57d4724ef3ea33e1311914e49659042e916e467a9f16877d348ed62f909fe8423589976669b25241a3b996fbd7ac235a44e35947d1b87d3e3ef2b
 DIST clhpp-2024.05.08.tar.gz 124818 BLAKE2B 57b22e1911d8e21b4f7bef1f39f9910dd80eb50844dc7c18b3c75e311991a37577a0671d9e1b10ff3fb3302568118e3fb69987beec6fbe8fc8da85fcd7addda0 SHA512 6396cd67a2edef6a76695857e3e45f7eeb8cdaa8c729197357c6374ac58b41caa37bbe8c3b7a1724d43d3805f8cd5edd53a8ed833d6415bf072745800b744572
 EBUILD clhpp-2023.12.14.ebuild 910 BLAKE2B 00134c45206af93acf6d39c63d6a583fd54128ae05d1f827751096f5dd9d1be7fd78f9bf2a8df353550159b98534a2d1c2b877720ce6885742caddd870619b67 SHA512 cb9ff07d57997b49df098a8dc5e69b529580602c8fcd84a54b3c78c3c2809c46444f2f126957ee836d2c51170b17911ef3d47e2c8af2a4de26474dd497ef29d5
-EBUILD clhpp-2024.05.08.ebuild 913 BLAKE2B 486c927d32d16855c1d3fd214785c2f82d3a04f793779ebbb77705afb25a8a79d66feab4316d9c979341df15c15eb0de5675e090ead4c22b7f0aa27044e78d9d SHA512 5aadbc0ee2d2a4173854a04e9bcceca110f2597f267fc5c2f2b21ffbf12b80c78e2bbdf4fe8f31211ab25f3d0f2cfa7081b497ff89cf06ae8bc6b59b68064bdb
+EBUILD clhpp-2024.05.08.ebuild 911 BLAKE2B 14bb4369344846d75bf1cc6eaac0695445b1a3237b3b48860ae761d8a044ee7552cbf5b9ca62b21bf1c984e7acf0f42758c9d02eb2c7d5f78b7e238b1ddb33a2 SHA512 90829f82c31de0cb122ead06e6888ff995532cfa4768425982e3ec15ce44bb00ffeecd772ca0be937845bf6ca7c1e7463dab4e5953c1ef41aa5c7d6f75442d91
 MISC metadata.xml 263 BLAKE2B 1eea312a01e0cddbbb0889500bb51edeb1b8b76a65c72d2b3e285d35ef0a005b3fb28fef3b368e43fcfc1f0c0b633124598def0b188fa778842948008080dee8 SHA512 0d84fc5f0697ffb0274c721c6e681e3bd472b51f45e72f6baa7e2189f8fb655fabe83380f3a3e758ec183daf4c20423915989f7e2f72831d366ac19f70e6ee59
diff --git a/dev-cpp/clhpp/clhpp-2024.05.08.ebuild b/dev-cpp/clhpp/clhpp-2024.05.08.ebuild
index cfd7e4b5e780..e4d18674dac5 100644
--- a/dev-cpp/clhpp/clhpp-2024.05.08.ebuild
+++ b/dev-cpp/clhpp/clhpp-2024.05.08.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Tests require CMock (NOT cmocka), which is currently not in Gentoo
 # and has been found to be extremely awkward to package.
diff --git a/dev-cpp/cpptoml/Manifest b/dev-cpp/cpptoml/Manifest
index cda5a5f3201a..29a872d825fe 100644
--- a/dev-cpp/cpptoml/Manifest
+++ b/dev-cpp/cpptoml/Manifest
@@ -1,4 +1,5 @@
 AUX cpptoml-0.1.1-limits.patch 398 BLAKE2B 3f32f6eb64b315801e48a9c4af7d64f6d29f6ed9e08e6eec8027af1362f194406df3bfa5e366af7729e39f9e6dabc194487ece8be0773b93ccd42c2a33e04ab2 SHA512 5069644bf32d6f617de522c6db58c1855feb9554fa4b87d44b52f392766c9e6059bf1060fdb77f4474e345de00e78c2d5b20e939eab559d6b5d780fb31dd9aed
+AUX cpptoml-0.1.1-remove-libcxx-config.patch 1042 BLAKE2B d67e924cd53bcc65323675d8e77c94c71401ed8c623e0ca3f73254c5a532b520fe203a001da6116a49bcb572100c181445667d76c00878200f1a275ce75a04af SHA512 8356a685b3bca874984533b14262b17ebfc189e08a0f8c7e74bbe9b46ff6ebd8d3eedfd0a998ec5dd22eada59acf1673bcec22b9490d23863995e0bbb9b5569a
 DIST cpptoml-0.1.1.tar.gz 47398 BLAKE2B c0ce036bec4731c4dfe96d01076b9ca18a1c4108180d5dbc839dfc44b37eb0c7af85f685a6356ef92fa684219e2883dd341e64a2012505dacc3df73dfb9e28ca SHA512 14edce576514d53a7e13562d7f8d2b66ea2b95f44038396c0e26232ec81783042ebecec31ee272a99afef96d5c8582a8e81ea5167a787844b98de6ee6f545cc5
-EBUILD cpptoml-0.1.1.ebuild 628 BLAKE2B 0d14998fd91d722bd38a65e9188c73719995b96825de6ea5ae8469fd10b55161eb53400f2a4ba47f169b7ad3f54ee01c2daa10a87dd1a3772199671ee84339ef SHA512 78e15eebfb619cc2af9b268c52bc22ed74d84d67afe6f61c647c7fbac610be5bb48f17e12e41d2b45252d496c26538fcac2be249d5685c4a4fdaff511d963d5a
+EBUILD cpptoml-0.1.1-r1.ebuild 578 BLAKE2B 21f0ab444b7aecf02a219a0ef472e95e85a0fb3dcfb52c19f5c9fe49a61568e45b9cb1a9a968770f5832e0281a6586ad968f40c0e6297a6f5ae4e2783289456e SHA512 35bb51b9656e54f6d757b1350c5f8340240b4d34192bc8d79e479f605e85a4a54ebc7f17d369300d04060d73fb8da3a2438b232783105d76d756c2b576958171
 MISC metadata.xml 822 BLAKE2B ee55b32633362a35150d6465a65a3af1c35727e0652dcda66eae510b21f86bc5c969acd27fd822ff9d94ec9cba034e5f7b9df85ce02298eda2e5f89b0135e975 SHA512 8019ded1e37c739fb642b552608954292d91cf20ece97c35249ffe9da68d77c44209a78cbdc5227a560f85923c160bd5567b11a0aab19f36989ff05ee25a1860
diff --git a/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild b/dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
index 27c81a63572b..d353eccd491f 100644
--- a/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
+++ b/dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake toolchain-funcs
+inherit cmake
 
 DESCRIPTION="Header-only library for parsing TOML"
 HOMEPAGE="https://github.com/skystrife/cpptoml"
@@ -11,11 +11,12 @@ SRC_URI="https://github.com/skystrife/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="examples"
 
 PATCHES=(
 	"${FILESDIR}/${P}-limits.patch"
+	"${FILESDIR}/${P}-remove-libcxx-config.patch"
 )
 
 src_configure() {
@@ -23,9 +24,5 @@ src_configure() {
 		-DCPPTOML_BUILD_EXAMPLES=$(usex examples)
 	)
 
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		mycmakeargs+=(-DENABLE_LIBCXX=ON)
-	fi
-
 	cmake_src_configure
 }
diff --git a/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch b/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch
new file mode 100644
index 000000000000..a25f004d83e5
--- /dev/null
+++ b/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch
@@ -0,0 +1,37 @@
+From bfb98b0f1e0ffdc187e87c79e1c3114eadc3fa0e Mon Sep 17 00:00:00 2001
+From: sin-ack <sin-ack@protonmail.com>
+Date: Sat, 23 Nov 2024 20:28:52 +0100
+Subject: [PATCH] Remove custom configuration for libc++
+
+This doesn't seem to be necessary anymore for libc++ support, and
+actually breaks builds on system-libcxx systems.
+---
+ CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ec25cc..6f4753b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@ include(CMakePushCheckState)
+ 
+ cmake_push_check_state()
+ 
+-option(ENABLE_LIBCXX "Use libc++ for the C++ standard library" ON)
+ option(CPPTOML_BUILD_EXAMPLES "Build examples" ON)
+ 
+ set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+@@ -25,11 +24,6 @@ if(UNIX OR MINGW)
+     if(CMAKE_GENERATOR STREQUAL "Ninja")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
+     endif()
+-
+-    if(ENABLE_LIBCXX)
+-      find_package(LIBCXX REQUIRED)
+-      set_libcxx_required_flags()
+-    endif()
+   endif()
+ endif()
+ 
+-- 
+2.45.2
diff --git a/dev-cpp/edencommon/Manifest b/dev-cpp/edencommon/Manifest
index c94cfb47f295..55aa69f927d4 100644
--- a/dev-cpp/edencommon/Manifest
+++ b/dev-cpp/edencommon/Manifest
@@ -1,5 +1,5 @@
 DIST edencommon-2023.06.19.00.gh.tar.gz 146697 BLAKE2B 8b2419671c50eea43aa4b8d5d85eee75ed24ff9745a71c2d11b1994605552ffc288b55520639585631aed0e2528482a01daa9b47ef676fed7c14b4c7d75d018f SHA512 47b37a6acf93a6c6f2903f3113021aa1d54230cf3e31a8071aa7f276601a8eae56bd95767ec23c3027695367261d4db1483b637513c72ce220778f1f1a4c42ce
 DIST edencommon-2024.11.04.00.gh.tar.gz 311977 BLAKE2B 2b152c3cc243c684b8b802981494816b5114e100bc31cc07a96d000dae2be70da4e205d52a30776e930c7c01d63e01baa102cb49a431c961ef133ed936c5eb76 SHA512 c1c428d7392d279e1b0c4348b0fd41ef9a53e50d8a65ff513a56919a7834c118af4adb1145153d10821efb7c8b30b62c1c6d6365b368b90cd567e350c8be0e81
 EBUILD edencommon-2023.06.19.00.ebuild 874 BLAKE2B fe1e890a1b6054061f7c7d2df9cd64099fb131a2ebedc38eb1f4df1e50973db017dcc2669878a035aa4ed7d9d1f748b95882f62c86a75221c1b12129316b8ebe SHA512 44a5aaed2da61e3134088a44983fc93c8665f2a9bc2f519cc98720f2275f6bf564d6e2e8eadc4797963ffeead6d1a7ba900067f26721c8eec816f04f90d7fbeb
-EBUILD edencommon-2024.11.04.00.ebuild 1041 BLAKE2B e2f389174e410fe44ca6b2bcc56551846ab9b7b49b396f512343d4cca7d01a0f4a11c78cead4e269eccec2347f069fb9b2be85704db9db603bfd5729408575d1 SHA512 f2b5951975749a8764574b3b4b13ffd188b74edfc7ce49260c4b940a19447d69e37b651fc1578865ad3bf6f5aa15f2a4d29b1efa5db66a768c31ebf6b7d067ad
+EBUILD edencommon-2024.11.04.00.ebuild 1320 BLAKE2B 0a0994ca77f5aea55af01ae73acc1b0d42ec2dd011952dd15f1ba7cf4849b4cca9abf26cdc3c7393ed32108d83b843e91291b9f9cc550891128b248673959d59 SHA512 5d53ae23042f59b9ee5e3e4c2389614b1776be02b3cee2914da6d9dbe0d9b651aac8f9cfa5ddb1e5b4c10120ffca6bb613569477b4d95388d9b8852b3c6efd75
 MISC metadata.xml 489 BLAKE2B 8a2011652b278e1fa6a5339aa4d686796245042308bee8df9d33fec2d34062a41ce8ac64a77c64bb628e4416c15349aa76741359118af0ffbbe500c611e9b2ee SHA512 1ab46f2ef88633c7ce8f771b6bfa64638becfdc5a62b9667f7bf1be5623301c1fece6f1af581560d12f6478d518fd08a9d487e6232861e98363346929852be83
diff --git a/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild b/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
index c53780c9b1f9..bd951c699e39 100644
--- a/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
+++ b/dev-cpp/edencommon/edencommon-2024.11.04.00.ebuild
@@ -13,7 +13,7 @@ EAPI=8
 # dev-cpp/wangle
 # dev-util/watchman
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Shared library for Watchman and Eden projects"
 HOMEPAGE="https://github.com/facebookexperimental/edencommon"
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v$
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="llvm-libunwind"
 
 RDEPEND="
@@ -47,3 +47,15 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	CMAKE_SKIP_TESTS=()
+
+	# This test fails on GCC 13.
+	# https://github.com/facebookexperimental/edencommon/issues/22
+	if tc-is-gcc && ver_test $(gcc-version) -lt 14.0.0; then
+		CMAKE_SKIP_TESTS+=(PathFuncs.move_or_copy)
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/fast_float/Manifest b/dev-cpp/fast_float/Manifest
index ad53de531881..8c9c5f40c98a 100644
--- a/dev-cpp/fast_float/Manifest
+++ b/dev-cpp/fast_float/Manifest
@@ -1,3 +1,3 @@
 DIST fast_float-6.1.6.tar.gz 101727 BLAKE2B eb9833f7bff6e6086db1525fcc71231c5cc8f47985aa4c71078d896afb5fea20c41bfdb55de6c1e8c9cfa6c9b842331f340115590683e1d9e6a3ba40f4148870 SHA512 d2dbd2537f433329a76539c061238af080125526b7822fbfdf0f70ac0a6800114848b9be0fdf9c51dbb22211af3bdcf9829ed9cc4a47fd28ecdeecf7c5d4b663
-EBUILD fast_float-6.1.6.ebuild 932 BLAKE2B 4455ffef2bc8dd9ddfea12440a2d001953943e644eb56f3d838052d9055dda8fa494286b52658728589b08feeaf78b9de9ac10b199dd3c2024c5566fbaff76e3 SHA512 7c7dc89323e5d95caa4701a811905bbf95d6a7bca1a2f927a8a0b8b0770f59ed64862b2dde986e0f51b293622493cc3196b390a02849b1068dd1c7879c8f7312
+EBUILD fast_float-6.1.6.ebuild 939 BLAKE2B 5de977f1e2aed0d3f986711961a180174892bf4ada313309bf7950a5bc8fcfacd3a01582bc71c789d6130bdf2f333478aa3124d55e6b7bbea3fb636f3c88d88f SHA512 505d8dcb841d9c500c94141c4cad663cc6c94d3683cf87c5f079582e7fc10dff678f872c75e0a3940b2304648090c9136dd5a8ff7b0e755acf61536054dae109
 MISC metadata.xml 485 BLAKE2B e4083d4fbbe17c0ae9e645a312bbb3523a5c90e461ec4168e9e808f358ede9376d7d02dd58ea07ff594056ae11445c030ad5ef6fbcc0514416cf8600cd70bd7d SHA512 4868fbfc454bd279f1dd1bc958f69c0955a5f3b2aeb06bfdd58f37d7f7275e90f73962fcda358338ebf9100668ae0d4b624f3347848e83d9faa9c47516c88b83
diff --git a/dev-cpp/fast_float/fast_float-6.1.6.ebuild b/dev-cpp/fast_float/fast_float-6.1.6.ebuild
index 275cb2b493bf..974c160275da 100644
--- a/dev-cpp/fast_float/fast_float-6.1.6.ebuild
+++ b/dev-cpp/fast_float/fast_float-6.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fastfloat/fast_float/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="|| ( Apache-2.0 Boost-1.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-cpp/doctest )"
diff --git a/dev-cpp/fb303/Manifest b/dev-cpp/fb303/Manifest
index 18caeb804f0f..c84252d755c5 100644
--- a/dev-cpp/fb303/Manifest
+++ b/dev-cpp/fb303/Manifest
@@ -1,3 +1,3 @@
 DIST fb303-2024.11.04.00.gh.tar.gz 256825 BLAKE2B a7cb9b56f38f0a8f20a860b4b288f37cb59315242b50ac757bcd472e0310491a575149b2580a67a837a52badaf7ca4b72a769293d248830f90a0cf48f351835a SHA512 4ec54931f23267197e74cc0c3a0dd500f443221d5c4a6bb6a4d707feb6fbc377ef6c16f8fa94f2162e2c0a192fce01016f249890f7384a6c042b5f94b657dc11
-EBUILD fb303-2024.11.04.00.ebuild 1044 BLAKE2B 4a488791b63463316ff4dad57d712b5b8efcf85cc133aa106561ddb120c0c0914f080922b72a1a44f9a380f4f26ab9774ccdb93f8de2bb7a30828c2185686ca7 SHA512 26301249cb27737b2bb60a46ba75f64a82d978f6da434b3edfc92bc7dac598d0d68886ba916d269caa65c8771e962887641199ef8a183ae1b5577c3c7528c637
+EBUILD fb303-2024.11.04.00.ebuild 1051 BLAKE2B 8e50ae112cbabe284e3a896f9311da78ead5947a71ca611beb6f33663bd6aceddd6980f62402081395e3ec874cee1b896bd03d344fb4f000eb991ba9cae7d2f5 SHA512 a812f8f5c7639c7abe926d8fa4a47d977399f075892090174fbc37b577c2d3eed31f22f45b31d4e056bd5ed6bd7444555e1e047d0d5a51cf2dc9100d2da5694f
 MISC metadata.xml 472 BLAKE2B a1dd333968267401d3ca1b8d71b718298dc48591707be5b6c45f1ce20fb2e8097963cb643acae18513ccc8aea3f70ecc2003170e47929ed9533b7b4a909d3762 SHA512 918f05c46aaf18203740925dbb8d352e45b02f884f0c836dc5ebf5bde8dd8c5d333b305792638bc805fcc35590af8d2338d12f7c8e9d18b7b1a6eb0665511704
diff --git a/dev-cpp/fb303/fb303-2024.11.04.00.ebuild b/dev-cpp/fb303/fb303-2024.11.04.00.ebuild
index 915f3bcf8459..feeeabe6c5ec 100644
--- a/dev-cpp/fb303/fb303-2024.11.04.00.ebuild
+++ b/dev-cpp/fb303/fb303-2024.11.04.00.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/facebook/fb303/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 # See https://github.com/facebook/fb303/issues/61
diff --git a/dev-cpp/fbthrift/Manifest b/dev-cpp/fbthrift/Manifest
index f0a7a8ebb622..48dbf56be571 100644
--- a/dev-cpp/fbthrift/Manifest
+++ b/dev-cpp/fbthrift/Manifest
@@ -1,3 +1,3 @@
 DIST fbthrift-2024.11.04.00.gh.tar.gz 15541383 BLAKE2B 447fdeba8b9f270e77066d7cf8dedd64ff0e74baf58b8848b0225e936c5d0815cae764f0b38c26c4ce17d9b0f2c0ba46df3a03b2512065b7bd5d685ac7dc99d6 SHA512 b2175eac20ef9b4f15b5d9002583db7339549f660d03a1ced34289009cd99a4308a9ce340b9a37b9771a32340e80b7877b7c5498619241819cf0664e1e395bf7
-EBUILD fbthrift-2024.11.04.00.ebuild 1171 BLAKE2B c6d9a72b2ea5b4d3f431c5da279db42e5b038a918937be58422434dabbae3ba4129873bf78f5a1fa54599edeb4d09ff2add6ae275c16c27d1424b79d3fe7f92c SHA512 3bf0d3f52afcb5884396093b8eb71ed644b8b2809518b9be600967e149a6f24f5d0d97aaa3d9d1c95cdb62aae4e917c8ba992584e2085b568b63513e372bf8e5
+EBUILD fbthrift-2024.11.04.00.ebuild 1178 BLAKE2B e92a24ee9d95bdd93e1f13406d0ee9109a5a16d67e284bed3c380d5d12e40bc4e76ae334ed950f3f7fbc0c8273050a2e48b5eaf5a69ac6aa5474d65e834c20ec SHA512 7f8a415449ed082da1aba67d78e6876e26330d1bee88d8f2d241377be7c23d338a1b73317844afba620c8b960cf053d088e05d63e847d4bb50ff5abc01f17454
 MISC metadata.xml 475 BLAKE2B 6eb7bd77ac6519024d87adf20b1a4e4c19e0ac2aee35dd4abdb170747372e834e5c9838782842c382e209c15cb2632c5b6c7398f2ca14780df99da60e79241b6 SHA512 d623c4a6567da3272ac3ce24d18e11aef7556765cd21efeaffe8ba8ac7f0767d97b5cc311df0d4d4c2ae68d7331972c95b6288023e5f105f1b01dfe8a6183d8c
diff --git a/dev-cpp/fbthrift/fbthrift-2024.11.04.00.ebuild b/dev-cpp/fbthrift/fbthrift-2024.11.04.00.ebuild
index 8937ac23d77a..38a7c49d69fd 100644
--- a/dev-cpp/fbthrift/fbthrift-2024.11.04.00.ebuild
+++ b/dev-cpp/fbthrift/fbthrift-2024.11.04.00.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/facebook/fbthrift/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 # See https://github.com/facebook/fbthrift/issues/628
diff --git a/dev-cpp/fizz/Manifest b/dev-cpp/fizz/Manifest
index 2bba58e5724b..55064d99920a 100644
--- a/dev-cpp/fizz/Manifest
+++ b/dev-cpp/fizz/Manifest
@@ -1,3 +1,3 @@
 DIST fizz-2024.11.04.00.gh.tar.gz 736821 BLAKE2B af8ecc3f78dfc98d854b402f3e44f8be7b57684d09a34c4a6a19d7c47d7663cc835f27328ed0ee0a25465e7d8dbbb46c8f8085c0b9da7948c99aaf868c8c1fcc SHA512 004665bca243ac835be3628e2196450fee30852e414b068ae98555193c3e9788800536a6280e218614df89061c3f05e501dfd89f08f3c5ba3942c3e9d476bf2c
-EBUILD fizz-2024.11.04.00.ebuild 1007 BLAKE2B 84f0066a14c09f38ae1c8de13a0db1e93959512891806831bae1eecff4699c9780716bfd17fa0c6cad49b8b537ace9724454772dca6e07e915391e5bbc574a76 SHA512 30a373ec21efac2d6a269dc1167abfb11e13738bbc5dad3bb83db682fa5246d22e95bbed2f80a2d0e21f42cde99cf3e9be2984ca2ed8ad60d1d9e6fbe8ee2656
+EBUILD fizz-2024.11.04.00.ebuild 1014 BLAKE2B ae573662d3dc9ac0f894b45fc9a66815b82e1db40e955fa0c09ff766aba564eeb242f05ce7850e16230a6d29d95efb5deb493f3510a3aef5d67e3f00fa25119e SHA512 32399bc6aa5f7d3505afc929ffd66eebbfc4c6e85ccc857ec9a5726bcee3c786d8303a2c84297c72cf00aee26fe808fb33025d0cc803ec3ca844efc9a10e9d94
 MISC metadata.xml 480 BLAKE2B 94478b06c81957bda6a271a2cb8815357a458771a7f495cbe886e41aa494b49ef342c0bdaf0f05b600bfea3dfd6a9361c8770b3acd0da6cd1148769bac918385 SHA512 a9d2674d274e001cfeceee594ba320ff52031c7e3aee85db3058daf318d3f92aebf51211779ffdd2c1f146470b1cfe11be15d10d96743c195952f890b4209933
diff --git a/dev-cpp/fizz/fizz-2024.11.04.00.ebuild b/dev-cpp/fizz/fizz-2024.11.04.00.ebuild
index f14c4392583c..db96b4800def 100644
--- a/dev-cpp/fizz/fizz-2024.11.04.00.ebuild
+++ b/dev-cpp/fizz/fizz-2024.11.04.00.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/facebookincubator/fizz/archive/refs/tags/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 4256babc2df7..ab4891bcefba 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -4,5 +4,5 @@ AUX folly-2024.11.04.00-musl-fix.patch 1033 BLAKE2B 362f7047998f5867e55ade0c8992
 DIST folly-v2023.06.19.00.tar.gz 3850872 BLAKE2B 6332b6de28fd4a0c19b20c4b23fa7093bded940fb07de92ad9fa7f44b8347fb5e5543e5a57c32d2414f345b4f7b306eed806c5d48a871a06833c1d2a71a34584 SHA512 9189adddf59019787969c7edb27a3e57436c2dca772f3142cdbf66e3a69b398be7ae4f2c36a9576c7ad9c51fd3703555e2a7ad6ed1ddce4036f8760d8095d371
 DIST folly-v2024.11.04.00.tar.gz 4185762 BLAKE2B 16eca3bde4320b2c5dd535afddb2640f567135ea90e7a270814bda56eb0d2ba4e864e07015879bb79d1146c68e05695eb06e2219e3dd3b4f71a1434e6f2998a5 SHA512 918ec7217a58789818c502c47302d9296867456bb3dd1c36480406905875eae9a7d52900def34ac1a936af9be6010b8b77897b351c36aa8ca09c16fe1775f508
 EBUILD folly-2023.06.19.00-r1.ebuild 2191 BLAKE2B eecb4073cff810ec80a55044b926b6af5524c2c4af8c7b4a9c6bc0825554418e7f2837527b10e5c5e23dbb85491143c3c333fe4f528d4b289838201d28b0ad03 SHA512 86fcebbb06a2e79f38da22654c58a5767271fa8e7bf430f4b3257b20c5ddeb372a7e4287a5e8ceac70c180c5f5c4476c68697f36f14fdcf175bdc87ee348b433
-EBUILD folly-2024.11.04.00.ebuild 1929 BLAKE2B ea1ac5dbe17f25b99b2c73fb5b56f40403269bfb7232b8308c3d70bef1ba2fe090e82c87bd864d4efdfebdf98a490b147a57841e5997b42ae239902beceb981c SHA512 b67e4e5b8e05f8b8f9cf6808b895b4a1612c6db77f93365623079601918d36f4c9ee64905ba6cb1311b5f6d9f759cc42ed48dd25e7bd6822847222b670aeddc1
+EBUILD folly-2024.11.04.00-r1.ebuild 2363 BLAKE2B ad6f310d298fe0e2b6b4353f0b4cec26875bf17b76fa5c482de326bbeca1d764278750c89888eb2b8bd4f29f8f4ee3aa16b40ded31b68603835c789075b91dd2 SHA512 ddd7f673b9106b5f2c10c8291070d382eac575264b9e0707832047df5d0ce7072678ecc82fd8dae967679914d48a433e4471fc913a7487e8f7f5b7cfe3bf28b5
 MISC metadata.xml 472 BLAKE2B c82d4f4d0a0cd409f77ab20853793e45c8c7adb97ad6bdddabf5eb69eb5a523909109da1f2b311694fc5bf5fbcf4dd330957859894eae46b1b24308a04f5b7b2 SHA512 22b8c645a91f91769cadecc7b905c0b365c252e49a63fe690fbd5db82a58afe27517561f01ca5b3f37543b69b5d60af472d86f74105a6baaeb236f1b32db29de
diff --git a/dev-cpp/folly/folly-2024.11.04.00.ebuild b/dev-cpp/folly/folly-2024.11.04.00-r1.ebuild
index 27be95cd3414..fd2b8493af92 100644
--- a/dev-cpp/folly/folly-2024.11.04.00.ebuild
+++ b/dev-cpp/folly/folly-2024.11.04.00-r1.ebuild
@@ -13,7 +13,7 @@ EAPI=8
 # dev-cpp/wangle
 # dev-util/watchman
 
-inherit cmake
+inherit flag-o-matic cmake
 
 DESCRIPTION="An open-source C++ library developed and used at Facebook"
 HOMEPAGE="https://github.com/facebook/folly"
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE="llvm-libunwind test"
 RESTRICT="!test? ( test )"
 
@@ -75,6 +75,9 @@ src_configure() {
 		-DCMAKE_LIBRARY_ARCHITECTURE=$(usex amd64 x86_64 ${ARCH})
 	)
 
+	# https://github.com/facebook/folly/issues/1984
+	use arm64 && append-cxxflags "-flax-vector-conversions"
+
 	cmake_src_configure
 }
 
@@ -87,5 +90,15 @@ src_test() {
 		'concurrency_concurrent_hash_map_test.*'
 	)
 
+	if use arm64; then
+		CMAKE_SKIP_TESTS+=(
+			# Tests are flaky/timing dependent on both QEMU chroot and real hardware
+			io_async_hh_wheel_timer_test.HHWheelTimerTest
+			# Times out on real hardware
+			concurrent_skip_list_test.ConcurrentSkipList
+			futures_retrying_test.RetryingTest.largeRetries
+		)
+	fi
+
 	cmake_src_test
 }
diff --git a/dev-cpp/mvfst/Manifest b/dev-cpp/mvfst/Manifest
index 40f39ebe3b68..d85275fe8b55 100644
--- a/dev-cpp/mvfst/Manifest
+++ b/dev-cpp/mvfst/Manifest
@@ -1,3 +1,3 @@
 DIST mvfst-2024.11.04.00.gh.tar.gz 1983543 BLAKE2B 9c8b0da32baddd04af29e892a379333f89af45957a415dfa7f6da86f9a9b39fc8fbc73e450deb51e7a61b4ddfd37f08dc3d9ba8f48f83557aab4ae762068ec14 SHA512 4a000583884777fa876f3bfc52a3420c9cf8818f943c07898ac3b313837092fc173d8db497fd59027ef405d8fa5e3114a53b3bc5cf3fef398ca712c06a1da3e0
-EBUILD mvfst-2024.11.04.00.ebuild 969 BLAKE2B 2a5f0ae62f0c03d3ff0744e14f727fd6eba9a00feede67f5fd120baf0d96498bccbdbc9b838b82f6a7efd3af34ea34bd83c9e833848bdbcd6b84747630476211 SHA512 0714d9225b36a79690ab49e8595cff9e20ab7c9212c476aecf0795ba78aac58d01188a35dfe6d036ac2528203d62fc6441bf16687be0c0a8030c569fdea9d5a6
+EBUILD mvfst-2024.11.04.00-r1.ebuild 1266 BLAKE2B 7d0d38d9d7de7135f81b10594451403bf6d3a136c05a2455871a4a89f61e58bef385db99c31adaa17f3b42a325d0b5fe4c9e305175db0734d488acc6d5766898 SHA512 4d5e1ee612753d79fe4875c5dc3b27c932540c8a5a936851bbeb2037f7ae7f3edd90148a0479fe406f32f199e5da25acd2f351d68630bc413b585f7ec40dac1c
 MISC metadata.xml 472 BLAKE2B 916daab0f3a2f9df3019f592d45d217f9af4c856087053cebec1ad892961654c96957ce953e15a6c32743f6909e8e19063766a2dfdff35a6f8402caff1119d5d SHA512 3da6ea7c55662d148b91146947789430cbb6ca88b9547de2a75b007e579d2ec513b1a03517c577ad43ebc7282962db5c04a1a27f2a0e39d15cac4d6018a53e15
diff --git a/dev-cpp/mvfst/mvfst-2024.11.04.00.ebuild b/dev-cpp/mvfst/mvfst-2024.11.04.00-r1.ebuild
index b920ce229a20..7059319511db 100644
--- a/dev-cpp/mvfst/mvfst-2024.11.04.00.ebuild
+++ b/dev-cpp/mvfst/mvfst-2024.11.04.00-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/facebook/mvfst/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -40,10 +40,23 @@ DEPEND="
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
-		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-DCMAKE_INSTALL_MODULE_DIR="$(get_libdir)/cmake/${PN}"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
 		-DBUILD_TESTS="$(usex test ON OFF)"
 	)
 
 	cmake_src_configure
 }
+
+src_test() {
+	if use arm64; then
+		# These tests segfault on arm64.
+		# https://github.com/facebook/mvfst/issues/363
+		CMAKE_SKIP_TESTS=(
+			QuicClientTransportIntegrationTest.ResetClient
+			QuicClientTransportIntegrationTest.TestStatelessResetToken
+		)
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 9b898f1993be..d5c443cc41f1 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -8,5 +8,5 @@ DIST nlohmann_json-testdata-3.1.0.tar.gz 115036393 BLAKE2B 809be0728a0b9d007fcc7
 EBUILD nlohmann_json-3.10.2.ebuild 1577 BLAKE2B 2db087d7545ab034faf859f314b69ba645b3f5be0f589b96de763d9bc371aa148ce86c15332e08d516f854916e730cca8aa1f521ff0fd5aa5210500dc1d6dbf9 SHA512 fda0401e5bbdf6b49f2f1a8694780ab43da076612fc4224e5ca012bf014c132bb1c7923939226793272fa7546c00a79f8eb40ef1905b5cdf714fe08f26833539
 EBUILD nlohmann_json-3.11.2-r1.ebuild 2069 BLAKE2B d8a1d7efff14b2332f18d3dc1af37f09213d5a872a1ed3a789c701464aa8d8b4d93f8848b24618e1321476c58384d3801af083371400a459661bf47a0601b95f SHA512 a131d2f949c94122809acbc5c8c47629a7f815026b7f7dd14aad071d07a768f50c4d50c6a29cbff3bb34e813bf3b6f99e9ecae1d5c91c5994b9a2ad5be0929cf
 EBUILD nlohmann_json-3.11.2.ebuild 1968 BLAKE2B 0189ac08dad78df6b312780263ef313d6e50cf2687a8b54b68f42289e20bed3e7d7be4778568dd43676fd8baa608b179582656448e71a01826e2ea661cc16752 SHA512 0e6d817be5007b7d82b419cbc1b2a30188e9384d230d1ceb73ca067c63db8ec3f04630cde569466ed3509002c07c9849a14d2e940e58d6b2d59d31de0d1a409d
-EBUILD nlohmann_json-3.11.3.ebuild 1981 BLAKE2B 26d26bc92c6f1e4b93dd71ebf4a37ff964e0788b3670d44f17c7ca700f99daa30acf251af1af7e10c3748cb910fa8cde09118a056b143433b1908fd57f4b030d SHA512 431d564c529eb56aaab7769728dab9d7d3f41a82d667a5e798900279f184197db8cbd7aa229107dff1f7f2f9c5eebbb986d3c8fe827d1e74890176e1bbf42cc1
+EBUILD nlohmann_json-3.11.3.ebuild 1976 BLAKE2B 851a2bc3ce4bc563dd32bfec5c4beb5bde4515c874f636bed0e86381db0dfbba6f6f0ba1a5732522423f36bb4b8d8b5a66f8630e299303357e38c2dfefdbb626 SHA512 06449bb6047ba3466becb7504b646030a775beccc2e8ef38338ac493d9bdb597f8681eb8a48e673810279209363968e4f600455736a4495bb2592460a65a117f
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
index e9c1e4431fb6..647f8194b619 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ S="${WORKDIR}/json-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index cfc2f9529699..f4e693751934 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -4,5 +4,5 @@ DIST scitokens-cpp-1.1.1.tar.gz 311677 BLAKE2B ea880a50b5e3e6f17c4bb11b7021df5e2
 DIST scitokens-cpp-1.1.2.tar.gz 312169 BLAKE2B de6053f9319074b442e074b643042095e0bb5c796d1874ec1f7ace35b8f45825314fc2b086820d86b4f7d384974ce1b62ae4180bfc14744b722cf5c240d7521c SHA512 d7898b5717b6df6cda7c30c33dd993e81f30befa62522a920db96ca39611658b16347338c67e3acbe7a9c88d5e273d935ec1109420e7b66c700136315e513938
 EBUILD scitokens-cpp-1.1.0-r1.ebuild 1480 BLAKE2B cd199977beaf9c872bc00c6dc344b4450ced455bfaa1bbff646b15c6a3300359a8c66c52a0daca6f9b4882530eeb581d19d81e695f8ab2a341680aefa0ab2b6c SHA512 42daaafb71e5afa224df2bcaf6314cb101a6865277d70901c98bc206871133ec699dbd46a73c7ac36a34690f20e9fa6ef71caf3371ab5a614b051be03c5dc34d
 EBUILD scitokens-cpp-1.1.1.ebuild 1413 BLAKE2B d9e5646f1e42e1395afb8af809f0846476f1f48c7c5a8e517132abce364248cc20904d621597c1e9773a8f2cba500a2b3abf2a82e315e1728b4c3a3180cb64ff SHA512 69e13b094ad62de9137a8383fb836ea7ea6f183547d2a51dddc265674990c33bb6053725dafe50339489403ee6c35969a30e244c2cb008fa7f520c06b67e1f7b
-EBUILD scitokens-cpp-1.1.2.ebuild 1412 BLAKE2B 3a65935434192650f4312fe4993b63c230d14976668c1ffb4ed32c2015ab91a9b22060c9954ad1eecefefcaf9616502802640ff039ab428d6218d9cf5c7036dd SHA512 25bbd56bde7669e2f7c9b5a28cb9c12de62061a41f3f932336e37fba5c8f8973215ab6356e0327e67aaf391d85632b95127fa0038291d61837891141f7febfe3
+EBUILD scitokens-cpp-1.1.2.ebuild 1411 BLAKE2B fbe42fae716e70e8f4af0207154eac8a84b0737c08310d3bd54f64c14fdd26b4f8349bf2c8c76bfb673a27ab59c1ac2d299e539c0cebce30acd50dfdbc97370c SHA512 0a6732c66b6243e642c7b283a6704ee7f1b8e48fc08bc1cd1b0bbf87a6cd444cfb30429f1d56da7768c0c9f85765d16e7eb0ec6f225a7da04d63c8654dd86e77
 MISC metadata.xml 1067 BLAKE2B a3af60b824b07a0db1f2497b7a8d8dea6a4c5a0a225be98e0bd2c35e701197210d0905c213fda060536cacf68e7b0181bad0f849c3dc9eac709af8c1c1df9169 SHA512 e87768329cb90205fb98cba59ddb911414c202cf03de358030aca79766b9834b3a3be4f00ba1a50f5171281852b85b5dc0211a6b7943c4cf0de94e794dd4827a
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
index 4b0c78687b79..91251a33990d 100644
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/scitokens/scitokens-cpp"
 else
 	SRC_URI="https://github.com/scitokens/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="C++ implementation of the SciTokens library with a C library interface"
diff --git a/dev-cpp/wangle/Manifest b/dev-cpp/wangle/Manifest
index ebdf4063e475..2e64a489dd7d 100644
--- a/dev-cpp/wangle/Manifest
+++ b/dev-cpp/wangle/Manifest
@@ -1,3 +1,3 @@
 DIST wangle-2024.11.04.00.gh.tar.gz 372838 BLAKE2B 5d6636aa9cbea7f1438269a8c935b93dd5e3c6abef0cc6c668088d883a9b9326f44409649d809c80c08e79c2fa0527fd26a4db7ceed616f27aea2a3921c5ae75 SHA512 d44f3553b04f378935c2a6cf072d6b4a911be3bb71f3480ccdbb269f83c0f62dce4451bcb2edb365d9b398f719c7162269690d07aab07054dafaa55b5b38e0ad
-EBUILD wangle-2024.11.04.00.ebuild 1238 BLAKE2B 15328543010ae5f396cdebea54ed4cd47b5d090749fa582bd6fa08e8c73d8a4f5e593052f25d726a51d9b3b74082f77d849efb056833a781e7f51d60a6617f6a SHA512 69489c3ba642732662276564d6ed3c4ba184fa9e7b7e292d72a3370145e36cb9c8797311dc4dadef1fc1ce96edd06910e79ca40785c0b61d158235a0d51d1635
+EBUILD wangle-2024.11.04.00.ebuild 1403 BLAKE2B c291ad11ebc24150fa7bc89ac5fc44c06375204c340cd71d3d1b1138ec184bd39d24a6386becad9815f16617bb5d90f0137d32a887f4095d86e61823e8b25fcf SHA512 ebe12ca47318b98141d6c7011a4c26b35c9c553dbbee1ed4efc847b94622f4655a3ae4d5610e0336aa7ac2f689f0c94c4313f458884691faeb3df3063c425a7a
 MISC metadata.xml 473 BLAKE2B 4b1249d84b05c02bf0d20c3ac89b562841296ecea52b3cc49b6ed6090c511e0cc2b1b6e453642999010f48da706bc8c3d0e9b2cd2ceec25446bb48a0842d2b0e SHA512 069df201ae8710a4084c09b5414935e232c35f69cae2b1fbc63ebd57cfe259dd1d4451fab9a2e443d6688a9463973c92078f14b388fe6e65f229475a01bf6c08
diff --git a/dev-cpp/wangle/wangle-2024.11.04.00.ebuild b/dev-cpp/wangle/wangle-2024.11.04.00.ebuild
index 15b6be4d72de..33c0a4f2f1dc 100644
--- a/dev-cpp/wangle/wangle-2024.11.04.00.ebuild
+++ b/dev-cpp/wangle/wangle-2024.11.04.00.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/facebook/wangle/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
@@ -58,5 +58,11 @@ src_test() {
 		SSLContextManagerTest
 	)
 
+	if use arm64; then
+		# This test fails on arm64.
+		# https://github.com/facebook/wangle/issues/241
+		CMAKE_SKIP_TESTS+=(TLSInMemoryTicketProcessorTest)
+	fi
+
 	cmake_src_test
 }