net-p2p/bitcoin-core: bump to 25.1

See: https://github.com/bitcoin/bitcoin/releases/tag/v25.1
Closes: https://bugs.gentoo.org/916014
Signed-off-by: Matt Whitlock <gentoo@mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/33414
Signed-off-by: Florian Schmaus <flow@gentoo.org>

4 files changed, 8 insertions, 7 deletions

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index c4ed0f3bcb9e..bbfc7b44670b 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -1 +1 @@
-DIST bitcoin-25.0.tar.gz 12413133 BLAKE2B 34f725e8c69ee3eb25d2a0c796f7688b3727603a4a34eb7ef4dd140c9b2995ecf28c60bfa45ad22614dcd445c9ddfdadd8dbb45dfbb9327c4b5dbe50c7ae9a11 SHA512 2be57fc760fa12d291dcf946522838b2e791e24e5dd98de20b5b72af2269269a66539c5bddce590e6cdb6464fd5ecb530cf549edc188ee6f08b4365fdcf850a2
+DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb64f9862376e2de1a0731b4aeafbf43a95b33770e882ad77b73e454d48dbd5744902c78ade2b965e3d2d4e4b4656 SHA512 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab
diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
index 396432ac6598..0ed41f21df48 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 # IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3
-IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer kde libs +man nat-pmp qrcode qt5 +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq"
+IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer kde libs +man nat-pmp +qrcode qt5 +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
diff --git a/net-p2p/bitcoin-core/files/25.0-syslibs.patch b/net-p2p/bitcoin-core/files/25.0-syslibs.patch
index 525ae129abbb..ec548f08b98c 100644
--- a/net-p2p/bitcoin-core/files/25.0-syslibs.patch
+++ b/net-p2p/bitcoin-core/files/25.0-syslibs.patch
@@ -1,4 +1,4 @@
-From b4cc8c4437eea107d2d821b1282051756c47a6b6 Mon Sep 17 00:00:00 2001
+From 7dea5ad88e709689e3a40f1de239e238749f9e55 Mon Sep 17 00:00:00 2001
 From: Matt Whitlock <bitcoin@mattwhitlock.name>
 Date: Sun, 17 Sep 2023 10:29:27 -0400
 Subject: [PATCH] support linking against system-installed leveldb and
@@ -113,7 +113,7 @@ index c6dc5a6875..3507a81b7a 100644
  AC_OUTPUT
  
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 1d7004ac86..c7d6fdbc39 100644
+index 1d7004ac86..2fb8d3e2eb 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -24,7 +24,7 @@ check_PROGRAMS =
@@ -148,11 +148,12 @@ index 1d7004ac86..c7d6fdbc39 100644
  
  # 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:
-@@ -1105,7 +1111,12 @@ endif
+@@ -1104,8 +1110,13 @@ endif
+ 
  include Makefile.minisketch.include
  
- include Makefile.crc32c.include
 +if EMBEDDED_LEVELDB
+ include Makefile.crc32c.include
  include Makefile.leveldb.include
 +else
 +LEVELDB_CPPFLAGS = $(leveldb_CFLAGS)
diff --git a/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1 b/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1
index bcaff58d9fb9..b70476cc16e4 100644
--- a/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1
+++ b/net-p2p/bitcoin-core/files/bitcoind.logrotate-r1
@@ -1,4 +1,4 @@
-/var/log/bitcoin/debug.log {
+/var/log/bitcoind/debug.log {
 	missingok
 	weekly
 	sharedscripts