net-p2p/monero: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3

8 files changed, 30 insertions, 53 deletions

diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index b6e49dc8..ccab2545 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1,7 +1,7 @@
-DIST monero-0.17.3.2.tar.gz 10685156 BLAKE2B f313ec0e5e224797448a43ad46d4e990174eec6cdceec6dc9a25d62f014a775172e103d05a33558404bd84a8443ba6ada0c27f81a3a83fe630d16cbad97602f5 SHA512 2d34e0525b2ca1d7bddb8ea51776b49fec4fb866a1c1239c347460ed3369af2f430be32da45666f16c369cebef099f285971c0e806d75d60354f195c5f93891d
 DIST monero-0.18.0.0.tar.gz 11595071 BLAKE2B b0bb74f4b4190adfcdfa7afb21e9feb060a712ba53d8e458c3a6ac756d7d2bede4111f4f5dd3518d52d8adf87a1b0e08cd13b7b17bef42dced7eb7750264b96c SHA512 75a09957fb89082636e3b95effa1a4a2e502b94a89006c8ece13dca609584c906b4decc00a3f10ccb6cf00144b2a41101bf2390f25fe687a9e7f2dc09393bcf9
-DIST monero-gui-0.17.3.2.tar.gz 5764033 BLAKE2B 0095398508d12290c7b43722d45f2b7ab14410083b0c3d470a8406a6b85cade7da782c553190f4492e9921df5e2d0b71bba3805a9ada7fa21cc6c8a58f4d1150 SHA512 84ce3ff1bb56e13e2c39fb1d495c7d047a253ea119b3ea3d84090478da8b7be0bf32d1694991289e8e2e85536bbf11b2441865beb3848fbaed2a347bbe73ac0f
+DIST monero-0.18.1.0.tar.gz 11600139 BLAKE2B dac1182e772b4163b2cc76ec83dc2cb5e91b251dab2185d4a2df6134780f05fadba2fc603964caab973ef6bc37dce1bfcb194c92ea4f843cfb953f9a5fc24378 SHA512 761f1bae4157ea05565c7459d1cd2a9316317068e3afc18a7215e4a949dee7eb58fe023cbd04c9fec0141d1f3dc33f526b2a187934b33d7aff2b55e47fad599c
 DIST monero-gui-0.18.0.0.tar.gz 5879775 BLAKE2B 4592736ccb654d8bce01dbe31877cb4624acbf3b7359ec8d328f386400956a4a9a544f1275ee4f643c24961895fd2ae00ca788f94a244ebfcbad13e34ee195c0 SHA512 15a96eb74f9cf766cf374a8d680bae8c8b9c7507434439cc3104d801630043db149071f5072c23fabfc9b9ba29f09217bf00ba2c63cdf72587dba43dca91d0f4
+DIST monero-gui-0.18.1.0.tar.gz 5879078 BLAKE2B c10f9040f08ede210197865a44a9f9268d7b2a53901051b8e3b0a7ed527cf40299d70b369b1ca9089b415addc100af5091d2d147c6435d1b5578653bfb966578 SHA512 bef0965164c9001f143e16ed75a437f934e543059d024bb9afd39e89cf6198b3e080c279d8c9e72b35cdf2904f171fa335749fb1ca4086b5657d871a3a508710
 DIST quirc-516d91a94d880ca1006fc1d57f318bdff8411f0d.tar.gz 42163 BLAKE2B 36f07063c376c51397958321e317c9f3a8718f192a16ade546add1b652a7252abeecebcb7c850b50b85c3b59b941456c4225a80aa301cdab5eb42c04e4725698 SHA512 30eb2905e03fd070ec160ad78bfba2ed973fe24fe63ab810bdb7bcec9e52da5ef042efbb50cce19fcfae13ffa531bcfb20421325e4a868856690d696f8e89eee
 DIST supercop-633500ad8c8759995049ccd022107d1fa8a1bbc9.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
 DIST trezor-common-028c9b2e95d83b4164748a12cfdc181f0dd11920.tar.gz 926880 BLAKE2B e2937f9e17fdf33e047084eec73bd4b75bb5e2a1ccb3ce03c9d731ddf2b93200f895de565c16913a0bb022e3662faa38777828912dc257124ea4196b23cc501c SHA512 d0fdc74dbcde444c852bf000123bc795d86a07993b79b18cc5cfb1535348059f3b7b5a4865892321c7ddc8a98be8f04e6cfbe224e7daae3aa292f40642afa609
diff --git a/net-p2p/monero/files/monero-0.17.3.2-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/monero-0.17.3.2-Do-not-install-trezor-dep-libs.patch
deleted file mode 100644
index 8e67be09..00000000
--- a/net-p2p/monero/files/monero-0.17.3.2-Do-not-install-trezor-dep-libs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6c75b95c9b4c3bd43842e50da7c14f122ed4fcb0 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
-
----
- src/wallet/CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
-index bf238ae37887..0cfb534ed4fe 100644
---- a/src/wallet/CMakeLists.txt
-+++ b/src/wallet/CMakeLists.txt
-@@ -149,11 +149,7 @@ if (BUILD_GUI_DEPS)
-     install(TARGETS wallet_merged
-         ARCHIVE DESTINATION ${lib_folder})
- 
--    install(FILES ${TREZOR_DEP_LIBS}
--            DESTINATION ${lib_folder})
-     file(WRITE "trezor_link_flags.txt" ${TREZOR_DEP_LINKER})
--    install(FILES "trezor_link_flags.txt"
--            DESTINATION ${lib_folder})
- endif()
- 
- add_subdirectory(api)
diff --git a/net-p2p/monero/files/monero-0.17.3.2-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.18.1.0-Drop-in-tree-miniupnpc.patch
index 56b93027..4959cf9c 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-Drop-in-tree-miniupnpc.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-Drop-in-tree-miniupnpc.patch
@@ -1,4 +1,4 @@
-From f9b6fc9209e256b00bd5f198a9427d6ce1c9f34b Mon Sep 17 00:00:00 2001
+From dc3a18789e8c8ef6252bd94546bf8cd6184a56eb 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
@@ -12,7 +12,7 @@ submodule not part of the archive available upstream.
  2 files changed, 6 insertions(+), 19 deletions(-)
 
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 7ae4ba750da4..77e9a50205ff 100644
+index 5b7f69a56843..fc40455064f4 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
 @@ -36,22 +36,9 @@
@@ -42,10 +42,10 @@ index 7ae4ba750da4..77e9a50205ff 100644
  find_package(Unbound)
  
 diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 71021b24c3c5..a2f5930aaf7b 100644
+index f33ce977de07..3d0c05a19da2 100644
 --- a/src/p2p/net_node.inl
 +++ b/src/p2p/net_node.inl
-@@ -61,9 +61,9 @@
+@@ -60,9 +60,9 @@
  #include "cryptonote_core/cryptonote_core.h"
  #include "net/parse.h"
  
diff --git a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-dev-libs-randomx.patch
index 3ed12631..178e83ff 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-dev-libs-randomx.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-dev-libs-randomx.patch
@@ -1,4 +1,4 @@
-From 0644c9fcb32af4f5cd55dc1040007631f01cf2ca Mon Sep 17 00:00:00 2001
+From a007bfe93c3e71a166206abd30a91dc3637983c8 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Use gentoo dev-libs/randomx
  1 file changed, 1 deletion(-)
 
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 85040f05b3d3..adf307c5fc01 100644
+index fc40455064f4..5536debe8e2b 100644
 --- a/external/CMakeLists.txt
 +++ b/external/CMakeLists.txt
-@@ -66,4 +66,3 @@ endif()
+@@ -56,4 +56,3 @@ endif()
  add_subdirectory(db_drivers)
  add_subdirectory(easylogging++)
  add_subdirectory(qrcodegen)
diff --git a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-versioning.patch
index c10730cf..c2c563e1 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-Use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-Use-gentoo-versioning.patch
@@ -1,4 +1,4 @@
-From 67dac45de0bfb119888cb5ebb41be1283a074a3d Mon Sep 17 00:00:00 2001
+From 9e2da6c420843a4928b0fb42a41bafcfb4b95ee3 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Use gentoo versioning
  1 file changed, 3 insertions(+), 15 deletions(-)
 
 diff --git a/cmake/Version.cmake b/cmake/Version.cmake
-index 707d7263958a..e6386339d720 100644
+index e9ed9fba159b..5df4bc1ab7f3 100644
 --- a/cmake/Version.cmake
 +++ b/cmake/Version.cmake
 @@ -31,20 +31,8 @@ function (write_version tag)
diff --git a/net-p2p/monero/files/monero-0.17.3.2-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.18.1.0-translations-use-host-compiler.patch
index 40276b0a..e51bef2f 100644
--- a/net-p2p/monero/files/monero-0.17.3.2-translations-use-host-compiler.patch
+++ b/net-p2p/monero/files/monero-0.18.1.0-translations-use-host-compiler.patch
@@ -1,4 +1,4 @@
-From e10d750a15343998ae1b655947820cdb26e58276 Mon Sep 17 00:00:00 2001
+From c927623016a946cddf6ba4e255cc9208929fa117 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 ffb5abb82534..49f18a57cf7e 100644
+index b05c087cf898..ef980115c9e1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -542,7 +542,9 @@ ExternalProject_Add(generate_translations_header
+@@ -671,7 +671,9 @@ ExternalProject_Add(generate_translations_header
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/translations"
    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/translations"
    STAMP_DIR ${LRELEASE_PATH}
@@ -23,21 +23,21 @@ index ffb5abb82534..49f18a57cf7e 100644
 +  CMAKE_ARGS
 +    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/translations.cmake
 +    -DLRELEASE_PATH=${LRELEASE_PATH}
-   INSTALL_COMMAND cmake -E echo "")
+   INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "")
  include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
  add_subdirectory(external)
 diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt
-index 7e31ed319e94..64bda84f055e 100644
+index 3b43360f84c8..35fcae544a42 100644
 --- a/translations/CMakeLists.txt
 +++ b/translations/CMakeLists.txt
-@@ -28,6 +28,10 @@
+@@ -30,6 +30,10 @@ cmake_minimum_required(VERSION 3.5)
  
- cmake_minimum_required(VERSION 3.5)
+ project(translations)
  
 +# Ensure LDFLAGS for target are not propagated here since target are
 +# meant for host
 +UNSET(ENV{LDFLAGS})
 +
- project(translations)
- 
  # when crosscompiling import the executable targets from a file
+ IF(CMAKE_CROSSCOMPILING)
+   message(WARNING "CrossCompiling")
diff --git a/net-p2p/monero/files/monero-gui-0.17.3.2-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.18.1.0-cmake-use-gentoo-versioning.patch
index 546c562a..1d05fdb6 100644
--- a/net-p2p/monero/files/monero-gui-0.17.3.2-cmake-use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/monero-gui-0.18.1.0-cmake-use-gentoo-versioning.patch
@@ -1,4 +1,4 @@
-From d83bfe6ab9b90b16d48e7bd7c88ee1a75a91afda Mon Sep 17 00:00:00 2001
+From 3a0d595e530779c37431743b73566a7f6b2543e9 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
@@ -8,7 +8,7 @@ Subject: [PATCH] cmake: use gentoo versioning
  1 file changed, 2 insertions(+), 12 deletions(-)
 
 diff --git a/cmake/VersionGui.cmake b/cmake/VersionGui.cmake
-index e225bf2bb3c0..786bb2d934f1 100644
+index e225bf2bb3c0..1f8574e8d1e8 100644
 --- a/cmake/VersionGui.cmake
 +++ b/cmake/VersionGui.cmake
 @@ -31,17 +31,7 @@ function (write_static_version_header tag)
diff --git a/net-p2p/monero/monero-0.17.3.2.ebuild b/net-p2p/monero/monero-0.18.1.0.ebuild
index 7da6521c..0244244c 100644
--- a/net-p2p/monero/monero-0.17.3.2.ebuild
+++ b/net-p2p/monero/monero-0.18.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python{3_8,3_9,3_10} )
 CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake flag-o-matic toolchain-funcs python-any-r1 systemd qmake-utils
@@ -31,11 +31,11 @@ RDEPEND="net-dns/unbound:=[threads]
 	net-libs/miniupnpc:=
 	dev-libs/openssl:0
 	>=dev-libs/boost-1.62:=[icu,nls]
-	net-libs/zeromq:=[sodium]
+	>=net-libs/zeromq-4.3:=[sodium]
 	dev-libs/rapidjson:=
 	readline? ( sys-libs/readline:= )
 	smartcard? (
-		dev-libs/hidapi:=
+		>=dev-libs/hidapi-0.11.0:=
 		virtual/libusb:=
 		virtual/libudev:=
 		dev-libs/protobuf:=
@@ -71,7 +71,6 @@ BDEPEND="${PYTHON_DEPS}
 PATCHES_MONERO=(
 	"${FILESDIR}/monero-${PV}-Drop-in-tree-miniupnpc.patch"
 	"${FILESDIR}/monero-${PV}-Use-gentoo-versioning.patch"
-	"${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"
 )
@@ -114,12 +113,16 @@ src_prepare() {
 
 	CMAKE_USE_DIR="${WORKDIR}/monero-${PV}"
 	BUILD_DIR="${WORKDIR}/monero-${PV}_build"
+	pushd "${CMAKE_USE_DIR}" > /dev/null || die
 	S="${CMAKE_USE_DIR}" PATCHES="${PATCHES_MONERO[@]}" cmake_src_prepare
+	popd > /dev/null || die
 
 	if use qt5 ; then
 		CMAKE_USE_DIR="${WORKDIR}/monero-gui-${PV}"
 		BUILD_DIR="${WORKDIR}/monero-gui-${PV}_build"
+		pushd "${CMAKE_USE_DIR}" > /dev/null || die
 		S="${CMAKE_USE_DIR}" PATCHES="${PATCHES_MONERO_GUI[@]}" cmake_src_prepare
+		popd > /dev/null || die
 	fi
 }
 
@@ -132,10 +135,8 @@ src_configure() {
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DBUILD_DOCUMENTATION="$(usex doc ON OFF)"
 		-DBUILD_TESTS=OFF
-		-DCOVERAGE=OFF
 		-DUSE_READLINE="$(usex readline ON OFF)"
 		-DBUILD_GUI_DEPS="$(usex qt5 ON OFF)"
-		-DINSTALL_VENDORED_LIBUNBOUND=OFF
 		-DBUILD_SHARED_LIBS=OFF
 		-DMANUAL_SUBMODULES=ON
 	)
@@ -158,6 +159,7 @@ src_configure() {
 		-DUSE_DEVICE_TREZOR="$(usex smartcard ON OFF)"
 		-DWITH_DESKTOP_ENTRY=ON
 		-DWITH_SCANNER=ON
+		-DWITH_UPDATER=OFF
 		-DDEV_MODE=OFF
 	)