gentoo auto-resync : 05:06:2023 - 15:37:05

16 files changed, 447 insertions, 22 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4ef4a341e687..f230c7c75cf6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 46a8e7c026e5..71907241bab5 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-1.0.12.tar.xz 1154912 BLAKE2B f76f9d28f738f0cc9790ccdf0fe419cb0e7d70b24aa825844d23c4b31ad51c33f09c88ad4876fa6a52523f2a52d5eb7a4b50deeb70f9db750c69ac236ecfa8f5 SHA512 cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49
 DIST fribidi-1.0.13.tar.xz 1170100 BLAKE2B 8cc31220304ddbdeb0047b30ed9084921920b32ad3f1bdcf29ecbb2fafbd430c391bc99bb7f205546ff8482aea1ef7ed369da71deb3474aa623fc2aeace1b62a SHA512 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07
 EBUILD fribidi-1.0.12.ebuild 754 BLAKE2B 4638e229e37b28cc7592cc734266b1b5fcdc3bfc13c70791e27f268d9884761863a91a3d7c5be733a930da094f1e7f31d1b0e9a1c05cebd02de220045ad0c6d0 SHA512 8cdfe4ab719b9b2c5263823e0bc26f940ca7804e747f1962073dd7bb9ce85b49c4b7e84a254ad6af0c33f041948184176d37e64a8ce5e1ae1904a047c9bb23e4
-EBUILD fribidi-1.0.13.ebuild 762 BLAKE2B 9d22ea267571d2f54a8f2cc6478e75a33c2ba193dd3e6ad4531f8edb315677c136e3458ea22a7e27d45acfd5885900086143ef54ab2e2b03e02d9186cc98b03b SHA512 512f0fd5e36528b33a1adcc1561d32dff53bfcac6d4cb09ad577627448041d98fa9eea16e4083ae509f4fc27139623e366bfe097bd37adf57b64e81e0f8acb9f
+EBUILD fribidi-1.0.13.ebuild 775 BLAKE2B 13ff2b5f5238cf6b6aafe7bda6be4d6213645a71fb324722ac18e73031737eb791b2cb90d5a033f4600a243145f786909594a97683d33b200381b3f68f564bb8 SHA512 c1897a6c172eb035d43a32bfc5b8570da005819e49f94048967ba63bbcd6142ffe11f3f1ec4015209fe805f465b4b21a0a00f3688061adefa9e983c2f2ca0686
 MISC metadata.xml 397 BLAKE2B 822ec06fe2137ab1fb34d138a51ccdcdc8dbad5f2cbb309d6719ff0dc2ed2d835f4906e5c50e1e0be375693d2192edb970299e16dcfa9f0bc33b5f627c85e141 SHA512 5aec835ea9be60ccf6515bdc6c57d8d3d442f32da9c76cc412b07a3de72febef00dcbcdbfb4bcd539be45e2ffc9ad1c10dc7ea45fbfd795433324d2fdc3f00b2
diff --git a/dev-libs/fribidi/fribidi-1.0.13.ebuild b/dev-libs/fribidi/fribidi-1.0.13.ebuild
index cefc220b3796..41c1b0955fff 100644
--- a/dev-libs/fribidi/fribidi-1.0.13.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="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 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index ae931284e991..9f2e7e2e53c0 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,6 +1,6 @@
 DIST gnulib-5293ada82e1ea38e9e5cdd3724c73204d703f07b.tar.xz 4721720 BLAKE2B d0c70f4f33cbc3b7fcbef6ebe67d4ebac2a89fe8e9b1598fa00f0292ce2bc528ed6f5be123072c43c52f1234266bb6fb96b7881839ff884a39d2bce58a9f3ad7 SHA512 0f1822fb579649c3cd09ca8e69334d425f2024d780a98d7bbf38d26f36f174036fa066635513485ddd6e2ad485c7060ae9b101c1595891307a382e6aa9bc4226
 DIST gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.xz 4711472 BLAKE2B 901fd3b3388210f090825829d1de43395819ee907574e2cf7c6586c93ef72afd26e68abc7ae27d1e462a703f1d3bedf37ffcf4d8924fed32a95bc94ae83399d5 SHA512 04ab346648a23a4f58dc2d818955ae145bc9c21c3b24a1719cdf48bb8116e3765de675bcf19747d64d43432db1bb406f403168f973f24811f9d126deadea7e7f
 EBUILD gnulib-2022.02.12.16.27.05.ebuild 895 BLAKE2B 09a707654402a406af303cc08c872b2d90a3061279b5650984228feae9999cf4545205c6375ad3cd02eeea9745f3812382ced5cff3a37572d6b240878a4f451f SHA512 e34425e1167c43c80834d25bf36e839b271b86f152850da297a6303484d2c2cafc0b39763397475168ba67999d1652f7f0aeff449b99998ad5d95b0b04d417e9
-EBUILD gnulib-2022.05.26.07.24.56.ebuild 895 BLAKE2B e6bd74257413d64f2402917f798c989116cb229185a4a6ab4c2cd48b3dd869d46851ae2e8099415657f35d129ea5d95421349811f6c252df3c85228038954dfd SHA512 779d9de68e02d6a4dfb7fd724c82da667b4903a5bfd5eee02877a7e26a69b564d25d3df73262b884b4e4c8fe9aa681c7499292cf53259fe6c1013e26173a080e
+EBUILD gnulib-2022.05.26.07.24.56.ebuild 908 BLAKE2B 5e6cabfe0469a2ccdc4fd03c8a114e2eb88cd2b1dafa3bf5863d982911c81dfa0af88440c13bab0df0e21b5713e288ea9206a074ef31ba2bcdfecfdc245e1335 SHA512 1ff1a11c396775b7c40448f46a3c0445c81ab926be37eda194567f2ff770f6ff6b8854210e5d36be92a199650ecbb04bc0d7d674b66a61bbe57c69e799df9917
 EBUILD gnulib-9999-r1.ebuild 805 BLAKE2B cb29c7441ea6f2ab97c48bab9c6b5d143e37a01f2b236b2852401ca49d95a345f931cd904bbf4c682802376f365f23660097d9b3c6d3feb5f8bd4a24f982302b SHA512 8b2716c60b1871c2f05505b8b2e3aff08f7294bc7aa8b569217ce9423276e4c0c41da97596ab67ca868f01807a50ac17ea682fe7422e91512448903a64424660
 MISC metadata.xml 244 BLAKE2B f599747a5c4b523305b9895669bb3171446bd4edf7339753b21ca14524c010a83bdb41e83851df393240077c31891fefa1a9bd876bda37cf2ef77731a76eca80 SHA512 7db5efa0f85d76e9ff76fd6a0e83908ccb9d5486b2994277166976ff531b9eb88806ca80cd3cb070bac89f383872733c8470d04f86a67854d1b023eb24b4e2b5
diff --git a/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild b/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild
index 1533ed71e2a8..c94405ca93aa 100644
--- a/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild
+++ b/dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.t
 
 LICENSE="GPL-3+ LGPL-2.1+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="~x64-macos ~x64-solaris"
+KEYWORDS="~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="doc"
 
 S="${WORKDIR}/${PN}-${GIT_TAG}"
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index f30c796b2fee..5f08a9d757f4 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.76.1.tar.xz 1055416 BLAKE2B 2251c34b543c95f95bdec6853c8234db1b2e6271e729eaa5abf28e39c7718b326e0813a1214c62fb4634fd11218c4c856e6651de09081b01c9fcf8f73b8cf316 SHA512 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916
-EBUILD gobject-introspection-common-1.76.1.ebuild 888 BLAKE2B bd80e81f012117ff39b8d2f339f519bc1a76d202a3f460e297c91fde53e0904e3e6467201baf85ca2c6b2a795ce2731e127763b8d96757be13d6f21761a37003 SHA512 7f7fc881faa9654fb4ec1adfa116482517e0a0d3096c66084c27304bfa1ca5228dfd09aa2b0e236d0bfd922a51e70ced0d582fa88d369b9d2b2904a816083ee8
+EBUILD gobject-introspection-common-1.76.1.ebuild 901 BLAKE2B efa7e6830895288f3c933c037577dc13212fe3a6547e9794689cdbd8b52eecf4eedb461af85db71539a16b92cefcf9487a892cdbdb70dc46158295b92fd5e0b5 SHA512 89018fc4b94c67be73471d2571f8f421131d3455b92337fcd732f64df9fd6fe194f5148d8cdaccf1fe592d308389887ec63ed1d8ad3d01740003af7dbf7b99a4
 MISC metadata.xml 362 BLAKE2B 18f3d214e624758a552818e8c02cebcaf9340d5201cb23c6999c36247f969b65c912de4515101acdc0862338d697a510b15182b904dca7f4a7ae12e3c1b188b9 SHA512 f08d8077b802b7c95433d8e4e31d89183b072306ebf16570977f65339641c29a1917dc3c869d5268bd3a9ebba5537ed15623183a7dada64f811943a16bab676b
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild
index c2a490838f5d..cf04ae5c7db0 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
 # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 78bd0864ac3b..9a01ff7af9ff 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,4 @@
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
-EBUILD libmspack-0.10.1_alpha-r1.ebuild 1356 BLAKE2B dd12598018f5af01cd4ceac2a711f3f0b289237b81e1b68e2fe9d7bbe9d0836ad45de13332a5193da015283fd131b064e4e2dd48eef4c47c404ca5bd3304af44 SHA512 d5f053584b3f49d0069750557c382779a1265bf5837942268cb7d06dca2bba696d6c0cb5fe587c55c03c7e92ceb56cae327cccc25a265cf09ca33e1646ed0bbd
+EBUILD libmspack-0.10.1_alpha-r1.ebuild 1369 BLAKE2B 04e8828b4615542a75104facf08b6f6ed62abcfb6390927c86e1c4cc77d354915d660d53bd8d5cb973c068864d479f46ce553def0b7da777d079cfb0f0ff184a SHA512 87b358f0c0b11ce79e2181cd64a7702887a61c1e52ae54105023befadc099951e2607de2c5631bff89a2f78931d9d64f790fe14e9fb58e87f18b6949104dafa5
 EBUILD libmspack-9999.ebuild 1356 BLAKE2B dd12598018f5af01cd4ceac2a711f3f0b289237b81e1b68e2fe9d7bbe9d0836ad45de13332a5193da015283fd131b064e4e2dd48eef4c47c404ca5bd3304af44 SHA512 d5f053584b3f49d0069750557c382779a1265bf5837942268cb7d06dca2bba696d6c0cb5fe587c55c03c7e92ceb56cae327cccc25a265cf09ca33e1646ed0bbd
 MISC metadata.xml 330 BLAKE2B 443f1e0e7d08031a118eb3a1936ee027b5f286e30aed7f4dd05be9674985893f3d043ce1da1a44d5adbb3a9306d256ef7900d58957ff63ffc3ed8f57d078a2ed SHA512 6e4a217b11f7776fd45b0f56745be54cc87e49a8641b69c61be13db6a469c899249b39a90155392360fbd264c54796bf59fe3d553028b788604db21b1fe7306c
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
index 1c6a56dacf44..da8fcd943d18 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 33ac287d9851..664c5c8b4725 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -6,7 +6,9 @@ AUX nss-3.79-gcc-13.patch 1058 BLAKE2B d0249304f09fdea7e391732e7da63344c3e29c185
 AUX nss-3.87-use-clang-as-bgo892686.patch 2693 BLAKE2B fe8a25c9c8599e0f3e630202c824b854ebfa5b3580e79a61f7172a93a5aad2df3754e2e5aba718a22bb2ad5102f4d638ca10508f0b66cf6e8f21da4ea52bf966 SHA512 67d231aa1b2433e5feeff59af6849eee78f6d5ebf601c0f7baaf0e1b5b44c25ca63f012ced677f5562bb45e3fc0dabe0210b123a78b56de4dfe11c5eaafac3bc
 DIST nss-3.79.4.tar.gz 84826326 BLAKE2B c34b1ba2c24891bd316af27828dbcc6b193b7298fe6a965cfd42d6a37aa3c25ecb80c9b8c2195ba89d2ea395739def47ff5269f7964235c2883e5b33d67889e9 SHA512 194c7595871ada65c03dcea8f2ec75ea9d6da3ce270c956e8abb2d72b6465e14c7be7892532548b9ca6f319f557353b98facb6f3d620a3a3825d889170b02fa2
 DIST nss-3.89.1.tar.gz 71624456 BLAKE2B fca6e09375ba2ce4a6f0bf189cabb9cdb1ba7cb5ebc1a49d47a2d6b509936a60d7f1867f71cdcfa6a81c0cbbf298513981a9b16ac23bbc464c7004bb40b830b4 SHA512 aeece4e8bc28113fc53997b29c89d40b4be74fee4f5d27c4e065d2fa6701038442f4eeeb1fcf98befedb03537a5a48a4701fe270f56197da57946529f9fa02dd
+DIST nss-3.90.tar.gz 72211928 BLAKE2B 9518bed4f8ca5f9dd1c3d15e255f9954fabc30762ff6db7e45ab54fd0d7d7a34e2c021ecc76b5dcac97c571914e9af116a8c1361a5f2f055a31db168518a99a7 SHA512 e41f4de73f4971c8f35dffe3926b6845ef12a1ce7e8f3fe682e643ddb791a009d079c1706f66d065333af884726840dbc96d4e44762f9c3e48b8d919c09ae625
 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.89.1.ebuild 11238 BLAKE2B dd764066bc58c3e7ccf5d1694da18fd48e75d17407bb978e171425563e8c91b4db0b429fd11dcdf2edd2df15bc8d74dc5b15f7cf18106aaba553b50ad24109b2 SHA512 135e401e94a2754935d86e13283cf77f6442e14252b0b04101475d47bb0157b24372e1bfdf220da8bbc52882fda2fa3507884aaea570e611418c14637a485e1a
+EBUILD nss-3.90.ebuild 11383 BLAKE2B 04ddb43b318f7e9dd2f9239681a24be1db5ce550a3c0f6c6fc9825822a31f28a175fd3bdabfd0a6640b87c859c0508d5328811c136e5dab10e0daf6780fd5cff SHA512 349022ff589b29663c880992e5225935a2bf9705dcd7551b4579cf571003df6fae2f4819bc91dff19269bab41bd68f746626ee8df295cd5e281c2fdd786666ed
 MISC metadata.xml 568 BLAKE2B 1cebc7cc572aebf6dd8f84b7adaf9ff19391384c03430344062546bfc12fae56e2b134e8e2b83c0059c41116575bac16cb7ece046357f1c48f20e2dcbb2b9103 SHA512 f43917344f571dec20ff7973ab1c78e6941861eee729b8988b1ecfdda1cf4088b826ed3ec5d4a0e8c460c08c328d675dcbdd535fd202baa75c06a52d43716adb
diff --git a/dev-libs/nss/nss-3.90.ebuild b/dev-libs/nss/nss-3.90.ebuild
new file mode 100644
index 000000000000..463187e5c65a
--- /dev/null
+++ b/dev-libs/nss/nss-3.90.ebuild
@@ -0,0 +1,414 @@
+# 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}/${PN}-3.23-hppa-byte_order.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"
+
+	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/ntl/Manifest b/dev-libs/ntl/Manifest
index e2e9bd073a67..d271cabcc81b 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,4 +1,4 @@
 DIST ntl-11.5.1.tar.gz 2304103 BLAKE2B 92284383451c7a810f7ee8d9a82836695d19d2a2e46b71c8c60b00acb77f4b4d3bad5497a309616a3e3188567d20203f5ad31295130ab0f3ace08417188c9fda SHA512 cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f
 EBUILD ntl-11.5.1-r1.ebuild 2071 BLAKE2B 63b41f8d75761d7d002238955c7c3a8f81af90cd3db436eec1e5a30017995f2ffa2456d912e3b103bdb25d3916e5d6f94b17f70ae5960b91fa83bb870f3201a3 SHA512 71a9d39b67f2144522090613a9143585ae17727d200958a89ae7317d6dacaadcdf09d5d10fcca2c00c77f507243fd7e56bfef9cbdc989c42a27f828a8be18dc6
-EBUILD ntl-11.5.1-r2.ebuild 2123 BLAKE2B a877421a688fabb0b046591d3e0f715cb254b4e8feeba95d9e4b01b0649700f89ece30ac1c296ec59d88d0dc2bd962108509732edf72645171c47e57e9cf3e5c SHA512 34955939a5ad0a1f8c60b66bf506ac3423b8d78643f267bb96faaa14f516fdb220734bbd5aabe091ef6c368eee8be164fa77ec36107fe24bda50cd6b6fd46001
-MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
+EBUILD ntl-11.5.1-r3.ebuild 2561 BLAKE2B 200992893e76e9b74cad467fd961ec8e884e01bc071e856d7a74172b7eb4dec30a0c126e245189b3a18dee343c509236dbcc5c2934406db11effc9117f058392 SHA512 ac8157016dedd9f8eb3a4776c5334b35db83996cb2cc4432b8b159a26af6dd64aca8594b7d34fb73536d913a32784bb58b55b69061153ca460eb407800016ae1
+MISC metadata.xml 628 BLAKE2B 12ef87b42f60ca7bd5f91708c96471378481bfdc911d638a550608f62928a40e879431028f6e578047b79749e0c8307a4075520434191099adece5a771e5c27f SHA512 724f4bc44918ec49f4bb30ef7c9cc6de8c4243845a2a4c7d8c73db6f1db8fa548ad0932f324deea2002ea35cb7b410120cb86a0743bb2d6765fcd987593fcd84
diff --git a/dev-libs/ntl/metadata.xml b/dev-libs/ntl/metadata.xml
index 41060691e818..495cab106d33 100644
--- a/dev-libs/ntl/metadata.xml
+++ b/dev-libs/ntl/metadata.xml
@@ -11,4 +11,7 @@
 		integers, and for vectors, matrices, and polynomials over the
 		integers and over finite fields.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">libntl/ntl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/ntl/ntl-11.5.1-r2.ebuild b/dev-libs/ntl/ntl-11.5.1-r3.ebuild
index 5601959c8c2a..1b7f7af03821 100644
--- a/dev-libs/ntl/ntl-11.5.1-r2.ebuild
+++ b/dev-libs/ntl/ntl-11.5.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0/44"
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc static-libs threads cpu_flags_x86_avx2"
+IUSE="doc threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
 DEPEND="dev-libs/gmp:0=
@@ -35,6 +35,16 @@ src_configure() {
 	export CC="$(tc-getCC)"
 	export CXX="$(tc-getCXX)"
 
+	# The "AVX2" detection within NTL does more than just detect AVX2;
+	# it also checks that (for example) the size of a "long" is 64 bits.
+	# If we try to enable the AVX FFT (based on the avx2 cpu flag) and
+	# if NTL determines that AVX2 is unusable for some other reason,
+	# then the build will fail (bug 815775). To work around that, we
+	# disable the AVX FFT on x86 entirely. This still isn't perfect, but
+	# it should fix the cases we know about.
+	local avx_fft=$(usex cpu_flags_x86_avx2 on off)
+	use x86 && avx_fft=off
+
 	# Currently the build system can build a static library or both
 	# static and shared libraries, but not only shared libraries. The
 	# name NTL_GMP_LIP is *not* a typo.
@@ -51,7 +61,7 @@ src_configure() {
 		NTL_GMP_LIP=on \
 		NTL_GF2X_LIB=on \
 		NTL_THREADS=$(usex threads on off) \
-		NTL_ENABLE_AVX_FFT=$(usex cpu_flags_x86_avx2 on off) \
+		NTL_ENABLE_AVX_FFT="${avx_fft}" \
 		NATIVE=off \
 		|| die "DoConfig failed"
 
@@ -66,15 +76,11 @@ src_configure() {
 
 src_install() {
 	default
+	find "${ED}" -name '*.la' -delete || die
 
-	if ! use static-libs; then
-		# bug #775884
-		find "${ED}" -name '*.la' -delete || die
-
-		# Use rm -f because the static archive may not be created when
-		# using (for example) slibtool-shared.
-		rm -f "${ED}/usr/$(get_libdir)"/libntl.a || die
-	fi
+	# Use rm -f because the static archive may not be created when
+	# using (for example) slibtool-shared.
+	rm -f "${ED}/usr/$(get_libdir)"/libntl.a || die
 
 	rm -r "${ED}"/usr/share/doc/NTL || die
 }
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 8de213dd94aa..0e91a12537c9 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,4 +1,4 @@
 DIST onig-6.9.8.tar.gz 944148 BLAKE2B ee7d91f2d3a7a41d675bcbb9d18490aa3e5a9edb8f3c6e880d27f2218c476499bba21088def41fbb5d500bfb2916af85c2489fca5bd846594fab53ac492531af SHA512 5a3d220961c22cda981bbae06dc383401771362cdf67e4f0b5d2fa8951a03907362edae498f63226287e70715c0abe4acdd22ec3ceb74bbb226234a52c36a4d7
-EBUILD oniguruma-6.9.8.ebuild 1277 BLAKE2B 2bb13388656a5a7b2bcd400cdecfbaa4ba8741eb2699b23d090f08882542884c97fc779e10e401ea8794ee22c5f95ecba30055411cc37daf587ea49eccbe4a59 SHA512 c72fa3049f93e4b4eb255fc38b798f5baa6cf9ba302963742b2994b454b7089f05f042fa5d15cd7c2ceafdf187b792442476be673df8e752f04247c69f50613f
+EBUILD oniguruma-6.9.8.ebuild 1290 BLAKE2B 54b699d1a131fa571c54facbad8d2f5597488dc31c2b90fc0789bae0ff0bebb4fac91e6543ad123613744ad1ec78bee34c0daaa3551d47e080371aada8713ea1 SHA512 79e889fe4c7d58c89f6a3c61ecafb2a0d431283ec96affe0282f806f0bca9042ec898af9a612f5a17602350ce13dc25d484b2ef029dd629adc5ebaa48605f7e9
 EBUILD oniguruma-9999.ebuild 1152 BLAKE2B c2910ecee5175e00896f5e91c712c9d1c284a37e44673f3609e45cf1fb935c46189daaba27792f468f1aa60c80c7a9cadef881abbad026cebc56cb8733317046 SHA512 0c49cf1fc620e9e8b1ef78193abc4cf6f9d92c5aea38f2a6914241c6f7bc074c7acec0e79183c996973eec80f2bccb70be7492af05bd999558813e60621e2166
 MISC metadata.xml 914 BLAKE2B c3ffcecee4f392fdaa44339db589f018967dc8dd2322e08ace06d4ffed958563ef51366a0cf09126e04f78673f7a621efb3eec85bd4e2322ed3c3b74cc0f7b4c SHA512 13a7f0fdc4ddeabe2bb163fc1421766f9dbb7730284aa9b732720d49d39ae91c4dce9283a17d36fb10bbfe832187655f1cbedfe2ab2e9a89bb664f8bf978dc7c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.8.ebuild b/dev-libs/oniguruma/oniguruma-6.9.8.ebuild
index b35bda73a3df..63834f9c37b8 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.8.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.8.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="crnl-as-line-terminator static-libs"
 
 BDEPEND=""