commit:     ef78ef66f5a4b4c92e646a45ebd20c06c756eeb3
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Tue Jun 25 19:38:33 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 09:26:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef78ef66

net-p2p/bitcoin-core: make compat with >=net-libs/miniupnpc-2.2.8

See: 
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5
Closes: https://bugs.gentoo.org/934821
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/37301
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                     | 1 +
 net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild  | 6 +++++-
 net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild     | 6 +++++-
 net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild  | 6 +++++-
 net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild     | 6 +++++-
 net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild | 6 +++++-
 net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild     | 6 +++++-
 net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild     | 6 +++++-
 8 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index 2377fd11938e..e05eefe46e00 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -5,3 +5,4 @@ DIST bitcoin-core-26.1.tar.gz 12822211 BLAKE2B 
9093133f025a47cc93cc02056c2588be0
 DIST bitcoin-core-26.2_rc1.tar.gz 12889436 BLAKE2B 
59a517597f2482ea297bbe251464e635937e166379d9dcd420a14cb1ed8af3f02c5480a1d2501a3c43c461938728e06b1c48944ad653bada2ab183ce5051647d
 SHA512 
cd67cbd5b813d34c098a0724e00375d8a2daa3509756055a7a60fd86ef681e7e65df9c21322b38a652e580f72122b0e01bea1dd2dfb46a337cfcc0645e5b9f53
 DIST bitcoin-core-27.0.tar.gz 13087956 BLAKE2B 
f625eaa2ce98cd8ed771f97d5a7e66733e94523d2ddda99cd858777bfb88a6e7eafae71e10fbf1ddadfcf629f2e3f790fb48c39f0e016d3fb22f1da7e7c93614
 SHA512 
0833fbd654570bc3e50efbe4da1f0bcab7744b92becc76d0dfea39a551325bd1b64ae746f7d9824d9e93fc53c95bc5eb5977869f0af04e26bd8ccb992d4c6e7c
 DIST bitcoin-core-27.1.tar.gz 13146683 BLAKE2B 
9df45ca67565aa1f1cb851e86302ab5e7edbc573642cbd66585910cbd20ecbe8b3a89f7441fc7f299bb3ff32cf687a617f7449cd1a4164e9ac78637501f619da
 SHA512 
b3c2f90b125705401dbf1318db44be586f3609473a9aa3b7330d6c7f48bf5b31951f822e494ae607ebb96e5ffb62b909bea51be14fd91ed71ea62324d2736862
+DIST bitcoin-core-miniupnpc-2.2.8-compat.patch 1130 BLAKE2B 
4b1e8eaf4c7f13e9317fa4f69f6c2bce5f1663d8e4731bfe5ca5b4622fcd140e6532acdae544259727a59050b7f3f7bd7dab6f7f23dccebef4caf8fdef0f0c83
 SHA512 
ec0890d90a5ec3555b2e5477ead75ea5874c57aa3312dc64df5688224f51569f3f7c59593ed2f4336b283fff71c87b5d4fd786ab3cfecbb6407ef143b5018ba5

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild 
b/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
index 1b14729e0a7c..52a3f31055e3 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop 
edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/";
-SRC_URI="https://bitcoincore.org/bin/${P}/${P/-core}.tar.gz";
+SRC_URI="
+       https://bitcoincore.org/bin/${P}/${P/-core}.tar.gz
+       
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1
 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${P/-core}"
 
 LICENSE="MIT"
@@ -91,6 +94,7 @@ DOCS=(
 )
 
 PATCHES=(
+       "${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
        "${FILESDIR}/25.0-syslibs.patch"
        "${FILESDIR}/init.patch"
 )

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild 
b/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild
index b51f27a43b29..d3b23526e37c 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop 
edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/";
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="
+       https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz
+       
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1
 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+       "${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
        "${FILESDIR}/25.0-syslibs.patch"
        "${FILESDIR}/init.patch"
 )

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild 
b/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
index bc609a903ac0..27e0238e5b62 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop 
edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/";
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV}.tar.gz -> 
${P/-core}.tar.gz"
+SRC_URI="
+       https://github.com/bitcoin/bitcoin/archive/v${PV}.tar.gz -> 
${P/-core}.tar.gz
+       
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1
 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${P/-core}"
 
 LICENSE="MIT"
@@ -91,6 +94,7 @@ DOCS=(
 )
 
 PATCHES=(
+       "${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
        "${FILESDIR}/26.0-syslibs.patch"
        "${FILESDIR}/26.0-init.patch"
 )

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild 
b/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
index 54533f4ae6a8..5327852ba303 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop 
edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/";
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="
+       https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz
+       
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1
 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+       "${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
        "${FILESDIR}/26.0-syslibs.patch"
        "${FILESDIR}/26.0-init.patch"
 )

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild 
b/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
index eacdbc50d800..73ea8bc6302b 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop 
edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/";
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="
+       https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz
+       
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1
 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+       "${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
        "${FILESDIR}/26.0-syslibs.patch"
        "${FILESDIR}/26.0-init.patch"
 )

diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild 
b/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild
index 44f1f8378b82..f35da4dc4869 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop 
edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/";
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="
+       https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz
+       
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1
 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+       "${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
        "${FILESDIR}/27.0-syslibs.patch"
        "${FILESDIR}/26.0-init.patch"
 )

diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild 
b/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild
index 820fbbb16b31..9ee8d0810153 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild
@@ -9,7 +9,10 @@ inherit autotools bash-completion-r1 check-reqs db-use desktop 
edo multiprocessi
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/";
-SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="
+       https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> 
${P}.tar.gz
+       
https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1
 -> ${PN}-miniupnpc-2.2.8-compat.patch
+"
 S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
@@ -92,6 +95,7 @@ DOCS=(
 )
 
 PATCHES=(
+       "${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
        "${FILESDIR}/27.0-syslibs.patch"
        "${FILESDIR}/26.0-init.patch"
 )

Reply via email to