Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 374 insertions, 15 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index d8b7e23e3a29..6f4ee6cafdbe 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.112 2015/07/17 20:56:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.113 2015/07/17 22:20:36 blueness Exp $
+
+*bitcoin-qt-0.10.2-r1 (17 Jul 2015)
+
+  17 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +bitcoin-qt-0.10.2-r1.ebuild, +files/9999-syslibs.patch:
+  Version bump.
 
   17 Jul 2015; Anthony G. Basile <blueness@gentoo.org> bitcoin-qt-0.11.0.ebuild,
   bitcoin-qt-9999.ebuild:
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index e677f993153d..721fb4d3c931 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -7,32 +7,36 @@ AUX 0.9-openssl-101k.patch 1192 SHA256 198318943cd1eaff2ce5e94b5b9aea40a2c99c46c
 AUX 0.9.0-sys_leveldb.patch 1040 SHA256 1355674ba82966b31fd001b12e7bd1bffbfd7f1c6d8dc1679cedba032e6df642 SHA512 26b1b6f8c4fdc228c08982a3172de57e09d963745726c99e1e274f381e242467f84d23c718f8e07675c2fc938f2d6db6b50a05dbb944702238d7b0eb6205cff7 WHIRLPOOL 7d39d39f846f03ffbf3e4c9655c42f298c8196dde8ee621862483a49f386c13cfdd13221ff265745f504a33422aaafac3657b72552f55784c9296daffc248f31
 AUX 0.9.x-ljr_noblacklist.patch 330 SHA256 b20c934540748cd42405bfca305a61bf05a76cd9b54f20e57e5fba84bb742f6a SHA512 13e727d6e1324542f7097c310e2f2a869d39acf6288593661b81715858ee95d1ca0566aa9892e5a8e34e4c45edc28faff6938728f1b97e9561460ea99838834a WHIRLPOOL 851fe606c02da5d8f778d56aea83d5a55a427c7a83610755cdd35fdc67a02a4628c1c480bea5d8d862968416ff3cb3e78d56ece498055f86e4d138e5997db674
 AUX 9999-sys_libsecp256k1.patch 2804 SHA256 ddeb293959184d82beed8bf9117916a28d49c0d0a324287ea026bdcaa7505871 SHA512 970a851f564cddf5ca2ad453ce6ba767b3815be9bcc4dd09c5fba6f42e1b70a9de7438d31e8dcf15875cb4c06ff2f04b0a2361b6b413b2146b2c2c78b908ea17 WHIRLPOOL 634cb832458551b61caf8d852335260ce4f2253a516dddc8b723ce89be05fd4254f4f6b49f8c6697da4120e723a068308d0cdfb57c16c199329cceb83a9be2b1
+AUX 9999-syslibs.patch 9143 SHA256 a91cb64a820e2e0eaa573fc3c7e408d68f344f9f0d25a4ba110d0443cb622bc6 SHA512 595717f059b6ad11dc790a7c2f343ca66fcf237311cbf5f60cd9569624755295d5efb57127cc82bf3e0bb972ee432e0d2211155b26c71546808faa68c78d55df WHIRLPOOL 805ebe3de20d9a417ead593274297d2b074af55cccf63bc73b4a8884f5c27bd0c27d0f8c92636769bce88637677924149ef8b8520e907c64486f7c666f2e1a04
 DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e
 DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4
+DIST bitcoin-rbf-v0.10.2-r1.patch 26987 SHA256 a5dcd50134fe9872c0460746da2d743864525a775150304473a5588aa6c516e6 SHA512 2e88d185dd8d5845a7286dda130ab6d73328a09f7623387d68437be5e655e9657a1e392e9c6a0004856127738f340a77283206a0a8183f2ee9407ddf43328e7f WHIRLPOOL 39ffca7486964eb25f5de4ccfc4a1aff4078b1a08d907300ea06f51189bdb0c6514dbd9565ce615de6d776bf01faa1dabae5cb0c4628ef8d3dd686f6300c037a
 DIST bitcoin-rbf-v0.10.2.patch 25171 SHA256 2610cca0d758c502b71a13184643fe00c9dcb7a2b258f943f33a4534ec1f6cd5 SHA512 855e5e497a371b1e503ab5a0c1fbdb7cb3c30c318b19c32c220d8e6e0b2ae06ca6e63ac27fcb23b51b01c5573c6ea94417ec9d395174ae4f01ad9a0ed4c28c51 WHIRLPOOL 9e67a1d03eb7e40431623818230f2c94e811402a5da6f36dd950cc8a92cc76797ba770c3586ff88477d74b7ee21c9b93704ccead7b489678911dda1394f34fda
 DIST bitcoin-rbf-v0.11.0rc3.patch 27178 SHA256 976e3007121a69630b74c6106f41ebc48b97476ac647e0872d3aaa08a64ec52f SHA512 dc1c46b731dd78bbcb2e7b066dd74aaf0adf39c672847349ed7ebf00012481d3105cebc753dd3bccbe0c35c49bf9dc1546cc8e4d0cc5509d449115e53e91fcc2 WHIRLPOOL de7bd2c1a45369baeac8e311fcd3f9b37e6ab84b99362bb05a5f3f8d6990ea2ad5f509b389b0962bf679ced9dca70c0825e35ae02d97b389101108d2d80be589
+DIST bitcoin-v0.10.2-r1.tgz 5076702 SHA256 9bee2b9fe0c236f9f75bfc05c59df238c9424cbcffe4483db5009c5aaff8881b SHA512 5650dc281c749a6057d2dc29d61909619d680ace8c74c41df1581ef56e98950cb42bf4ea2c37264f00090cfa7762f2539f433c8117228484cd7628d397aa69fa WHIRLPOOL 02c2e74748c7572fa3968fc132d561323e33e6aadc07744bd06567abdddd3c7871afe6b46d30fc3389d92246c705454db708dd05946e93e3a93ad5d3b89a327b
 DIST bitcoin-v0.10.2.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e
 DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf
 DIST bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4
+EBUILD bitcoin-qt-0.10.2-r1.ebuild 3041 SHA256 e7a2f42064c9e671611e07f89f9266e12cb4316115b31177d0d4149d23018d56 SHA512 5aaeac4f64e1d0d1187936e86002df37351789f7d83bceb378ede1df71bedc4722f9bc2bcdfe7f1aa754633fa162964baa91f360b54ba0816026526cebb89329 WHIRLPOOL e089aedf529af6c040a1ac8cf66582acf277547ae630156bda785fb9b83222ad76af79cfc7e2b6216fb08be643e5781d0c40ec1053dce8495384155b9d8b8725
 EBUILD bitcoin-qt-0.10.2.ebuild 3212 SHA256 a9e9582d7ee551efd556a4c395a5398f653a5b7c316d4a6f1f18d66bdb20ee7d SHA512 25cfdff7638fc110b72ab2ce9497a68dc8ebeff7cde27931343bb6eb72022918789ecf854a0f8aa33a3171d8d3e48d8142db8741acc91a1d078ed1b7b46dc6e9 WHIRLPOOL 33932b6ac1fdf431e15ef39d01e65a7482f31bd4a7112dd58a0dd9f0fd0032cc5569c595ce7f10857e2c2c551e42ad73993c170aedeea75b9b59fb6b487d2758
 EBUILD bitcoin-qt-0.11.0.ebuild 2843 SHA256 35242bd354ec2fc37c540a6a08f44b1c76be630335d3bf95e97858ebf2f51614 SHA512 ecfbfe26e0a7bb749b9673e3cd799870d0c1729c377f69043f8cded2adcd5d8c8b2f0bb3bda25f1a946a53c4ba8dcadf27319aa906edb885b3bb993bcc88a743 WHIRLPOOL d68c81a793f23ea12c603267820666a747c329a957f4d1b81078a71d40b6984c7cb7a1bf3a26919daa82a87495963e86c076629698c2bd610c8bdd970326090f
 EBUILD bitcoin-qt-9999.ebuild 2628 SHA256 e4e109bf537736e802d9d81ef81da4323013d6ce5fc5c3f0c9a7f7c62ca46dfc SHA512 2ca1c217d5e83b92decfffa3363819586d6e93e25ee78a2d6bae56879d80dcfa3415b19e71355f5c6dadc32dca9fa360dce10a0fdfb0043eaa31201d6db57820 WHIRLPOOL 9b1ff0b3c94411fb4ee020ec5aedf861631164d635a0214db5dc499440c108b9469d62d91410b8b690690dacf331cef2c6e647c46cd6b3540ae514b0a7b04558
-MISC ChangeLog 22087 SHA256 89a923d244a22d925ed04b77482c5b2e1e1b9b1cde0fa40f866a9773273c9c02 SHA512 9152614a9ea3decab1692419d285e60feb94c917121937f34effad92030974e6fc6945e274523d57190db1dfc1ff7835a4b4df2d971bb4a408e2a05bcd326870 WHIRLPOOL 7c2c6c92c37e54086a91c6a8af0c8d8b3532115051e0cb40fa030f8ff4dfc871c0d4031041657733ddc307c43cba686dcac5950bc731bdbea6bc64389e195ef0
+MISC ChangeLog 22255 SHA256 ebfcacc863c72dead32277c3d80191762a836439f3cf7829ee50ed5f1a6408e6 SHA512 158750c693b2f3fe316d8831a04b04dcc3e46f6a587777ea4d831742fe061ff26e7ace9496f7bab688429f054f9ff9e7cdd8dace8efbd388db5eb14b81800b89 WHIRLPOOL 7f8a8f0bc56bc2b77b9d1bace29fed3c84667db3e59f90423d503812ed3064d0df01771608e09951c64b83f07e65c098f77803a4e7967c92fa4f4eb07eb157f3
 MISC metadata.xml 1626 SHA256 4b60abfec18e0fda95c9663f282c5337a95cba8fe809607ed5748982d1b544b2 SHA512 0048435fb0ca34f06f9fad0b9736da60532f8f4ffdf50dda056e2abd1e5ce98477383a432b597580f6e272b4895c3434ca5261986643ae3dc834638fcf74e5a4 WHIRLPOOL bc857f922aa1d313887fe4e5ddfb468ada0be66e5259d856568f044c13cadf01b19ba5de90ddfc47584062900f4fc7adf2db19ba28d213f3deb2cc892ebb3a59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVqWx6AAoJEJOE+m71LUu6LS0P+wW4N/bnyMgrnrOReznAhnkq
-xSFS1zrnWCJItyk5Iea8V3o3WUMuNaPHwRcuMFCS4PfTqCZu535vPEkNvg4gNIY3
-nHXNYeOX9vMtZWbOa7y5r57F9r5YByr6JXJ6vx8P+V7lirT5uVxFQaKOY0Yq3/HI
-ANgIvZdl6wmf7KTWwIviu9qlrrTYO4GnYfUtZ88lnp8+59orsLd6kr1dwBfVyLRg
-ck4/1c0XUAm/Tcfd7Ludkfm8MXUNwpDDXGB4LUXjVzeLn0vI0F7Bi3CNe1TORAYU
-e53a5bXEYR1eQRNDSI9fNH2f5J8NfQFd7NTpYB8BvmEGzLlJVxjxNC9+MMqE9orm
-LjbbOG5lZj2HayGn0ucg33VVFQjv4NlA53zg34Q9Bzem04/dBHCKz8dUcKNWSkqE
-lXpQPR1Q8SDZNH7LERGil/l30q7SzVI6i6sakDVpZGRuIrwKuTKAT0IE92xIonSq
-GeWL4tg96EifXww3Q32mylLpXBBg7VH539sv6qEWmGpmbdlyYwJ+2DrRp/EoLv7R
-oYCFkN09OriijXPbW5E2TH2WPoTcLlR4klNc53GuDa3tC6E0C1foaiTc4b894hGB
-tYS54PuAuIIqEyXGlxvDPy1ZTJ867LfwIaGwMvrS7VWqXypItftI0i68dJyPKk0p
-OYsa9gig3gz4SmbZA/Go
-=f5H8
+iQIcBAEBCAAGBQJVqYBKAAoJEJOE+m71LUu6gTcP/2Yi/R6zVQB7phWbWsDxCn9P
+kjoi4eT/j/Xh+hwHQdIrZ4BN2ZAgywnSqPs0uiiHVMcpARWth4kCZtBtITDAyULm
+LnFzAUE/3hLTSLjDDlv0g46pM1N/NPoSe8LCcU1TcuKLVSMqLnepHL2NZdavkHwY
+i968toBXGH+3r3OfmDwA/GpfMYbbJgLcshQVynDgMRhhBqsm/YLX9rl/Qap11Wif
+PJP2LRstkV3sfvFaA46wG/tpwW+/NVfjzeGwDGoHU0s0tA/Q+CYf9IsR7/orZxxL
+ROQwshS6UgwKbAa1/B6FjUYlmxXn9oXBozsaNahYGRPTC+s7K5Fm3Ih5ChMYnKbq
+ffVeMXykXlkFqmbcd/qmwAV7qMAcUCiUtEfhhAXlwQ6bQJ2l8rqxav1ZKv1hXtDN
+sMfufGkYBgK7tdN7upfOyY8qqW5c8u1c7PLDwY9Wh5mbZkS9BzzE53T+fRgmuZ/i
+FWeWbOTkuZXC4bsV7BNjHdlrn2dMxf4zYR77bM3cUXd6XUTVZZUCQngiMqf0y9zX
+SnHuCPuYN7j9QCbjRQ+JgfEZHzWp1mTrdH11V+ZbnCl8RoEC5rjwwrgw1uMbXOXi
+2TlPjIltuF0SWyYKfI7WTOGxTdAPf9boyg3qmyANMJFH0XsSoU7iJ0Ly8yjmP74t
+hTMlbfO9hfQOCIJITIPR
+=zANZ
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..7e1f807c75b9
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild,v 1.1 2015/07/17 22:20:36 blueness Exp $
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="16f45600c8c372a738ffef544292864256382601"
+BITCOINCORE_SRC_SUFFIX="-r1"
+BITCOINCORE_LJR_PV="0.10.1"
+BITCOINCORE_LJR_DATE="20150428"
+BITCOINCORE_IUSE="1stclassmsg dbus kde ljr +qrcode qt4 qt5 test upnp +wallet xt zeromq"
+BITCOINCORE_POLICY_PATCHES="cpfp dcmp rbf spamfilter"
+LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
+BITCOINCORE_NEED_LEVELDB=1
+BITCOINCORE_NEED_LIBSECP256K1=1
+inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+LICENSE="MIT GPL-3 LGPL-2.1 || ( CC-BY-SA-3.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-libs/protobuf
+	qrcode? (
+		media-gfx/qrencode
+	)
+	qt4? ( dev-qt/qtgui:4 )
+	qt5? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 )
+	dbus? (
+		qt4? ( dev-qt/qtdbus:4 )
+		qt5? ( dev-qt/qtdbus:5 )
+	)
+"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
+
+src_prepare() {
+	bitcoincore_prepare
+
+	local filt= yeslang= nolang=
+
+	for lan in $LANGS; do
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			die "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in $(ls src/qt/locale/*.ts)
+	do
+		x="${ts/*bitcoin_/}"
+		x="${x/.ts/}"
+		if ! use "linguas_$x"; then
+			nolang="$nolang $x"
+			rm "$ts"
+			filt="$filt\\|$x"
+		else
+			yeslang="$yeslang $x"
+		fi
+	done
+	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	bitcoincore_autoreconf
+}
+
+src_configure() {
+	# NOTE: --enable-zmq actually disables it
+	bitcoincore_conf \
+		$(use_with dbus qtdbus)  \
+		$(use_with qrcode qrencode)  \
+		$(usex 1stclassmsg --enable-first-class-messaging '')  \
+		--with-gui=$(usex qt5 qt5 qt4)
+}
+
+src_install() {
+	bitcoincore_src_install
+
+	insinto /usr/share/pixmaps
+	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
+
+	dodoc doc/assets-attribution.md doc/tor.md
+	doman contrib/debian/manpages/bitcoin-qt.1
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+	fi
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	buildsycoca
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/files/9999-syslibs.patch b/net-p2p/bitcoin-qt/files/9999-syslibs.patch
new file mode 100644
index 000000000000..2cdf2ab9837b
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/9999-syslibs.patch
@@ -0,0 +1,243 @@
+diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4
+index 66f106c..5f0a3b1 100644
+--- a/build-aux/m4/bitcoin_subdir_to_include.m4
++++ b/build-aux/m4/bitcoin_subdir_to_include.m4
+@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
+     AC_MSG_RESULT([default])
+   else
+     echo "#include <$2$3.h>" >conftest.cpp
+-    newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`]
++    newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d])
+     AC_MSG_RESULT([${newinclpath}])
+     if test "x${newinclpath}" != "x"; then
+       eval "$1=\"\$$1\"' -I${newinclpath}'"
+diff --git a/configure.ac b/configure.ac
+index 37fe47e..14e5c34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -170,6 +170,18 @@ AC_ARG_WITH([utils],
+   [build_bitcoin_utils=$withval],
+   [build_bitcoin_utils=yes])
+ 
++AC_ARG_ENABLE([util-cli],
++  [AS_HELP_STRING([--enable-util-cli],
++  [build bitcoin-cli])],
++  [build_bitcoin_cli=$enableval],
++  [build_bitcoin_cli=$build_bitcoin_utils])
++
++AC_ARG_ENABLE([util-tx],
++  [AS_HELP_STRING([--enable-util-tx],
++  [build bitcoin-tx])],
++  [build_bitcoin_tx=$enableval],
++  [build_bitcoin_tx=$build_bitcoin_utils])
++
+ AC_ARG_WITH([libs],
+   [AS_HELP_STRING([--with-libs],
+   [build libraries (default=yes)])],
+@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then
+   [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
+ fi
+ 
++dnl Check for leveldb, only if explicitly requested
+ LEVELDB_CPPFLAGS=
+ LIBLEVELDB=
+ LIBMEMENV=
+-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
++AC_ARG_WITH([system-leveldb],
++  [AS_HELP_STRING([--with-system-leveldb],
++  [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_leveldb=$withval],
++  [system_leveldb=no]
++)
++if test x$system_leveldb != xno; then
++  LEVELDB_CPPFLAGS=
++  AC_CHECK_LIB([leveldb],[main],[
++    LIBLEVELDB=-lleveldb
++  ],[
++    AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])
++  ])
++  TEMP_LIBS="$LIBS"
++  LIBS="$LIBS $LIBLEVELDB"
++  AC_CHECK_LIB([memenv],[main],[
++    LIBMEMENV=-lmemenv
++  ],[
++    AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway])
++  ])
++  LIBS="$TEMP_LIBS"
++  AC_CHECK_HEADER([leveldb/filter_policy.h],[],[
++    AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++  ])
++  AC_CHECK_HEADER([leveldb/helpers/memenv.h],[
++    AC_MSG_CHECKING([for memenv.h path])
++    BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv])
++  ],[
++    AC_CHECK_HEADER([memenv.h],[],[
++      AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])
++    ])
++  ])
++fi
++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno])
+ AC_SUBST(LEVELDB_CPPFLAGS)
+ AC_SUBST(LIBLEVELDB)
+ AC_SUBST(LIBMEMENV)
+ 
++dnl Check for libsecp256k1, only if explicitly requested
++AC_ARG_WITH([system-libsecp256k1],
++  [AS_HELP_STRING([--with-system-libsecp256k1],
++  [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])],
++  [system_libsecp256k1=$withval],
++  [system_libsecp256k1=no]
++)
++if test x$system_libsecp256k1 != xno; then
++  PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++else
++  libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include'
++  libsecp256k1_LIBS='secp256k1/libsecp256k1.la'
++fi
++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno])
++AC_SUBST(libsecp256k1_CFLAGS)
++AC_SUBST(libsecp256k1_LIBS)
++
+ if test x$enable_wallet != xno; then
+     dnl Check for libdb_cxx only if wallet enabled
+     BITCOIN_FIND_BDB48
+@@ -515,7 +578,7 @@ BITCOIN_QT_INIT
+ dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
+ BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
+ 
+-if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
+     use_boost=no
+ else
+     use_boost=yes
+@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind])
+ AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
+ AC_MSG_RESULT($build_bitcoind)
+ 
+-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
+-AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
+-AC_MSG_RESULT($build_bitcoin_utils)
++AC_MSG_CHECKING([whether to build bitcoin-cli])
++AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
++AC_MSG_RESULT($build_bitcoin_cli)
++
++AC_MSG_CHECKING([whether to build bitcoin-tx])
++AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes])
++AC_MSG_RESULT($build_bitcoin_tx)
+ 
+ AC_MSG_CHECKING([whether to build libraries])
+ AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
+@@ -826,7 +893,7 @@ else
+   AC_MSG_RESULT([no])
+ fi
+ 
+-if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then
++if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then
+   AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests])
+ fi
+ 
+@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+ 
++if test x$system_libsecp256k1 = xno; then
+ ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no"
+ AC_CONFIG_SUBDIRS([src/secp256k1])
++fi
+ 
+ AC_OUTPUT
+ 
+diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
+index 9b31865..5bb187c 100755
+--- a/qa/pull-tester/rpc-tests.sh
++++ b/qa/pull-tester/rpc-tests.sh
+@@ -57,7 +57,7 @@ testScriptsExt=(
+ extArg="-extended"
+ passOn=${@#$extArg}
+ 
+-if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then
++if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then
+     for (( i = 0; i < ${#testScripts[@]}; i++ ))
+     do
+         if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ]
+diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in
+index 10f4d33..e0e407d 100755
+--- a/qa/pull-tester/tests-config.sh.in
++++ b/qa/pull-tester/tests-config.sh.in
+@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@"
+ 
+ # These will turn into comments if they were disabled when configuring.
+ @ENABLE_WALLET_TRUE@ENABLE_WALLET=1
+-@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1
++@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1
+ @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1
+ 
+ REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1c2f770..4d60ddf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,6 @@
++if EMBEDDED_LIBSECP256K1
+ DIST_SUBDIRS = secp256k1
++endif
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+ 
+ 
+@@ -20,7 +22,7 @@ endif
+ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
+ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
+ 
+-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS)
+ 
+ LIBBITCOIN_SERVER=libbitcoin_server.a
+ LIBBITCOIN_WALLET=libbitcoin_wallet.a
+@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
++if EMBEDDED_LIBSECP256K1
+ LIBSECP256K1=secp256k1/libsecp256k1.la
++else
++LIBSECP256K1=$(libsecp256k1_LIBS)
++endif
+ 
++if EMBEDDED_LIBSECP256K1
+ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++endif
+ 
+ # Make is not made aware of per-object dependencies to avoid limiting building parallelization
+ # But to build the less dependent modules first, we manually select their order here:
+@@ -63,8 +71,11 @@ if BUILD_BITCOIND
+   bin_PROGRAMS += bitcoind
+ endif
+ 
+-if BUILD_BITCOIN_UTILS
+-  bin_PROGRAMS += bitcoin-cli bitcoin-tx
++if BUILD_BITCOIN_CLI
++  bin_PROGRAMS += bitcoin-cli
++endif
++if BUILD_BITCOIN_TX
++  bin_PROGRAMS += bitcoin-tx
+ endif
+ 
+ .PHONY: FORCE
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 0997148..14b4deb 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
++if EMBEDDED_LIBSECP256K1
+ check-local:
+ 	@echo "Running test/bitcoin-util-test.py..."
+ 	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
++endif
+ 
+ %.json.h: %.json
+ 	@$(MKDIR_P) $(@D)