Add USE=bip17 to validate new P2SH transactions

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

6 files changed, 314 insertions, 5 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index 762b7a8580f9..5dec9833c9f8 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,5 +1,14 @@
 
 
+*bitcoind-0.5.2-r1 (08 Feb 2012)
+*bitcoind-0.5.0.3-r1 (08 Feb 2012)
+*bitcoind-0.4.3-r1 (08 Feb 2012)
+
+  08 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +bitcoind-0.4.3-r1.ebuild, +bitcoind-0.5.0.3-r1.ebuild,
+  +bitcoind-0.5.2-r1.ebuild, metadata.xml:
+  Add USE=bip17 to validate new P2SH transactions
+
 *bitcoind-0.5.2 (11 Jan 2012)
 *bitcoind-0.5.0.3 (11 Jan 2012)
 *bitcoind-0.4.3 (11 Jan 2012)
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index f345ecbdc0b2..29cdc53e4b68 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -7,22 +7,28 @@ AUX bitcoin.confd 238 RMD160 1f84716f3ac81da9b06b925913550acfe542f4b5 SHA1 138fe
 AUX bitcoin.initd 2481 RMD160 ea5398f2775eea17ab9a337650eef30e7912244d SHA1 356a3a0509c465bcc0ce67cfcc22aca745346e4e SHA256 5dace582c4bf05d893166794ce620ca13b794b695376030f7d319bb22a0c956a
 DIST 0.5-eligius_sendfee.patch 6767 RMD160 f084f46860af55f2b23ac1ef0dc4104da8d1c377 SHA1 34fa1567812853e84b53e2fe4940d3374dd42bc9 SHA256 d3503c33528ff6afcd6e5bbb314b8c00c414ed7f1350c2af1594d0e4b6e75e2c
 DIST 0.5.2-eligius_sendfee.patch.xz 2408 RMD160 cc947fd2c62bb842438462dcea654e41e59d0fb5 SHA1 1b44c00615dbdf6775a1a33189715cd118a62f13 SHA256 23495db978f81dc8e029dc260933b6644a4de823734507adff9bcc3c8eef02f8
+DIST bip17_v0.4.0.patch 12510 RMD160 ed83c26186f5d94a85cf2da11beb99bc75d1b56a SHA1 dda32be4438b58f1d2f12e4560902f531082e491 SHA256 42964bb0ab5fcb68fc3468f42f569ecfd5a1c0ab90332d250a28ba6d4edc4d26
+DIST bip17_v0.5.0.3.patch 19310 RMD160 38bb9274096efbf522cf60fabf0800dc59ba866b SHA1 57c61b2c361988f1e40073423a256551eb9ceaef SHA256 b848cc5236c02dd8bfc2968041fecbc40d4e5d5ab8b5a1e83f4357f620edb8e8
+DIST bip17_v0.5.2.patch 19310 RMD160 38bb9274096efbf522cf60fabf0800dc59ba866b SHA1 57c61b2c361988f1e40073423a256551eb9ceaef SHA256 b848cc5236c02dd8bfc2968041fecbc40d4e5d5ab8b5a1e83f4357f620edb8e8
 DIST bitcoin-v0.4.2.tgz 901039 RMD160 06af74fdbb443849e141665d7ee53074522dc83c SHA1 4ae770d6194f5c04a1ef8870094c3af853c8c989 SHA256 e5ac2d6ecf15091ada22a1f0dc74ba8776d4d606b09cc57a5e0496b5c570e0ef
 DIST bitcoin-v0.4.3.tgz 901460 RMD160 8f3a1a613110137f1addfaeae35b16d553e07f04 SHA1 28399e38af4ba1571e29ddff097a4016376766b8 SHA256 0830cb2af32e2dfe3574050a3a7192a10257b1a85d88e5e0867282a9c1d6b1aa
 DIST bitcoin-v0.5.0.3.tgz 899254 RMD160 179c58f86ebc5714ec3bcf0b909f6c8b61df06f7 SHA1 0732d8c1172a8537bd962b49e1967c168e29eebd SHA256 fed0e532f34548c4b9d96661bf597491d6dcc85f3293975faae5c5854cd5b4f1
 DIST bitcoin-v0.5.1.tgz 1007787 RMD160 107944a2f37cc0f873248ef8f2c23a602dfc2dd7 SHA1 27189303b71c6e9c5140c39659ea1f5280e8b4f0 SHA256 e33279066298e0a29e1dcca566d0a0bbcd89ef6e02d43bdbbeaf046f5faf66fe
 DIST bitcoin-v0.5.2.tgz 1008217 RMD160 0824656c82b7621bf58b4331d96592771d940aad SHA1 867ac6b745c6fc278b2b40b542e55c20433e3f36 SHA256 ad70d1fc93b9195dab64594644a4b804cc521fcb5145f6abde962f3c2aadc5c3
 EBUILD bitcoind-0.4.2.ebuild 2340 RMD160 aa09293b16711cc00be462efe678869378913a56 SHA1 46c548b01d3b6a88d1cd16fa573aa8fd9e6cbc14 SHA256 ea7ae03ac5b3f017fc172d01662ca1ab74fa4197d26861341d7316ede8b8062e
+EBUILD bitcoind-0.4.3-r1.ebuild 2493 RMD160 7c03e473e5c617c8b3d2ce0f43e2a82f5ea26657 SHA1 5dac869a24051bdcec0c684e7039dde456ee930f SHA256 715c4d740f28f8481fa66e89e603f95d7cc7bb81b9586d51079f795ba6e84653
 EBUILD bitcoind-0.4.3.ebuild 2347 RMD160 dae9d888451fc052bd5a082e4b0b1b7cd6e5413e SHA1 319f3054f302b93dbaf6e33203c067f048227682 SHA256 0b6bdd56d4a8dca3c15f540640d7acccab8dde08d2387cd6bcc8a3f8a190ac2a
+EBUILD bitcoind-0.5.0.3-r1.ebuild 2582 RMD160 a8869b44a055233d37b323fb7ea762923a37a713 SHA1 03ed5538758b7f8699372c63f979147218f45ae2 SHA256 a8e0650bbd89c62734ddcd97b7c8f6cc7728bcdc013a462d831fba75cd569157
 EBUILD bitcoind-0.5.0.3.ebuild 2436 RMD160 159a9c78a4034211c84417070a35c3f8926e7a70 SHA1 0e7ea01f61c2d0761b70e8aaf21f34e73eff5e11 SHA256 e62078ebbbd9bd22e2d72173c2ee57002ea1024ce2b55ce33eb01dc6c1be7b68
 EBUILD bitcoind-0.5.1.ebuild 2415 RMD160 c408e0aa560b339f01bf431dd4fd41e822f58870 SHA1 3009a95ec301a7d8af0a037359a44fade8f057b2 SHA256 b7ad045170f22c46b161442646e443a6b84697a3a052d1d96ed3f7a6a315e1a6
+EBUILD bitcoind-0.5.2-r1.ebuild 2586 RMD160 6c6b18574eb29924c4efd6a2095ccb79bb0662a0 SHA1 5b67bb364d5d158055c5a6d241fe7dc536c2f512 SHA256 2bef87b4f65d71a7a48da1efbef88a9c04eeb2e1933cc28556428de82bedecb7
 EBUILD bitcoind-0.5.2.ebuild 2440 RMD160 4140e280ee3edbe3d69a8a2723f6024df775aa38 SHA1 de757c7e4cceb4482c723258f2360719a04104b8 SHA256 14bb3aa54568f1034639425e04f8f785f088c951b1f0b031240f6262c925a1f9
-MISC ChangeLog 985 RMD160 8de0fc71ace70cdd1c07085fb06eed77f377dab2 SHA1 8e69c8dd49f07ed627cb697ed68dae9995fff674 SHA256 7113fb3d895a7ffb488b10e709c8c5b29b4f3f0e9e7a7654e8bc94aad2facee9
-MISC metadata.xml 489 RMD160 1bc142d56b8eba454c8b78611dc4a7949e365c4c SHA1 ef5280c637b35e90450c0dfc1b7729b32dac35de SHA256 8625c76579833480ab4a641f5a3723b4d624f23b0c46845637107e216d1560e8
+MISC ChangeLog 1294 RMD160 33c5fef790dbd9054872b49592a96f094e1b18de SHA1 f2e41cb7e46bbe8513d68894af5bedaadcfc8575 SHA256 762e7c732eb2108fb6a51a049757b357d87dd7ed4b26ddfc08766d9577d30ed3
+MISC metadata.xml 560 RMD160 11321353ae34abd53f26bd02de03f16b7fd0b690 SHA1 eaa342e9cd0d350b4ceb32e45606b07a8322d673 SHA256 d180599030468afe2d41133afc503b1b0c4444cbea0e8a28225a9568d9255bb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8NruYACgkQl5yvQNBFVTUjXQCfU+31V4tqcYuKr+XQ0J/gZOBR
-VisAnRq+Nz4B7baWj7r4OHm2Bj6m5LzH
-=vY6a
+iEYEAREIAAYFAk8xvNYACgkQl5yvQNBFVTUQzgCgiWALSZw0hmUgBFPcfPWey76m
+IfQAoJtSu+ChbFYmb7fA5O+T+VDPPVJI
+=etSM
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoind/bitcoind-0.4.3-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..fa04389a026d
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.4.3-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.3-r1.ebuild,v 1.1 2012/02/08 00:07:39 blueness Exp $
+
+EAPI=4
+
+DB_VER="4.8"
+
+inherit db-use eutils versionator
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="http://bitcoin.org/"
+SRC_URI="http://gitorious.org/bitcoin/${PN}-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v0.4.0.patch )
+	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
+"
+
+LICENSE="MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bip17 +eligius ssl upnp"
+
+RDEPEND="
+	>=dev-libs/boost-1.41.0
+	dev-libs/crypto++
+	dev-libs/openssl[-bindist]
+	upnp? (
+		net-libs/miniupnpc
+	)
+	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
+"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-4.1
+"
+
+S="${WORKDIR}/bitcoin-${PN}-stable"
+
+pkg_setup() {
+	local UG='bitcoin'
+	enewgroup "${UG}"
+	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
+}
+
+src_prepare() {
+	cd src || die
+	cp "${FILESDIR}/0.4.2-Makefile.gentoo" "Makefile" || die
+	use bip17 && epatch "${DISTDIR}/bip17_v0.4.0.patch"
+	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
+}
+
+src_compile() {
+	local OPTS=()
+	local BOOST_PKG BOOST_VER BOOST_INC
+
+	OPTS+=("CXXFLAGS=${CXXFLAGS}")
+	OPTS+=( "LDFLAGS=${LDFLAGS}")
+
+	OPTS+=("DB_CXXFLAGS=-I$(db_includedir "${DB_VER}")")
+	OPTS+=("DB_LDFLAGS=-ldb_cxx-${DB_VER}")
+
+	BOOST_PKG="$(best_version 'dev-libs/boost')"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	BOOST_INC="/usr/include/boost-${BOOST_VER}"
+	OPTS+=("BOOST_CXXFLAGS=-I${BOOST_INC}")
+	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
+
+	use ssl  && OPTS+=(USE_SSL=1)
+	use upnp && OPTS+=(USE_UPNP=1)
+
+	cd src || die
+	emake "${OPTS[@]}" ${PN}
+}
+
+src_install() {
+	dobin src/${PN}
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "${FILESDIR}/bitcoin.confd" ${PN}
+	newinitd "${FILESDIR}/bitcoin.initd" ${PN}
+
+	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/README
+}
diff --git a/net-p2p/bitcoind/bitcoind-0.5.0.3-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.5.0.3-r1.ebuild
new file mode 100644
index 000000000000..bc67252ca7a0
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.5.0.3-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.0.3-r1.ebuild,v 1.1 2012/02/08 00:07:39 blueness Exp $
+
+EAPI=4
+
+DB_VER="4.8"
+
+inherit db-use eutils versionator
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="http://bitcoin.org/"
+SRC_URI="http://gitorious.org/bitcoin/${PN}-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v${PV}.patch )
+	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
+"
+
+LICENSE="MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bip17 +eligius examples ssl upnp"
+
+RDEPEND="
+	>=dev-libs/boost-1.41.0
+	dev-libs/openssl[-bindist]
+	upnp? (
+		net-libs/miniupnpc
+	)
+	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
+"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-4.1
+"
+
+S="${WORKDIR}/bitcoin-${PN}-stable"
+
+pkg_setup() {
+	local UG='bitcoin'
+	enewgroup "${UG}"
+	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
+}
+
+src_prepare() {
+	cd src || die
+	use bip17 && epatch "${DISTDIR}/bip17_v${PV}.patch"
+	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
+}
+
+src_compile() {
+	local OPTS=()
+	local BOOST_PKG BOOST_VER BOOST_INC
+
+	OPTS+=("CXXFLAGS=${CXXFLAGS}")
+	OPTS+=("LDFLAGS=${LDFLAGS}")
+
+	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
+	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
+
+	BOOST_PKG="$(best_version 'dev-libs/boost')"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	BOOST_INC="/usr/include/boost-${BOOST_VER}"
+	OPTS+=("BOOST_INCLUDE_PATH=${BOOST_INC}")
+	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
+
+	use ssl  && OPTS+=(USE_SSL=1)
+	if use upnp; then
+		OPTS+=(USE_UPNP=1)
+	else
+		OPTS+=(USE_UPNP=)
+	fi
+
+	cd src || die
+	emake -f makefile.unix "${OPTS[@]}" ${PN}
+}
+
+src_install() {
+	dobin src/${PN}
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "${FILESDIR}/bitcoin.confd" ${PN}
+	newinitd "${FILESDIR}/bitcoin.initd" ${PN}
+
+	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/README
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{bitrpc,pyminer,wallettools}
+	fi
+}
diff --git a/net-p2p/bitcoind/bitcoind-0.5.2-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..00a40af8da40
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.5.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.2-r1.ebuild,v 1.1 2012/02/08 00:07:39 blueness Exp $
+
+EAPI=4
+
+DB_VER="4.8"
+
+inherit db-use eutils versionator
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="http://bitcoin.org/"
+SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v${PV}.patch )
+	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
+"
+
+LICENSE="MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bip17 +eligius examples ssl upnp"
+
+RDEPEND="
+	>=dev-libs/boost-1.41.0
+	dev-libs/openssl[-bindist]
+	upnp? (
+		net-libs/miniupnpc
+	)
+	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
+"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-4.1
+"
+
+S="${WORKDIR}/bitcoin-bitcoind-stable"
+
+pkg_setup() {
+	local UG='bitcoin'
+	enewgroup "${UG}"
+	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
+}
+
+src_prepare() {
+	cd src || die
+	use bip17 && epatch "${DISTDIR}/bip17_v${PV}.patch"
+	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
+}
+
+src_compile() {
+	local OPTS=()
+	local BOOST_PKG BOOST_VER BOOST_INC
+
+	OPTS+=("CXXFLAGS=${CXXFLAGS}")
+	OPTS+=("LDFLAGS=${LDFLAGS}")
+
+	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
+	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
+
+	BOOST_PKG="$(best_version 'dev-libs/boost')"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	BOOST_INC="/usr/include/boost-${BOOST_VER}"
+	OPTS+=("BOOST_INCLUDE_PATH=${BOOST_INC}")
+	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
+
+	use ssl  && OPTS+=(USE_SSL=1)
+	if use upnp; then
+		OPTS+=(USE_UPNP=1)
+	else
+		OPTS+=(USE_UPNP=)
+	fi
+
+	cd src || die
+	emake -f makefile.unix "${OPTS[@]}" ${PN}
+}
+
+src_install() {
+	dobin src/${PN}
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "${FILESDIR}/bitcoin.confd" ${PN}
+	newinitd "${FILESDIR}/bitcoin.initd" ${PN}
+
+	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/README
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{bitrpc,pyminer,wallettools}
+	fi
+}
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index e5803dcd78bf..45871a7c2afa 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
+		<flag name='bip17'>Enable validation of new P2SH transactions</flag>
 		<flag name='eligius'>Enable using lower fees accepted by Eligius</flag>
 		<flag name='upnp'>Enable Universal Plug and Play</flag>
 	</use>