diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2020-09-28 20:27:25 +0100 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2020-10-18 16:02:50 +0100 |
| commit | 9bc468e080d131f2279fd516c7decc87e79a3e07 (patch) | |
| tree | bb7c9c3f606e3677bd7557c7696cc0795f88ee77 | |
| parent | profiles: enable brotli in desktop (diff) | |
| download | portage-9bc468e080d131f2279fd516c7decc87e79a3e07.tar.xz | |
net-p2p/monero: version bump
Package-Manager: Portage-3.0.4, Repoman-3.0.1
23 files changed, 342 insertions, 565 deletions
diff --git a/net-p2p/monero-gui/Manifest b/net-p2p/monero-gui/Manifest deleted file mode 100644 index fd97378d..00000000 --- a/net-p2p/monero-gui/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST monero-0.16.0.3.tar.gz 10519009 BLAKE2B d972ca284b6150e467fe83f4da975308c31d2b66c4a322d228aad08e725c9d70947d82971852bbea3483bb371b7213417adde444f2a8222b3aa42639b8069cbb SHA512 146ceb9f27a03478364395e29022e319596d3ada66b4f48b57063e64dee31d8f7abd1a0502947d34d0e7ff2e3e1a5a1e49466a67bb08a22ed993d7e5afe94f3d -DIST monero-gui-0.16.0.3.tar.gz 4691951 BLAKE2B 2df126ea5958b3546d8224875f6ca0b7915bcc771102e6a8839e64ad61ef045dfce802d1bc265c174a5cc6fa9f204cfb2648bea764b215be5e052f5c2c77be68 SHA512 5a6dfb1f62ecda1ec3117f8d213f71c5fd562a4647e96dee9cfb8f97f1989f03b0a0f3e64e8c4d6be7857c11e617ce801e01d5ad752e1c2117f215b1a741fa79 diff --git a/net-p2p/monero-gui/metadata.xml b/net-p2p/monero-gui/metadata.xml deleted file mode 100644 index b6f20b92..00000000 --- a/net-p2p/monero-gui/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>bertrand@jacquin.bzh</email> - <name>Bertrand Jacquin</name> - </maintainer> - <use> - <flag name="qrcode">Enable QR code scanning with media-gfx/zbar</flag> - </use> -</pkgmetadata> diff --git a/net-p2p/monero-gui/monero-gui-0.16.0.3.ebuild b/net-p2p/monero-gui/monero-gui-0.16.0.3.ebuild deleted file mode 100644 index 29edad1d..00000000 --- a/net-p2p/monero-gui/monero-gui-0.16.0.3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qmake-utils toolchain-funcs flag-o-matic - -MONERO_PV="${PV}" - -DESCRIPTION="GUI for net-p2p/monero" -HOMEPAGE="https://getmonero.org" -SRC_URI="https://github.com/monero-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/monero-project/monero/archive/v${MONERO_PV}.tar.gz -> monero-${MONERO_PV}.tar.gz" - -LICENSE="NEWLIB" -SLOT="0" -KEYWORDS="~amd64" -IUSE="qrcode smartcard unwind" - -COMMON_DEPEND="net-p2p/monero:=[qt5,smartcard?,unwind?] - dev-db/lmdb:= - >=dev-libs/randomx-1.1.6:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtdeclarative:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtxmlpatterns:5[qml] - dev-qt/qtwidgets:5 - dev-libs/boost:= - dev-libs/openssl:0 - unwind? ( sys-libs/libunwind[lzma] ) - qrcode? ( - dev-qt/qtmultimedia:5 - media-gfx/zbar - ) - smartcard? ( - dev-libs/hidapi:= - virtual/libusb:= - dev-libs/protobuf:= - )" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtquickcontrols:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtgraphicaleffects:5 - media-fonts/fontawesome" - -src_unpack () { - default - - mkdir -p "${S}/monero/utils" || die - ln -snf "${WORKDIR}/monero-${MONERO_PV}/utils/gpg_keys" "${S}/monero/utils/gpg_keys" || die -} - -src_prepare () { - cat > "${S}/version.js" <<-EOF || die - var GUI_VERSION = "${PV};" - EOF - - export AR=$(tc-getAR) - export CC=$(tc-getCC) - export CXX=$(tc-getCXX) - - append-cxxflags "-I${WORKDIR}/monero-${MONERO_PV}/src" - append-cxxflags "-I${WORKDIR}/monero-${MONERO_PV}/contrib/epee/include" - append-cxxflags "-I${WORKDIR}/monero-${MONERO_PV}/external/easylogging++" - - default -} - -src_configure () { - local myconf=( "release" ) - - if use qrcode ; then - myconf+=( "WITH_SCANNER" ) - fi - - if ! use unwind ; then - myconf+=( "libunwind_off" ) - fi - - # CONFIG is expected to be a single argument, hence globbing - eqmake5 "CONFIG+=${myconf[*]}" -} - -src_compile () { - emake -C src/zxcvbn-c - - default -} - -src_install () { - dobin release/bin/monero-wallet-gui - dodoc README.md -} diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest deleted file mode 100644 index bf3b9226..00000000 --- a/net-p2p/monero/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST monero-0.16.0.3.tar.gz 10519009 BLAKE2B d972ca284b6150e467fe83f4da975308c31d2b66c4a322d228aad08e725c9d70947d82971852bbea3483bb371b7213417adde444f2a8222b3aa42639b8069cbb SHA512 146ceb9f27a03478364395e29022e319596d3ada66b4f48b57063e64dee31d8f7abd1a0502947d34d0e7ff2e3e1a5a1e49466a67bb08a22ed993d7e5afe94f3d -DIST monero-0.17.0.0.tar.gz 10583689 BLAKE2B 249030267da02a7cfca066d3aec9425c302706b7f28aee4a35f9a269917b63743a1c347fa5ba79d421915ec4a34052001c0fd263ca210f49b412c65650875adc SHA512 1c5578699a4b1dd2ab96b40539b408f2f756d34e5eb0c5dfc2cb3c29bfeca3025d69786b317b8b0d06783cd98354b964e209d58d8011d945dafbccfb603e294b -DIST trezor-common-cb901ba43c753d070f0310d858765c9f21cd7d8b.tar.gz 1306166 BLAKE2B 1290bac0da11b133bfb87738f79f9b54f3247378a3adc003bfa0b5a31b32e84b84fd872eaa6bda4c095aed9c7ea87fb897c0d95f117c8c81d072257f61e38929 SHA512 dd5c57c9226b0530b6f0df942577afc8d64e7811b06baca0f2c79c2d9c165f2aaf2e9bcfefcd2c5972cf7aa375e90ed48e7570178295213f85805a4d9947b945 diff --git a/net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch deleted file mode 100644 index d7aebe27..00000000 --- a/net-p2p/monero/files/0.16.0.3-Do-not-install-trezor-dep-libs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b5d4c4405a038e63c1cf1bd0f84e041ca35ed5bb 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 a0a166a93bb9..64a10e8b913b 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/0.16.0.3-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index 73a1944f..00000000 --- a/net-p2p/monero/files/0.16.0.3-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7b6c08d5dac6e4b42e81692e2d5297a213c75e04 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 71b165f4f166..072a26d19586 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 f8c177e3a99c..6ab425fd1d75 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/0.16.0.3-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch deleted file mode 100644 index 598dcc88..00000000 --- a/net-p2p/monero/files/0.16.0.3-Use-gentoo-dev-libs-randomx.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0a8fea3234d80c7b7bc73f47181e1d72dea448ff 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 - ---- - external/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 072a26d19586..10189ce3a2fb 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -70,4 +70,3 @@ endif() - - add_subdirectory(db_drivers) - add_subdirectory(easylogging++) --add_subdirectory(randomx EXCLUDE_FROM_ALL) diff --git a/net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch deleted file mode 100644 index e4280f4e..00000000 --- a/net-p2p/monero/files/0.16.0.3-Use-gentoo-versioning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7e4e6cab0c98aa7fc1fa2ffd811885fd5e27ddba 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 - ---- - cmake/Version.cmake | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/cmake/Version.cmake b/cmake/Version.cmake -index 26c2e2a1d447..d595b8293e1b 100644 ---- a/cmake/Version.cmake -+++ b/cmake/Version.cmake -@@ -31,20 +31,8 @@ function (write_version tag) - configure_file("${CMAKE_SOURCE_DIR}/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp") - endfunction () - --find_package(Git QUIET) --if ("$Format:$" STREQUAL "") -- # We're in a tarball; use hard-coded variables. -- set(VERSION_IS_RELEASE "true") -- write_version("release") --elseif (GIT_FOUND OR Git_FOUND) -- message(STATUS "Found Git: ${GIT_EXECUTABLE}") -- include(GitVersion) -- get_version_tag_from_git("${GIT_EXECUTABLE}") -- write_version("${VERSIONTAG}") --else() -- message(STATUS "WARNING: Git was not found!") -- set(VERSION_IS_RELEASE "false") -- write_version("unknown") --endif () -+set(VERSION_IS_RELEASE "true") -+write_version("release") -+ - add_custom_target(genversion ALL - DEPENDS "${CMAKE_BINARY_DIR}/version.cpp") diff --git a/net-p2p/monero/files/0.16.0.3-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch b/net-p2p/monero/files/0.16.0.3-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch deleted file mode 100644 index 941f4745..00000000 --- a/net-p2p/monero/files/0.16.0.3-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c62ddad29e57e5c7c535e860bc58db503bfcd8b7 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Sat, 30 Nov 2019 03:25:11 +0000 -Subject: [PATCH] https://sourceware.org/bugzilla/show_bug.cgi?id=25210 - ---- - CMakeLists.txt | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 882bc96c56a2..2cb9c040634d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -716,11 +716,6 @@ else() - CHECK_CXX_ACCEPTS_FLAG(-mfloat-abi=softfp CXX_ACCEPTS_MFLOAT_SOFTFP) - endif() - -- if(ARM8) -- CHECK_CXX_ACCEPTS_FLAG(-mfix-cortex-a53-835769 CXX_ACCEPTS_MFIX_CORTEX_A53_835769) -- CHECK_CXX_ACCEPTS_FLAG(-mfix-cortex-a53-843419 CXX_ACCEPTS_MFIX_CORTEX_A53_843419) -- endif() -- - if(ARM6) - message(STATUS "Selecting VFP for ARMv6") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp") -@@ -757,20 +752,6 @@ else() - endif() - endif(ARM7) - -- if(ARM8) -- if(CXX_ACCEPTS_MFIX_CORTEX_A53_835769) -- message(STATUS "Enabling Cortex-A53 workaround 835769") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfix-cortex-a53-835769") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfix-cortex-a53-835769") -- endif() -- -- if(CXX_ACCEPTS_MFIX_CORTEX_A53_843419) -- message(STATUS "Enabling Cortex-A53 workaround 843419") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfix-cortex-a53-843419") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfix-cortex-a53-843419") -- endif() -- endif(ARM8) -- - endif(ARM) - - if(ANDROID AND NOT BUILD_GUI_DEPS STREQUAL "ON" OR IOS) diff --git a/net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch b/net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch deleted file mode 100644 index 1dd1af02..00000000 --- a/net-p2p/monero/files/0.16.0.3-translations-use-host-compiler.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f5670abe068eb90650533ff64a354568ab47b84a 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 - -Do not pass target compiler and compiler flags as -generate_translations_header need to be created using host compiler and -compiler flags ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d9ec866e49ec..882bc96c56a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -453,7 +453,12 @@ ExternalProject_Add(generate_translations_header - SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/translations" - BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/translations" - STAMP_DIR ${LRELEASE_PATH} -- CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH} -+ CMAKE_ARGS -+ -DCMAKE_C_COMPILER=$ENV{BUILD_CC} -+ -DCMAKE_CXX_COMPILER=$ENV{BUILD_CXX} -+ -DCMAKE_C_FLAGS=$ENV{BUILD_CFLAGS} -+ -DCMAKE_CXX_FLAGS=$ENV{BUILD_CXXFLAGS} -+ -DLRELEASE_PATH=${LRELEASE_PATH} - INSTALL_COMMAND cmake -E echo "") - include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") - add_subdirectory(external) diff --git a/net-p2p/monero/files/0.17.0.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/monero-0.17.1.0-Do-not-install-trezor-dep-libs.patch index 801c375a..801c375a 100644 --- a/net-p2p/monero/files/0.17.0.0-Do-not-install-trezor-dep-libs.patch +++ b/net-p2p/monero/files/monero-0.17.1.0-Do-not-install-trezor-dep-libs.patch diff --git a/net-p2p/monero/files/0.17.0.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-0.17.1.0-Drop-in-tree-miniupnpc.patch index cbb3a7f9..cbb3a7f9 100644 --- a/net-p2p/monero/files/0.17.0.0-Drop-in-tree-miniupnpc.patch +++ b/net-p2p/monero/files/monero-0.17.1.0-Drop-in-tree-miniupnpc.patch diff --git a/net-p2p/monero/files/0.17.0.0-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch index f6540042..f6540042 100644 --- a/net-p2p/monero/files/0.17.0.0-Use-gentoo-dev-libs-randomx.patch +++ b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-dev-libs-randomx.patch diff --git a/net-p2p/monero/files/0.17.0.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-versioning.patch index bfb6896a..bfb6896a 100644 --- a/net-p2p/monero/files/0.17.0.0-Use-gentoo-versioning.patch +++ b/net-p2p/monero/files/monero-0.17.1.0-Use-gentoo-versioning.patch diff --git a/net-p2p/monero/files/0.17.0.0-translations-use-host-compiler.patch b/net-p2p/monero/files/monero-0.17.1.0-translations-use-host-compiler.patch index b3ae7d7d..b3ae7d7d 100644 --- a/net-p2p/monero/files/0.17.0.0-translations-use-host-compiler.patch +++ b/net-p2p/monero/files/monero-0.17.1.0-translations-use-host-compiler.patch diff --git a/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch new file mode 100644 index 00000000..849fc32d --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-fix-install-targets.patch @@ -0,0 +1,32 @@ +From 44df1bccfc69f8390fd405828d469a250f5397a2 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sat, 17 Oct 2020 22:49:17 +0100 +Subject: [PATCH] cmake: fix install targets + +Binary should be installed in bin/ relative to CMAKE_INSTALL_PREFIX, +prior to this commit, monero-wallet-gui is installed in usr/ instead of +usr/bin + + -- Installing: image/usr/monero-wallet-gui + +With this comment, file is installed in the right location: + + -- Installing: image/usr/bin/monero-wallet-gui + +See: https://cmake.org/cmake/help/latest/command/install.html +See: https://github.com/monero-project/monero-gui/pull/3172 +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c7822ee7690e..b3f7fa4aaed3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -178,5 +178,5 @@ add_custom_command(TARGET monero-wallet-gui POST_BUILD COMMAND ${CMAKE_COMMAND} + include(Deploy) + + install(TARGETS monero-wallet-gui +- DESTINATION ${CMAKE_INSTALL_PREFIX} ++ DESTINATION bin + ) diff --git a/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch new file mode 100644 index 00000000..b7c19692 --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-remove-Werror.patch @@ -0,0 +1,39 @@ +From fbaf0c4b21fb5390758311ff70644623b6697bf2 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 + +See: https://bugs.gentoo.org/show_bug.cgi?id=652650 +--- + CMakeLists.txt | 2 -- + monero-wallet-gui.pro | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 197e7c301120..a865ec4fa922 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -422,8 +422,6 @@ if(APPLE) + endif() + + # warnings +-add_c_flag_if_supported(-Werror C_SECURITY_FLAGS) +-add_cxx_flag_if_supported(-Werror CXX_SECURITY_FLAGS) + add_c_flag_if_supported(-Wformat C_SECURITY_FLAGS) + add_cxx_flag_if_supported(-Wformat CXX_SECURITY_FLAGS) + add_c_flag_if_supported(-Wformat-security C_SECURITY_FLAGS) +diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro +index 271786236b98..49506e09e9e2 100644 +--- a/monero-wallet-gui.pro ++++ b/monero-wallet-gui.pro +@@ -187,8 +187,8 @@ android { + + + +-QMAKE_CXXFLAGS += -Werror -Wformat -Wformat-security +-QMAKE_CFLAGS += -Werror -Wformat -Wformat-security ++QMAKE_CXXFLAGS += -Wformat -Wformat-security ++QMAKE_CFLAGS += -Wformat -Wformat-security + QMAKE_CXXFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2 + QMAKE_CFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2 + diff --git a/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch new file mode 100644 index 00000000..e20fb6f4 --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-cmake-use-gentoo-versioning.patch @@ -0,0 +1,35 @@ +From 5a4a63dbf9608c82c1cf18e0abc529d2a9ac5258 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 + +--- + cmake/VersionGui.cmake | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/cmake/VersionGui.cmake b/cmake/VersionGui.cmake +index 960c3f4e0d05..ef1af288495d 100644 +--- a/cmake/VersionGui.cmake ++++ b/cmake/VersionGui.cmake +@@ -30,20 +30,7 @@ function (write_static_version_header VERSION_TAG_GUI) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.js.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.js") + endfunction () + +-find_package(Git QUIET) +-if ("$Format:$" STREQUAL "") +- # We're in a tarball; use hard-coded variables. +- write_static_version_header("release") +-elseif (GIT_FOUND OR Git_FOUND) +- message(STATUS "Found Git: ${GIT_EXECUTABLE}") ++write_static_version_header("@@PV@@") + +- include(GitGetVersionTag) +- git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} VERSION_TAG_GUI) +- STRING(REGEX REPLACE "^v([0-9])" "\\1" VERSION_TAG_GUI ${VERSION_TAG_GUI}) +- write_static_version_header(${VERSION_TAG_GUI}) +-else() +- message(STATUS "WARNING: Git was not found!") +- write_static_version_header("unknown") +-endif () + add_custom_target(genversiongui ALL + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/version.js") diff --git a/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch b/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch new file mode 100644 index 00000000..79d5b98c --- /dev/null +++ b/net-p2p/monero/files/monero-gui-0.17.1.0-wallet-set-right-signedness.patch @@ -0,0 +1,34 @@ +From fb802658e2205f6829f966b27455c000e6094529 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sat, 17 Oct 2020 13:54:01 +0100 +Subject: [PATCH] wallet: set right signedness + +libwalletqt fails to build with gcc 9.3.0 and QT 5.14.2 with the +following error + + x86_64-pc-linux-gnu-g++ -c -march=native -O2 -pipe -fomit-frame-pointer -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-0.17.1.0/src -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-0.17.1.0/contrib/epee/include -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-0.17.1.0/external/easylogging++ -fPIC -fstack-protector -fstack-protector-strong -Werror -Wformat -Wformat-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2 -std=gnu++11 -pthread -Wall -Wextra -D_REENTRANT -fPIC -DWITH_SCANNER -DQT_NO_DEBUG -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_MULTIMEDIA_LIB -DQT_GUI_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I. -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/include -Isrc/libwalletqt -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/src/QR-Code-generator -Isrc -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/src -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/external/easylogging++ -I/var/tmp/portage/net-p2p/monero-gui-0.17.1.0/work/monero-gui-0.17.1.0/monero/contrib/epee/include -Isrc/QR-Code-scanner -isystem /usr/include/libusb-1.0 -isystem /usr/include/hidapi -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtSvg -isystem /usr/include/qt5/QtWidgets -isystem /usr/include/qt5/QtGui/5.14.2 -isystem /usr/include/qt5/QtGui/5.14.2/QtGui -isystem /usr/include/qt5/QtQuick -isystem /usr/include/qt5/QtMultimedia -isystem /usr/include/qt5/QtGui -isystem /usr/include/qt5/QtQmlModels -isystem /usr/include/qt5/QtQml -isystem /usr/include/qt5/QtNetwork -isystem /usr/include/qt5/QtCore/5.14.2 -isystem /usr/include/qt5/QtCore/5.14.2/QtCore -isystem /usr/include/qt5/QtCore -I. -I/usr/lib64/qt5/mkspecs/linux-g++ -o Wallet.o src/libwalletqt/Wallet.cpp + src/libwalletqt/Wallet.cpp: In lambda function: + src/libwalletqt/Wallet.cpp:1129:29: error: comparison of integer expressions of different signedness: 'const long int' and 'const size_t' {aka 'const long unsigned int'} [-Werror=sign-compare] + 1129 | if (elapsed >= refreshIntervalSec) + | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ + cc1plus: all warnings being treated as errors + make: *** [Makefile:1934: Wallet.o] Error 1 + +See: https://github.com/monero-project/monero-gui/pull/3173 +--- + src/libwalletqt/Wallet.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp +index 454dca29b23f..93156c2b7b3d 100644 +--- a/src/libwalletqt/Wallet.cpp ++++ b/src/libwalletqt/Wallet.cpp +@@ -1125,7 +1125,7 @@ void Wallet::startRefreshThread() + if (m_refreshEnabled) + { + const auto now = std::chrono::steady_clock::now(); +- const auto elapsed = std::chrono::duration_cast<std::chrono::seconds>(now - last).count(); ++ const size_t elapsed = std::chrono::duration_cast<std::chrono::seconds>(now - last).count(); + if (elapsed >= refreshIntervalSec) + { + refresh(false); diff --git a/net-p2p/monero/monero-0.16.0.3.ebuild b/net-p2p/monero/monero-0.16.0.3.ebuild deleted file mode 100644 index 29b55430..00000000 --- a/net-p2p/monero/monero-0.16.0.3.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs python-single-r1 systemd - -DESCRIPTION="Secure, private, untraceable cryptocurrency" -HOMEPAGE="https://getmonero.org" - -TREZOR_COMMON_COMMIT="cb901ba43c753d070f0310d858765c9f21cd7d8b" - -SRC_URI="https://github.com/monero-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - smartcard? ( https://github.com/trezor/trezor-common/archive/${TREZOR_COMMON_COMMIT}.tar.gz -> trezor-common-${TREZOR_COMMON_COMMIT}.tar.gz )" - -LICENSE="NEWLIB" -SLOT="0/${PV}" -KEYWORDS="~amd64" -CPU_FLAGS="cpu_flags_arm_aes cpu_flags_x86_aes" -IUSE="doc qt5 nls readline smartcard unwind ${CPU_FLAGS}" - -RDEPEND="net-dns/unbound:=[threads] - >=dev-libs/randomx-1.1.6:= - net-libs/miniupnpc:= - dev-libs/openssl:0 - >=dev-libs/boost-1.62:=[icu,threads,nls] - net-libs/zeromq:=[sodium] - dev-libs/rapidjson:= - readline? ( sys-libs/readline:= ) - unwind? ( sys-libs/libunwind[lzma] ) - smartcard? ( - dev-libs/hidapi:= - virtual/libusb:= - dev-libs/protobuf:= - $(python_gen_cond_dep 'dev-python/protobuf-python:=[${PYTHON_MULTI_USEDEP}]') - ) - acct-user/monero - acct-group/monero" -DEPEND="${PYTHON_DEPS} - doc? ( - media-gfx/graphviz - app-doc/doxygen:0 - ) - nls? ( dev-qt/qtchooser ) - ${RDEPEND}" -PDEPEND="qt5? ( net-p2p/monero-gui )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}/${PV}-Drop-in-tree-miniupnpc.patch" - "${FILESDIR}/${PV}-Use-gentoo-versioning.patch" - "${FILESDIR}/${PV}-Do-not-install-trezor-dep-libs.patch" - "${FILESDIR}/${PV}-Use-gentoo-dev-libs-randomx.patch" - "${FILESDIR}/${PV}-translations-use-host-compiler.patch" - "${FILESDIR}/${PV}-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch" -) - -QA_MULTILIB_PATHS="usr/lib/.*" - -CMAKE_BUILD_TYPE=Release - -src_unpack() { - default - - if use smartcard ; then - unpack "trezor-common-${TREZOR_COMMON_COMMIT}.tar.gz" - - rm -r "${S}/external/trezor-common" || die - mv "trezor-common-${TREZOR_COMMON_COMMIT}" "${S}/external/trezor-common" || die - fi -} - -src_prepare() { - cmake_src_prepare - - append-cflags -DUSE_EXTRA_EC_CERT - append-cxxflags -DUSE_EXTRA_EC_CERT - tc-export_build_env BUILD_C{C,XX} -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TAG="$(tc-arch)" - -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 - -DMANUAL_SUBMODULES=ON - ) - - if use cpu_flags_arm_aes || use cpu_flags_x86_aes ; then - mycmakeargs+=( -DNO_AES=OFF ) - else - mycmakeargs+=( -DNO_AES=ON ) - fi - - export DATABASE="lmdb" - export DEVELOPER_LOCAL_TOOLS=0 - export DEVELOPER_LIBUNBOUND_OLD=0 - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /etc - doins utils/conf/monerod.conf - - newinitd "${FILESDIR}/monerod.initd" monerod - systemd_dounit utils/systemd/monerod.service -} diff --git a/net-p2p/monero/monero-0.17.0.0.ebuild b/net-p2p/monero/monero-0.17.0.0.ebuild deleted file mode 100644 index edad098b..00000000 --- a/net-p2p/monero/monero-0.17.0.0.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs python-single-r1 systemd - -DESCRIPTION="Secure, private, untraceable cryptocurrency" -HOMEPAGE="https://getmonero.org" - -TREZOR_COMMON_COMMIT="cb901ba43c753d070f0310d858765c9f21cd7d8b" - -SRC_URI="https://github.com/monero-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - smartcard? ( https://github.com/trezor/trezor-common/archive/${TREZOR_COMMON_COMMIT}.tar.gz -> trezor-common-${TREZOR_COMMON_COMMIT}.tar.gz )" - -LICENSE="NEWLIB" -SLOT="0/${PV}" -KEYWORDS="~amd64" -CPU_FLAGS="cpu_flags_arm_aes cpu_flags_x86_aes" -IUSE="doc qt5 nls readline smartcard unwind ${CPU_FLAGS}" - -RDEPEND="net-dns/unbound:=[threads] - >=dev-libs/randomx-1.1.6:= - net-libs/miniupnpc:= - dev-libs/openssl:0 - >=dev-libs/boost-1.62:=[icu,threads,nls] - net-libs/zeromq:=[sodium] - dev-libs/rapidjson:= - readline? ( sys-libs/readline:= ) - unwind? ( sys-libs/libunwind[lzma] ) - smartcard? ( - dev-libs/hidapi:= - virtual/libusb:= - virtual/libudev:= - dev-libs/protobuf:= - $(python_gen_cond_dep 'dev-python/protobuf-python:=[${PYTHON_MULTI_USEDEP}]') - ) - acct-user/monero - acct-group/monero" -DEPEND="${PYTHON_DEPS} - doc? ( - media-gfx/graphviz - app-doc/doxygen:0 - ) - nls? ( dev-qt/qtchooser ) - ${RDEPEND}" -PDEPEND="qt5? ( net-p2p/monero-gui )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}/${PV}-Drop-in-tree-miniupnpc.patch" - "${FILESDIR}/${PV}-Use-gentoo-versioning.patch" - "${FILESDIR}/${PV}-Do-not-install-trezor-dep-libs.patch" - "${FILESDIR}/${PV}-Use-gentoo-dev-libs-randomx.patch" - "${FILESDIR}/${PV}-translations-use-host-compiler.patch" -) - -QA_MULTILIB_PATHS="usr/lib/.*" - -CMAKE_BUILD_TYPE=Release - -src_unpack() { - default - - if use smartcard ; then - unpack "trezor-common-${TREZOR_COMMON_COMMIT}.tar.gz" - - rm -r "${S}/external/trezor-common" || die - mv "trezor-common-${TREZOR_COMMON_COMMIT}" "${S}/external/trezor-common" || die - fi -} - -src_prepare() { - cmake_src_prepare - - append-cflags -DUSE_EXTRA_EC_CERT - append-cxxflags -DUSE_EXTRA_EC_CERT - tc-export_build_env BUILD_C{C,XX} -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TAG="$(tc-arch)" - -DUSE_CCACHE=OFF - -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 - ) - - if use cpu_flags_arm_aes || use cpu_flags_x86_aes ; then - mycmakeargs+=( -DNO_AES=OFF ) - else - mycmakeargs+=( -DNO_AES=ON ) - fi - - export DATABASE="lmdb" - export DEVELOPER_LOCAL_TOOLS=0 - export DEVELOPER_LIBUNBOUND_OLD=0 - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /etc - doins utils/conf/monerod.conf - - newinitd "${FILESDIR}/monerod.initd" monerod - systemd_dounit utils/systemd/monerod.service -} diff --git a/net-p2p/monero/monero-0.17.1.0.ebuild b/net-p2p/monero/monero-0.17.1.0.ebuild new file mode 100644 index 00000000..33186f67 --- /dev/null +++ b/net-p2p/monero/monero-0.17.1.0.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +CMAKE_MAKEFILE_GENERATOR="emake" +inherit git-r3 cmake flag-o-matic toolchain-funcs python-single-r1 systemd + +DESCRIPTION="Secure, private, untraceable cryptocurrency" +HOMEPAGE="https://getmonero.org" + +EGIT_REPO_URI="https://github.com/monero-project/${PN}.git" +EGIT_COMMIT="v${PV}" +EGIT_SUBMODULES=( external/trezor-common external/supercop ) + +LICENSE="NEWLIB" +SLOT="0/${PV}" +KEYWORDS="~amd64" +CPU_FLAGS="cpu_flags_arm_aes cpu_flags_x86_aes" +IUSE="doc qt5 nls readline smartcard ${CPU_FLAGS}" + +RDEPEND="net-dns/unbound:=[threads] + >=dev-libs/randomx-1.1.6:= + net-libs/miniupnpc:= + dev-libs/openssl:0 + >=dev-libs/boost-1.62:=[icu,threads,nls] + net-libs/zeromq:=[sodium] + dev-libs/rapidjson:= + readline? ( sys-libs/readline:= ) + smartcard? ( + dev-libs/hidapi:= + virtual/libusb:= + virtual/libudev:= + dev-libs/protobuf:= + $(python_gen_cond_dep 'dev-python/protobuf-python:=[${PYTHON_MULTI_USEDEP}]') + ) + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtdeclarative:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtxmlpatterns:5[qml] + dev-qt/qtwidgets:5 + dev-qt/qtmultimedia:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtgraphicaleffects:5 + dev-libs/hidapi:= + media-gfx/zbar[jpeg,v4l] + media-fonts/fontawesome[ttf] + ) + acct-user/monero + acct-group/monero" +DEPEND="${PYTHON_DEPS} + doc? ( + media-gfx/graphviz + app-doc/doxygen:0 + ) + nls? ( dev-qt/qtchooser ) + qt5? ( dev-qt/linguist-tools:5 ) + ${RDEPEND}" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +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" +) + +PATCHES_MONERO_GUI=( + "${FILESDIR}/monero-gui-${PV}-cmake-remove-Werror.patch" + "${FILESDIR}/monero-gui-${PV}-wallet-set-right-signedness.patch" + "${FILESDIR}/monero-gui-${PV}-cmake-fix-install-targets.patch" + "${FILESDIR}/monero-gui-${PV}-cmake-use-gentoo-versioning.patch" +) + +CMAKE_BUILD_TYPE=Release + +src_unpack() { + git-r3_src_unpack + + if use qt5 ; then + git-r3_fetch "https://github.com/monero-project/${PN}-gui.git" "${EGIT_COMMIT}" + git-r3_checkout "https://github.com/monero-project/${PN}-gui.git" "${WORKDIR}/monero-gui-${PV}" + + rm -rf "${WORKDIR}/monero-gui-${PV}/monero" || die + ln -snf "${WORKDIR}/monero-${PV}" "${WORKDIR}/monero-gui-${PV}/monero" || die + fi +} + +src_prepare() { + export AR=$(tc-getAR) + export CC=$(tc-getCC) + export CXX=$(tc-getCXX) + tc-export_build_env BUILD_C{C,XX} + + append-cflags -DUSE_EXTRA_EC_CERT + append-cxxflags -DUSE_EXTRA_EC_CERT + + CMAKE_USE_DIR="${WORKDIR}/monero-${PV}" + BUILD_DIR="${WORKDIR}/monero-${PV}_build" + S="${CMAKE_USE_DIR}" PATCHES="${PATCHES_MONERO[@]}" cmake_src_prepare + + if use qt5 ; then + CMAKE_USE_DIR="${WORKDIR}/monero-gui-${PV}" + BUILD_DIR="${WORKDIR}/monero-gui-${PV}_build" + S="${CMAKE_USE_DIR}" PATCHES="${PATCHES_MONERO_GUI[@]}" cmake_src_prepare + + sed -i \ + -e "s/@@PV@@/${PV}/" \ + "${WORKDIR}/monero-gui-${PV}/cmake/VersionGui.cmake" \ + || die + fi +} + +src_configure() { + local mycmakeargs + local cmakeargs_monero=( + -DBUILD_TAG="$(tc-arch)" + -DUSE_CCACHE=OFF + -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 + ) + + if use cpu_flags_arm_aes || use cpu_flags_x86_aes ; then + cmakeargs_monero+=( -DNO_AES=OFF ) + else + cmakeargs_monero+=( -DNO_AES=ON ) + fi + + local cmakeargs_monerogui=( + "${cmakeargs_monero[@]}" + -DUSE_DEVICE_TREZOR="$(usex smartcard ON OFF)" + -DENABLE_PASS_STRENGTH_METER=ON + -DWITH_SCANNER=ON + -DDEV_MODE=OFF + ) + + export DATABASE="lmdb" + export DEVELOPER_LOCAL_TOOLS=0 + export DEVELOPER_LIBUNBOUND_OLD=0 + + CMAKE_USE_DIR="${WORKDIR}/monero-${PV}" + BUILD_DIR="${WORKDIR}/monero-${PV}_build" + mycmakeargs=( ${cmakeargs_monero[@]} ) + cmake_src_configure + + if use qt5 ; then + CMAKE_USE_DIR="${WORKDIR}/monero-gui-${PV}" + BUILD_DIR="${WORKDIR}/monero-gui-${PV}_build" + mycmakeargs=( ${cmakeargs_monerogui[@]} ) + cmake_src_configure + fi +} + +src_compile() { + CMAKE_USE_DIR="${WORKDIR}/monero-${PV}" + BUILD_DIR="${WORKDIR}/monero-${PV}_build" + cmake_src_compile + + if use qt5 ; then + emake -C "${WORKDIR}/monero-gui-${PV}/src/zxcvbn-c" + + CMAKE_USE_DIR="${WORKDIR}/monero-gui-${PV}" + BUILD_DIR="${WORKDIR}/monero-gui-${PV}_build" + cmake_src_compile + fi +} + +src_install() { + CMAKE_USE_DIR="${WORKDIR}/monero-${PV}" + BUILD_DIR="${WORKDIR}/monero-${PV}_build" + cmake_src_install + + if use qt5 ; then + CMAKE_USE_DIR="${WORKDIR}/monero-gui-${PV}" + BUILD_DIR="${WORKDIR}/monero-gui-${PV}_build" + cmake_src_install + fi + + rm -rf "${ED}/usr/include" || die + rm -rf "${ED}/usr/lib" || die + + insinto /etc + doins utils/conf/monerod.conf + + newinitd "${FILESDIR}/monerod.initd" monerod + systemd_dounit utils/systemd/monerod.service +} diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 8bad73ea..633a1d05 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -64,7 +64,6 @@ net-misc/icmptx:server - Enable server support net-p2p/dogecoin:qrcode - Enable generation of QR Codes for receiving payments net-p2p/dogecoin:utils - Build the utils net-p2p/dogecoin:wallet - Enable wallet support -net-p2p/monero-gui:qrcode - Enable QR code scanning with media-gfx/zbar net-p2p/pesetacoin:qrcode - Enable generation of QR Codes for receiving payments net-p2p/pesetacoin:wallet - Enable wallet support sys-firmware/gnuk:tools - Install aditional tools |