diff options
| -rw-r--r-- | net-p2p/monero/Manifest | 1 | ||||
| -rw-r--r-- | net-p2p/monero/files/0.13.0.2-Drop-in-tree-miniupnpc.patch | 57 | ||||
| -rw-r--r-- | net-p2p/monero/monero-0.13.0.2.ebuild | 54 |
3 files changed, 112 insertions, 0 deletions
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index ca9f6b5e..b00f86f2 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1 +1,2 @@ DIST monero-0.12.3.0.tar.gz 8431327 BLAKE2B dfc46780ff26ba9369afc869ee37fbe252a5999246b9fc3732cdd78bf9a8d416fdddcc91b59aebce363021fd9719fd8838e3d99e01ad352b5d345b2003be0e43 SHA512 9e78a66c2f76ebcefd355442f659a9a02298ec34ffca5ee514763b688d999da25cd1b96dd98255bacda7448e783b1c52e8d9effbbf3a75d1f0be1b5788d4b1ca +DIST monero-0.13.0.2.tar.gz 8614595 BLAKE2B ceaa14e0703599a6bca5528c661dc5186bced659ee7b9e835a1e4b9c9bbf36aa55d1c622c5e3d12f04d161a0b5655d20b365cacf8704ee178cf1f022f9f8c08c SHA512 6e139774188752d4f632bc8161d695c2a13b44c62b52d55a7ce55725d0f5885c2634670a4206d57e76ce56c9b4e3755aa43199df709ad91f1a639511f8ee9b29 diff --git a/net-p2p/monero/files/0.13.0.2-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.13.0.2-Drop-in-tree-miniupnpc.patch new file mode 100644 index 00000000..034f4dd2 --- /dev/null +++ b/net-p2p/monero/files/0.13.0.2-Drop-in-tree-miniupnpc.patch @@ -0,0 +1,57 @@ +From 370f436d94714772a447181b68ed2d86a14a78cc 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 7553f87ea968..59996bf0c2f7 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 74924e4f437c..3554dd0d8806 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -49,9 +49,9 @@ + #include "storages/levin_abstract_invoke2.h" + #include "cryptonote_core/cryptonote_core.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/monero-0.13.0.2.ebuild b/net-p2p/monero/monero-0.13.0.2.ebuild new file mode 100644 index 00000000..a255bd61 --- /dev/null +++ b/net-p2p/monero/monero-0.13.0.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit cmake-utils + +DESCRIPTION="Secure, private, untraceable cryptocurrency" +HOMEPAGE="https://getmonero.org" +SRC_URI="https://github.com/monero-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="NEWLIB" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc qt5 readline smartcard unwind" + +RDEPEND="dev-db/lmdb + net-dns/unbound:=[threads] + net-libs/miniupnpc:= + dev-libs/openssl:0 + dev-libs/boost:= + 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:= )" +DEPEND=">=dev-util/cmake-3.5 + doc? ( + media-gfx/graphviz + app-doc/doxygen:0 + ) + ${RDEPEND}" +PDEPEND="qt5? ( =net-p2p/monero-gui-${PV} )" + +PATCHES=( "${FILESDIR}/${PV}-Drop-in-tree-miniupnpc.patch" ) + +src_configure () { + local mycmakeargs=( + -DCMAKE_BUILD_TYPE=Release + -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 + ) + + export DATABASE="lmdb" + export DEVELOPER_LOCAL_TOOLS=0 + export DEVELOPER_LIBUNBOUND_OLD=0 + + cmake-utils_src_configure +} |