net-p2p/monero: version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.3

9 files changed, 13 insertions, 40 deletions

diff --git a/net-p2p/monero/files/monero-0.17.2.0-Fix-boost-1.76.0-compatibility.patch b/net-p2p/monero/files/monero-0.17.2.0-Fix-boost-1.76.0-compatibility.patch
deleted file mode 100644
index b0fdd457..00000000
--- a/net-p2p/monero/files/monero-0.17.2.0-Fix-boost-1.76.0-compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 44cc6d67620ff09dc0173ad8e6ada89d700ffd3e Mon Sep 17 00:00:00 2001
-From: loqs <loqs@users.noreply.github.com>
-Date: Sun, 23 May 2021 20:29:17 +0100
-Subject: [PATCH] Fix boost 1.76.0 compatibility
-
-Add missing header boost/mpl/contains.hpp
-monero-project/monero/issues/7728
----
- contrib/epee/include/storages/portable_storage.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
-index 655a2eb12cda..60f3e672fb55 100644
---- a/contrib/epee/include/storages/portable_storage.h
-+++ b/contrib/epee/include/storages/portable_storage.h
-@@ -31,6 +31,8 @@
- #include "misc_log_ex.h"
- #include "span.h"
- 
-+#include <boost/mpl/contains.hpp>
-+
- namespace epee
- {
-   class byte_slice;
diff --git a/net-p2p/monero/files/monero-0.17.2.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/monero-0.17.2.3-Do-not-install-trezor-dep-libs.patch
index 9f00b14a..96fede78 100644
--- a/net-p2p/monero/files/monero-0.17.2.0-Do-not-install-trezor-dep-libs.patch
+++ b/net-p2p/monero/files/monero-0.17.2.3-Do-not-install-trezor-dep-libs.patch
@@ -1,4 +1,4 @@
-From dcf248f63e8a932cd48d0c0941faa3b48c551011 Mon Sep 17 00:00:00 2001
+From bfdf47d264e23f31c72529058d4d724033ac1b4f 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
diff --git a/net-p2p/monero/files/monero-0.17.2.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch
index ee2b9b64..f8f7036a 100644
--- a/net-p2p/monero/files/monero-0.17.2.0-Drop-in-tree-miniupnpc.patch
+++ b/net-p2p/monero/files/monero-0.17.2.3-Drop-in-tree-miniupnpc.patch
@@ -1,4 +1,4 @@
-From 05f4db1c0256cc12b7233208d62b8218ea98d14c Mon Sep 17 00:00:00 2001
+From 2998bbb7886f03771884a7d0405827cc1ecec48d 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
@@ -39,10 +39,10 @@ index a8916a7d00d4..1db18e2431e6 100644
  find_package(Unbound)
  
 diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index aa16e93d5939..9f51639edbdd 100644
+index b8cf2d124948..8fdcd08d554d 100644
 --- a/src/p2p/net_node.inl
 +++ b/src/p2p/net_node.inl
-@@ -60,9 +60,9 @@
+@@ -61,9 +61,9 @@
  #include "cryptonote_core/cryptonote_core.h"
  #include "net/parse.h"
  
diff --git a/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch
index a0c30347..02994f0d 100644
--- a/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-dev-libs-randomx.patch
+++ b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-dev-libs-randomx.patch
@@ -1,4 +1,4 @@
-From 33f0cd8a1323f537fe8721e5021423aa716f9b3a Mon Sep 17 00:00:00 2001
+From 19ee58c33daece28e198e058d3cd5a06501ef178 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Wed, 6 Nov 2019 01:23:52 +0000
 Subject: [PATCH] Use gentoo dev-libs/randomx
diff --git a/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch
index 9e8331d7..16cfb731 100644
--- a/net-p2p/monero/files/monero-0.17.2.0-Use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-0.17.2.3-Use-gentoo-versioning.patch
@@ -1,4 +1,4 @@
-From e9da57769285e9a8a73ae3509cb85fcbe5ff1b29 Mon Sep 17 00:00:00 2001
+From 885cd1e274b4d1cdc35dd4d20713fd21d6757885 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
diff --git a/net-p2p/monero/files/monero-0.17.2.0-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.17.2.3-translations-use-host-compiler.patch
index be4364df..847a6310 100644
--- a/net-p2p/monero/files/monero-0.17.2.0-translations-use-host-compiler.patch
+++ b/net-p2p/monero/files/monero-0.17.2.3-translations-use-host-compiler.patch
@@ -1,4 +1,4 @@
-From 52f77ae211afe9e02717d1c47369d83cebe4ace3 Mon Sep 17 00:00:00 2001
+From 6e2719e0d44e052715642ec895e76d64b77809ce Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 30 Nov 2019 02:09:14 +0000
 Subject: [PATCH] translations: use host compiler
@@ -12,10 +12,10 @@ compiler flags
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0c8d8dffb826..2889fd7f922f 100644
+index 362ca8d5659c..3b4d31f87e46 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -467,7 +467,9 @@ ExternalProject_Add(generate_translations_header
+@@ -534,7 +534,9 @@ ExternalProject_Add(generate_translations_header
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/translations"
    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/translations"
    STAMP_DIR ${LRELEASE_PATH}
diff --git a/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-remove-Werror.patch b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-remove-Werror.patch
index dda8dbed..aa77b755 100644
--- a/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-remove-Werror.patch
+++ b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-remove-Werror.patch
@@ -1,4 +1,4 @@
-From 162a8cadf4270306f216becf0ade15ad9acc7916 Mon Sep 17 00:00:00 2001
+From 398631d77701cd134a83094d66364bfc34c0456b Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 17 Oct 2020 18:27:24 +0100
 Subject: [PATCH] cmake: remove Werror
@@ -9,10 +9,10 @@ See: https://bugs.gentoo.org/show_bug.cgi?id=652650
  1 file changed, 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ef6cbf1861f..8e45fdd66c99 100644
+index 16a9551d2f38..7e4e82fe7c73 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -453,8 +453,6 @@ if(APPLE)
+@@ -438,8 +438,6 @@ if(APPLE)
  endif()
  
  # warnings
diff --git a/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-use-gentoo-versioning.patch
index 201f461f..31aa7be3 100644
--- a/net-p2p/monero/files/monero-gui-0.17.2.0-cmake-use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-gui-0.17.2.3-cmake-use-gentoo-versioning.patch
@@ -1,4 +1,4 @@
-From c9ac85124e908625a2262b3cd4103687558a6fd9 Mon Sep 17 00:00:00 2001
+From 7296808739a756fa3a95d2ccc85e46bd8f0eb457 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 18 Oct 2020 15:43:33 +0100
 Subject: [PATCH] cmake: use gentoo versioning
diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.3.ebuild
index 45989b25..704cb3dc 100644
--- a/net-p2p/monero/monero-0.17.2.0.ebuild
+++ b/net-p2p/monero/monero-0.17.2.3.ebuild
@@ -49,7 +49,6 @@ RDEPEND="net-dns/unbound:=[threads]
 		dev-qt/qtquickcontrols:5
 		dev-qt/qtquickcontrols2:5
 		dev-qt/qtgraphicaleffects:5
-		dev-libs/hidapi:=
 		dev-libs/libgcrypt:=
 		media-fonts/fontawesome[ttf]
 	)
@@ -71,7 +70,6 @@ PATCHES_MONERO=(
 	"${FILESDIR}/monero-${PV}-Do-not-install-trezor-dep-libs.patch"
 	"${FILESDIR}/monero-${PV}-Use-gentoo-dev-libs-randomx.patch"
 	"${FILESDIR}/monero-${PV}-translations-use-host-compiler.patch"
-	"${FILESDIR}/monero-${PV}-Fix-boost-1.76.0-compatibility.patch"
 )
 
 PATCHES_MONERO_GUI=(
@@ -148,7 +146,6 @@ src_configure() {
 	local cmakeargs_monerogui=(
 		"${cmakeargs_monero[@]}"
 		-DUSE_DEVICE_TREZOR="$(usex smartcard ON OFF)"
-		-DENABLE_PASS_STRENGTH_METER=ON
 		-DWITH_SCANNER=ON
 		-DDEV_MODE=OFF
 	)