Bump 0.6.0 to rc5

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

4 files changed, 38 insertions, 31 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index e0dada99bb00..4f60f2a45667 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.19 2012/03/25 10:33:33 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.20 2012/03/26 22:54:24 blueness Exp $
+
+*bitcoin-qt-0.6.0_rc5 (26 Mar 2012)
+
+  26 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  files/9999-eligius_sendfee.patch, -bitcoin-qt-0.6.0_rc4.ebuild,
+  +bitcoin-qt-0.6.0_rc5.ebuild:
+  Bump 0.6.0 to rc5
 
   25 Mar 2012; Thomas Kahle <tomka@gentoo.org> bitcoin-qt-0.5.3.ebuild:
   marked x86 per bug 407793
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index f62942b6efdc..71815e96fb23 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX 0.5.0.5+bip16-eligius_sendfee.patch 6739 RMD160 45dc281379c25b7406b2cb612e8e653e3898ced0 SHA1 01e56629ee138ad61ae4c51a2dc9fb7eb689a624 SHA256 2e16bca9106bcb8056efc5a60791226119ca011cd007e4b547de4c23f0d8e9a4
-AUX 9999-eligius_sendfee.patch 5073 RMD160 7af7540a05243c7e267734c5f5b20bebaba4b1ec SHA1 dfd777fc408e2d670533188900885702be6e9baa SHA256 fbaa91d15db631ae9af2cadbf4b0937ac786b1b061692e05fbb47db1abf6f305
+AUX 9999-eligius_sendfee.patch 5265 RMD160 461246ad8265e15596f4e4c3b15061802d4b9e47 SHA1 8a36a3f370f9fd4729b64ca19f2774393d704719 SHA256 310e3ab44b98c69437f4f4c0624e8f7137071298013f944ff51c94bcd5b885d8
 DIST 0.5-eligius_sendfee.patch 6767 RMD160 f084f46860af55f2b23ac1ef0dc4104da8d1c377 SHA1 34fa1567812853e84b53e2fe4940d3374dd42bc9 SHA256 d3503c33528ff6afcd6e5bbb314b8c00c414ed7f1350c2af1594d0e4b6e75e2c
 DIST 0.5.0.5-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz 4884 RMD160 1e1d446c531544b1cebc6434686b9c97a43dfed5 SHA1 aaa0a3eb639e4c71f145bb158b604444cc92974e SHA256 1fc8804f27c3e5337ca05d2197f1bdbdb4d442dd80d549714926627f11465b70
 DIST 0.5.0.5-Minimal-support-for-validating-BIP16-pay-to-script-h.patch.xz 6940 RMD160 e2dcdbf36f1214ff0a6ed97f60e02b959fbd664c SHA1 cf1109e54e54be3792989f22fdaa36639a1a2796 SHA256 f0300fae1792ba70738e20cd44211da43a8cf9b2aa5efa8bd3c0dbe58cf6fefc
@@ -14,7 +14,7 @@ DIST bitcoin-v0.5.0.6_rc1.tgz 906640 RMD160 b844dcca105ed8eb6f415d9abd3f7a4c6b73
 DIST bitcoin-v0.5.1.tgz 1007787 RMD160 107944a2f37cc0f873248ef8f2c23a602dfc2dd7 SHA1 27189303b71c6e9c5140c39659ea1f5280e8b4f0 SHA256 e33279066298e0a29e1dcca566d0a0bbcd89ef6e02d43bdbbeaf046f5faf66fe
 DIST bitcoin-v0.5.3.tgz 1012843 RMD160 92875b0073ada3771c79960c1a7aac3df511a49d SHA1 ac181eb976780f8af2ea5a3df2d9709accaa283f SHA256 0f39305d3da134a04c2509569f0c65dbe889aff9c91aef2deb3cfaa386094c0c
 DIST bitcoin-v0.5.4_rc1.tgz 1016066 RMD160 41cc6fd309ea817c5d0670c26f9888c9b778dfd6 SHA1 1ff1553d1447f78136e048f4ba063f0f193aecdf SHA256 54d4af2fa3f0f002c296a7a8157eaeefa796230ec97e027c636247581fcfb9c8
-DIST bitcoin-v0.6.0_rc4.tgz 1237013 RMD160 503e7e26b53f92fb9b7a9373e4505bbdf3aeaa4b SHA1 0503afe1cc81d41dda9f7988d42d7f01127dbd9a SHA256 a0a013fa97743b8d0dc9234e726d02f6bd06a0e9a2ece42bdee23de281a11cdc
+DIST bitcoin-v0.6.0_rc5.tgz 1239558 RMD160 f1c3635785bdf727d642d8bbaf14375991ab3aea SHA1 c6c5c48c16adf6688e556862096979f96944c0df SHA256 4153625fd2d593c5da5b33df128c1ee9f3041863d1175900940446a80acb98dc
 EBUILD bitcoin-qt-0.5.0.4-r1.ebuild 3273 RMD160 e899b4e89661cfc405666129e3b7b4092a7bc40b SHA1 0ddfaeddaa286a8a423bc3f0c9077d97ffebec25 SHA256 aa31cafd1063ad085ef25b8c900f41cc5971f84691f7315e355971b27cf6a0bf
 EBUILD bitcoin-qt-0.5.0.5-r1.ebuild 3263 RMD160 29f563fe1a55ce416b85979a1acf68db46bb59a5 SHA1 879614b73b5102bc080fa98c269bdfaa1188d99e SHA256 0e943a70a6154e579526f25dab8af443e4215ebc4f7d17d5b097af7927d82d0f
 EBUILD bitcoin-qt-0.5.0.6_rc1.ebuild 3063 RMD160 9682b27a962b3b501ea7aba98da98df488612d3b SHA1 eafe71f485c5a2d5a0641674afb66aaae9a1d855 SHA256 5f67188b2cd906bff43733e24c3168bd570ccd8a832f158b47f00fa67dd4651c
@@ -22,13 +22,13 @@ EBUILD bitcoin-qt-0.5.1.ebuild 2541 RMD160 325e98ded3e924b5eebda3b326b6dd42655be
 EBUILD bitcoin-qt-0.5.3-r2.ebuild 3271 RMD160 3b02fe84d7c5ab8b7d9e653b72b50dc9b2c1cec1 SHA1 9ad57d54f632866339dd6fc4fb50999e71e34038 SHA256 c3aaea9962644e5b13800224ebebe39e6155a7b31ad6834356d63924a7297d88
 EBUILD bitcoin-qt-0.5.3.ebuild 2563 RMD160 00f4829f118455c96ab2e3e0fba8163d416da239 SHA1 645557413a5350a2fa900a4b4760fede837b77b4 SHA256 8c72cc602b5986eca7f0ad38ff3f8cb90991b4eb4fe34a2945adfacf2be53415
 EBUILD bitcoin-qt-0.5.4_rc1.ebuild 3061 RMD160 d0e474205332b1469fc5d374994e4a5bb51e7a67 SHA1 17d4837f086c3718d6d21d88db0e21af0ac31327 SHA256 67a3148d11b1a56297d5953dfcb57f320e7461465818d7d998dace854bdeaf8d
-EBUILD bitcoin-qt-0.6.0_rc4.ebuild 2802 RMD160 84950d0673c983af2633a26b9a4a0b449e486304 SHA1 f6c280cf8ac105ebbebe7fb21dbc7f2fb795c13a SHA256 4c79f25296409f3325fe9c95d0d7157086fa65c39c442913be5a03d5f1a7d0c6
-MISC ChangeLog 4593 RMD160 cfa414e16c9a431507d4653fe900e37f35de00af SHA1 a58f809e7e7f0a1e9a49acbbfd603494eb64f03f SHA256 d05d47d93d95eb48bfd7f2149787d5b39accbaaa6ef0f3f4f24223491e1746fe
+EBUILD bitcoin-qt-0.6.0_rc5.ebuild 2796 RMD160 43ec10fd1cb979b868b04e301908e9082815f27d SHA1 77665f65caacd343d24a6fb44ab0c5ad1d4375d5 SHA256 92bad9cdd1449af22cee057f0a85fd404add7bd6b2a175ecda66bd73d57f10bb
+MISC ChangeLog 4807 RMD160 f3b2ac2fc47d1b24f81ea9cb176ec3be745bfe6e SHA1 c11703a6f825da2ee74e971c047415e5ad88f2ad SHA256 dde3c220e966b2506c61d65b9412aa10c98e64a8d2f3f19d9377df24b7965219
 MISC metadata.xml 766 RMD160 a05a49497ac64d24de1207742de57d71393f2068 SHA1 a46a9688742ac67390bdaa3bed1dcd72c6d85c91 SHA256 2605d6f5e9f771f1c4eaa8ec347e826f0f6bc1341818277e5f8cd0864779a02d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9u9IMACgkQodBTJSDyo67XXwD/fFpWfe/ti56+vNxiuM0vh42B
-6XPVhrtbRaw38Rqe9C4A/2cBqTA1Z0zcdJOjcGY9gZzxvtT3ChpJX6AZT22UsInD
-=h/Fr
+iEYEAREIAAYFAk9w86oACgkQl5yvQNBFVTXeugCglY7RaMXj4Ma/Vc5/ApSIW/77
+tjwAoILnEZbJoNMA4l8OYls1D28TxAkH
+=XSRJ
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc4.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc5.ebuild
index 84de6eb838e5..1bbcdfa1e0d9 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc4.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc5.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2012 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.6.0_rc4.ebuild,v 1.2 2012/03/18 20:05:58 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc5.ebuild,v 1.1 2012/03/26 22:54:24 blueness Exp $
 
 EAPI="4"
 
 DB_VER="4.8"
 
-LANGS="ca_ES cs cs_CZ da de en es es_CL et eu_ES fa fa_IR fi fr_CA fr_FR hr hu it lt nb nl pl pt_BR ro_RO ru sk sr sv tr uk zh_CN zh_TW"
+LANGS="ca_ES cs da de en es es_CL et eu_ES fa fa_IR fi fr_CA fr_FR hr hu it lt nb nl pl pt_BR ro_RO ru sk sr sv tr uk zh_CN zh_TW"
 inherit db-use eutils qt4-r2 versionator
 
 DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
 HOMEPAGE="http://bitcoin.org/"
-SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v0.6.0rc4 -> bitcoin-v${PV}.tgz
+SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
 "
 
 LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 
 DOCS="doc/README"
 
-S="${WORKDIR}/bitcoin-bitcoin-e52182e"
+S="${WORKDIR}/bitcoin-bitcoin-5b22438"
 
 src_prepare() {
 	cd src || die
diff --git a/net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch b/net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch
index 7101aed919de..e1af82397f22 100644
--- a/net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch
+++ b/net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch
@@ -1,8 +1,8 @@
 diff --git a/src/main.cpp b/src/main.cpp
-index f78133b..0574f4c 100644
+index d795ca1..d7f5da8 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -464,8 +464,10 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
+@@ -472,8 +472,10 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
      if ((int64)nLockTime > std::numeric_limits<int>::max())
          return error("AcceptToMemoryPool() : not accepting nLockTime beyond 2038 yet");
  
@@ -14,7 +14,7 @@ index f78133b..0574f4c 100644
          return error("AcceptToMemoryPool() : nonstandard transaction type");
  
      // Do we already have it?
-@@ -520,7 +522,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
+@@ -528,7 +530,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
          }
  
          // Check for non-standard pay-to-script-hash in inputs
@@ -23,7 +23,7 @@ index f78133b..0574f4c 100644
              return error("AcceptToMemoryPool() : nonstandard transaction input");
  
          // Note: if you modify this code to accept non-standard transactions, then
-@@ -530,6 +532,9 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
+@@ -538,6 +540,9 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
          int64 nFees = GetValueIn(mapInputs)-GetValueOut();
          unsigned int nSize = ::GetSerializeSize(*this, SER_NETWORK);
  
@@ -33,7 +33,7 @@ index f78133b..0574f4c 100644
          // Don't accept it if it can't get into a block
          if (nFees < GetMinFee(1000, true, GMF_RELAY))
              return error("AcceptToMemoryPool() : not enough fees");
-@@ -559,6 +564,8 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
+@@ -567,6 +572,8 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
              }
          }
  
@@ -42,7 +42,7 @@ index f78133b..0574f4c 100644
          // Check against previous transactions
          // This is done last to help prevent CPU exhaustion denial-of-service attacks.
          if (!ConnectInputs(mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false))
-@@ -3070,6 +3077,9 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
+@@ -3136,6 +3143,9 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
              // Priority is sum(valuein * age) / txsize
              dPriority /= ::GetSerializeSize(tx, SER_NETWORK);
  
@@ -52,7 +52,7 @@ index f78133b..0574f4c 100644
              if (porphan)
                  porphan->dPriority = dPriority;
              else
-@@ -3108,7 +3118,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
+@@ -3174,7 +3184,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
  
              // Transaction fee required depends on block size
              bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
@@ -62,10 +62,10 @@ index f78133b..0574f4c 100644
              // Connecting shouldn't fail due to dependency on other memory pool transactions
              // because we're already processing them in order of dependency
 diff --git a/src/main.h b/src/main.h
-index 908ada7..1179f19 100644
+index 6be5a8b..f217648 100644
 --- a/src/main.h
 +++ b/src/main.h
-@@ -573,6 +573,42 @@ public:
+@@ -551,6 +551,42 @@ public:
  
          unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK);
          unsigned int nNewBlockSize = nBlockSize + nBytes;
@@ -108,7 +108,7 @@ index 908ada7..1179f19 100644
          int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee;
  
          if (fAllowFree)
-@@ -598,6 +634,8 @@ public:
+@@ -576,6 +612,8 @@ public:
                  if (txout.nValue < CENT)
                      nMinFee = nBaseFee;
  
@@ -118,14 +118,14 @@ index 908ada7..1179f19 100644
          if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2)
          {
 diff --git a/src/net.cpp b/src/net.cpp
-index f0ea550..5d81c48 100644
+index 37e73c4..5f6b5d9 100644
 --- a/src/net.cpp
 +++ b/src/net.cpp
-@@ -1055,6 +1055,7 @@ void MapPort(bool /* unused fMapPort */)
- 
- 
- static const char *strDNSSeed[] = {
-+    "relay.eligius.st",
-     "bitseed.xf2.org",
-     "dnsseed.bluematt.me",
-     "seed.bitcoin.sipa.be",
+@@ -1052,6 +1052,7 @@ void MapPort(bool /* unused fMapPort */)
+ // The first name is used as information source for addrman.
+ // The second name should resolve to a list of seed addresses.
+ static const char *strDNSSeed[][2] = {
++    {"eligius.st", "relay.eligius.st"},
+     {"xf2.org", "bitseed.xf2.org"},
+     {"bluematt.me", "dnsseed.bluematt.me"},
+     {"bitcoin.sipa.be", "seed.bitcoin.sipa.be"},