From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDF2D158043 for ; Wed, 17 Apr 2024 10:10:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06698E29EE; Wed, 17 Apr 2024 10:10:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9C4AE29EE for ; Wed, 17 Apr 2024 10:10:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01FAA343070 for ; Wed, 17 Apr 2024 10:10:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F9EF16D3 for ; Wed, 17 Apr 2024 10:10:00 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1713348533.3317412ab15a4c6f0c89b9f7c1f4b0df555a8eaf.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/bitcoin-core/Manifest net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild X-VCS-Directories: net-p2p/bitcoin-core/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 3317412ab15a4c6f0c89b9f7c1f4b0df555a8eaf X-VCS-Branch: master Date: Wed, 17 Apr 2024 10:10:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f6ecb52-11a8-482b-84dc-ceeec988a86a X-Archives-Hash: b0a9014accdc8068ee083f570891b672 commit: 3317412ab15a4c6f0c89b9f7c1f4b0df555a8eaf Author: Matt Whitlock mattwhitlock name> AuthorDate: Wed Apr 17 08:40:18 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Apr 17 10:08:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3317412a net-p2p/bitcoin-core: bump to 25.2 and 27.0 See: https://github.com/bitcoin/bitcoin/releases/tag/v25.2 See: https://github.com/bitcoin/bitcoin/releases/tag/v27.0 Signed-off-by: Matt Whitlock mattwhitlock.name> Closes: https://github.com/gentoo/gentoo/pull/36292 Signed-off-by: Florian Schmaus gentoo.org> net-p2p/bitcoin-core/Manifest | 4 ++-- ...coin-core-25.2_rc1.ebuild => bitcoin-core-25.2.ebuild} | 15 +++++++-------- ...coin-core-27.0_rc1.ebuild => bitcoin-core-27.0.ebuild} | 15 +++++++-------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest index 6bd7695b6c08..f76b525a3ab7 100644 --- a/net-p2p/bitcoin-core/Manifest +++ b/net-p2p/bitcoin-core/Manifest @@ -1,5 +1,5 @@ DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb64f9862376e2de1a0731b4aeafbf43a95b33770e882ad77b73e454d48dbd5744902c78ade2b965e3d2d4e4b4656 SHA512 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0eaf4a59f5ed943a59189c0ede5d78207b7606f1c3490b90f14c17e87882242d6637fdc348005a6f60a1d8202d13 SHA512 31b7bc66b43d073611ccf19adc80a4dd3ce3a4b5cf4c8b814f4be9e771e88721d20ae0aa83d89cd8d55ffaf0853444479932b425e82081fd66bb037c6b53e4a8 -DIST bitcoin-core-25.2_rc1.tar.gz 12499745 BLAKE2B db05eb84f80aebfcbb269367ac95f8e9f710210ddb99ea44755344260be3000e0c41cf9e458fb66288f8e206a376f63b2e486ff430daee4719d201b2c18f435e SHA512 40c1b13f887d7229742155d48946e42adedf1431d92acc322426a4df38625f7acabff226a70d2a864ea12d34a16b67d657db3274891c313534c46f64e7b07a3a +DIST bitcoin-core-25.2.tar.gz 12502724 BLAKE2B b6c4a2916c058a399c61ea3c57dd485a19d67fd71cdadf014b82d779792de65f7359d0cf994130681e5e27d568fbcfbc7dba22ff72b2dbc684c6bde9b99ab622 SHA512 bee23eee4d95dadabc34c72f48c940d81512c25b5db2fac8ed9f58bc433f6bdbe4e4aaba2a39b7d46c08355c957f8e7afc8e9a4836f634641c297dbc41ff0809 DIST bitcoin-core-26.1.tar.gz 12822211 BLAKE2B 9093133f025a47cc93cc02056c2588be0eb8cc5dcb58c33111a79f88b7b07ef36e278ea7b95ee8d359ec0935a71846306b14d31f423e1af330dc55dcfa23abab SHA512 b7d364134b12bbd683661db95d2cd313644ca7e0f4d04163c09ab39753df55ce4943ae386e8f41b6787e993b2bbf674cde0a093487afe1a1504f0b6e45338ac9 -DIST bitcoin-core-27.0_rc1.tar.gz 13084690 BLAKE2B c4fe8de0ae8e46a5ce9f00ef0274a1ddb7bc6c448b467224375fe5f317e3af0a12a53b704b56ed4f77cfd3efd043349905e72ada1cc12db82e72be5e07374d17 SHA512 515fb0ad1dfce7d1a3b580a0200cebe6a51a267210c1218e6c601048c3ce64be52e20aa662f97183deb9d0e4e36ac23fe989f8189458c9755000c02c825353fc +DIST bitcoin-core-27.0.tar.gz 13087956 BLAKE2B f625eaa2ce98cd8ed771f97d5a7e66733e94523d2ddda99cd858777bfb88a6e7eafae71e10fbf1ddadfcf629f2e3f790fb48c39f0e016d3fb22f1da7e7c93614 SHA512 0833fbd654570bc3e50efbe4da1f0bcab7744b92becc76d0dfea39a551325bd1b64ae746f7d9824d9e93fc53c95bc5eb5977869f0af04e26bd8ccb992d4c6e7c diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild similarity index 95% rename from net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild rename to net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild index f0ad56e4ac05..b51f27a43b29 100644 --- a/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild +++ b/net-p2p/bitcoin-core/bitcoin-core-25.2.ebuild @@ -17,8 +17,7 @@ SLOT="0" if [[ "${PV}" != *_rc* ]] ; then KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi -# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 -IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" +IUSE="+asm +berkdb +cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -35,7 +34,7 @@ RDEPEND=" >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.12:= berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) - bitcoin-cli? ( !net-p2p/bitcoin-cli ) + cli? ( !net-p2p/bitcoin-cli ) daemon? ( !net-p2p/bitcoind acct-group/bitcoin @@ -109,9 +108,9 @@ pkg_pretend() { installation. EOF fi - if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then + if use daemon && ! use cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli(-),-cli(-)]" ; then efmt ewarn <<-EOF - You are enabling USE="daemon" but not USE="bitcoin-cli". This is a valid + You are enabling USE="daemon" but not USE="cli". This is a valid configuration, but you will be unable to interact with your bitcoind node via the command line using this installation. EOF @@ -179,7 +178,7 @@ src_configure() { $(use_enable man) $(use_enable external-signer) --with-utils - $(use_enable {bitcoin,util}-cli) + $(use_enable {,util-}cli) --enable-util-tx --${wallet}-util-wallet --disable-util-util @@ -232,7 +231,7 @@ src_install() { ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die newbashcomp contrib/completions/bash/bitcoin-tx.bash-completion bitcoin-tx - use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash-completion bitcoin-cli + use cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash-completion bitcoin-cli if use daemon ; then newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind use gui && bashcomp_alias bitcoind bitcoin-qt @@ -320,7 +319,7 @@ pkg_postinst() { EOF fi - if use bitcoin-cli && use daemon ; then + if use cli && use daemon ; then efmt -su elog <<-EOF To use bitcoin-cli with the /etc/init.d/bitcoind service: - Add your user(s) to the 'bitcoin' group. diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild similarity index 95% rename from net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild rename to net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild index 71f4e9421dd1..44f1f8378b82 100644 --- a/net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild +++ b/net-p2p/bitcoin-core/bitcoin-core-27.0.ebuild @@ -17,8 +17,7 @@ SLOT="0" if [[ "${PV}" != *_rc* ]] ; then KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" fi -# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 -IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" +IUSE="+asm +berkdb +cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -35,7 +34,7 @@ RDEPEND=" >=dev-libs/boost-1.81.0:= >=dev-libs/libevent-2.1.12:= berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) - bitcoin-cli? ( !net-p2p/bitcoin-cli ) + cli? ( !net-p2p/bitcoin-cli ) daemon? ( !net-p2p/bitcoind acct-group/bitcoin @@ -109,9 +108,9 @@ pkg_pretend() { installation. EOF fi - if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then + if use daemon && ! use cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli(-),-cli(-)]" ; then efmt ewarn <<-EOF - You are enabling USE="daemon" but not USE="bitcoin-cli". This is a valid + You are enabling USE="daemon" but not USE="cli". This is a valid configuration, but you will be unable to interact with your bitcoind node via the command line using this installation. EOF @@ -179,7 +178,7 @@ src_configure() { $(use_enable man) $(use_enable external-signer) --with-utils - $(use_enable {bitcoin,util}-cli) + $(use_enable {,util-}cli) --enable-util-tx --${wallet}-util-wallet --disable-util-util @@ -229,7 +228,7 @@ src_install() { ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx - use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli + use cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli if use daemon ; then newbashcomp contrib/completions/bash/bitcoind.bash bitcoind use gui && bashcomp_alias bitcoind bitcoin-qt @@ -317,7 +316,7 @@ pkg_postinst() { EOF fi - if use bitcoin-cli && use daemon ; then + if use cli && use daemon ; then efmt -su elog <<-EOF To use bitcoin-cli with the /etc/init.d/bitcoind service: - Add your user(s) to the 'bitcoin' group.