gentoo resync : 15.01.2020

5 files changed, 17 insertions, 3 deletions

diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index b48187dc8b26..d7a6cfdcfcae 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,6 +1,7 @@
 AUX 0.18.0-daemon-fix.patch 470 BLAKE2B eb390dbe6a0093fa1e977e55efa7e562b67316c6c5b247359da1effc0ff0d7057abd67189a232ba0fdca79328e5d80dd1fa6b9a609c8d4bd820ac3da3b994bd6 SHA512 9f3f85d1f2b5e8dc2556a5a2bc246ef5eaa6305ab10aacc5ca5bfb2f52d9d21f2c52fc6bc0e5c34221b8bae4daead2e8edf13e69878eb59bfa1d3580df84b62b
 AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f
 AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888
+AUX bitcoind-0.16.3-missing-include.patch 194 BLAKE2B 9e445cc1e6db76fbd6353eba59b15344b0df82581683ef5432b41faa5a31b847920d84c07de1af95f75d234f2394aec7feb8287354a32890d951a9375165b605 SHA512 236217e8f75974d57b7ea525f80f0840e1a5ecf5ee579422c01ab8eb195e2e62722a16426726ea66609de7b2c255827e2debe43aa13a2fd6c8eb69ce3d84d1dd
 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
@@ -9,7 +10,7 @@ DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a1
 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 4872 BLAKE2B ce55ed47b10e8e9ed864b84774afa9941fddceda43503c8307d3b5ca937756f296631dd60e7f95007d457105f011ef36438e68a904f00a72f35224b51cc5b96f SHA512 57c1edf677c9f944445c91e59998f548e00157ddf3648a20f7a4a46f30fea876f2e499e04ba1d604052c91007c84ddcb61c760b5a8df96b6e5b2cad0dd62da81
-EBUILD bitcoind-0.17.1.ebuild 4949 BLAKE2B ac286880adf9cfa813baf458177c331ab5207c974bd941891260c10b0bcf2e517e4bb285bd5f6af195bf315d37b5d4e42cb868d7731c4c964779eee40b29ac2b SHA512 87bd022955a7c2e4fce1a28e49f7e3f26936806537e0cefb63ae0879e92dbd39dd96943bbb60e645e60ee03c88926dd37168a1b875afb20a441fe684f10cd05d
-EBUILD bitcoind-0.18.0.ebuild 5190 BLAKE2B 1dc826611b26271ba81094be25828a026e9f9d201d5e23cd993f92b468f2a85d118f041949d3e3892849c3927eb1ae0a319f80b740a43bb340de926a449dc9e2 SHA512 b035c5a725ffb851051b8f022be3a259275525344b60a6d1c96f629c2a1505f4d1d8be93ee3297fdf5e40a8998b5a8065c8ec3425efd894029f65eb1ffc9b63e
+EBUILD bitcoind-0.16.3.ebuild 4929 BLAKE2B 0659fbc5d29350ad948f4108762fca414c6f5893342a6a7463bfe1b7d4b3744ce5969949954d6aa040b4ae333df368661ffd9344a0e7c2fbec28befb0710d0f7 SHA512 1f6d0648aea9d864d22bbc55236e0b9ffd6ad0744051b165f40447eafcafa6179a28538dcac2e784ac07e58355969a6ec39a8b3fa9631067e0a4ade012101079
+EBUILD bitcoind-0.17.1.ebuild 5006 BLAKE2B aad9e7021ab9e4241eafcfca3b6734a9259351e6600ef47078eb27ef6de33bd7352a9ac516fcea73e58da5689aaa6ee9c6e9b386a22aa72a793da1032d6d9296 SHA512 a808f9733f201b7f5a850fa65d91d31b3899624b7482c1f9e4bd7b5f793c440ee37c1806ff52516dbd6d1e01cbe12ef0e36d35e5ed91c8630d275b68a198fef3
+EBUILD bitcoind-0.18.0.ebuild 5247 BLAKE2B 24ee462f7b825086cff084e2c99bfece19ba3291e0bfc1255883aaf842a2d721f1b7414dd448ae00039ed34889ed3c487d4f1742f26eb98374aef9165feb158a SHA512 22f55c178d1891ababeecc6cac6ce8e92926691517c201fa4eeafdf97b02724850c6a0f40cd275d1981153fc5b6e725229c42560f07fe2227c5a1f88f25dbac6
 MISC metadata.xml 1126 BLAKE2B c109473fe9b14ded30c783f08664ffdddca59b27905ec3ed2c7af3b367102f30017bf79599e984546f431d9665a33f9fb7a75501a1f37a5212073a3ff6c57ea6 SHA512 8e6357a5c3860a0b0d4440f0f2341a13582a24a1256443b352834aea491ec15f1d7980b7c9b2568aa1d4f5c44dd189934065c23df4bd63199acc6189aebbf03a
diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
index 9147db4d3e08..86589b99be5e 100644
--- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
@@ -71,6 +71,7 @@ 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
diff --git a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
index 2f1df22dec83..f8e1efe4331a 100644
--- a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
@@ -71,6 +71,7 @@ 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
diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
index d758ec041969..6b144706f370 100644
--- a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -75,6 +75,7 @@ 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
diff --git a/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch b/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch
new file mode 100644
index 000000000000..f413c323b92d
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/httpserver.cpp
++++ b/src/httpserver.cpp
+@@ -13,6 +13,7 @@
+ #include <sync.h>
+ #include <ui_interface.h>
+ 
++#include <deque>
+ #include <memory>
+ #include <stdio.h>
+ #include <stdlib.h>