net-p2p/monero: Version bump

Package-Manager: Portage-2.3.66, Repoman-2.3.11

4 files changed, 8 insertions, 65 deletions

diff --git a/net-p2p/monero/files/0.14.0.2-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.14.0.2-Drop-in-tree-miniupnpc.patch
deleted file mode 100644
index c300bf9b..00000000
--- a/net-p2p/monero/files/0.14.0.2-Drop-in-tree-miniupnpc.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bcc66dab7ac3d7745b28dc406c39846def96d2fd Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Sun, 17 Jun 2018 22:34:11 +0100
-Subject: [PATCH] Drop in-tree miniupnpc
-
-Since 6b8539803184 ("Build: update CMake and p2p for in-tree
-miniupnp"), a hard dependency is made on miniupnpc which is a git
-submodule not part of the archive available upstream.
----
- external/CMakeLists.txt | 16 +++-------------
- src/p2p/net_node.inl    |  6 +++---
- 2 files changed, 6 insertions(+), 16 deletions(-)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 7553f87ea968..59996bf0c2f7 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,19 +37,9 @@
- 
- find_package(Miniupnpc REQUIRED)
- 
--message(STATUS "Using in-tree miniupnpc")
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--if(MSVC)
--  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
--elseif(NOT MSVC)
--  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
--endif()
--if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
--	set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
--endif()
--
--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+set(UPNP_STATIC false PARENT_SCOPE)
-+set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
-+set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
- 
- find_package(Unbound)
- 
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 9390626a8f7d..a5e5b99b51ef 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -49,9 +49,9 @@
- #include "storages/levin_abstract_invoke2.h"
- #include "cryptonote_core/cryptonote_core.h"
- 
--#include <miniupnp/miniupnpc/miniupnpc.h>
--#include <miniupnp/miniupnpc/upnpcommands.h>
--#include <miniupnp/miniupnpc/upnperrors.h>
-+#include <miniupnpc/miniupnpc.h>
-+#include <miniupnpc/upnpcommands.h>
-+#include <miniupnpc/upnperrors.h>
- 
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/net-p2p/monero/files/0.14.1.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.14.1.2-Do-not-install-trezor-dep-libs.patch
index 9525a2f6..7ef73765 100644
--- a/net-p2p/monero/files/0.14.1.0-Do-not-install-trezor-dep-libs.patch
+++ b/net-p2p/monero/files/0.14.1.2-Do-not-install-trezor-dep-libs.patch
@@ -1,7 +1,7 @@
-From 29277ef1a899be4f71d97d3df0909b561299edb7 Mon Sep 17 00:00:00 2001
+From 8247c0f8151d678ca51a7b940667665809cb60aa Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 15 Jun 2019 00:57:09 +0100
-Subject: [PATCH] Do not install trezor dep libs
+Subject: [PATCH 3/3] Do not install trezor dep libs
 
 ---
  src/wallet/CMakeLists.txt | 4 ----
diff --git a/net-p2p/monero/files/0.14.1.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.14.1.2-Drop-in-tree-miniupnpc.patch
index 23fafa98..9d34d836 100644
--- a/net-p2p/monero/files/0.14.1.0-Drop-in-tree-miniupnpc.patch
+++ b/net-p2p/monero/files/0.14.1.2-Drop-in-tree-miniupnpc.patch
@@ -1,7 +1,7 @@
-From defc40037d89c32c9763e660af1b5a9260f43867 Mon Sep 17 00:00:00 2001
+From a4ba00bb22e8de0f1c436be17392014b8d21117c Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 17 Jun 2018 22:34:11 +0100
-Subject: [PATCH] Drop in-tree miniupnpc
+Subject: [PATCH 1/3] Drop in-tree miniupnpc
 
 Since 6b8539803184 ("Build: update CMake and p2p for in-tree
 miniupnp"), a hard dependency is made on miniupnpc which is a git
@@ -39,7 +39,7 @@ index bc4344b34833..10189ce3a2fb 100644
  find_package(Unbound)
  
 diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index ba29d92c9144..e9f62ad1717b 100644
+index cec832231d3f..6b156792286d 100644
 --- a/src/p2p/net_node.inl
 +++ b/src/p2p/net_node.inl
 @@ -60,9 +60,9 @@
diff --git a/net-p2p/monero/files/0.14.1.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.14.1.2-Use-gentoo-versioning.patch
index b1f11ec7..763d17be 100644
--- a/net-p2p/monero/files/0.14.1.0-Use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/0.14.1.2-Use-gentoo-versioning.patch
@@ -1,14 +1,14 @@
-From 777b5fb5c1128b54a008b47bd637cb93fe1253b4 Mon Sep 17 00:00:00 2001
+From 9b782e9ba4c576367f50a336f15e81b1b79cb392 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 15 Jun 2019 00:15:54 +0100
-Subject: [PATCH] Use gentoo versioning
+Subject: [PATCH 2/3] Use gentoo versioning
 
 ---
  cmake/Version.cmake | 19 ++-----------------
  1 file changed, 2 insertions(+), 17 deletions(-)
 
 diff --git a/cmake/Version.cmake b/cmake/Version.cmake
-index 632c1431c953..5aaa404b9f6f 100644
+index 632c1431c953..957202469db7 100644
 --- a/cmake/Version.cmake
 +++ b/cmake/Version.cmake
 @@ -31,22 +31,7 @@ function (write_static_version_header hash)