net-p2p/bitcoin*: bump all pkgs to 0.12.0 and update 9999

5 files changed, 92 insertions, 57 deletions

diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index a000ed3c550e..c665791943da 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 000000000000..63f25e2d7c52
--- /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 c41e1e207907..755248dc0827 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 2cdf2ab9837b..c594c54634ed 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 7a8f5cb5bdcf..a686a21c5264 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>