gentoo Easter resync : 12.04.2020

5 files changed, 44 insertions, 238 deletions

diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index c5f833a73566..9518b4dadbb7 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -2,12 +2,9 @@ AUX bitcoin-qt-0.16.3-boost-1.72-missing-include.patch 700 BLAKE2B b115726fd0c65
 AUX bitcoin-qt.protocol 150 BLAKE2B b18645f52a6884fc0e475a85809d5b79e207adc346307623c5f1edececcb4564ac17bdb9a0deeb5c12c41409a34f83c1f22ab89f32852c58d948affa1de57edb SHA512 6b71d9d3fc9e05e6c6595aaaa307be9b5007c25f4b11162c5d873e200576d35156c2c660f229799400a3fba6dc8a9663ff8824371d83242d52ee6472687118ab
 AUX org.bitcoin.bitcoin-qt.desktop 468 BLAKE2B e00d41612be14770d1f34b83f98a104aed197eb62707382a0189c5b9559f572336e8d236dcd290e1a4a43df041bfdef23209e1533401659228af8b004c9b3d76 SHA512 0cecb04d7813bcc0e5c9f1a5dfc32859708d3524548f6dcee33ba9fd600a7000f64b3d5f2dbdc1dcfce0a68fd82ea932b338da77ad495ebc03b097f462a75d88
 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 bitcoin-qt-0.16.3.ebuild 4967 BLAKE2B 9c17d4bfd817fa0bdc218d6feef51af69378d8e1f3475c2820f31238f0f4c250d2eee208315f0e194b0f3d662b49cfe000bd7c8305773dc53d5f50d39145e742 SHA512 970a8fed13a0fdf88c9c94b98f0984b4a0138ab45ec6f8e74f7600d4df0abee381e9b206c41188242f6556e99f4cf30f0322b4062a88b5b19f1e3a4b7e6a3e89
-EBUILD bitcoin-qt-0.17.1.ebuild 5119 BLAKE2B 14498aef2e20fbf2e375c0f1c01e7323742d12d4696da6eeed29caab2dc3432201c60fa920d0bc9320f532993eec548fc4ba0cd3f65db869b55ad8a6e3e3a6fb SHA512 b9c0a9fe6e1a139766d46f13afecd5c20a6b5266ddd3c25f60c4067ac64fd075cf7c5dcc74157792e32c12c96a13f37baa2af306a9ada7418ec79fc3984ddbb4
-EBUILD bitcoin-qt-0.18.0.ebuild 5255 BLAKE2B 8d3d0363985b822d6dc1d512c6e0ed228288288875c790c4f919f4db5e6083412ae46a876f4111fda0c3cb22cc20036a7ec14b1f7070c70b46b4f7bb2ddffc7f SHA512 5ef943897c3a8d0e1324c97bbe8dc88b1406a93995ea17b74016eb45bc5bf5fcf85049db983b703c43b3cfeb80028a9e4ad3674770e901973ad4660038fbab4e
-MISC metadata.xml 1390 BLAKE2B 2fc9611a5a3839183e28be1f49f3eebf3c01ba0097afbcbf2c587e53edbe9ec9973dc65b834d479e8870e9094cc3fb1cc3fda266818f7b6e209079f4c576b6c9 SHA512 a5d9727f4cc019d475f625d705c08f26958d5118d4433a9245e73ef4eb2ff7ffe840630de334c93df7107eecf3adf8c7782a85b7c35690c1c073ff489548ed70
+DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
+EBUILD bitcoin-qt-0.16.3.ebuild 4655 BLAKE2B 66c93d17b35aed2be874b64ebb1bc124a1b8e27d45967bf9bdd5b3c1a7c370fccb00b11c962f00de2427a8b686ea52e2ffa9ffada10d6f4138272587bad266b2 SHA512 2fbb05e0e11e5af8f3cce588756d0e8bde1481d880991e746b09a41236d5891abf2e39d4faf4df8c76af80ed1b034a196f05ff8f62e0d0cc84378741eaa0596e
+EBUILD bitcoin-qt-0.19.1.ebuild 4909 BLAKE2B e8689372c1dec02458190ad7d2286b550ddd38644aa3110d0f80e2bd7ac24a22d47cfab2b865e1e9e726a56edc19e310be8e70a153d7e41eb5b36f1ce97d58f3 SHA512 70e965cefe59b2e94af363b916bc4910c34787f751e9a415c09380f864ae9435c3ee82b0b30d7c8ed2c67736564842f64626e037c7a3c28318478c0edb47cad7
+MISC metadata.xml 1216 BLAKE2B bda0caaaa5e249b66b397de19a8cf57d5c21c0701814a8dc7c91b1434158a27d43347a006cbb260cf86358925a6e6635c19f493a22ab426c1cd7265b79c19108 SHA512 b54fe817a2edf65e388a2fd018b079ea745ae4950b384424f3a932a1f84ee9fe2fc3a62043933c5e3ec4eb617d14009cc3191588d2e016ac3902e8aed25266e9
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
index 0ee413a509bd..21877477b08c 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+inherit autotools bash-completion-r1 db-use desktop gnome2-utils xdg-utils
 
 BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
 KNOTS_PV="${PV}.knots20180918"
@@ -21,7 +21,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 
-IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq"
+IUSE="+asm +bip70 dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -69,14 +69,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
+	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() {
@@ -98,10 +93,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
@@ -140,7 +131,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
 
 	insinto /usr/share/icons/hicolor/scalable/apps/
 	doins bitcoin128.svg
@@ -148,8 +139,7 @@ src_install() {
 		newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
 	fi
 
-	insinto /usr/share/applications
-	newins "contrib/debian/bitcoin-qt.desktop" "org.bitcoin.bitcoin-qt.desktop"
+	newmenu "contrib/debian/bitcoin-qt.desktop" "org.bitcoin.bitcoin-qt.desktop"
 
 	use libevent && dodoc doc/REST-interface.md doc/tor.md
 
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
deleted file mode 100644
index 1ae0e2eadb77..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 2010-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
-
-BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
-KNOTS_PV="${PV}.knots20181229"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
-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
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	>=dev-libs/univalue-1.0.4:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	system-leveldb? ( virtual/bitcoin-leveldb )
-	bip70? ( dev-libs/protobuf:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	dev-libs/libevent:=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	qrcode? (
-		media-gfx/qrencode:=
-	)
-	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
-	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
-	zeromq? ( net-libs/zeromq:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	knots? (
-		gnome-base/librsvg
-		media-gfx/imagemagick[png]
-	)
-"
-
-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 )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-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"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2018/12/25/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
-}
-
-src_prepare() {
-	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
-
-	# Save the generic icon for later
-	cp src/qt/res/src/bitcoin.svg bitcoin128.svg || die
-
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-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"
-	fi
-
-	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
-
-	eautoreconf
-	if use system-leveldb; then
-		rm -r src/leveldb src/secp256k1 || die
-	fi
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		$(use_enable bip70)
-		$(use_with dbus qtdbus)
-		$(use_with qrcode qrencode)
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-gui=qt5
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--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 /usr/share/icons/hicolor/scalable/apps/
-	doins bitcoin128.svg
-	if use knots; then
-		newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
-	fi
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
-	if ! use knots; then
-		sed -i 's/Knots/Core/;s/^\(Icon=\).*$/\1bitcoin128/' "${D}/usr/share/applications/org.bitcoin.bitcoin-qt.desktop" || die
-	fi
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/bitcoind.bash-completion ${PN}
-
-	if use kde; then
-		insinto /usr/share/kservices5
-		doins "${FILESDIR}/bitcoin-qt.protocol"
-		dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol"
-	fi
-}
-
-update_caches() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	update_caches
-
-	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 add your user to the 'tor' user group."
-}
-
-pkg_postrm() {
-	update_caches
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.19.1.ebuild
index 5c4928418151..03a969382479 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.19.1.ebuild
@@ -1,32 +1,32 @@
-# Copyright 2010-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+inherit autotools bash-completion-r1 db-use desktop xdg-utils
 
-BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
-KNOTS_PV="${PV}.knots20190502"
+BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f"
+KNOTS_PV="${PV}.knots20200304"
 KNOTS_P="bitcoin-${KNOTS_PV}"
 
 DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
 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
+	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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq"
+IUSE="+asm bip70 dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
 	>=dev-libs/univalue-1.0.4:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -45,7 +45,8 @@ RDEPEND="
 	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
 	zeromq? ( net-libs/zeromq:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	knots? (
 		gnome-base/librsvg
@@ -53,7 +54,18 @@ DEPEND="${RDEPEND}
 	)
 "
 
-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 )
+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}"
 
@@ -61,20 +73,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.18.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/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."
+		elog "https://bitcoincore.org/en/2020/03/04/release-${PV}/"
 	fi
+	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() {
@@ -85,7 +92,6 @@ src_prepare() {
 
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
-	eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
 	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
 
 	if use knots; then
@@ -96,10 +102,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
@@ -143,7 +145,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
 
 	insinto /usr/share/icons/hicolor/scalable/apps/
 	doins bitcoin128.svg
@@ -151,11 +153,11 @@ src_install() {
 		newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
 	fi
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+	cp "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" "${T}" || die
 	if ! use knots; then
-		sed -i 's/Knots/Core/;s/^\(Icon=\).*$/\1bitcoin128/' "${D}/usr/share/applications/org.bitcoin.bitcoin-qt.desktop" || die
+		sed -i 's/Knots/Core/;s/^\(Icon=\).*$/\1bitcoin128/' "${T}/org.bitcoin.bitcoin-qt.desktop" || die
 	fi
+	domenu "${T}/org.bitcoin.bitcoin-qt.desktop"
 
 	use zeromq && dodoc doc/zmq.md
 
@@ -169,7 +171,7 @@ src_install() {
 }
 
 update_caches() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index 0e5739a73259..d37cf8037b83 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="asm">Enable assembly for optimization</flag>
 		<flag name="bip70">Enable support for the BIP70 payment protocol</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="libevent">Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>