gentoo auto-resync : 07:01:2023 - 12:13:10

11 files changed, 132 insertions, 57 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fce424011c92..836f53cbc153 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 421e1cea5c05..e8494f200a00 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -10,7 +10,7 @@ DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAK
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
 EBUILD libclc-15.0.5.ebuild 1667 BLAKE2B 0c2b3a2a781f1a177214e1da430f2180188ab1d9cbe0001009016fd7cf4aa72391de4bba2c4a9f4c8b275462818a24c4a29861fecb6a235d6c0fac10220144d5 SHA512 a06a0ee32ff783980d6b93e52a4c0b9e92315d05b03443f24121a3170edad5a5a63508617942e5890913d09c90e5fbbc7371c4f0b32c9ab18057a0a8b5d20e3b
 EBUILD libclc-15.0.6.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8b1835859e3a07debc3f4d17081b4b8f34d7adba7666b8c106b455a68b1ad41604d44d36b9ffc63ed40e1d5b99b0f8e SHA512 cf3d643b19823e6c0ec33122ea33b21da8300ac8b7476e906002ed7ef3e0501db2874d97c58e32ec71a524fc1278b29098f521cc0d6ca8076211305ab61a981a
-EBUILD libclc-15.0.6.ebuild 1668 BLAKE2B 6e58e4dd7b2a9f740d81bba7b69c25d9b2f9604593364537135b08c75165c668f21850915ade4030a57e1c98188dee98bdf778cecc1702c072e50b6621c07784 SHA512 2ab9c1196c2e07070033e8981468659d51f6f0391d8e98c9cf3a822cf6be2261feeb65bd66d27369fa18c8dd1b5b29c2b5f4e14293f3a037fafb6c97f9b75768
+EBUILD libclc-15.0.6.ebuild 1667 BLAKE2B 01346327892acf0ab7b2753f83add55892e436fae55d842d894cfb605cba00e2b163827c04b59a4607e86b83fad00ef87176cbfffc4778e473adef852272b980 SHA512 f4e391d4ceabbe2ea288425e78f4349394ce9849a05f2e1966196f260b0fda4408ff27011bc4a7c53fa8b9fdfe4b6eb5cb5fe03bba077a85405595569e462876
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
 EBUILD libclc-16.0.0_pre20221217.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
 EBUILD libclc-16.0.0_pre20221226.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
diff --git a/dev-libs/libclc/libclc-15.0.6.ebuild b/dev-libs/libclc/libclc-15.0.6.ebuild
index 38cf79651080..cda23b90ae0d 100644
--- a/dev-libs/libclc/libclc-15.0.6.ebuild
+++ b/dev-libs/libclc/libclc-15.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=15
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index e3f4e5d56b65..e1f598421e9f 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,7 +1,8 @@
+AUX 0.2.0-fix-cross-compile.patch 3941 BLAKE2B ec2272250dd4cde7dcae4eb2bf0ac73649330a70fce4108b086d1e834bf9f132fc513fbb9ae4d2f5f87ceeb033e9ab3d4ff39025b9c537dd4ad982020faa5092 SHA512 c6fcb9dba23d00955174fef94323bd37250e1019aa1b68c0b4393292b505e6ff17670ea1121837f50f4b22356dd637ea53f4e43623c2cf32691d435f0278805a
 DIST libsecp256k1-0.2.0.tar.gz 2456096 BLAKE2B 9160ea9977ddc08daf8881cdcb98cd223024c938ab09c0dab9fc4cd67d355018f339bab7701bbb895345fa858e5673006ab81e027da109a7c9d470e2052eecdf SHA512 a345ffd69c5587777dc834a9f86f89971090158695507cf08cd12efc3b136ff5eff54a7bd789354a5e6e11229e1b2839f706458d64cdf7561519245c5be31a9f
 DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae5dcb5a92f68bc3fb39a397c532951c6392347df14ea0347bbe05cab43158512e0d9f5ea87bd8f69bece1b04440860ebb8065ee SHA512 8c4945e93cb5ff241482ba4426b25162a7ae3b26860edc10c91d06b1c396887202ad971f4d38e035828352531b87fc29087a12b675e43da44f23c9ea3b6c0cc8
 DIST libsecp256k1-v0.1_pre20201028.tgz 200051 BLAKE2B 90d636049b411e02703feb2661006900a55f952f60e76e2b7147a5afe8e391a06a80d6ae1489b1e7f2382176c7ea831526465a85bca09156dc6d37b417fcb33b SHA512 54a0fa21b64dd6836e4227de51f3539afe06e0e2f352683397d6adb5dd0508af443d2e25f91e90e1ae366b261965fe7d438292314705baee799cf37421644958
 EBUILD libsecp256k1-0.1_pre20190401.ebuild 1577 BLAKE2B f1472ea251a7f43a7c6a96aabcfcf34481d55b1f43afaca01293326c1d19cb0debf9d9a258250b6f045060d4827ada3b6f0644f2029e1d37ef7349833136dbc1 SHA512 ac2c63c0db252ca605ce4d2f99de32a66ffd24d6658eb23692d5380f02507e754b2135c5de562dcc98c689c32eea8edb85b6976ab3cb5c9814088f3e9cf5e8ac
-EBUILD libsecp256k1-0.1_pre20201028.ebuild 1911 BLAKE2B 3d222fe811adfc6df26d7a7271c72b3d4d39c39742be1046e814028d1a97d68a2c3f5399ce13f3df04cb13cb46843be20b9218355e4ef105a305493d25d90e55 SHA512 b6daafabdb58adc46dc973ba56cdb50fe9cff927ae67b9fdfe5318c0a84ad473f33890fed8afc58247fe734359151468bfbc5225436bc11ddad5aa7631e56080
-EBUILD libsecp256k1-0.2.0-r1.ebuild 1932 BLAKE2B f71d754f607dc0de2edc1b5ec13298601820d0fd1af9140fe5cb132f2c6c2b788611a21df9b4ce7c3709b8c1f869c74b10269df489da81fcca3b8cbcccc937b8 SHA512 13d913a5e92d3b218cebdd282e4af58e6088ba5d1ddeb6cba6ecb727b9823711e4e61b7359415e288afcd63601d299ed1012ed74da880c9ddb60e7791f34a702
-MISC metadata.xml 1369 BLAKE2B c1fe8fac34fe5181cf4f95bdceafa0d228e750eb731161a2a0938a0b72c5cac88a7d872b689d1fac264a44d93da7788b8ddab3785d4c71dd80f90f2a0b9f3d74 SHA512 614774e744a25199edd3ecc4b4beb6fe2fb550d2160594a6c9994e566987dde010d6f2bd4c09a14976ee5dae5a11a316d68b937fc20a84df2c3a415364be6bda
+EBUILD libsecp256k1-0.1_pre20201028-r1.ebuild 1771 BLAKE2B 4f3ed2587e7c8e5637446b01858072542deef4cb1413969f673820db6634489a6fce0b228cd702a18b0952634cda4c3480efc2df421242cb62e62bcfd3e788e7 SHA512 30a9ebfa633e9daac40b6345261aa31326c698314cde6e138deea33a7d3a924e914ee8be82b39b0ddcd02a047824f71edce2870c421f0fe0ce44f0284068504e
+EBUILD libsecp256k1-0.2.0-r2.ebuild 1716 BLAKE2B 0f1cacd77407313498270b2fed646ce14e9b795b241037f4b44f15f3a04f4762058798357e49fe7432154837e95dd7516d1306f70953b3577b05fece3d1a6b82 SHA512 78a28a64a146c677f68bcab83f01db94faba5461d4fbd612efdb654cd6b596bff9bdd2de90768057f77cd4b69bf7240d8eb032091f88d4f58fb93fd64bb5fc09
+MISC metadata.xml 1229 BLAKE2B 2bef1f35210eb662ffe409aa32b5d61a11a4838ccda892fe545c1eef596bb130ebdd4ff80814d1e69a0328b16f74e94e50a1557f00c64bc16c6b218a84969614 SHA512 42f20aa48559dc254bc1233732aac1e0b3a4dec8935abcd81b980127f5ec511206812f84493c1d55bc6ce369735df0a2b01170327b39cc7dfb995811f4ce3085
diff --git a/dev-libs/libsecp256k1/files/0.2.0-fix-cross-compile.patch b/dev-libs/libsecp256k1/files/0.2.0-fix-cross-compile.patch
new file mode 100644
index 000000000000..a1db0826ebe2
--- /dev/null
+++ b/dev-libs/libsecp256k1/files/0.2.0-fix-cross-compile.patch
@@ -0,0 +1,87 @@
+https://github.com/bitcoin-core/secp256k1/pull/1159
+
+From 772e747bd9104d80fe531bed61f23f75342d7d63 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <bitcoin@mattwhitlock.name>
+Date: Sun, 20 Nov 2022 01:46:07 -0500
+Subject: [PATCH] Makefile: build precomp generators using build-system
+ toolchain
+
+When cross-compiling libsecp256k1, if the `precomputed_ecmult*.c` source
+files need to be regenerated, then the generators need to be built for
+the *build* system, not for the *host* system. Autoconf supports this
+fairly cleanly via the `AX_PROG_CC_FOR_BUILD` macro (from Autoconf
+Archive), but Automake requires some hackery. When building the
+generators, we override the `CC`, `CFLAGS`, `CPPFLAGS`, and `LDFLAGS`
+variables to their build-system counterparts, whose names are suffixed
+with `_FOR_BUILD` and whose values are populated by the aforementioned
+Autoconf macro and may be overridden on the `make` command line. Since
+Automake lacks support for overriding `EXEEXT` on a per-program basis,
+we define a recipe that builds the generator binaries with names
+suffixed with `$(EXEEXT)` and then renames them suffixed with
+`$(BUILD_EXEEXT)`.
+---
+ Makefile.am  | 30 ++++++++++++++++++++++++------
+ configure.ac |  1 +
+ 2 files changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 30b6a794d0..e929300298 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -180,8 +180,26 @@ endif
+ endif
+ 
+ ### Precomputed tables
+-EXTRA_PROGRAMS = precompute_ecmult precompute_ecmult_gen
+-CLEANFILES = $(EXTRA_PROGRAMS)
++PROGRAMS_FOR_BUILD = precompute_ecmult precompute_ecmult_gen
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override CC = $(CC_FOR_BUILD)
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override CFLAGS = $(CFLAGS_FOR_BUILD)
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override LDFLAGS = $(LDFLAGS_FOR_BUILD)
++# Automake has no support for PROGRAMS suffixed with BUILD_EXEEXT
++# instead of EXEEXT, so if those extensions differ, then we define a
++# recipe that builds the latter and renames it to the former. Since
++# Cygwin toolchains always append '.exe' to the output file name given
++# by '-o', we ignore rename failures since the toolchain will have
++# already created the right output file. (Note: The leading spaces
++# before ifneq and endif here are a hack so Automake won't try to
++# interpret them as an Automake conditional.)
++ ifneq ($(BUILD_EXEEXT),$(EXEEXT))
++%$(BUILD_EXEEXT) : %$(EXEEXT)
++	mv -- '$<' '$@' || :
++ endif
++
++EXTRA_PROGRAMS = $(PROGRAMS_FOR_BUILD)
++CLEANFILES = $(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD))
+ 
+ precompute_ecmult_SOURCES = src/precompute_ecmult.c
+ precompute_ecmult_CPPFLAGS = $(SECP_INCLUDES)
+@@ -198,11 +216,11 @@ precompute_ecmult_gen_LDADD = $(SECP_LIBS) $(COMMON_LIB)
+ # This means that rebuilds of the prebuilt files always need to be
+ # forced by deleting them, e.g., by invoking `make clean-precomp`.
+ src/precomputed_ecmult.c:
+-	$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(EXEEXT)
+-	./precompute_ecmult$(EXEEXT)
++	$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(BUILD_EXEEXT)
++	./precompute_ecmult$(BUILD_EXEEXT)
+ src/precomputed_ecmult_gen.c:
+-	$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(EXEEXT)
+-	./precompute_ecmult_gen$(EXEEXT)
++	$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(BUILD_EXEEXT)
++	./precompute_ecmult_gen$(BUILD_EXEEXT)
+ 
+ PRECOMP = src/precomputed_ecmult_gen.c src/precomputed_ecmult.c
+ precomp: $(PRECOMP)
+diff --git a/configure.ac b/configure.ac
+index a2a15d2b82..013964f5ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AC_PROG_CC
+ AM_PROG_AS
+ AM_PROG_AR
++AX_PROG_CC_FOR_BUILD
+ 
+ # Clear some cache variables as a workaround for a bug that appears due to a bad
+ # interaction between AM_PROG_AR and LT_INIT when combining MSVC's archiver lib.exe.
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
index b78335558ac9..ae79e2f9f11b 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,13 +14,12 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+asm ecdh +experimental +extrakeys gmp lowmem precompute-ecmult +schnorr +recovery test test-openssl valgrind"
+IUSE="+asm ecdh +experimental +extrakeys gmp lowmem +recovery +schnorr test test-openssl valgrind"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	asm? ( || ( amd64 arm ) arm? ( experimental ) )
 	extrakeys? ( experimental )
-	?? ( lowmem precompute-ecmult )
 	schnorr? ( experimental extrakeys )
 	test-openssl? ( test )
 "
@@ -63,8 +62,7 @@ src_configure() {
 		--with-bignum=$(usex gmp gmp no) \
 		$(use_enable recovery module-recovery) \
 		$(use_enable schnorr module-schnorrsig) \
-		$(usex lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2' '') \
-		$(usex precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8' '') \
+		$(usex lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2' '') \
 		$(use_with valgrind) \
 		--disable-static
 }
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r2.ebuild
index 30b67ab2dd17..588001fd95a4 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r2.ebuild
@@ -5,38 +5,33 @@ EAPI=8
 
 inherit autotools
 
-MY_PN=${PN##lib}
-
+MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
 HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-if [[ ${PV} == *_p* ]] ; then
-	MY_COMMIT="3967d96bf184519eb98b766af665b4d4b072563e"
-	SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_PN}-${MY_COMMIT}
-else
-	SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
+SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/1"
+SLOT="0/1"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm ecdh experimental +extrakeys lowmem precompute-ecmult +schnorr +recovery test valgrind"
+IUSE="+asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
 RESTRICT="!test? ( test )"
+
 REQUIRED_USE="
-	?? ( lowmem precompute-ecmult )
-	asm? (
-		|| ( amd64 arm )
-	)
+	asm? ( || ( amd64 arm ) arm? ( experimental ) )
 	schnorr? ( extrakeys )
 "
-
 BDEPEND="
+	sys-devel/autoconf-archive
 	virtual/pkgconfig
-	test? ( dev-libs/openssl )
 	valgrind? ( dev-util/valgrind )
 "
 
+PATCHES=(
+	"${FILESDIR}/0.2.0-fix-cross-compile.patch"
+)
+
+S="${WORKDIR}/${MyPN}-${PV}"
+
 src_prepare() {
 	default
 	eautoreconf
@@ -46,37 +41,32 @@ src_prepare() {
 }
 
 src_configure() {
-	local asm_opt
-	if use asm; then
-		if use arm; then
-			asm_opt=arm
-		else
-			asm_opt=auto
-		fi
-	else
-		asm_opt=no
-	fi
-
 	local myeconfargs=(
 		--disable-benchmark
 		$(use_enable experimental)
 		$(use_enable test tests)
 		$(use_enable test exhaustive-tests)
-		$(use_enable ecdh module-ecdh)
-		$(use_enable extrakeys module-extrakeys)
-		--with-asm=${asm_opt}
-		$(use_enable recovery module-recovery)
+		$(use_enable {,module-}ecdh)
+		$(use_enable {,module-}extrakeys)
+		$(use_enable {,module-}recovery)
 		$(use_enable schnorr module-schnorrsig)
-		$(usev lowmem '--with-ecmult-window=2 --with-ecmult-gen-precision=2')
-		$(usev precompute-ecmult '--with-ecmult-window=24 --with-ecmult-gen-precision=8')
+		$(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2')
 		$(use_with valgrind)
 	)
+	if use asm; then
+		if use arm; then
+			myeconfargs+=( --with-asm=arm )
+		else
+			myeconfargs+=( --with-asm=auto )
+		fi
+	else
+		myeconfargs+=( --with-asm=no )
+	fi
 
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 3a2cdd782fc6..9a105e32f61a 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -15,8 +15,7 @@
     <flag name="endomorphism">Enable endomorphism</flag>
     <flag name="experimental">Allow experimental USE flags</flag>
     <flag name="extrakeys">Enable extrakeys module</flag>
-    <flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 2, gen precision 2)</flag>
-    <flag name="precompute-ecmult">Use over 512 MB memory at runtime for better performance (ecmult window size 24, gen precision 8)</flag>
+    <flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 4, gen precision 2)</flag>
     <flag name="recovery">Enable ECDSA pubkey recovery module</flag>
     <flag name="schnorr">Enable Schnorr signature module</flag>
     <flag name="test-openssl">Enable OpenSSL comparison tests</flag>
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index ef27522302c2..58a3f5aa29fc 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -14,9 +14,9 @@ DIST mpfr-4.1.0-patch13.patch 3344 BLAKE2B 1239cf16dfe32a71bb6fc7b156978cd451bcb
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
 DIST mpfr-4.1.1-patch01.patch 2985 BLAKE2B d6bed1d6fca2319db457096a81aca060c1bd934fcdf9c5f98ba44920a7e97c2a5e9c539ec554feb723fb98c84096e1cb615c0d973133c67f3c2097edc1c5b803 SHA512 aa98173d59a24d0f59acff0c2143db5623746db3f6445e300a018a124b35a6b57d631c357a9a890f23c748591f621a95d3a801bed7341b6c8b6ddcc86ecfb107
 DIST mpfr-4.1.1.tar.xz 1429836 BLAKE2B ce20baee2f060acb28b877ffe6fc40c5619cf6af231bd54ca6cfb3e42ef2d74a4ffbab96cf0b5dd6a162e558099a54701d42f34f5bf2256f256fe6f5ae2505d0 SHA512 be468749bd88870dec37be35e544983a8fb7bda638eb9414c37334b9d553099ea2aa067045f51ae2c8ab86d852ef833e18161d173e414af0928e9a438c9b91f1
-DIST mpfr-4.2.0-rc1.tar.xz 1476596 BLAKE2B 0bb116d26743a5ce644d7c9ecbbec903e5556483fff0bf3a42a572e1fd56ba21e1d9e6ca45c8ee7d59c5e3bd9cf243987a75bfffbddbb6d7e7ac0509da99052a SHA512 ea5edc569fbafa01b83aa4e5022f9b2021d5768649073cf5ee3d6b5a94c0ac207dada301076e033174ffa07a24f5e42e8d82fe69bca6b696e04dc250385dd919
-DIST mpfr-4.2.0-rc1.tar.xz.asc 228 BLAKE2B 5d02eb5aef7224754ac5c4f15f4b58897f0327bc0672c70d5db664a73a0731480afcef3ac1ee6e2b1f0ed5e124a74a662adf1e8febf55b41b296402f899b9195 SHA512 29245c05f97ccc24aca38776231a73d2738077dedd488fd6148c18d93318f5b4c8abe6f6e9ba92c56a85cd1823f208828dc2f1691e941825e2d04d69c1357ff7
+DIST mpfr-4.2.0.tar.xz 1477532 BLAKE2B dd88ae3a6a910ad8faeb791b49c3b1085de5d0d4c49c637c124bf4d9bc79fb621d0d1d69e07d0642b9b678f6d355a5830d083dfd189e1e91d0e04c970c10bd64 SHA512 58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c
+DIST mpfr-4.2.0.tar.xz.asc 228 BLAKE2B b281a11528a69418739b0122b4130d9cf212569f9ded8def685b31afe700ea776dd40ac0de7aa6de1bbd5d03a1dc9726ed4278cc6cccfacd1147681a6de27f70 SHA512 ce64346cce89bc38fee161a5e01c349c97c69b626547e54a522b741949cb27bba1668d123143fd03b015f9bdd692bcba08c7b85cf4d4cea9f7834383e04d4bbc
 EBUILD mpfr-4.1.0_p13-r1.ebuild 2700 BLAKE2B 46afea4da633c055ece8404cfabe6171abb568061a33445a58a961b55a3eb23ed28f08011efc001de2fdccc79c3ab34cc2d798be48928b74d2d1a302b8273cf2 SHA512 2e088ffc2e2343d8ce54b62ff625df579ea9236e31981f893c478f1e2b14e19d3bfa332d98fe9c486793a23acf76b231abf8ada2c1f4e7319bafa9ace3daf2fa
-EBUILD mpfr-4.1.1_p1.ebuild 2708 BLAKE2B ad21498526dd91dcc6d03b35153cbd284d85d1ee90515ab3e323a3e9c44a16ce4b8bdc59c590b5b0b7166d1a3f8fc86f42fa5b72bab7fa7e3df72e7bba3586a5 SHA512 d08c80ed13fad11c6469812d1ba9aa1074ecb27707469c1ea368e77fc9d9d5d09511c205490f97450f0c4114ac09fed53a9170259ba66f82eea949c10b0ae42f
-EBUILD mpfr-4.2.0_rc1.ebuild 3105 BLAKE2B 499f1631ce48757b6cc67b702f97130013665401ec66320167f90efbea45a4d89081c68adeb953efc190cab8ee92e49b39a773798d8fdf440fb951e49716677d SHA512 8594a1d37e2a21f416bb84aafb61bf1c44508fdbcf4cfb588f977901fbab4024295d2892a931e1e095ddaa07d88eb87710acf557804fea986e87c7070b5cc9f6
+EBUILD mpfr-4.1.1_p1.ebuild 2701 BLAKE2B 8aacae17aa5fb59458d78536d33c4e807156a22b140abc2c2979f81a15e6b9e88edfa8cf00dfff803f768f9bb8ae0c3e5b57e9ed894b60b048081c0f7983df7f SHA512 28c026f2ff30f63feefe2512f2acce6ba3e900e141c218ea1f3a36c474db435207cf0464b9e1763b34b47bef32d2967d1308db62bfcf4fe75613cb682b96aba8
+EBUILD mpfr-4.2.0.ebuild 3123 BLAKE2B 65ea979e52693d4e414999c37bb07bc101558396ef2c0e50b9937e6660a9cf4503a55c63661ae07410fd8ae0895073205fdfb84fba6c3423a3ca1b39272022c0 SHA512 209572e8efe239176d25cdaf998d8b73e155c5943f9ba03d6acb2bd92cb540b93bb1ce1087bb9cee3900e0a527f1e9ffe448f3905853ab54b01e41ef9ccdd6f7
 MISC metadata.xml 344 BLAKE2B b7a0bcfbcf945ce2b6d58a9a2078c823c12de5ef8261ec009612b58a833deecb7caaf864f0b55e0c46aac004c58feb7a1f88f6d78b584c2e25c403cfb1de96a0 SHA512 8b8b5ae00a4f9ba76c193c5d84f27cce973963f4db109219394efccba3a8e8bebb7f241658a0b682331e34c66ee99332f871d826abf6ec5a4ced4f3dce381fe9
diff --git a/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild b/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
index 13392ae4cf60..7d94c53994a8 100644
--- a/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ LICENSE="LGPL-2.1"
 # This is a critical package; if SONAME changes, bump subslot but also add
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.2.0_rc1.ebuild b/dev-libs/mpfr/mpfr-4.2.0.ebuild
index 471d276fecb5..b80366c8f91b 100644
--- a/dev-libs/mpfr/mpfr-4.2.0_rc1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -58,7 +58,7 @@ PATCHES=(
 HTML_DOCS=( doc/FAQ.html )
 
 src_unpack() {
-	verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
 
 	# Avoid src_unpack noise from patches
 	unpack ${MY_P}.tar.xz