[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
@ 2017-01-24  1:17 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-01-24  1:17 UTC (permalink / raw
  To: gentoo-commits

commit:     f31189f83957e3a5cbb52b4ec285582b49b5a926
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 20:51:33 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 01:17:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31189f8

net-p2p/bitcoind: Drop old

Package-Manager: portage-2.3.0

 net-p2p/bitcoind/Manifest                         | 19 ------
 net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild        | 80 -----------------------
 net-p2p/bitcoind/bitcoind-0.10.2.ebuild           | 78 ----------------------
 net-p2p/bitcoind/bitcoind-0.11.0.ebuild           | 76 ---------------------
 net-p2p/bitcoind/bitcoind-0.11.1.ebuild           | 68 -------------------
 net-p2p/bitcoind/bitcoind-0.11.2.ebuild           | 71 --------------------
 net-p2p/bitcoind/bitcoind-0.12.0.ebuild           | 70 --------------------
 net-p2p/bitcoind/bitcoind-0.12.1.ebuild           | 70 --------------------
 net-p2p/bitcoind/files/0.10.0-openrc-compat.patch | 24 -------
 net-p2p/bitcoind/files/bitcoind.logrotate         |  7 --
 net-p2p/bitcoind/files/miniupnpc-14.patch         | 28 --------
 net-p2p/bitcoind/metadata.xml                     |  6 --
 12 files changed, 597 deletions(-)

diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index a69baa0..1a8817d 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,25 +1,6 @@
-DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
-DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
-DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a
-DIST bitcoin-0.11.2.ljr20151118.patches.tar.xz 98552 SHA256 de44c8604de476d282820c2419ccbba3bef3eb054887cdd16b0ab4e7ff450dcb SHA512 283d0b6550fa1c6d2347e146c350b2afb9d7ca0c2e8ad150a8dcb6c0522abd17ca31ba8dcdee7e2d7020561be6e8bdc9bd33f7d21e7901ca675ff990441a97ef WHIRLPOOL 24f25ba32d1c22e1e795aba13e202af661b9e23992b633382cdd62953d744862901494726c36075eb0ae186bd6e60e4c15148e0f46a2401efffa1b419b4d2390
-DIST bitcoin-0.12.0.knots20160226.rc1.patches.tar.xz 145776 SHA256 93431aa2c1d66c41d52bbf8810df27228f5a0823db2416312d6e07a20dc78dea SHA512 042c02dc64591f4edbad1cc421ee90e84d628f93292fd42b190728960a65eb76d0234d821ce2df92a3a66328a5368b5b42670ebf130045d92d74d74287a90990 WHIRLPOOL b4543468936c6e16a8636c2eaed1d6f76a20958c2f2fda6f9c6a389cc79111369d906c08878e3eb7b2d6bad8299e3e16ad38a190dab80996f63adfda8c1c93f2
-DIST bitcoin-0.12.1.knots20160629.rc2.patches.tar.xz 283700 SHA256 9bc8ff0946dfcd10d82b0f9ce3b509b23da244cddc3707013a9a8eebe64df1af SHA512 25860908625d8e501e079e0cbb946432ca086edcacdcb59dc81d49eac309bfb70e4c4701aeb0d45cd51ffbebead4f211590b4870dff22c2886c949fd8e600643 WHIRLPOOL da6c35551e87da57a4d0d67ee12e239638b02b634c4fc2c08912a1b56dd6348f595929af03719238d7bfc8f4e490b39672cc7671ec1c84f8c36b77a8f37fe643
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 SHA256 be92292d55e624ce8494210a51d6228f20d3f7b5ee2faf4185ba326a5f18fd30 SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2 WHIRLPOOL c41dbadc730f1b8df2244dd294c63a1989ebaf4bc2057435eeb0743555345a6158c36b34589427c22eb717af9358096fb6ab3dd851fffc5cafafa76c812b7fd8
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 SHA256 b3242fa3bf7959de31aba47b4124e582d0a3d2924a5fe48f91676ef586a5d2f0 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6 WHIRLPOOL 768d3d1fdfe15d5d36d3d724224e3e33da5292764b3264bba89e3186e03d05cf57e957c071850bacc0fb49c7aae6cfd01bb649ffd82acfa4cfe695ef4b7e3b43
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 SHA256 837dbc5a69a25a844681971e3b5bc22c93655e893fc579094556c10bc038488a SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061 WHIRLPOOL a5eaf1076eae2162d672ad705e8085e7034e163095d0645cd3ee522a11062fba8928a2d2dad94bda28538698f61fe46b3501fe978ff7940237e3f6895eafa6ae
-DIST bitcoin-addrindex-v0.11.0.patch 20078 SHA256 d627b0a3eb864053e053e633181d0e3b0e6f1d7f6995e050dc9d1c81ff923522 SHA512 a20b78997e2cff7222c9c3c91eaa2fcc225df8d1ede555c78b7fd09b2c1246339140a0105212ba01047eb3a99b892f28f756b2a35d59555a06204b30819af0d7 WHIRLPOOL 6a0ce13ce3da20d6adfb81ef90ee51a97b7bcf3552b5825e6d43a2b62025e68ef56365319d28411edb288ce40d42551feced1344803058f497a05b7de73aa68a
-DIST bitcoin-addrindex-v0.11.2.patch 19567 SHA256 6c22530dfeee109404ffc589a5d807bc9d60ecddc510ab6b39243e0d26a4d4a6 SHA512 cfeeff21b3c73fb875ec659a230e296efaedde90ea78940a4df18f5bd645e3a4f80c4abc4cd041ce6edcebc4a3d7d82e829f770e9641f23de4f5305a1bd98aed WHIRLPOOL 2fb6c07c42fc193735f4aa60663bae07952437051717ee2d7d1e758fbb37461e1eae393d5be3801bb872c69be2a0ee5c9e970cd5a90ad9b7ffa28dee53ecc034
-DIST bitcoin-rbf-v0.10.2-r1.patch 26987 SHA256 a5dcd50134fe9872c0460746da2d743864525a775150304473a5588aa6c516e6 SHA512 2e88d185dd8d5845a7286dda130ab6d73328a09f7623387d68437be5e655e9657a1e392e9c6a0004856127738f340a77283206a0a8183f2ee9407ddf43328e7f WHIRLPOOL 39ffca7486964eb25f5de4ccfc4a1aff4078b1a08d907300ea06f51189bdb0c6514dbd9565ce615de6d776bf01faa1dabae5cb0c4628ef8d3dd686f6300c037a
-DIST bitcoin-rbf-v0.10.2.patch 25171 SHA256 2610cca0d758c502b71a13184643fe00c9dcb7a2b258f943f33a4534ec1f6cd5 SHA512 855e5e497a371b1e503ab5a0c1fbdb7cb3c30c318b19c32c220d8e6e0b2ae06ca6e63ac27fcb23b51b01c5573c6ea94417ec9d395174ae4f01ad9a0ed4c28c51 WHIRLPOOL 9e67a1d03eb7e40431623818230f2c94e811402a5da6f36dd950cc8a92cc76797ba770c3586ff88477d74b7ee21c9b93704ccead7b489678911dda1394f34fda
-DIST bitcoin-rbf-v0.11.0rc3.patch 27178 SHA256 976e3007121a69630b74c6106f41ebc48b97476ac647e0872d3aaa08a64ec52f SHA512 dc1c46b731dd78bbcb2e7b066dd74aaf0adf39c672847349ed7ebf00012481d3105cebc753dd3bccbe0c35c49bf9dc1546cc8e4d0cc5509d449115e53e91fcc2 WHIRLPOOL de7bd2c1a45369baeac8e311fcd3f9b37e6ab84b99362bb05a5f3f8d6990ea2ad5f509b389b0962bf679ced9dca70c0825e35ae02d97b389101108d2d80be589
-DIST bitcoin-v0.10.2-r1.tgz 5076702 SHA256 9bee2b9fe0c236f9f75bfc05c59df238c9424cbcffe4483db5009c5aaff8881b SHA512 5650dc281c749a6057d2dc29d61909619d680ace8c74c41df1581ef56e98950cb42bf4ea2c37264f00090cfa7762f2539f433c8117228484cd7628d397aa69fa WHIRLPOOL 02c2e74748c7572fa3968fc132d561323e33e6aadc07744bd06567abdddd3c7871afe6b46d30fc3389d92246c705454db708dd05946e93e3a93ad5d3b89a327b
-DIST bitcoin-v0.10.2.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
-DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
-DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc
-DIST bitcoin-v0.11.2.tgz 5958338 SHA256 1adb0b5ea6dcbf9e3de9c6338b4f0d0abc6f72d8023ac5451370cdf43c9971c4 SHA512 0a76ca482c71e9a88e14e274d082bce796b2a9abd48d0fb40e41d169479ced144530825b36e1ab0953dac80b823607aaa8be52fe631f7df9a5062dc2a4bf4e66 WHIRLPOOL 9d8c98b45919e3323a27eacf1c0cc28d992bf7fe1cef9f738dab880e104613e8fb9184ecaa5ad3ea2234625254f3329c7ab5c939f6076d50b9f1ce970db85b9d
-DIST bitcoin-v0.12.0.tgz 6708553 SHA256 a5bac23b087c183821f06c19947cba2399ced09ee2b02c751ecbda9f808d8e33 SHA512 2c6bec18eed7b8145ee711ae143b425e08ed3243454083a1a91eb2a1f16abcac2a5e053f83c9ae840cbbdea3960856b613ba17d269d8b60706379744a4cf9f4b WHIRLPOOL bd159d52567a84a577c0581cdd8df02030c25b32ee44df26e1081b588cbddde0d951226c1c46e69077d2e2887c98874455f340bb3fe01bede85d044ef1bb02e8
-DIST bitcoin-v0.12.1.tgz 6755692 SHA256 3ff2947e956dcc52c37fc2302839ad2725cb68266a3542bd932e784a363d38c0 SHA512 27a795af8bd53238172c582f1310457d9895f8fdddfa37e9dc58e27e032d7a543fc8341985b5a25a339ff7a971654eac9cb56fd409acb8ec095769535cafcaf4 WHIRLPOOL 095840a3b326a2e644c41ff0711379a420650bd69a772329146f5cbf2ece7182c8929da467f217cafebbe48fbb987a20762b18d9500b632c57c81a95b8380d93
 DIST bitcoin-v0.13.0.tgz 5836862 SHA256 f7dfb156667c366390339773cf86efe3dda9318fd3a6d3c25bb0026b93d772af SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1 WHIRLPOOL 3d03247795f37afd7a08543986d41df6b03d416993aee603637b5bae783bd6cfaf0521e264224e5d8e1b923ea7ce53e47a967ad72ec83a8982a995309aa98b62
 DIST bitcoin-v0.13.1.tgz 5955845 SHA256 8523eb58fcbba68d07ccff0ce3a8878c3de9c9b532949d36dae56969bf3594e0 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3 WHIRLPOOL 6795bdd3d57b358c97ffa71f4dbfdae938500c0be190bdaf73829575f34d1a17443e34d71ddb1cae495640b01e8be3de8b8de490cd34ce6fe680c0069e9fd067
 DIST bitcoin-v0.13.2.tgz 6088472 SHA256 f2148eef9ad1a938e2ca053d4ba5712f05245afbcff616e839011ec07324352a SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca WHIRLPOOL fb25d8cc0360435f1a8c2eb3465911d080eecc9247cb8373ca73bf5bf8a1cce02028e9f0e86102d55049c7a1c164fd04d3e777976c3aa66a21ce5f9ff3d602eb
-DIST bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4

diff --git a/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
deleted file mode 100644
index 78bd496..00000000
--- a/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="16f45600c8c372a738ffef544292864256382601"
-BITCOINCORE_SRC_SUFFIX="-r1"
-BITCOINCORE_LJR_PV="0.10.1"
-BITCOINCORE_LJR_DATE="20150428"
-BITCOINCORE_IUSE="examples ljr logrotate test upnp +wallet xt zeromq"
-BITCOINCORE_POLICY_PATCHES="cpfp dcmp rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	logrotate? (
-		app-admin/logrotate
-	)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/miniupnpc-14.patch"
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
-	epatch "${FILESDIR}/0.10.0-openrc-compat.patch"
-	bitcoincore_src_prepare
-}
-
-src_configure() {
-	# NOTE: --enable-zmq actually disables it
-	bitcoincore_conf \
-		--with-daemon
-}
-
-src_install() {
-	bitcoincore_src_install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/assets-attribution.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-	fi
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.10.2.ebuild b/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
deleted file mode 100644
index 3b94586..00000000
--- a/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="d8ac90184254fea3a7f4991fd0529dfbd750aea0"
-BITCOINCORE_LJR_PV="0.10.1"
-BITCOINCORE_LJR_DATE="20150428"
-BITCOINCORE_IUSE="examples ljr logrotate test upnp +wallet xt zeromq"
-BITCOINCORE_POLICY_PATCHES="cpfp dcmp rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	logrotate? (
-		app-admin/logrotate
-	)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/miniupnpc-14.patch"
-	epatch "${FILESDIR}/0.10.0-openrc-compat.patch"
-	bitcoincore_src_prepare
-}
-
-src_configure() {
-	# NOTE: --enable-zmq actually disables it
-	bitcoincore_conf \
-		--with-daemon
-}
-
-src_install() {
-	bitcoincore_src_install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/assets-attribution.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-	fi
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.11.0.ebuild b/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
deleted file mode 100644
index f2ed1f4..00000000
--- a/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="d26f951802c762de04fb68e1a112d611929920ba"
-BITCOINCORE_LJR_DATE="20150711"
-BITCOINCORE_IUSE="examples ljr logrotate test upnp +wallet zeromq"
-BITCOINCORE_POLICY_PATCHES="cltv cpfp rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	logrotate? (
-		app-admin/logrotate
-	)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/miniupnpc-14.patch"
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion
-	bitcoincore_src_prepare
-}
-
-src_configure() {
-	bitcoincore_conf \
-		--with-daemon
-}
-
-src_install() {
-	bitcoincore_src_install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-	fi
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild b/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
deleted file mode 100644
index 0b60d2e..00000000
--- a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE="addrindex examples ljr test upnp +wallet zeromq"
-BITCOINCORE_ADDRINDEX_DIFF="8a915e56f4be5d090d79f01cbd4a23ce1b7e9168...4a6331c5068d8f2c95731518445a57267d506bb5"
-BITCOINCORE_ADDRINDEX_PATCHFILE="bitcoin-addrindex-v0.11.0.patch"
-BITCOINCORE_POLICY_PATCHES="cltv cpfp dcmp rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
-	bitcoincore_src_prepare
-}
-
-src_configure() {
-	bitcoincore_conf \
-		--with-daemon
-}
-
-src_install() {
-	bitcoincore_src_install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.11.2.ebuild b/net-p2p/bitcoind/bitcoind-0.11.2.ebuild
deleted file mode 100644
index ae38e8c..00000000
--- a/net-p2p/bitcoind/bitcoind-0.11.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="7e278929df53e1fb4191bc5ba3176a177ce718bf"
-BITCOINCORE_LJR_DATE="20151118"
-BITCOINCORE_IUSE="addrindex examples ljr test upnp +wallet zeromq"
-BITCOINCORE_ADDRINDEX_DIFF="7e278929df53e1fb4191bc5ba3176a177ce718bf...fddd278524c96aac9de63edeae5aef247ece4af4"
-BITCOINCORE_ADDRINDEX_PATCHFILE="bitcoin-addrindex-v0.11.2.patch"
-BITCOINCORE_POLICY_PATCHES="cpfp dcmp rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
-	bitcoincore_src_prepare
-}
-
-src_configure() {
-	bitcoincore_conf \
-		--with-daemon
-}
-
-src_install() {
-	bitcoincore_src_install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.12.0.ebuild b/net-p2p/bitcoind/bitcoind-0.12.0.ebuild
deleted file mode 100644
index 38ecc9a..00000000
--- a/net-p2p/bitcoind/bitcoind-0.12.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2010-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="188ca9c305d3dd0fb462b9d6a44048b1d99a05f3"
-BITCOINCORE_LJR_DATE="20160226"
-BITCOINCORE_LJR_PREV="rc1"
-BITCOINCORE_IUSE="examples ljr test upnp +wallet zeromq"
-BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
-	bitcoincore_src_prepare
-}
-
-src_configure() {
-	bitcoincore_conf \
-		--with-daemon
-}
-
-src_install() {
-	bitcoincore_src_install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{qos,spendfrom,tidy_datadir.sh}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.12.1.ebuild b/net-p2p/bitcoind/bitcoind-0.12.1.ebuild
deleted file mode 100644
index fc4bec1..00000000
--- a/net-p2p/bitcoind/bitcoind-0.12.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2010-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="9779e1e1f320a45255f2e81325f2feceec3fa944"
-BITCOINCORE_LJR_DATE="20160629"
-BITCOINCORE_LJR_PREV="rc2"
-BITCOINCORE_IUSE="examples ljr test upnp +wallet zeromq"
-BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
-	bitcoincore_src_prepare
-}
-
-src_configure() {
-	bitcoincore_conf \
-		--with-daemon
-}
-
-src_install() {
-	bitcoincore_src_install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{qos,spendfrom,tidy_datadir.sh}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}

diff --git a/net-p2p/bitcoind/files/0.10.0-openrc-compat.patch b/net-p2p/bitcoind/files/0.10.0-openrc-compat.patch
deleted file mode 100644
index a7c31d6..00000000
--- a/net-p2p/bitcoind/files/0.10.0-openrc-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- contrib/init/bitcoind.openrc	2015-03-03 09:37:59.919728713 +0000
-+++ contrib/init/bitcoind.openrc	2015-03-03 09:38:08.109757531 +0000
-@@ -12,9 +12,11 @@
- BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind}
- BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid}
- BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}}
--BITCOIND_USER=${BITCOIND_USER:-bitcoin}
-+BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}}
- BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin}
- BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind}
-+BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}}
-+BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}"
- 
- name="Bitcoin Core Daemon"
- description="Bitcoin crypto-currency p2p network daemon"
-@@ -28,7 +30,7 @@
- 
- required_files="${BITCOIND_CONFIGFILE}"
- start_stop_daemon_args="-u ${BITCOIND_USER} \
--			-N ${BITCOIND_NICE:-0} -w 2000"
-+			-N ${BITCOIND_NICE} -w 2000"
- pidfile="${BITCOIND_PIDFILE}"
- retry=60
- 

diff --git a/net-p2p/bitcoind/files/bitcoind.logrotate b/net-p2p/bitcoind/files/bitcoind.logrotate
deleted file mode 100644
index 36d8dc2..00000000
--- a/net-p2p/bitcoind/files/bitcoind.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/lib/bitcoin/.bitcoin/debug.log {
-	weekly
-	sharedscripts
-	postrotate
-		killall -HUP bitcoind
-	endscript
-}

diff --git a/net-p2p/bitcoind/files/miniupnpc-14.patch b/net-p2p/bitcoind/files/miniupnpc-14.patch
deleted file mode 100644
index aa8e32f..00000000
--- a/net-p2p/bitcoind/files/miniupnpc-14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (origin-pull/6583/head)
-Author: Pavel Vasin <pavel@vasin.nl>
-Date:   Sun Aug 23 23:53:49 2015 +0300
-
-    add support for miniupnpc api version 14
-    
-    The value of new arg ttl is set to 2 as it's recommended default.
-
-diff --git a/src/net.cpp b/src/net.cpp
-index fb5726a..4c6331f 100644
---- a/src/net.cpp
-+++ b/src/net.cpp
-@@ -1120,10 +1120,14 @@ void ThreadMapPort()
- #ifndef UPNPDISCOVER_SUCCESS
-     /* miniupnpc 1.5 */
-     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
--#else
-+#elif MINIUPNPC_API_VERSION < 14
-     /* miniupnpc 1.6 */
-     int error = 0;
-     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
-+#else
-+    /* miniupnpc 1.9.20150730 */
-+    int error = 0;
-+    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
- #endif
- 
-     struct UPNPUrls urls;

diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 4823df2..542e126 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -10,17 +10,11 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
-		<flag name="addrindex">Enable BtcDrak's addrindex patch</flag>
-		<flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
-		<flag name="bitcoin_policy_cpfp">Child-Pays-For-Parent policy: If you mine, you will give consideration to child transaction fees to pay for their parents</flag>
-		<flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
 		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
 		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
-		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
-		<flag name="xt">Enable Mike Hearn's Bitcoin XT patches</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
@ 2018-01-23 10:37 Thomas Deutschmann
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2018-01-23 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     4909efc24359126a7d86a755d874979d5b63ced3
Author:     Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Tue Jan 23 04:03:32 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 10:37:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4909efc2

net-p2p/bitcoind-0.15.1: Fix tests

Closes: https://github.com/gentoo/gentoo/pull/6934
Closes: https://bugs.gentoo.org/645250

 net-p2p/bitcoind/bitcoind-0.15.1.ebuild            |  4 +++-
 .../files/bitcoind-0.15.1-test-build-fix.patch     | 24 ++++++++++++++++++++++
 .../files/bitcoind-0.15.1-test-util-fix.patch      | 15 ++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
index 3ada285926e..3d8c5eb306c 100644
--- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -74,11 +74,13 @@ src_prepare() {
 	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
 
 	eapply "$(KNOTS_PATCH syslibs)"
+	eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
 
 	if use knots; then
 		eapply "$(KNOTS_PATCH f)"
 		eapply "$(KNOTS_PATCH branding)"
 		eapply "$(KNOTS_PATCH ts)"
+		eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
 	fi
 
 	eapply_user

diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
new file mode 100644
index 00000000000..3d953d9c0a9
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
@@ -0,0 +1,24 @@
+commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date:   Tue Jan 23 03:37:10 2018 +0000
+
+    Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
+
+diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
+index 7826cdc1b3..013846811b 100644
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
+     ++data->eof;
+ }
+ 
++#if defined(HAVE_CONSENSUS_LIB)
+ static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
+     .ScriptBegin = script_tests_debugger_ScriptBegin,
+     .ScriptPreStep = script_tests_debugger_ScriptPreStep,
+     .ScriptEOF = script_tests_debugger_ScriptEOF,
+ };
++#endif
+ 
+ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
+ {

diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
new file mode 100644
index 00000000000..60fc9d84905
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 147add3eb5..308b1c88c0 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
+ check-local:
++if BUILD_BITCOIN_TX
+ 	@echo "Running test/util/bitcoin-util-test.py..."
+ 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
++endif
+ if EMBEDDED_LIBSECP256K1
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+ endif


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
@ 2019-08-07 16:33 Craig Andrews
  0 siblings, 0 replies; 6+ messages in thread
From: Craig Andrews @ 2019-08-07 16:33 UTC (permalink / raw
  To: gentoo-commits

commit:     b3cb7b8967205cf814ab9eadc50aa7466814e4c6
Author:     Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Mon May 20 03:38:24 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 16:27:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3cb7b89

net-p2p/bitcoind: Bump to 0.18.0

Closes: https://bugs.gentoo.org/685912

Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org>
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/bitcoind/Manifest                          |   2 +
 net-p2p/bitcoind/bitcoind-0.18.0.ebuild            | 173 +++++++++++++++++++++
 net-p2p/bitcoind/files/0.18.0-daemon-fix.patch     |  12 ++
 .../bitcoind-0.18.0-raii_event_tests-always.patch  |  70 +++++++++
 4 files changed, 257 insertions(+)

diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index c3a90d5a2b6..6498fdc5f9f 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,4 +1,6 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
 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

diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
new file mode 100644
index 00000000000..813f8093491
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2019 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 systemd user
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+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.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	dev-libs/libevent:=
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+RDEPEND="${DEPEND}"
+
+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}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-raii_event_tests-always.patch"
+)
+
+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.18.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/2019/05/02/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
+}
+
+pkg_setup() {
+	enewgroup bitcoin
+	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.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}/${PV}-daemon-fix.patch"
+	fi
+
+	default
+
+	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
+
+	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)
+		--without-qtdbus
+		--without-qrencode
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-daemon
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-gui
+		--without-rapidcheck
+		--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 /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	doman "${FILESDIR}/bitcoin.conf.5"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+	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:"
+	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
+	elog "- Running bitcoind directly: add that user to the 'tor' user group."
+}

diff --git a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch b/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
new file mode 100644
index 00000000000..8a6737f8847
--- /dev/null
+++ b/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
@@ -0,0 +1,12 @@
+--- a/src/support/lockedpool.cpp
++++ b/src/support/lockedpool.cpp
+@@ -250,9 +250,6 @@ void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
+     addr = mmap(nullptr, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+     if (addr) {
+         *lockingSuccess = mlock(addr, len) == 0;
+-#ifdef MADV_DONTFORK
+-        madvise(addr, len, MADV_DONTFORK);
+-#endif
+ #ifdef MADV_DONTDUMP
+         madvise(addr, len, MADV_DONTDUMP);
+ #endif

diff --git a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch b/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
new file mode 100644
index 00000000000..8148d565967
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
@@ -0,0 +1,70 @@
+https://github.com/bitcoin/bitcoin/pull/16564
+
+From 272855746b18de76f51e84945d675904e9b907af Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 7 Aug 2019 11:38:11 -0400
+Subject: [PATCH] Always define the raii_event_tests test suite
+
+The test suite must always be defined (even when EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED is not defined) so that the test harness doesn't fail due to not being able to find the raii_event_tests test.
+
+This improves upon 95f97f4 actually fixing https://github.com/bitcoin/bitcoin/issues/9493
+---
+ src/test/raii_event_tests.cpp | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
+index bdb411d53f57..6691de882930 100644
+--- a/src/test/raii_event_tests.cpp
++++ b/src/test/raii_event_tests.cpp
+@@ -4,20 +4,28 @@
+ 
+ #include <event2/event.h>
+ 
++#include <test/test_bitcoin.h>
++
++#include <boost/test/unit_test.hpp>
++
++BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
++
++#ifndef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
++BOOST_AUTO_TEST_CASE(raii_event_creation)
++{
++    // dummy; do nothing
++}
++#endif  // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
++
+ #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
+-// It would probably be ideal to define dummy test(s) that report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros)
+ 
+ #include <map>
+ #include <stdlib.h>
+ 
+ #include <support/events.h>
+ 
+-#include <test/test_bitcoin.h>
+-
+ #include <vector>
+ 
+-#include <boost/test/unit_test.hpp>
+-
+ static std::map<void*, short> tags;
+ static std::map<void*, uint16_t> orders;
+ static uint16_t tagSequence = 0;
+@@ -36,8 +44,6 @@ static void tag_free(void* mem) {
+     free(mem);
+ }
+ 
+-BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
+-
+ BOOST_AUTO_TEST_CASE(raii_event_creation)
+ {
+     event_set_mem_functions(tag_malloc, realloc, tag_free);
+@@ -89,6 +95,6 @@ BOOST_AUTO_TEST_CASE(raii_event_order)
+     event_set_mem_functions(malloc, realloc, free);
+ }
+ 
+-BOOST_AUTO_TEST_SUITE_END()
+-
+ #endif  // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
++
++BOOST_AUTO_TEST_SUITE_END()


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
@ 2021-01-21 23:23 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-01-21 23:23 UTC (permalink / raw
  To: gentoo-commits

commit:     d00a0f0f3e4e07b0a959d4c1e6588358ef3b4a1b
Author:     John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Sun Jan 10 22:03:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 23:22:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00a0f0f

net-p2p/bitcoind: security cleanup

Bug: https://bugs.gentoo.org/711198
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoind/Manifest                          |   6 -
 net-p2p/bitcoind/bitcoind-0.16.3.ebuild            | 153 ------------------
 net-p2p/bitcoind/bitcoind-0.19.1.ebuild            | 168 --------------------
 net-p2p/bitcoind/bitcoind-0.20.0.ebuild            | 171 ---------------------
 .../files/bitcoind-0.16.3-missing-include.patch    |  10 --
 5 files changed, 508 deletions(-)

diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index caa968a9c39..16d898727cf 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,8 +1,2 @@
-DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
-DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
-DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
-DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e

diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
deleted file mode 100644
index 74b734ed258..00000000000
--- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2010-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DB_VER="4.8"
-inherit autotools bash-completion-r1 db-use systemd
-
-BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
-KNOTS_PV="${PV}.knots20180918"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-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 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm examples knots libressl test upnp +wallet zeromq"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-group/bitcoin
-	acct-user/bitcoin
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	dev-libs/libevent:=
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	dev-libs/univalue:=
-	virtual/bitcoin-leveldb
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
-	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
-	zeromq? ( net-libs/zeromq:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/files.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.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/2018/09/18/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/' contrib/${PN}.bash-completion || die
-
-	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
-		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/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--with-libevent
-		--without-qrencode
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-daemon
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-libs
-		--without-gui
-		--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 /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	doman "${FILESDIR}/bitcoin.conf.5"
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{linearize,qos,tidy_datadir.sh}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
-
-pkg_postinst() {
-	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:"
-	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
-	elog "- Running bitcoind directly: add that user to the 'tor' user group."
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.19.1.ebuild b/net-p2p/bitcoind/bitcoind-0.19.1.ebuild
deleted file mode 100644
index 7e8083f53f5..00000000000
--- a/net-p2p/bitcoind/bitcoind-0.19.1.ebuild
+++ /dev/null
@@ -1,168 +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 systemd
-
-BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f"
-KNOTS_PV="${PV}.knots20200304"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-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.19.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm examples knots libressl +system-leveldb test upnp +wallet zeromq"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-group/bitcoin
-	acct-user/bitcoin
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	dev-libs/libevent:=
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
-	>=dev-libs/univalue-1.0.4:=
-	system-leveldb? ( virtual/bitcoin-leveldb )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
-	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
-	zeromq? ( net-libs/zeromq:= )
-"
-RDEPEND="${DEPEND}"
-
-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.19.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/03/04/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/' contrib/${PN}.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"
-	fi
-
-	default
-
-	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)
-		--without-qtdbus
-		--without-qrencode
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-daemon
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-libs
-		--without-gui
-		--without-rapidcheck
-		--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 /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	doman "${FILESDIR}/bitcoin.conf.5"
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{linearize,qos}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
-
-pkg_postinst() {
-	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:"
-	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
-	elog "- Running bitcoind directly: add that user to the 'tor' user group."
-}

diff --git a/net-p2p/bitcoind/bitcoind-0.20.0.ebuild b/net-p2p/bitcoind/bitcoind-0.20.0.ebuild
deleted file mode 100644
index f7e6db7b7e8..00000000000
--- a/net-p2p/bitcoind/bitcoind-0.20.0.ebuild
+++ /dev/null
@@ -1,171 +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 systemd
-
-BITCOINCORE_COMMITHASH="a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd"
-KNOTS_PV="${PV}.knots20200614"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-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 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm examples knots libressl +system-leveldb test upnp +wallet zeromq"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-group/bitcoin
-	acct-user/bitcoin
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	dev-libs/libevent:=
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
-	>=dev-libs/univalue-1.0.4:=
-	system-leveldb? ( virtual/bitcoin-leveldb )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
-	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
-	zeromq? ( net-libs/zeromq:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-"
-
-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/06/03/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/' contrib/${PN}.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"
-	fi
-
-	default
-
-	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)
-		--without-qtdbus
-		--without-qrencode
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-daemon
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-libs
-		--without-gui
-		--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 /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
-	newinitd "contrib/init/bitcoind.openrc" ${PN}
-	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	doman "${FILESDIR}/bitcoin.conf.5"
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{linearize,qos}
-		use zeromq && dodoc -r contrib/zmq
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
-
-pkg_postinst() {
-	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:"
-	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
-	elog "- Running bitcoind directly: add that user to the 'tor' user group."
-}

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
deleted file mode 100644
index f413c323b92..00000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
@ 2023-01-05  4:38 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-01-05  4:38 UTC (permalink / raw
  To: gentoo-commits

commit:     6fe2ee275a20a9a3178a94e3e79bac481197f828
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 03:30:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 04:37:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe2ee27

net-p2p/bitcoind: add 24.0.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoind/Manifest                   |   1 +
 net-p2p/bitcoind/bitcoind-24.0.1.ebuild     | 159 ++++++++++++++++
 net-p2p/bitcoind/files/24.0.1-syslibs.patch | 281 ++++++++++++++++++++++++++++
 3 files changed, 441 insertions(+)

diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 0408f94aa093..c33fa9abf302 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,4 +1,5 @@
 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
 DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
+DIST bitcoin-24.0.1.tar.gz 11412628 BLAKE2B 2a8c83aecd12d8d40305d78ede1f389884ee62cfe4af39a9b416b8887a595f3393d599ebe9ddeb576bba5896923feb7ee45ba32d7d4cb0ce9e6d0ef39ecf83c7 SHA512 de1ddb543429f70b0b55a46500e0bc4807cca1b1655a28f8ab186d6f6e620f8cf82420bbdf412976ffed9bc6d742926b19933429c734edaf7430a4f8c37e1685
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad

diff --git a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild
new file mode 100644
index 000000000000..edae72c7b9f3
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="https://bitcoincore.org/"
+SRC_URI="
+	https://bitcoincore.org/bin/bitcoin-core-${PV}/${P/d}.tar.gz
+"
+S="${WORKDIR}"/${P/d}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm +berkdb examples +external-signer nat-pmp sqlite systemtap test upnp +wallet zeromq"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	sqlite? ( wallet )
+	berkdb? ( wallet )
+	wallet? ( || ( berkdb sqlite ) )
+"
+RDEPEND="
+	acct-group/bitcoin
+	acct-user/bitcoin
+	dev-libs/boost:=
+	dev-libs/libevent:=
+	>=dev-libs/libsecp256k1-0.2.0:=[recovery,schnorr]
+	>=dev-libs/univalue-1.0.4:=
+	virtual/bitcoin-leveldb
+	nat-pmp? ( net-libs/libnatpmp )
+	sqlite? ( >=dev-db/sqlite-3.7.17:= )
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	berkdb? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+DEPEND="
+	${RDEPEND}
+	systemtap? ( dev-util/systemtap )
+"
+
+DOCS=(
+	doc/bips.md
+	doc/bitcoin-conf.md
+	doc/descriptors.md
+	doc/files.md
+	doc/JSON-RPC-interface.md
+	doc/psbt.md
+	doc/reduce-memory.md
+	doc/reduce-traffic.md
+	doc/release-notes.md
+	doc/REST-interface.md
+	doc/tor.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/24.0.1-syslibs.patch
+)
+
+pkg_pretend() {
+	elog "You are building ${PN} from Bitcoin Core."
+	elog "For more information, see:"
+	elog "https://bitcoincore.org/en/releases/${PV}/"
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
+
+	default
+
+	eautoreconf
+
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable asm)
+		--without-qtdbus
+		$(use_enable systemtap ebpf)
+		$(use_enable external-signer)
+		$(use_with nat-pmp natpmp)
+		$(use_with nat-pmp natpmp-default)
+		--without-qrencode
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-daemon
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-util
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-gui
+		--disable-fuzz
+		--disable-fuzz-binary
+		--disable-ccache
+		--disable-static
+		$(use_with berkdb bdb)
+		$(use_with sqlite)
+		--with-system-leveldb
+		--with-system-libsecp256k1
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use test; then
+		rm -f "${ED}/usr/bin/test_bitcoin" || die
+	fi
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	doman "${FILESDIR}/bitcoin.conf.5"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+	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:"
+	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
+	elog "- Running bitcoind directly: add that user to the 'tor' user group."
+}

diff --git a/net-p2p/bitcoind/files/24.0.1-syslibs.patch b/net-p2p/bitcoind/files/24.0.1-syslibs.patch
new file mode 100644
index 000000000000..00404a2ff021
--- /dev/null
+++ b/net-p2p/bitcoind/files/24.0.1-syslibs.patch
@@ -0,0 +1,281 @@
+Originally based on 22.0-fix_build_without_leveldb.patch.
+
+- Allow system libsecp256k1
+- Allow system leveldb
+- Abort if runtime leveldb != compiled-against leveldb
+- Handle berkdb support being disabled better
+--- a/configure.ac
++++ b/configure.ac
+@@ -1362,6 +1362,23 @@ if test "$enable_fuzz_binary" = "yes"; then
+   CHECK_RUNTIME_LIB
+ fi
+ 
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++  [AS_HELP_STRING([--with-system-libsecp256k1],
++  [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_libsecp256k1=$withval],
++  [system_libsecp256k1=no]
++)
++if test x$system_libsecp256k1 != xno; then
++  PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++else
++  libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++  libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++fi
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test "$enable_wallet" != "no"; then
+     dnl Check for libdb_cxx only if wallet enabled
+     if test "$use_bdb" != "no"; then
+@@ -1413,11 +1430,76 @@ if test "$use_usdt" != "no"; then
+ fi
+ AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"])
+ 
++build_leveldb=yes
+ if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then
+   use_upnp=no
+   use_natpmp=no
+   use_zmq=no
++  build_leveldb=no
++fi
++
++if test x$build_leveldb = xno; then
++  system_leveldb=no
++fi
++dnl Check for leveldb, only if explicitly requested
++if test x$system_leveldb != xno; then
++  build_leveldb=no
++  LEVELDB_CPPFLAGS=
++  AC_CHECK_LIB([leveldb],[main],[
++    LIBLEVELDB=-lleveldb
++  ],[
++    AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
++  ])
++  AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
++    AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++  ])
++  AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
++    AC_MSG_CHECKING([for memenv.h path])
++    BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
++  ],[
++    AC_CHECK_HEADER([memenv.h],[],[
++      AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++    ])
++  ])
++
++  AC_MSG_CHECKING([library containing leveldb::NewMemEnv])
++  TEMP_LIBS="$LIBS"
++  TEMP_CPPFLAGS="$CPPFLAGS"
++  CPPFLAGS="$CPPFLAGS $LEVELDB_CPPFLAGS"
++  for searchlib in "" "-lmemenv" ERR; do
++    if test "x$searchlib" = "xERR"; then
++      AC_MSG_RESULT([no])
++      AC_MSG_ERROR([LevelDB's memenv helper not found; using --with-system-leveldb is not supported anyway])
++    fi
++    searchlib="$searchlib $LIBLEVELDB"
++    LIBS="$searchlib $TEMP_LIBS"
++    AC_LINK_IFELSE([AC_LANG_SOURCE([
++        #include <leveldb/env.h>
++        #include <leveldb/helpers/memenv.h>
++
++        int main() {
++            leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default());
++            delete myenv;
++        }
++    ])],[
++      AC_MSG_RESULT([$searchlib])
++      LIBMEMENV="$searchlib"
++      break
++    ])
++  done
++  LIBS="$TEMP_LIBS"
++  CPPFLAGS="$TEMP_CPPFLAGS"
+ fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$build_leveldb = xyes])
++AC_SUBST(LEVELDB_CPPFLAGS)
++AC_SUBST(LIBLEVELDB)
++AC_SUBST(LIBMEMENV)
++AC_ARG_WITH([system-leveldb],
++  [AS_HELP_STRING([--with-system-leveldb],
++  [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_leveldb=$withval],
++  [system_leveldb=no]
++)
+ 
+ dnl Check for libminiupnpc (optional)
+ if test "$use_upnp" != "no"; then
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -23,7 +23,7 @@ noinst_PROGRAMS =
+ TESTS =
+ BENCHMARKS =
+ 
+-BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS)
++BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
+ 
+ LIBBITCOIN_NODE=libbitcoin_node.a
+ LIBBITCOIN_COMMON=libbitcoin_common.a
+@@ -32,7 +32,11 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
+ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.la
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+ 
+ if ENABLE_ZMQ
+ LIBBITCOIN_ZMQ=libbitcoin_zmq.a
+@@ -67,8 +71,10 @@ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI)
+ endif
+ noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO)
+ 
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*)
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+ 
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -1080,7 +1086,9 @@ endif
+ include Makefile.minisketch.include
+ 
+ include Makefile.crc32c.include
++if EMBEDDED_LEVELDB
+ include Makefile.leveldb.include
++endif
+ 
+ include Makefile.test_util.include
+ include Makefile.test_fuzz.include
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -377,8 +377,9 @@ if ENABLE_BENCH
+ 	$(BENCH_BINARY) --sanity-check > /dev/null
+ endif
+ endif
++if EMBEDDED_LIBSECP256K1
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+-
++endif
+ if ENABLE_TESTS
+ UNIVALUE_TESTS = univalue/test/object univalue/test/unitester
+ noinst_PROGRAMS += $(UNIVALUE_TESTS)
+--- a/src/dbwrapper.cpp
++++ b/src/dbwrapper.cpp
+@@ -7,26 +7,45 @@
+ #include <fs.h>
+ #include <logging.h>
+ #include <random.h>
++#include <node/interface_ui.h>
+ #include <tinyformat.h>
+ #include <util/strencodings.h>
+ #include <util/system.h>
++#include <util/translation.h>
+ 
+ #include <algorithm>
+ #include <cassert>
+ #include <cstdarg>
+ #include <cstdint>
+ #include <cstdio>
++#include <leveldb/c.h>
+ #include <leveldb/cache.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+ #include <leveldb/filter_policy.h>
+-#include <leveldb/helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ #include <leveldb/iterator.h>
+ #include <leveldb/options.h>
+ #include <leveldb/status.h>
+ #include <memory>
+ #include <optional>
+ 
++bool dbwrapper_SanityCheck()
++{
++    unsigned long header_version = (leveldb::kMajorVersion << 16) | leveldb::kMinorVersion;
++    unsigned long library_version = (leveldb_major_version() << 16) | leveldb_minor_version();
++
++    if (header_version != library_version) {
++        InitError(Untranslated(strprintf("Compiled with LevelDB %d.%d, but linked with LevelDB %d.%d (incompatible).",
++            leveldb::kMajorVersion, leveldb::kMinorVersion,
++            leveldb_major_version(), leveldb_minor_version()
++        )));
++        return false;
++    }
++
++    return true;
++}
++
+ class CBitcoinLevelDBLogger : public leveldb::Logger {
+ public:
+     // This code is adapted from posix_logger.h, which is why it is using vsprintf.
+--- a/src/dbwrapper.h
++++ b/src/dbwrapper.h
+@@ -31,6 +31,8 @@ class Env;
+ static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
+ static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
+ 
++bool dbwrapper_SanityCheck();
++
+ class dbwrapper_error : public std::runtime_error
+ {
+ public:
+--- a/src/kernel/checks.cpp
++++ b/src/kernel/checks.cpp
+@@ -3,9 +3,10 @@
+ // file COPYING or http://www.opensource.org/licenses/mit-license.php.
+ 
+ #include <kernel/checks.h>
+-
++#include <dbwrapper.h>
+ #include <key.h>
+ #include <random.h>
++#include <node/interface_ui.h>
+ #include <util/time.h>
+ #include <util/translation.h>
+ 
+@@ -15,6 +16,10 @@ namespace kernel {
+ 
+ std::optional<bilingual_str> SanityChecks(const Context&)
+ {
++    if (!dbwrapper_SanityCheck()) {
++        return Untranslated("Database sanity check failure. Aborting.");
++    }
++
+     if (!ECC_InitSanityCheck()) {
+         return Untranslated("Elliptic curve cryptography sanity check failure. Aborting.");
+     }
+--- a/src/qt/createwalletdialog.cpp
++++ b/src/qt/createwalletdialog.cpp
+@@ -12,6 +12,7 @@
+ 
+ #include <qt/guiutil.h>
+ 
++#include <QMessageBox>
+ #include <QPushButton>
+ 
+ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
+@@ -94,9 +95,16 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
+         ui->external_signer_checkbox->setChecked(false);
+ #endif
+ 
+-#ifndef USE_BDB
+-        ui->descriptor_checkbox->setEnabled(false);
+-        ui->descriptor_checkbox->setChecked(true);
++#ifdef USE_BDB
++    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
++#else
++    connect(ui->buttonBox, &QDialogButtonBox::accepted, [this]() {
++        if (!this->isDescriptorWalletChecked()) {
++            QMessageBox::critical(this, tr("Cannot create wallet"), tr("This build was compiled without BDB support, so only experimental descriptor wallets are supported."));
++            return;
++        }
++        this->accept();
++    });
+ #endif
+ 
+ #ifndef ENABLE_EXTERNAL_SIGNER


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
@ 2023-04-10  4:11 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-10  4:11 UTC (permalink / raw
  To: gentoo-commits

commit:     3418f2ccedbf9e6f0df70d720f38b98ed8a924a6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 04:03:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 04:03:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3418f2cc

net-p2p/bitcoind: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/903781
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/bitcoind/bitcoind-24.0.1.ebuild   |  1 +
 net-p2p/bitcoind/files/24.0.1-gcc13.patch | 39 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild
index 15346a5e3025..6eec37f477fe 100644
--- a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild
@@ -62,6 +62,7 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}"/24.0.1-syslibs.patch
+	"${FILESDIR}"/24.0.1-gcc13.patch
 )
 
 pkg_pretend() {

diff --git a/net-p2p/bitcoind/files/24.0.1-gcc13.patch b/net-p2p/bitcoind/files/24.0.1-gcc13.patch
new file mode 100644
index 000000000000..39cf81b14953
--- /dev/null
+++ b/net-p2p/bitcoind/files/24.0.1-gcc13.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/903781
+https://bugs.gentoo.org/900246
+https://bugs.gentoo.org/895814
+https://bugs.gentoo.org/894734
+https://github.com/bitcoin/bitcoin/commit/fadeb6b103cb441e0e91ef506ef29febabb10715
+
+From fadeb6b103cb441e0e91ef506ef29febabb10715 Mon Sep 17 00:00:00 2001
+From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
+Date: Thu, 19 Jan 2023 19:35:43 +0100
+Subject: [PATCH] Add missing includes to fix gcc-13 compile error
+
+--- a/src/support/lockedpool.cpp
++++ b/src/support/lockedpool.cpp
+@@ -19,6 +19,9 @@
+ #endif
+ 
+ #include <algorithm>
++#include <limits>
++#include <stdexcept>
++#include <utility>
+ #ifdef ARENA_DEBUG
+ #include <iomanip>
+ #include <iostream>
+--- a/src/support/lockedpool.h
++++ b/src/support/lockedpool.h
+@@ -5,11 +5,11 @@
+ #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H
+ #define BITCOIN_SUPPORT_LOCKEDPOOL_H
+ 
+-#include <stdint.h>
++#include <cstddef>
+ #include <list>
+ #include <map>
+-#include <mutex>
+ #include <memory>
++#include <mutex>
+ #include <unordered_map>
+ 
+ /**


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-04-10  4:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-24  1:17 [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2018-01-23 10:37 Thomas Deutschmann
2019-08-07 16:33 Craig Andrews
2021-01-21 23:23 Sam James
2023-01-05  4:38 Sam James
2023-04-10  4:11 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox