From 1dc3daaceafdd32ffbf7771dbe60fd02b7adcb0f Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Fri, 17 Jul 2015 22:20:46 +0000 Subject: Version bump. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- net-p2p/bitcoin-cli/ChangeLog | 8 +- net-p2p/bitcoin-cli/Manifest | 33 ++-- net-p2p/bitcoin-cli/bitcoin-cli-0.11.0.ebuild | 33 ++++ net-p2p/bitcoin-cli/metadata.xml | 3 + net-p2p/bitcoin-qt/ChangeLog | 8 +- net-p2p/bitcoin-qt/Manifest | 32 ++-- net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild | 106 +++++++++++ net-p2p/bitcoin-qt/files/9999-syslibs.patch | 243 +++++++++++++++++++++++++ net-p2p/bitcoind/ChangeLog | 8 +- net-p2p/bitcoind/Manifest | 32 ++-- net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild | 79 ++++++++ net-p2p/bitcoind/files/9999-syslibs.patch | 243 +++++++++++++++++++++++++ 12 files changed, 782 insertions(+), 46 deletions(-) create mode 100644 net-p2p/bitcoin-cli/bitcoin-cli-0.11.0.ebuild create mode 100644 net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild create mode 100644 net-p2p/bitcoin-qt/files/9999-syslibs.patch create mode 100644 net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild create mode 100644 net-p2p/bitcoind/files/9999-syslibs.patch (limited to 'net-p2p') diff --git a/net-p2p/bitcoin-cli/ChangeLog b/net-p2p/bitcoin-cli/ChangeLog index ec24f16457e7..80799d77a12f 100644 --- a/net-p2p/bitcoin-cli/ChangeLog +++ b/net-p2p/bitcoin-cli/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/bitcoin-cli # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/ChangeLog,v 1.9 2015/07/17 21:21:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/ChangeLog,v 1.10 2015/07/17 22:16:07 blueness Exp $ + +*bitcoin-cli-0.11.0 (17 Jul 2015) + + 17 Jul 2015; Anthony G. Basile + +bitcoin-cli-0.11.0.ebuild, metadata.xml: + Version bump. *bitcoin-cli-0.10.2 (17 Jul 2015) diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest index 6cde4208575a..d2f41c6e732d 100644 --- a/net-p2p/bitcoin-cli/Manifest +++ b/net-p2p/bitcoin-cli/Manifest @@ -3,33 +3,36 @@ Hash: SHA256 DIST bitcoin-0.10.0.ljr20150311.patches.tar.xz 34836 SHA256 353b82a933d234daaaed3f807f940a701646c7c9669867fbf5cdb48a1065312c SHA512 dc2a24f141d591f288e846f29a3263dea463f77dda22b92f91e781a8500c695be8b6f497251b6c960e1acdf43e839a7f0bc06fb7a18cdbda90b3d6a61f21c4af WHIRLPOOL 3b898c529e7967750dabcbb235657c19bab0ce75b6f47017ae7bdc7943acb8001cc19eff2d319e1ad405037ecf0674759a575116b1b0c1f32fde89a98f0052a3 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.9.3.ljr20141002.patch.xz 23320 SHA256 d0a480e11159d597a36e300398c858b5713de78d4f00295b46aa6612ed4b28cc SHA512 b6f225c1e6fc4b1b0b53084d62ff6a57af3b45ea48064fb790b51a081bd1a2333ad5ebffdd443da47babac76ca7394d3ccb645fb3e5e532252409de32a3cb768 WHIRLPOOL 2cdb0a3e3b8407ef11a9f6a56c47ca51c38eb7adbf1b0ceaf1b7fec00118a75892782f66a4c85e54f43e3a3107d1b4e3c799eb1171dff8eb9db69d162cde650a DIST bitcoin-cli-manpage-v0.11.0rc3.1 1609 SHA256 868d35484d12a649c3ceb5797abf915c4110393fb33b34509793ae0717963b9e SHA512 296006670bf64c54c408803244eed9db77fe96d1d3f642fb63442838fb4f086c50518d32f44f642a84757bfdf5f041fa6fc98f1e07d48739e41c1049a19b7666 WHIRLPOOL f63e632cb1ad82b4536cff7a04d55c55e981d6cc8e9cd2199e08a3267e4692dd7e732ccb0e66d08657c428a569046a0abc6fac9eec82ba6b997bd41fc96865a7 DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3 DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e DIST bitcoin-v0.10.2-r1.tgz 5076702 SHA256 9bee2b9fe0c236f9f75bfc05c59df238c9424cbcffe4483db5009c5aaff8881b SHA512 5650dc281c749a6057d2dc29d61909619d680ace8c74c41df1581ef56e98950cb42bf4ea2c37264f00090cfa7762f2539f433c8117228484cd7628d397aa69fa WHIRLPOOL 02c2e74748c7572fa3968fc132d561323e33e6aadc07744bd06567abdddd3c7871afe6b46d30fc3389d92246c705454db708dd05946e93e3a93ad5d3b89a327b +DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf DIST bitcoin-v0.9.3.tgz 4788997 SHA256 3ed92e8323cb4187cae015457c7c5920a5c658438f01c6c45f0ce3aabf9bd428 SHA512 cf6ff5bc586b0614b4e74e1c18b30e8f443f03db348382492e49c70ec31a0ef3a4d1989b34a8fdce289788c894b48b72b94d2562e497220453b668dc28ce0d66 WHIRLPOOL 6ce18de9a2b24cedd88e110088d0747452f8403b6239df9212b673e4a893e059bdea2640b13b6fde659a866d4a6a3b4fa62dde3adbf957b80104d41c0e4aeb18 EBUILD bitcoin-cli-0.10.0-r1.ebuild 687 SHA256 90af30eb44b21a636a7c6832a42b0114345bafd7fcc37138d41a5ca420360ea9 SHA512 4896dc12a8e4488d519e13bc6be681c33ae2b20e080552cd0bdf474e3a748cb87ef1d44a8ca2555979e2654e9896208acba4675b9d7cb04f15186c1eff290a31 WHIRLPOOL a41cb57a54dd9ba0271f5fd5dec562e3b955b428a8c0a39622bb5c3ff39b26efa741fdaa0d672ce7785be0f743c36d03230854c94e6901726333185b247ec19a EBUILD bitcoin-cli-0.10.1.ebuild 684 SHA256 dbf5d631d613e94c756b467cf953372f11ca3eb614c351bc7e48cce5225ee109 SHA512 4be2801cc4a2806ae311e300d76e3d03d947f61b3e94ed321037d6c3aabd00f0e65e1852a033abe58fe9ea003b0338af6510bb6cd8c0d06630e159347c5d0487 WHIRLPOOL ebfedf223a30ada1136724e31d59bf110dfe4842fa2d76c14001f20bdde76d43d6d2e9e533e3f805319b5991a9390142d2e5ba30586727ea48ecfc65497c6b8d EBUILD bitcoin-cli-0.10.2.ebuild 1253 SHA256 2c684635c141f86cc65687ecd3214b69219ecd9223d260969920b6efd7ad4edd SHA512 6b81e4c8fcc8d4d05bf3dbac3667973e607504cec73461b95776f4076b79974e2a1d7ea377b7dd53ded8dea253c465a6292977b8aa6a6e78ff8aeed59ff27237 WHIRLPOOL e25182f89b867c2792d8f5307d7873e5003b3b706b9e3ae6f77c10a03860d9c71d08c8bfb59a1b1251234a433de415f1ca4962d8e59bf20045c9fd44c53b3e1d +EBUILD bitcoin-cli-0.11.0.ebuild 954 SHA256 64f6fce7e67be852289ed4ba9e9d65f77db8a802f763a4d3b0415ab44a739bff SHA512 5bc0d5f4e3f6ddea41cf0083ee2e9ad33deacf3cbadf2f32a0b8f99dcdff26941a12dec54c633edd75b774fb02b6fab6406d58bcc28f96bae48099519c3c89c7 WHIRLPOOL 4d9391a62be55349960d6c6387b53a3e5c19f0042bbf0d45c152b7cc7f328acdda937f7111e74e37c7eac424c8e4bc1a48d8bb070890ff1f36d8e46849551664 EBUILD bitcoin-cli-0.9.3.ebuild 1264 SHA256 b7b9da112ddb28aef6aa5ee8bb3e80685796b1c77d68eaa5cbc6fe0bbb798d9e SHA512 11657d55d0aee792184c7531bbf9a94b7b9d1c142ebdfb5809c998c124cca613d1ccbef72664d5323c4da5aa041eb67ed6d97dfabe515825e175da092960271e WHIRLPOOL aed811c30bae6e32cea764c624b19664f2aaf363a5cd9a29a0baaee089ea7a941086bb2dff56fe09f30d9be50e75cdf9b4df6c966135e32801941e02bc37dd43 EBUILD bitcoin-cli-9999.ebuild 598 SHA256 f51fd454fc1696086ebf20b49b504fb7c4158245c1b792008d1436ba3eb776d2 SHA512 c27f79431145b853562ba3b5304deba1e8b358d426ba71daaecc851d8b01a915bdf663ef3d6418ac5066252608f029d0562517859a8402b8bf46e2dc2e55d289 WHIRLPOOL e4e6b61e7c52ae8ba7e7ae6b5a5a5785b15db66fa5159ee776c3751420c34c18f88215159c61caad263aa23ea3c6a5ea4071e9244cf11f9b0b5a68004b736a13 -MISC ChangeLog 1468 SHA256 07d00e56eca52407ccd025b95baedaf3d43a6e1c0632d119f455e2aafeeb737e SHA512 c760a186ec956bf3a41534b70669342b465a7c30fa9e3a844f7b915337f3462524b3cb59714532640998e88cf349fc16576fe03a6f022e28a1d8eabd6c14dce7 WHIRLPOOL efeb2348b85a23b579f6f4243569a0197c88082e76bfb999c432bd0ee59fd257784907198c170e0d86bf8a9de21f25f1f2b19ad3e1fde25c76743635a02ec92f -MISC metadata.xml 374 SHA256 5098edf30adee84f59968d5b6c45adcfa410a32001905dea9c093a5ce74a44b3 SHA512 4315e762ca8061694dd652ddcd1a9f9f4b51a06126207c644a52557fb977b94eda2bea826f326763f99cd7da5e813fd07251d039bece31fc13f8686d7113cea2 WHIRLPOOL a629000079acf2866848adb5f66496970dc515badbd9e624437ea89d06d7a7f106ac50a22eeefaac28012667f86d5938c8e4ebba3df837c70763b93e3e239b6e +MISC ChangeLog 1620 SHA256 e899e87b2be7f04bde81c7dd1580d9de9daf9b93ed7810879b7992f52b6b2db3 SHA512 928190b33f0c7e8b07a228ddfdf30790415062e57e54cd5529a3e7512b507a1aec5e3a5a3280ed2265fb166d4d2a11822ccd2a7ecf87b4fe2d4c3efc41f74eef WHIRLPOOL 0a0253a8a90b57062b5f81737c89acb10edfda0a6c1aad6d4610c89b14c3c5603ba3b6f202f7c844772585dfb405d72aa3b57f26127af58d84cc8a6fdae2fbb5 +MISC metadata.xml 444 SHA256 dcf312dbf10a07a1fe9d37070172c6c0f646d38dc4da001755b80e54d013932f SHA512 37fa4573a9647e88965f54a9a9ac0672da91c22cbd3116b33efac44321da5d29f94c442ffe66d938be2b3dd846bd56518b0c2f89b21f98d8b778152a3f11d5d8 WHIRLPOOL 1fc1d9f372fe36b595302241e080691272ea941b502d7cf5d0342c42ac51e485c94ac907ee926f7322c96983f62422f3818fa505438c3f5f03c5807f996d9ae7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVqXKJAAoJEJOE+m71LUu64cIP/042nxA8AWvVSCGqkUmS4iwn -DTtwYG1rz3KPPEvSXDjK2enD0BGneQs7+z16BuVwwTr3jFKH8fNc7AE93fiarG7n -AqiFcIeEBXeGdtXmVMGetc/0iaFTmkF5UuUVfBoCPZO6aRyKtXgqPIY34iQxPDno -NZteZT8YCz5p/S0ycSa52SmSUkg97mmyaaeM4QW78tAgdLC2gHOhlwGL2JdcEN41 -tXZxMfcLqyJz/burlqIxr3EauRrI5rr9Z/zvTucxc/1VYgZg1a9ufDZ4gki+mgN4 -7mvHYItI7OGUfq2YdoiUlFa31hS5o1TjUwg3yfEAHSC3zHWWuu9Oml4RskF3d58Y -sLJjV7tR0RNtoEOBUon+FTDRF+spoeE8Rh1dCWMKz3Unbsxdn+EbBnp84J7kqDRs -570bIh95ZgV02asyo0uGuKTH8ppcJk6NKhwJ3n/f+CWqUWLoU4yvRqt3Dtl3E3+F -C8TLI8t4UwZ/NFN0NghOOiXvKV6Wb9D3f3TJWi2aCHYOSUrcQEZ2qiU8StY0ScqC -cwx5uKj2BkRPbQzNZuLNC3FtPoEEaIz9N6psZrvArrUBajpTe+PBr7Q2Hl0D9Ata -Vf91+aFNAdOPQIakvWv+uDCrni2USIMJUDfiJCeDN2Lb7A+NmJmAiL/WK22xN/eb -uusdiaSP67ltsl5lMI/B -=nd/j +iQIcBAEBCAAGBQJVqX89AAoJEJOE+m71LUu6qMgP/RTGtVSUhMsjMlr/zgGUN5Un +y6QaCFZ1q2VNV8W9QO4qvlJDooaNE9iA4uS1flMS18UqsYXvYLtptLUPqgtoNAdj +kdY6A9HAHiHIELbjVwjNcEQrzulZFFpBqhr2Z8DMrA6qpzrVf637tXN4Btgh999h +hb8bPzSTKKLEq57n23uzTnEGC5wIrmOTgtbizACBqljXF5xidvhYwmwDW9LJGMAt +dsiP/eIaC/WXi1TYGm0Tj1+zEoOjt3IQsMzW6iliUUtqVpLlyU3R+1vWUWOI90GN +yOx2CMxrDk7v/+0KQC+to9vxq1ErTCreFXIq6PSMrNBENnbtiZ3N82c49hUr+cqA +/3UiDwO46Q9ZUwExCisPOolQG9roJaB/Y0z7zks9z6C+VFFfrAOe+ZswnvroNO0j +kreCvn9Lpgy6OYJSULTqmR+iOGymp4hRl2/vjW93OT2FpEXw+fKwqQrHwTDzhHli ++fzvH27BipKLmYFAYwIi1Cg7JD/P2SbNUxMIuHsXzXEp3i28rBO/Naq5S1p8WOEY +m7d/UecT8kvmKnof0i1zgbQeVRUvHd2FTGmWr3GepHpJ4+rndU7drFsieSs6GcZ/ +FIN/YNZ2js/xh/Q4SkYUx09BATDgMxQWF3ikj4AyNYROfjvWdzroVmuvKZG59/ia +KpHjqWvoF74WQmsJ9Kd1 +=3nlN -----END PGP SIGNATURE----- diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.0.ebuild new file mode 100644 index 000000000000..b9966d12172e --- /dev/null +++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 2010-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/bitcoin-cli-0.11.0.ebuild,v 1.1 2015/07/17 22:16:07 blueness Exp $ + +EAPI=5 + +BITCOINCORE_COMMITHASH="d26f951802c762de04fb68e1a112d611929920ba" +BITCOINCORE_LJR_DATE="20150711" +BITCOINCORE_IUSE="ljr" +inherit bash-completion-r1 bitcoincore + +DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +src_prepare() { + sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind \(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion + bitcoincore_src_prepare +} + +src_configure() { + bitcoincore_conf \ + --enable-util-cli +} + +src_install() { + bitcoincore_src_install + + doman contrib/debian/manpages/bitcoin-cli.1 + + newbashcomp contrib/bitcoind.bash-completion ${PN} +} diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml index f258144be6d6..c25ea048b4e3 100644 --- a/net-p2p/bitcoin-cli/metadata.xml +++ b/net-p2p/bitcoin-cli/metadata.xml @@ -10,4 +10,7 @@ luke-jr+gentoobugs@utopios.org Luke Dashjr + + Enable Luke Dashjr's patches + diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog index d8b7e23e3a29..6f4ee6cafdbe 100644 --- a/net-p2p/bitcoin-qt/ChangeLog +++ b/net-p2p/bitcoin-qt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/bitcoin-qt # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.112 2015/07/17 20:56:03 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.113 2015/07/17 22:20:36 blueness Exp $ + +*bitcoin-qt-0.10.2-r1 (17 Jul 2015) + + 17 Jul 2015; Anthony G. Basile + +bitcoin-qt-0.10.2-r1.ebuild, +files/9999-syslibs.patch: + Version bump. 17 Jul 2015; Anthony G. Basile bitcoin-qt-0.11.0.ebuild, bitcoin-qt-9999.ebuild: diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest index e677f993153d..721fb4d3c931 100644 --- a/net-p2p/bitcoin-qt/Manifest +++ b/net-p2p/bitcoin-qt/Manifest @@ -7,32 +7,36 @@ AUX 0.9-openssl-101k.patch 1192 SHA256 198318943cd1eaff2ce5e94b5b9aea40a2c99c46c AUX 0.9.0-sys_leveldb.patch 1040 SHA256 1355674ba82966b31fd001b12e7bd1bffbfd7f1c6d8dc1679cedba032e6df642 SHA512 26b1b6f8c4fdc228c08982a3172de57e09d963745726c99e1e274f381e242467f84d23c718f8e07675c2fc938f2d6db6b50a05dbb944702238d7b0eb6205cff7 WHIRLPOOL 7d39d39f846f03ffbf3e4c9655c42f298c8196dde8ee621862483a49f386c13cfdd13221ff265745f504a33422aaafac3657b72552f55784c9296daffc248f31 AUX 0.9.x-ljr_noblacklist.patch 330 SHA256 b20c934540748cd42405bfca305a61bf05a76cd9b54f20e57e5fba84bb742f6a SHA512 13e727d6e1324542f7097c310e2f2a869d39acf6288593661b81715858ee95d1ca0566aa9892e5a8e34e4c45edc28faff6938728f1b97e9561460ea99838834a WHIRLPOOL 851fe606c02da5d8f778d56aea83d5a55a427c7a83610755cdd35fdc67a02a4628c1c480bea5d8d862968416ff3cb3e78d56ece498055f86e4d138e5997db674 AUX 9999-sys_libsecp256k1.patch 2804 SHA256 ddeb293959184d82beed8bf9117916a28d49c0d0a324287ea026bdcaa7505871 SHA512 970a851f564cddf5ca2ad453ce6ba767b3815be9bcc4dd09c5fba6f42e1b70a9de7438d31e8dcf15875cb4c06ff2f04b0a2361b6b413b2146b2c2c78b908ea17 WHIRLPOOL 634cb832458551b61caf8d852335260ce4f2253a516dddc8b723ce89be05fd4254f4f6b49f8c6697da4120e723a068308d0cdfb57c16c199329cceb83a9be2b1 +AUX 9999-syslibs.patch 9143 SHA256 a91cb64a820e2e0eaa573fc3c7e408d68f344f9f0d25a4ba110d0443cb622bc6 SHA512 595717f059b6ad11dc790a7c2f343ca66fcf237311cbf5f60cd9569624755295d5efb57127cc82bf3e0bb972ee432e0d2211155b26c71546808faa68c78d55df WHIRLPOOL 805ebe3de20d9a417ead593274297d2b074af55cccf63bc73b4a8884f5c27bd0c27d0f8c92636769bce88637677924149ef8b8520e907c64486f7c666f2e1a04 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-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 bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4 +EBUILD bitcoin-qt-0.10.2-r1.ebuild 3041 SHA256 e7a2f42064c9e671611e07f89f9266e12cb4316115b31177d0d4149d23018d56 SHA512 5aaeac4f64e1d0d1187936e86002df37351789f7d83bceb378ede1df71bedc4722f9bc2bcdfe7f1aa754633fa162964baa91f360b54ba0816026526cebb89329 WHIRLPOOL e089aedf529af6c040a1ac8cf66582acf277547ae630156bda785fb9b83222ad76af79cfc7e2b6216fb08be643e5781d0c40ec1053dce8495384155b9d8b8725 EBUILD bitcoin-qt-0.10.2.ebuild 3212 SHA256 a9e9582d7ee551efd556a4c395a5398f653a5b7c316d4a6f1f18d66bdb20ee7d SHA512 25cfdff7638fc110b72ab2ce9497a68dc8ebeff7cde27931343bb6eb72022918789ecf854a0f8aa33a3171d8d3e48d8142db8741acc91a1d078ed1b7b46dc6e9 WHIRLPOOL 33932b6ac1fdf431e15ef39d01e65a7482f31bd4a7112dd58a0dd9f0fd0032cc5569c595ce7f10857e2c2c551e42ad73993c170aedeea75b9b59fb6b487d2758 EBUILD bitcoin-qt-0.11.0.ebuild 2843 SHA256 35242bd354ec2fc37c540a6a08f44b1c76be630335d3bf95e97858ebf2f51614 SHA512 ecfbfe26e0a7bb749b9673e3cd799870d0c1729c377f69043f8cded2adcd5d8c8b2f0bb3bda25f1a946a53c4ba8dcadf27319aa906edb885b3bb993bcc88a743 WHIRLPOOL d68c81a793f23ea12c603267820666a747c329a957f4d1b81078a71d40b6984c7cb7a1bf3a26919daa82a87495963e86c076629698c2bd610c8bdd970326090f EBUILD bitcoin-qt-9999.ebuild 2628 SHA256 e4e109bf537736e802d9d81ef81da4323013d6ce5fc5c3f0c9a7f7c62ca46dfc SHA512 2ca1c217d5e83b92decfffa3363819586d6e93e25ee78a2d6bae56879d80dcfa3415b19e71355f5c6dadc32dca9fa360dce10a0fdfb0043eaa31201d6db57820 WHIRLPOOL 9b1ff0b3c94411fb4ee020ec5aedf861631164d635a0214db5dc499440c108b9469d62d91410b8b690690dacf331cef2c6e647c46cd6b3540ae514b0a7b04558 -MISC ChangeLog 22087 SHA256 89a923d244a22d925ed04b77482c5b2e1e1b9b1cde0fa40f866a9773273c9c02 SHA512 9152614a9ea3decab1692419d285e60feb94c917121937f34effad92030974e6fc6945e274523d57190db1dfc1ff7835a4b4df2d971bb4a408e2a05bcd326870 WHIRLPOOL 7c2c6c92c37e54086a91c6a8af0c8d8b3532115051e0cb40fa030f8ff4dfc871c0d4031041657733ddc307c43cba686dcac5950bc731bdbea6bc64389e195ef0 +MISC ChangeLog 22255 SHA256 ebfcacc863c72dead32277c3d80191762a836439f3cf7829ee50ed5f1a6408e6 SHA512 158750c693b2f3fe316d8831a04b04dcc3e46f6a587777ea4d831742fe061ff26e7ace9496f7bab688429f054f9ff9e7cdd8dace8efbd388db5eb14b81800b89 WHIRLPOOL 7f8a8f0bc56bc2b77b9d1bace29fed3c84667db3e59f90423d503812ed3064d0df01771608e09951c64b83f07e65c098f77803a4e7967c92fa4f4eb07eb157f3 MISC metadata.xml 1626 SHA256 4b60abfec18e0fda95c9663f282c5337a95cba8fe809607ed5748982d1b544b2 SHA512 0048435fb0ca34f06f9fad0b9736da60532f8f4ffdf50dda056e2abd1e5ce98477383a432b597580f6e272b4895c3434ca5261986643ae3dc834638fcf74e5a4 WHIRLPOOL bc857f922aa1d313887fe4e5ddfb468ada0be66e5259d856568f044c13cadf01b19ba5de90ddfc47584062900f4fc7adf2db19ba28d213f3deb2cc892ebb3a59 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVqWx6AAoJEJOE+m71LUu6LS0P+wW4N/bnyMgrnrOReznAhnkq -xSFS1zrnWCJItyk5Iea8V3o3WUMuNaPHwRcuMFCS4PfTqCZu535vPEkNvg4gNIY3 -nHXNYeOX9vMtZWbOa7y5r57F9r5YByr6JXJ6vx8P+V7lirT5uVxFQaKOY0Yq3/HI -ANgIvZdl6wmf7KTWwIviu9qlrrTYO4GnYfUtZ88lnp8+59orsLd6kr1dwBfVyLRg -ck4/1c0XUAm/Tcfd7Ludkfm8MXUNwpDDXGB4LUXjVzeLn0vI0F7Bi3CNe1TORAYU -e53a5bXEYR1eQRNDSI9fNH2f5J8NfQFd7NTpYB8BvmEGzLlJVxjxNC9+MMqE9orm -LjbbOG5lZj2HayGn0ucg33VVFQjv4NlA53zg34Q9Bzem04/dBHCKz8dUcKNWSkqE -lXpQPR1Q8SDZNH7LERGil/l30q7SzVI6i6sakDVpZGRuIrwKuTKAT0IE92xIonSq -GeWL4tg96EifXww3Q32mylLpXBBg7VH539sv6qEWmGpmbdlyYwJ+2DrRp/EoLv7R -oYCFkN09OriijXPbW5E2TH2WPoTcLlR4klNc53GuDa3tC6E0C1foaiTc4b894hGB -tYS54PuAuIIqEyXGlxvDPy1ZTJ867LfwIaGwMvrS7VWqXypItftI0i68dJyPKk0p -OYsa9gig3gz4SmbZA/Go -=f5H8 +iQIcBAEBCAAGBQJVqYBKAAoJEJOE+m71LUu6gTcP/2Yi/R6zVQB7phWbWsDxCn9P +kjoi4eT/j/Xh+hwHQdIrZ4BN2ZAgywnSqPs0uiiHVMcpARWth4kCZtBtITDAyULm +LnFzAUE/3hLTSLjDDlv0g46pM1N/NPoSe8LCcU1TcuKLVSMqLnepHL2NZdavkHwY +i968toBXGH+3r3OfmDwA/GpfMYbbJgLcshQVynDgMRhhBqsm/YLX9rl/Qap11Wif +PJP2LRstkV3sfvFaA46wG/tpwW+/NVfjzeGwDGoHU0s0tA/Q+CYf9IsR7/orZxxL +ROQwshS6UgwKbAa1/B6FjUYlmxXn9oXBozsaNahYGRPTC+s7K5Fm3Ih5ChMYnKbq +ffVeMXykXlkFqmbcd/qmwAV7qMAcUCiUtEfhhAXlwQ6bQJ2l8rqxav1ZKv1hXtDN +sMfufGkYBgK7tdN7upfOyY8qqW5c8u1c7PLDwY9Wh5mbZkS9BzzE53T+fRgmuZ/i +FWeWbOTkuZXC4bsV7BNjHdlrn2dMxf4zYR77bM3cUXd6XUTVZZUCQngiMqf0y9zX +SnHuCPuYN7j9QCbjRQ+JgfEZHzWp1mTrdH11V+ZbnCl8RoEC5rjwwrgw1uMbXOXi +2TlPjIltuF0SWyYKfI7WTOGxTdAPf9boyg3qmyANMJFH0XsSoU7iJ0Ly8yjmP74t +hTMlbfO9hfQOCIJITIPR +=zANZ -----END PGP SIGNATURE----- diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild new file mode 100644 index 000000000000..7e1f807c75b9 --- /dev/null +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 2010-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild,v 1.1 2015/07/17 22:20:36 blueness Exp $ + +EAPI=5 + +BITCOINCORE_COMMITHASH="16f45600c8c372a738ffef544292864256382601" +BITCOINCORE_SRC_SUFFIX="-r1" +BITCOINCORE_LJR_PV="0.10.1" +BITCOINCORE_LJR_DATE="20150428" +BITCOINCORE_IUSE="1stclassmsg dbus kde ljr +qrcode qt4 qt5 test upnp +wallet xt zeromq" +BITCOINCORE_POLICY_PATCHES="cpfp dcmp rbf spamfilter" +LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW" +BITCOINCORE_NEED_LEVELDB=1 +BITCOINCORE_NEED_LIBSECP256K1=1 +inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2 + +DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency" +LICENSE="MIT GPL-3 LGPL-2.1 || ( CC-BY-SA-3.0 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-libs/protobuf + qrcode? ( + media-gfx/qrencode + ) + qt4? ( dev-qt/qtgui:4 ) + qt5? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 ) + dbus? ( + qt4? ( dev-qt/qtdbus:4 ) + qt5? ( dev-qt/qtdbus:5 ) + ) +" +DEPEND="${RDEPEND}" +REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )" + +src_prepare() { + bitcoincore_prepare + + local filt= yeslang= nolang= + + for lan in $LANGS; do + if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then + die "Language '$lan' no longer supported. Ebuild needs update." + fi + done + + for ts in $(ls src/qt/locale/*.ts) + do + x="${ts/*bitcoin_/}" + x="${x/.ts/}" + if ! use "linguas_$x"; then + nolang="$nolang $x" + rm "$ts" + filt="$filt\\|$x" + else + yeslang="$yeslang $x" + fi + done + filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)" + sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' + sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' + einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang" + + bitcoincore_autoreconf +} + +src_configure() { + # NOTE: --enable-zmq actually disables it + bitcoincore_conf \ + $(use_with dbus qtdbus) \ + $(use_with qrcode qrencode) \ + $(usex 1stclassmsg --enable-first-class-messaging '') \ + --with-gui=$(usex qt5 qt5 qt4) +} + +src_install() { + bitcoincore_src_install + + insinto /usr/share/pixmaps + newins "share/pixmaps/bitcoin.ico" "${PN}.ico" + make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false" + + dodoc doc/assets-attribution.md doc/tor.md + doman contrib/debian/manpages/bitcoin-qt.1 + + if use kde; then + insinto /usr/share/kde4/services + doins contrib/debian/bitcoin-qt.protocol + fi +} + +update_caches() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update + buildsycoca +} + +pkg_postinst() { + update_caches +} + +pkg_postrm() { + update_caches +} diff --git a/net-p2p/bitcoin-qt/files/9999-syslibs.patch b/net-p2p/bitcoin-qt/files/9999-syslibs.patch new file mode 100644 index 000000000000..2cdf2ab9837b --- /dev/null +++ b/net-p2p/bitcoin-qt/files/9999-syslibs.patch @@ -0,0 +1,243 @@ +diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 +index 66f106c..5f0a3b1 100644 +--- a/build-aux/m4/bitcoin_subdir_to_include.m4 ++++ b/build-aux/m4/bitcoin_subdir_to_include.m4 +@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ + AC_MSG_RESULT([default]) + else + echo "#include <$2$3.h>" >conftest.cpp +- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] ++ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) + AC_MSG_RESULT([${newinclpath}]) + if test "x${newinclpath}" != "x"; then + eval "$1=\"\$$1\"' -I${newinclpath}'" +diff --git a/configure.ac b/configure.ac +index 37fe47e..14e5c34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], + [build_bitcoin_utils=$withval], + [build_bitcoin_utils=yes]) + ++AC_ARG_ENABLE([util-cli], ++ [AS_HELP_STRING([--enable-util-cli], ++ [build bitcoin-cli])], ++ [build_bitcoin_cli=$enableval], ++ [build_bitcoin_cli=$build_bitcoin_utils]) ++ ++AC_ARG_ENABLE([util-tx], ++ [AS_HELP_STRING([--enable-util-tx], ++ [build bitcoin-tx])], ++ [build_bitcoin_tx=$enableval], ++ [build_bitcoin_tx=$build_bitcoin_utils]) ++ + AC_ARG_WITH([libs], + [AS_HELP_STRING([--with-libs], + [build libraries (default=yes)])], +@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then + [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) + fi + ++dnl Check for leveldb, only if explicitly requested + LEVELDB_CPPFLAGS= + LIBLEVELDB= + LIBMEMENV= +-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) ++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] ++) ++if test x$system_leveldb != xno; then ++ LEVELDB_CPPFLAGS= ++ AC_CHECK_LIB([leveldb],[main],[ ++ LIBLEVELDB=-lleveldb ++ ],[ ++ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ TEMP_LIBS="$LIBS" ++ LIBS="$LIBS $LIBLEVELDB" ++ AC_CHECK_LIB([memenv],[main],[ ++ LIBMEMENV=-lmemenv ++ ],[ ++ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ LIBS="$TEMP_LIBS" ++ 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]) ++ ]) ++ ]) ++fi ++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) + AC_SUBST(LEVELDB_CPPFLAGS) + AC_SUBST(LIBLEVELDB) + AC_SUBST(LIBMEMENV) + ++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 x$enable_wallet != xno; then + dnl Check for libdb_cxx only if wallet enabled + BITCOIN_FIND_BDB48 +@@ -515,7 +578,7 @@ BITCOIN_QT_INIT + dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + +-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then + use_boost=no + else + use_boost=yes +@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) + AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) + AC_MSG_RESULT($build_bitcoind) + +-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) +-AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) +-AC_MSG_RESULT($build_bitcoin_utils) ++AC_MSG_CHECKING([whether to build bitcoin-cli]) ++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) ++AC_MSG_RESULT($build_bitcoin_cli) ++ ++AC_MSG_CHECKING([whether to build bitcoin-tx]) ++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) ++AC_MSG_RESULT($build_bitcoin_tx) + + AC_MSG_CHECKING([whether to build libraries]) + AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) +@@ -826,7 +893,7 @@ else + AC_MSG_RESULT([no]) + fi + +-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then + AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) + fi + +@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" + unset PKG_CONFIG_LIBDIR + PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" + ++if test x$system_libsecp256k1 = xno; then + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + AC_CONFIG_SUBDIRS([src/secp256k1]) ++fi + + AC_OUTPUT + +diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh +index 9b31865..5bb187c 100755 +--- a/qa/pull-tester/rpc-tests.sh ++++ b/qa/pull-tester/rpc-tests.sh +@@ -57,7 +57,7 @@ testScriptsExt=( + extArg="-extended" + passOn=${@#$extArg} + +-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then ++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then + for (( i = 0; i < ${#testScripts[@]}; i++ )) + do + if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ] +diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in +index 10f4d33..e0e407d 100755 +--- a/qa/pull-tester/tests-config.sh.in ++++ b/qa/pull-tester/tests-config.sh.in +@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" + + # These will turn into comments if they were disabled when configuring. + @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 +-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 ++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 + @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + + REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" +diff --git a/src/Makefile.am b/src/Makefile.am +index 1c2f770..4d60ddf 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,6 @@ ++if EMBEDDED_LIBSECP256K1 + DIST_SUBDIRS = secp256k1 ++endif + AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) + + +@@ -20,7 +22,7 @@ endif + BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config + BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) + +-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include ++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) + + LIBBITCOIN_SERVER=libbitcoin_server.a + LIBBITCOIN_WALLET=libbitcoin_wallet.a +@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a + LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a + LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a + LIBBITCOINQT=qt/libbitcoinqt.a ++if EMBEDDED_LIBSECP256K1 + LIBSECP256K1=secp256k1/libsecp256k1.la ++else ++LIBSECP256K1=$(libsecp256k1_LIBS) ++endif + ++if EMBEDDED_LIBSECP256K1 + $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(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: +@@ -63,8 +71,11 @@ if BUILD_BITCOIND + bin_PROGRAMS += bitcoind + endif + +-if BUILD_BITCOIN_UTILS +- bin_PROGRAMS += bitcoin-cli bitcoin-tx ++if BUILD_BITCOIN_CLI ++ bin_PROGRAMS += bitcoin-cli ++endif ++if BUILD_BITCOIN_TX ++ bin_PROGRAMS += bitcoin-tx + endif + + .PHONY: FORCE +diff --git a/src/Makefile.test.include b/src/Makefile.test.include +index 0997148..14b4deb 100644 +--- a/src/Makefile.test.include ++++ b/src/Makefile.test.include +@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE + bitcoin_test_clean : FORCE + rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) + ++if EMBEDDED_LIBSECP256K1 + check-local: + @echo "Running test/bitcoin-util-test.py..." + $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check ++endif + + %.json.h: %.json + @$(MKDIR_P) $(@D) diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog index bbd6fdba8705..5af2a3c3a854 100644 --- a/net-p2p/bitcoind/ChangeLog +++ b/net-p2p/bitcoind/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/bitcoind # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.110 2015/07/17 20:48:48 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.111 2015/07/17 22:18:00 blueness Exp $ + +*bitcoind-0.10.2-r1 (17 Jul 2015) + + 17 Jul 2015; Anthony G. Basile + +bitcoind-0.10.2-r1.ebuild, +files/9999-syslibs.patch: + Version bump. 17 Jul 2015; Anthony G. Basile -files/9999-sys_libsecp256k1.patch, -files/bitcoin.initd, diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index 3034b7986d16..78243ee899fc 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -7,6 +7,7 @@ AUX 0.8.2-sys_leveldb.patch 6726 SHA256 11322fc7715b9b552075babf60c8261e0343e5ec AUX 0.9-openssl-101k.patch 1192 SHA256 198318943cd1eaff2ce5e94b5b9aea40a2c99c46c459f2f2049eb15c52721566 SHA512 471dd9a581a07f859bb5f7b8d9489995c6e137bec0e3afcf91903135f4dd259f7f56d734749fd5acba0d744d6b8b23688570371656be5af9e960d63bbe3659f0 WHIRLPOOL abc6596e349acb34c2fb657c302b20fa74c545f2c2fbb4062bc1041f4944285ab3a5ff63dfc7ef7a724abb95a1742ac1e9ee05c9e9dbabcba4a5cbf500d4e368 AUX 0.9.0-sys_leveldb.patch 1040 SHA256 1355674ba82966b31fd001b12e7bd1bffbfd7f1c6d8dc1679cedba032e6df642 SHA512 26b1b6f8c4fdc228c08982a3172de57e09d963745726c99e1e274f381e242467f84d23c718f8e07675c2fc938f2d6db6b50a05dbb944702238d7b0eb6205cff7 WHIRLPOOL 7d39d39f846f03ffbf3e4c9655c42f298c8196dde8ee621862483a49f386c13cfdd13221ff265745f504a33422aaafac3657b72552f55784c9296daffc248f31 AUX 0.9.x-ljr_noblacklist.patch 330 SHA256 b20c934540748cd42405bfca305a61bf05a76cd9b54f20e57e5fba84bb742f6a SHA512 13e727d6e1324542f7097c310e2f2a869d39acf6288593661b81715858ee95d1ca0566aa9892e5a8e34e4c45edc28faff6938728f1b97e9561460ea99838834a WHIRLPOOL 851fe606c02da5d8f778d56aea83d5a55a427c7a83610755cdd35fdc67a02a4628c1c480bea5d8d862968416ff3cb3e78d56ece498055f86e4d138e5997db674 +AUX 9999-syslibs.patch 9143 SHA256 a91cb64a820e2e0eaa573fc3c7e408d68f344f9f0d25a4ba110d0443cb622bc6 SHA512 595717f059b6ad11dc790a7c2f343ca66fcf237311cbf5f60cd9569624755295d5efb57127cc82bf3e0bb972ee432e0d2211155b26c71546808faa68c78d55df WHIRLPOOL 805ebe3de20d9a417ead593274297d2b074af55cccf63bc73b4a8884f5c27bd0c27d0f8c92636769bce88637677924149ef8b8520e907c64486f7c666f2e1a04 AUX bitcoin.conf 80 SHA256 541ae10cc2246b620de3e7efa97eee59efacf83d28ea5f1297a121d0708226d2 SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f WHIRLPOOL 728e38b62da2c7c3a1149ac511b92d156f7b3c51dacfadd7ce74d9e6f915a6547c4cc8d34159243f50eee333c63b35949b311ea5a7f48a6c3bf17a5d4d47c123 AUX bitcoin.confd 238 SHA256 72300b41d57325de5a5f2ddea449d5f414f278549fb665d60746707ee5de2549 SHA512 2b010d8c773a76868a11626ba0552f122cd51293cb39e06b7ed7e17be47f9e3790cc090f8311b32d441d3ff1eb4db266a4b2cd08693f7edbe2dde178254838d1 WHIRLPOOL f51d97b828b4b096d1ca924cb7256f648b94ae098a4f10dcfbac7d6045cf84da0c203b1e2d5569f3b304ba193501c9b9239c5ee1a1c11fbdb62bb9909c384358 AUX bitcoin.initd-r1 934 SHA256 8aea8b4ab593ebb7093f1890666d8dd730d5bbc64893b43af1680098bfe531c2 SHA512 2d4313caa1d9ca88bc5c30f28ba012a459863e51cf4bb18415fb77f99f0ba12e7060e84cfc974cc9b993542f66d40d53684814c58d5f03785c25e56e151f00ab WHIRLPOOL 3b31dee4a70fbd5d7572f93e449a6394f55b1e9f63c70471a46913a90698757f390fc358e31f8b497b6d887f30a4fa1aa6bf026cad38be81c5f006f5c7f9d1a8 @@ -15,30 +16,33 @@ AUX bitcoind.logrotate-r1 121 SHA256 71b195013cd2fe3091eb03a3b8c18d1f021fa91a2e2 AUX bitcoind.service 869 SHA256 c24332570f8ac155847372a4f9019a47a2e3c8c15435584dac4153b8eb300bc7 SHA512 d0e23b98bc9109e7e4d8a6459f73d1f9a06a3da71593613e22c5d0f31a8ad7473242b07690c6f22f35358ed869ffa7160d0daa65937462442bfc9028794321ea WHIRLPOOL 7992f776ac36277ce83898920ed5a8abc6b031f1d88214150c362c6f5befc869eb9901bd346da74da9fb56bda500fe9d3d9ff8dd46f1b3f257691cb106754a93 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-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 bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4 +EBUILD bitcoind-0.10.2-r1.ebuild 2221 SHA256 0402d770c77cef4a863ff07cea0fb8e3f84e5f37e07030006162bf4dfc783e4c SHA512 ddbd5e2d149468359776302ea14ebd0fc303888a9a8b4b6dadb3075b103f78e661cbe41cb18f472b74a6f1691bfbbab2f8c335cfb5927fc61f93f7a9252a9ff7 WHIRLPOOL 9d2901f41e3262320b58866a2c78cc956c9fc40fb9c851633237695df6cf1f2fd05f8010f020b5bff3a64db5e2aea72e11a6d0b7e0af920f7473acec33cb2b01 EBUILD bitcoind-0.10.2.ebuild 2070 SHA256 846df6a4c95a0c9003b555294bf49f9dfdb203845d3fbb73b045e4446d28f62f SHA512 1921c5d04af328d844532204a6d6ec482b832a3e714633189e16b96604c18de1daf6e62776970941a1ebd5440503e82aa66fbaf59c2129e61f1e7c6b588942cc WHIRLPOOL ed79e96b2d03f6d2e88889cf37d41bae68dc33eb08fb8b5e650338cdbcf3a05a752a6d418786104db9b673c1c54d8b4b750f3d77155e425d27909fbc4e7532c2 EBUILD bitcoind-0.11.0.ebuild 2089 SHA256 bfc4ea0978621cbc9ba5eeba1cca67555b924a24bb52bfc5547d59039a499ce0 SHA512 685a0d5cb8173f1a9cd9be3d76924b180e6ed920da3e0931b5e2c796fba694327cc3882a2c0392a9d1e41771754802ef92c47198909f6a11545e4cee9022d90a WHIRLPOOL b1db32d6ab1107eaee3a8982776021301b6854d2fffcc21f73c2754861d8c5310a515d89e8bb36dfe22b1fb896534c5045c91116fa5a5a8a6e7e384792b51618 EBUILD bitcoind-9999.ebuild 1866 SHA256 a6705e0329bba561b71cedec5a79f32e6f16ded945fa62e8bc2764dc7da4444a SHA512 d4275948ebff7c7c87da57d7f6d3d28bb87c3a1e81ff7ef65c2fd59db42f0555a85a6265b854d42fad331e4b2ad5e7d871e515f04428ddb2fc217272a9c971b3 WHIRLPOOL a19bfe2870ba774d777f9b3541885c9e551a9c3fd5800e63c0bc19576aa64c20b1a126d8a590f3e145b1dec98d16bd1ec8930dce8423a21c24a32d6ccf79024c -MISC ChangeLog 23869 SHA256 6df77e9a8d0f94c3ba6547e7a5b588c64cd51edc0b533428dbad88b16e9ca4b9 SHA512 f92da89e472fade7d83b4562a6ae2631e1674f725f8323c51aeaa8cea5e88c43d9dcf7824e81fbaadcaaaa3edfa8491eb0cc557ccbedebeeb120b873d488b606 WHIRLPOOL 68a8ab594c5d9cbb04f8a2baa58779311072cd8b2b4b733658b48d7fe816922f46e7e18467f673e4e4b1b14448a22c073b378d50ad56eba3635c6ce26aa50887 +MISC ChangeLog 24033 SHA256 0f86788a06aa91f42dbf9afc7df804636514719a127a43f4b951c0656aa4ccf6 SHA512 93c1e7a250f88da646913bd03fbdde15c7d837488dbed9647cbc79b7455a64bd6fe856c308276a4ecb300912c20ec68ce5ffa227674bee2fd12ace0cd0fb3712 WHIRLPOOL 95f9a698543c76cc001744e0e4367ba46da7897ea8b6a97af346f6ba31e4eda6be0e824af8350024d32e04b68b0d151712f57a1109b6f983d469ee39573c7e81 MISC metadata.xml 1543 SHA256 091f6ca7a638a8d9f6d1a48e62efa2183455173740e32cd4db1d3f0176d18cc9 SHA512 0426cda8251208f71ff3ef772c317af831bcd1415e624943381c79f88b2715aea6e1204d41783fcf3732522ae1cba741aca4eccb9ce9546fc1b44857230e7ab1 WHIRLPOOL c378e914041129f51288efadfdaa8ee8ed11d346c574d9071c3d407494603b333a79dfea2025ba635aa6c7c490f0fe741d60f17961ac28ce9159026f9f687d31 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVqWrFAAoJEJOE+m71LUu6e3kP/0mIkUAU96RCFB/Da6E8guXQ -uTiTawRQVWvETFyo/bOpp1AdfS5dF2M406Mj1DvuCCvNf3MkIaAJFZu2tj9qBP2b -/qO2WzgoSKlzmUT7RXz3P8r1ZlA+8iRi+y9+BkeZPOCIvIGj+J1Rv5K235PQDEKw -zH5Pzpp3uHLlJ5Cn0v/zBWcMnjWCF6cOQgNoVCQZQhwaW68bgkKnbAF4zR23ZFwI -ewj+J9+Mi3c4BIiVVSe2rgTfoKNd1nL1fqK5C3dQUjkm2J2cFU3oeDbv4bpq4ljn -XJal15Y5v9vWlObO/Gj1302TXm7/fpbCDt59D35x18wHtRReVuDprs+GrtNFFZaE -jcMiSS1uk354z/9fYGhXdrguxkyBLqqjvP+Mb6Cn58uyjFGvMTrmZ4BK1pVCLjui -6GbIiap5IJyySpKvEiQTM8H3+wGW8twYtlZIGNLM4KAwqomYijzW1seuQ1kyXlb6 -usr3TGED/sMBVWtL+8x29xr2hkqtyCBOqiVO77vrgrKo4nMU7f9QCXXRCsZ6gyhh -omKv4sJoaw2d1AVEcA2xPS2O1hSMVpdaF2vOnW+Mh3LHnu2BSDTNub8IoIBlb+BC -8zBWzcNkMKBchmN5KYta3zBEIKGEaubi9XOX7ts4RbEwl44NWJ9WZH8hQjkqnY4+ -fVY1+FDteU02SktBleht -=+PtF +iQIcBAEBCAAGBQJVqX+wAAoJEJOE+m71LUu6Y6cP+wUG511eIDUhggNqN/5Q+sRv +oERI8BhpWogovetdsSMThz3pyMYan1oK+DxXSqIxM0e6v+Qg4KXR7xm464eJf7XU +1PyoP3Vtli2wH4fh/Qk+deDp/2akYF/aSd3gqe3LFc9EE+alWFGWRlRYkiNZ8/vi +Ue4ObzCFSeLAY6rNYL4jGq3G//qlvrekRjv3mGzffTMlJUyTp0CpPGTw3xcuct3c +IssQ5NUIcnWGzWfSL8OH+c6VB4KVsgUtw0g/gdPAMv2McIJ1dk4yqONDfAhJjLoQ +bnRZn95MjmvtuqhKUTCzsAXlveFozYnKPAd79Au+MuSD6xqAgfS1qoG9WYUd4e7J +aE5CPywrSLTx3W3tTohxMivSDwAq/zg7HX7P0RHe0UqYMfxZBQebuTcASpQfxuD+ +SrH7G9fw4iJdh8blPIrYwd6jHNHhLtL9XlTgt0ruP1HWVb269Ox4mbvppiLLyWRU +3n8l/1nXNXBKL9ZP0yVZKgxCFdS2y71ojWdivwnsc/bLBMd24roaAZqHH1LtWXMp +7Tt8LhcfasxOFAFfw21h/sLuBNO0ucbYWeHR72ie+pmmyaVifKueye0q0wOCF8gq +UMjyVU1Y/wrPcK2NDmzPdHsqGJV/rkTMxisgoS9LCEKxBD/nCHoB3rzMWZxnVHH+ +6IqKQb+pHI8j5/TByh6z +=12JY -----END PGP SIGNATURE----- diff --git a/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild new file mode 100644 index 000000000000..40d4bcf71b83 --- /dev/null +++ b/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 2010-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild,v 1.1 2015/07/17 22:18:00 blueness Exp $ + +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() { + 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/files/9999-syslibs.patch b/net-p2p/bitcoind/files/9999-syslibs.patch new file mode 100644 index 000000000000..2cdf2ab9837b --- /dev/null +++ b/net-p2p/bitcoind/files/9999-syslibs.patch @@ -0,0 +1,243 @@ +diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 +index 66f106c..5f0a3b1 100644 +--- a/build-aux/m4/bitcoin_subdir_to_include.m4 ++++ b/build-aux/m4/bitcoin_subdir_to_include.m4 +@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ + AC_MSG_RESULT([default]) + else + echo "#include <$2$3.h>" >conftest.cpp +- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] ++ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) + AC_MSG_RESULT([${newinclpath}]) + if test "x${newinclpath}" != "x"; then + eval "$1=\"\$$1\"' -I${newinclpath}'" +diff --git a/configure.ac b/configure.ac +index 37fe47e..14e5c34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], + [build_bitcoin_utils=$withval], + [build_bitcoin_utils=yes]) + ++AC_ARG_ENABLE([util-cli], ++ [AS_HELP_STRING([--enable-util-cli], ++ [build bitcoin-cli])], ++ [build_bitcoin_cli=$enableval], ++ [build_bitcoin_cli=$build_bitcoin_utils]) ++ ++AC_ARG_ENABLE([util-tx], ++ [AS_HELP_STRING([--enable-util-tx], ++ [build bitcoin-tx])], ++ [build_bitcoin_tx=$enableval], ++ [build_bitcoin_tx=$build_bitcoin_utils]) ++ + AC_ARG_WITH([libs], + [AS_HELP_STRING([--with-libs], + [build libraries (default=yes)])], +@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then + [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) + fi + ++dnl Check for leveldb, only if explicitly requested + LEVELDB_CPPFLAGS= + LIBLEVELDB= + LIBMEMENV= +-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) ++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] ++) ++if test x$system_leveldb != xno; then ++ LEVELDB_CPPFLAGS= ++ AC_CHECK_LIB([leveldb],[main],[ ++ LIBLEVELDB=-lleveldb ++ ],[ ++ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ TEMP_LIBS="$LIBS" ++ LIBS="$LIBS $LIBLEVELDB" ++ AC_CHECK_LIB([memenv],[main],[ ++ LIBMEMENV=-lmemenv ++ ],[ ++ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ LIBS="$TEMP_LIBS" ++ 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]) ++ ]) ++ ]) ++fi ++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) + AC_SUBST(LEVELDB_CPPFLAGS) + AC_SUBST(LIBLEVELDB) + AC_SUBST(LIBMEMENV) + ++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 x$enable_wallet != xno; then + dnl Check for libdb_cxx only if wallet enabled + BITCOIN_FIND_BDB48 +@@ -515,7 +578,7 @@ BITCOIN_QT_INIT + dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + +-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then + use_boost=no + else + use_boost=yes +@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) + AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) + AC_MSG_RESULT($build_bitcoind) + +-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) +-AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) +-AC_MSG_RESULT($build_bitcoin_utils) ++AC_MSG_CHECKING([whether to build bitcoin-cli]) ++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) ++AC_MSG_RESULT($build_bitcoin_cli) ++ ++AC_MSG_CHECKING([whether to build bitcoin-tx]) ++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) ++AC_MSG_RESULT($build_bitcoin_tx) + + AC_MSG_CHECKING([whether to build libraries]) + AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) +@@ -826,7 +893,7 @@ else + AC_MSG_RESULT([no]) + fi + +-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then + AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) + fi + +@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" + unset PKG_CONFIG_LIBDIR + PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" + ++if test x$system_libsecp256k1 = xno; then + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + AC_CONFIG_SUBDIRS([src/secp256k1]) ++fi + + AC_OUTPUT + +diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh +index 9b31865..5bb187c 100755 +--- a/qa/pull-tester/rpc-tests.sh ++++ b/qa/pull-tester/rpc-tests.sh +@@ -57,7 +57,7 @@ testScriptsExt=( + extArg="-extended" + passOn=${@#$extArg} + +-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then ++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then + for (( i = 0; i < ${#testScripts[@]}; i++ )) + do + if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ] +diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in +index 10f4d33..e0e407d 100755 +--- a/qa/pull-tester/tests-config.sh.in ++++ b/qa/pull-tester/tests-config.sh.in +@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" + + # These will turn into comments if they were disabled when configuring. + @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 +-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 ++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 + @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + + REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" +diff --git a/src/Makefile.am b/src/Makefile.am +index 1c2f770..4d60ddf 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,6 @@ ++if EMBEDDED_LIBSECP256K1 + DIST_SUBDIRS = secp256k1 ++endif + AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) + + +@@ -20,7 +22,7 @@ endif + BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config + BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) + +-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include ++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) + + LIBBITCOIN_SERVER=libbitcoin_server.a + LIBBITCOIN_WALLET=libbitcoin_wallet.a +@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a + LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a + LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a + LIBBITCOINQT=qt/libbitcoinqt.a ++if EMBEDDED_LIBSECP256K1 + LIBSECP256K1=secp256k1/libsecp256k1.la ++else ++LIBSECP256K1=$(libsecp256k1_LIBS) ++endif + ++if EMBEDDED_LIBSECP256K1 + $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(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: +@@ -63,8 +71,11 @@ if BUILD_BITCOIND + bin_PROGRAMS += bitcoind + endif + +-if BUILD_BITCOIN_UTILS +- bin_PROGRAMS += bitcoin-cli bitcoin-tx ++if BUILD_BITCOIN_CLI ++ bin_PROGRAMS += bitcoin-cli ++endif ++if BUILD_BITCOIN_TX ++ bin_PROGRAMS += bitcoin-tx + endif + + .PHONY: FORCE +diff --git a/src/Makefile.test.include b/src/Makefile.test.include +index 0997148..14b4deb 100644 +--- a/src/Makefile.test.include ++++ b/src/Makefile.test.include +@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE + bitcoin_test_clean : FORCE + rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) + ++if EMBEDDED_LIBSECP256K1 + check-local: + @echo "Running test/bitcoin-util-test.py..." + $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check ++endif + + %.json.h: %.json + @$(MKDIR_P) $(@D) -- cgit v1.2.3-65-gdbad