1 |
commit: 7acb5e30be0fab30a4e40eaf96dbefbb42f25c7a |
2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 30 19:03:44 2018 +0000 |
4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 30 19:05:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7acb5e30 |
7 |
|
8 |
net-p2p/bitcoin-qt: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
11 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
12 |
|
13 |
net-p2p/bitcoin-qt/Manifest | 2 - |
14 |
net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild | 190 --------------------- |
15 |
.../bitcoin-qt-0.16.0-fix_memory_include.patch | 13 -- |
16 |
.../files/bitcoin-qt-0.16.0-fix_mempoolstats.patch | 46 ----- |
17 |
4 files changed, 251 deletions(-) |
18 |
|
19 |
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest |
20 |
index 9313ec120c3..8c6c2a5d72d 100644 |
21 |
--- a/net-p2p/bitcoin-qt/Manifest |
22 |
+++ b/net-p2p/bitcoin-qt/Manifest |
23 |
@@ -1,6 +1,4 @@ |
24 |
DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890 |
25 |
-DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb |
26 |
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893 |
27 |
DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9 |
28 |
-DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c |
29 |
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d |
30 |
|
31 |
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 |
32 |
deleted file mode 100644 |
33 |
index 07a5658ba4b..00000000000 |
34 |
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,190 +0,0 @@ |
37 |
-# Copyright 1999-2018 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-DB_VER="4.8" |
43 |
-inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils |
44 |
- |
45 |
-BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991" |
46 |
-KNOTS_PV="${PV}.knots20180322" |
47 |
-KNOTS_P="bitcoin-${KNOTS_PV}" |
48 |
- |
49 |
-DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency" |
50 |
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" |
51 |
-SRC_URI=" |
52 |
- https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz |
53 |
- https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz |
54 |
-" |
55 |
- |
56 |
-LICENSE="MIT" |
57 |
-SLOT="0" |
58 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
59 |
- |
60 |
-IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq" |
61 |
- |
62 |
-RDEPEND=" |
63 |
- >=dev-libs/boost-1.52.0:=[threads(+)] |
64 |
- >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] |
65 |
- dev-libs/univalue:= |
66 |
- dev-qt/qtcore:5 |
67 |
- dev-qt/qtgui:5 |
68 |
- dev-qt/qtnetwork:5 |
69 |
- dev-qt/qtwidgets:5 |
70 |
- virtual/bitcoin-leveldb |
71 |
- bip70? ( dev-libs/protobuf:= ) |
72 |
- dbus? ( |
73 |
- dev-qt/qtdbus:5 |
74 |
- ) |
75 |
- libevent? ( dev-libs/libevent:= ) |
76 |
- !libressl? ( dev-libs/openssl:0=[-bindist] ) |
77 |
- libressl? ( dev-libs/libressl:0= ) |
78 |
- qrcode? ( |
79 |
- media-gfx/qrencode:= |
80 |
- ) |
81 |
- upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) |
82 |
- wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] ) |
83 |
- zeromq? ( net-libs/zeromq:= ) |
84 |
-" |
85 |
-DEPEND="${RDEPEND} |
86 |
- dev-qt/linguist-tools:5 |
87 |
- knots? ( |
88 |
- gnome-base/librsvg |
89 |
- media-gfx/imagemagick[png] |
90 |
- ) |
91 |
-" |
92 |
- |
93 |
-DOCS=( doc/bips.md doc/files.md doc/release-notes.md ) |
94 |
- |
95 |
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" |
96 |
- |
97 |
-pkg_pretend() { |
98 |
- if use knots; then |
99 |
- elog "You are building ${PN} from Bitcoin Knots." |
100 |
- elog "For more information, see:" |
101 |
- elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html" |
102 |
- else |
103 |
- elog "You are building ${PN} from Bitcoin Core." |
104 |
- elog "For more information, see:" |
105 |
- elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/" |
106 |
- fi |
107 |
- if use bitcoin_policy_rbf; then |
108 |
- elog "Replace By Fee policy is enabled: Your node will preferentially mine and" |
109 |
- elog "relay transactions paying the highest fee, regardless of receive order." |
110 |
- else |
111 |
- elog "Replace By Fee policy is disabled: Your node will only accept the first" |
112 |
- elog "transaction seen consuming a conflicting input, regardless of fee" |
113 |
- elog "offered by later ones." |
114 |
- fi |
115 |
-} |
116 |
- |
117 |
-src_prepare() { |
118 |
- sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die |
119 |
- |
120 |
- # Save the generic icon for later |
121 |
- cp src/qt/res/src/bitcoin.svg bitcoin128.svg || die |
122 |
- |
123 |
- local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" |
124 |
- |
125 |
- eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" |
126 |
- |
127 |
- if use knots; then |
128 |
- eapply "${knots_patchdir}/${KNOTS_P}.f.patch" |
129 |
- eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" |
130 |
- eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" |
131 |
- eapply "${FILESDIR}/${P}-fix_mempoolstats.patch" |
132 |
- fi |
133 |
- |
134 |
- eapply "${FILESDIR}/${P}-fix_memory_include.patch" |
135 |
- |
136 |
- eapply_user |
137 |
- |
138 |
- if ! use bitcoin_policy_rbf; then |
139 |
- sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die |
140 |
- fi |
141 |
- |
142 |
- echo '#!/bin/true' >share/genbuild.sh || die |
143 |
- mkdir -p src/obj || die |
144 |
- echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die |
145 |
- |
146 |
- if use knots; then |
147 |
- sed -i 's/^\(Icon=\).*$/\1bitcoinknots/' contrib/debian/bitcoin-qt.desktop || die |
148 |
- fi |
149 |
- sed -i 's/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die |
150 |
- |
151 |
- eautoreconf |
152 |
- rm -r src/leveldb src/secp256k1 || die |
153 |
-} |
154 |
- |
155 |
-src_configure() { |
156 |
- local my_econf=( |
157 |
- $(use_enable asm) |
158 |
- $(use_enable bip70) |
159 |
- $(use_with dbus qtdbus) |
160 |
- $(use_with libevent) |
161 |
- $(use_with qrcode qrencode) |
162 |
- $(use_with upnp miniupnpc) |
163 |
- $(use_enable upnp upnp-default) |
164 |
- $(use_enable test tests) |
165 |
- $(use_enable wallet) |
166 |
- $(use_enable zeromq zmq) |
167 |
- --with-gui=qt5 |
168 |
- --disable-util-cli |
169 |
- --disable-util-tx |
170 |
- --disable-bench |
171 |
- --without-libs |
172 |
- --without-daemon |
173 |
- --disable-ccache |
174 |
- --disable-static |
175 |
- --with-system-leveldb |
176 |
- --with-system-libsecp256k1 |
177 |
- --with-system-univalue |
178 |
- ) |
179 |
- econf "${my_econf[@]}" |
180 |
-} |
181 |
- |
182 |
-src_install() { |
183 |
- default |
184 |
- |
185 |
- rm -f "${ED%/}/usr/bin/test_bitcoin" || die |
186 |
- |
187 |
- insinto /usr/share/icons/hicolor/scalable/apps/ |
188 |
- doins bitcoin128.svg |
189 |
- if use knots; then |
190 |
- newins src/qt/res/src/bitcoin.svg bitcoinknots.svg |
191 |
- fi |
192 |
- |
193 |
- insinto /usr/share/applications |
194 |
- newins "contrib/debian/bitcoin-qt.desktop" "org.bitcoin.bitcoin-qt.desktop" |
195 |
- |
196 |
- use libevent && dodoc doc/REST-interface.md doc/tor.md |
197 |
- |
198 |
- use zeromq && dodoc doc/zmq.md |
199 |
- |
200 |
- newbashcomp contrib/bitcoind.bash-completion ${PN} |
201 |
- |
202 |
- if use kde; then |
203 |
- insinto /usr/share/kservices5 |
204 |
- doins contrib/debian/bitcoin-qt.protocol |
205 |
- dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol" |
206 |
- fi |
207 |
-} |
208 |
- |
209 |
-update_caches() { |
210 |
- gnome2_icon_cache_update |
211 |
- xdg_desktop_database_update |
212 |
-} |
213 |
- |
214 |
-pkg_postinst() { |
215 |
- update_caches |
216 |
- |
217 |
- if use libevent; then |
218 |
- elog "To have ${PN} automatically use Tor when it's running, be sure your" |
219 |
- elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup" |
220 |
- elog "correctly, and add your user to the 'tor' user group." |
221 |
- fi |
222 |
-} |
223 |
- |
224 |
-pkg_postrm() { |
225 |
- update_caches |
226 |
-} |
227 |
|
228 |
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 |
229 |
deleted file mode 100644 |
230 |
index 66b7d361ee5..00000000000 |
231 |
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_memory_include.patch |
232 |
+++ /dev/null |
233 |
@@ -1,13 +0,0 @@ |
234 |
-diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h |
235 |
-index cd531dba4b..816b0c35af 100644 |
236 |
---- a/src/qt/walletmodeltransaction.h |
237 |
-+++ b/src/qt/walletmodeltransaction.h |
238 |
-@@ -7,6 +7,8 @@ |
239 |
- |
240 |
- #include <qt/walletmodel.h> |
241 |
- |
242 |
-+#include <memory> |
243 |
-+ |
244 |
- #include <QObject> |
245 |
- |
246 |
- class SendCoinsRecipient; |
247 |
|
248 |
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 |
249 |
deleted file mode 100644 |
250 |
index 95219c67982..00000000000 |
251 |
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch |
252 |
+++ /dev/null |
253 |
@@ -1,46 +0,0 @@ |
254 |
-From 450ac607a3568f8c991df1681155de6fa7f5a5cb Mon Sep 17 00:00:00 2001 |
255 |
-From: Luke Dashjr <luke-jr+git@×××××××.org> |
256 |
-Date: Fri, 23 Mar 2018 20:30:11 +0000 |
257 |
-Subject: [PATCH] Bugfix: GUI/MempoolStats: Avoid dereferencing NULL |
258 |
- |
259 |
---- |
260 |
- src/qt/mempoolstats.cpp | 12 ++++-------- |
261 |
- 1 file changed, 4 insertions(+), 8 deletions(-) |
262 |
- |
263 |
-diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp |
264 |
-index ebc72e95d0..50a3ef71ab 100644 |
265 |
---- a/src/qt/mempoolstats.cpp |
266 |
-+++ b/src/qt/mempoolstats.cpp |
267 |
-@@ -79,13 +79,9 @@ void MempoolStats::setClientModel(ClientModel *model) |
268 |
- |
269 |
- void MempoolStats::drawChart() |
270 |
- { |
271 |
-- if (!isVisible()) |
272 |
-+ if (!(isVisible() && clientModel)) |
273 |
- return; |
274 |
- |
275 |
-- const bool drawTxCount = cbShowNumTxns->isChecked(); |
276 |
-- const bool drawMinFee = cbShowMinFeerate->isChecked(); |
277 |
-- const bool drawDynMemUsage = cbShowMemUsage->isChecked(); |
278 |
-- |
279 |
- if (!titleItem) |
280 |
- { |
281 |
- // create labels (only once) |
282 |
-@@ -349,11 +345,11 @@ void MempoolStats::drawChart() |
283 |
- QPen linePenRed(QColor(188,49,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); |
284 |
- QPen linePenGreen(QColor(49,188,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); |
285 |
- |
286 |
-- if (drawTxCount) |
287 |
-+ if (cbShowNumTxns->isChecked()) |
288 |
- redrawItems.append(scene->addPath(txCountPath, linePenRed)); |
289 |
-- if (drawMinFee) |
290 |
-+ if (cbShowMinFeerate->isChecked()) |
291 |
- redrawItems.append(scene->addPath(minFeePath, linePenGreen)); |
292 |
-- if (drawDynMemUsage) |
293 |
-+ if (cbShowMemUsage->isChecked()) |
294 |
- { |
295 |
- redrawItems.append(scene->addPath(dynMemUsagePath, linePenBlue)); |
296 |
- redrawItems.append(scene->addPath(dynMemUsagePathFill, QPen(Qt::NoPen), graBru)); |
297 |
--- |
298 |
-2.16.1 |
299 |
- |