Update 9999

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

4 files changed, 108 insertions, 18 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index 3017c2d1a1be..5cc307511c7d 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.88 2014/11/13 18:31:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.89 2014/11/21 23:44:07 blueness Exp $
+
+  21 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/9999-sys_libsecp256k1.patch, bitcoin-qt-9999.ebuild:
+  Update 9999
 
 *bitcoin-qt-9999 (13 Nov 2014)
 
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 4bdc1301e8ea..724fa6821bde 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX 0.8.2-sys_leveldb.patch 6647 SHA256 45ac78376c1983babf0e001b18196b777cd4bfca1c6b92fad62302d70ec9aabf SHA512 0aaa00584bc56984133f388523b2084d94a620987367e0eff39cc6debc39738586fb991e7cb84f54eb56f27992929d562261bb867e1091679a51839185626edf WHIRLPOOL c027065cedb40a946dc7fa1f5dea6908d35290147f53df178d7ff416c2a5d5bd9f7e6802779d8a0a04044e04bfc4dd76433ad2dcb48b65869d3fbfe8c7bb3748
 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
 DIST 0.8.2-1stclassmsg.patch.xz 1788 SHA256 ae871cbd949abb6c6c57eade016b2945ea95672958362439db76697aa23400af SHA512 b511c0dac07710497d0d2aa814049b72db1186a5f86f2b7837e7927989be75319a83eb10dd37fbf4f5aba7c4266f7a35d0b9abb24384df2f93e1cd8090bd7a55 WHIRLPOOL e7a05cda0ee01bce08ce5a17c8b72f6b9f1636c916f38e03cb0a2604094959f44c58e54c35be6aefddc81e91f1e6b416d23480a8ac0e34a186b80ce349cebaa5
 DIST bitcoin-0.9.3.ljr20141002.patch.xz 23320 SHA256 d0a480e11159d597a36e300398c858b5713de78d4f00295b46aa6612ed4b28cc SHA512 b6f225c1e6fc4b1b0b53084d62ff6a57af3b45ea48064fb790b51a081bd1a2333ad5ebffdd443da47babac76ca7394d3ccb645fb3e5e532252409de32a3cb768 WHIRLPOOL 2cdb0a3e3b8407ef11a9f6a56c47ca51c38eb7adbf1b0ceaf1b7fec00118a75892782f66a4c85e54f43e3a3107d1b4e3c799eb1171dff8eb9db69d162cde650a
 DIST bitcoin-v0.8.5.tgz 3181865 SHA256 39f170aa29292d530371d287f2036aa372d1e255cf46c29588b8c5a3afedcea4 SHA512 ac605f202b4b8c2fc3574517018817d7ac6ac9296040052db67232b0fd136446895986e25f1b4aa6a888a0ec510ad2a69bf09c65b95deba1d9b2ea6ece62d9c7 WHIRLPOOL cfe8839fd5bc6e22cfe485c63e2a7f261c8817c0d090766ae2dac6303612a977ebea87df2df473a5cebaaee9a2712b8a97aa3f6613f88732be06b7a9fa18351b
@@ -14,23 +15,23 @@ EBUILD bitcoin-qt-0.8.5.ebuild 3380 SHA256 599f1eeac12ee41b67c8f6a6f7f18966651e2
 EBUILD bitcoin-qt-0.8.6.ebuild 3383 SHA256 96392e278dcd2491834215e3dc12ffdba7647db9d9175526123b984f2dafc7a1 SHA512 84a86f6a33a3631765263ed47ec06b644b2ee1669778a89e451955a61b699603a2cf2fd76dc2df2b778ecb6123bc5f6def7f17bc0c2b127b42d978bea4ac606b WHIRLPOOL d7d40e5e15ab243bc9a0432fb18e24fe5c0a6cdf9d9c3f32c277b2b2afeaf99d867340ff7f88efbc6aa56594d66f7e54ed793442defb0ee70afba9e431e598e5
 EBUILD bitcoin-qt-0.9.2.1.ebuild 3109 SHA256 fd706d51a8c9fc2a1707850dc022b4ed326861dc56541348a0fd7c1ccb455e05 SHA512 061af2155cad7deedf585db3db1116f07c52a3dd6b88814f32af4cf7f922aec0a43b55a123e551fd0d99281dda51791283aa6c08a60ffd50b7b0a68282a09d42 WHIRLPOOL ab50bc1fc2752c36bff3ec058da9da309d541d8cbe2ecd2467a519391a9381b58fd5c63ebd91c47a16a7bd5fdb4292260365042e9e41f4242ac35a89bc725789
 EBUILD bitcoin-qt-0.9.3.ebuild 3566 SHA256 6a4bcb925637a012828746382b79eafb83f680620f00ea7c0081f0937ef00cfb SHA512 d4fd6cd3d3b480d7dffe9ac74a99366060f4cea64c22aba5766a6b2f1f6b71abfddd06e4abedf422dd76b091a6ab63c72d9b01a702c87b362ae6649d81f5387c WHIRLPOOL a427e125b7508d8235c3cad5a5d7bb2494b7a59c341a75afe4006229e9bd1fbe04bc358f39011c8bb2a8e0c58f77725a466edb2a3158a3d62d15ceeecdd977e5
-EBUILD bitcoin-qt-9999.ebuild 3122 SHA256 a62a09c5805bde6bc804de82c06a65b17829de5243a9b1d893c068b1e69ec982 SHA512 c297d8656e44572ee197441e2a6ef4a6b45830cc05969594eb46ef5a9e72b25a502dc8c75b060c0ce530d512bf2470ee904fcada3f1e5e44a330474f59cb87e3 WHIRLPOOL cbdeca26429d8e9f90f270495961b0d5fe68a88613d0d1bbf2d63c5b4f42f2c41f82b0771d2b9b0b37c79f88440d12821ad2f54ba6b43bbd527d696e6417fae1
-MISC ChangeLog 18508 SHA256 610434a09a6d3afd9550a2c08855c63adee56155962249941fb3bd3f5bddce43 SHA512 a520512fb438ac53593f7726addf021dbf5aa08afd585eaf742364abdf8ea8ddd72cd71f00762a46d5d3b1b87a6dd413c8b78ca35ac6533c1be75ba0df7f9598 WHIRLPOOL 6a143866bf2843157fea8e791776ae214245acf24ceecea3fa646a04b4bf049840a5abcb27e2638f76c245ebf98568916ad5cecaa8947feb4875b57a1aec4281
+EBUILD bitcoin-qt-9999.ebuild 3262 SHA256 6ad27258aba3246ca29bc5721211771463e239d4762eb8ec39f78fed49f59be5 SHA512 b7b2618c153cbf15a2c09046f7d5c99e8f33d417a0ae28d3788120eb037829ba8ce04cb62b345700a68657fd3e392aa4ecaff08547147424489940547f37e2b8 WHIRLPOOL 1c13231c9e023c5239341c3763d65bd0f8eb81358ea34b811b088913ccaa3c0736e9d068e3106407529fc5f68a29f10c24b1c9770803447907665d4c6cc56204
+MISC ChangeLog 18640 SHA256 65c4269ac5f0e80180252ada001ceb47cff1a3e6366efa80b600888429272bc6 SHA512 c0ba62f85ed2ca81800692642867401a2fb0ac3809512da8b2beda0c3feb8002ec0a3c24d218245ac2585b1f91dea15e101459c096153aae8d8c42778b23c1c1 WHIRLPOOL ebec09fa90667d3093df5fda6d0faae1c71fcbc7e8aa67e7be4044d07f8c437b25cb25d7dc29afe03ddda0e1587053a61e7ce0a25325abc3a249b785c30a798d
 MISC metadata.xml 683 SHA256 7646cc2d572e809bfa417fd1ff3cd6132e242684890cd12839d30c7ccd58093c SHA512 5e5678aea84a43f45994a3d4ccfa82990df66dc6f7d752642090dd70b2e8bea79eb0d08bf2c1e0017827d1515763fbd1365c2a332fbd033c983d143c38f52453 WHIRLPOOL 0f0456674533817da48c3bfafb23e3b2ecb9fe0679ed0d6cad10db38b01474a08134542d743877e3b10b4979b853775eafdf98b1cc16b1cb0f8f89e8d48b496c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUZPmXAAoJEJOE+m71LUu6lzoQAJRxwJQzxYwhzITz043ICWAP
-9l5/bi9L1M024KCS4YH8y7BehR9umF0z8Kx4KaAiHHJTtlxCOW1AUqkyoN9TL8Om
-FWwajoI7nXxE0lrmSTqLmCF4FRxYK8sdw0SxV8yrXrQoIG01IXeyVXqETLrkVuqI
-IeMxfPlCYDZ0kxHGfmhNH71VTLY0KV6ux2eGW2f42+zcSELmm2bKXZ4tEPwq0bzS
-Z7MFPr0Cn1mvte51K9vBPzNl90uGd0GSTkiII6xrU/976Tmyk34bX8MlTXhl+kSn
-an7E7UjLD+gQV04Gk46ZrjToopoOA8OIuJt9DmTw4NKEd07C1vQtz8Qo+sZgjN70
-L5TPIINBDaB9VI7A7vAEVJ535Zsla4mwfeIV1It5QFMEh7i6zVYi2TyX/x6GZyC1
-KBwLNJsKGruvh2g83tFhQ2aJUE7yQtOPvs+EGKc90xSE3YTOl+qHo7Ecj15fhFPH
-CdbPXY2//n9j4KGdc/fXW6K7339TJ2dWdFp4XuIzJkNZFdcOx9/JZNLXxGerY4t/
-xiqk9shK/vrqdGSOUnCkdyw4UtPo/0X9TZewSWVtE9V7eaZDWB5G66r5pGuHI3Wt
-HCkriszFHpk/jcarwn+w/btzq1PGxb3JOw/zCdcxKx4r8MABFkEonxhb4GDNPkPC
-kAh+v8B9AJJjUahhj8b2
-=0RHW
+iQIcBAEBCAAGBQJUb87qAAoJEJOE+m71LUu6mz0P/10Z71EPpMsYIAsNwcRv6G62
+Kj1zVPSxCii+4SzJClYJCrOAlRvvyZBOL8xaYv6gev8uNA5Zzis3mWOxMPMJNpRi
+ymopaGY5B88o+A9VK7d7dAchPMWjs6etCYxSP3aA9dxHjr1owjQJyZ2D6LgPCC9V
+bzZ86WR/7iSxe07dTaH5Fr0/5OJu5/AddJZjaCX6KC+Owf6/Th7rCr9iEb+2w4ne
+jxDLipFbx1po5QxHjCNJqFZQqpdUAWYZ2WvvBdR3VeB1jpFCAyKQUdguCg+Velg8
+zsg+SymZqBqubNq5IKzE/eeDqt01A+nXuXdQXG70t3u10KOQ+N+sVjODx3JGvMIQ
+3XyJjPoCd4DgeBl1nnrvv0/75U4ISp9HgzJ2F5We1dtzRr81gIsaFhwSksYHsaQD
+A6eXmSGp8oB14l5LDdtwVlqb2JoRxif9j2nIrqPIeho9aezujeJnOcyyw6Cd2hCD
+o8eKgULxGONflaqLFYICdtYSnVPFxn44fMokxGdGs4/L5CdoOL4r3QoF4/gqOOs6
+09jV1X/eBag2bk1Vs/jpSxTjIQdRKQu5DgbGsqt1IAQ3M0c14q1vgE300jHcplXI
+4ymxEOfqBTWokk7myZZ+0LKQlECnXg+HagXzNR+fRBES7CzPSF2AYAOdpIOKwoZW
+INDvU+dsV+e2PLu7WcK7
+=JiHw
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
index 7811b7debd9e..7ec9305252e8 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2010-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild,v 1.1 2014/11/13 18:31:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild,v 1.2 2014/11/21 23:44:07 blueness Exp $
 
 EAPI=4
 
@@ -37,6 +37,7 @@ RDEPEND="
 	)
 	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
 	virtual/bitcoin-leveldb
+	dev-libs/libsecp256k1
 	dev-qt/qtgui:4
 	dbus? (
 		dev-qt/qtdbus:4
@@ -48,7 +49,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
-	rm -r src/leveldb
+	epatch "${FILESDIR}/${PV}-sys_libsecp256k1.patch"
+	rm -r src/leveldb src/secp256k1
 
 	local filt= yeslang= nolang=
 
@@ -87,6 +89,7 @@ src_configure() {
 		$(use_enable test tests)  \
 		--with-system-leveldb  \
 		--without-utils --without-daemon \
+		--without-libs \
 		--with-gui
 }
 
@@ -97,6 +100,8 @@ src_test() {
 src_install() {
 	emake DESTDIR="${D}" install
 
+	rm "${D}/usr/bin/test_bitcoin"
+
 	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"
diff --git a/net-p2p/bitcoin-qt/files/9999-sys_libsecp256k1.patch b/net-p2p/bitcoin-qt/files/9999-sys_libsecp256k1.patch
new file mode 100644
index 000000000000..77ed10675e30
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/9999-sys_libsecp256k1.patch
@@ -0,0 +1,80 @@
+diff --git a/configure.ac b/configure.ac
+index 6784521..3598bab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -634,6 +634,12 @@ AC_ARG_WITH([daemon],
+ 
+ BITCOIN_QT_INIT
+ 
++PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true])
++AC_ARG_WITH([libsecp256k1-verify],[],[use_libsecp256k1=$withval],[use_libsecp256k1=yes])
++if test "x$use_libsecp256k1" = "xyes"; then
++    AC_DEFINE(USE_SECP256K1,1,[USE_SECP256K1])
++fi
++
+ if test x$use_pkgconfig = xyes; then
+ 
+   if test x"$PKG_CONFIG" = "x"; then
+@@ -869,9 +875,6 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR"
+ unset PKG_CONFIG_LIBDIR
+ PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP"
+ 
+-ac_configure_args="${ac_configure_args} --disable-shared --with-pic"
+-AC_CONFIG_SUBDIRS([src/secp256k1])
+-
+ AC_OUTPUT
+ 
+ dnl Taken from https://wiki.debian.org/RpathIssue
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0d45203..3a44a16 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,3 @@
+-DIST_SUBDIRS = secp256k1
+ AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+ 
+ 
+@@ -20,7 +19,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 +29,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
+ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
+ LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
+ LIBBITCOINQT=qt/libbitcoinqt.a
+-LIBSECP256K1=secp256k1/libsecp256k1.la
+-
+-$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
+-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
++LIBSECP256K1=$(libsecp256k1_LIBS)
+ 
+ # 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:
+@@ -364,7 +360,7 @@ libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
+ libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
+ libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL
+ if USE_LIBSECP256K1
+-libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
++libbitcoinconsensus_la_LIBADD += $(LIBSECP256K1)
+ endif
+ endif
+ 
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 5fd2afe..014092a 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -104,9 +104,6 @@ bitcoin_test_check: $(TEST_BINARY) FORCE
+ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
+-check-local:
+-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+-
+ %.json.h: %.json
+ 	@$(MKDIR_P) $(@D)
+ 	@echo "namespace json_tests{" > $@