5 files changed, 7 insertions, 53 deletions
diff --git a/net-p2p/namecoin/files/patch-src__main.h b/net-p2p/namecoin/files/patch-src__main.h
index 4fb54e4fcd1a..9abd575cb34a 100644
--- a/net-p2p/namecoin/files/patch-src__main.h
+++ b/net-p2p/namecoin/files/patch-src__main.h
@@ -1,6 +1,6 @@
---- ./src/main.h.orig	2013-10-29 13:38:10.000000000 +0000
-+++ ./src/main.h	2014-01-18 23:12:20.871138275 +0000
-@@ -16,7 +16,6 @@
+--- src/main.h.orig	2014-12-18 14:47:02 UTC
++++ src/main.h
+@@ -17,7 +17,6 @@
  #ifdef __WXMSW__
  #include <io.h> /* for _commit */
  #elif !defined(MAC_OSX)
diff --git a/net-p2p/namecoin/files/patch-src__net.cpp b/net-p2p/namecoin/files/patch-src__net.cpp
deleted file mode 100644
index 992948cf9d63..000000000000
--- a/net-p2p/namecoin/files/patch-src__net.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./src/net.cpp.orig	2013-10-29 13:38:10.000000000 +0000
-+++ ./src/net.cpp	2014-01-18 23:12:20.911138205 +0000
-@@ -51,7 +51,7 @@
- CAddress addrLocalHost("0.0.0.0", 0, false, nLocalServices);
- CNode* pnodeLocalHost = NULL;
- uint64 nLocalHostNonce = 0;
--array<int, 10> vnThreadsRunning;
-+boost::array<int, 10> vnThreadsRunning;
- SOCKET hListenSocket = INVALID_SOCKET;
- 
- vector<CNode*> vNodes;
-@@ -1094,13 +1094,8 @@
-         char intClient[16];
-         char intPort[6];
- 
--#if !defined(__WXMSW__) && !defined(MAC_OSX)
--        r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
--	                        port, port, lanaddr, 0, "TCP", 0);
--#else
-         r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
- 	                        port, port, lanaddr, 0, "TCP", 0, "0");
--#endif
-         if(r!=UPNPCOMMAND_SUCCESS)
-             printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
-                 port, port, lanaddr, r, strupnperror(r));
diff --git a/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h b/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h
index 104460b7b841..5bb77e1af82a 100644
--- a/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h
+++ b/net-p2p/namecoin/files/patch-src__qt__configurenamedialog.h
@@ -1,5 +1,5 @@
---- ./src/qt/configurenamedialog.h.orig	2013-10-29 13:38:10.000000000 +0000
-+++ ./src/qt/configurenamedialog.h	2014-01-18 23:12:20.925138619 +0000
+--- src/qt/configurenamedialog.h.orig	2014-12-18 14:47:02 UTC
++++ src/qt/configurenamedialog.h
 @@ -1,6 +1,9 @@
  #ifndef CONFIGURENAMEDIALOG_H
  #define CONFIGURENAMEDIALOG_H
diff --git a/net-p2p/namecoin/files/patch-src__qt__managenamespage.h b/net-p2p/namecoin/files/patch-src__qt__managenamespage.h
index 6651dcbbf137..d37fd4e44275 100644
--- a/net-p2p/namecoin/files/patch-src__qt__managenamespage.h
+++ b/net-p2p/namecoin/files/patch-src__qt__managenamespage.h
@@ -1,5 +1,5 @@
---- ./src/qt/managenamespage.h.orig	2013-10-29 13:38:10.000000000 +0000
-+++ ./src/qt/managenamespage.h	2014-01-18 23:12:20.965138391 +0000
+--- src/qt/managenamespage.h.orig	2014-12-18 14:47:02 UTC
++++ src/qt/managenamespage.h
 @@ -1,6 +1,9 @@
  #ifndef MANAGENAMESPAGE_H
  #define MANAGENAMESPAGE_H
diff --git a/net-p2p/namecoin/files/patch-src__serialize.h b/net-p2p/namecoin/files/patch-src__serialize.h
deleted file mode 100644
index 30eb12fa5131..000000000000
--- a/net-p2p/namecoin/files/patch-src__serialize.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/serialize.h.orig	2014-01-19 03:49:23.000000000 +0000
-+++ src/serialize.h	2014-01-19 03:52:10.000000000 +0000
-@@ -858,18 +858,6 @@
-     iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); }
-     void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); }
- 
--    void insert(iterator it, const_iterator first, const_iterator last)
--    {
--        if (it == vch.begin() + nReadPos && last - first <= nReadPos)
--        {
--            // special case for inserting at the front when there's room
--            nReadPos -= (last - first);
--            memcpy(&vch[nReadPos], &first[0], last - first);
--        }
--        else
--            vch.insert(it, first, last);
--    }
--
-     void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
-     {
-         if (it == vch.begin() + nReadPos && last - first <= nReadPos)