commit: 7acb5e30be0fab30a4e40eaf96dbefbb42f25c7a Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> AuthorDate: Sun Sep 30 19:03:44 2018 +0000 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> CommitDate: Sun Sep 30 19:05:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7acb5e30
net-p2p/bitcoin-qt: remove old Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> net-p2p/bitcoin-qt/Manifest | 2 - net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild | 190 --------------------- .../bitcoin-qt-0.16.0-fix_memory_include.patch | 13 -- .../files/bitcoin-qt-0.16.0-fix_mempoolstats.patch | 46 ----- 4 files changed, 251 deletions(-) diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest index 9313ec120c3..8c6c2a5d72d 100644 --- a/net-p2p/bitcoin-qt/Manifest +++ b/net-p2p/bitcoin-qt/Manifest @@ -1,6 +1,4 @@ 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-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9 -DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d 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 deleted file mode 100644 index 07a5658ba4b..00000000000 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild +++ /dev/null @@ -1,190 +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 - - # 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" - eapply "${FILESDIR}/${P}-fix_mempoolstats.patch" - fi - - eapply "${FILESDIR}/${P}-fix_memory_include.patch" - - 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 - - if use knots; then - sed -i 's/^\(Icon=\).*$/\1bitcoinknots/' contrib/debian/bitcoin-qt.desktop || die - fi - sed -i '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/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 - 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/bitcoin-qt-0.16.0-fix_memory_include.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch deleted file mode 100644 index 66b7d361ee5..00000000000 --- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -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; diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch deleted file mode 100644 index 95219c67982..00000000000 --- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 450ac607a3568f8c991df1681155de6fa7f5a5cb Mon Sep 17 00:00:00 2001 -From: Luke Dashjr <luke-jr+...@utopios.org> -Date: Fri, 23 Mar 2018 20:30:11 +0000 -Subject: [PATCH] Bugfix: GUI/MempoolStats: Avoid dereferencing NULL - ---- - src/qt/mempoolstats.cpp | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp -index ebc72e95d0..50a3ef71ab 100644 ---- a/src/qt/mempoolstats.cpp -+++ b/src/qt/mempoolstats.cpp -@@ -79,13 +79,9 @@ void MempoolStats::setClientModel(ClientModel *model) - - void MempoolStats::drawChart() - { -- if (!isVisible()) -+ if (!(isVisible() && clientModel)) - return; - -- const bool drawTxCount = cbShowNumTxns->isChecked(); -- const bool drawMinFee = cbShowMinFeerate->isChecked(); -- const bool drawDynMemUsage = cbShowMemUsage->isChecked(); -- - if (!titleItem) - { - // create labels (only once) -@@ -349,11 +345,11 @@ void MempoolStats::drawChart() - QPen linePenRed(QColor(188,49,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); - QPen linePenGreen(QColor(49,188,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); - -- if (drawTxCount) -+ if (cbShowNumTxns->isChecked()) - redrawItems.append(scene->addPath(txCountPath, linePenRed)); -- if (drawMinFee) -+ if (cbShowMinFeerate->isChecked()) - redrawItems.append(scene->addPath(minFeePath, linePenGreen)); -- if (drawDynMemUsage) -+ if (cbShowMemUsage->isChecked()) - { - redrawItems.append(scene->addPath(dynMemUsagePath, linePenBlue)); - redrawItems.append(scene->addPath(dynMemUsagePathFill, QPen(Qt::NoPen), graBru)); --- -2.16.1 -