gentoo resync : 05.12.2021

5 files changed, 63 insertions, 190 deletions

diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 819a96d959dd..974cceac0d92 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,12 +1,10 @@
+AUX bitcoin-qt-0.20.1-boost-1.77-compat.patch 2255 BLAKE2B 9a65c1640fd4090840070865265b7529324e850a7f34cc13c6e6a940f0a706cf5b3849497044233f3cf5b3fde177afb4d160ded2ed3a8adfc0ae8d488724539f SHA512 f1326a67749949efee07e01175b227ff16fda8f88e0a956598013399ad3b0ae652bb3206a0ce08edfbf4a712d523f2018de684d4c747c9d234d1fab6088e42ad
 AUX bitcoin-qt.protocol 150 BLAKE2B b18645f52a6884fc0e475a85809d5b79e207adc346307623c5f1edececcb4564ac17bdb9a0deeb5c12c41409a34f83c1f22ab89f32852c58d948affa1de57edb SHA512 6b71d9d3fc9e05e6c6595aaaa307be9b5007c25f4b11162c5d873e200576d35156c2c660f229799400a3fba6dc8a9663ff8824371d83242d52ee6472687118ab
 AUX org.bitcoin.bitcoin-qt.desktop 468 BLAKE2B e00d41612be14770d1f34b83f98a104aed197eb62707382a0189c5b9559f572336e8d236dcd290e1a4a43df041bfdef23209e1533401659228af8b004c9b3d76 SHA512 0cecb04d7813bcc0e5c9f1a5dfc32859708d3524548f6dcee33ba9fd600a7000f64b3d5f2dbdc1dcfce0a68fd82ea932b338da77ad495ebc03b097f462a75d88
-DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
 DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae
-DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
-EBUILD bitcoin-qt-0.20.1.ebuild 4788 BLAKE2B f7f315f8031fad1e04bb23450469591c2116e0e62a6f90f375787c8b3161f51364984a38f2da70c67980c8dc2bc08ca134480f26b3b5b0694451ed433ffc7a96 SHA512 66327a318dcd8aa88c8f7cf3aa09c855ec6e05e220a99227b46f437488f6bd9bd7a10ef4083b8bad867b3abd4b2de9aeada2f36d7bf372d0eba0be1ea3864ca9
-EBUILD bitcoin-qt-0.21.0.ebuild 4886 BLAKE2B f201c0effcf772eb87b3a16dc1010dc6ef77e3a1865b0077ecea75fc105ef90ac7916cc303304149ef491a503f27d58aa581765d4a7a1f079c2f73f2aa8614fd SHA512 03f5b1986a7850707ae83f68cadce46ce2446ddf9a68134aa7d26855cce0fd0f9d19f961c4040e4d1704fe834c87ded40e2240156694dc23d13f61317df102a6
-EBUILD bitcoin-qt-0.21.1.ebuild 5650 BLAKE2B 56eb1f4aa02fa5f729083752dca81145492bc4f7a1c977e339e393228cabdcd1a046bc3584ad1bbf5dde823ef69909f3da9c00b2eb7c4bdd58ab9d83cfb66136 SHA512 12c1c4b5219509410d0ec3c72b2924b40a32c0ae1e2439691364a80a4683a2fdaf1d086d51e57bd05b9956c30e36886a563b1790f3aa5f36ad2329afaf77ef5f
+EBUILD bitcoin-qt-0.21.0.ebuild 4946 BLAKE2B 49170bbc182529f28bfbf60b24fa5bcbe246b94a2e670e70a34e1e11055bf3d1909411de32ab549065886427e73f57c896b829db8a375a44d2dde78e63827935 SHA512 3c7e6e3f4906248bd3668e66d2c795abc15ce89690d4eb776faf6adca7d5cb3ff4147aa3cb44048c7a5dd71bcf2f173a52a288494d6ed9f81ffe03dbbaa77ad4
+EBUILD bitcoin-qt-0.21.1.ebuild 5710 BLAKE2B deaad27da303d6e493c2ff575d705ed8336127a4ce677a7116a5ceec51be50d410c88d55800556e18e61763737da93d5330ed5ecf93f138b4aeed2d4b2391bdc SHA512 664f4539eacb702b8df2aa68fba72c6997adf5683ee57bf45381060f1a79e2fc7884c96213b6417d6ed2148e2a7a57966b756ea3fadc5233a743ef22cc4479a0
 MISC metadata.xml 1208 BLAKE2B 7ba0a536bbcfa90b950a674f136c7bb21b6d94b1fb176bfc4a0473c3e345d0eb5575c5c892b58e3ccbb9cd7b7be2a515b89710600d2886e788cc816de4a2dbf3 SHA512 bfeee0a52f41d180bea144235edd2d01791f35a3e60eb4e87115a58d116c054ca1e97cbe866b11a7906702c79423f53b521e50bcb8e894857459b2a6c5b2caa7
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
deleted file mode 100644
index 3644f4d6d0ca..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
+++ /dev/null
@@ -1,185 +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 desktop xdg-utils
-
-BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
-KNOTS_PV="${PV}.knots20200815"
-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.20.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 dbus kde knots +qrcode +system-leveldb test upnp +wallet zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[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 )
-	dbus? ( dev-qt/qtdbus:5 )
-	dev-libs/libevent:=
-	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}"
-BDEPEND="
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-	dev-qt/linguist-tools:5
-	knots? (
-		gnome-base/librsvg
-		media-gfx/imagemagick[png]
-	)
-"
-
-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}"
-
-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.20.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/2020/08/01/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() {
-	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 "${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
-
-	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)
-		$(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-util-wallet
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--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 /usr/share/icons/hicolor/scalable/apps/
-	doins bitcoin128.svg
-	if use knots; then
-		newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
-	fi
-
-	cp "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" "${T}" || die
-	if ! use knots; then
-		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
-
-	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() {
-	xdg_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.21.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
index 7f9d109b04a4..33e07afa9afe 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
@@ -100,6 +100,8 @@ src_prepare() {
 		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
 	fi
 
+	eapply "${FILESDIR}/${PN}-0.20.1-boost-1.77-compat.patch"
+
 	eapply_user
 
 	echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
index 71f88ca3d981..eebd7ff2f4de 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
@@ -116,6 +116,8 @@ src_prepare() {
 		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
 	fi
 
+	eapply "${FILESDIR}/${PN}-0.20.1-boost-1.77-compat.patch"
+
 	eapply_user
 
 	echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.20.1-boost-1.77-compat.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.20.1-boost-1.77-compat.patch
new file mode 100644
index 000000000000..53b5563cb662
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.20.1-boost-1.77-compat.patch
@@ -0,0 +1,56 @@
+commit acb7aad27ec8a184808aa7905887e3b2c5d54e9c
+Author: Rafael Sadowski <rafael@sizeofvoid.org>
+Date:   Mon Aug 16 06:34:02 2021 +0200
+
+    Fix build with Boost 1.77.0
+    
+    BOOST_FILESYSTEM_C_STR changed to accept the path as an argument
+
+diff --git a/src/fs.cpp b/src/fs.cpp
+index 4f20ca4d28f..89c7ad27dc4 100644
+--- a/src/fs.cpp
++++ b/src/fs.cpp
+@@ -242,7 +242,11 @@ void ofstream::close()
+ }
+ #else // __GLIBCXX__
+ 
++#if BOOST_VERSION >= 107700
++static_assert(sizeof(*BOOST_FILESYSTEM_C_STR(fs::path())) == sizeof(wchar_t),
++#else
+ static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t),
++#endif // BOOST_VERSION >= 107700
+     "Warning: This build is using boost::filesystem ofstream and ifstream "
+     "implementations which will fail to open paths containing multibyte "
+     "characters. You should delete this static_assert to ignore this warning, "
+diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp
+index 17f5264b459..16cb7e0baf0 100644
+--- a/src/wallet/test/db_tests.cpp
++++ b/src/wallet/test/db_tests.cpp
+@@ -25,7 +25,11 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
+     std::string test_name = "test_name.dat";
+     const fs::path datadir = gArgs.GetDataDirNet();
+     fs::path file_path = datadir / test_name;
++#if BOOST_VERSION >= 107700
++    std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path));
++#else
+     std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+     f.close();
+ 
+     std::string filename;
+diff --git a/src/wallet/test/init_test_fixture.cpp b/src/wallet/test/init_test_fixture.cpp
+index dd9354848d7..53c972c46d3 100644
+--- a/src/wallet/test/init_test_fixture.cpp
++++ b/src/wallet/test/init_test_fixture.cpp
+@@ -32,7 +32,11 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainNam
+     fs::create_directories(m_walletdir_path_cases["default"]);
+     fs::create_directories(m_walletdir_path_cases["custom"]);
+     fs::create_directories(m_walletdir_path_cases["relative"]);
++#if BOOST_VERSION >= 107700
++    std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"]));
++#else
+     std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+     f.close();
+ }
+