gentoo auto-resync : 24:10:2023 - 14:40:32

8 files changed, 3 insertions, 601 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c3cfd6710959..c5731b5073f5 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 2b6b3a5a516d..e49b52c194dd 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,11 +1,2 @@
-AUX 24.0.1-syslibs.patch 9037 BLAKE2B fa634a8f18d1f1c32d1c3cb18bdfcafc89838a7f5b3a075a40ad3354d1253f1d637351d2661475eb86110db470a7b29c9cfb6266a7f61623c0865939c9e74453 SHA512 fcf8114174e69c5385058b190fa2c0b0ef105869d5d6a40a3cc6bb8e8ef1518cb8bc1fb7cc3a7ec28f361d91f66e4253420c2b50a0004a2dc0978910254cae3d
-DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
-DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
-DIST bitcoin-24.0.1.tar.gz 11412628 BLAKE2B 2a8c83aecd12d8d40305d78ede1f389884ee62cfe4af39a9b416b8887a595f3393d599ebe9ddeb576bba5896923feb7ee45ba32d7d4cb0ce9e6d0ef39ecf83c7 SHA512 de1ddb543429f70b0b55a46500e0bc4807cca1b1655a28f8ab186d6f6e620f8cf82420bbdf412976ffed9bc6d742926b19933429c734edaf7430a4f8c37e1685
-DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
-DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD libbitcoinconsensus-0.21.0.ebuild 2356 BLAKE2B bde74c3275a7e3855fe37f91c50f4967c239dd0f56a0119b8567e87cf13bc40505407e0c51ac830a148f1a67c351a8797d27dd8f4acdd4bb95f299b971272a00 SHA512 87596512f29bf5d38fae4890fd3baeab25a2cbefa53bb110e534176fd579b55612f61194bc76b4b651c4b81c7e403ce0c30f368f2d49ea0d5e217d8dddd13f20
-EBUILD libbitcoinconsensus-22.0.ebuild 3193 BLAKE2B 58b0cfba170bd4e1e43e9e21fba6d17bf18d6d5366208385de5556cc8f9dd4e90b7e8d335304b1fad25a9fffe3826ab673c6cbb77b2a18d1e84e4299c55de2d8 SHA512 eb399b93aa0a645b0f85292caecbe199091a071f4f7bc00c7fefa8898457d8939f5c2591f04e7f142cdd828d349cf774c1c4ecda5dc0a870175697d390ca9ffd
-EBUILD libbitcoinconsensus-24.0.1.ebuild 2335 BLAKE2B 1cd5c7922a55ab693e56d5b467e28b2c432eed9848fd23fd114a10ede3e4e619e36cd950fb864d53d34055b437ac22e1d054010e9c952dc87bd50b222fbe35d4 SHA512 75a8143d572920799e5cb7e7d809f87c9222bcb9ad79cd3ef298fb46837b74a679b43bbd3388c7b143a2c813b66cd38ee28254dd3c9ccd6f7bb988bc5424fe6b
-EBUILD libbitcoinconsensus-25.1.ebuild 378 BLAKE2B 284109f96a37a174624ee910a435113ee6a978ba8bbc7a2e5d2f2667c23701edaceb492b423c93474ef00ddd70eb56392d9d4e7df778ae5b02282743597b41e4 SHA512 fe8f928b30e2088b2bbdc57b5ed4cb33eaf79e4b3f0bc6b6393141321b323a681454a7cd8c04421d2518651cb9ed8dfcaeef77ca83d4a5769096e393783adc24
-MISC metadata.xml 710 BLAKE2B 3d75198b842caa94dd3de1bca5cabc08559fcf3d03cea90602ebc8eabb4f1be96ee9aca89500096048655be67c4d09ae466e2d7094c77d905bc0b19ef2e99c6a SHA512 0384b791e087d1b2475d0c4fc355d5d9c160d7841e85d41a0c3c827269a0ec2d71e05f81fe68c65f32a1eb57aaf6609dd1c3a6663171e312650e5461ef563518
+EBUILD libbitcoinconsensus-25.1.ebuild 376 BLAKE2B 14cc7118dbc1555b92b1203b4c30eb5995b148399ca30f200ea7a8b84bd6822b4d0f5490aa945ba18722519a32c380a7b47441d99ff484ea03d12427622eb801 SHA512 e23f48bfe5a248e4c5b5e64846b0d31ac45db806c6dfe2df38e948a414be99009de112906cfa308374612b6e590a51025845223355529e2636fe173c2dab16ad
+MISC metadata.xml 619 BLAKE2B 617267c738415fa0ab450aedc4ec991787df1bfe90321450eb3dd54b0f139980f7672e7adab680cc3d12e95391b9ad2a9c7600b15a34a97ea4ab0515f5ee42c2 SHA512 ed268fde1fef775788bde3a6cf128b5809a4926c3e9a0371c3c72d0072100aac9d7b9d4035373a24e4c76ef87066ceb1e2240e1c0e414c34d5f3ef0f8fec0382
diff --git a/net-libs/libbitcoinconsensus/files/24.0.1-syslibs.patch b/net-libs/libbitcoinconsensus/files/24.0.1-syslibs.patch
deleted file mode 100644
index 00404a2ff021..000000000000
--- a/net-libs/libbitcoinconsensus/files/24.0.1-syslibs.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-Originally based on 22.0-fix_build_without_leveldb.patch.
-
-- Allow system libsecp256k1
-- Allow system leveldb
-- Abort if runtime leveldb != compiled-against leveldb
-- Handle berkdb support being disabled better
---- a/configure.ac
-+++ b/configure.ac
-@@ -1362,6 +1362,23 @@ if test "$enable_fuzz_binary" = "yes"; then
-   CHECK_RUNTIME_LIB
- fi
- 
-+dnl Check for libsecp256k1, only if explicitly requested
-+AC_ARG_WITH([system-libsecp256k1],
-+  [AS_HELP_STRING([--with-system-libsecp256k1],
-+  [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
-+  [system_libsecp256k1=$withval],
-+  [system_libsecp256k1=no]
-+)
-+if test x$system_libsecp256k1 != xno; then
-+  PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
-+else
-+  libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
-+  libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
-+fi
-+AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
-+AC_SUBST(libsecp256k1_CFLAGS)
-+AC_SUBST(libsecp256k1_LIBS)
-+
- if test "$enable_wallet" != "no"; then
-     dnl Check for libdb_cxx only if wallet enabled
-     if test "$use_bdb" != "no"; then
-@@ -1413,11 +1430,76 @@ if test "$use_usdt" != "no"; then
- fi
- AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"])
- 
-+build_leveldb=yes
- if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then
-   use_upnp=no
-   use_natpmp=no
-   use_zmq=no
-+  build_leveldb=no
-+fi
-+
-+if test x$build_leveldb = xno; then
-+  system_leveldb=no
-+fi
-+dnl Check for leveldb, only if explicitly requested
-+if test x$system_leveldb != xno; then
-+  build_leveldb=no
-+  LEVELDB_CPPFLAGS=
-+  AC_CHECK_LIB([leveldb],[main],[
-+    LIBLEVELDB=-lleveldb
-+  ],[
-+    AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
-+  ])
-+  AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
-+    AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
-+  ])
-+  AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
-+    AC_MSG_CHECKING([for memenv.h path])
-+    BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
-+  ],[
-+    AC_CHECK_HEADER([memenv.h],[],[
-+      AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
-+    ])
-+  ])
-+
-+  AC_MSG_CHECKING([library containing leveldb::NewMemEnv])
-+  TEMP_LIBS="$LIBS"
-+  TEMP_CPPFLAGS="$CPPFLAGS"
-+  CPPFLAGS="$CPPFLAGS $LEVELDB_CPPFLAGS"
-+  for searchlib in "" "-lmemenv" ERR; do
-+    if test "x$searchlib" = "xERR"; then
-+      AC_MSG_RESULT([no])
-+      AC_MSG_ERROR([LevelDB's memenv helper not found; using --with-system-leveldb is not supported anyway])
-+    fi
-+    searchlib="$searchlib $LIBLEVELDB"
-+    LIBS="$searchlib $TEMP_LIBS"
-+    AC_LINK_IFELSE([AC_LANG_SOURCE([
-+        #include <leveldb/env.h>
-+        #include <leveldb/helpers/memenv.h>
-+
-+        int main() {
-+            leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default());
-+            delete myenv;
-+        }
-+    ])],[
-+      AC_MSG_RESULT([$searchlib])
-+      LIBMEMENV="$searchlib"
-+      break
-+    ])
-+  done
-+  LIBS="$TEMP_LIBS"
-+  CPPFLAGS="$TEMP_CPPFLAGS"
- fi
-+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$build_leveldb = xyes])
-+AC_SUBST(LEVELDB_CPPFLAGS)
-+AC_SUBST(LIBLEVELDB)
-+AC_SUBST(LIBMEMENV)
-+AC_ARG_WITH([system-leveldb],
-+  [AS_HELP_STRING([--with-system-leveldb],
-+  [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
-+  [system_leveldb=$withval],
-+  [system_leveldb=no]
-+)
- 
- dnl Check for libminiupnpc (optional)
- if test "$use_upnp" != "no"; then
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -23,7 +23,7 @@ noinst_PROGRAMS =
- TESTS =
- BENCHMARKS =
- 
--BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS)
-+BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
- 
- LIBBITCOIN_NODE=libbitcoin_node.a
- LIBBITCOIN_COMMON=libbitcoin_common.a
-@@ -32,7 +32,11 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
- LIBBITCOIN_UTIL=libbitcoin_util.a
- LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.la
- LIBBITCOINQT=qt/libbitcoinqt.a
-+if EMBEDDED_LIBSECP256K1
- LIBSECP256K1=secp256k1/libsecp256k1.la
-+else
-+LIBSECP256K1=$(libsecp256k1_LIBS)
-+endif
- 
- if ENABLE_ZMQ
- LIBBITCOIN_ZMQ=libbitcoin_zmq.a
-@@ -67,8 +71,10 @@ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI)
- endif
- noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO)
- 
-+if EMBEDDED_LIBSECP256K1
- $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*)
- 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-+endif
- 
- # Make is not made aware of per-object dependencies to avoid limiting building parallelization
- # But to build the less dependent modules first, we manually select their order here:
-@@ -1080,7 +1086,9 @@ endif
- include Makefile.minisketch.include
- 
- include Makefile.crc32c.include
-+if EMBEDDED_LEVELDB
- include Makefile.leveldb.include
-+endif
- 
- include Makefile.test_util.include
- include Makefile.test_fuzz.include
---- a/src/Makefile.test.include
-+++ b/src/Makefile.test.include
-@@ -377,8 +377,9 @@ if ENABLE_BENCH
- 	$(BENCH_BINARY) --sanity-check > /dev/null
- endif
- endif
-+if EMBEDDED_LIBSECP256K1
- 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
--
-+endif
- if ENABLE_TESTS
- UNIVALUE_TESTS = univalue/test/object univalue/test/unitester
- noinst_PROGRAMS += $(UNIVALUE_TESTS)
---- a/src/dbwrapper.cpp
-+++ b/src/dbwrapper.cpp
-@@ -7,26 +7,45 @@
- #include <fs.h>
- #include <logging.h>
- #include <random.h>
-+#include <node/interface_ui.h>
- #include <tinyformat.h>
- #include <util/strencodings.h>
- #include <util/system.h>
-+#include <util/translation.h>
- 
- #include <algorithm>
- #include <cassert>
- #include <cstdarg>
- #include <cstdint>
- #include <cstdio>
-+#include <leveldb/c.h>
- #include <leveldb/cache.h>
- #include <leveldb/db.h>
- #include <leveldb/env.h>
- #include <leveldb/filter_policy.h>
--#include <leveldb/helpers/memenv/memenv.h>
-+#include <leveldb/helpers/memenv.h>
- #include <leveldb/iterator.h>
- #include <leveldb/options.h>
- #include <leveldb/status.h>
- #include <memory>
- #include <optional>
- 
-+bool dbwrapper_SanityCheck()
-+{
-+    unsigned long header_version = (leveldb::kMajorVersion << 16) | leveldb::kMinorVersion;
-+    unsigned long library_version = (leveldb_major_version() << 16) | leveldb_minor_version();
-+
-+    if (header_version != library_version) {
-+        InitError(Untranslated(strprintf("Compiled with LevelDB %d.%d, but linked with LevelDB %d.%d (incompatible).",
-+            leveldb::kMajorVersion, leveldb::kMinorVersion,
-+            leveldb_major_version(), leveldb_minor_version()
-+        )));
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
- class CBitcoinLevelDBLogger : public leveldb::Logger {
- public:
-     // This code is adapted from posix_logger.h, which is why it is using vsprintf.
---- a/src/dbwrapper.h
-+++ b/src/dbwrapper.h
-@@ -31,6 +31,8 @@ class Env;
- static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
- static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
- 
-+bool dbwrapper_SanityCheck();
-+
- class dbwrapper_error : public std::runtime_error
- {
- public:
---- a/src/kernel/checks.cpp
-+++ b/src/kernel/checks.cpp
-@@ -3,9 +3,10 @@
- // file COPYING or http://www.opensource.org/licenses/mit-license.php.
- 
- #include <kernel/checks.h>
--
-+#include <dbwrapper.h>
- #include <key.h>
- #include <random.h>
-+#include <node/interface_ui.h>
- #include <util/time.h>
- #include <util/translation.h>
- 
-@@ -15,6 +16,10 @@ namespace kernel {
- 
- std::optional<bilingual_str> SanityChecks(const Context&)
- {
-+    if (!dbwrapper_SanityCheck()) {
-+        return Untranslated("Database sanity check failure. Aborting.");
-+    }
-+
-     if (!ECC_InitSanityCheck()) {
-         return Untranslated("Elliptic curve cryptography sanity check failure. Aborting.");
-     }
---- a/src/qt/createwalletdialog.cpp
-+++ b/src/qt/createwalletdialog.cpp
-@@ -12,6 +12,7 @@
- 
- #include <qt/guiutil.h>
- 
-+#include <QMessageBox>
- #include <QPushButton>
- 
- CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
-@@ -94,9 +95,16 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
-         ui->external_signer_checkbox->setChecked(false);
- #endif
- 
--#ifndef USE_BDB
--        ui->descriptor_checkbox->setEnabled(false);
--        ui->descriptor_checkbox->setChecked(true);
-+#ifdef USE_BDB
-+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-+#else
-+    connect(ui->buttonBox, &QDialogButtonBox::accepted, [this]() {
-+        if (!this->isDescriptorWalletChecked()) {
-+            QMessageBox::critical(this, tr("Cannot create wallet"), tr("This build was compiled without BDB support, so only experimental descriptor wallets are supported."));
-+            return;
-+        }
-+        this->accept();
-+    });
- #endif
- 
- #ifndef ENABLE_EXTERNAL_SIGNER
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
deleted file mode 100644
index e977b9486557..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.21.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="95ea54ba089610019a74c1176a2c7c0dba144b1c"
-KNOTS_PV="${PV}.knots20210130"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots"
-
-DEPEND="
-	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2021/01/14/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
deleted file mode 100644
index 218e2e9f0d9c..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-22.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-BITCOINCORE_COMMITHASH="a0988140b71485ad12c3c3a4a9573f7c21b1eff8"
-KNOTS_PV="${PV}.knots20211108"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots"
-
-RDEPEND="
-	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13
-	|| ( >=sys-devel/gcc-7[cxx] >=sys-devel/clang-5 )
-"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2021/09/13/release-${PV}/"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.21.1" ; then
-		ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED"
-		ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin"
-		ewarn "rules, beginning in November. Protocol changes require user consent to be"
-		ewarn "effective, and if enforced inconsistently within the community may compromise"
-		ewarn "your security or others! If you do not know what you are doing, learn more"
-		ewarn "before November. (You must make a decision either way - simply not upgrading"
-		ewarn "is insecure in all scenarios.)"
-		ewarn "To learn more, see https://bitcointaproot.cc"
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++17 ; then
-			die "Building ${CATEGORY}/${P} requires at least GCC 7 or Clang 5"
-		fi
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
-	fi
-
-	default
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--disable-ebpf
-		--without-natpmp
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-util
-		--disable-util-wallet
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-fuzz-binary
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-24.0.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-24.0.1.ebuild
deleted file mode 100644
index e0e4b8abae86..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-24.0.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/"
-SRC_URI="
-	https://bitcoincore.org/bin/bitcoin-core-${PV}/bitcoin-${PV}.tar.gz
-"
-S="${WORKDIR}"/bitcoin-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots"
-# Tries to run test/test_bitcoin which isn't built as part of this package
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/libsecp256k1-0.2.0:=[recovery,schnorr]"
-DEPEND="${RDEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-PATCHES=(
-	"${FILESDIR}"/24.0.1-syslibs.patch
-)
-
-pkg_pretend() {
-	elog "You are building ${PN} from Bitcoin Core."
-	elog "For more information, see:"
-	elog "https://bitcoincore.org/en/releases/${PV}/"
-
-	if has_version "<${CATEGORY}/${PN}-0.21.1" ; then
-		ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED"
-		ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin"
-		ewarn "rules, beginning in November. Protocol changes require user consent to be"
-		ewarn "effective, and if enforced inconsistently within the community may compromise"
-		ewarn "your security or others! If you do not know what you are doing, learn more"
-		ewarn "before November. (You must make a decision either way - simply not upgrading"
-		ewarn "is insecure in all scenarios.)"
-		ewarn "To learn more, see https://bitcointaproot.cc"
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++17 ; then
-			die "Building ${CATEGORY}/${P} requires at least GCC 7 or Clang 5"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		--without-qtdbus
-		--disable-ebpf
-		--without-natpmp
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-util
-		--disable-util-wallet
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-fuzz-binary
-		--disable-ccache
-		--with-system-libsecp256k1
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-25.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-25.1.ebuild
index a13f58256a8b..dc085cb36737 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-25.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-25.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://bitcoincore.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+asm"
 
 RDEPEND="~net-p2p/bitcoin-core-${PV}[libs,asm=]"
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 9bfa2e353aff..88aab8a9fbb7 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="asm">Enable assembly for optimization</flag>
-		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>