gentoo Easter resync : 12.04.2020

5 files changed, 44 insertions, 233 deletions

diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index f1633b51a285..4696192c9529 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -5,12 +5,9 @@ AUX bitcoind-0.16.3-missing-include.patch 194 BLAKE2B 9e445cc1e6db76fbd6353eba59
 AUX bitcoind-0.18.0-raii_event_tests-always.patch 2192 BLAKE2B 353d38c285eafb335094b7ca2102f8872f69f178bf408f41785d9685a5fc0eecfa27fc3fa69668a551b6dd1eb53fdcd3709a6362a177c53b911fd95152ca5b31 SHA512 8a99721fbe165419129a0b2632c6e8ea6535e1541083fe6ba4558193163567723301d15b16cb9657ce9b999bc2e9d04df4992d6d4a81f82cf94bedc52bc5de11
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
-DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
+DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
-DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
-EBUILD bitcoind-0.16.3.ebuild 4929 BLAKE2B 0659fbc5d29350ad948f4108762fca414c6f5893342a6a7463bfe1b7d4b3744ce5969949954d6aa040b4ae333df368661ffd9344a0e7c2fbec28befb0710d0f7 SHA512 1f6d0648aea9d864d22bbc55236e0b9ffd6ad0744051b165f40447eafcafa6179a28538dcac2e784ac07e58355969a6ec39a8b3fa9631067e0a4ade012101079
-EBUILD bitcoind-0.17.1.ebuild 5004 BLAKE2B 518be105b1d194068e3f47ded8dbc4e7cdff1b2eaa4eff4ca0d585f901babc6f97ffcee8d2f4fd4488d23e79d7bbe3125a02afbc9acabb84030be0f33ea068aa SHA512 46704e4f6d15b20681488b7efe66f6a27cb0636a308118447e792d569d029a9c82a98430c98ddbf47295826bcd1ecfbd0bdb864fd12c4db1b9ca00d76cc11339
-EBUILD bitcoind-0.18.0.ebuild 5245 BLAKE2B 4b3fd60733173c89ec5e7c4df7c17a6bfe98676bd7014d90a6b371957e5c7c7b5714bdfbf9d0082465b0527c6c774cebd75bd72f708402b9e44239395dab1237 SHA512 284a81248c1b2657afe2b42b02d2ae550a9c534b18c0fc4655ef54cf6c4c71f96a1e823b899fbcbbae95b5ae33a930d490eb5113e9e823bf949df448cfa8c175
-MISC metadata.xml 1126 BLAKE2B c109473fe9b14ded30c783f08664ffdddca59b27905ec3ed2c7af3b367102f30017bf79599e984546f431d9665a33f9fb7a75501a1f37a5212073a3ff6c57ea6 SHA512 8e6357a5c3860a0b0d4440f0f2341a13582a24a1256443b352834aea491ec15f1d7980b7c9b2568aa1d4f5c44dd189934065c23df4bd63199acc6189aebbf03a
+DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
+EBUILD bitcoind-0.16.3.ebuild 4590 BLAKE2B ed0aa66c675d03225ea9d543e183f0e683fd12bc5e17575b678ac78f3aff0dd1890303b28f0fa950b3db8f716445061a4d785055defe82f296726d26a98e3e9c SHA512 2c000cbece2b8a934f13007d907a69a33732d7be014d56b41251bf0387da17865539ceb7287c6767d8289e5e5e5e29c3895b1d685d5e0240cd0d63e7a5f67675
+EBUILD bitcoind-0.19.1.ebuild 4749 BLAKE2B a73f39d8bb38dc7464f1095e7f83afef371b9896286e480e7684f218b4e9c396b4059ba64795cec504722549a4e3ba55f9dba278c1c9cc78c02411fc6ff84844 SHA512 33d8c951151f6bdae49ccc5e6ca207a8ce938acc07d00118077cce1621e4718f1d7add84375c6f332aea50151c9a3a61d159d4f07902fea1878d358807d75b39
+MISC metadata.xml 952 BLAKE2B 93d018a58c2d352e122b848dbd124804c840be806e88f4e11d38f958aeb0a834ba686d542f4bf16ff73aaf8d7f1d13071a79cb7b813d30ca4c6998e1ec581991 SHA512 f812e5ea4a2f85d750817c18b92bb9e00c0a466697830ff4371a1bdee456c1876a5935edce1e4a4ae0be2262855a6982c65038347d3394df1aff4d7baad3a831
diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
index 86589b99be5e..74b734ed258c 100644
--- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use systemd user
+inherit autotools bash-completion-r1 db-use systemd
 
 BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
 KNOTS_PV="${PV}.knots20180918"
@@ -20,10 +20,12 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq"
+IUSE="+asm examples knots libressl test upnp +wallet zeromq"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	acct-group/bitcoin
+	acct-user/bitcoin
 	>=dev-libs/boost-1.52.0:=[threads(+)]
 	dev-libs/libevent:=
 	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
@@ -51,19 +53,9 @@ pkg_pretend() {
 		elog "For more information, see:"
 		elog "https://bitcoincore.org/en/2018/09/18/release-${PV}/"
 	fi
-	if use bitcoin_policy_rbf; then
-		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
-		elog "relay transactions paying the highest fee, regardless of receive order."
-	else
-		elog "Replace By Fee policy is disabled: Your node will only accept the first"
-		elog "transaction seen consuming a conflicting input, regardless of fee"
-		elog "offered by later ones."
-	fi
-}
-
-pkg_setup() {
-	enewgroup bitcoin
-	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+	elog "Replace By Fee policy is now always enabled by default: Your node will"
+	elog "preferentially mine and relay transactions paying the highest fee, regardless"
+	elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf"
 }
 
 src_prepare() {
@@ -82,10 +74,6 @@ src_prepare() {
 
 	eapply_user
 
-	if ! use bitcoin_policy_rbf; then
-		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
-	fi
-
 	echo '#!/bin/true' >share/genbuild.sh || die
 	mkdir -p src/obj || die
 	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
@@ -123,7 +111,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
 
 	insinto /etc/bitcoin
 	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
deleted file mode 100644
index 7e946db56847..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use systemd user
-
-BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
-KNOTS_PV="${PV}.knots20190502"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	dev-libs/libevent:=
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	>=dev-libs/univalue-1.0.4:=
-	system-leveldb? ( virtual/bitcoin-leveldb )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
-	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
-	zeromq? ( net-libs/zeromq:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/bitcoin-conf.md doc/descriptors.md doc/files.md doc/JSON-RPC-interface.md doc/psbt.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-raii_event_tests-always.patch"
-)
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
-	fi
-	if use bitcoin_policy_rbf; then
-		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
-		elog "relay transactions paying the highest fee, regardless of receive order."
-	else
-		elog "Replace By Fee policy is disabled: Your node will only accept the first"
-		elog "transaction seen consuming a conflicting input, regardless of fee"
-		elog "offered by later ones."
-	fi
-}
-
-pkg_setup() {
-	enewgroup bitcoin
-	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
-}
-
-src_prepare() {
-	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
-
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${FILESDIR}"/${PN}-0.16.3-missing-include.patch
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-		eapply "${FILESDIR}/${PV}-daemon-fix.patch"
-	fi
-
-	default
-
-	if ! use bitcoin_policy_rbf; then
-		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
-	fi
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/secp256k1 || die
-	if use system-leveldb; then
-		rm -r src/leveldb || die
-	fi
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-qrencode
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-daemon
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-libs
-		--without-gui
-		--without-rapidcheck
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		$(use_with system-leveldb)
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	rm -f "${ED}/usr/bin/test_bitcoin" || die
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	doman "${FILESDIR}/bitcoin.conf.5"
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{linearize,qos}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
-
-pkg_postinst() {
-	elog "To have ${PN} automatically use Tor when it's running, be sure your"
-	elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
-	elog "correctly, and:"
-	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
-	elog "- Running bitcoind directly: add that user to the 'tor' user group."
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild b/net-p2p/bitcoind/bitcoind-0.19.1.ebuild
index d900279ae658..7e8083f53f52 100644
--- a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.19.1.ebuild
@@ -4,29 +4,31 @@
 EAPI=7
 
 DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use systemd user
+inherit autotools bash-completion-r1 db-use systemd
 
-BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
-KNOTS_PV="${PV}.knots20181229"
+BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f"
+KNOTS_PV="${PV}.knots20200304"
 KNOTS_P="bitcoin-${KNOTS_PV}"
 
 DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 SRC_URI="
 	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq"
+IUSE="+asm examples knots libressl +system-leveldb test upnp +wallet zeromq"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	acct-group/bitcoin
+	acct-user/bitcoin
 	>=dev-libs/boost-1.52.0:=[threads(+)]
 	dev-libs/libevent:=
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
 	>=dev-libs/univalue-1.0.4:=
 	system-leveldb? ( virtual/bitcoin-leveldb )
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
@@ -37,7 +39,18 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( doc/bips.md doc/descriptors.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/JSON-RPC-interface.md
+	doc/psbt.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
 
 S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
 
@@ -45,25 +58,15 @@ pkg_pretend() {
 	if use knots; then
 		elog "You are building ${PN} from Bitcoin Knots."
 		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+		elog "https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
 	else
 		elog "You are building ${PN} from Bitcoin Core."
 		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
+		elog "https://bitcoincore.org/en/2020/03/04/release-${PV}/"
 	fi
-	if use bitcoin_policy_rbf; then
-		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
-		elog "relay transactions paying the highest fee, regardless of receive order."
-	else
-		elog "Replace By Fee policy is disabled: Your node will only accept the first"
-		elog "transaction seen consuming a conflicting input, regardless of fee"
-		elog "offered by later ones."
-	fi
-}
-
-pkg_setup() {
-	enewgroup bitcoin
-	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+	elog "Replace By Fee policy is now always enabled by default: Your node will"
+	elog "preferentially mine and relay transactions paying the highest fee, regardless"
+	elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf"
 }
 
 src_prepare() {
@@ -71,7 +74,6 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
-	eapply "${FILESDIR}"/${PN}-0.16.3-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
@@ -80,19 +82,16 @@ src_prepare() {
 		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
 	fi
 
-	eapply_user
-
-	if ! use bitcoin_policy_rbf; then
-		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
-	fi
+	default
 
 	echo '#!/bin/true' >share/genbuild.sh || die
 	mkdir -p src/obj || die
 	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
 
 	eautoreconf
+	rm -r src/secp256k1 || die
 	if use system-leveldb; then
-		rm -r src/leveldb src/secp256k1 || die
+		rm -r src/leveldb || die
 	fi
 }
 
@@ -109,9 +108,12 @@ src_configure() {
 		--with-daemon
 		--disable-util-cli
 		--disable-util-tx
+		--disable-util-wallet
 		--disable-bench
 		--without-libs
 		--without-gui
+		--without-rapidcheck
+		--disable-fuzz
 		--disable-ccache
 		--disable-static
 		$(use_with system-leveldb)
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 6283c9d733c0..31bb9103620b 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="asm">Enable assembly for optimization</flag>
-		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="system-leveldb">Use the system-wide dev-libs/leveldb instead of bundled</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>