diff options
| -rw-r--r-- | net-p2p/monero/Manifest | 1 | ||||
| -rw-r--r-- | net-p2p/monero/files/0.13.0.4-Drop-in-tree-miniupnpc.patch | 57 | ||||
| -rw-r--r-- | net-p2p/monero/monero-0.13.0.4.ebuild | 55 |
3 files changed, 0 insertions, 113 deletions
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index 992ce588..a1a37e92 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,2 +1 @@ -DIST monero-0.13.0.4.tar.gz 8615614 BLAKE2B 3d9061a9fc19fd52190a720265429c640d970302c8a2bb72e81c1958ca319d81684e6ed6265cf1bf012a22e7b6481fdb9403fee5843ebb6421209b0bd4353b47 SHA512 3c74aca71c5debf3b8e0b408bd17604ddcb11489358dce4f69cdb9c306ab88ed0cedb13b861341ec8db441c694ec125b11b1a865e2c51df3d6f6a5857775c612 DIST monero-0.14.0.2.tar.gz 8659788 BLAKE2B a852608343ddc920725f5b9769d00b8cf5eef84d509a6de40ee8971a5f2741912cdcb7c0375a1233a6aae080618f634dd52e3ed1a1850755e15744b65e436bd9 SHA512 f58718f6ef182796dfe14153c5e8e476289804acc20ce63275e1ca82b1b160473864859dabe42269c20c59054f29dc2a355be24e95466ce78fea15678301b3f4 diff --git a/net-p2p/monero/files/0.13.0.4-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.13.0.4-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index 034f4dd2..00000000 --- a/net-p2p/monero/files/0.13.0.4-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -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.4.ebuild b/net-p2p/monero/monero-0.13.0.4.ebuild deleted file mode 100644 index ee0b71c7..00000000 --- a/net-p2p/monero/monero-0.13.0.4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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" ) - -CMAKE_BUILD_TYPE=Release - -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 - ) - - export DATABASE="lmdb" - export DEVELOPER_LOCAL_TOOLS=0 - export DEVELOPER_LIBUNBOUND_OLD=0 - - cmake-utils_src_configure -} |