gentoo auto-resync : 16:12:2023 - 14:53:46

14 files changed, 163 insertions, 431 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0fdc8f474e82..2119093b6ea9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index bf870a87fca6..2ff912d09331 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -11,5 +11,5 @@ DIST elfutils-0.189.tar.bz2.sig 310 BLAKE2B d4155de64b15a9ab5c497cd603e73bf918eb
 DIST elfutils-0.190.tar.bz2 9162766 BLAKE2B 9934aff08f1898377708b28595fb52130ef9f80408132ac7d306845b10672ba45cf1ac69783da07b3eea9fd647741d44da45b8b2626c45a768cb2844c6186513 SHA512 9c4f5328097e028286c42f29e39dc3d80914b656cdfbbe05b639e91bc787ae8ae64dd4d69a6e317ce30c01648ded10281b86a51e718295f4c589df1225a48102
 DIST elfutils-0.190.tar.bz2.sig 310 BLAKE2B d6a2d490aa6815ed9a7c3624050716ebf7c50465af9907d471d47aa3b57590faf9b9ee03de127c6b3bdffa6948414aab6aa8c784ce29570f76bb03ee2021c062 SHA512 7cd88c19402a959679204a5b01ddd48720e224b84268d0d7452f0f1433150b97dd02288fac204fbd5e2fd6f227473bfe62205b350d5fe2e17addf45fb452eed6
 EBUILD elfutils-0.189-r4.ebuild 3576 BLAKE2B 403abe865eb97d562717dd550b1a177c1486f135a25892a984d583aaeb424333f608c2c8dfb5f17c04b6b9e295d7761fd3eca866c57dbf775b522e38388f96cb SHA512 a1f9f585b0d2b303c0a26667b72eda2c94716900c3413b50c0b3b7c240f183e2fef3db29dff69a2d41b412048e9d2b90c7a5b7661087731a13f32d485f45a308
-EBUILD elfutils-0.190.ebuild 3206 BLAKE2B a6fe0ec196c532d81e22402bf198720c680029ae822163eb970d6539ec4475bb45b97950e32423d9b701238b425c25a06d7524f4bee6aa059d776def7eac2287 SHA512 d6f11f16e1e16c1a10d8bfa2182c5b456675f664a88a5df8ca03f726de97ca423401e4e3a6d176c7278834b376a3aea26d01e269e69ed5c457f8fee9b9e8eb57
+EBUILD elfutils-0.190.ebuild 3204 BLAKE2B 5b797ba6ef6d05afc40a33c695c355f802f1770d63a7911ed89fec689a544fbfb0d0cd9475cbdb406417809de85712b30bd6644cfdb5ed29e71f0291864417bd SHA512 b0cb91a1b99ebced7639b7fd36e02420c3c3acd32cdfe06ab81ede6fde18b2050c8ccfa658ef8b0241e2d1408765a26406f328fcd51f8b7cfb7e4bf6e5ff5c89
 MISC metadata.xml 680 BLAKE2B f5f2ad88e2f5f7823ea466403cb44888cea12ded4c1364e4c941be9f0e620ff9214973459bd4f70c43540e8f2a5d915c7d6e65ff3b2758c6660af928deb648b3 SHA512 403b91d41f6ff564c66445492c45d41ed4513709e557ac68d447e583b6bc4e22ccafe67f8e998660dfe47e75120c902107fccba90db06d99bd4c72f024bd881c
diff --git a/dev-libs/elfutils/elfutils-0.190.ebuild b/dev-libs/elfutils/elfutils-0.190.ebuild
index 857fb2fd495e..6f3bad188c61 100644
--- a/dev-libs/elfutils/elfutils-0.190.ebuild
+++ b/dev-libs/elfutils/elfutils-0.190.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 1a2e1b2e2e63..5f2256d65e3d 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,3 @@
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
-EBUILD jsoncpp-1.9.5.ebuild 1198 BLAKE2B cb5f505b556a65b6586173d0e94743d9b1a31c8a5178603472acb66004498f37af5c355d7931bbfbfcea51e515a903fc16e84887bdbbbd468ae899c110ac2f7f SHA512 cc185bc116c080c7c3fec167e28e02162ec124b36406926ed5abf171716ebb04767b9fdbce038d8acc91723691b8b69d9ac1efced2bda6238a224115bdd111b7
+EBUILD jsoncpp-1.9.5.ebuild 1192 BLAKE2B 1faec52e115681dfb8f8ec30b449bd625bb350115e8b663a7b7ebbb9c529fd9cf87b53c5bc9204700494b7dd167fdedd5a3783df7df79e09e2234a4135505b94 SHA512 5e19795e9ce20dc6a1544302756212f9c7663462c7d60d2f5bd67033c83634a35a27e89eb129204b40a467e6478eecd89949c9acdb0a6937b242962eb22e090e
 MISC metadata.xml 473 BLAKE2B cee9ea6f824489bf51f6c293faff24e62bb8c3457d49638b9547d104bfbed8b5c566e429b4d597dfa9b556955450c758261231ce83ea28216c1386a2d645176b SHA512 f7e2f0a82c5370802072e94a727bcb19d138979ab46670f01bdb17ed19b59f8e79bd28d37a8d939917f108fd4a64f53f67153ceaa9dad393840e9eb0247538e1
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
index ba865aa3d9e4..7ad641757006 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+
 inherit meson python-any-r1
 
 DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
 SRC_URI="
 	https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
+		-> ${P}.tar.gz
+"
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/25"
@@ -20,8 +22,8 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-RDEPEND=""
+	doc? ( app-doc/doxygen )
+"
 
 src_configure() {
 	local emesonargs=(
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index bd851be7e9f2..678a4591cf6a 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -5,7 +5,7 @@ AUX libffi-3.4.4-lld-17.patch 828 BLAKE2B 3462bc7db0cf754cb14a9fa0de6377da401c78
 AUX libffi-3.4.4-sparc-float-typo.patch 830 BLAKE2B cdec73bd227f0bcfb077ae0383bdea782886015189da8f3ac89d693a94967f1055edaa34462815709327ebc8a2c3d195a89090b3553db0ee7fa03b92c2341043 SHA512 3314e46725276df7fc91032a2446b9a379d54e9eceee0875952424bd6fd8b6e41a5103bcb990865b18f59ab3264db3bd106474b27a24b3e00196e9257f111022
 DIST libffi-3.4.4.tar.gz 1362394 BLAKE2B 189fe1ffe9507f204581b0ab09995dc7e7b761bb4eac7e338e9f5ff81431aebcef6c182c1839c9f9acb2706697a260c67e6d1351cf7e2aed7c4eb5d694f6f8fd SHA512 88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889
 EBUILD libffi-3.4.4-r1.ebuild 2386 BLAKE2B 2fed1f1f77934bcd7cb23bb9121205f4d89d35af7415b684fbccb20559fa34c266bc8e43076e38f5c8417d84fc3822ab374cb7ccbcf1528e76ad6b5d8e8378ec SHA512 ee51d4c56849f5e8f35d71ea01b82fb4b34fdceef9a6fa4af2c3a99eadb54ce140389336c8f00e6ce9172f8a385e48ce33aee9e274ca0ee47a3f12b862c7ca33
-EBUILD libffi-3.4.4-r2.ebuild 2442 BLAKE2B 690b00a0f8211039ed20126515468c8042161fee63cfd6d2f600dc9c548ac389e440543b9609326a15c70bd9310fcb0c4534387f7e1309e4d3926d1a30cddb10 SHA512 3acd597611c1ea754f4cd5963a84ef23b1d5469e5b490eda944756a915501c29839a41e6bbda4409a2cb213e1c8eb19ccdc7ca56dc2041aa85758e5f3900fef4
+EBUILD libffi-3.4.4-r2.ebuild 2439 BLAKE2B 71a0d537edb5ddea73e4ba2be267eeb1cdb75abae048a899594ef2debe8cc20dee2a3dec4278a7138de12d54509f47f2070b8ab25ecd023f8185ca72cf694832 SHA512 1ccfc74f47eb4f85bc62b94249fe534aa3f1ce9dc767debedc45ccebb5e176f29f6d29e82d32a8d67a4d022be8dbb77db99086a7eb34e21453396a92b551564b
 EBUILD libffi-3.4.4-r3.ebuild 2513 BLAKE2B 29712c6986e6288206241a3f8a4e0b6bf130178160a10897c0a41f8fbe023f0dac402e04d36013322c326986867209ef7379ab1909a25b00c727a8f7aadef749 SHA512 2547cc73f48de955a5e7da2ca1360613c05301bffc87b17347eb736dd28343675ff1b5cde6026fecddbed20bf9090edce7c463c4d67cf08d22a3a52f142666c2
 EBUILD libffi-3.4.4.ebuild 2234 BLAKE2B e4bfd05eb22e58723aeae755e760106d5b03278ffcfc11c7d65c6db54bb489bf8a500a9a5b383fafe0d67792c51ed3319a080a43b853ae7b31a7a979966a4607 SHA512 94461cdfdd44e7eab0491063cbe845e4ccb448730135974864a4260d514bcd9ea81cb773a1f004b4ee8afb3937a5ec6ce55ba71bcc1556e8414048e06b50d6d3
 MISC metadata.xml 2110 BLAKE2B 2653be2cf09c047e45e489d7265d00165ddab2f94744988e4e8bca449bd1e40eeab74cb0b8d7d47a2d8b73563869460fcccb06e1fbccad697a9f213be362cb03 SHA512 e1a280792b929d38451fea1eb360053ed3a452592094f3e327ce4a4ff7eb8e0119435e8ee98f215585d8d98440512b5b68f92d1cd472a3bfd12e2f382e1981a1
diff --git a/dev-libs/libffi/libffi-3.4.4-r2.ebuild b/dev-libs/libffi/libffi-3.4.4-r2.ebuild
index 63367bd2fe39..2efcd92dc454 100644
--- a/dev-libs/libffi/libffi-3.4.4-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.4.4-r2.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 # with FEATURES="-preserved-libs" or another package manager if SONAME
 # changes.
 SLOT="0/8" # SONAME=libffi.so.8
-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"
+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="debug exec-static-trampoline pax-kernel static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 7ff627317406..9cc29dcc2c31 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,6 @@
 AUX libmcrypt-2.5.8-autoconf-2.70.patch 561 BLAKE2B 7781b257c87eb1f6d793fd5a0a2f017190728731f95dec00b25986fd97c36590db38f3670af6ef29c480ebab90405a1b2638601536102a6b62363226011c1199 SHA512 5aec87f49632a4e9d7cddabd5f661b813caa8558cb304374fda331a490a9f9f7a0bb753b2d4c81a17ca605246c18b9aaf24ee4d437af7f5e7a293e2fc9e37b79
+AUX libmcrypt-2.5.8-c99-2.patch 1103 BLAKE2B ad03edd1015f2d559f74ddf05944e6eaf30c6a4360fed2462b6530b6eca127681625156fda6699545c0704c39951e67d301b170b19139836ed90eaff7a05d2dd SHA512 601c98a58c152a16762d0835575137146ee907ef6597fe0c1d0fa94a53c67d3985e41bf86bdcc52a776e57d5c15f6da4ba19cf6d986126b66998aa579949733f
+AUX libmcrypt-2.5.8-c99.patch 3193 BLAKE2B c8d692a2e0bf94ee0cb5e28ac40540b3c43e0003dcfcb2a0aba7e5a9964505616229e84635abe43179ce4728bfd8267f82191d812f2303d7e476c2d1ec744c57 SHA512 83fb939e6668dcce0b376f934641fbf232d42a8082c7bf625a0062ae69d55d3061d44d4abd1d3e4d4d7d75294e9032798d5f1c8159033bc134458d949aa3086d
 AUX libmcrypt-2.5.8-implicit-int.patch 2367 BLAKE2B be96b6c76f75d6998211877aa8e7bae68c0a585ac5ca469f38cf701c5d46c3a7e18c9b41e68cc1e111cad6c6951737a2b02867e08761769cd4bead44028cc849 SHA512 a3e0dfab2a17393631e09334f214a11c572df1cc8bc3572375d35c9598f1b51bf75b5a4db382022273da68e58b48d70173d040095bc17ef235bdb679f1ebe8eb
 AUX libmcrypt-2.5.8-prototypes.patch 1435 BLAKE2B 6b4e85df1432e7766d5e678595b08b75a1592993d79f18373d28868566b4cbe271552d7e899719530677e4f2ad2b34d4308f01ff7808a0527507f23dc74dbf70 SHA512 c821c8c6bb42e50bb377c85042ff3127375b195ffa075d17a6ead6cedd01ff66dfe6e1fdf049a48d12b5285ee26e0a2208a86ab333294055c2df7723857c70d7
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
@@ -6,4 +8,5 @@ AUX libmcrypt-2.5.8-uninitialized.patch 624 BLAKE2B d6c55091d0c159b5b04fb7cb68a2
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
 EBUILD libmcrypt-2.5.8-r4.ebuild 918 BLAKE2B 1a6e3419f27e0bfe0bfc8f3cbfabd53b802d0069efc90293012b6fb331a611d0e877284273f2e26dd8e10358a369f10042f6c6080a6466c5b90fe525f55b4b93 SHA512 fc16b72db54973d4b74b58b3cf9cfd3719131a0e4baf749b94dd9cc2e090e1d011e6793b28469716e18c5a2d8d257cada2dac8f971a0e38cdc878969f3cf3c5b
 EBUILD libmcrypt-2.5.8-r6.ebuild 1207 BLAKE2B 5396daf57c3f6b226346c0eb183e3d5a4e4873a1156b11af94f99d43e66b0ae27f42c22409e8bdd3682a66d82812832b75ab869eee013138b6f0c61c756e86fe SHA512 d8210a585f575a6093092d1a2699435603bc2b2146859578f435633d017527e55bd574f51c2fa814fb420fa9937251667b31c3863d42715040fb8b0c96306aff
+EBUILD libmcrypt-2.5.8-r7.ebuild 1253 BLAKE2B b6417c7e10bae50e4e21b5c31dfe2c802d05fcc5ca74e094016bcef13bf1fc5794da3b5ec182cdf582af4ca18d1a2309f6a2a63391ade418e3b085ebcfd82f04 SHA512 534d3826f5877daa39ee02a390172b13aebc433f31ea56446c2832b07a14c8982ed8ee7cec5603f83ed154908d44e7298d7bf4469ee26ecb0a34656261e190a3
 MISC metadata.xml 249 BLAKE2B d6e11cf35a40f525ea7e1f78e0eb43ebde085e8f3a9ee2bd869a5acb43040d3490b84f7b916e5580163b217ca8e36910016199223a0d7f958d8d32e77fd6c92f SHA512 3976fd063b92b20de47f9a45410cf467b778d186a58eb13cd1dd6f46bbbd4fa1d0b8665e0a37f07e0f6b7a44343594d95bfa616c384be151982f0342ecdda7f3
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99-2.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99-2.patch
new file mode 100644
index 000000000000..ba2236de6c42
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99-2.patch
@@ -0,0 +1,42 @@
+https://src.fedoraproject.org/rpms/libmcrypt/blob/e02fbd614a5b7ba093e9e15ab322e7eb02d64e3b/f/libmcrypt-configure-c99-2.patch
+
+Fix glitches in the readdir and bcopy probes.  They were
+just invalid.
+
+diff --git a/configure b/configure
+index d0fb8783e147654b..4fe7660a16359171 100755
+--- a/configure
++++ b/configure
+@@ -6639,7 +6639,7 @@ fi
+ done
+ 
+ 
+-for ac_func in readdir,,
++for ac_func in readdir
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -6741,7 +6741,7 @@ fi
+ done
+ 
+ 
+-for ac_func in bcopy,,
++for ac_func in bcopy
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+diff --git a/configure.in b/configure.in
+index a815778931728ec2..f0c9a0e8f73e1153 100644
+--- a/configure.in
++++ b/configure.in
+@@ -204,8 +204,8 @@ AC_FUNC_MEMCMP
+ AC_FUNC_REALLOC
+ 
+ AC_CHECK_FUNCS([bzero memmove memset mlock readdir_r strchr strdup strrchr])
+-AC_CHECK_FUNCS([readdir,,])
+-AC_CHECK_FUNCS([bcopy,,])
++AC_CHECK_FUNCS([readdir])
++AC_CHECK_FUNCS([bcopy])
+ 
+ dnl Checks for libraries.
+ AC_C_BIGENDIAN
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch
new file mode 100644
index 000000000000..25c555c99627
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-c99.patch
@@ -0,0 +1,56 @@
+https://src.fedoraproject.org/rpms/libmcrypt/blob/e02fbd614a5b7ba093e9e15ab322e7eb02d64e3b/f/libmcrypt-c99.patch
+
+Add return and argument types to fake prototypes in mcrypt_symb.c.
+This avoids build failures with future compilers that do not support
+implicit function declarations.
+
+Also fix a minor type error in the perminit calls in the Triple DES
+implementation.
+
+Submitted upstream: <https://sourceforge.net/p/mcrypt/patches/15/>
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index a1a09578858aaf3c..a92f150627a1f610 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -23,8 +23,8 @@ mcrypt_symb.c: mcrypt_internal.h
+ 	@echo "/* This is automatically created. Don't touch... */" >> mcrypt_symb.c
+ 	@echo "" >> mcrypt_symb.c
+ 	-@for i in $(EXTRA_ALGOS); do \
+-		if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \
+-		if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \
++		if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \
++		if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \
+ 	done
+ 	@echo "" >> mcrypt_symb.c
+ 	@echo "const mcrypt_preloaded mps[] = {" >> mcrypt_symb.c
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index 1baaa1e94be1abce..e0e690d1c831370f 100644
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -561,8 +561,8 @@ mcrypt_symb.c: mcrypt_internal.h
+ 	@echo "/* This is automatically created. Don't touch... */" >> mcrypt_symb.c
+ 	@echo "" >> mcrypt_symb.c
+ 	-@for i in $(EXTRA_ALGOS); do \
+-		if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \
+-		if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern "$$3"();";}' >> mcrypt_symb.c 2>/dev/null; fi; \
++		if test -f ../modules/algorithms/$$i.c; then cat ../modules/algorithms/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \
++		if test -f ../modules/modes/$$i.c; then cat ../modules/modes/$$i.c 2>/dev/null|grep define|grep LTX|awk '{print "extern void "$$3"(void);";}' >> mcrypt_symb.c 2>/dev/null; fi; \
+ 	done
+ 	@echo "" >> mcrypt_symb.c
+ 	@echo "const mcrypt_preloaded mps[] = {" >> mcrypt_symb.c
+diff --git a/modules/algorithms/tripledes.c b/modules/algorithms/tripledes.c
+index 98e9bd45b4f336b1..2737d2fd8fd02a3f 100644
+--- a/modules/algorithms/tripledes.c
++++ b/modules/algorithms/tripledes.c
+@@ -201,8 +201,8 @@ static int _mcrypt_desinit(TRIPLEDES_KEY * key)
+ 	spinit(key, 0);
+ 	spinit(key, 1);
+ 	spinit(key, 2);
+-	perminit(&key->iperm, ip);
+-	perminit(&key->fperm, fp);
++	perminit(key->iperm, ip);
++	perminit(key->fperm, fp);
+ 
+ 
+ 	return 0;
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
new file mode 100644
index 000000000000..3f3d5b686185
--- /dev/null
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Provides an uniform interface to access several encryption algorithms"
+HOMEPAGE="https://mcrypt.sourceforge.net"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DOCS=(
+	AUTHORS NEWS README THANKS TODO ChangeLog
+	doc/README.config doc/README.key doc/README.xtea
+	doc/example.c
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-rotate-mask.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch" #775113
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1872801&group_id=87941&atid=584895
+	"${FILESDIR}/${P}-uninitialized.patch"
+	"${FILESDIR}/${P}-prototypes.patch"
+	"${FILESDIR}/${P}-c99.patch"
+	"${FILESDIR}/${P}-c99-2.patch"
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	mv libltdl/configure.in libltdl/configure.ac || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
+
+	eautoreconf # update stale autotools
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 97681722e272..75028486b2bf 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -8,14 +8,12 @@ DIST nss-3.79.4.tar.gz 84826326 BLAKE2B c34b1ba2c24891bd316af27828dbcc6b193b7298
 DIST nss-3.91-fixed-certs.tar.xz 11300 BLAKE2B 85f191b85c7caf1ee24f92a2ff76f7660a1afd64d6c8d9da84f521aea18cb12bdf3d08426c47302a4b444b0e4b4ed2f2251ed8234d5bc0006b00cd4b97aacc51 SHA512 88d2a47ba160f93f2f2c88a1e2a591c516d19209bd77cc18111c8538d9cf86498cbfd57c7e36478819bde307d90ba31e0a12a9c17320ae5dc736d02959a32a3a
 DIST nss-3.91.tar.gz 72267945 BLAKE2B 7dcd680311a5503007c0bb738ec24b50e40841470592c2d8dd542b3bdf085a6e4816f1fab4cb6b86220ff3e39a828f57a0a9172e3d1c2c82537eab6558a50226 SHA512 65258a4ea0b8c06ec49dd411eabe860ad5d7c3873beb27f8f43e10ef6be020b1522112df9deaeed27f23fd72f13cc7554e9c1854cd97e4716de419f722aff020
 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-3.96.tar.gz 76724862 BLAKE2B 307c4ebcd6124a0006a24c8e2e9e884788f44c83645fd8cdd49cfa49497ed5c4f83d2d4f22ce5dd3b5256fffd6aec572b289af5e84f8131f1f23be3ea4264245 SHA512 96fdc1f09882c15678515f46f2daf966862fbf7525b92241297f26b95475de21e95128ffd63a0f9f9063e6c99e4abf435da8e93a19327885bfb0ad384ef15227
 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 11762 BLAKE2B 04104e5221a437db7a8e056b6940bb4b1b3d49ed790c72da8de1244debff478f683186816d2b608a54718407ed6b621f4df0d6e511b2b928aa90142a53c630fa SHA512 f60cda155bf7825d102b75f1924429c90e7e7039cfe3449baa9b5a577839543cdd51dda1d707b4c82ed908eb9680365359095f5617d2672addc6b05e97849c96
 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
+EBUILD nss-3.96.ebuild 11571 BLAKE2B 0cda30f165213942fc117ca1dbf589bff0db5347707f7828f263f2d388e9af4a9797f1470fb59d761c68b14ea4209124b6f68b3ce800d2091825297b37ca314c SHA512 cfbe7cc8dc0bd846f8bf221e17b029ca52282e9f758b56c3990a7ebf35c75a6323600a8ccb486965e9e8180f4b3dca61fb4dcfc2148095a9984ccf4b28b27ddb
 MISC metadata.xml 603 BLAKE2B 74c5a84f8a860b6a43731ed83cd40373187236de7add14ca33f3417eb0cfc165aa5df5308dca14b4664bcfe453e0f328988df4459af5781da4cbcb7bfc00e93d SHA512 9d7fb0be71d18ad1da440de047f4430bd3b50a8584d8dccd43e5e4cdf050f5c5cfeb34cd82ea617f2419ff092908becd1508eb7efcf54f3cca8c7f36af9517bb
diff --git a/dev-libs/nss/nss-3.93.ebuild b/dev-libs/nss/nss-3.93.ebuild
deleted file mode 100644
index e5b28698782c..000000000000
--- a/dev-libs/nss/nss-3.93.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# 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"
-	# Per README, this is recommended to make run tests quicker.
-	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/nss/nss-3.94.ebuild b/dev-libs/nss/nss-3.96.ebuild
index ef59d94cde49..68af01795644 100644
--- a/dev-libs/nss/nss-3.94.ebuild
+++ b/dev-libs/nss/nss-3.96.ebuild
@@ -111,9 +111,10 @@ nssbits() {
 	else
 		cc=$(tc-getCC)
 	fi
+	# TODO: Port this to toolchain-funcs tc-get-ptr-size/tc-get-build-ptr-size
 	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
+	${cc} ${!cppflags} ${!cflags} -fno-lto -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file -S "${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*) ;;