diff options
| -rw-r--r-- | net-p2p/monero/Manifest | 1 | ||||
| -rw-r--r-- | net-p2p/monero/files/0.15.0.0-Do-not-install-trezor-dep-libs.patch | 25 | ||||
| -rw-r--r-- | net-p2p/monero/files/0.15.0.0-Drop-in-tree-miniupnpc.patch | 57 | ||||
| -rw-r--r-- | net-p2p/monero/files/0.15.0.0-Use-gentoo-dev-libs-randomx.patch | 18 | ||||
| -rw-r--r-- | net-p2p/monero/files/0.15.0.0-Use-gentoo-versioning.patch | 37 | ||||
| -rw-r--r-- | net-p2p/monero/monero-0.15.0.0.ebuild | 98 |
6 files changed, 236 insertions, 0 deletions
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index c0042073..d63bc5ae 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,2 +1,3 @@ DIST monero-0.14.1.2.tar.gz 9052395 BLAKE2B bc419877f8040566ae64312123f4e20a7683b43a22c642f3f01451d52a349d32470b1198fa218a1145a1de63a2746378e3e5bc986cc93778daabcf227e7853b7 SHA512 c3c3b7cb6e6d5ab5fd28fddd4c0d40978ede0b281f27d714ab909c6c85f73da6e56a6114ddeed6b520a462e0066d5412ca8e38370e1c89113015b880bbd926fd +DIST monero-0.15.0.0.tar.gz 10383817 BLAKE2B 2238f961e39190a3ad08dec0cb19a20567df7936d4251c15bef4dd4a7b1ca53dfde9dd3d2375eb339198d18fdcd0c0af20f1b06725d5b71a6d738d6c4b254be3 SHA512 8290800e78b266230292ebbea71dd8c5bceb967f20de0a17aa59dd67aff737f45102105a530e5bfd63be0e9ccec56f680009ad891d87db6fd21f93d1220cb19f DIST trezor-common-31a0073c62738827b48d725facd3766879429124.tar.gz 1329234 BLAKE2B 1d02969183c7df068797649e0f4a68887dae3ff673a488ad96a33753a3c3cdfa2f210f5d6f895a8bcc3c2498e6c77a62f890bd6dea795b04d23cda2d7050ad09 SHA512 dbea8e80809046cd620ae4ad90cb4c715c07f614b29735ebd6cc8347d721f130e2f9c01c7f3a311d5f5e2a731c29821402a1fa9e027c710e594a1c6dccd5273e diff --git a/net-p2p/monero/files/0.15.0.0-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.15.0.0-Do-not-install-trezor-dep-libs.patch new file mode 100644 index 00000000..bd82f089 --- /dev/null +++ b/net-p2p/monero/files/0.15.0.0-Do-not-install-trezor-dep-libs.patch @@ -0,0 +1,25 @@ +From ccee640ae7af98c6ad129ad2bad5497c860e026b Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sat, 15 Jun 2019 00:57:09 +0100 +Subject: [PATCH 3/3] 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 3be1a6f6b2bf..8b0008fadf15 100644 +--- a/src/wallet/CMakeLists.txt ++++ b/src/wallet/CMakeLists.txt +@@ -148,11 +148,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.15.0.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.15.0.0-Drop-in-tree-miniupnpc.patch new file mode 100644 index 00000000..7736e369 --- /dev/null +++ b/net-p2p/monero/files/0.15.0.0-Drop-in-tree-miniupnpc.patch @@ -0,0 +1,57 @@ +From 918206c8f3a80a590e5a6fafc33b756d75a5271c Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sun, 17 Jun 2018 22:34:11 +0100 +Subject: [PATCH 1/3] Drop in-tree miniupnpc + +Since 6b8539803184 ("Build: update CMake and p2p for in-tree +miniupnp"), a hard dependency is made on miniupnpc which is a git +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 f8094bfa8d8f..aa039fa17ee3 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.15.0.0-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/0.15.0.0-Use-gentoo-dev-libs-randomx.patch new file mode 100644 index 00000000..4eead2fe --- /dev/null +++ b/net-p2p/monero/files/0.15.0.0-Use-gentoo-dev-libs-randomx.patch @@ -0,0 +1,18 @@ +From f5ed8309bceea680f2c36830e348f962467fc67f 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.15.0.0-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.15.0.0-Use-gentoo-versioning.patch new file mode 100644 index 00000000..614e9956 --- /dev/null +++ b/net-p2p/monero/files/0.15.0.0-Use-gentoo-versioning.patch @@ -0,0 +1,37 @@ +From ccdcaff338ab3647db92c00a9f0dc4f490f8df42 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sat, 15 Jun 2019 00:15:54 +0100 +Subject: [PATCH 2/3] 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/monero-0.15.0.0.ebuild b/net-p2p/monero/monero-0.15.0.0.ebuild new file mode 100644 index 00000000..dd45080f --- /dev/null +++ b/net-p2p/monero/monero-0.15.0.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{3_6,3_7} ) +inherit cmake-utils user systemd python-r1 + +DESCRIPTION="Secure, private, untraceable cryptocurrency" +HOMEPAGE="https://getmonero.org" + +TREZOR_COMMON_COMMIT="31a0073c62738827b48d725facd3766879429124" + +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" +IUSE="doc qt5 readline smartcard unwind" + +RDEPEND="dev-db/lmdb + 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] + net-libs/cppzmq:= + dev-libs/rapidjson:= + net-libs/openpgm:= + readline? ( sys-libs/readline:= ) + unwind? ( sys-libs/libunwind[lzma] ) + smartcard? ( + dev-libs/hidapi:= + virtual/libusb:= + dev-libs/protobuf:= + dev-python/protobuf-python:=[${PYTHON_USEDEP}] + )" +DEPEND="${PYTHON_DEPS} + >=dev-util/cmake-2.8.7 + doc? ( + media-gfx/graphviz + app-doc/doxygen:0 + ) + ${RDEPEND}" +PDEPEND="qt5? ( net-p2p/monero-gui )" + +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" +) + +CMAKE_BUILD_TYPE=Release + +pkg_setup() { + enewgroup monero + enewuser monero -1 -1 /var/lib/monero monero +} + +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_configure() { + local mycmakeargs=( + -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 + ) + + export DATABASE="lmdb" + export DEVELOPER_LOCAL_TOOLS=0 + export DEVELOPER_LIBUNBOUND_OLD=0 + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + insinto /etc + doins utils/conf/monerod.conf + + systemd_dounit utils/systemd/monerod.service +} |