public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-06-13  7:47 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-06-13  7:47 UTC (permalink / raw
  To: gentoo-commits

commit:     e818e9c623dd14bae8a27d6fc0a83bdaf6b79f65
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Mon Jun 10 19:33:31 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 07:47:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e818e9c6

net-p2p/bitcoin-core: add unkeyworded 27.1_rc1

Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/37113
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                     |   1 +
 net-p2p/bitcoin-core/bitcoin-core-27.1_rc1.ebuild | 423 ++++++++++++++++++++++
 2 files changed, 424 insertions(+)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index f76b525a3ab7..755d6a1f68d0 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -3,3 +3,4 @@ DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0e
 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.tar.gz 13087956 BLAKE2B f625eaa2ce98cd8ed771f97d5a7e66733e94523d2ddda99cd858777bfb88a6e7eafae71e10fbf1ddadfcf629f2e3f790fb48c39f0e016d3fb22f1da7e7c93614 SHA512 0833fbd654570bc3e50efbe4da1f0bcab7744b92becc76d0dfea39a551325bd1b64ae746f7d9824d9e93fc53c95bc5eb5977869f0af04e26bd8ccb992d4c6e7c
+DIST bitcoin-core-27.1_rc1.tar.gz 13150196 BLAKE2B bf0b7d76b54cbb9f097b3d15e7e3397f504dba60d1f838373eb9096f435a33b9eefef408a44f7d484657e43fcd627000685d5177aab9ebc3d7d91960645b8b29 SHA512 273a1f8d05ef2d5204a59742726ad03fc8e1ce6797cf95cf9bc9c6b75db7f23d4f7e46c153c5757cefdf246b1094b9146b1fea2a853274fc11474b98874389b5

diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.1_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-27.1_rc1.ebuild
new file mode 100644
index 000000000000..820fbbb16b31
--- /dev/null
+++ b/net-p2p/bitcoin-core/bitcoin-core-27.1_rc1.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils
+
+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"
+S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
+
+LICENSE="MIT"
+SLOT="0"
+if [[ "${PV}" != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+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="
+	dbus? ( gui )
+	kde? ( gui )
+	qrcode? ( gui )
+	system-leveldb? ( || ( daemon gui ) )
+"
+# dev-libs/univalue is now bundled, as upstream dropped support for system copy
+# and their version in the Bitcoin repo has deviated a fair bit from upstream.
+# Upstream also seems very inactive.
+RDEPEND="
+	!dev-util/bitcoin-tx
+	>=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] )
+	cli? ( !net-p2p/bitcoin-cli )
+	daemon? (
+		!net-p2p/bitcoind
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? (
+		!net-p2p/bitcoin-qt
+		>=dev-qt/qtcore-5.15.11:5
+		>=dev-qt/qtgui-5.15.11:5
+		>=dev-qt/qtnetwork-5.15.11:5
+		>=dev-qt/qtwidgets-5.15.11:5
+		dbus? ( >=dev-qt/qtdbus-5.15.11:5 )
+	)
+	libs? ( !net-libs/libbitcoinconsensus )
+	nat-pmp? ( >=net-libs/libnatpmp-20220705:= )
+	qrcode? ( >=media-gfx/qrencode-4.1.1:= )
+	sqlite? ( >=dev-db/sqlite-3.38.5:= )
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] )
+	upnp? ( >=net-libs/miniupnpc-2.2.2:= )
+	zeromq? ( >=net-libs/zeromq-4.3.4:= )
+"
+DEPEND="
+	${RDEPEND}
+	systemtap? ( >=dev-debug/systemtap-4.8 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	daemon? (
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? ( >=dev-qt/linguist-tools-5.15.11:5 )
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="
+	gui? ( dev-util/desktop-file-utils )
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/i2p.md
+	doc/JSON-RPC-interface.md
+	doc/multisig-tutorial.md
+	doc/p2p-bad-ports.md
+	doc/psbt.md
+	doc/reduce-memory.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+PATCHES=(
+	"${FILESDIR}/27.0-syslibs.patch"
+	"${FILESDIR}/26.0-init.patch"
+)
+
+efmt() {
+	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
+}
+
+pkg_pretend() {
+	if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="daemon" nor USE="gui". This is a valid
+			configuration, but you will be unable to run a Bitcoin node using this
+			installation.
+		EOF
+	fi
+	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="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
+	fi
+	if ! use berkdb && ! use sqlite &&
+		{ { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } ||
+		  { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; }
+	then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid
+			configuration, but your Bitcoin node will be unable to open any wallets.
+		EOF
+	fi
+
+	# test/functional/feature_pruning.py requires 4 GB disk space
+	# test/functional/wallet_pruning.py requires 1.3 GB disk space
+	use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	! use system-leveldb || rm -r src/leveldb || die
+	if use system-libsecp256k1 ; then
+		rm -r src/secp256k1 || die
+		sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die
+	else
+		pushd src/secp256k1 >/dev/null || die
+		AT_NOELIBTOOLIZE=yes eautoreconf
+		popd >/dev/null || die
+	fi
+	eautoreconf
+
+	# we say --disable-util-util, so we can't test bitcoin-util
+	sed -ne '/^  {/{h;:0;n;H;/^  }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \
+		-i test/util/data/bitcoin-util-test.json || die
+
+	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \
+		-i contrib/completions/bash/bitcoind.bash || die
+}
+
+src_configure() {
+	local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi
+	local myeconfargs=(
+		--disable-static
+		--${wallet}-wallet
+		$(use_with sqlite)
+		$(use_with berkdb bdb)
+		$(use_enable systemtap usdt)
+		$(use_with upnp miniupnpc)
+		$(use_with nat-pmp natpmp)
+		$(use_enable test tests)
+		--disable-bench
+		--disable-fuzz{,-binary}
+		$(use_with qrcode qrencode)
+		--disable-ccache
+		$(use_enable asm)
+		$(use_enable zeromq zmq)
+		$(use_enable man)
+		$(use_enable external-signer)
+		--with-utils
+		$(use_enable {,util-}cli)
+		--enable-util-tx
+		--${wallet}-util-wallet
+		--disable-util-util
+		$(use_with libs)
+		$(use_with daemon)
+		$(use_with gui gui qt5)
+		$(use_with dbus qtdbus)
+		$(use_with system-leveldb)
+		$(use_with system-libsecp256k1)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use daemon && ! tc-is-cross-compiler ; then
+		TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
+	fi
+	sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \
+		-ni share/examples/bitcoin.conf || die
+}
+
+src_test() {
+	emake check
+
+	use daemon && edo "${PYTHON}" test/functional/test_runner.py \
+			--ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}"
+}
+
+src_install() {
+	use external-signer && DOCS+=( doc/external-signer.md )
+	use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md )
+	use libs && DOCS+=( doc/shared-libraries.md )
+	use systemtap && DOCS+=( doc/tracing.md )
+	use zeromq && DOCS+=( doc/zmq.md )
+
+	if use daemon ; then
+		# https://bugs.gentoo.org/757102
+		DOCS+=( share/rpcauth/rpcauth.py )
+		docompress -x "/usr/share/doc/${PF}/rpcauth.py"
+	fi
+
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+	! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die
+
+	newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx
+	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
+	elif use gui ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt
+	fi
+
+	if use daemon ; then
+		insinto /etc/bitcoin
+		doins share/examples/bitcoin.conf
+		fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+		fperms 0660 /etc/bitcoin/bitcoin.conf
+
+		newconfd contrib/init/bitcoind.openrcconf bitcoind
+		newinitd "${FILESDIR}/bitcoind.openrc" bitcoind
+		systemd_newunit contrib/init/bitcoind.service bitcoind.service
+
+		keepdir /var/lib/bitcoind
+		fperms 0750 /var/lib/bitcoind
+		fowners bitcoin:bitcoin /var/lib/bitcoind
+		dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+	fi
+
+	if use gui ; then
+		insinto /usr/share/icons/hicolor/scalable/apps
+		newins src/qt/res/src/bitcoin.svg bitcoin128.svg
+
+		domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+
+		if use kde ; then
+			insinto /usr/share/kservices5
+			doins "${FILESDIR}/bitcoin-qt.protocol"
+		fi
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+}
+
+pkg_preinst() {
+	if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+		if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+			dosym -r /var/lib/bitcoin{d,/.bitcoin}
+		elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then
+			efmt ewarn <<-EOF
+				Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin,
+				a deprecated location. To perform an automated migration to
+				${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances
+				that may be using the deprecated path, and then run:
+
+				# emerge --config ${CATEGORY}/${PN}
+				EOF
+			insinto /var/lib/bitcoin
+			mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die
+			dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf
+			dosym -r /var/lib/bitcoin{/.bitcoin,d}
+		fi
+	fi
+
+	if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then
+		dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol
+	fi
+}
+
+pkg_postinst() {
+	# we don't use xdg.eclass because it adds unconditional IDEPENDs
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+
+	if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		efmt -su elog <<-EOF
+			To have ${PN} automatically use Tor when it's running, be sure your \
+			'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \
+			correctly, and:
+			- Using an init script: add the 'bitcoin' user to the 'tor' user group.
+			- Running bitcoind directly: add that user to the 'tor' user group.
+			EOF
+	fi
+
+	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.
+			 - Symlink ~/.bitcoin to /var/lib/bitcoind.
+		EOF
+	fi
+
+	if use berkdb ; then
+		# https://github.com/bitcoin/bitcoin/pull/28597
+		# https://bitcoincore.org/en/releases/26.0/#wallet
+		efmt ewarn <<-EOF
+			Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin
+			Core 26.0, pending the deprecation and eventual removal of support for
+			legacy wallets altogether in future releases. At present you can still
+			force support for the creation of legacy wallets by adding the following
+			line to your bitcoin.conf:
+
+			deprecatedrpc=create_bdb
+		EOF
+	fi
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_config() {
+	if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] &&
+		[[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]]
+	then
+		in_use() {
+			: ${1:?} ; local each
+			if command -v fuser >/dev/null ; then
+				fuser "${@}" >/dev/null 2>&1
+			elif command -v lsof >/dev/null ; then
+				for each ; do
+					lsof -- "${each}" && return
+				done >/dev/null 2>&1
+			elif mountpoint -q /proc ; then
+				{ find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} +
+					awk '{ print $6 }' /proc/[0-9]*/maps
+				} 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}")
+			else
+				return 13
+			fi
+		}
+		ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use"
+		in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock}
+		case $? in
+			0)
+				eend 1
+				efmt eerror <<-EOF
+					${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any
+					running bitcoind instances that may be using this data directory, and then
+					retry this migration.
+					EOF
+				die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				;;
+			13)
+				eend 1
+				if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then
+					efmt eerror <<-EOF
+						Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use.
+						Do you have /proc mounted? To force the migration without checking, re-run
+						this command with BITCOIND_IS_NOT_RUNNING=1.
+						EOF
+					die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				fi
+				;;
+			*)
+				eend 0
+				;;
+		esac
+
+		# find all relative symlinks that point outside the data dir
+		local -A symlinks
+		cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die
+		local each ; while read -r -d '' each ; do
+			local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] &&
+				target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] &&
+				symlinks["${each}"]="${target}"
+		done < <(find -type l -print0)
+
+		einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+		rm -f -- "${EROOT}/var/lib/bitcoind" || die
+		mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} ||
+			die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+
+		# fix up the relative symlinks
+		cd -- "${EROOT}/var/lib/bitcoind" || die
+		for each in "${!symlinks[@]}" ; do
+			ln -fnrs -- "${symlinks[${each}]}" "${each}"  # keep going even if this fails
+		done
+
+		einfo 'Creating a transitional symlink for your convenience.'
+		ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin}
+		einfo 'You may remove this link when you no longer need it.'
+	else
+		einfo 'Nothing to do.'
+	fi
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-10-08 19:33 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-10-08 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     cfc954f9192b7d506c600fb75ce3f81beb7a4bdc
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Fri Oct  4 23:26:13 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 19:32:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc954f9

net-p2p/bitcoin-core: bump to 28.0

See: https://github.com/bitcoin/bitcoin/releases/tag/v28.0
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/38882
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                                           | 2 +-
 .../{bitcoin-core-28.0_rc2.ebuild => bitcoin-core-28.0.ebuild}          | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index 463acacb9ffd..55472f19f61d 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -5,5 +5,5 @@ DIST bitcoin-core-26.1.tar.gz 12822211 BLAKE2B 9093133f025a47cc93cc02056c2588be0
 DIST bitcoin-core-26.2.tar.gz 12889171 BLAKE2B 9a0d5ed49eb4e14e9bd4c88fb5665536a82ad054c8a6756bed7eeff15be1fb15bca280e73ecd97a2a09d5a4bc9ae6c400f815a83e62959eac26a22d0803a2282 SHA512 4069a903423d58e29a49c638274f0916d6b8e6e8761b987e570a230ecb3b5f6ceaa499b1d6e3dd52bc16f2c3c229ad31ab2ce1d0c91e61d85a65fdc477b0e3ba
 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-28.0_rc2.tar.gz 12595205 BLAKE2B 679e33428e39c7bfca31806f295520b926ba632568a064a3dde192fbcda37b1328a6dfa80287d462dd2286b640039741b0a7047164f617d7a28d53fed1b2a258 SHA512 ca2d598061c1dc8585ad8ac7d2c53c2b2b1af46f12425cdc6b8556eff17a97af83e9f345c5130ae2d24480b7690b2abb272dc704abe8106e1bae42c2c1d2489c
+DIST bitcoin-core-28.0.tar.gz 12598313 BLAKE2B 20b189cc359d4ba1d2c61af6f69f050be32b3670a3df7e9d8fe53e55bd78fcac8dde07d6a5d32088981742aa97234aa38c19669d77837c5ab6b114260762e039 SHA512 67b2abf58c1bc57ce53b80d2d2bc9c83fc5b6d8ac08224073e03a7f13b7f6fef1127d9b825ff3594210a7c962098b520042f1eff9007ba26a5d8922f96f96e57
 DIST bitcoin-core-miniupnpc-2.2.8-compat.patch 1130 BLAKE2B 4b1e8eaf4c7f13e9317fa4f69f6c2bce5f1663d8e4731bfe5ca5b4622fcd140e6532acdae544259727a59050b7f3f7bd7dab6f7f23dccebef4caf8fdef0f0c83 SHA512 ec0890d90a5ec3555b2e5477ead75ea5874c57aa3312dc64df5688224f51569f3f7c59593ed2f4336b283fff71c87b5d4fd786ab3cfecbb6407ef143b5018ba5

diff --git a/net-p2p/bitcoin-core/bitcoin-core-28.0_rc2.ebuild b/net-p2p/bitcoin-core/bitcoin-core-28.0.ebuild
similarity index 100%
rename from net-p2p/bitcoin-core/bitcoin-core-28.0_rc2.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-28.0.ebuild


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-09-22 11:27 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2024-09-22 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     367dcd0586b14427dc4aee7dcbf1f0f081b1a924
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Sun Sep 22 07:57:04 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 11:26:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367dcd05

net-p2p/bitcoin-core: bump to 28.0_rc2

See: https://github.com/bitcoin/bitcoin/releases/tag/v28.0rc2
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/38721
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                                           | 2 +-
 .../{bitcoin-core-28.0_rc1.ebuild => bitcoin-core-28.0_rc2.ebuild}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index fb0a5eb5b0fa..463acacb9ffd 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -5,5 +5,5 @@ DIST bitcoin-core-26.1.tar.gz 12822211 BLAKE2B 9093133f025a47cc93cc02056c2588be0
 DIST bitcoin-core-26.2.tar.gz 12889171 BLAKE2B 9a0d5ed49eb4e14e9bd4c88fb5665536a82ad054c8a6756bed7eeff15be1fb15bca280e73ecd97a2a09d5a4bc9ae6c400f815a83e62959eac26a22d0803a2282 SHA512 4069a903423d58e29a49c638274f0916d6b8e6e8761b987e570a230ecb3b5f6ceaa499b1d6e3dd52bc16f2c3c229ad31ab2ce1d0c91e61d85a65fdc477b0e3ba
 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-28.0_rc1.tar.gz 12588747 BLAKE2B dc1900ad2dd58c504092127d60db83e22cea67cbb693f6d827b9284e4ddaed9c447a0107fcbc7109dd98a465b239aee46b10496c40f40301d5e02d02b16d86a3 SHA512 6d123330d8b3f4f50b21f84463c754d8bf179b0298f1004ef3249655213fb37855665de6eb3b2e226c3127e0e83bdb93a4ee0992d300f37025c5f033dbb1891e
+DIST bitcoin-core-28.0_rc2.tar.gz 12595205 BLAKE2B 679e33428e39c7bfca31806f295520b926ba632568a064a3dde192fbcda37b1328a6dfa80287d462dd2286b640039741b0a7047164f617d7a28d53fed1b2a258 SHA512 ca2d598061c1dc8585ad8ac7d2c53c2b2b1af46f12425cdc6b8556eff17a97af83e9f345c5130ae2d24480b7690b2abb272dc704abe8106e1bae42c2c1d2489c
 DIST bitcoin-core-miniupnpc-2.2.8-compat.patch 1130 BLAKE2B 4b1e8eaf4c7f13e9317fa4f69f6c2bce5f1663d8e4731bfe5ca5b4622fcd140e6532acdae544259727a59050b7f3f7bd7dab6f7f23dccebef4caf8fdef0f0c83 SHA512 ec0890d90a5ec3555b2e5477ead75ea5874c57aa3312dc64df5688224f51569f3f7c59593ed2f4336b283fff71c87b5d4fd786ab3cfecbb6407ef143b5018ba5

diff --git a/net-p2p/bitcoin-core/bitcoin-core-28.0_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-28.0_rc2.ebuild
similarity index 100%
rename from net-p2p/bitcoin-core/bitcoin-core-28.0_rc1.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-28.0_rc2.ebuild


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-08-31  2:23 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2024-08-31  2:23 UTC (permalink / raw
  To: gentoo-commits

commit:     db7c3b5707475eadbb95b452d96423a853e8908d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 02:21:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 02:21:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db7c3b57

net-p2p/bitcoin-core: SystemTAP -> SystemTap

dev-debug/systemtap is called 'SystemTap'.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoin-core/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/metadata.xml b/net-p2p/bitcoin-core/metadata.xml
index a43e231b9918..63568431d943 100644
--- a/net-p2p/bitcoin-core/metadata.xml
+++ b/net-p2p/bitcoin-core/metadata.xml
@@ -22,7 +22,7 @@
 		<flag name="sqlite">Support descriptor wallets in SQLite format</flag>
 		<flag name="system-leveldb">Link with <pkg>virtual/bitcoin-leveldb</pkg> rather than embedding an internal copy</flag>
 		<flag name="system-libsecp256k1">Link with <pkg>dev-libs/libsecp256k1</pkg> rather than embedding an internal copy</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-07-29  7:33 Joonas Niilola
  0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2024-07-29  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     9efbcd5f9d7665542c81a53322a84160ef8a563d
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Thu Jul 11 10:25:40 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 07:33:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efbcd5f

net-p2p/bitcoin-core: bump to 26.2

See: https://github.com/bitcoin/bitcoin/releases/tag/v26.2
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/37517
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                                           | 2 +-
 .../{bitcoin-core-26.2_rc1.ebuild => bitcoin-core-26.2.ebuild}          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index e05eefe46e00..d5be9aa47104 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -2,7 +2,7 @@ DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb6
 DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0eaf4a59f5ed943a59189c0ede5d78207b7606f1c3490b90f14c17e87882242d6637fdc348005a6f60a1d8202d13 SHA512 31b7bc66b43d073611ccf19adc80a4dd3ce3a4b5cf4c8b814f4be9e771e88721d20ae0aa83d89cd8d55ffaf0853444479932b425e82081fd66bb037c6b53e4a8
 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-26.2_rc1.tar.gz 12889436 BLAKE2B 59a517597f2482ea297bbe251464e635937e166379d9dcd420a14cb1ed8af3f02c5480a1d2501a3c43c461938728e06b1c48944ad653bada2ab183ce5051647d SHA512 cd67cbd5b813d34c098a0724e00375d8a2daa3509756055a7a60fd86ef681e7e65df9c21322b38a652e580f72122b0e01bea1dd2dfb46a337cfcc0645e5b9f53
+DIST bitcoin-core-26.2.tar.gz 12889171 BLAKE2B 9a0d5ed49eb4e14e9bd4c88fb5665536a82ad054c8a6756bed7eeff15be1fb15bca280e73ecd97a2a09d5a4bc9ae6c400f815a83e62959eac26a22d0803a2282 SHA512 4069a903423d58e29a49c638274f0916d6b8e6e8761b987e570a230ecb3b5f6ceaa499b1d6e3dd52bc16f2c3c229ad31ab2ce1d0c91e61d85a65fdc477b0e3ba
 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-26.2_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.2.ebuild
similarity index 98%
rename from net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-26.2.ebuild
index 73ea8bc6302b..8c33bb9af0a7 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.2.ebuild
@@ -11,7 +11,6 @@ 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
-	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}"
 
@@ -95,7 +94,6 @@ DOCS=(
 )
 
 PATCHES=(
-	"${DISTDIR}/${PN}-miniupnpc-2.2.8-compat.patch"
 	"${FILESDIR}/26.0-syslibs.patch"
 	"${FILESDIR}/26.0-init.patch"
 )


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-06-26  9:27 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-06-26  9:27 UTC (permalink / raw
  To: gentoo-commits

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"
 )


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-06-20 11:28 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-06-20 11:28 UTC (permalink / raw
  To: gentoo-commits

commit:     736b65b51bb899f3fcf6f737d3af1e5995ed12c4
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 11:28:45 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 11:28:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736b65b5

net-p2p/bitcoin-core: stabilize 26.1 for amd64

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
index eacdbc50d800..54533f4ae6a8 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 LICENSE="MIT"
 SLOT="0"
 if [[ "${PV}" != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 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 )"


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-06-20 11:27 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-06-20 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     d1c3e50a54c80836609b3874e1eab2e3b0a1c21e
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Fri Jun 14 14:10:44 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 11:27:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c3e50a

net-p2p/bitcoin-core: add unkeyworded 26.2_rc1

See: https://github.com/bitcoin/bitcoin/releases/tag/v26.2rc1
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/37157
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                     |   1 +
 net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild | 423 ++++++++++++++++++++++
 2 files changed, 424 insertions(+)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index 906b73b6782b..2377fd11938e 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -2,5 +2,6 @@ DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb6
 DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0eaf4a59f5ed943a59189c0ede5d78207b7606f1c3490b90f14c17e87882242d6637fdc348005a6f60a1d8202d13 SHA512 31b7bc66b43d073611ccf19adc80a4dd3ce3a4b5cf4c8b814f4be9e771e88721d20ae0aa83d89cd8d55ffaf0853444479932b425e82081fd66bb037c6b53e4a8
 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-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

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
new file mode 100644
index 000000000000..eacdbc50d800
--- /dev/null
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.2_rc1.ebuild
@@ -0,0 +1,423 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils
+
+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"
+S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
+
+LICENSE="MIT"
+SLOT="0"
+if [[ "${PV}" != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+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="
+	dbus? ( gui )
+	kde? ( gui )
+	qrcode? ( gui )
+	system-leveldb? ( || ( daemon gui ) )
+"
+# dev-libs/univalue is now bundled, as upstream dropped support for system copy
+# and their version in the Bitcoin repo has deviated a fair bit from upstream.
+# Upstream also seems very inactive.
+RDEPEND="
+	!dev-util/bitcoin-tx
+	>=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] )
+	cli? ( !net-p2p/bitcoin-cli )
+	daemon? (
+		!net-p2p/bitcoind
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? (
+		!net-p2p/bitcoin-qt
+		>=dev-qt/qtcore-5.15.10:5
+		>=dev-qt/qtgui-5.15.10:5
+		>=dev-qt/qtnetwork-5.15.10:5
+		>=dev-qt/qtwidgets-5.15.10:5
+		dbus? ( >=dev-qt/qtdbus-5.15.10:5 )
+	)
+	libs? ( !net-libs/libbitcoinconsensus )
+	nat-pmp? ( >=net-libs/libnatpmp-20220705:= )
+	qrcode? ( >=media-gfx/qrencode-4.1.1:= )
+	sqlite? ( >=dev-db/sqlite-3.38.5:= )
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] )
+	upnp? ( >=net-libs/miniupnpc-2.2.2:= )
+	zeromq? ( >=net-libs/zeromq-4.3.4:= )
+"
+DEPEND="
+	${RDEPEND}
+	systemtap? ( >=dev-debug/systemtap-4.8 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	daemon? (
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? ( >=dev-qt/linguist-tools-5.15.10:5 )
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="
+	gui? ( dev-util/desktop-file-utils )
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/i2p.md
+	doc/JSON-RPC-interface.md
+	doc/multisig-tutorial.md
+	doc/p2p-bad-ports.md
+	doc/psbt.md
+	doc/reduce-memory.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+PATCHES=(
+	"${FILESDIR}/26.0-syslibs.patch"
+	"${FILESDIR}/26.0-init.patch"
+)
+
+efmt() {
+	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
+}
+
+pkg_pretend() {
+	if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="daemon" nor USE="gui". This is a valid
+			configuration, but you will be unable to run a Bitcoin node using this
+			installation.
+		EOF
+	fi
+	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="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
+	fi
+	if ! use berkdb && ! use sqlite &&
+		{ { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } ||
+		  { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; }
+	then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid
+			configuration, but your Bitcoin node will be unable to open any wallets.
+		EOF
+	fi
+
+	# test/functional/feature_pruning.py requires 4 GB disk space
+	# test/functional/wallet_pruning.py requires 1.3 GB disk space
+	use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	! use system-leveldb || rm -r src/leveldb || die
+	if use system-libsecp256k1 ; then
+		rm -r src/secp256k1 || die
+		sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die
+	else
+		pushd src/secp256k1 >/dev/null || die
+		AT_NOELIBTOOLIZE=yes eautoreconf
+		popd >/dev/null || die
+	fi
+	eautoreconf
+
+	# we say --disable-util-util, so we can't test bitcoin-util
+	sed -ne '/^  {/{h;:0;n;H;/^  }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \
+		-i test/util/data/bitcoin-util-test.json || die
+
+	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \
+		-i contrib/completions/bash/bitcoind.bash || die
+}
+
+src_configure() {
+	local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi
+	local myeconfargs=(
+		--disable-static
+		--${wallet}-wallet
+		$(use_with sqlite)
+		$(use_with berkdb bdb)
+		$(use_enable systemtap usdt)
+		$(use_with upnp miniupnpc)
+		$(use_with nat-pmp natpmp)
+		$(use_enable test tests)
+		--disable-bench
+		--disable-fuzz{,-binary}
+		$(use_with qrcode qrencode)
+		--disable-ccache
+		$(use_enable asm)
+		$(use_enable zeromq zmq)
+		$(use_enable man)
+		$(use_enable external-signer)
+		--with-utils
+		$(use_enable {,util-}cli)
+		--enable-util-tx
+		--${wallet}-util-wallet
+		--disable-util-util
+		$(use_with libs)
+		$(use_with daemon)
+		$(use_with gui gui qt5)
+		$(use_with dbus qtdbus)
+		$(use_with system-leveldb)
+		$(use_with system-libsecp256k1)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use daemon && ! tc-is-cross-compiler ; then
+		TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
+	fi
+	sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \
+		-ni share/examples/bitcoin.conf || die
+}
+
+src_test() {
+	emake check
+
+	use daemon && edo "${PYTHON}" test/functional/test_runner.py \
+			--ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}"
+}
+
+src_install() {
+	use external-signer && DOCS+=( doc/external-signer.md )
+	use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md )
+	use libs && DOCS+=( doc/shared-libraries.md )
+	use systemtap && DOCS+=( doc/tracing.md )
+	use zeromq && DOCS+=( doc/zmq.md )
+
+	if use daemon ; then
+		# https://bugs.gentoo.org/757102
+		DOCS+=( share/rpcauth/rpcauth.py )
+		docompress -x "/usr/share/doc/${PF}/rpcauth.py"
+	fi
+
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+	! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die
+
+	newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx
+	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
+	elif use gui ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt
+	fi
+
+	if use daemon ; then
+		insinto /etc/bitcoin
+		doins share/examples/bitcoin.conf
+		fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+		fperms 0660 /etc/bitcoin/bitcoin.conf
+
+		newconfd contrib/init/bitcoind.openrcconf bitcoind
+		newinitd "${FILESDIR}/bitcoind.openrc" bitcoind
+		systemd_newunit contrib/init/bitcoind.service bitcoind.service
+
+		keepdir /var/lib/bitcoind
+		fperms 0750 /var/lib/bitcoind
+		fowners bitcoin:bitcoin /var/lib/bitcoind
+		dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+	fi
+
+	if use gui ; then
+		insinto /usr/share/icons/hicolor/scalable/apps
+		newins src/qt/res/src/bitcoin.svg bitcoin128.svg
+
+		domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+
+		if use kde ; then
+			insinto /usr/share/kservices5
+			doins "${FILESDIR}/bitcoin-qt.protocol"
+		fi
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+}
+
+pkg_preinst() {
+	if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+		if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+			dosym -r /var/lib/bitcoin{d,/.bitcoin}
+		elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then
+			efmt ewarn <<-EOF
+				Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin,
+				a deprecated location. To perform an automated migration to
+				${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances
+				that may be using the deprecated path, and then run:
+
+				# emerge --config ${CATEGORY}/${PN}
+				EOF
+			insinto /var/lib/bitcoin
+			mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die
+			dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf
+			dosym -r /var/lib/bitcoin{/.bitcoin,d}
+		fi
+	fi
+
+	if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then
+		dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol
+	fi
+}
+
+pkg_postinst() {
+	# we don't use xdg.eclass because it adds unconditional IDEPENDs
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+
+	if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		efmt -su elog <<-EOF
+			To have ${PN} automatically use Tor when it's running, be sure your \
+			'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \
+			correctly, and:
+			- Using an init script: add the 'bitcoin' user to the 'tor' user group.
+			- Running bitcoind directly: add that user to the 'tor' user group.
+			EOF
+	fi
+
+	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.
+			 - Symlink ~/.bitcoin to /var/lib/bitcoind.
+		EOF
+	fi
+
+	if use berkdb ; then
+		# https://github.com/bitcoin/bitcoin/pull/28597
+		# https://bitcoincore.org/en/releases/26.0/#wallet
+		efmt ewarn <<-EOF
+			Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin
+			Core 26.0, pending the deprecation and eventual removal of support for
+			legacy wallets altogether in future releases. At present you can still
+			force support for the creation of legacy wallets by adding the following
+			line to your bitcoin.conf:
+
+			deprecatedrpc=create_bdb
+		EOF
+	fi
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_config() {
+	if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] &&
+		[[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]]
+	then
+		in_use() {
+			: ${1:?} ; local each
+			if command -v fuser >/dev/null ; then
+				fuser "${@}" >/dev/null 2>&1
+			elif command -v lsof >/dev/null ; then
+				for each ; do
+					lsof -- "${each}" && return
+				done >/dev/null 2>&1
+			elif mountpoint -q /proc ; then
+				{ find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} +
+					awk '{ print $6 }' /proc/[0-9]*/maps
+				} 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}")
+			else
+				return 13
+			fi
+		}
+		ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use"
+		in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock}
+		case $? in
+			0)
+				eend 1
+				efmt eerror <<-EOF
+					${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any
+					running bitcoind instances that may be using this data directory, and then
+					retry this migration.
+					EOF
+				die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				;;
+			13)
+				eend 1
+				if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then
+					efmt eerror <<-EOF
+						Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use.
+						Do you have /proc mounted? To force the migration without checking, re-run
+						this command with BITCOIND_IS_NOT_RUNNING=1.
+						EOF
+					die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				fi
+				;;
+			*)
+				eend 0
+				;;
+		esac
+
+		# find all relative symlinks that point outside the data dir
+		local -A symlinks
+		cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die
+		local each ; while read -r -d '' each ; do
+			local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] &&
+				target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] &&
+				symlinks["${each}"]="${target}"
+		done < <(find -type l -print0)
+
+		einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+		rm -f -- "${EROOT}/var/lib/bitcoind" || die
+		mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} ||
+			die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+
+		# fix up the relative symlinks
+		cd -- "${EROOT}/var/lib/bitcoind" || die
+		for each in "${!symlinks[@]}" ; do
+			ln -fnrs -- "${symlinks[${each}]}" "${each}"  # keep going even if this fails
+		done
+
+		einfo 'Creating a transitional symlink for your convenience.'
+		ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin}
+		einfo 'You may remove this link when you no longer need it.'
+	else
+		einfo 'Nothing to do.'
+	fi
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-06-20 11:27 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-06-20 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     04490613a37cd6fe2e033adfa80820081e2d3e18
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Fri Jun 14 14:05:36 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 11:27:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04490613

net-p2p/bitcoin-core: bump to 27.1

See: https://github.com/bitcoin/bitcoin/releases/tag/v27.1
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                                           | 2 +-
 .../{bitcoin-core-27.1_rc1.ebuild => bitcoin-core-27.1.ebuild}          | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index 755d6a1f68d0..906b73b6782b 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -3,4 +3,4 @@ DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0e
 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.tar.gz 13087956 BLAKE2B f625eaa2ce98cd8ed771f97d5a7e66733e94523d2ddda99cd858777bfb88a6e7eafae71e10fbf1ddadfcf629f2e3f790fb48c39f0e016d3fb22f1da7e7c93614 SHA512 0833fbd654570bc3e50efbe4da1f0bcab7744b92becc76d0dfea39a551325bd1b64ae746f7d9824d9e93fc53c95bc5eb5977869f0af04e26bd8ccb992d4c6e7c
-DIST bitcoin-core-27.1_rc1.tar.gz 13150196 BLAKE2B bf0b7d76b54cbb9f097b3d15e7e3397f504dba60d1f838373eb9096f435a33b9eefef408a44f7d484657e43fcd627000685d5177aab9ebc3d7d91960645b8b29 SHA512 273a1f8d05ef2d5204a59742726ad03fc8e1ce6797cf95cf9bc9c6b75db7f23d4f7e46c153c5757cefdf246b1094b9146b1fea2a853274fc11474b98874389b5
+DIST bitcoin-core-27.1.tar.gz 13146683 BLAKE2B 9df45ca67565aa1f1cb851e86302ab5e7edbc573642cbd66585910cbd20ecbe8b3a89f7441fc7f299bb3ff32cf687a617f7449cd1a4164e9ac78637501f619da SHA512 b3c2f90b125705401dbf1318db44be586f3609473a9aa3b7330d6c7f48bf5b31951f822e494ae607ebb96e5ffb62b909bea51be14fd91ed71ea62324d2736862

diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.1_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild
similarity index 100%
rename from net-p2p/bitcoin-core/bitcoin-core-27.1_rc1.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-27.1.ebuild


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-04-17 10:10 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-04-17 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3317412ab15a4c6f0c89b9f7c1f4b0df555a8eaf
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Wed Apr 17 08:40:18 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> 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 <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/36292
Signed-off-by: Florian Schmaus <flow <AT> 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.


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-04-03 17:38 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2024-04-03 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     01894255a5a44b8263f72342ab7dfc4666f93611
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Fri Mar 29 01:55:31 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Apr  3 17:34:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01894255

net-p2p/bitcoin-core: bump to 26.1

Note: This begins the rename of USE="bitcoin-cli" back to "cli" now that
the 23.0 profile no longer disables that flag by default.

See: https://github.com/bitcoin/bitcoin/releases/tag/v26.1

Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/35975
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                             |  2 +-
 ...coin-core-26.1_rc2.ebuild => bitcoin-core-26.1.ebuild} | 15 +++++++--------
 net-p2p/bitcoin-core/metadata.xml                         |  1 +
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index d6dcb289c108..6bd7695b6c08 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-26.1_rc2.tar.gz 12823146 BLAKE2B 92d193936475fd2bf8f4cb2e823546a5b51722dd80e035fbbdd1e501b9d65cfcc25f2ff60afd0702030c57e572af92bc16eae1a9a27aad7d588b5f4e77697b8c SHA512 4d77fd5fa05b53be0a0b67f6c999fedfec28c7264ed65e6173a7ab9fe1586bfc4d7947fca2a7466dbd23ebb771da5cfb6383f072f15120b2645ad8430647a5bf
+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

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
similarity index 95%
rename from net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-26.1.ebuild
index cf31b6360f4b..eacdbc50d800 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.1.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.

diff --git a/net-p2p/bitcoin-core/metadata.xml b/net-p2p/bitcoin-core/metadata.xml
index bd1fb933e02c..a43e231b9918 100644
--- a/net-p2p/bitcoin-core/metadata.xml
+++ b/net-p2p/bitcoin-core/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="berkdb">Support legacy wallets in Berkeley DB format</flag>
 		<flag name="bitcoin-cli">Build and install bitcoin-cli command line interface</flag>
+		<flag name="cli">Build and install bitcoin-cli command line interface</flag>
 		<flag name="daemon">Build and install bitcoind daemon</flag>
 		<flag name="external-signer">Include support for external wallet signer programs</flag>
 		<flag name="gui">Build and install Bitcoin-Qt GUI</flag>


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-03-07 15:19 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2024-03-07 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     3d6ca46320b6ace4d3157bc685d0e9436e73567f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 15:18:20 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 15:18:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6ca463

net-p2p/bitcoin-core: define KEYWORDS on one line

Per PG0105 and MultipleKeywordsLines.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild | 4 +---
 net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild
index 7e4f5c62aec2..f0ad56e4ac05 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild
@@ -14,9 +14,7 @@ S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
 SLOT="0"
-if [[ "${PV}" == *_rc* ]] ; then
-	KEYWORDS=""
-else
+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

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild
index 10e917bd4b78..cf31b6360f4b 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild
@@ -14,9 +14,7 @@ S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
 
 LICENSE="MIT"
 SLOT="0"
-if [[ "${PV}" == *_rc* ]] ; then
-	KEYWORDS=""
-else
+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


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-03-07 15:19 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2024-03-07 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     950b8a10289e3d99377239afef096e91104a30bd
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Wed Mar  6 18:03:20 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 15:15:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950b8a10

net-p2p/bitcoin-core: install symlink for bitcoin-qt Bash completion

Closes: https://bugs.gentoo.org/926253
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{bitcoin-core-25.1-r1.ebuild => bitcoin-core-25.1-r2.ebuild}   | 7 ++++++-
 .../{bitcoin-core-26.0.ebuild => bitcoin-core-26.0-r1.ebuild}      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
similarity index 98%
rename from net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
index 688ac7bf25d3..1b14729e0a7c 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1-r2.ebuild
@@ -221,7 +221,12 @@ src_install() {
 
 	newbashcomp contrib/completions/bash/bitcoin-tx.bash-completion bitcoin-tx
 	use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash-completion bitcoin-cli
-	use daemon || use gui && newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind
+	if use daemon ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind
+		use gui && bashcomp_alias bitcoind bitcoin-qt
+	elif use gui ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoin-qt
+	fi
 
 	if use daemon ; then
 		insinto /etc/bitcoin

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
similarity index 98%
rename from net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
index 90d9df5ad6dd..bc609a903ac0 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.0-r1.ebuild
@@ -228,7 +228,12 @@ src_install() {
 
 	newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx
 	use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli
-	use daemon || use gui && newbashcomp contrib/completions/bash/bitcoind.bash bitcoind
+	if use daemon ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoind
+		use gui && bashcomp_alias bitcoind bitcoin-qt
+	elif use gui ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt
+	fi
 
 	if use daemon ; then
 		insinto /etc/bitcoin


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2024-03-07 15:19 Sam James
  0 siblings, 0 replies; 21+ messages in thread
From: Sam James @ 2024-03-07 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     7dbd815f8630708953f03aad46ad067ce24d7caf
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Wed Mar  6 18:03:53 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 15:15:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbd815f

net-p2p/bitcoin-core: add unkeyworded 25.2_rc1 and 26.1_rc1

Closes: https://bugs.gentoo.org/926275
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/35639
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoin-core/Manifest                     |   2 +
 net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild | 415 +++++++++++++++++++++
 net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild | 426 ++++++++++++++++++++++
 3 files changed, 843 insertions(+)

diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index 496eef02d287..1bf4be169a74 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -1,2 +1,4 @@
 DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb64f9862376e2de1a0731b4aeafbf43a95b33770e882ad77b73e454d48dbd5744902c78ade2b965e3d2d4e4b4656 SHA512 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab
+DIST bitcoin-core-25.2_rc1.tar.gz 12499745 BLAKE2B db05eb84f80aebfcbb269367ac95f8e9f710210ddb99ea44755344260be3000e0c41cf9e458fb66288f8e206a376f63b2e486ff430daee4719d201b2c18f435e SHA512 40c1b13f887d7229742155d48946e42adedf1431d92acc322426a4df38625f7acabff226a70d2a864ea12d34a16b67d657db3274891c313534c46f64e7b07a3a
 DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0eaf4a59f5ed943a59189c0ede5d78207b7606f1c3490b90f14c17e87882242d6637fdc348005a6f60a1d8202d13 SHA512 31b7bc66b43d073611ccf19adc80a4dd3ce3a4b5cf4c8b814f4be9e771e88721d20ae0aa83d89cd8d55ffaf0853444479932b425e82081fd66bb037c6b53e4a8
+DIST bitcoin-core-26.1_rc1.tar.gz 12816436 BLAKE2B 05a3c774901f75368a42f4f81b2dcf181efc1db4f82b230bca1c5f78ee9a310e00654960fdab368eb169bbc283628f9c5a020d1e7c7abcad6fe15ca4feba01c5 SHA512 5f93bc3061e93c57d65c00c458c39ede19e1908a25804b2191ed4866a7cf92438b068de15e8685a37d38608d750be3ce64d3e7cc22418e27b47ed65d9bcb7557

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild
new file mode 100644
index 000000000000..7e4f5c62aec2
--- /dev/null
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.2_rc1.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils
+
+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"
+S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
+
+LICENSE="MIT"
+SLOT="0"
+if [[ "${PV}" == *_rc* ]] ; then
+	KEYWORDS=""
+else
+	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"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	dbus? ( gui )
+	kde? ( gui )
+	qrcode? ( gui )
+	system-leveldb? ( || ( daemon gui ) )
+"
+# dev-libs/univalue is now bundled, as upstream dropped support for system copy
+# and their version in the Bitcoin repo has deviated a fair bit from upstream.
+# Upstream also seems very inactive.
+RDEPEND="
+	!dev-util/bitcoin-tx
+	>=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 )
+	daemon? (
+		!net-p2p/bitcoind
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? (
+		!net-p2p/bitcoin-qt
+		>=dev-qt/qtcore-5.15.5:5
+		>=dev-qt/qtgui-5.15.5:5
+		>=dev-qt/qtnetwork-5.15.5:5
+		>=dev-qt/qtwidgets-5.15.5:5
+		dbus? ( >=dev-qt/qtdbus-5.15.5:5 )
+	)
+	libs? ( !net-libs/libbitcoinconsensus )
+	nat-pmp? ( >=net-libs/libnatpmp-20220705:= )
+	qrcode? ( >=media-gfx/qrencode-4.1.1:= )
+	sqlite? ( >=dev-db/sqlite-3.38.5:= )
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.3.1:=[recovery,schnorr] )
+	upnp? ( >=net-libs/miniupnpc-2.2.2:= )
+	zeromq? ( >=net-libs/zeromq-4.3.4:= )
+"
+DEPEND="
+	${RDEPEND}
+	systemtap? ( >=dev-debug/systemtap-4.8 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	daemon? (
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? ( >=dev-qt/linguist-tools-5.15.5:5 )
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="
+	gui? ( dev-util/desktop-file-utils )
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/i2p.md
+	doc/JSON-RPC-interface.md
+	doc/multisig-tutorial.md
+	doc/p2p-bad-ports.md
+	doc/psbt.md
+	doc/reduce-memory.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+PATCHES=(
+	"${FILESDIR}/25.0-syslibs.patch"
+	"${FILESDIR}/init.patch"
+)
+
+efmt() {
+	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
+}
+
+pkg_pretend() {
+	if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="daemon" nor USE="gui". This is a valid
+			configuration, but you will be unable to run a Bitcoin node using this
+			installation.
+		EOF
+	fi
+	if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then
+		efmt ewarn <<-EOF
+			You are enabling USE="daemon" but not USE="bitcoin-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
+	fi
+	if ! use berkdb && ! use sqlite &&
+		{ { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } ||
+		  { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; }
+	then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid
+			configuration, but your Bitcoin node will be unable to open any wallets.
+		EOF
+	fi
+
+	# test/functional/feature_pruning.py requires 4 GB disk space
+	# test/functional/wallet_pruning.py requires 1.3 GB disk space
+	use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	! use system-leveldb || rm -r src/leveldb || die
+	if use system-libsecp256k1 ; then
+		rm -r src/secp256k1 || die
+		sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die
+	else
+		pushd src/secp256k1 >/dev/null || die
+		AT_NOELIBTOOLIZE=yes eautoreconf
+		popd >/dev/null || die
+	fi
+	eautoreconf
+
+	# we say --disable-util-util, so we can't test bitcoin-util
+	sed -ne '/^  {/{h;:0;n;H;/^  }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \
+		-i test/util/data/bitcoin-util-test.json || die
+
+	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \
+		-i contrib/completions/bash/bitcoind.bash-completion || die
+}
+
+src_configure() {
+	local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi
+	local myeconfargs=(
+		--disable-static
+		--${wallet}-wallet
+		$(use_with sqlite)
+		$(use_with berkdb bdb)
+		$(use_enable systemtap usdt)
+		$(use_with upnp miniupnpc)
+		$(use_with nat-pmp natpmp)
+		$(use_enable test tests)
+		--disable-bench
+		--disable-fuzz{,-binary}
+		$(use_with qrcode qrencode)
+		--disable-ccache
+		$(use_enable asm)
+		$(use_enable zeromq zmq)
+		$(use_enable man)
+		$(use_enable external-signer)
+		--with-utils
+		$(use_enable {bitcoin,util}-cli)
+		--enable-util-tx
+		--${wallet}-util-wallet
+		--disable-util-util
+		# syscall sandbox is missing faccessat2 and pselect6, causing bitcoind to crash during tests;
+		# removed upstream for 26.0 in https://github.com/bitcoin/bitcoin/commit/32e2ffc39374f61bb2435da507f285459985df9e
+		--without-seccomp
+		$(use_with libs)
+		$(use_with daemon)
+		$(use_with gui gui qt5)
+		$(use_with dbus qtdbus)
+		$(use_with system-leveldb)
+		$(use_with system-libsecp256k1)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use daemon && ! tc-is-cross-compiler ; then
+		TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
+	fi
+	sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \
+		-ni share/examples/bitcoin.conf || die
+}
+
+src_test() {
+	emake check
+
+	use daemon && edo "${PYTHON}" test/functional/test_runner.py \
+			--ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}"
+}
+
+src_install() {
+	use external-signer && DOCS+=( doc/external-signer.md )
+	use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md )
+	use libs && DOCS+=( doc/shared-libraries.md )
+	use systemtap && DOCS+=( doc/tracing.md )
+	use zeromq && DOCS+=( doc/zmq.md )
+
+	if use daemon ; then
+		# https://bugs.gentoo.org/757102
+		DOCS+=( share/rpcauth/rpcauth.py )
+		docompress -x "/usr/share/doc/${PF}/rpcauth.py"
+	fi
+
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+	! 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
+	if use daemon ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind
+		use gui && bashcomp_alias bitcoind bitcoin-qt
+	elif use gui ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoin-qt
+	fi
+
+	if use daemon ; then
+		insinto /etc/bitcoin
+		doins share/examples/bitcoin.conf
+		fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+		fperms 0660 /etc/bitcoin/bitcoin.conf
+
+		newconfd contrib/init/bitcoind.openrcconf bitcoind
+		newinitd "${FILESDIR}/bitcoind.openrc" bitcoind
+		systemd_newunit contrib/init/bitcoind.service bitcoind.service
+
+		keepdir /var/lib/bitcoind
+		fperms 0750 /var/lib/bitcoind
+		fowners bitcoin:bitcoin /var/lib/bitcoind
+		dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+	fi
+
+	if use gui ; then
+		insinto /usr/share/icons/hicolor/scalable/apps
+		newins src/qt/res/src/bitcoin.svg bitcoin128.svg
+
+		domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+
+		if use kde ; then
+			insinto /usr/share/kservices5
+			doins "${FILESDIR}/bitcoin-qt.protocol"
+		fi
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+}
+
+pkg_preinst() {
+	if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+		if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+			dosym -r /var/lib/bitcoin{d,/.bitcoin}
+		elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then
+			efmt ewarn <<-EOF
+				Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin,
+				a deprecated location. To perform an automated migration to
+				${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances
+				that may be using the deprecated path, and then run:
+
+				# emerge --config ${CATEGORY}/${PN}
+				EOF
+			insinto /var/lib/bitcoin
+			mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die
+			dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf
+			dosym -r /var/lib/bitcoin{/.bitcoin,d}
+		fi
+	fi
+
+	if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then
+		dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol
+	fi
+}
+
+pkg_postinst() {
+	# we don't use xdg.eclass because it adds unconditional IDEPENDs
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+
+	if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		efmt -su elog <<-EOF
+			To have ${PN} automatically use Tor when it's running, be sure your \
+			'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \
+			correctly, and:
+			- Using an init script: add the 'bitcoin' user to the 'tor' user group.
+			- Running bitcoind directly: add that user to the 'tor' user group.
+			EOF
+	fi
+
+	if use bitcoin-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.
+			 - Symlink ~/.bitcoin to /var/lib/bitcoind.
+		EOF
+	fi
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_config() {
+	if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] &&
+		[[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]]
+	then
+		in_use() {
+			: ${1:?} ; local each
+			if command -v fuser >/dev/null ; then
+				fuser "${@}" >/dev/null 2>&1
+			elif command -v lsof >/dev/null ; then
+				for each ; do
+					lsof -- "${each}" && return
+				done >/dev/null 2>&1
+			elif mountpoint -q /proc ; then
+				{ find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} +
+					awk '{ print $6 }' /proc/[0-9]*/maps
+				} 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}")
+			else
+				return 13
+			fi
+		}
+		ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use"
+		in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock}
+		case $? in
+			0)
+				eend 1
+				efmt eerror <<-EOF
+					${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any
+					running bitcoind instances that may be using this data directory, and then
+					retry this migration.
+					EOF
+				die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				;;
+			13)
+				eend 1
+				if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then
+					efmt eerror <<-EOF
+						Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use.
+						Do you have /proc mounted? To force the migration without checking, re-run
+						this command with BITCOIND_IS_NOT_RUNNING=1.
+						EOF
+					die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				fi
+				;;
+			*)
+				eend 0
+				;;
+		esac
+
+		# find all relative symlinks that point outside the data dir
+		local -A symlinks
+		cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die
+		local each ; while read -r -d '' each ; do
+			local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] &&
+				target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] &&
+				symlinks["${each}"]="${target}"
+		done < <(find -type l -print0)
+
+		einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+		rm -f -- "${EROOT}/var/lib/bitcoind" || die
+		mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} ||
+			die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+
+		# fix up the relative symlinks
+		cd -- "${EROOT}/var/lib/bitcoind" || die
+		for each in "${!symlinks[@]}" ; do
+			ln -fnrs -- "${symlinks[${each}]}" "${each}"  # keep going even if this fails
+		done
+
+		einfo 'Creating a transitional symlink for your convenience.'
+		ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin}
+		einfo 'You may remove this link when you no longer need it.'
+	else
+		einfo 'Nothing to do.'
+	fi
+}

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild
new file mode 100644
index 000000000000..10e917bd4b78
--- /dev/null
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils
+
+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"
+S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}"
+
+LICENSE="MIT"
+SLOT="0"
+if [[ "${PV}" == *_rc* ]] ; then
+	KEYWORDS=""
+else
+	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"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	dbus? ( gui )
+	kde? ( gui )
+	qrcode? ( gui )
+	system-leveldb? ( || ( daemon gui ) )
+"
+# dev-libs/univalue is now bundled, as upstream dropped support for system copy
+# and their version in the Bitcoin repo has deviated a fair bit from upstream.
+# Upstream also seems very inactive.
+RDEPEND="
+	!dev-util/bitcoin-tx
+	>=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 )
+	daemon? (
+		!net-p2p/bitcoind
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? (
+		!net-p2p/bitcoin-qt
+		>=dev-qt/qtcore-5.15.10:5
+		>=dev-qt/qtgui-5.15.10:5
+		>=dev-qt/qtnetwork-5.15.10:5
+		>=dev-qt/qtwidgets-5.15.10:5
+		dbus? ( >=dev-qt/qtdbus-5.15.10:5 )
+	)
+	libs? ( !net-libs/libbitcoinconsensus )
+	nat-pmp? ( >=net-libs/libnatpmp-20220705:= )
+	qrcode? ( >=media-gfx/qrencode-4.1.1:= )
+	sqlite? ( >=dev-db/sqlite-3.38.5:= )
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] )
+	upnp? ( >=net-libs/miniupnpc-2.2.2:= )
+	zeromq? ( >=net-libs/zeromq-4.3.4:= )
+"
+DEPEND="
+	${RDEPEND}
+	systemtap? ( >=dev-debug/systemtap-4.8 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	daemon? (
+		acct-group/bitcoin
+		acct-user/bitcoin
+	)
+	gui? ( >=dev-qt/linguist-tools-5.15.10:5 )
+	test? ( ${PYTHON_DEPS} )
+"
+IDEPEND="
+	gui? ( dev-util/desktop-file-utils )
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/i2p.md
+	doc/JSON-RPC-interface.md
+	doc/multisig-tutorial.md
+	doc/p2p-bad-ports.md
+	doc/psbt.md
+	doc/reduce-memory.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+PATCHES=(
+	"${FILESDIR}/26.0-syslibs.patch"
+	"${FILESDIR}/26.0-init.patch"
+)
+
+efmt() {
+	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
+}
+
+pkg_pretend() {
+	if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="daemon" nor USE="gui". This is a valid
+			configuration, but you will be unable to run a Bitcoin node using this
+			installation.
+		EOF
+	fi
+	if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then
+		efmt ewarn <<-EOF
+			You are enabling USE="daemon" but not USE="bitcoin-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
+	fi
+	if ! use berkdb && ! use sqlite &&
+		{ { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } ||
+		  { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; }
+	then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid
+			configuration, but your Bitcoin node will be unable to open any wallets.
+		EOF
+	fi
+
+	# test/functional/feature_pruning.py requires 4 GB disk space
+	# test/functional/wallet_pruning.py requires 1.3 GB disk space
+	use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	! use system-leveldb || rm -r src/leveldb || die
+	if use system-libsecp256k1 ; then
+		rm -r src/secp256k1 || die
+		sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die
+	else
+		pushd src/secp256k1 >/dev/null || die
+		AT_NOELIBTOOLIZE=yes eautoreconf
+		popd >/dev/null || die
+	fi
+	eautoreconf
+
+	# we say --disable-util-util, so we can't test bitcoin-util
+	sed -ne '/^  {/{h;:0;n;H;/^  }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \
+		-i test/util/data/bitcoin-util-test.json || die
+
+	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \
+		-i contrib/completions/bash/bitcoind.bash || die
+}
+
+src_configure() {
+	local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi
+	local myeconfargs=(
+		--disable-static
+		--${wallet}-wallet
+		$(use_with sqlite)
+		$(use_with berkdb bdb)
+		$(use_enable systemtap usdt)
+		$(use_with upnp miniupnpc)
+		$(use_with nat-pmp natpmp)
+		$(use_enable test tests)
+		--disable-bench
+		--disable-fuzz{,-binary}
+		$(use_with qrcode qrencode)
+		--disable-ccache
+		$(use_enable asm)
+		$(use_enable zeromq zmq)
+		$(use_enable man)
+		$(use_enable external-signer)
+		--with-utils
+		$(use_enable {bitcoin,util}-cli)
+		--enable-util-tx
+		--${wallet}-util-wallet
+		--disable-util-util
+		$(use_with libs)
+		$(use_with daemon)
+		$(use_with gui gui qt5)
+		$(use_with dbus qtdbus)
+		$(use_with system-leveldb)
+		$(use_with system-libsecp256k1)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use daemon && ! tc-is-cross-compiler ; then
+		TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
+	fi
+	sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \
+		-ni share/examples/bitcoin.conf || die
+}
+
+src_test() {
+	emake check
+
+	use daemon && edo "${PYTHON}" test/functional/test_runner.py \
+			--ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}"
+}
+
+src_install() {
+	use external-signer && DOCS+=( doc/external-signer.md )
+	use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md )
+	use libs && DOCS+=( doc/shared-libraries.md )
+	use systemtap && DOCS+=( doc/tracing.md )
+	use zeromq && DOCS+=( doc/zmq.md )
+
+	if use daemon ; then
+		# https://bugs.gentoo.org/757102
+		DOCS+=( share/rpcauth/rpcauth.py )
+		docompress -x "/usr/share/doc/${PF}/rpcauth.py"
+	fi
+
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+	! 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
+	if use daemon ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoind
+		use gui && bashcomp_alias bitcoind bitcoin-qt
+	elif use gui ; then
+		newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt
+	fi
+
+	if use daemon ; then
+		insinto /etc/bitcoin
+		doins share/examples/bitcoin.conf
+		fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+		fperms 0660 /etc/bitcoin/bitcoin.conf
+
+		newconfd contrib/init/bitcoind.openrcconf bitcoind
+		newinitd "${FILESDIR}/bitcoind.openrc" bitcoind
+		systemd_newunit contrib/init/bitcoind.service bitcoind.service
+
+		keepdir /var/lib/bitcoind
+		fperms 0750 /var/lib/bitcoind
+		fowners bitcoin:bitcoin /var/lib/bitcoind
+		dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+	fi
+
+	if use gui ; then
+		insinto /usr/share/icons/hicolor/scalable/apps
+		newins src/qt/res/src/bitcoin.svg bitcoin128.svg
+
+		domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+
+		if use kde ; then
+			insinto /usr/share/kservices5
+			doins "${FILESDIR}/bitcoin-qt.protocol"
+		fi
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+}
+
+pkg_preinst() {
+	if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+		if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
+			dosym -r /var/lib/bitcoin{d,/.bitcoin}
+		elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then
+			efmt ewarn <<-EOF
+				Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin,
+				a deprecated location. To perform an automated migration to
+				${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances
+				that may be using the deprecated path, and then run:
+
+				# emerge --config ${CATEGORY}/${PN}
+				EOF
+			insinto /var/lib/bitcoin
+			mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die
+			dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf
+			dosym -r /var/lib/bitcoin{/.bitcoin,d}
+		fi
+	fi
+
+	if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then
+		dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol
+	fi
+}
+
+pkg_postinst() {
+	# we don't use xdg.eclass because it adds unconditional IDEPENDs
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+
+	if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		efmt -su elog <<-EOF
+			To have ${PN} automatically use Tor when it's running, be sure your \
+			'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \
+			correctly, and:
+			- Using an init script: add the 'bitcoin' user to the 'tor' user group.
+			- Running bitcoind directly: add that user to the 'tor' user group.
+			EOF
+	fi
+
+	if use bitcoin-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.
+			 - Symlink ~/.bitcoin to /var/lib/bitcoind.
+		EOF
+	fi
+
+	if use berkdb ; then
+		# https://github.com/bitcoin/bitcoin/pull/28597
+		# https://bitcoincore.org/en/releases/26.0/#wallet
+		efmt ewarn <<-EOF
+			Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin
+			Core 26.0, pending the deprecation and eventual removal of support for
+			legacy wallets altogether in future releases. At present you can still
+			force support for the creation of legacy wallets by adding the following
+			line to your bitcoin.conf:
+
+			deprecatedrpc=create_bdb
+		EOF
+	fi
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_config() {
+	if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] &&
+		[[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]]
+	then
+		in_use() {
+			: ${1:?} ; local each
+			if command -v fuser >/dev/null ; then
+				fuser "${@}" >/dev/null 2>&1
+			elif command -v lsof >/dev/null ; then
+				for each ; do
+					lsof -- "${each}" && return
+				done >/dev/null 2>&1
+			elif mountpoint -q /proc ; then
+				{ find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} +
+					awk '{ print $6 }' /proc/[0-9]*/maps
+				} 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}")
+			else
+				return 13
+			fi
+		}
+		ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use"
+		in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock}
+		case $? in
+			0)
+				eend 1
+				efmt eerror <<-EOF
+					${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any
+					running bitcoind instances that may be using this data directory, and then
+					retry this migration.
+					EOF
+				die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				;;
+			13)
+				eend 1
+				if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then
+					efmt eerror <<-EOF
+						Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use.
+						Do you have /proc mounted? To force the migration without checking, re-run
+						this command with BITCOIND_IS_NOT_RUNNING=1.
+						EOF
+					die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use"
+				fi
+				;;
+			*)
+				eend 0
+				;;
+		esac
+
+		# find all relative symlinks that point outside the data dir
+		local -A symlinks
+		cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die
+		local each ; while read -r -d '' each ; do
+			local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] &&
+				target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] &&
+				symlinks["${each}"]="${target}"
+		done < <(find -type l -print0)
+
+		einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+		rm -f -- "${EROOT}/var/lib/bitcoind" || die
+		mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} ||
+			die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind."
+
+		# fix up the relative symlinks
+		cd -- "${EROOT}/var/lib/bitcoind" || die
+		for each in "${!symlinks[@]}" ; do
+			ln -fnrs -- "${symlinks[${each}]}" "${each}"  # keep going even if this fails
+		done
+
+		einfo 'Creating a transitional symlink for your convenience.'
+		ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin}
+		einfo 'You may remove this link when you no longer need it.'
+	else
+		einfo 'Nothing to do.'
+	fi
+}


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2023-12-13  7:47 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2023-12-13  7:47 UTC (permalink / raw
  To: gentoo-commits

commit:     05a44653f0cb459b22349e4b15c447ac70bf09be
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Tue Dec 12 21:25:56 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 07:46:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a44653

net-p2p/bitcoin-core: fix build failure when USE="-daemon"

Regenerating the example bitcoin.conf doesn't work when we didn't build
bitcoind.

No revbump required since it was not possible to complete a build in the
affected configurations.

Closes: https://bugs.gentoo.org/919772
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/34255
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild
index 6bdeaa1317a6..4e37d3fc4059 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild
@@ -194,7 +194,9 @@ src_configure() {
 src_compile() {
 	default
 
-	tc-is-cross-compiler || TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
+	if use daemon && ! tc-is-cross-compiler ; then
+		TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die
+	fi
 	sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \
 		-ni share/examples/bitcoin.conf || die
 }


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2023-10-25  8:37 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2023-10-25  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2d23ce0f6769a00197db3e28117a7e809dc92828
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Tue Oct 24 15:46:17 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 08:37:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d23ce0f

net-p2p/bitcoin-core: install rpcauth.py to doc dir

Closes: https://bugs.gentoo.org/757102
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../{bitcoin-core-25.1.ebuild => bitcoin-core-25.1-r1.ebuild}       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
similarity index 98%
rename from net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
rename to net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
index a5818124e34f..5eadbf6fddce 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
@@ -191,6 +191,12 @@ src_install() {
 	use systemtap && DOCS+=( doc/tracing.md )
 	use zeromq && DOCS+=( doc/zmq.md )
 
+	if use daemon ; then
+		# https://bugs.gentoo.org/757102
+		DOCS+=( share/rpcauth/rpcauth.py )
+		docompress -x "/usr/share/doc/${PF}/rpcauth.py"
+	fi
+
 	default
 
 	find "${ED}" -type f -name '*.la' -delete || die


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2023-10-25  8:37 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2023-10-25  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     1494dde4f27b31dd269d646e5ce0298f082c4716
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Tue Oct 24 15:43:47 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 08:37:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1494dde4

net-p2p/bitcoin-core: add warnings about unlikely USE flag combos

Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild | 42 ++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
index 351ec614e96f..a5818124e34f 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
@@ -95,6 +95,36 @@ PATCHES=(
 	"${FILESDIR}/init.patch"
 )
 
+efmt() {
+	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
+}
+
+pkg_pretend() {
+	if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="daemon" nor USE="gui". This is a valid
+			configuration, but you will be unable to run a Bitcoin node using this
+			installation.
+		EOF
+	fi
+	if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then
+		efmt ewarn <<-EOF
+			You are enabling USE="daemon" but not USE="bitcoin-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
+	fi
+	if ! use berkdb && ! use sqlite &&
+		{ { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } ||
+		  { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; }
+	then
+		efmt ewarn <<-EOF
+			You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid
+			configuration, but your Bitcoin node will be unable to open any wallets.
+		EOF
+	fi
+}
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
@@ -209,10 +239,6 @@ src_install() {
 	fi
 }
 
-efmt() {
-	: ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}")
-}
-
 pkg_preinst() {
 	if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
 		if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then
@@ -254,6 +280,14 @@ pkg_postinst() {
 			- Running bitcoind directly: add that user to the 'tor' user group.
 			EOF
 	fi
+
+	if use bitcoin-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.
+			 - Symlink ~/.bitcoin to /var/lib/bitcoind.
+		EOF
+	fi
 }
 
 pkg_postrm() {


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2023-10-25  8:37 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2023-10-25  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ce3df200dcf0857155b695bc917825d4edea840c
Author:     Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Tue Oct 24 16:00:31 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 08:37:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce3df200

net-p2p/bitcoin-core: run functional tests if USE="daemon"

Add --without-seccomp since the sandbox is broken and has been dropped
upstream in 26.0 anyway.

Pass --timeout-factor (default: 15) to test/functional/test_runner.py
since our system may not be as quick as the machines upstream tests on,
especially if we happen to be building multiple packages in parallel.
Set TIMEOUT_FACTOR in package env to override.

Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
index 5eadbf6fddce..4d55cae08417 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit autotools bash-completion-r1 db-use desktop python-any-r1 systemd xdg-utils
+inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd xdg-utils
 
 DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency"
 HOMEPAGE="https://bitcoincore.org/"
@@ -123,10 +123,17 @@ pkg_pretend() {
 			configuration, but your Bitcoin node will be unable to open any wallets.
 		EOF
 	fi
+
+	# test/functional/feature_pruning.py requires 4 GB disk space
+	# test/functional/wallet_pruning.py requires 1.3 GB disk space
+	use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend
 }
 
 pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup
+		python-any-r1_pkg_setup
+	fi
 }
 
 src_prepare() {
@@ -174,6 +181,9 @@ src_configure() {
 		--enable-util-tx
 		--${wallet}-util-wallet
 		--disable-util-util
+		# syscall sandbox is missing faccessat2 and pselect6, causing bitcoind to crash during tests;
+		# removed upstream for 26.0 in https://github.com/bitcoin/bitcoin/commit/32e2ffc39374f61bb2435da507f285459985df9e
+		--without-seccomp
 		$(use_with libs)
 		$(use_with daemon)
 		$(use_with gui gui qt5)
@@ -184,6 +194,13 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	emake check
+
+	use daemon && edo "${PYTHON}" test/functional/test_runner.py \
+			--ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}"
+}
+
 src_install() {
 	use external-signer && DOCS+=( doc/external-signer.md )
 	use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md )


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2023-10-24  9:14 Joonas Niilola
  0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2023-10-24  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     46885b9adfec7c1b558411a1711e7961f57f94b4
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 09:14:02 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 09:14:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46885b9a

net-p2p/bitcoin-core: Stabilize 25.1 x86, #902099

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
index 99945cb2a26c..7697985bd4d0 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/-core}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 gui +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq"
 RESTRICT="!test? ( test )"


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2023-10-24  9:14 Joonas Niilola
  0 siblings, 0 replies; 21+ messages in thread
From: Joonas Niilola @ 2023-10-24  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     020013f9af9b8fb6867d36084d403471268a0c06
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 09:13:33 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 09:13:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020013f9

net-p2p/bitcoin-core: Stabilize 25.1 amd64, #902099

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
index f512f8f4c517..99945cb2a26c 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/-core}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 gui +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq"
 RESTRICT="!test? ( test )"


^ permalink raw reply related	[flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/
@ 2023-10-09 13:14 Florian Schmaus
  0 siblings, 0 replies; 21+ messages in thread
From: Florian Schmaus @ 2023-10-09 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a6f863a3eacafb5487e924d5870234422c564bbf
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 13:13:29 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 13:14:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f863a3

net-p2p/bitcoin-core: don't enable USE=qrcode per default

USE=qrcode requires qt5 via REQUIRED_USE, which is *not* enabled per
default. Either both USE flags should be enabled per default, or none.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild
index 0ed41f21df48..396432ac6598 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.0.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.0.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="


^ permalink raw reply related	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2024-10-08 19:33 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-13  7:47 [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2024-10-08 19:33 Florian Schmaus
2024-09-22 11:27 Sam James
2024-08-31  2:23 Sam James
2024-07-29  7:33 Joonas Niilola
2024-06-26  9:27 Florian Schmaus
2024-06-20 11:28 Florian Schmaus
2024-06-20 11:27 Florian Schmaus
2024-06-20 11:27 Florian Schmaus
2024-04-17 10:10 Florian Schmaus
2024-04-03 17:38 Florian Schmaus
2024-03-07 15:19 Sam James
2024-03-07 15:19 Sam James
2024-03-07 15:19 Sam James
2023-12-13  7:47 Florian Schmaus
2023-10-25  8:37 Florian Schmaus
2023-10-25  8:37 Florian Schmaus
2023-10-25  8:37 Florian Schmaus
2023-10-24  9:14 Joonas Niilola
2023-10-24  9:14 Joonas Niilola
2023-10-09 13:14 Florian Schmaus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox