gentoo resync : 10.04.2018

5 files changed, 17 insertions, 233 deletions

diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index fcc88a42f8f9..99b552e7cc0f 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,12 +1,11 @@
-AUX 0.13.2-libressl.patch 1761 BLAKE2B 76aa634056d293f6e175c9c272cc46dc2d0dfb1c8400aecbf027cfe04a9f4b140bd6a5f31c593995abb5cb7c819a3c4e81bc677e2495009718813d63059dfa6d SHA512 88ef81df293bd05dce54aefeda2d0a2c1fd26842ddf26a138760aa365b22637d9d782d41d93967d0a81c6404fd133159d096397c77a2e1ac71787686dc384602
 AUX bitcoin-qt-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
 AUX bitcoin-qt-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
+AUX bitcoin-qt-0.16.0-fix_memory_include.patch 310 BLAKE2B 4df06eee24f316412828f56ce535cbe867b5414b377a29878b41d095d939c6b43a5cada5d20c2e9f15f6a0fdd6cde36a0a0e3b9afa74be1e6e95ee8bd4b87820 SHA512 77b292f17332aea0443dc7104d2b6a679170c82fa320f3b5a5f2e98d7bb1cf3d3e4ad6a672f39a7a7edc1bb22a6795e6fe4fe78292e9cb892a07038d7e5c477c
 AUX bitcoin-qt-0.16.0-fix_mempoolstats.patch 1672 BLAKE2B 252efa28461f2367044da6e2a46e2273857022da8a73af654ab6b7acd02fd90051290190d3c3de1ce283a930beac64cf15847f2cc8c2b79f3d3ace61b7181bc4 SHA512 b1143d45e8de2d4a1de572bca758b01889bd14140d475de1cdf8224cdb1962dd3c418e504879a0ba81abd5e4e673131646c72ff54e1cf5972d9cc1dafac52b7f
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD bitcoin-qt-0.15.1.ebuild 7197 BLAKE2B 1aa41f45e03b1c567fda197271007a17f07c3600e6759a4a9dfa0be918ff6878d8b81582647316efbe15d386e6499ebdd54b161ce8afe97c81e10a4ea92ef757 SHA512 7d452b1526df5815d309987beaee84086d4091c198b0e31bc2c80f6a6baeab5a99aff4b4b366d3c06829c070f87683bcabbfb6c14a22d7f551c0b53cd8b5bc5d
-EBUILD bitcoin-qt-0.16.0-r1.ebuild 5129 BLAKE2B ae3cd021a23c102220de9c15ccdb3c3ce5e85f03eda49d86a3337dcaafe579425994cb77c95879bed87275f7a3dcb4693cc7f934797180e19ec5ac121f4996de SHA512 f2397332f1016324bb384a26ead566ed55bee5a70eda42364ac1d7a3fa16710fd45860f88bd00d0800b8f7e414219ff0d19d824ed7fd85b921ce8f976256e3fe
-EBUILD bitcoin-qt-0.16.0.ebuild 4981 BLAKE2B ce92f5dae608a10c9405108088a39891fb62ce4fe47c663799fc54d1a591d4cfb97d6f2fc755a071308e7b0e375876917a6490cfd6d5bbc8d8fd63b4213454d9 SHA512 11398148eae722375b427abad3244a55ad06b302757fc8823167190171a0e2217f034df5a0bf1b65fecf8f16afd325a95536e63eed28b9182075165504e4e4fc
+EBUILD bitcoin-qt-0.16.0-r1.ebuild 5182 BLAKE2B bf0dab729c8bbd7c79aa9b732b974afed7fd91413674cdb36071100ae8c701160f3c0326c403a0f7484cc284e4cb1c513a832c0e64328771f97c99f802e47dcc SHA512 327af32f1dd507c3f5c5464c1f6d63e3691b484409d1998e1d5ce7dae5cdd3677fcdd59780e1ea0226f8fea01e8d4a6fee77f6f956230933669aed9aa32afa8b
 MISC metadata.xml 1485 BLAKE2B e372351807fa1375c29e2fe88cd15e9aa85111069c8876ae1d806bcd509692fc4d173c37c94a8e5bf63d9d1f25b0ddb8895b2cad4e957c4cb11cd29fe837b8c7 SHA512 ebdf31d2908f1828a57b3728a86b65b1818d7ccee0d2725b3f049fb624cc32d72db48b53ce5f99c98cce7926a3e5840eae375227a5ec6ec6719f7c12ae858c20
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
index f3fc18a6875b..07a5658ba4ba 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
@@ -95,6 +95,8 @@ src_prepare() {
 		eapply "${FILESDIR}/${P}-fix_mempoolstats.patch"
 	fi
 
+	eapply "${FILESDIR}/${P}-fix_memory_include.patch"
+
 	eapply_user
 
 	if ! use bitcoin_policy_rbf; then
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
deleted file mode 100644
index 4e08a581606c..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="4b4d7eb255ca8f9a94b92479e6061d129c91a991"
-KNOTS_PV="${PV}.knots20180322"
-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.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-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"
-
-RDEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	dev-libs/univalue:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	virtual/bitcoin-leveldb
-	bip70? ( dev-libs/protobuf:= )
-	dbus? (
-		dev-qt/qtdbus:5
-	)
-	libevent? ( 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/files.md doc/release-notes.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.16.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/2017/11/11/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
-
-	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"
-		eapply "${FILESDIR}/${P}-fix_mempoolstats.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
-
-	sed -i 's/^\(Icon=\).*$/\1bitcoin-qt/;s/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		$(use_enable bip70)
-		$(use_with dbus qtdbus)
-		$(use_with libevent)
-		$(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
-		--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/pixmaps
-	if use knots; then
-		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
-	else
-		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	fi
-	insinto /usr/share/applications
-	newins "contrib/debian/bitcoin-qt.desktop" "org.bitcoin.bitcoin-qt.desktop"
-
-	use libevent && dodoc doc/REST-interface.md doc/tor.md
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/bitcoind.bash-completion ${PN}
-
-	if use kde; then
-		insinto /usr/share/kservices5
-		doins contrib/debian/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
-
-	if use libevent; then
-		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."
-	fi
-}
-
-pkg_postrm() {
-	update_caches
-}
diff --git a/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch b/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch
deleted file mode 100644
index 415adcc59eae..000000000000
--- a/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 0388afe69dd85ca9549727ee105ba7017169b464 (HEAD -> EVP_MD_CTX_new, personal-github/EVP_MD_CTX_new)
-Author: Luke Dashjr <luke-jr+git@utopios.org>
-Date:   Wed Jan 4 17:07:42 2017 +0000
-
-    Let autoconf detect presence of EVP_MD_CTX_new
-    
-    Fixes LibreSSL compatibility
-
-diff --git a/configure.ac b/configure.ac
-index ced258e..02af0d6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -832,6 +832,13 @@ else
-   fi
- fi
- 
-+save_CXXFLAGS="${CXXFLAGS}"
-+CXXFLAGS="${CXXFLAGS} ${CRYPTO_CFLAGS} ${SSL_CFLAGS}"
-+AC_CHECK_DECLS([EVP_MD_CTX_new],,,[AC_INCLUDES_DEFAULT
-+#include <openssl/x509_vfy.h>
-+])
-+CXXFLAGS="${save_CXXFLAGS}"
-+
- dnl univalue check
- 
- need_bundled_univalue=yes
-diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
-index 82be4d8..0d4907b 100644
---- a/src/qt/paymentrequestplus.cpp
-+++ b/src/qt/paymentrequestplus.cpp
-@@ -159,7 +159,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
-         std::string data_to_verify;                     // Everything but the signature
-         rcopy.SerializeToString(&data_to_verify);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if HAVE_DECL_EVP_MD_CTX_NEW
-         EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-         if (!ctx) throw SSLVerifyError("Error allocating OpenSSL context.");
- #else
-@@ -174,7 +174,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
-             !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) {
-             throw SSLVerifyError("Bad signature, invalid payment request.");
-         }
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if HAVE_DECL_EVP_MD_CTX_NEW
-         EVP_MD_CTX_free(ctx);
- #endif
- 
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch
new file mode 100644
index 000000000000..66b7d361ee5b
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch
@@ -0,0 +1,13 @@
+diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
+index cd531dba4b..816b0c35af 100644
+--- a/src/qt/walletmodeltransaction.h
++++ b/src/qt/walletmodeltransaction.h
+@@ -7,6 +7,8 @@
+ 
+ #include <qt/walletmodel.h>
+ 
++#include <memory>
++
+ #include <QObject>
+ 
+ class SendCoinsRecipient;