Update BIP17 patch

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

8 files changed, 47 insertions, 31 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index 84a26fa0d7fb..32ecde2cfb5c 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,5 +1,21 @@
 
 
+*bitcoind-0.5.3_rc2-r1 (21 Feb 2012)
+*bitcoind-0.5.2-r2 (21 Feb 2012)
+*bitcoind-0.5.0.4_rc2-r1 (21 Feb 2012)
+*bitcoind-0.5.0.3-r2 (21 Feb 2012)
+*bitcoind-0.4.4_rc2-r1 (21 Feb 2012)
+*bitcoind-0.4.3-r2 (21 Feb 2012)
+
+  21 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  -bitcoind-0.4.3-r1.ebuild, +bitcoind-0.4.3-r2.ebuild,
+  -bitcoind-0.4.4_rc2.ebuild, +bitcoind-0.4.4_rc2-r1.ebuild,
+  -bitcoind-0.5.0.3-r1.ebuild, +bitcoind-0.5.0.3-r2.ebuild,
+  -bitcoind-0.5.0.4_rc2.ebuild, +bitcoind-0.5.0.4_rc2-r1.ebuild,
+  -bitcoind-0.5.2-r1.ebuild, +bitcoind-0.5.2-r2.ebuild,
+  -bitcoind-0.5.3_rc2.ebuild, +bitcoind-0.5.3_rc2-r1.ebuild:
+  Update BIP17 patch
+
 *bitcoind-0.5.3_rc2 (16 Feb 2012)
 *bitcoind-0.5.0.4_rc2 (16 Feb 2012)
 *bitcoind-0.4.4_rc2 (16 Feb 2012)
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 81a59b0443b4..c361f423115c 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -7,9 +7,9 @@ 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 bip17_v0.4.0_r2.patch 12510 RMD160 813bdf80e2ee6dbfb3e269377a47e7b6e97ace7b SHA1 a7fd9d0758aa62a12d31945e3726df0bf8758eee SHA256 2ed63cf6a8af65482edf462e563bf042091f124df7ec53a3f2e01efcf93334fa
+DIST bip17_v0.5.0.3_r2.patch 19310 RMD160 a9ac277d66eae168f177f7194714440cd04e42d2 SHA1 29a859b2b40b51dd5b342a56a6e5e603d862688d SHA256 969ca49e0d4e03906f42fe73374ff77331fdaefe7b3810c52579c9d3737e874a
+DIST bip17_v0.5.2_r2.patch 19310 RMD160 a9ac277d66eae168f177f7194714440cd04e42d2 SHA1 29a859b2b40b51dd5b342a56a6e5e603d862688d SHA256 969ca49e0d4e03906f42fe73374ff77331fdaefe7b3810c52579c9d3737e874a
 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.4.4_rc2.tgz 903162 RMD160 ce4b152fc5c0a152c012f161110b7e86bedefc8a SHA1 51e21d8d266011682e8ce7d13528a2cc0ed9cef1 SHA256 83894e980dc707c1759bcd2ca7b2f56da47c9ca4ff5c7cf9f32da52ca375d556
@@ -19,22 +19,22 @@ DIST bitcoin-v0.5.1.tgz 1007787 RMD160 107944a2f37cc0f873248ef8f2c23a602dfc2dd7
 DIST bitcoin-v0.5.2.tgz 1008217 RMD160 0824656c82b7621bf58b4331d96592771d940aad SHA1 867ac6b745c6fc278b2b40b542e55c20433e3f36 SHA256 ad70d1fc93b9195dab64594644a4b804cc521fcb5145f6abde962f3c2aadc5c3
 DIST bitcoin-v0.5.3_rc2.tgz 1011192 RMD160 a037b23762098840be567a728df5b91295be69e3 SHA1 b025f12dc99fbca7bf78d55b76937457fdfaddd8 SHA256 7a8ab6f426a6a8db2c72188c00e7a7e2da27daec64a9dcbc1237577da8dcc052
 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-r2.ebuild 2521 RMD160 4895cb66869ea3c44c78e57ae8af2caae84583e7 SHA1 86774b357058d6d5374ff14ce79718e211d6c7b6 SHA256 9449ebae433e62472b652e21785b6bec4e2f6f9ee024fc8466b70a767f2e9e00
 EBUILD bitcoind-0.4.3.ebuild 2347 RMD160 dae9d888451fc052bd5a082e4b0b1b7cd6e5413e SHA1 319f3054f302b93dbaf6e33203c067f048227682 SHA256 0b6bdd56d4a8dca3c15f540640d7acccab8dde08d2387cd6bcc8a3f8a190ac2a
-EBUILD bitcoind-0.4.4_rc2.ebuild 2494 RMD160 f27a5e14650129624b81a4b9c9f42bb567625603 SHA1 4eeeae79be8893e4e423a4fb6e73659d0b3959f4 SHA256 c47b10bd1157c1f8fc6b0ecefc78b3473954efeb7b114d31c15e5cf365385aa1
-EBUILD bitcoind-0.5.0.3-r1.ebuild 2582 RMD160 a8869b44a055233d37b323fb7ea762923a37a713 SHA1 03ed5538758b7f8699372c63f979147218f45ae2 SHA256 a8e0650bbd89c62734ddcd97b7c8f6cc7728bcdc013a462d831fba75cd569157
+EBUILD bitcoind-0.4.4_rc2-r1.ebuild 2525 RMD160 3bb5a9effe9eca88d409f16abfa6637acd5a73e4 SHA1 a87d748426ebffacc17353d3bebbbe16438cacc5 SHA256 2ebfdcf34fbd479ed6a1a0e93d664f9fde1a3195f007fb0498d6cf46d298d60c
+EBUILD bitcoind-0.5.0.3-r2.ebuild 2610 RMD160 b6170f32e3f96b109908cfecf56bea11c8747e9c SHA1 72a9baa3d07d744f8cc1901cc70ea6358c8a0bd9 SHA256 651ef67237af5aa8f03d4186b559a4190ce25c4c1d2b640bacbc4111d101f2af
 EBUILD bitcoind-0.5.0.3.ebuild 2436 RMD160 159a9c78a4034211c84417070a35c3f8926e7a70 SHA1 0e7ea01f61c2d0761b70e8aaf21f34e73eff5e11 SHA256 e62078ebbbd9bd22e2d72173c2ee57002ea1024ce2b55ce33eb01dc6c1be7b68
-EBUILD bitcoind-0.5.0.4_rc2.ebuild 2587 RMD160 10ca79b957165e5fa5f827e26c4cf5c516d90ffe SHA1 ef6724768a72097427366f824a6c36c2ad560c5a SHA256 5ed0cd4e403293cda8bf04783b2404654df6703f2bf20ff6f88b355432ee866b
+EBUILD bitcoind-0.5.0.4_rc2-r1.ebuild 2620 RMD160 d3d92c1cb941ff90cd72d58ac73ca2bf7680e36d SHA1 08bab6f537c3b4a58615c8db5f703c2ee0bdfd27 SHA256 c51a9df2f5dec7355a3a319886358e60c527d56328169437df4cd5626d2f4a04
 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-r2.ebuild 2614 RMD160 95338cd2f8feb2ef506aa5ac4d09f2caaea0c465 SHA1 5988046bf5a2e934dd08d99617e4ba1dfc3256b5 SHA256 a5f84fa983cb058d7224d95afb1317ba4c8684a654df69132e3816550e4b9e3c
 EBUILD bitcoind-0.5.2.ebuild 2440 RMD160 4140e280ee3edbe3d69a8a2723f6024df775aa38 SHA1 de757c7e4cceb4482c723258f2360719a04104b8 SHA256 14bb3aa54568f1034639425e04f8f785f088c951b1f0b031240f6262c925a1f9
-EBUILD bitcoind-0.5.3_rc2.ebuild 2587 RMD160 e71c6836a8a2174d5475c5ccde61974c059681b8 SHA1 4b0ff746ba32cfd5ed2530e90a60a5634ed90a73 SHA256 b15e733288d9b5f3411fb3d611b41faa507f2f25e20e8e5548192a3294845be1
-MISC ChangeLog 1584 RMD160 6dc0d79020dace3f5c19cec1b0a670fa640db8a9 SHA1 895d5de99afd0c3efc7815d3675e89234c0e73a3 SHA256 d1d8eb8a41c49ac983510724241364974bf5dfc33b3e7f17295ae543df15f923
+EBUILD bitcoind-0.5.3_rc2-r1.ebuild 2618 RMD160 84973635fc285faf40d313962ffd429728e9433f SHA1 eca49f53c3c317f758da29e8d99df959a907eb67 SHA256 1b4be335e2a41bcd1a9bebe2ecac91ebdc51c5b063760dcfa3b1a3dc2e445384
+MISC ChangeLog 2235 RMD160 76d8cf7f6d4b9e6ad063f34fb986edd2627f26ed SHA1 546d6a40fab88c1eaeee5fa8db1fa387df039ae5 SHA256 97410d4e09491f10440e0d64068dd5fe259e754315654235a56f82f50e80bee4
 MISC metadata.xml 560 RMD160 11321353ae34abd53f26bd02de03f16b7fd0b690 SHA1 eaa342e9cd0d350b4ceb32e45606b07a8322d673 SHA256 d180599030468afe2d41133afc503b1b0c4444cbea0e8a28225a9568d9255bb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk88gM8ACgkQl5yvQNBFVTVNEwCgkSWT7y4LapS2RonEGwf//zSB
-VmIAn3Ff6uQwLSUVxAZXcrkNdypEzRlH
-=vua7
+iEYEAREIAAYFAk9D2lgACgkQl5yvQNBFVTUlvwCfRjtyKtDdP4+TzTGwDWP5fBxc
+DV8An3qZ2FtAzzPdmbOfFcwogjpUWFUu
+=Ks1R
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoind/bitcoind-0.4.3-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.4.3-r2.ebuild
index fa04389a026d..7cfd02156d7f 100644
--- a/net-p2p/bitcoind/bitcoind-0.4.3-r1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.3-r2.ebuild,v 1.1 2012/02/21 17:54:21 blueness Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ 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 )
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v0.4.0.patch -> bip17_v0.4.0_r2.patch )
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
 "
 
@@ -44,7 +44,7 @@ pkg_setup() {
 src_prepare() {
 	cd src || die
 	cp "${FILESDIR}/0.4.2-Makefile.gentoo" "Makefile" || die
-	use bip17 && epatch "${DISTDIR}/bip17_v0.4.0.patch"
+	use bip17 && epatch "${DISTDIR}/bip17_v0.4.0_r2.patch"
 	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
 }
 
diff --git a/net-p2p/bitcoind/bitcoind-0.4.4_rc2.ebuild b/net-p2p/bitcoind/bitcoind-0.4.4_rc2-r1.ebuild
index 2799822dfcc3..60d41aafbdb6 100644
--- a/net-p2p/bitcoind/bitcoind-0.4.4_rc2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.4.4_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4_rc2.ebuild,v 1.1 2012/02/16 04:06:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.4_rc2-r1.ebuild,v 1.1 2012/02/21 17:54:21 blueness Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ 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 )
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v0.4.0.patch -> bip17_v0.4.0_r2.patch )
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
 "
 
@@ -44,7 +44,7 @@ pkg_setup() {
 src_prepare() {
 	cd src || die
 	cp "${FILESDIR}/0.4.2-Makefile.gentoo" "Makefile" || die
-	use bip17 && epatch "${DISTDIR}/bip17_v0.4.0.patch"
+	use bip17 && epatch "${DISTDIR}/bip17_v0.4.0_r2.patch"
 	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
 }
 
diff --git a/net-p2p/bitcoind/bitcoind-0.5.0.3-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.5.0.3-r2.ebuild
index bc67252ca7a0..2d4fba5e4614 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.0.3-r1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.0.3-r2.ebuild,v 1.1 2012/02/21 17:54:21 blueness Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ 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 )
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v${PV}.patch -> bip17_v${PV}_r2.patch )
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
 "
 
@@ -42,7 +42,7 @@ pkg_setup() {
 
 src_prepare() {
 	cd src || die
-	use bip17 && epatch "${DISTDIR}/bip17_v${PV}.patch"
+	use bip17 && epatch "${DISTDIR}/bip17_v${PV}_r2.patch"
 	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
 }
 
diff --git a/net-p2p/bitcoind/bitcoind-0.5.0.4_rc2.ebuild b/net-p2p/bitcoind/bitcoind-0.5.0.4_rc2-r1.ebuild
index ab344e8c10c2..79ceccd8227a 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.0.4_rc2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.0.4_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4_rc2.ebuild,v 1.1 2012/02/16 04:06:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.0.4_rc2-r1.ebuild,v 1.1 2012/02/21 17:54:21 blueness Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ 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.5.0.3.patch )
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v0.5.0.3.patch -> bip17_v0.5.0.3_r2.patch )
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
 "
 
@@ -42,7 +42,7 @@ pkg_setup() {
 
 src_prepare() {
 	cd src || die
-	use bip17 && epatch "${DISTDIR}/bip17_v0.5.0.3.patch"
+	use bip17 && epatch "${DISTDIR}/bip17_v0.5.0.3_r2.patch"
 	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
 }
 
diff --git a/net-p2p/bitcoind/bitcoind-0.5.2-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.5.2-r2.ebuild
index 00a40af8da40..d98236e267a0 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.2-r1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.2-r2.ebuild,v 1.1 2012/02/21 17:54:21 blueness Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ 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 )
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v${PV}.patch -> bip17_v${PV}_r2.patch )
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
 "
 
@@ -42,7 +42,7 @@ pkg_setup() {
 
 src_prepare() {
 	cd src || die
-	use bip17 && epatch "${DISTDIR}/bip17_v${PV}.patch"
+	use bip17 && epatch "${DISTDIR}/bip17_v${PV}_r2.patch"
 	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
 }
 
diff --git a/net-p2p/bitcoind/bitcoind-0.5.3_rc2.ebuild b/net-p2p/bitcoind/bitcoind-0.5.3_rc2-r1.ebuild
index 151ae306e65c..a022218628b0 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.3_rc2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.3_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3_rc2.ebuild,v 1.1 2012/02/16 04:06:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.3_rc2-r1.ebuild,v 1.1 2012/02/21 17:54:21 blueness Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ 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_v0.5.2.patch )
+	bip17? ( http://luke.dashjr.org/programs/bitcoin/files/bip17/bip17_v0.5.2.patch -> bip17_v0.5.2_r2.patch )
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
 "
 
@@ -42,7 +42,7 @@ pkg_setup() {
 
 src_prepare() {
 	cd src || die
-	use bip17 && epatch "${DISTDIR}/bip17_v0.5.2.patch"
+	use bip17 && epatch "${DISTDIR}/bip17_v0.5.2_r2.patch"
 	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
 }