gentoo auto-resync : 02:12:2024 - 02:07:07

13 files changed, 13 insertions, 678 deletions

diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index f50b066b4758..987134b29b0e 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,23 +1,6 @@
-AUX 0.3.0-fix-cross-compile.patch 4416 BLAKE2B e68d46d85af6d0bf56f5423219ad5412230de6808bd79e154316e8918df056353f336063e07810c7b40cfe41edd099986e3591e9caa918e01a99a1406a48bee4 SHA512 2865dd0d751b629258bc7283d9a7cca6f07ff304f29e0e020b87ffbcce85225ef2e72914b668ef2c4317ed8c11e093c5f2efa1604fa37f495a3f370404f9eff5
 AUX 0.4.0-fix-cross-compile.patch 4361 BLAKE2B a42a42404477cb69ffef4f6d2fb92efb1f7c09153c65dcbf467a9c756ef1e0e4df8bfbc06068aaff9e1e494d1d280a6f3f836c655c23b5d4fe4162add2bf4596 SHA512 28ae55f9b0ca02173bbb159b5232b4531fa6149d7888e5ff860f4a0e85e4c64e9544a8007452382e6615d1c922dc6d42cdaebebe0b82a2cad93b0c3ccb279839
-DIST libsecp256k1-0.3.0.tar.gz 2475682 BLAKE2B a531a87da63abc67a55e756852cde41cdc56d388963871beb23233623721f583ade4ce6b273ffa1c319a3875541e18c549512034d7b6a9eb926e8e916513d14d SHA512 77251b37990b0e73442aa1ec1ff51c5c7e293755ace9abc92ce6c3d21c7ed7f3b1666b939b4410bf1f637e3a69b16a7d33069caf071327f05177420a10f15eda
-DIST libsecp256k1-0.3.1.tar.gz 2560292 BLAKE2B 70ff57e222dd47d0e63a40653d4e7b4e727f6bcb5abf005f15c94cf70e7d11843281d7406d2640b06a0f6a2c2f79cc66ea544cca761d1587973d57006ca39daf SHA512 58ec679625ef4663c94c7198ee953283106c1e027623c3de341277fa757265b822ad3c0e98019f9e425f0e9e414b03e6b62853a1581611813cce753e81845d0f
-DIST libsecp256k1-0.3.2.tar.gz 2566680 BLAKE2B bf0a5ac1edbc115247148912822a2cefe798651f6c6a480422eee90eba96ebbfba772d561e321ac2bf7a0f8261f8ccd9f3af0e66e196f1e861aa550ee1303f27 SHA512 18104b72dd5d1f5e776d72c31c36247e450736437b453b59cf6ec86f84fedeafcf231e266c1ddad727befd9864c65a779000d01e6cef4b9a6485850afebc8a81
-DIST libsecp256k1-0.4.0.tar.gz 2607093 BLAKE2B abbd68580e5e35478d74cad13e0e55a175d2000a0a071dc0812655a47ee262572c1e6944d2d5c8f3dd2b798a72e90be7b64d76f7be25e85ba2471e03254a8fb0 SHA512 84cc115a74d39bc4173012f321ae13195ae92bb96f1dcdcb01fe8392fd5b2437addfa63a1654d07f70e67f0ea6e27978134196442b9ae25bc6f9159ee9ef6527
-DIST libsecp256k1-0.4.1.tar.gz 2614189 BLAKE2B 50de3e2699afa6b80aa64b9c593a6eff98d779706fde3cbb9b54ae0b596c584538abfc9f6d03cdcfd92e6df46db287049a83609e4f5dbb197fd067202f728810 SHA512 68d057d6820ca77006a16d6997c1e8240480b2d6e8d6a4d68188c699c476b71a46850dd3bc217e53a2ebd518b4db37d669058d2104d89cb2a356ba54892ad447
-DIST libsecp256k1-0.5.0.tar.gz 1960832 BLAKE2B 118e3bb1d8e0a4493debae3b1feb68ff5a93348bbed32486779416cc2359dd65d8cfaa7bb47afca8b4ddb214b7ce05c9997896fd256ad73df35ec51a8966fe69 SHA512 b8511b0d8b581d371ee48f2c8a5a72930e7a0686a860200e56e83e2f58a63f2d781af75829d922e98f6648d361e20efde29abcf52c086b77647457c6c3586e78
 DIST libsecp256k1-0.5.1.tar.gz 1962518 BLAKE2B edff454529755c5de4f7a5192235b7e461426cc05da83ba1be03a3f9f4327397ae96b11bbf4250cd09165a1a6bd5383b928d4374713c47ef930de0af11cfc772 SHA512 5cba94794ac9c0e9a72111958562690bfb79b1ccd3071e0aaa22c4c6a4fe4007b87e402c00bbab1bdc93f31490d4b528d7ac368870ac05de12ee76db8313e510
 DIST libsecp256k1-0.6.0.tar.gz 1996783 BLAKE2B 6c8ec26bd3d10f463ac4aeed4aa092718a8101012d9ae0b8931166a4bec717f9d5bdc2c8ef21395f6ce2285828871deefa1e47299654d19634c9398d7447acea SHA512 bccaa15295b0633e1fe5a4a4d7a80be812e40c8ed815be4f0d3f3348a5e185633c599cd50b7461a3584f89aea94f6d5321772876c5146553e2732df8b72becc2
-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 1569 BLAKE2B 8bdcfc642c81e89452bda4b16974d6d5fdac999d89a3d33c5ce255c71fa0ec715fb74f4c69c61301397618561c0513978150ef8105a173924e050133257625e8 SHA512 fab97dd27464d172584eff44ec94d59a077bdf8dd5a4b02052a214dafe2abc85d3f966d5c3fc8c57e75ca2407e8da2a9d27f96b9037674c2cb0774f6ee17d73b
-EBUILD libsecp256k1-0.1_pre20201028-r1.ebuild 1764 BLAKE2B 40d7ca57489930a4b47a392d9c845dee45dd45e6d2de72567d71cc1e0ab3995943fb8f8562ed58bc2cc0cda90b79e650a7c669ef328e2ccbb2b5ecc41ce15d97 SHA512 8099ea2fa5e5808397c24c7697aeee96918db094c10caf643f8dfbf8ab0231d7ac9f6cb5fc02f7ffe00261f6b1f42204084fbb9a04eefc18b8ab4b2602aaf2e0
-EBUILD libsecp256k1-0.3.0.ebuild 1709 BLAKE2B d2350984d007d4350fedefcb45b48db8e1458f821db8f2d7b7e1d9e3c1a21804e2709dab864d0c571b7a0950509c2daa8ea0a4450bbd441ba5503007ce05908c SHA512 e749b236b153706b0ee07dd2c961ec3a536edccb8cde4f60e676b6e91496b610caf18ff82a49e7e49847af6321ab71d7f0d3ea595edc9d1dbb9401ec0b0b231e
-EBUILD libsecp256k1-0.3.1.ebuild 1709 BLAKE2B d2350984d007d4350fedefcb45b48db8e1458f821db8f2d7b7e1d9e3c1a21804e2709dab864d0c571b7a0950509c2daa8ea0a4450bbd441ba5503007ce05908c SHA512 e749b236b153706b0ee07dd2c961ec3a536edccb8cde4f60e676b6e91496b610caf18ff82a49e7e49847af6321ab71d7f0d3ea595edc9d1dbb9401ec0b0b231e
-EBUILD libsecp256k1-0.3.2.ebuild 1709 BLAKE2B 990018262a9278fb65cb17d8e0698c1fcb7eae39646bdb7e6c447c664c8e9bd3eeaec2e8c884bb2b93f9353d330d455adc378798e83e59d6891982dcfe86f3d7 SHA512 1cf4e799ec4fd3be6a9293f92006983df8c1fd5bdaa42e7644596fedf0ebf5a1c043d1480cb8e5aea597646e269abafee022a116329a34c37f9b97554722a818
-EBUILD libsecp256k1-0.4.0.ebuild 1750 BLAKE2B ec4efa0023d607c3268ac7f74ec8788569b7eb5d77b5b599c87e8796db48c255e884bcf6f6a209a54cc073fba3501767b1a739852819d09153c98e00d197950e SHA512 b8d5590ac42eb0ecacb4ac13f707fc9ec14fb26f81aa5c1c33e9cbab17cbef30132ae06f2ce09353f1b723fed24ce832ee404e7c82d4fb83a56744c691e91882
-EBUILD libsecp256k1-0.4.1.ebuild 1637 BLAKE2B 2d0b7a5dacc80beedfa4aaeba865dc49468b355d5b5f2a9f420568406eccbfde6e323a512558c8b929ddf6dfeba7ff420b1d62de5821640cbbd28c1bdc2d840e SHA512 887f0331136d6a945b7f8a2d19de404c56b942872743eff9d2f0e68ee9201c7b720eb09cb48b211f02cbadeaa6d0d6e73480c5dc0f389f60e2ec7a1a5641a541
-EBUILD libsecp256k1-0.5.0.ebuild 1630 BLAKE2B 21966672a481637b1462164d07818fe64705789c17e09cb66982c57a0501e6c5dd421691e4dd0388e1750028db3aea8731908a1cbf7e0fc96cf609b92fec1116 SHA512 c200ed8cb3afe91f048956a51813d4570a085e8116389b1d1537f013934d80912f6b9d979e7589bea8e6f29442f0be0c7271632273e8b171c9438e6efb1eae67
-EBUILD libsecp256k1-0.5.1.ebuild 1624 BLAKE2B ece360549b88f87c9324dfe82dca67566dbf54a5ae945ec953e57c64b6bcf4283825fa54fd86362e2e5151253c0cd03a6c1a0edbc5f6c347213f64914e551c73 SHA512 edbf49f97d0f6693f6ca204408446d91ab8288288f294360eb21579858588f031f2ac31b28df2d5e78864810d03b421f7f0cdefcbefed0861401ee8ca280941b
-EBUILD libsecp256k1-0.6.0.ebuild 1821 BLAKE2B 7e1514c6c16c60937a606879d0e2335969ccd06112a277db162038e7eda410deef7eca54fd6c873d6236710cbb6fbfdc019448e9ee241f7b3296ea11e48f14d7 SHA512 5dd2483bddf9cefed03571f73e968e611b5d992dc243094dd642ea52796df0fd2a6b2bfda7d4a10ce9427db30aeff1f5f49a075eb133e5c26bed1945be8352fa
-MISC metadata.xml 1369 BLAKE2B 935dca61c06efd8f9353ac2360e126d1437609bacd2ccb6a7313548674d07992b3c89503e2a227a68cad5ab67a7fa959c45c000099083a6e6d1f63174385208f SHA512 c06a92153e3570db4c65aa2c47850848cce2be05d6c6155ca77d757ff4d3c7b277a76732fc5ca22c8904cd5641e6eaaa5e5b524f66dc2cb1ba9ac2d064f6653a
+EBUILD libsecp256k1-0.5.1.ebuild 1779 BLAKE2B eb6f72bdc047ee4130bb6be33a1abfc3561236f23ae1152199253ee15f380bc14c5a891fe99df9396708f48b81cb5c39d5acf15c5ba032a18c1b76ae8dde8816 SHA512 003a75b03e23056c037aab4ac26fe45f67291427e85b234f1d626bcf74681b1ae8ec431b64db32203cb28d8d2ec2702ac1a370057b3c7c55ca11f0358dc80612
+EBUILD libsecp256k1-0.6.0.ebuild 1976 BLAKE2B 73ac4f8526048a269e233e318cb112330c89f8e0005560595ce0cb20ad1e77bc34b1e8f7758b03dc15f5f01a1233a13b9aa2b6ef7c0d15b847b2b55980340a39 SHA512 42fe9e5719e483027d66e7ced4ef92d806ecd3d5f9b946177725c365f7aa9ada2dc960b581a90668b5cb52f7f04422bb6a133a2953eb5d452de400f64a076c6d
+MISC metadata.xml 1243 BLAKE2B df52851a4c0c3ac5d14e609abb8b43fea01a56436e4824171713262e1cfb5828d7e91e060eb48196ddd72fce90bdfb823f51772c399172963721de1561f4a5a7 SHA512 3a4ba1d15a7b1e9b126f2ac7d5e6453c8836f3203acd4d76bb13cdec60e1de1e39ac6e90e1ee380f051c1740fd6be48d3a1a8780cc248cb06f46186395bbf754
diff --git a/dev-libs/libsecp256k1/files/0.3.0-fix-cross-compile.patch b/dev-libs/libsecp256k1/files/0.3.0-fix-cross-compile.patch
deleted file mode 100644
index 1aec78d36589..000000000000
--- a/dev-libs/libsecp256k1/files/0.3.0-fix-cross-compile.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://github.com/bitcoin-core/secp256k1/pull/1159
-
-From dc87b08eea757aae95b1efc25fe543e91510df0a 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` variable to its build-system
-counterpart, `CC_FOR_BUILD`, and we specify Automake per-program
-overrides for `CFLAGS`, `CPPFLAGS`, and `LDFLAGS`, setting their values
-respectively from the `CFLAGS_FOR_BUILD`, `CPPFLAGS_FOR_BUILD`, and
-`LDFLAGS_FOR_BUILD` variables, whose values in turn 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  | 35 +++++++++++++++++++++++++++--------
- configure.ac |  1 +
- 2 files changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e3fdf4da..5e859c91 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -186,15 +186,34 @@ 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)
-+# 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_CONFIG_DEFINES)
-+precompute_ecmult_CFLAGS = $(CFLAGS_FOR_BUILD)
-+precompute_ecmult_CPPFLAGS = $(CPPFLAGS_FOR_BUILD) $(SECP_CONFIG_DEFINES)
-+precompute_ecmult_LDFLAGS = $(LDFLAGS_FOR_BUILD)
- precompute_ecmult_LDADD = $(COMMON_LIB)
- 
- precompute_ecmult_gen_SOURCES = src/precompute_ecmult_gen.c
--precompute_ecmult_gen_CPPFLAGS = $(SECP_CONFIG_DEFINES)
-+precompute_ecmult_gen_CFLAGS = $(CFLAGS_FOR_BUILD)
-+precompute_ecmult_gen_CPPFLAGS = $(CPPFLAGS_FOR_BUILD) $(SECP_CONFIG_DEFINES)
-+precompute_ecmult_gen_LDFLAGS = $(LDFLAGS_FOR_BUILD)
- precompute_ecmult_gen_LDADD = $(COMMON_LIB)
- 
- # See Automake manual, Section "Errors with distclean".
-@@ -204,11 +223,11 @@ precompute_ecmult_gen_LDADD = $(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 a46a0a7b..3b88d0d0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,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_pre20190401.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
deleted file mode 100644
index f9c8c9d6cffd..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-COMMITHASH="b19c000063be11018b4d1a6b0a85871ab9d0bdcf"
-SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	ecdh? ( experimental )
-	java? ( ecdh )
-	test-openssl? ( test )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	java? ( virtual/jdk )
-	test-openssl? ( dev-libs/openssl:0 )
-"
-BDEPEND="
-	java? ( virtual/jdk )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-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
-	econf \
-		--disable-benchmark \
-		$(use_enable experimental) \
-		$(use_enable java jni) \
-		$(use_enable test tests) \
-		$(use_enable test-openssl openssl-tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$asm_opt \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
deleted file mode 100644
index 5d25d6fc5453..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-COMMITHASH="3967d96bf184519eb98b766af665b4d4b072563e"
-SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-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 )
-	schnorr? ( experimental extrakeys )
-	test-openssl? ( test )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test-openssl? ( dev-libs/openssl:0 )
-	valgrind? ( dev-debug/valgrind )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-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
-	econf \
-		--disable-benchmark \
-		$(use_enable experimental) \
-		$(use_enable test tests) \
-		$(use_enable test exhaustive-tests) \
-		$(use_enable test-openssl openssl-tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable extrakeys module-extrakeys) \
-		--with-asm=${asm_opt} \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		$(use_enable schnorr module-schnorrsig) \
-		$(usex lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2' '') \
-		$(use_with valgrind) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
deleted file mode 100644
index 9dacf0b84fde..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	schnorr? ( extrakeys )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.3.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Generate during build
-	rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-benchmark
-		$(use_enable experimental)
-		$(use_enable test tests)
-		$(use_enable test exhaustive-tests)
-		$(use_enable {,module-}ecdh)
-		$(use_enable {,module-}extrakeys)
-		$(use_enable {,module-}recovery)
-		$(use_enable schnorr module-schnorrsig)
-		$(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/libsecp256k1-0.3.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
deleted file mode 100644
index 9dacf0b84fde..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	schnorr? ( extrakeys )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.3.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Generate during build
-	rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-benchmark
-		$(use_enable experimental)
-		$(use_enable test tests)
-		$(use_enable test exhaustive-tests)
-		$(use_enable {,module-}ecdh)
-		$(use_enable {,module-}extrakeys)
-		$(use_enable {,module-}recovery)
-		$(use_enable schnorr module-schnorrsig)
-		$(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/libsecp256k1-0.3.2.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
deleted file mode 100644
index a1de3bf23f5c..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	schnorr? ( extrakeys )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.3.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Generate during build
-	rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-benchmark
-		$(use_enable experimental)
-		$(use_enable test tests)
-		$(use_enable test exhaustive-tests)
-		$(use_enable {,module-}ecdh)
-		$(use_enable {,module-}extrakeys)
-		$(use_enable {,module-}recovery)
-		$(use_enable schnorr module-schnorrsig)
-		$(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=arm32 )
-		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/libsecp256k1-0.4.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
deleted file mode 100644
index af00152f3730..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	schnorr? ( extrakeys )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.4.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Generate during build
-	rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-benchmark
-		$(use_enable experimental)
-		$(use_enable test tests)
-		$(use_enable test exhaustive-tests)
-		$(use_enable {,module-}ecdh)
-		$(use_enable {,module-}ellswift)
-		$(use_enable {,module-}extrakeys)
-		$(use_enable {,module-}recovery)
-		$(use_enable schnorr module-schnorrsig)
-		$(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=arm32 )
-		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/libsecp256k1-0.4.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
deleted file mode 100644
index 09b8366b8764..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	schnorr? ( extrakeys )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.4.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Generate during build
-	rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-benchmark
-		$(use_enable experimental)
-		$(use_enable test tests)
-		$(use_enable test exhaustive-tests)
-		$(use_enable {,module-}ecdh)
-		$(use_enable {,module-}ellswift)
-		$(use_enable {,module-}extrakeys)
-		$(use_enable {,module-}recovery)
-		$(use_enable schnorr module-schnorrsig)
-		$(use_with asm asm "$(usex arm arm32 auto)")
-		$(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2')
-		$(use_with valgrind)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
deleted file mode 100644
index 57b2d865e1ba..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2"  # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	schnorr? ( extrakeys )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
-	"${FILESDIR}/0.4.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# Generate during build
-	rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-benchmark
-		$(use_enable experimental)
-		$(use_enable test tests)
-		$(use_enable test exhaustive-tests)
-		$(use_enable {,module-}ecdh)
-		$(use_enable {,module-}ellswift)
-		$(use_enable {,module-}extrakeys)
-		$(use_enable {,module-}recovery)
-		$(use_enable schnorr module-schnorrsig)
-		$(use_with asm asm "$(usex arm arm32 auto)")
-		$(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-kb=2')
-		$(use_with valgrind)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
index c28846fde624..146e0e7adeac 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
@@ -40,6 +40,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/729888
+	tc-export_build_env BUILD_CC BUILD_CPP
+	export CC_FOR_BUILD="${BUILD_CC}" CPP_FOR_BUILD="${BUILD_CPP}"
+
 	local myeconfargs=(
 		--disable-benchmark
 		$(use_enable experimental)
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild
index 0b1785939856..246a6bac38ed 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
@@ -46,6 +46,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/729888
+	tc-export_build_env BUILD_CC BUILD_CPP
+	export CC_FOR_BUILD="${BUILD_CC}" CPP_FOR_BUILD="${BUILD_CPP}"
+
 	local myeconfargs=(
 		--disable-benchmark
 		$(use_enable experimental)
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 734060bad981..08a4e16cdf19 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -16,14 +16,12 @@
   <use>
     <flag name="ecdh">Enable ECDH shared secret computation</flag>
     <flag name="ellswift">Enable ElligatorSwift encoding for public keys</flag>
-    <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 4, gen precision 2)</flag>
     <flag name="musig">Enable MuSig2 module</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>
   </use>
   <upstream>
     <remote-id type="github">bitcoin-core/secp256k1</remote-id>