11 files changed, 515 insertions, 3 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index dee0f3edeffd..5addafb0eb85 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cpuinfo/Manifest b/dev-libs/cpuinfo/Manifest
index c7d24c64b15c..70a18cff8792 100644
--- a/dev-libs/cpuinfo/Manifest
+++ b/dev-libs/cpuinfo/Manifest
@@ -1,6 +1,9 @@
 AUX cpuinfo-2022.03.26-gentoo.patch 1268 BLAKE2B 182386f080c1aca057dc91cc878236ce589233f47173e2c4eb3421505be18c24171b9c58f2c8a50f6b54992761513cd864070734dd74bf411fcc9585b8c17454 SHA512 bea50072b201d7120c8163ebca975e2101399fadb3ed4b8828dc20afdfbdab5040683219ddfbecc7bc694def2b30efa2bec256311c8ac3cd7d1ab67591295e84
+AUX cpuinfo-2023.01.13-test.patch 432 BLAKE2B 31cb0cb7b75445651a2d82143bdfce28f636ab4692c3c4f4f503646b61af952c8599f17192d15ff43d20ad9a0a4cc26410057efd44aa9b9837ff1cdba319663d SHA512 e6a730137c621946a7839b3273e163382ad35a8881f0fd848e70f3fe02820a3196044a235f5d301e0443e2d376321ff17f3256f8aa27e1ae66fc220bbf6f0d96
 DIST cpuinfo-2022.03.26.tar.gz 3503965 BLAKE2B 03607ea04de156907d230dc9f009d72bf6d36ae7391c190c68dbc3f9a4c395e8ec72f935f6ae032d6b1341432278df3aee6f9fe7f7cad1b82784ecec5084d373 SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c
 DIST cpuinfo-2022.08.19.tar.gz 3512624 BLAKE2B 909ebde6c522d514641dcbe16586bc972327b8564cb12fa6db25b8978a0a840e627154430f97dd37f024ea4f36a45db8ca5033e6e076390383dd9b35307bed5f SHA512 b3342ce0a1f842084ff53efdfd15c44586ac7cd36249211e2925d84aa1f33ee8d6f76cd62ea20e91d8b908c3c8afda5a47516008b69749504024b9813a623ee2
+DIST cpuinfo-2023.01.13.tar.gz 3513605 BLAKE2B eee9765f30b1dca6f39fb0b1f387f5e1cfaf544e5c9b256391aea913c5b67a012ef45f5afecfcda4a34ab64ca8da2f20e37db58cb4d463f8e312a04965cd40df SHA512 96bd11d3453e98cf1130f0862614e813861e20111655f8c472f29f17048a07d712b4f84b511760fdee995cf3d695112371af0c21cbd144ee3fb6fb6153dd2829
 EBUILD cpuinfo-2022.03.26-r1.ebuild 894 BLAKE2B e4d7b5c15f660e5e23afdc4c4f89df0af6211ff45429911875a7e4464cdf5eef633ee563e15626481428143788d8b2d63e76f89b38da007ee0ef44c0c711d9c7 SHA512 34d863c1bd6abbd2607e7ddeeb44f648c8b24f4c50d3d1909450e5c0e465ef28689d57e55af31caf03e725a3421a5d6b86a9f1422eb7dc96cb23cdc86c775c91
 EBUILD cpuinfo-2022.08.19.ebuild 906 BLAKE2B 5395cf008fb40443b8929f8c83680164bee23844c437bab9cb5d9110df146db12b3f3bee957cdaeaa880c0bf1efe74e0ae93527a4e54a3e20bcb9c58fbb5ef98 SHA512 45528b7df2699a5e3818813e0e5ee3941a17e456e7da2c5c8855a4b65d896a1b261944e3c143f6c7500a1b231d41aee2cb48031b12b6b35b781ed21de795e371
+EBUILD cpuinfo-2023.01.13.ebuild 937 BLAKE2B af15c89bba1ebff2538cc46b68c612da31e6d45b94e0bd9d7ba6b84ab959166d31492c421b6e1eb6216dab1dba7c79b1b197e8a10a6bcb25a1daf963cdf8208c SHA512 4b96b40ea10605871748b5832940c63d22b79ba27222bcd8593a793c2b79a9b200ae3834d1b53e8d01b8fbbc072806bac46bf5005ef8870afc7815d5b43b84ce
 MISC metadata.xml 328 BLAKE2B 160050e4c013753fd69c5a153bf5c63d0627fb2dc96f170f5d2d4a9585b53771fb32866db5a99c27a878402c54c2f10ff43a56718acec5afd5e7b6827c8884d1 SHA512 032c753ed917179bba2cb457ee87b3a8ce6941032138d4cdf59ff764907da93c779fd1ff01a36778d99fefa89f0a2fdf43d1871a9db9e82d6ecfdcbe8bb198fe
diff --git a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild b/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild
new file mode 100644
index 000000000000..3b0ec9465234
--- /dev/null
+++ b/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=6481e8bef08f606ddd627e4d3be89f64d62e1b8a
+
+DESCRIPTION="CPU INFOrmation library"
+HOMEPAGE="https://github.com/pytorch/cpuinfo/"
+SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.03.26-gentoo.patch
+	"${FILESDIR}"/${P}-test.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard
+	sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \
+		CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPUINFO_BUILD_BENCHMARKS=OFF
+		-DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/cpuinfo/files/cpuinfo-2023.01.13-test.patch b/dev-libs/cpuinfo/files/cpuinfo-2023.01.13-test.patch
new file mode 100644
index 000000000000..65c051556fff
--- /dev/null
+++ b/dev-libs/cpuinfo/files/cpuinfo-2023.01.13-test.patch
@@ -0,0 +1,18 @@
+--- a/test/init.cc	2023-12-02 09:02:56.240873209 +0100
++++ b/test/init.cc	2023-12-02 09:04:23.240867364 +0100
+@@ -304,6 +304,7 @@
+ 	cpuinfo_deinitialize();
+ }
+ 
++#if 0
+ TEST(CORE, known_uarch) {
+ 	ASSERT_TRUE(cpuinfo_initialize());
+ 	for (uint32_t i = 0; i < cpuinfo_get_cores_count(); i++) {
+@@ -314,6 +315,7 @@
+ 	}
+ 	cpuinfo_deinitialize();
+ }
++#endif
+ 
+ TEST(CLUSTERS_COUNT, within_bounds) {
+ 	ASSERT_TRUE(cpuinfo_initialize());
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 3ac1f9ce5ff9..bd2c19663391 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,8 +1,9 @@
+AUX libxslt-1.1.39-libxml2-2.11-tests.patch 911 BLAKE2B b9240d9720044ec75fff2ca73abb5b5192f8a0262d5cc51cd5e3bc5b8e07af45486a257d4eb5098cf0c7263d1324a7a9995cce38210245d5b53afc5fe7f4d224 SHA512 26f8664c3cc2bf2579eb236cb771d9fbc0ee528472a44ea55e7975fa0182e63c12a1b7d30c9c01b2e848f9ec91dded5ec4a59c60a7eea2bb283bd120c3e0fedc
 DIST libxslt-1.1.37.tar.xz 1588572 BLAKE2B 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 SHA512 a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca
 DIST libxslt-1.1.38.tar.xz 1576676 BLAKE2B 9397be8b223bd68b326b954fe6a749a269e969b4669747678715728f553916c23475232fc2894a5e4230e15b031981423adeb8f83407f4db8075a784c7e6a55b SHA512 2836bd2990b95680db0960ac4c465d0c6c28a293ad095a224c05021a1c8d2576a45e41da8947a31f4ef3e6ef368cbda65243661e311c9886c19694be5a7c9a8e
 DIST libxslt-1.1.39.tar.xz 1578216 BLAKE2B 7c87b769d345fc99a966bea6b4e94533fa211dc3a987ce013a03eefb05dde73ef75526bdecf7d32d8c77112232096fb22d8ec4f0a781b9f59d0422a2db75df01 SHA512 c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89
 EBUILD libxslt-1.1.37-r1.ebuild 3094 BLAKE2B 79420465dd0ece4b8bb2c8c537e30b47c449cb2fa0366ba999e0f77f9888acba8d9470c97ce2e70c2721642d079f5192c2aa9d110c8d824e462e2e84bbe2c0fe SHA512 1c5ca970a00af6fdbedc27480850aaa85981b10e9e1efe5d94a4d451166537854a48117f9c56bb0828e0535c0f6a184f8d3617163523bcebd9c365945d7630b6
 EBUILD libxslt-1.1.38.ebuild 3052 BLAKE2B 4de5a8e8a932fe895f4bd33e9f2acdb0918435c8f8800d6f85678ae183f6a79b0327c33b775472f61b505e79af623bab7a5964d51a4ea2dd780043a55c23ceb7 SHA512 6ed9fe71cc3a721acc9d716cca49897288f5119d09ba46168045fe887c5423d04becae5f83eb8045b14da3d46c1fe627b1f77d8dd0de0883811965034f028f9f
-EBUILD libxslt-1.1.39.ebuild 3060 BLAKE2B c218a2ec42a1efdc2f5ecc935236d72a7ee7c8255748781ca0d60ab2beee3a8ec1078e9ee5a2ab777033016615a55b26c53cf312a1f2dab5bc686f8db92b518b SHA512 7a9463edab4a317260a4856eb2c4c7015fff088a068408937d55aae7b13893edb79986e179340bd8a2c762bd867ff7bd17135859e414ff90130930da4c29cbb8
+EBUILD libxslt-1.1.39.ebuild 3118 BLAKE2B 58fba785e1607e551c4561820f6cf20f44c2c113b458096455f9d484138fc2de7799d08734d39080a10514bbe8b80f663b6d6a97fe19594a227f2c071ae787a7 SHA512 e0d8db459aa53c25be32874da89593c3487de976afe28fbbe4bb4d5d037e641cbfff1466e52d47314a8c51de1b0008a00e8a4dd86d39adfa306dbb071eb3af53
 EBUILD libxslt-9999.ebuild 3060 BLAKE2B c218a2ec42a1efdc2f5ecc935236d72a7ee7c8255748781ca0d60ab2beee3a8ec1078e9ee5a2ab777033016615a55b26c53cf312a1f2dab5bc686f8db92b518b SHA512 7a9463edab4a317260a4856eb2c4c7015fff088a068408937d55aae7b13893edb79986e179340bd8a2c762bd867ff7bd17135859e414ff90130930da4c29cbb8
 MISC metadata.xml 519 BLAKE2B 19c44d930c1d6af33c7cd756ddd74fb29f93d37dc4953956011e8ff5a563caa119b8848ef8e47ca0e71ced4134b7dfc9092c89a14cf1000148e0383c01183ddc SHA512 6c5e8dcd014d9203f0f50ba2e11d3fd52d89f226ef2f4d1d39143347a8de4433e1f6fa30881f87701695438da263c13dad59230c957002aea2950da01eb66c00
diff --git a/dev-libs/libxslt/files/libxslt-1.1.39-libxml2-2.11-tests.patch b/dev-libs/libxslt/files/libxslt-1.1.39-libxml2-2.11-tests.patch
new file mode 100644
index 000000000000..8d7f98e71b9d
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.39-libxml2-2.11-tests.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/918973
+https://gitlab.gnome.org/GNOME/libxslt/-/issues/99
+https://gitlab.gnome.org/GNOME/libxslt/-/commit/86ec392efd75ce24b79f4baa9822a1b088f3e47f
+
+From 86ec392efd75ce24b79f4baa9822a1b088f3e47f Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Fri, 1 Dec 2023 21:05:19 +0100
+Subject: [PATCH] tests: Fix build with older libxml2
+
+Fixes #99.
+--- a/tests/runtest.c
++++ b/tests/runtest.c
+@@ -456,7 +456,8 @@ initializeLibxml2(void) {
+     xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader);
+     xmlSetGenericErrorFunc(NULL, testErrorHandler);
+     xsltSetGenericErrorFunc(NULL, testErrorHandler);
+-    xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler);
++    xmlSetStructuredErrorFunc(NULL,
++            (xmlStructuredErrorFunc) testStructuredErrorHandler);
+     exsltRegisterAll();
+     xsltRegisterTestModule();
+     xsltMaxDepth = 200;
+-- 
+GitLab
diff --git a/dev-libs/libxslt/libxslt-1.1.39.ebuild b/dev-libs/libxslt/libxslt-1.1.39.ebuild
index e7d5b131b6cb..45105b23a089 100644
--- a/dev-libs/libxslt/libxslt-1.1.39.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.39.ebuild
@@ -39,6 +39,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libxslt/xsltconfig.h
 )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libxml2-2.11-tests.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2c6ac45590a6..27a9704234a8 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,10 +10,12 @@ DIST nss-3.91.tar.gz 72267945 BLAKE2B 7dcd680311a5503007c0bb738ec24b50e408414705
 DIST nss-3.92.tar.gz 72133646 BLAKE2B 251daae56ccf8b8f4fd0b4287fea2049b6e72d1fc57fe02fb3d4f0b8a083aaf00046844145721a1e7620ecfbdbbb93206591e47386c12662765c09cf99db42bc SHA512 dc317ec909433c9026f108b466bc436110b3c77edc3f73aef3d6dc6782f584c205053a368e4a134715bfdf63d2c1ae2185fc23238e5c2dca8f88ec185b1fec2a
 DIST nss-3.93.tar.gz 72281331 BLAKE2B 99e50f450a451f2b0bc0aad9b0fba405c987d88546d4aad6c490cb43dc274f23eb99d03d5fa8cf7ef16585abebfdae942fe1092d3f1c86816ba35e16ed3d490f SHA512 d96f13a70e825b39efadfe7c973c24c1e5ad43319bd813599010383e2b8434181f53489672f68fe79e2cb0c4d4ea0088499e588c3524eccf9298aafc57b94951
 DIST nss-3.94.tar.gz 76580364 BLAKE2B ad7d4fb7c8ddb063100b70717642677fcea177e46f04cf1a172eb4a7d565f99fdf0fca8b431498d83948f88aa89d4d53fbbc871cd8d64fb95242990eae203852 SHA512 3a839a6cc7267e45749f769621c3e8823f92cb654ee40460187e59b50825bb0f84ca278cd61881a3e0e7d95f95e0ffcd266a10c780cdcf8a08a2f0a9bb71892f
+DIST nss-3.95.tar.gz 76571130 BLAKE2B 9d40b09c0c58901781abfad609dd45f44c2f4d1ce9d4f1592748cb64a9eb29b1ac84be54ebb19fa528d8b9fd08911f769a80f72d9e6dbb22e82e5b3581a30af1 SHA512 54567c063fc72bf1a29898bc8cc405e54aa086269021d864b10a3640e6b4ae0d632834db87766257fdb43740d9bc71e362d69cfe6924f5c72a6e1a99a91f8c3a
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.79.4.ebuild 10715 BLAKE2B 0b5947e1a5f4f0e4bc3d037a92116c25d3995b8e3c3a912e23e17b96136564b89946013dca40351b698af2a974b698cca0fd4832fff9e07d78ae628744a8c0eb SHA512 f519e6c3a17ef0bd51291ed8f210ae2b20c8faa9fe5f3cb0b5466a37b63bd7606420e1f90e46fa05632cda31f0482230a7aba6ce48006e5cf846bf42f9d6bc86
 EBUILD nss-3.91.ebuild 11766 BLAKE2B 464740851ea438e3a4f63ee226932d454cb6d43b32c63f833fa89fd8749b8ba427c196f771ca051ab12b3e4a9df89051709d593b77f10e047dd186d5f11a88d3 SHA512 d991f343324afb0c89d9cf72b15a11233aaf4ec3dc5d9170ac7bad159f16d3b4da7430f829bceb7746666c8893679f525b655f75a6a52f9317626332092bdeb3
 EBUILD nss-3.92.ebuild 11335 BLAKE2B 5f94b4d9687ab37207861670a97d856f91e30f0ea57f0f67c4e3c18066939db2dc3c79cbbddacca53515fd49f3211fda4c84be2cf37e16967e7fd1e7c9d56344 SHA512 313d21c4ea9f4c009b828ee2c3bea5a9b5999822e0a7890950f0952a3c95f59313dba9bff7c18926539b8c2673b295de1dda3f4f678efbe83403180e65454c92
 EBUILD nss-3.93.ebuild 11427 BLAKE2B 38dfc4561aeae8208e5af788640ebce0ab87923dbd1cec0ca4b701e68a620f28cbba023705b97d4215a0ad8d04d6f8b53b6a62c836b54329b6b1e0c566e84a0f SHA512 1f61e5af486ae8625464eeba10f19df6fd4747ea14df5f4da176a66aa9f3e69d76fdb9a5a9a980f8fc752072f5f12ada732ba37e83a7f042560af5372b7a81b8
 EBUILD nss-3.94.ebuild 11483 BLAKE2B 84ee4638a5252deeb03f83cd1a3835d13ec8b55b8f53181be4157f4b56f2f5cee6308f5b93e668210283e6ffce9a4ab1c1931822b23fd9f3a0fd174f56de2d61 SHA512 134285d8e55bab7297d6147ebffbb7dc6d954ac2a7bd71b61f57131e38b025cbb7e80872ba5719223a01d5f14f9f05cdeedae73adbdd8de5d7928fa9dc4fba2e
+EBUILD nss-3.95.ebuild 11483 BLAKE2B 84ee4638a5252deeb03f83cd1a3835d13ec8b55b8f53181be4157f4b56f2f5cee6308f5b93e668210283e6ffce9a4ab1c1931822b23fd9f3a0fd174f56de2d61 SHA512 134285d8e55bab7297d6147ebffbb7dc6d954ac2a7bd71b61f57131e38b025cbb7e80872ba5719223a01d5f14f9f05cdeedae73adbdd8de5d7928fa9dc4fba2e
 MISC metadata.xml 603 BLAKE2B 74c5a84f8a860b6a43731ed83cd40373187236de7add14ca33f3417eb0cfc165aa5df5308dca14b4664bcfe453e0f328988df4459af5781da4cbcb7bfc00e93d SHA512 9d7fb0be71d18ad1da440de047f4430bd3b50a8584d8dccd43e5e4cdf050f5c5cfeb34cd82ea617f2419ff092908becd1508eb7efcf54f3cca8c7f36af9517bb
diff --git a/dev-libs/nss/nss-3.95.ebuild b/dev-libs/nss/nss-3.95.ebuild
new file mode 100644
index 000000000000..ef59d94cde49
--- /dev/null
+++ b/dev-libs/nss/nss-3.95.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
+	sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+		disable_ckbi=0
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# Include exportable custom settings defined by users, #900915
+	# Two examples uses:
+	#   EXTRA_NSSCONF="MYONESWITCH=1"
+	#   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
+	# e.g.
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
+	# or
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
+	# etc.
+	if [[ -n "${EXTRA_NSSCONF}" ]]; then
+		ewarn "EXTRA_NSSCONF applied, please disable custom settings before reporting bugs."
+		read -a myextranssconf <<< "${EXTRA_NSSCONF}"
+
+		for (( i=0; i<${#myextranssconf[@]}; i++ )); do
+			export "${myextranssconf[$i]}"
+			echo "exported ${myextranssconf[$i]}"
+		done
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
+	use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+			${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	# Only run the standard cycle instead of full, reducing testing time from 45 minutes to 15
+	# per lib implementation.
+	export NSS_CYCLES=standard
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/trio/Manifest b/dev-libs/trio/Manifest
index a9f047e5508d..b5353794b4f5 100644
--- a/dev-libs/trio/Manifest
+++ b/dev-libs/trio/Manifest
@@ -1,3 +1,3 @@
 DIST trio-1.17.1.tar.gz 466909 BLAKE2B 1403c2534623b536de519cd428ac75480ecc0fcb9fbba693e329a923471947f068cae1e1fd453d10863255369e830ef5d8a75475d95f0f903e66936a9fa48e2b SHA512 574e360d88be838d13d7df5259c68809187a578d8d04981812ff768d3ab80215baf5595952994ec9fabbe3a6ce71512a7cd16d6a29b4f91dcd1b6f2ebcd3ed98
-EBUILD trio-1.17.1.ebuild 550 BLAKE2B 057ffd419e9366d0cceb56a83ce39a41df2ddfd96e0f1fdd8b594218b278fe170261c34f573dc6aa1645e31684fe007b5673ddd35674f5eb9ce73e2938ceeb3d SHA512 217f94c2dac59946cecc9a34b59eaef397b93c3956979325186e82bb4ac196fd3f67eed1777ff9d81a1f2becdb63194f9352a40c16537e491275236ad2ab4080
+EBUILD trio-1.17.1.ebuild 555 BLAKE2B 42970b5401a939192cc642589e5e0d16e980d57c7635720c4ffadf0e954258cbe8efad74635b14e55a6e100ff0a5539054daa6028c165b4b351e36deab188bde SHA512 7aee89deaf271ad81909111684482e63e4baeb141e3c2a7fc1c8e97511c6c0b3e573c4730814f9215004a87c7fd817e1741f9322ef967e764b996a1fd83b4a07
 MISC metadata.xml 329 BLAKE2B 5863c898baa0c23c810edcdc6ae637b0a391579d1fee8db773c899bb936e36c76fb847e2d6de1410d9b6b286154459fb7d515f0a7f270c16a762274f4c19457f SHA512 5ee6ecb624bca2b159b5a6ebd0605d5ccef265c21f37e5f440317032a4144851b0b2eeaabf5fa89f710b9b18b85ad6812827cf9d32f4cfefc4d44e6592c98de2
diff --git a/dev-libs/trio/trio-1.17.1.ebuild b/dev-libs/trio/trio-1.17.1.ebuild
index e7d1f68b3fa4..d1df2e9d2c16 100644
--- a/dev-libs/trio/trio-1.17.1.ebuild
+++ b/dev-libs/trio/trio-1.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/orbea/trio/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="trio"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
 
 src_compile() {
 	default