gentoo resync : 31.12.2017 (final resync this year)

3 files changed, 108 insertions, 1 deletions

diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 4ab44bce2628..d5750a7cab67 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,8 +1,11 @@
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD libbitcoinconsensus-0.13.1.ebuild 608 BLAKE2B 6f6cfdf482edc19ba4708664d0a161514c13c205d0ba5f9ddfcf8492e9ab5b734ccc73ced89d196cac82cfa314dbff14900648d461886d972d0c18d3b240f110 SHA512 20581062b5cc1dd73e8334aa127b750f2b73e38544076ab77c5f9d9659d186f4d46b4e0ecf31317d16893dfef89e194eaef310e108d76115e3d8b359edb3339f
 EBUILD libbitcoinconsensus-0.13.2.ebuild 608 BLAKE2B 5536ce019cd28b55129ac466012f0d3463cc081389ce3497fda010e46a9c0ffa586a0c9f00fd80ce81463f3a77d6ad6dccf1b4959f1e8f8ac5ed1ec8b158a0b6 SHA512 62b1de1e117af3f66721df34519a40f3347e51914f0f3deab203225d684a4056e0db09a1e2c8acdcaf97b492018d6ab726f9e2b6e0b87b3200d203df9ea66348
+EBUILD libbitcoinconsensus-0.15.1.ebuild 2387 BLAKE2B 41805a2aeae89849833054571267ad0c90d20cf25570cc60e70fe2ca15abce2a482cdbe6be3b10ff8a9c682b6dcb27c844dc0628b9855440464961d46d203f7d SHA512 6912c3598f2516d583f4569bb66fcf30c8ab12e097393a3d5ee6d37ff6f890c4a002b349e0d616303bc87481b93352898327d54a288de5197af82e10bb74da77
 EBUILD libbitcoinconsensus-9999.ebuild 512 BLAKE2B 5a1bc9f59c902cee3357f913334564e8e91808d7d19abb88ee1f1ae2d44b785be975f18643223a2a619acefc704a073ada3e308d2bb5385109e9f2d5bbc1cefb SHA512 4c8b7bdfdded19b7907ad5f8dcd5541ab15c585381604d619a20f3ad1fd7672936b1d25951406613490c5a11e880c5f866d45d250a72625e865aa08370a365fb
-MISC metadata.xml 454 BLAKE2B bab3faf6cb2af717f0c21cdd1183733c968823e206934a07e7afe99487d352d56048c854e624c7328344977e960420bdd8256df08cbb1601a47b9f04428f2fd5 SHA512 e666cfd44fff4e75dc6af1b49a81b88233ad5c48ad213dcc4b359ded3ad3752bdf73e89d647357cf71eaba8e67256acdc4c9b1f284f273477e25f2c228ff2a83
+MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
new file mode 100644
index 000000000000..d83c3297cadf
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="+asm knots libressl"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm experimental-asm)
+		--without-qtdbus
+		--without-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 54ddf8fd823f..946f87b1e8e0 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -9,7 +9,12 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="asm">Enable assembly for optimization</flag>
+		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>