net-p2p/monero: cleaning and general improvements

- add version restriction to 9999 and remaining 0.17 package
- unify latest package and git version
- rename patch for 0.17.1.2 to 0.17.3.2
- rename patch for 0.18.1.0 to 0.18.3.3
- drop old versions
- drop unused patches

Signed-off-by: Filip Kobierski <fkobi@pm.me>

18 files changed, 22 insertions, 1076 deletions

diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index 394d1ed3b..a4b7a5322 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1,10 +1,3 @@
-DIST monero-0.17.2.0.tar.gz 10622184 BLAKE2B c439e447f524a08a7ee79420873b7cf393f5cd3269460944aac30a315ac7c273c12fd809d86d41445bfc7e8c2feb0538d4e9fc1dadeb55f7e09f2920778f07a7 SHA512 85b764f1fc25127e7ca4ada67b1d832a9604c4cf65b160d689650e7ca7bbc36b73d8b26c5409fabdaad7369684997447cd812d1c521fad19d24f5b35f4789a1e
-DIST monero-0.17.2.3.tar.gz 10640501 BLAKE2B 15c7b92e7d00788214953c09af96d578e79c65ba9263d2a9ea19cfb9cc65e77d15770b873a10b77aae9e908dce74162d3577ed241600ebd57098b860bfd8f114 SHA512 7f3363c2cb66fa90a47a4cbb03b367182afa63af21d40bf07ea57cd91e4805684ec4795c0390bc966626a3b7b3c0a47167036873f5d1ea4b487a3d02bf01aaa4
-DIST monero-0.17.3.0.tar.gz 10659302 BLAKE2B fe73172e490f119a3d3730e3c11afd386e54fa22e12ac69d6f5e420d5409ba8201289feb01041520b374768325ea82132108972f68ef59114f414451232daea6 SHA512 97a40f594aaa6f588a3ad982142a0ea4f4410d208dd5ff43b09c70baadd32f87e92eac97abd800f25298e8d0613ae85f68605f586ceccf9dc078fcb189d7511a
 DIST monero-0.17.3.2.tar.gz 10685156 BLAKE2B f313ec0e5e224797448a43ad46d4e990174eec6cdceec6dc9a25d62f014a775172e103d05a33558404bd84a8443ba6ada0c27f81a3a83fe630d16cbad97602f5 SHA512 2d34e0525b2ca1d7bddb8ea51776b49fec4fb866a1c1239c347460ed3369af2f430be32da45666f16c369cebef099f285971c0e806d75d60354f195c5f93891d
-DIST monero-0.18.1.2.tar.gz 11609034 BLAKE2B 3186a1038e9dd8f204a506df28c526bf3e0e5f788ad2d6b512f02735162a479be3f46d309d4e6888f30f962d68ecaf269888c8c0b21a066cad78b3c06f8cfc83 SHA512 d112f34b2fe6720c324560dd523badb68f08d03183d4bbbe7e1aa95f641cde4a1c4fa4042f1d47f9920f799269cc9620150136ebbef6dd66fcd4df0336c0d7f3
-DIST monero-0.18.2.0.tar.gz 11624875 BLAKE2B e8dc2e89c664cb218d900ce0803dd1716f1ee363bbddb232fbd22570818c9a9ca307df04808ffef1eb30ee6097fbe243f6977dfad181f57b9169f22d4819f145 SHA512 19625d8e6ee3e9f27ba06eb6027ef21571a2ae8261c9e32f6e74d2f7adf8c73e9dfe34516cd456426274c41ce941e1e5b7eba9f9d20492b99decbd9262aec434
-DIST monero-0.18.2.2.tar.gz 11640001 BLAKE2B 04b19e760b09636d7862af2a071128a28006d2829f08039cf55cfa1fd7d054b1382dbbcfc7f0ed381fcbd358e75ec437467349c7f250510e99e06527d1209da6 SHA512 78d4f7fee4eb37ba4837bc392c5869e21c9ea1e9bd9e95f768003bc833302935121c315fb3b4fcbe8f07a9513f928e9e9146dc7ca8892a3db2eb14cfe1371727
 DIST monero-0.18.3.1.tar.gz 14005197 BLAKE2B 169d876caf94090894c9a2bd9d07b71e46411971b06da0f51fc57f01396de4f5f770062e08cbebf702b6b49dbcd47923675d2375795969f5673bf2091a7da742 SHA512 b29d25043d50fa30459e59e0c82627cc3dc4a7e2e28a727a353915a32cf5e70e36f548bda152dee13329cb2d09a978ff45c2121f8bf7acc8966957a53e772f03
 DIST monero-0.18.3.3.tar.gz 14028018 BLAKE2B 07c3272175fb05645a2f5f7ce6cef4d65054ba1d80994c4dc8445ec4df13aebe2b268d5b4be49db0cdd35dcdce1bbd33874111e21503839d63fae70ea30b0dff SHA512 26aaa02be4d1109dfdae08981b9fee16a10c358030ba99ae809eb241e805c50edc8ad10b1a375cd02e3160fa3de8ae6773cca55618d39ca30614f1d6662c18e5
-DIST monero-8682.patch 1053 BLAKE2B 6252ee36961d41e6c7161004f2b3ddb0916a2dc91b91eed0e500a9681040366eb7e696abc91b138484bc735da5eb13f0a79ec1ded6f3c36dd3c8f8565113d7cf SHA512 2960a937ec04bc96a3564d2c730ca53cd1369f26d47567cd08c8e90abaf126f336a083e297b4240b5fae22ab3ad3cb45d741f2f48364d30f1442df393109a6eb
diff --git a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch b/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
deleted file mode 100644
index d0f59a6f9..000000000
--- a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 12a78e5e745556c29e45b7716a8b038ecfbff800 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@offtopica.uk>
-Date: Wed, 5 Aug 2020 18:39:44 +0100
-Subject: [PATCH] cmake: Use job pool feature to limit concurrent jobs
-
-Add two new options, MONERO_PARALLEL_COMPILE_JOBS and
-MONERO_PARALLEL_LINK_JOBS to try and prevent running out of memory when
-building everything.
-
-Requires >= cmake 3.0.0, and the use of the Ninja generator.
-
-Useful links:
-
-* https://cmake.org/cmake/help/latest/prop_gbl/JOB_POOLS.html
-* https://reviews.llvm.org/D6304
----
- CMakeLists.txt | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f63c07a35d..3729a6b659 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,6 +55,20 @@ else()
- 	message(STATUS "ccache deselected")
- endif()
- 
-+if (${CMAKE_VERSION} VERSION_GREATER "3.0.0" AND CMAKE_MAKE_PROGRAM MATCHES "ninja")
-+  set(MONERO_PARALLEL_COMPILE_JOBS "" CACHE STRING "The maximum number of concurrent compilation jobs.")
-+  if (MONERO_PARALLEL_COMPILE_JOBS)
-+    set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${MONERO_PARALLEL_COMPILE_JOBS})
-+    set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
-+  endif ()
-+
-+  set(MONERO_PARALLEL_LINK_JOBS "" CACHE STRING "The maximum number of concurrent link jobs.")
-+  if (MONERO_PARALLEL_LINK_JOBS)
-+    set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${MONERO_PARALLEL_LINK_JOBS})
-+    set(CMAKE_JOB_POOL_LINK link_job_pool)
-+  endif ()
-+endif()
-+
- enable_language(C ASM)
- 
- function (die msg)
diff --git a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
deleted file mode 100644
index ea7f80499..000000000
--- a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41f82e26c..3eb2b2e78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,7 +312,7 @@ endif()
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- #   set(BSDI TRUE)
- 
--include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
-+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
- 
- if(APPLE)
-   include_directories(SYSTEM /usr/include/malloc)
-@@ -995,7 +995,6 @@ if(SODIUM_LIBRARY)
-   set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
- endif()
- 
--include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
- add_subdirectory(contrib)
- add_subdirectory(src)
- 
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index a8916a7d0..05ab35c82 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,19 +37,7 @@
- 
- 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_LIBRARIES "miniupnpc" PARENT_SCOPE)
- 
- find_package(Unbound)
- 
-@@ -81,4 +69,3 @@ endif()
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
- add_subdirectory(qrcodegen)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
-diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
-index 3b33fe90a..ba354a0e8 100644
---- a/src/crypto/CMakeLists.txt
-+++ b/src/crypto/CMakeLists.txt
-@@ -55,6 +55,7 @@ list(APPEND crypto_sources CryptonightR_template.S)
- endif()
- 
- include_directories(${RANDOMX_INCLUDE})
-+include_directories(SYSTEM /usr/include/monero)
- 
- set(crypto_headers)
- 
-@@ -116,6 +117,3 @@ endif()
- 
- # cheat because cmake and ccache hate each other
- set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
--
--# Must be done last, because it references libraries in this directory
--add_subdirectory(wallet)
-diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
-index a4c5d5a07..5c6b96cd8 100644
---- a/src/crypto/wallet/crypto.h
-+++ b/src/crypto/wallet/crypto.h
-@@ -29,7 +29,6 @@
- #pragma once
- 
- #include <cstddef>
--#include "crypto/wallet/ops.h"
- 
- namespace crypto {
-   namespace wallet {
-diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
-index ff2afba4b..26b0f4523 100644
---- a/src/device/CMakeLists.txt
-+++ b/src/device/CMakeLists.txt
-@@ -72,7 +72,7 @@ target_link_libraries(device
-     ${HIDAPI_LIBRARIES}
-     cncrypto
-     ringct_basic
--    wallet-crypto
-+    monero-crypto
-     ${OPENSSL_CRYPTO_LIBRARIES}
-     ${Boost_SERIALIZATION_LIBRARY}
-   PRIVATE
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 65db2615c..3ace310f6 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -60,9 +60,9 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.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/monero-0.17.2.0-boost-176.patch b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
deleted file mode 100644
index 07a584a39..000000000
--- a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c28d2f7c110c0a2161fa02d6c20df94a60a41965 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 1e68605abf5..801bb2c3465 100644
---- a/contrib/epee/include/storages/portable_storage.h
-+++ b/contrib/epee/include/storages/portable_storage.h
-@@ -40,6 +40,8 @@
- #include "span.h"
- #include "int-util.h"
- 
-+#include <boost/mpl/contains.hpp>
-+
- namespace epee
- {
-   namespace serialization
diff --git a/net-p2p/monero/files/monero-0.17.3.0-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
index ec03bf5f4..ec03bf5f4 100644
--- a/net-p2p/monero/files/monero-0.17.3.0-unbundle-dependencies.patch
+++ b/net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
diff --git a/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch
deleted file mode 100644
index 181b4ddcc..000000000
--- a/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41f82e26c..3eb2b2e78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -382,7 +382,7 @@
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- #   set(BSDI TRUE)
- 
--include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
-+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
- 
- if(APPLE)
-   include_directories(SYSTEM /usr/include/malloc)
-@@ -1082,7 +1082,6 @@
-   set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
- endif()
- 
--include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
- add_subdirectory(contrib)
- add_subdirectory(src)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index a8916a7d0..05ab35c82 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,21 +37,7 @@
- 
- find_package(Miniupnpc REQUIRED)
- 
--message(STATUS "Using in-tree miniupnpc")
--set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
--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_LIBRARIES "miniupnpc" PARENT_SCOPE)
- 
- find_package(Unbound)
- 
-@@ -83,4 +69,3 @@
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
- add_subdirectory(qrcodegen)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
---- a/src/crypto/CMakeLists.txt	2022-08-15 18:09:12.275043765 +0200
-+++ b/src/crypto/CMakeLists.txt	2022-08-15 18:10:52.687184277 +0200
-@@ -55,6 +55,7 @@
- endif()
-
- include_directories(${RANDOMX_INCLUDE})
-+include_directories(SYSTEM /usr/include/monero)
-
- set(crypto_headers)
-
-@@ -97,6 +98,3 @@
- # cheat because cmake and ccache hate each other
- set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
- set_property(SOURCE CryptonightR_template.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
--
--# Must be done last, because it references libraries in this directory
--add_subdirectory(wallet)
-diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
-index a4c5d5a07..5c6b96cd8 100644
---- a/src/crypto/wallet/crypto.h
-+++ b/src/crypto/wallet/crypto.h
-@@ -29,7 +29,6 @@
- #pragma once
- 
- #include <cstddef>
--#include "crypto/wallet/ops.h"
- 
- namespace crypto {
-   namespace wallet {
-diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
-index ff2afba4b..26b0f4523 100644
---- a/src/device/CMakeLists.txt
-+++ b/src/device/CMakeLists.txt
-@@ -73,7 +73,7 @@
-     cncrypto
-     cryptonote_format_utils_basic
-     ringct_basic
--    wallet-crypto
-+    monero-crypto
-     ${OPENSSL_CRYPTO_LIBRARIES}
-     ${Boost_SERIALIZATION_LIBRARY}
-   PRIVATE
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 65db2615c..3ace310f6 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -61,9 +61,9 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.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/monero-0.18.2.2-cstdint.patch b/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch
deleted file mode 100644
index 8ac44be8e..000000000
--- a/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c32befe4f8385f5f893c0db611060bc7c7b425f3 Mon Sep 17 00:00:00 2001
-From: tobtoht <tob@featherwallet.org>
-Date: Sat, 6 May 2023 18:13:18 +0200
-Subject: [PATCH] fix missing <cstdint> includes
-
----
- contrib/epee/include/file_io_utils.h                | 1 +
- contrib/epee/include/storages/parserse_base_utils.h | 1 +
- src/common/combinator.h                             | 1 +
- src/wallet/api/wallet2_api.h                        | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h
-index da05520c1b9..de95e58c3ea 100644
---- a/contrib/epee/include/file_io_utils.h
-+++ b/contrib/epee/include/file_io_utils.h
-@@ -29,6 +29,7 @@
- 
- #include <string>
- #include <ctime>
-+#include <cstdint>
- 
- namespace epee
- {
-diff --git a/contrib/epee/include/storages/parserse_base_utils.h b/contrib/epee/include/storages/parserse_base_utils.h
-index 898813ff9fd..4658eba77ad 100644
---- a/contrib/epee/include/storages/parserse_base_utils.h
-+++ b/contrib/epee/include/storages/parserse_base_utils.h
-@@ -30,6 +30,7 @@
- 
- #include <boost/utility/string_ref_fwd.hpp>
- #include <string>
-+#include <cstdint>
- 
- namespace epee 
- {
-diff --git a/src/common/combinator.h b/src/common/combinator.h
-index cb237ed8d40..6ef244a1ed1 100644
---- a/src/common/combinator.h
-+++ b/src/common/combinator.h
-@@ -34,6 +34,7 @@
- #include <iostream>
- #include <vector>
- #include <stdexcept>
-+#include <cstdint>
- 
- namespace tools {
- 
-diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
-index ab3d9732e8f..df86da847ea 100644
---- a/src/wallet/api/wallet2_api.h
-+++ b/src/wallet/api/wallet2_api.h
-@@ -38,6 +38,7 @@
- #include <ctime>
- #include <iostream>
- #include <stdexcept>
-+#include <cstdint>
- 
- //  Public interface for libwallet library
- namespace Monero {
diff --git a/net-p2p/monero/files/monero-0.18.1.2-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.18.3.3-unbundle-dependencies.patch
index 6cd7e7c3d..6cd7e7c3d 100644
--- a/net-p2p/monero/files/monero-0.18.1.2-unbundle-dependencies.patch
+++ b/net-p2p/monero/files/monero-0.18.3.3-unbundle-dependencies.patch
diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild
deleted file mode 100644
index 6b1e9824b..000000000
--- a/net-p2p/monero/monero-0.17.2.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/monero
-	acct-user/monero
-	<dev-libs/boost-1.85:=[nls]
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/randomx
-	dev-libs/rapidjson
-	dev-libs/supercop
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-	net-libs/miniupnpc:=
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
-	"${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Update CMake to install built libraries (help wanted)
-		-DBUILD_SHARED_LIBS=OFF
-		-DMANUAL_SUBMODULES=ON
-		-DMONERO_PARALLEL_LINK_JOBS=1
-		-DUSE_DEVICE_TREZOR=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local targets=()
-	use daemon && targets+=(daemon)
-	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
-	use wallet-cli && targets+=(simplewallet)
-	use wallet-rpc && targets+=(wallet_rpc_server)
-	cmake_build ${targets[@]}
-}
-
-src_install() {
-	einstalldocs
-
-	# Install all binaries.
-	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
-		while IFS= read -r -d '' line; do
-			dobin "$line"
-		done
-
-	if use daemon; then
-		dodoc utils/conf/monerod.conf
-
-		# data-dir
-		keepdir /var/lib/monero
-		fowners monero:monero /var/lib/monero
-		fperms 0755 /var/lib/monero
-
-		# log-file dir
-		keepdir /var/log/monero
-		fowners monero:monero /var/log/monero
-		fperms 0755 /var/log/monero
-
-		# /etc/monero/monerod.conf
-		insinto /etc/monero
-		doins "${FILESDIR}/monerod.conf"
-
-		# OpenRC
-		newconfd "${FILESDIR}/monerod.confd" monerod
-		newinitd "${FILESDIR}/monerod.initd" monerod
-
-		# systemd
-		systemd_dounit "${FILESDIR}/monerod.service"
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		elog "Start the Monero P2P daemon as a system service with"
-		elog "'rc-service monerod start'. Enable it at startup with"
-		elog "'rc-update add monerod default'."
-		elog
-		elog "Run monerod status as any user to get sync status and other stats."
-		elog
-		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
-		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
-		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
-		elog "or move the data directory to another disk."
-	fi
-}
diff --git a/net-p2p/monero/monero-0.17.2.3.ebuild b/net-p2p/monero/monero-0.17.2.3.ebuild
deleted file mode 100644
index 6b1e9824b..000000000
--- a/net-p2p/monero/monero-0.17.2.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/monero
-	acct-user/monero
-	<dev-libs/boost-1.85:=[nls]
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/randomx
-	dev-libs/rapidjson
-	dev-libs/supercop
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-	net-libs/miniupnpc:=
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
-	"${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Update CMake to install built libraries (help wanted)
-		-DBUILD_SHARED_LIBS=OFF
-		-DMANUAL_SUBMODULES=ON
-		-DMONERO_PARALLEL_LINK_JOBS=1
-		-DUSE_DEVICE_TREZOR=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local targets=()
-	use daemon && targets+=(daemon)
-	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
-	use wallet-cli && targets+=(simplewallet)
-	use wallet-rpc && targets+=(wallet_rpc_server)
-	cmake_build ${targets[@]}
-}
-
-src_install() {
-	einstalldocs
-
-	# Install all binaries.
-	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
-		while IFS= read -r -d '' line; do
-			dobin "$line"
-		done
-
-	if use daemon; then
-		dodoc utils/conf/monerod.conf
-
-		# data-dir
-		keepdir /var/lib/monero
-		fowners monero:monero /var/lib/monero
-		fperms 0755 /var/lib/monero
-
-		# log-file dir
-		keepdir /var/log/monero
-		fowners monero:monero /var/log/monero
-		fperms 0755 /var/log/monero
-
-		# /etc/monero/monerod.conf
-		insinto /etc/monero
-		doins "${FILESDIR}/monerod.conf"
-
-		# OpenRC
-		newconfd "${FILESDIR}/monerod.confd" monerod
-		newinitd "${FILESDIR}/monerod.initd" monerod
-
-		# systemd
-		systemd_dounit "${FILESDIR}/monerod.service"
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		elog "Start the Monero P2P daemon as a system service with"
-		elog "'rc-service monerod start'. Enable it at startup with"
-		elog "'rc-update add monerod default'."
-		elog
-		elog "Run monerod status as any user to get sync status and other stats."
-		elog
-		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
-		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
-		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
-		elog "or move the data directory to another disk."
-	fi
-}
diff --git a/net-p2p/monero/monero-0.17.3.0.ebuild b/net-p2p/monero/monero-0.17.3.0.ebuild
deleted file mode 100644
index 654199f4f..000000000
--- a/net-p2p/monero/monero-0.17.3.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/monero
-	acct-user/monero
-	<dev-libs/boost-1.85:=[nls]
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/randomx
-	dev-libs/rapidjson
-	dev-libs/supercop
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-	net-libs/miniupnpc:=
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.17.3.0-unbundle-dependencies.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Update CMake to install built libraries (help wanted)
-		-DBUILD_SHARED_LIBS=OFF
-		-DMANUAL_SUBMODULES=ON
-		-DUSE_DEVICE_TREZOR=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local targets=()
-	use daemon && targets+=(daemon)
-	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
-	use wallet-cli && targets+=(simplewallet)
-	use wallet-rpc && targets+=(wallet_rpc_server)
-	cmake_build ${targets[@]}
-}
-
-src_install() {
-	einstalldocs
-
-	# Install all binaries.
-	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
-		while IFS= read -r -d '' line; do
-			dobin "$line"
-		done
-
-	if use daemon; then
-		dodoc utils/conf/monerod.conf
-
-		# data-dir
-		keepdir /var/lib/monero
-		fowners monero:monero /var/lib/monero
-		fperms 0755 /var/lib/monero
-
-		# log-file dir
-		keepdir /var/log/monero
-		fowners monero:monero /var/log/monero
-		fperms 0755 /var/log/monero
-
-		# /etc/monero/monerod.conf
-		insinto /etc/monero
-		doins "${FILESDIR}/monerod.conf"
-
-		# OpenRC
-		newconfd "${FILESDIR}/monerod.confd" monerod
-		newinitd "${FILESDIR}/monerod.initd" monerod
-
-		# systemd
-		systemd_dounit "${FILESDIR}/monerod.service"
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		elog "Start the Monero P2P daemon as a system service with"
-		elog "'rc-service monerod start'. Enable it at startup with"
-		elog "'rc-update add monerod default'."
-		elog
-		elog "Run monerod status as any user to get sync status and other stats."
-		elog
-		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
-		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
-		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
-		elog "or move the data directory to another disk."
-	fi
-}
diff --git a/net-p2p/monero/monero-0.17.3.2.ebuild b/net-p2p/monero/monero-0.17.3.2.ebuild
index a8253123a..d05784e9e 100644
--- a/net-p2p/monero/monero-0.17.3.2.ebuild
+++ b/net-p2p/monero/monero-0.17.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,14 +34,14 @@ DEPEND="
 	dev-libs/supercop
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
-	net-libs/miniupnpc:=
+	<net-libs/miniupnpc-2.2.8:=
 	readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.17.3.0-unbundle-dependencies.patch"
+	"${FILESDIR}/${PN}-0.17.3.2-unbundle-dependencies.patch"
 )
 
 src_configure() {
diff --git a/net-p2p/monero/monero-0.18.1.2.ebuild b/net-p2p/monero/monero-0.18.1.2.ebuild
deleted file mode 100644
index 7d2e23515..000000000
--- a/net-p2p/monero/monero-0.18.1.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/monero-project/monero/commit/96677fffcd436c5c108718b85419c5dbf5da9df2.patch -> ${PN}-8682.patch"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/monero
-	acct-user/monero
-	<dev-libs/boost-1.85:=[nls]
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/randomx
-	dev-libs/rapidjson
-	dev-libs/supercop
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-	net-libs/miniupnpc:=
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
-	"${DISTDIR}/${PN}-8682.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Update CMake to install built libraries (help wanted)
-		-DBUILD_SHARED_LIBS=OFF
-		-DMANUAL_SUBMODULES=ON
-		-DUSE_DEVICE_TREZOR=OFF
-	)
-
-	use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local targets=()
-	use daemon && targets+=(daemon)
-	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
-	use wallet-cli && targets+=(simplewallet)
-	use wallet-rpc && targets+=(wallet_rpc_server)
-	cmake_build ${targets[@]}
-}
-
-src_install() {
-	einstalldocs
-
-	# Install all binaries.
-	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
-		while IFS= read -r -d '' line; do
-			dobin "$line"
-		done
-
-	if use daemon; then
-		dodoc utils/conf/monerod.conf
-
-		# data-dir
-		keepdir /var/lib/monero
-		fowners monero:monero /var/lib/monero
-		fperms 0755 /var/lib/monero
-
-		# log-file dir
-		keepdir /var/log/monero
-		fowners monero:monero /var/log/monero
-		fperms 0755 /var/log/monero
-
-		# /etc/monero/monerod.conf
-		insinto /etc/monero
-		doins "${FILESDIR}/monerod.conf"
-
-		# OpenRC
-		newconfd "${FILESDIR}/monerod.confd" monerod
-		newinitd "${FILESDIR}/monerod.initd" monerod
-
-		# systemd
-		systemd_dounit "${FILESDIR}/monerod.service"
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		elog "Start the Monero P2P daemon as a system service with"
-		elog "'rc-service monerod start'. Enable it at startup with"
-		elog "'rc-update add monerod default'."
-		elog
-		elog "Run monerod status as any user to get sync status and other stats."
-		elog
-		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
-		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
-		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
-		elog "or move the data directory to another disk."
-	fi
-}
diff --git a/net-p2p/monero/monero-0.18.2.0.ebuild b/net-p2p/monero/monero-0.18.2.0.ebuild
deleted file mode 100644
index cb583f3e9..000000000
--- a/net-p2p/monero/monero-0.18.2.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/monero
-	acct-user/monero
-	<dev-libs/boost-1.85:=[nls]
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/randomx
-	dev-libs/rapidjson
-	dev-libs/supercop
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-	net-libs/miniupnpc:=
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Update CMake to install built libraries (help wanted)
-		-DBUILD_SHARED_LIBS=OFF
-		-DMANUAL_SUBMODULES=ON
-		-DUSE_DEVICE_TREZOR=OFF
-	)
-
-	use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local targets=()
-	use daemon && targets+=(daemon)
-	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
-	use wallet-cli && targets+=(simplewallet)
-	use wallet-rpc && targets+=(wallet_rpc_server)
-	cmake_build ${targets[@]}
-}
-
-src_install() {
-	einstalldocs
-
-	# Install all binaries.
-	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
-		while IFS= read -r -d '' line; do
-			dobin "$line"
-		done
-
-	if use daemon; then
-		dodoc utils/conf/monerod.conf
-
-		# data-dir
-		keepdir /var/lib/monero
-		fowners monero:monero /var/lib/monero
-		fperms 0755 /var/lib/monero
-
-		# log-file dir
-		keepdir /var/log/monero
-		fowners monero:monero /var/log/monero
-		fperms 0755 /var/log/monero
-
-		# /etc/monero/monerod.conf
-		insinto /etc/monero
-		doins "${FILESDIR}/monerod.conf"
-
-		# OpenRC
-		newconfd "${FILESDIR}/monerod.confd" monerod
-		newinitd "${FILESDIR}/monerod.initd" monerod
-
-		# systemd
-		systemd_dounit "${FILESDIR}/monerod.service"
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		elog "Start the Monero P2P daemon as a system service with"
-		elog "'rc-service monerod start'. Enable it at startup with"
-		elog "'rc-update add monerod default'."
-		elog
-		elog "Run monerod status as any user to get sync status and other stats."
-		elog
-		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
-		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
-		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
-		elog "or move the data directory to another disk."
-	fi
-}
diff --git a/net-p2p/monero/monero-0.18.2.2.ebuild b/net-p2p/monero/monero-0.18.2.2.ebuild
deleted file mode 100644
index b2dafb62a..000000000
--- a/net-p2p/monero/monero-0.18.2.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/monero
-	acct-user/monero
-	<dev-libs/boost-1.85:=[nls]
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/randomx
-	dev-libs/rapidjson
-	dev-libs/supercop
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-	net-libs/miniupnpc:=
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
-	"${FILESDIR}/${P}-cstdint.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Update CMake to install built libraries (help wanted)
-		-DBUILD_SHARED_LIBS=OFF
-		-DMANUAL_SUBMODULES=ON
-		-DUSE_DEVICE_TREZOR=OFF
-	)
-
-	use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local targets=()
-	use daemon && targets+=(daemon)
-	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
-	use wallet-cli && targets+=(simplewallet)
-	use wallet-rpc && targets+=(wallet_rpc_server)
-	cmake_build ${targets[@]}
-}
-
-src_install() {
-	einstalldocs
-
-	# Install all binaries.
-	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
-		while IFS= read -r -d '' line; do
-			dobin "$line"
-		done
-
-	if use daemon; then
-		dodoc utils/conf/monerod.conf
-
-		# data-dir
-		keepdir /var/lib/monero
-		fowners monero:monero /var/lib/monero
-		fperms 0755 /var/lib/monero
-
-		# log-file dir
-		keepdir /var/log/monero
-		fowners monero:monero /var/log/monero
-		fperms 0755 /var/log/monero
-
-		# /etc/monero/monerod.conf
-		insinto /etc/monero
-		doins "${FILESDIR}/monerod.conf"
-
-		# OpenRC
-		newconfd "${FILESDIR}/monerod.confd" monerod
-		newinitd "${FILESDIR}/monerod.initd" monerod
-
-		# systemd
-		systemd_dounit "${FILESDIR}/monerod.service"
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		elog "Start the Monero P2P daemon as a system service with"
-		elog "'rc-service monerod start'. Enable it at startup with"
-		elog "'rc-update add monerod default'."
-		elog
-		elog "Run monerod status as any user to get sync status and other stats."
-		elog
-		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
-		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
-		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
-		elog "or move the data directory to another disk."
-	fi
-}
diff --git a/net-p2p/monero/monero-0.18.3.1.ebuild b/net-p2p/monero/monero-0.18.3.1.ebuild
index f707b6a2c..5477acec3 100644
--- a/net-p2p/monero/monero-0.18.3.1.ebuild
+++ b/net-p2p/monero/monero-0.18.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
+	"${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
 )
 
 src_configure() {
diff --git a/net-p2p/monero/monero-0.18.3.3-r1.ebuild b/net-p2p/monero/monero-0.18.3.3-r1.ebuild
index 565af48f3..36b9f1e65 100644
--- a/net-p2p/monero/monero-0.18.3.3-r1.ebuild
+++ b/net-p2p/monero/monero-0.18.3.3-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
+	"${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
 )
 
 src_configure() {
diff --git a/net-p2p/monero/monero-9999.ebuild b/net-p2p/monero/monero-9999.ebuild
index df4d6cf6b..36b9f1e65 100644
--- a/net-p2p/monero/monero-9999.ebuild
+++ b/net-p2p/monero/monero-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,14 +19,14 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
+IUSE="+daemon hw-wallet readline +tools +wallet-cli +wallet-rpc"
 REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
 RESTRICT="test"
 
 DEPEND="
 	acct-group/monero
 	acct-user/monero
-	dev-libs/boost:=[nls]
+	<dev-libs/boost-1.85:=[nls]
 	dev-libs/libsodium:=
 	dev-libs/openssl:=
 	dev-libs/randomx
@@ -34,23 +34,31 @@ DEPEND="
 	dev-libs/supercop
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
-	net-libs/miniupnpc:=
+	<net-libs/miniupnpc-2.2.8:=
 	readline? ( sys-libs/readline:0= )
+	hw-wallet? (
+		dev-libs/hidapi
+		dev-libs/protobuf:=
+		virtual/libusb:1
+	)
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.18.3.3-unbundle-dependencies.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
 		# TODO: Update CMake to install built libraries (help wanted)
 		-DBUILD_SHARED_LIBS=OFF
 		-DMANUAL_SUBMODULES=ON
-		-DMONERO_PARALLEL_LINK_JOBS=1
-		-DUSE_DEVICE_TREZOR=OFF
+		-DUSE_DEVICE_TREZOR=$(usex hw-wallet ON OFF)
 	)
 
+	use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
+
 	cmake_src_configure
 }
 
@@ -106,7 +114,7 @@ pkg_postinst() {
 		elog
 		elog "Run monerod status as any user to get sync status and other stats."
 		elog
-		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
+		elog "The Monero blockchain can take up a lot of space (200 GiB) and is stored"
 		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
 		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
 		elog "or move the data directory to another disk."