Remove unused patch file

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

3 files changed, 9 insertions, 137 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index c4433fd97c1c..ad44ae548005 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bitcoind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.22 2012/04/04 13:31:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.23 2012/04/04 13:36:02 blueness Exp $
+
+  04 Apr 2012; Anthony G. Basile <blueness@gentoo.org>
+  -files/9999-eligius_sendfee.patch:
+  Removed unused patch file
 
 *bitcoind-0.6.0 (04 Apr 2012)
 *bitcoind-0.5.4_rc2 (04 Apr 2012)
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 20db04c5d3d0..b1cfa3541b00 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -4,7 +4,6 @@ Hash: SHA256
 AUX 0.4.2-Makefile.gentoo 1845 RMD160 d08abd86b0c17d7b4ba20552fe04146c025fa0d4 SHA1 13017e850bd8e94864bc665a33bc7b959f92f3d5 SHA256 7ab3bf195862802f527c2016b126f7fba7d63a8b3e2048634011cdfa761cb750
 AUX 0.4.4+bip16-eligius_sendfee.patch 7210 RMD160 0279ef9dc89044efb17aaf0693b66ce04b0c007b SHA1 68fa40b2f8b0dba3c39e870a7508008d528e04b0 SHA256 5b7db8d1f55e2b9db5b6fca65b252f0eefefd3f248b57a0f8c927a0262f2e6eb
 AUX 0.5.0.5+bip16-eligius_sendfee.patch 6739 RMD160 45dc281379c25b7406b2cb612e8e653e3898ced0 SHA1 01e56629ee138ad61ae4c51a2dc9fb7eb689a624 SHA256 2e16bca9106bcb8056efc5a60791226119ca011cd007e4b547de4c23f0d8e9a4
-AUX 9999-eligius_sendfee.patch 5265 RMD160 461246ad8265e15596f4e4c3b15061802d4b9e47 SHA1 8a36a3f370f9fd4729b64ca19f2774393d704719 SHA256 310e3ab44b98c69437f4f4c0624e8f7137071298013f944ff51c94bcd5b885d8
 AUX bitcoin.conf 80 RMD160 d55c1ac48956c33cf4bf231f21ea81a7b1adc244 SHA1 12406dc38cd00a8160cb4246b7a167f4319c6715 SHA256 541ae10cc2246b620de3e7efa97eee59efacf83d28ea5f1297a121d0708226d2
 AUX bitcoin.confd 238 RMD160 1f84716f3ac81da9b06b925913550acfe542f4b5 SHA1 138fefcfa996f62bd9113633bd8505df002f545c SHA256 72300b41d57325de5a5f2ddea449d5f414f278549fb665d60746707ee5de2549
 AUX bitcoin.initd 2481 RMD160 ea5398f2775eea17ab9a337650eef30e7912244d SHA1 356a3a0509c465bcc0ce67cfcc22aca745346e4e SHA256 5dace582c4bf05d893166794ce620ca13b794b695376030f7d319bb22a0c956a
@@ -37,12 +36,12 @@ EBUILD bitcoind-0.5.3-r2.ebuild 3256 RMD160 2e76f9ec81f6412eba4c43e87f0b8ad4ef35
 EBUILD bitcoind-0.5.3.ebuild 2536 RMD160 16caed51a3bd162521955d9ffb936d310cefd5c6 SHA1 944f3921e5ae990de86cd4868de1cda0f5b5d6a9 SHA256 056f58b20e4c0e783bfce9a3aacad5872d60596321dcf3680d4ef6fb1a863bbc
 EBUILD bitcoind-0.5.4_rc2.ebuild 3046 RMD160 40f7c7438ff2a94f2ddded587e86f1100aabd76b SHA1 4d7bf05bb1a64b0604c9b313b1fcd648950f1de5 SHA256 787bd8426e9adc99665a0e6b6c4af89a10d6726887cf48e38b2649f11be49fc9
 EBUILD bitcoind-0.6.0.ebuild 2660 RMD160 2343afc83c9fc1c79762c54efada3b64e2b754fc SHA1 7d2710d14d65d5389a87221953185ef6cd0cb159 SHA256 8fa622347d8fb196ded2273ec7fba3caafb0b23f681c240b5b011b33f26659ed
-MISC ChangeLog 6102 RMD160 f22513258f3d3227f7bbbdf2496a66ea09ca3857 SHA1 01c91828b67faa22be090ce2c169a49fe003cec7 SHA256 6059aa66bedc8ebe801810d6f2c3627643c91ef05248798ec8853a7cd62aa637
+MISC ChangeLog 6223 RMD160 16d2dc1ac83346817f0f1e48277ba8e6a9219986 SHA1 8aa53a096503febf268120f60f88348f94d4e8e7 SHA256 175e73e0f215b0dd2bca4a8464d006555ea2036dee6af7eb1a2da5a887a58ee6
 MISC metadata.xml 609 RMD160 7e6a6d1f7e45721287817c007755a4f2a7335348 SHA1 f751a2b66b85e94a13ac0f27d7ffdd3648828a34 SHA256 232cf8629184b54358a8a4a1f9e5c6d973da0644fd512edcafed4f74443f86dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk98TSsACgkQl5yvQNBFVTV8XQCdGayoPHUo6t+QSec+GRPYDH7T
-f0AAoJ10QoV0oimpmj7gK522pBtgCzDg
-=ZVsI
+iEYEAREIAAYFAk98TkwACgkQl5yvQNBFVTXWegCgmdSP4MPDbTbr4qnSI0AwCqb9
+lLUAoIrH+36A+W/irDWfwNHHaK2y49Pz
+=IirW
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoind/files/9999-eligius_sendfee.patch b/net-p2p/bitcoind/files/9999-eligius_sendfee.patch
deleted file mode 100644
index e1af82397f22..000000000000
--- a/net-p2p/bitcoind/files/9999-eligius_sendfee.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index d795ca1..d7f5da8 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -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");
- 
-+    bool fIsMine = pwalletMain->IsMine(*this);
-+
-     // Rather not work on nonstandard transactions (unless -testnet)
--    if (!fTestNet && !IsStandard())
-+    if (!fTestNet && !IsStandard() && !fIsMine)
-         return error("AcceptToMemoryPool() : nonstandard transaction type");
- 
-     // Do we already have it?
-@@ -528,7 +530,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
-         }
- 
-         // Check for non-standard pay-to-script-hash in inputs
--        if (!AreInputsStandard(mapInputs) && !fTestNet)
-+        if (!AreInputsStandard(mapInputs) && !fIsMine && !fTestNet)
-             return error("AcceptToMemoryPool() : nonstandard transaction input");
- 
-         // Note: if you modify this code to accept non-standard transactions, then
-@@ -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);
- 
-+        if (!fIsMine)
-+        {
-+
-         // 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");
-@@ -567,6 +572,8 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
-             }
-         }
- 
-+        }
-+
-         // 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))
-@@ -3136,6 +3143,9 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
-             // Priority is sum(valuein * age) / txsize
-             dPriority /= ::GetSerializeSize(tx, SER_NETWORK);
- 
-+            if (pwalletMain->IsMine(tx))
-+                dPriority += 100.;
-+
-             if (porphan)
-                 porphan->dPriority = dPriority;
-             else
-@@ -3174,7 +3184,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
- 
-             // Transaction fee required depends on block size
-             bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
--            int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, GMF_BLOCK);
-+            int64 nMinFee = pwalletMain->IsMine(tx) ? 0 : tx.GetMinFee(nBlockSize, fAllowFree, GMF_BLOCK);
- 
-             // 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 6be5a8b..f217648 100644
---- a/src/main.h
-+++ b/src/main.h
-@@ -551,6 +551,42 @@ public:
- 
-         unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK);
-         unsigned int nNewBlockSize = nBlockSize + nBytes;
-+        int64 nMinFeeAlt;
-+
-+        {
-+            // Base fee is 0.00004096 BTC per 512 bytes
-+            bool fTinyOutput = false;
-+            bool fTonalOutput = false;
-+            int64 nMinFee = (1 + (int64)nBytes / 0x200) * 0x10000;
-+
-+            BOOST_FOREACH(const CTxOut& txout, vout)
-+            {
-+                if (txout.nValue < 0x100)
-+                {
-+                    fTinyOutput = true;
-+                    break;
-+                }
-+                if (0 == txout.nValue % 0x10000)
-+                    fTonalOutput = true;
-+            }
-+
-+            // Charge extra for ridiculously tiny outputs
-+            if (fTinyOutput)
-+                nMinFee *= 0x10;
-+            else
-+            // Waive the fee in a tonal-sized "free tranaction area" if at least one output is TBC (and under 512 bytes) ;)
-+            if (fTonalOutput && nNewBlockSize < 0x8000 && nBytes < 0x200)
-+                nMinFee = 0;
-+            else
-+            if (fAllowFree)
-+            {
-+                // Give a discount to the first so many tx
-+                nMinFee /= 0x10;
-+            }
-+
-+            nMinFeeAlt = nMinFee;
-+        }
-+
-         int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee;
- 
-         if (fAllowFree)
-@@ -576,6 +612,8 @@ public:
-                 if (txout.nValue < CENT)
-                     nMinFee = nBaseFee;
- 
-+        nMinFee = std::min(nMinFee, nMinFeeAlt);
-+
-         // Raise the price as the block approaches full
-         if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2)
-         {
-diff --git a/src/net.cpp b/src/net.cpp
-index 37e73c4..5f6b5d9 100644
---- a/src/net.cpp
-+++ b/src/net.cpp
-@@ -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"},