From 16e12de79657eafdd48dfdaa219bd7909c4c925b Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 28 Oct 2018 19:19:07 +0000 Subject: net-p2p/monero: Version bump Package-Manager: Portage-2.3.49, Repoman-2.3.11 --- net-p2p/monero/Manifest | 3 +- .../files/0.12.3.0-Drop-in-tree-miniupnpc.patch | 57 --------------------- .../files/0.13.0.3-Drop-in-tree-miniupnpc.patch | 57 --------------------- .../files/0.13.0.4-Drop-in-tree-miniupnpc.patch | 57 +++++++++++++++++++++ net-p2p/monero/metadata.xml | 3 -- net-p2p/monero/monero-0.12.3.0.ebuild | 58 ---------------------- net-p2p/monero/monero-0.13.0.3.ebuild | 55 -------------------- net-p2p/monero/monero-0.13.0.4.ebuild | 55 ++++++++++++++++++++ profiles/use.local.desc | 1 - 9 files changed, 113 insertions(+), 233 deletions(-) delete mode 100644 net-p2p/monero/files/0.12.3.0-Drop-in-tree-miniupnpc.patch delete mode 100644 net-p2p/monero/files/0.13.0.3-Drop-in-tree-miniupnpc.patch create mode 100644 net-p2p/monero/files/0.13.0.4-Drop-in-tree-miniupnpc.patch delete mode 100644 net-p2p/monero/monero-0.12.3.0.ebuild delete mode 100644 net-p2p/monero/monero-0.13.0.3.ebuild create mode 100644 net-p2p/monero/monero-0.13.0.4.ebuild diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index e71703b1..e5b2ad5c 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,2 +1 @@ -DIST monero-0.12.3.0.tar.gz 8431327 BLAKE2B dfc46780ff26ba9369afc869ee37fbe252a5999246b9fc3732cdd78bf9a8d416fdddcc91b59aebce363021fd9719fd8838e3d99e01ad352b5d345b2003be0e43 SHA512 9e78a66c2f76ebcefd355442f659a9a02298ec34ffca5ee514763b688d999da25cd1b96dd98255bacda7448e783b1c52e8d9effbbf3a75d1f0be1b5788d4b1ca -DIST monero-0.13.0.3.tar.gz 8614617 BLAKE2B 441f2d9c43dbc5c51d9c8424a9a140a9b9b264daa23aceb548da581e7913c1ce2f7554e6aa820adc94b84bc06b0e6cc2046934335e8b29e90d7f416fc596c468 SHA512 21378727681f4a3f57bbcc4edb9c5590e8d1a6b2860b1d24c52aa982257343a616931ffc5cf66df5dabab6c0064f52fd5a2bad4da4a1f80b5cbf28b226dc2dd5 +DIST monero-0.13.0.4.tar.gz 8615614 BLAKE2B 3d9061a9fc19fd52190a720265429c640d970302c8a2bb72e81c1958ca319d81684e6ed6265cf1bf012a22e7b6481fdb9403fee5843ebb6421209b0bd4353b47 SHA512 3c74aca71c5debf3b8e0b408bd17604ddcb11489358dce4f69cdb9c306ab88ed0cedb13b861341ec8db441c694ec125b11b1a865e2c51df3d6f6a5857775c612 diff --git a/net-p2p/monero/files/0.12.3.0-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.12.3.0-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index c7b9d543..00000000 --- a/net-p2p/monero/files/0.12.3.0-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 694352e707574580d4249ead6673ffa2e7fcd0c2 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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 1fc4d64c1cbf..48a6a9a32f08 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -36,19 +36,9 @@ - # others. - - 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() -- --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 07f369d40544..e10e4cfbc606 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 --#include --#include -+#include -+#include -+#include - - #undef MONERO_DEFAULT_LOG_CATEGORY - #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" diff --git a/net-p2p/monero/files/0.13.0.3-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.13.0.3-Drop-in-tree-miniupnpc.patch deleted file mode 100644 index 034f4dd2..00000000 --- a/net-p2p/monero/files/0.13.0.3-Drop-in-tree-miniupnpc.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 370f436d94714772a447181b68ed2d86a14a78cc Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -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 --#include --#include -+#include -+#include -+#include - - #undef MONERO_DEFAULT_LOG_CATEGORY - #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" 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 new file mode 100644 index 00000000..034f4dd2 --- /dev/null +++ b/net-p2p/monero/files/0.13.0.4-Drop-in-tree-miniupnpc.patch @@ -0,0 +1,57 @@ +From 370f436d94714772a447181b68ed2d86a14a78cc Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +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 +-#include +-#include ++#include ++#include ++#include + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" diff --git a/net-p2p/monero/metadata.xml b/net-p2p/monero/metadata.xml index 41f094a6..de37e444 100644 --- a/net-p2p/monero/metadata.xml +++ b/net-p2p/monero/metadata.xml @@ -5,7 +5,4 @@ bertrand@jacquin.bzh Bertrand Jacquin - - Use system libraries instead of the ones included in the upstream distribution - diff --git a/net-p2p/monero/monero-0.12.3.0.ebuild b/net-p2p/monero/monero-0.12.3.0.ebuild deleted file mode 100644 index 2d56a067..00000000 --- a/net-p2p/monero/monero-0.12.3.0.ebuild +++ /dev/null @@ -1,58 +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 +system-libs unwind" - -RDEPEND="dev-db/lmdb - system-libs? ( - net-dns/unbound:=[threads] - net-libs/miniupnpc - ) - dev-libs/openssl:0 - dev-libs/boost:= - net-libs/zeromq:=[sodium] - net-libs/cppzmq:= - dev-libs/rapidjson:= - readline? ( sys-libs/readline:= ) - unwind? ( sys-libs/libunwind[lzma] ) - smartcard? ( - sys-apps/pcsc-lite - >=app-crypt/ccid-1.4.28[usb] - )" -DEPEND=">=dev-util/cmake-3.0.0 - 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)" - -DINSTALL_VENDORED_LIBUNBOUND="$(usex system-libs OFF ON)" - -DBUILD_GUI_DEPS="$(usex qt5 ON OFF)" - ) - - export DATABASE="lmdb" - export DEVELOPER_LOCAL_TOOLS=0 - export DEVELOPER_LIBUNBOUND_OLD=0 - - cmake-utils_src_configure -} diff --git a/net-p2p/monero/monero-0.13.0.3.ebuild b/net-p2p/monero/monero-0.13.0.3.ebuild deleted file mode 100644 index ee0b71c7..00000000 --- a/net-p2p/monero/monero-0.13.0.3.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 -} diff --git a/net-p2p/monero/monero-0.13.0.4.ebuild b/net-p2p/monero/monero-0.13.0.4.ebuild new file mode 100644 index 00000000..ee0b71c7 --- /dev/null +++ b/net-p2p/monero/monero-0.13.0.4.ebuild @@ -0,0 +1,55 @@ +# 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 +} diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 691b8e0c..80b1b073 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -67,7 +67,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:system-libs - Use system libraries instead of the ones included in the upstream distribution 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 -- cgit v1.2.3