diff options
27 files changed, 797 insertions, 249 deletions
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest index a000ed3c550..c665791943d 100644 --- a/dev-util/bitcoin-tx/Manifest +++ b/dev-util/bitcoin-tx/Manifest @@ -3,8 +3,10 @@ DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c 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-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.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 diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.12.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.12.0.ebuild new file mode 100644 index 00000000000..63f25e2d7c5 --- /dev/null +++ b/dev-util/bitcoin-tx/bitcoin-tx-0.12.0.ebuild @@ -0,0 +1,23 @@ +# 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="ljr" +BITCOINCORE_NEED_LIBSECP256K1=1 +BITCOINCORE_NO_DEPEND="libevent" +inherit bitcoincore + +DESCRIPTION="Command-line Bitcoin transaction tool" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +src_configure() { + bitcoincore_conf \ + --enable-util-tx +} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild index c41e1e20790..755248dc082 100644 --- a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild +++ b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2015 Gentoo Foundation +# Copyright 2010-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,6 +6,7 @@ EAPI=5 BITCOINCORE_IUSE="" BITCOINCORE_NEED_LIBSECP256K1=1 +BITCOINCORE_NO_DEPEND="libevent" inherit bitcoincore DESCRIPTION="Command-line Bitcoin transaction tool" diff --git a/dev-util/bitcoin-tx/files/9999-syslibs.patch b/dev-util/bitcoin-tx/files/9999-syslibs.patch index 2cdf2ab9837..c594c54634e 100644 --- a/dev-util/bitcoin-tx/files/9999-syslibs.patch +++ b/dev-util/bitcoin-tx/files/9999-syslibs.patch @@ -12,10 +12,10 @@ index 66f106c..5f0a3b1 100644 if test "x${newinclpath}" != "x"; then eval "$1=\"\$$1\"' -I${newinclpath}'" diff --git a/configure.ac b/configure.ac -index 37fe47e..14e5c34 100644 +index 939dfea..6c9acb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], +@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -34,7 +34,7 @@ index 37fe47e..14e5c34 100644 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 +@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) fi @@ -101,16 +101,16 @@ index 37fe47e..14e5c34 100644 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 +@@ -558,7 +621,7 @@ BITCOIN_QT_INIT dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) -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]) +@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) @@ -127,7 +127,7 @@ index 37fe47e..14e5c34 100644 AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -826,7 +893,7 @@ else +@@ -975,7 +1042,7 @@ else AC_MSG_RESULT([no]) fi @@ -136,34 +136,54 @@ index 37fe47e..14e5c34 100644 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" +@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then + AC_CONFIG_SUBDIRS([src/univalue]) + fi +if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" 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 +diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py +index 7649c11..978419b 100755 +--- a/qa/pull-tester/rpc-tests.py ++++ b/qa/pull-tester/rpc-tests.py +@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): + ENABLE_WALLET=0 + if not vars().has_key('ENABLE_BITCOIND'): + ENABLE_BITCOIND=0 +-if not vars().has_key('ENABLE_UTILS'): +- ENABLE_UTILS=0 ++if not vars().has_key('ENABLE_CLI'): ++ ENABLE_CLI=0 + if not vars().has_key('ENABLE_ZMQ'): + ENABLE_ZMQ=0 + +@@ -141,7 +141,7 @@ def runtests(): + coverage = RPCCoverage() + print("Initializing coverage directory at %s\n" % coverage.dir) + +- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): ++ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): + rpcTestDir = buildDir + '/qa/rpc-tests/' + run_extended = '-extended' in opts + cov_flag = coverage.flag if coverage else '' +@@ -187,7 +187,7 @@ def runtests(): + coverage.cleanup() + + else: +- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" ++ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" + + + class RPCCoverage(object): +diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in +index 937b423..71a917c 100644 +--- a/qa/pull-tester/tests_config.py.in ++++ b/qa/pull-tester/tests_config.py.in @@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" # These will turn into comments if they were disabled when configuring. @@ -171,31 +191,24 @@ index 10f4d33..e0e407d 100755 -@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 +@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" diff --git a/src/Makefile.am b/src/Makefile.am -index 1c2f770..4d60ddf 100644 +index fa7a78f..cc2f2ca 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 +@@ -31,7 +31,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) + BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) LIBBITCOIN_SERVER=libbitcoin_server.a - LIBBITCOIN_WALLET=libbitcoin_wallet.a -@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a +@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a + 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 @@ -210,7 +223,7 @@ index 1c2f770..4d60ddf 100644 # 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 +@@ -79,8 +85,11 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif @@ -223,21 +236,18 @@ index 1c2f770..4d60ddf 100644 + bin_PROGRAMS += bitcoin-tx endif - .PHONY: FORCE + .PHONY: FORCE check-symbols check-security diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 0997148..14b4deb 100644 +index 6ef6a69..1b6e759 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 +@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE check-local: @echo "Running test/bitcoin-util-test.py..." $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py ++if EMBEDDED_LIBSECP256K1 $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check +endif - - %.json.h: %.json - @$(MKDIR_P) $(@D) + if EMBEDDED_UNIVALUE + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check + endif diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml index 7a8f5cb5bdc..a686a21c526 100644 --- a/dev-util/bitcoin-tx/metadata.xml +++ b/dev-util/bitcoin-tx/metadata.xml @@ -9,10 +9,9 @@ <email>luke-jr+gentoobugs@utopios.org</email> <name>Luke Dashjr</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <use> + <flag name="ljr">Enable Luke Dashjr's patches</flag> + </use> <upstream> <remote-id type="github">bitcoin/bitcoin</remote-id> </upstream> diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass index 0362c8cdcf2..4a4f33d3380 100644 --- a/eclass/bitcoincore.eclass +++ b/eclass/bitcoincore.eclass @@ -70,11 +70,14 @@ MyP="${MyPN}-${MyPV}" DOCS="${DOCS} doc/README.md doc/release-notes.md" OPENSSL_DEPEND="dev-libs/openssl:0[-bindist]" WALLET_DEPEND="sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]" +LIBEVENT_DEPEND="" +UNIVALUE_DEPEND="" +BITCOINCORE_LJR_NAME=ljr [ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}" case "${PV}" in 0.10*) - BITCOINCORE_SERIES="0.10.x" + BITCOINCORE_MINOR=10 LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20141212" case "${PVR}" in 0.10.2) @@ -89,7 +92,7 @@ case "${PV}" in BITCOINCORE_XT_DIFF="047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f" ;; 0.11*) - BITCOINCORE_SERIES="0.11.x" + BITCOINCORE_MINOR=11 LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423" # RBF is bundled with ljr patchset since 0.11.1 if [ "${PVR}" = "0.11.0" ]; then @@ -97,21 +100,55 @@ case "${PV}" in BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch" fi ;; +0.12*) + BITCOINCORE_MINOR=12 + IUSE="${IUSE} libressl" + OPENSSL_DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )" + if in_bcc_iuse libevent; then + LIBEVENT_DEPEND="libevent? ( dev-libs/libevent )" + else + LIBEVENT_DEPEND="dev-libs/libevent" + fi + LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]" + UNIVALUE_DEPEND="dev-libs/univalue" + BITCOINCORE_LJR_NAME=knots + if in_bcc_policy spamfilter; then + REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ljr )" + fi + ;; 9999*) + BITCOINCORE_MINOR=9999 BITCOINCORE_SERIES="9999" + LIBEVENT_DEPEND="dev-libs/libevent" LIBSECP256K1_DEPEND=">dev-libs/libsecp256k1-0.0.0_pre20150422" + UNIVALUE_DEPEND="dev-libs/univalue" ;; *) die "Unrecognised version" ;; esac -LJR_PV() { echo "${BITCOINCORE_LJR_PV}.${1}${BITCOINCORE_LJR_DATE}"; } +[ -n "${BITCOINCORE_SERIES}" ] || BITCOINCORE_SERIES="0.${BITCOINCORE_MINOR}.x" + +LJR_PV() { + local testsfx= + if [ -n "${BITCOINCORE_LJR_PREV}" ]; then + if [ "$1" = "dir" ]; then + testsfx="/test/${BITCOINCORE_LJR_PREV}" + else + testsfx=".${BITCOINCORE_LJR_PREV}" + fi + fi + echo "${BITCOINCORE_LJR_PV}.${BITCOINCORE_LJR_NAME}${BITCOINCORE_LJR_DATE}${testsfx}" +} LJR_PATCHDIR="${MyPN}-$(LJR_PV ljr).patches" LJR_PATCH() { echo "${WORKDIR}/${LJR_PATCHDIR}/${MyPN}-$(LJR_PV ljr).$@.patch"; } LJR_PATCH_DESC="http://luke.dashjr.org/programs/${MyPN}/files/${MyPN}d/luke-jr/${BITCOINCORE_SERIES}/$(LJR_PV ljr)/${MyPN}-$(LJR_PV ljr).desc.txt" +if [ "$BITCOINCORE_MINOR" -ge 12 ]; then + LJR_PATCH_DESC="http://bitcoinknots.org/files/${BITCOINCORE_SERIES}/$(LJR_PV dir)/${MyPN}-$(LJR_PV).desc.txt" +fi -HOMEPAGE="https://github.com/bitcoin/bitcoin" +HOMEPAGE="http://bitcoincore.org/" if [ -z "$BITCOINCORE_COMMITHASH" ]; then EGIT_PROJECT='bitcoin' @@ -119,7 +156,10 @@ if [ -z "$BITCOINCORE_COMMITHASH" ]; then else SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}${BITCOINCORE_SRC_SUFFIX}.tgz" if [ -z "${BITCOINCORE_NO_SYSLIBS}" ]; then - SRC_URI="${SRC_URI} http://luke.dashjr.org/programs/${MyPN}/files/${MyPN}d/luke-jr/${BITCOINCORE_SERIES}/$(LJR_PV ljr)/${LJR_PATCHDIR}.txz -> ${LJR_PATCHDIR}.tar.xz" + SRC_URI="${SRC_URI} http://bitcoinknots.org/files/${BITCOINCORE_SERIES}/$(LJR_PV dir)/${LJR_PATCHDIR}.txz -> ${LJR_PATCHDIR}.tar.xz" + fi + if in_bcc_iuse addrindex; then + SRC_URI="${SRC_URI} addrindex? ( https://github.com/btcdrak/bitcoin/compare/${BITCOINCORE_ADDRINDEX_DIFF}.diff -> ${BITCOINCORE_ADDRINDEX_PATCHFILE} )" fi if in_bcc_iuse xt; then BITCOINXT_PATCHFILE="${MyPN}xt-v${PV}.patch" @@ -152,11 +192,17 @@ fi BITCOINCORE_COMMON_DEPEND=" ${OPENSSL_DEPEND} " +if ! has libevent ${BITCOINCORE_NO_DEPEND}; then + BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} ${LIBEVENT_DEPEND}" +fi if [ "${BITCOINCORE_NEED_LIBSECP256K1}" = "1" ]; then BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} $LIBSECP256K1_DEPEND" fi -if [ "${PN}" != "libbitcoinconsensus" ]; then - BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} >=dev-libs/boost-1.52.0[threads(+)]" +if [ "${PN}" != "libbitcoinconsensus" ] && ! use_if_iuse test; then + BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} + ${UNIVALUE_DEPEND} + >=dev-libs/boost-1.52.0[threads(+)] + " fi bitcoincore_common_depend_use() { in_bcc_iuse "$1" || return @@ -173,8 +219,12 @@ DEPEND="${DEPEND} ${BITCOINCORE_COMMON_DEPEND} if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then RDEPEND="${RDEPEND} virtual/bitcoin-leveldb" fi -if in_bcc_iuse ljr && [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then - DEPEND="${DEPEND} ljr? ( dev-vcs/git )" +if in_bcc_iuse ljr; then + if [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then + DEPEND="${DEPEND} ljr? ( dev-vcs/git )" + elif [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then + DEPEND="${DEPEND} ljr? ( dev-lang/perl )" + fi fi bitcoincore_policymsg() { @@ -190,9 +240,12 @@ bitcoincore_policymsg() { bitcoincore_pkg_pretend() { bitcoincore_policymsg_flag=false - if use_if_iuse ljr || use_if_iuse 1stclassmsg || use_if_iuse xt || use_if_iuse zeromq; then + if use_if_iuse ljr || use_if_iuse 1stclassmsg || use_if_iuse addrindex || use_if_iuse xt || { use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; }; then einfo "Extra functionality improvements to Bitcoin Core are enabled." bitcoincore_policymsg_flag=true + if use_if_iuse addrindex addrindex; then + einfo "Please be aware that the addrindex functionality is known to be unreliable." + fi fi bitcoincore_policymsg cltv \ "CLTV policy is enabled: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions." \ @@ -212,6 +265,37 @@ bitcoincore_pkg_pretend() { $bitcoincore_policymsg_flag && einfo "For more information on any of the above, see ${LJR_PATCH_DESC}" } +bitcoincore_git_apply() { + local patchfile="$1" + einfo "Applying ${patchfile##*/} ..." + git apply --whitespace=nowarn "${patchfile}" || die +} + +bitcoincore_predelete_patch() { + local patchfile="$1" + mkdir -p "${WORKDIR}/pdp" + local tmpfile="${WORKDIR}/pdp/${patchfile##*/}" + perl -ne ' + newline: + if (m[(^diff .* b/(.*)$)]) { + $a = "$1\n"; + $f = $2; + $_ = <>; + if (m[^deleted file]) { + unlink($f) || die; + while (!m[^diff ]) { + $_ = <> + } + goto newline + } else { + print($a) + } + } + print + ' <"${patchfile}" >"${tmpfile}" || die + epatch "${tmpfile}" +} + bitcoincore_prepare() { local mypolicy if [ -n "${BITCOINCORE_NO_SYSLIBS}" ]; then @@ -222,11 +306,13 @@ bitcoincore_prepare() { epatch "$(LJR_PATCH syslibs)" fi if use_if_iuse ljr; then - if [ "${BITCOINCORE_SERIES}" = "0.10.x" ]; then + if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then + epatch "$(LJR_PATCH f)" + bitcoincore_predelete_patch "$(LJR_PATCH branding)" + epatch "$(LJR_PATCH ts)" + elif [ "${BITCOINCORE_SERIES}" = "0.10.x" ]; then # Regular epatch won't work with binary files - local patchfile="$(LJR_PATCH ljrF)" - einfo "Applying ${patchfile##*/} ..." - git apply --whitespace=nowarn "${patchfile}" || die + bitcoincore_git_apply "$(LJR_PATCH ljrF)" else epatch "$(LJR_PATCH ljrF)" fi @@ -234,12 +320,30 @@ bitcoincore_prepare() { if use_if_iuse 1stclassmsg; then epatch "$(LJR_PATCH 1stclassmsg)" fi + if use_if_iuse addrindex; then + epatch "${DISTDIR}/${BITCOINCORE_ADDRINDEX_PATCHFILE}" + fi if use_if_iuse xt; then epatch "${DISTDIR}/${BITCOINXT_PATCHFILE}" fi - use_if_iuse zeromq && epatch "$(LJR_PATCH zeromq)" + { use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; } && epatch "$(LJR_PATCH zeromq)" for mypolicy in ${BITCOINCORE_POLICY_PATCHES}; do mypolicy="${mypolicy#[-+]}" + + if [ "${BITCOINCORE_MINOR}" -ge 12 ]; then + case "${mypolicy}" in + rbf) + use bitcoin_policy_rbf || sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/main.h + ;; + spamfilter) + use bitcoin_policy_spamfilter || sed -i 's/\(DEFAULT_SPAMFILTER = \)true/\1false/' src/main.h + ;; + *) + die "Unknown policy ${mypolicy}" + esac + continue + fi + use bitcoin_policy_${mypolicy} || continue case "${mypolicy}" in rbf) @@ -284,19 +388,29 @@ bitcoincore_conf() { else my_econf="${my_econf} --disable-wallet" fi + if ! use_if_iuse zeromq; then + # NOTE: Older (pre-0.12) patches would disable ZMQ if --enable-zmq was passed + my_econf="${my_econf} --disable-zmq" + fi if [ -z "${BITCOINCORE_NO_SYSLIBS}" ]; then my_econf="${my_econf} --disable-util-cli --disable-util-tx" else my_econf="${my_econf} --without-utils" fi + # Knots 0.12.0 errors if --with-libevent used for bitcoin{d,-cli}, so only disable it when not wanted + if has libevent ${BITCOINCORE_NO_DEPEND} || { in_bcc_iuse libevent && ! use libevent; }; then + my_econf="${my_econf} --without-libevent" + fi if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then # Passing --with-system-leveldb fails if leveldb is not installed, so only use it for targets that use LevelDB my_econf="${my_econf} --with-system-leveldb" fi econf \ + --disable-bench \ --disable-ccache \ --disable-static \ --with-system-libsecp256k1 \ + --with-system-univalue \ --without-libs \ --without-daemon \ --without-gui \ diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest index a000ed3c550..c665791943d 100644 --- a/net-libs/libbitcoinconsensus/Manifest +++ b/net-libs/libbitcoinconsensus/Manifest @@ -3,8 +3,10 @@ DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c 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-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.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 diff --git a/net-libs/libbitcoinconsensus/files/9999-syslibs.patch b/net-libs/libbitcoinconsensus/files/9999-syslibs.patch index 2cdf2ab9837..c594c54634e 100644 --- a/net-libs/libbitcoinconsensus/files/9999-syslibs.patch +++ b/net-libs/libbitcoinconsensus/files/9999-syslibs.patch @@ -12,10 +12,10 @@ index 66f106c..5f0a3b1 100644 if test "x${newinclpath}" != "x"; then eval "$1=\"\$$1\"' -I${newinclpath}'" diff --git a/configure.ac b/configure.ac -index 37fe47e..14e5c34 100644 +index 939dfea..6c9acb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], +@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -34,7 +34,7 @@ index 37fe47e..14e5c34 100644 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 +@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) fi @@ -101,16 +101,16 @@ index 37fe47e..14e5c34 100644 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 +@@ -558,7 +621,7 @@ BITCOIN_QT_INIT dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) -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]) +@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) @@ -127,7 +127,7 @@ index 37fe47e..14e5c34 100644 AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -826,7 +893,7 @@ else +@@ -975,7 +1042,7 @@ else AC_MSG_RESULT([no]) fi @@ -136,34 +136,54 @@ index 37fe47e..14e5c34 100644 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" +@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then + AC_CONFIG_SUBDIRS([src/univalue]) + fi +if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" 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 +diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py +index 7649c11..978419b 100755 +--- a/qa/pull-tester/rpc-tests.py ++++ b/qa/pull-tester/rpc-tests.py +@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): + ENABLE_WALLET=0 + if not vars().has_key('ENABLE_BITCOIND'): + ENABLE_BITCOIND=0 +-if not vars().has_key('ENABLE_UTILS'): +- ENABLE_UTILS=0 ++if not vars().has_key('ENABLE_CLI'): ++ ENABLE_CLI=0 + if not vars().has_key('ENABLE_ZMQ'): + ENABLE_ZMQ=0 + +@@ -141,7 +141,7 @@ def runtests(): + coverage = RPCCoverage() + print("Initializing coverage directory at %s\n" % coverage.dir) + +- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): ++ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): + rpcTestDir = buildDir + '/qa/rpc-tests/' + run_extended = '-extended' in opts + cov_flag = coverage.flag if coverage else '' +@@ -187,7 +187,7 @@ def runtests(): + coverage.cleanup() + + else: +- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" ++ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" + + + class RPCCoverage(object): +diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in +index 937b423..71a917c 100644 +--- a/qa/pull-tester/tests_config.py.in ++++ b/qa/pull-tester/tests_config.py.in @@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" # These will turn into comments if they were disabled when configuring. @@ -171,31 +191,24 @@ index 10f4d33..e0e407d 100755 -@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 +@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" diff --git a/src/Makefile.am b/src/Makefile.am -index 1c2f770..4d60ddf 100644 +index fa7a78f..cc2f2ca 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 +@@ -31,7 +31,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) + BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) LIBBITCOIN_SERVER=libbitcoin_server.a - LIBBITCOIN_WALLET=libbitcoin_wallet.a -@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a +@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a + 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 @@ -210,7 +223,7 @@ index 1c2f770..4d60ddf 100644 # 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 +@@ -79,8 +85,11 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif @@ -223,21 +236,18 @@ index 1c2f770..4d60ddf 100644 + bin_PROGRAMS += bitcoin-tx endif - .PHONY: FORCE + .PHONY: FORCE check-symbols check-security diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 0997148..14b4deb 100644 +index 6ef6a69..1b6e759 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 +@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE check-local: @echo "Running test/bitcoin-util-test.py..." $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py ++if EMBEDDED_LIBSECP256K1 $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check +endif - - %.json.h: %.json - @$(MKDIR_P) $(@D) + if EMBEDDED_UNIVALUE + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check + endif diff --git a/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch b/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch new file mode 100644 index 00000000000..7319875e2d4 --- /dev/null +++ b/net-libs/libbitcoinconsensus/files/bugfix_bench_checks.patch @@ -0,0 +1,69 @@ +commit 789200f22b3aa744f6d0054a702e3f7ea6303db4 +Author: Luke Dashjr <luke-jr+git@utopios.org> +Date: Tue Mar 1 14:14:29 2016 +0000 + + Bugfix: Check for bench_bitcoin being enabled where needed, and skip UniValue dependency when unused + +diff --git a/configure.ac b/configure.ac +index e4fc443..a289e13 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -570,7 +570,7 @@ BITCOIN_QT_INIT + dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) + +-if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then + use_boost=no + else + use_boost=yes +@@ -754,7 +754,7 @@ if test x$use_pkgconfig = xyes; then + if test x$use_qr != xno; then + BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])]) + fi +- if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then ++ if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then + PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)]) + if test x$TARGET_OS != xwindows; then + PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)]) +@@ -779,7 +779,7 @@ else + AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),) + AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing)) + +- if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then ++ if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then + AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),) + AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing)) + if test x$TARGET_OS != xwindows; then +@@ -810,6 +810,11 @@ fi + + dnl univalue check + ++AC_MSG_WARN([x$build_bitcoin_cli,$build_bitcoin_tx,$build_bitcoind,$bitcoin_enable_qt,$use_tests]) ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnononononono; then ++ system_univalue=yes ++else ++ + if test x$system_univalue != xno ; then + found_univalue=no + if test x$use_pkgconfig = xyes; then +@@ -842,6 +847,8 @@ if test x$system_univalue = xno ; then + UNIVALUE_CFLAGS='-I$(srcdir)/univalue/include' + UNIVALUE_LIBS='univalue/libunivalue.la' + fi ++ ++fi + AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$system_univalue = xno]) + AC_SUBST(UNIVALUE_CFLAGS) + AC_SUBST(UNIVALUE_LIBS) +@@ -991,8 +998,8 @@ else + AC_MSG_RESULT([no]) + fi + +-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]) ++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononononono; then ++ AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-tests or --enable-bench]) + fi + + AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin]) diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild new file mode 100644 index 00000000000..2a45987128d --- /dev/null +++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.12.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 2010-2015 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="test" +BITCOINCORE_NO_DEPEND="libevent" +inherit bitcoincore eutils + +DESCRIPTION="Bitcoin Core consensus library" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +src_configure() { + bitcoincore_conf \ + --with-libs +} + +src_install() { + bitcoincore_src_install + dodoc doc/bips.md + prune_libtool_files +} diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild index 287ed610c27..38a8f571d0f 100644 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild +++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 BITCOINCORE_IUSE="test" +BITCOINCORE_NO_DEPEND="libevent" inherit bitcoincore eutils DESCRIPTION="Bitcoin Core consensus library" @@ -12,6 +13,11 @@ LICENSE="MIT" SLOT="0" KEYWORDS="" +src_prepare() { + bitcoincore_src_prepare + epatch "${FILESDIR}/bugfix_bench_checks.patch" +} + src_configure() { bitcoincore_conf \ --with-libs diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml index cfeaf23c176..e7fe998222a 100644 --- a/net-libs/libbitcoinconsensus/metadata.xml +++ b/net-libs/libbitcoinconsensus/metadata.xml @@ -9,10 +9,6 @@ <email>luke_gentoo_bitcoin@dashjr.org</email> <name>Luke Dashjr</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</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> diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest index 45691009b95..108724946f3 100644 --- a/net-p2p/bitcoin-cli/Manifest +++ b/net-p2p/bitcoin-cli/Manifest @@ -2,8 +2,10 @@ DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c 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-cli-manpage-v0.11.0rc3.1 1609 SHA256 868d35484d12a649c3ceb5797abf915c4110393fb33b34509793ae0717963b9e SHA512 296006670bf64c54c408803244eed9db77fe96d1d3f642fb63442838fb4f086c50518d32f44f642a84757bfdf5f041fa6fc98f1e07d48739e41c1049a19b7666 WHIRLPOOL f63e632cb1ad82b4536cff7a04d55c55e981d6cc8e9cd2199e08a3267e4692dd7e732ccb0e66d08657c428a569046a0abc6fac9eec82ba6b997bd41fc96865a7 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.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 diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.12.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.12.0.ebuild new file mode 100644 index 00000000000..95f36a903b7 --- /dev/null +++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.12.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 2010-2015 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="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 || die + 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 37268e9ce2f..a686a21c526 100644 --- a/net-p2p/bitcoin-cli/metadata.xml +++ b/net-p2p/bitcoin-cli/metadata.xml @@ -9,10 +9,6 @@ <email>luke-jr+gentoobugs@utopios.org</email> <name>Luke Dashjr</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="ljr">Enable Luke Dashjr's patches</flag> </use> diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest index 0bacd585586..4cf88dc26ff 100644 --- a/net-p2p/bitcoin-qt/Manifest +++ b/net-p2p/bitcoin-qt/Manifest @@ -2,6 +2,7 @@ DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c 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-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 @@ -10,4 +11,5 @@ DIST bitcoin-v0.10.2.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5a 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 bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4 diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.12.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.12.0.ebuild new file mode 100644 index 00000000000..45a3e400aec --- /dev/null +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.12.0.ebuild @@ -0,0 +1,133 @@ +# 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="dbus kde +libevent ljr +qrcode qt4 qt5 +http test +tor upnp +wallet zeromq" +BITCOINCORE_POLICY_PATCHES="+rbf spamfilter" +LANGS="af_ZA ar be_BY bg bg_BG bs ca ca@valencia ca_ES cs cs_CZ cy da de el el_GR en en_GB eo es es_AR es_CL es_CO es_DO es_ES es_MX es_UY es_VE et eu_ES fa fa_IR fi fr fr_CA fr_FR gl he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mk_MK mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru ru_RU sk sl_SI sq sr sv ta th_TH tr tr_TR uk ur_PK uz@Cyrl vi vi_VN zh zh_CN zh_TW" +KNOTS_LANGS="es_AR es_CO ta" +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" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~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 ) + dbus? ( + qt4? ( dev-qt/qtdbus:4 ) + qt5? ( dev-qt/qtdbus:5 ) + ) +" +DEPEND="${RDEPEND} + qt5? ( dev-qt/linguist-tools:5 ) + ljr? ( + gnome-base/librsvg + media-gfx/imagemagick[png] + ) +" +REQUIRED_USE="^^ ( qt4 qt5 ) + http? ( libevent ) tor? ( libevent ) libevent? ( http tor ) + !libevent? ( ljr ) + libressl? ( ljr ) +" + +for lang in ${KNOTS_LANGS}; do + REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( ljr )" +done + +src_prepare() { + bitcoincore_prepare + use ljr && epatch "${FILESDIR}/${PV}-libressl.patch" + + local filt= yeslang= nolang= lan ts x + + for lan in $LANGS; do + if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then + if has $lan $KNOTS_LANGS && ! use ljr; then + # Expected + continue + fi + die "Language '$lan' no longer supported. Ebuild needs update." + fi + done + + for ts in src/qt/locale/*.ts + do + x="${ts/*bitcoin_/}" + x="${x/.ts/}" + if ! use "linguas_$x"; then + nolang="$nolang $x" + rm "$ts" || die + filt="$filt\\|$x" + else + yeslang="$yeslang $x" + fi + done + filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)" + sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die + sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die + einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang" + + bitcoincore_autoreconf +} + +src_configure() { + bitcoincore_conf \ + $(use_with dbus qtdbus) \ + $(use_with qrcode qrencode) \ + --with-gui=$(usex qt5 qt5 qt4) +} + +src_install() { + bitcoincore_src_install + + insinto /usr/share/pixmaps + if use ljr; then + newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico" + else + newins "share/pixmaps/bitcoin.ico" "${PN}.ico" + fi + 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/bips.md doc/tor.md + doman contrib/debian/manpages/bitcoin-qt.1 + + use zeromq && dodoc doc/zmq.md + + if use kde; then + insinto /usr/share/kde4/services + doins contrib/debian/bitcoin-qt.protocol + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +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/bitcoin-qt-9999.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild index 202dbe52792..9dfb0595a91 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 2010-2015 Gentoo Foundation +# Copyright 2010-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -BITCOINCORE_IUSE="dbus kde +qrcode qt4 qt5 test upnp +wallet" -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_IUSE="dbus kde +qrcode qt4 qt5 test upnp +wallet zeromq" +LANGS="af_ZA ar be_BY bg bg_BG bs ca ca@valencia ca_ES cs cs_CZ cy da de el el_GR en en_GB eo es es_CL es_DO es_ES es_MX es_UY es_VE et eu_ES fa fa_IR fi fr fr_CA fr_FR gl he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mk_MK mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru ru_RU sk sl_SI sq sr sv th_TH tr tr_TR uk ur_PK uz@Cyrl vi vi_VN zh zh_CN zh_TW" BITCOINCORE_NEED_LEVELDB=1 BITCOINCORE_NEED_LIBSECP256K1=1 inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2 git-2 @@ -80,6 +80,8 @@ src_install() { dodoc doc/assets-attribution.md doc/bips.md doc/tor.md doman contrib/debian/manpages/bitcoin-qt.1 + use zeromq && dodoc doc/zmq.md + if use kde; then insinto /usr/share/kde4/services doins contrib/debian/bitcoin-qt.protocol diff --git a/net-p2p/bitcoin-qt/files/0.12.0-libressl.patch b/net-p2p/bitcoin-qt/files/0.12.0-libressl.patch new file mode 100644 index 00000000000..73f6f12a3a3 --- /dev/null +++ b/net-p2p/bitcoin-qt/files/0.12.0-libressl.patch @@ -0,0 +1,26 @@ +commit c5449b0bb7e6918773579fad6ea08c60e82cb73c +Author: Luke Dashjr <luke-jr+git@utopios.org> +Date: Thu Mar 17 07:24:22 2016 +0000 + + Bugfix: Actually fix LibreSSL build + +diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp +index cf59357..e51a5e9 100644 +--- a/src/qt/rpcconsole.cpp ++++ b/src/qt/rpcconsole.cpp +@@ -264,10 +264,12 @@ RPCConsole::RPCConsole(const PlatformStyle *platformStyle, QWidget *parent) : + + // set library version labels + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) +- ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION)); +-#else ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION)); ++#elif defined OPENSSL_VERSION ++ ui->openSSLVersion->setText(OpenSSL_version(OPENSSL_VERSION)); ++#elif defined LIBRESSL_VERSION_TEXT ++ ui->openSSLVersion->setText(LIBRESSL_VERSION_TEXT); + #endif + + #ifdef ENABLE_WALLET diff --git a/net-p2p/bitcoin-qt/files/9999-syslibs.patch b/net-p2p/bitcoin-qt/files/9999-syslibs.patch index 2cdf2ab9837..c594c54634e 100644 --- a/net-p2p/bitcoin-qt/files/9999-syslibs.patch +++ b/net-p2p/bitcoin-qt/files/9999-syslibs.patch @@ -12,10 +12,10 @@ index 66f106c..5f0a3b1 100644 if test "x${newinclpath}" != "x"; then eval "$1=\"\$$1\"' -I${newinclpath}'" diff --git a/configure.ac b/configure.ac -index 37fe47e..14e5c34 100644 +index 939dfea..6c9acb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], +@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -34,7 +34,7 @@ index 37fe47e..14e5c34 100644 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 +@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) fi @@ -101,16 +101,16 @@ index 37fe47e..14e5c34 100644 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 +@@ -558,7 +621,7 @@ BITCOIN_QT_INIT dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) -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]) +@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) @@ -127,7 +127,7 @@ index 37fe47e..14e5c34 100644 AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -826,7 +893,7 @@ else +@@ -975,7 +1042,7 @@ else AC_MSG_RESULT([no]) fi @@ -136,34 +136,54 @@ index 37fe47e..14e5c34 100644 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" +@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then + AC_CONFIG_SUBDIRS([src/univalue]) + fi +if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" 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 +diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py +index 7649c11..978419b 100755 +--- a/qa/pull-tester/rpc-tests.py ++++ b/qa/pull-tester/rpc-tests.py +@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): + ENABLE_WALLET=0 + if not vars().has_key('ENABLE_BITCOIND'): + ENABLE_BITCOIND=0 +-if not vars().has_key('ENABLE_UTILS'): +- ENABLE_UTILS=0 ++if not vars().has_key('ENABLE_CLI'): ++ ENABLE_CLI=0 + if not vars().has_key('ENABLE_ZMQ'): + ENABLE_ZMQ=0 + +@@ -141,7 +141,7 @@ def runtests(): + coverage = RPCCoverage() + print("Initializing coverage directory at %s\n" % coverage.dir) + +- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): ++ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): + rpcTestDir = buildDir + '/qa/rpc-tests/' + run_extended = '-extended' in opts + cov_flag = coverage.flag if coverage else '' +@@ -187,7 +187,7 @@ def runtests(): + coverage.cleanup() + + else: +- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" ++ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" + + + class RPCCoverage(object): +diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in +index 937b423..71a917c 100644 +--- a/qa/pull-tester/tests_config.py.in ++++ b/qa/pull-tester/tests_config.py.in @@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" # These will turn into comments if they were disabled when configuring. @@ -171,31 +191,24 @@ index 10f4d33..e0e407d 100755 -@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 +@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" diff --git a/src/Makefile.am b/src/Makefile.am -index 1c2f770..4d60ddf 100644 +index fa7a78f..cc2f2ca 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 +@@ -31,7 +31,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) + BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) LIBBITCOIN_SERVER=libbitcoin_server.a - LIBBITCOIN_WALLET=libbitcoin_wallet.a -@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a +@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a + 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 @@ -210,7 +223,7 @@ index 1c2f770..4d60ddf 100644 # 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 +@@ -79,8 +85,11 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif @@ -223,21 +236,18 @@ index 1c2f770..4d60ddf 100644 + bin_PROGRAMS += bitcoin-tx endif - .PHONY: FORCE + .PHONY: FORCE check-symbols check-security diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 0997148..14b4deb 100644 +index 6ef6a69..1b6e759 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 +@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE check-local: @echo "Running test/bitcoin-util-test.py..." $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py ++if EMBEDDED_LIBSECP256K1 $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check +endif - - %.json.h: %.json - @$(MKDIR_P) $(@D) + if EMBEDDED_UNIVALUE + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check + endif diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml index 9014f112299..7e5bba955d9 100644 --- a/net-p2p/bitcoin-qt/metadata.xml +++ b/net-p2p/bitcoin-qt/metadata.xml @@ -9,10 +9,6 @@ <email>luke-jr+gentoobugs@utopios.org</email> <name>Luke Dashjr</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="1stclassmsg">Enable first-class Bitcoin message tools</flag> <flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag> @@ -20,8 +16,11 @@ <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="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag> + <flag name="libevent">Use dev-libs/libevent</flag> <flag name="ljr">Enable Luke Dashjr's patches</flag> <flag name="qrcode">Enable generation of QR Codes for receiving payments</flag> + <flag name="tor">Enable automatic configuration of a Tor hidden service</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> diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index 0bacd585586..590a6593306 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -2,6 +2,9 @@ DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c 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-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 @@ -10,4 +13,5 @@ DIST bitcoin-v0.10.2.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5a 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 bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4 diff --git a/net-p2p/bitcoind/bitcoind-0.12.0.ebuild b/net-p2p/bitcoind/bitcoind-0.12.0.ebuild new file mode 100644 index 00000000000..2da79b5cc12 --- /dev/null +++ b/net-p2p/bitcoind/bitcoind-0.12.0.ebuild @@ -0,0 +1,70 @@ +# 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/{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-9999.ebuild b/net-p2p/bitcoind/bitcoind-9999.ebuild index 71304c3496a..979b901baa3 100644 --- a/net-p2p/bitcoind/bitcoind-9999.ebuild +++ b/net-p2p/bitcoind/bitcoind-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 2010-2015 Gentoo Foundation +# Copyright 2010-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -BITCOINCORE_IUSE="examples test upnp +wallet" +BITCOINCORE_IUSE="examples test upnp +wallet zeromq" BITCOINCORE_NEED_LEVELDB=1 BITCOINCORE_NEED_LIBSECP256K1=1 inherit bash-completion-r1 bitcoincore user systemd @@ -51,11 +51,14 @@ src_install() { 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 diff --git a/net-p2p/bitcoind/files/9999-syslibs.patch b/net-p2p/bitcoind/files/9999-syslibs.patch index 2cdf2ab9837..c594c54634e 100644 --- a/net-p2p/bitcoind/files/9999-syslibs.patch +++ b/net-p2p/bitcoind/files/9999-syslibs.patch @@ -12,10 +12,10 @@ index 66f106c..5f0a3b1 100644 if test "x${newinclpath}" != "x"; then eval "$1=\"\$$1\"' -I${newinclpath}'" diff --git a/configure.ac b/configure.ac -index 37fe47e..14e5c34 100644 +index 939dfea..6c9acb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], +@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -34,7 +34,7 @@ index 37fe47e..14e5c34 100644 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 +@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) fi @@ -101,16 +101,16 @@ index 37fe47e..14e5c34 100644 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 +@@ -558,7 +621,7 @@ BITCOIN_QT_INIT dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) -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]) +@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) @@ -127,7 +127,7 @@ index 37fe47e..14e5c34 100644 AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -826,7 +893,7 @@ else +@@ -975,7 +1042,7 @@ else AC_MSG_RESULT([no]) fi @@ -136,34 +136,54 @@ index 37fe47e..14e5c34 100644 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" +@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then + AC_CONFIG_SUBDIRS([src/univalue]) + fi +if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" 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 +diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py +index 7649c11..978419b 100755 +--- a/qa/pull-tester/rpc-tests.py ++++ b/qa/pull-tester/rpc-tests.py +@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): + ENABLE_WALLET=0 + if not vars().has_key('ENABLE_BITCOIND'): + ENABLE_BITCOIND=0 +-if not vars().has_key('ENABLE_UTILS'): +- ENABLE_UTILS=0 ++if not vars().has_key('ENABLE_CLI'): ++ ENABLE_CLI=0 + if not vars().has_key('ENABLE_ZMQ'): + ENABLE_ZMQ=0 + +@@ -141,7 +141,7 @@ def runtests(): + coverage = RPCCoverage() + print("Initializing coverage directory at %s\n" % coverage.dir) + +- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): ++ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): + rpcTestDir = buildDir + '/qa/rpc-tests/' + run_extended = '-extended' in opts + cov_flag = coverage.flag if coverage else '' +@@ -187,7 +187,7 @@ def runtests(): + coverage.cleanup() + + else: +- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" ++ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" + + + class RPCCoverage(object): +diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in +index 937b423..71a917c 100644 +--- a/qa/pull-tester/tests_config.py.in ++++ b/qa/pull-tester/tests_config.py.in @@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" # These will turn into comments if they were disabled when configuring. @@ -171,31 +191,24 @@ index 10f4d33..e0e407d 100755 -@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 +@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" diff --git a/src/Makefile.am b/src/Makefile.am -index 1c2f770..4d60ddf 100644 +index fa7a78f..cc2f2ca 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 +@@ -31,7 +31,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) + BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) LIBBITCOIN_SERVER=libbitcoin_server.a - LIBBITCOIN_WALLET=libbitcoin_wallet.a -@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a +@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a + 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 @@ -210,7 +223,7 @@ index 1c2f770..4d60ddf 100644 # 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 +@@ -79,8 +85,11 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif @@ -223,21 +236,18 @@ index 1c2f770..4d60ddf 100644 + bin_PROGRAMS += bitcoin-tx endif - .PHONY: FORCE + .PHONY: FORCE check-symbols check-security diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 0997148..14b4deb 100644 +index 6ef6a69..1b6e759 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 +@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE check-local: @echo "Running test/bitcoin-util-test.py..." $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py ++if EMBEDDED_LIBSECP256K1 $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check +endif - - %.json.h: %.json - @$(MKDIR_P) $(@D) + if EMBEDDED_UNIVALUE + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check + endif diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml index d0906f48b33..4823df2c5a1 100644 --- a/net-p2p/bitcoind/metadata.xml +++ b/net-p2p/bitcoind/metadata.xml @@ -9,10 +9,6 @@ <email>luke-jr+gentoobugs@utopios.org</email> <name>Luke Dashjr</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</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> diff --git a/profiles/desc/linguas.desc b/profiles/desc/linguas.desc index f9cd582048d..442bcd21c29 100644 --- a/profiles/desc/linguas.desc +++ b/profiles/desc/linguas.desc @@ -162,6 +162,7 @@ me - Montenegrin (Crnogorski) locale mg - Malagasy locale mi - Maori locale mk - Macedonian locale +mk_MK - Macedonian locale for Macedonia ml - Malayalam locale ml_IN - Malayalam locale for India mn - Mongolian locale |