summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-p2p/monero/Manifest3
-rw-r--r--net-p2p/monero/files/0.16.0.1-Do-not-install-trezor-dep-libs.patch (renamed from net-p2p/monero/files/0.15.0.5-Do-not-install-trezor-dep-libs.patch)6
-rw-r--r--net-p2p/monero/files/0.16.0.1-Drop-in-tree-miniupnpc.patch (renamed from net-p2p/monero/files/0.15.0.5-Drop-in-tree-miniupnpc.patch)4
-rw-r--r--net-p2p/monero/files/0.16.0.1-Use-gentoo-dev-libs-randomx.patch (renamed from net-p2p/monero/files/0.15.0.5-Use-gentoo-dev-libs-randomx.patch)2
-rw-r--r--net-p2p/monero/files/0.16.0.1-Use-gentoo-versioning.patch (renamed from net-p2p/monero/files/0.15.0.5-Use-gentoo-versioning.patch)2
-rw-r--r--net-p2p/monero/files/0.16.0.1-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch (renamed from net-p2p/monero/files/0.15.0.5-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch)8
-rw-r--r--net-p2p/monero/files/0.16.0.1-translations-use-host-compiler.patch (renamed from net-p2p/monero/files/0.15.0.5-translations-use-host-compiler.patch)6
-rw-r--r--net-p2p/monero/monero-0.16.0.1.ebuild (renamed from net-p2p/monero/monero-0.15.0.5.ebuild)15
8 files changed, 23 insertions, 23 deletions
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index 70fc2d24..7e641e32 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1,4 +1,3 @@
-DIST monero-0.15.0.5.tar.gz 10396703 BLAKE2B d8bfd9b7f229f91dd2c292ccad028977bdc4c5a7494e1e1c492d576013219be1e579a37eb0c2b4bc466fc1715bdc5299e0c8ec84f9856056b22e9095de9df081 SHA512 3156d1c000a5aea66e7c8503f4d0d424444e609145f4f182b0ba2841685bb4673c711b588066bad87b5e73f498b8c774636e084d20e47989bc1b215c1ca15a27
DIST monero-0.16.0.0.tar.gz 10510191 BLAKE2B 859dd271ecff86aa15888ec4452d9372ab43d2b72530f3180ac4ec2f04c40412586d708403c9172d27a8fa330636d5ca65316cd3173b988a28751b5f16dfd271 SHA512 a81e9c8b7bd6679bb84970831713dae047e1df74a690cdf9b122d6722e6b1920c27e65061d42aaa33d93d6fb52bca0a91572f758c359df049e722023ff9be5a4
-DIST trezor-common-31a0073c62738827b48d725facd3766879429124.tar.gz 1329234 BLAKE2B 1d02969183c7df068797649e0f4a68887dae3ff673a488ad96a33753a3c3cdfa2f210f5d6f895a8bcc3c2498e6c77a62f890bd6dea795b04d23cda2d7050ad09 SHA512 dbea8e80809046cd620ae4ad90cb4c715c07f614b29735ebd6cc8347d721f130e2f9c01c7f3a311d5f5e2a731c29821402a1fa9e027c710e594a1c6dccd5273e
+DIST monero-0.16.0.1.tar.gz 10514264 BLAKE2B 8ef6d66b2566e9cd91d69fd1656b5c52393c364bc1793b5fd81481099225a42fe08ffd8c7640ec76ce0856357299368597a8aa05a6d743e5d81f1e6b2f0f770f SHA512 c7c37eced56f7ce2d61be734a5b11efb49d48a78705b64c7cace4840e4210a1037cb380492592ef348e8d0e15acb155639788ee60cb686da2aa0580be0a5143d
DIST trezor-common-cb901ba43c753d070f0310d858765c9f21cd7d8b.tar.gz 1306166 BLAKE2B 1290bac0da11b133bfb87738f79f9b54f3247378a3adc003bfa0b5a31b32e84b84fd872eaa6bda4c095aed9c7ea87fb897c0d95f117c8c81d072257f61e38929 SHA512 dd5c57c9226b0530b6f0df942577afc8d64e7811b06baca0f2c79c2d9c165f2aaf2e9bcfefcd2c5972cf7aa375e90ed48e7570178295213f85805a4d9947b945
diff --git a/net-p2p/monero/files/0.15.0.5-Do-not-install-trezor-dep-libs.patch b/net-p2p/monero/files/0.16.0.1-Do-not-install-trezor-dep-libs.patch
index d268548c..d7aebe27 100644
--- a/net-p2p/monero/files/0.15.0.5-Do-not-install-trezor-dep-libs.patch
+++ b/net-p2p/monero/files/0.16.0.1-Do-not-install-trezor-dep-libs.patch
@@ -1,4 +1,4 @@
-From fd666a409ceb0b8bf88e2e08255a4486a07bfb0f Mon Sep 17 00:00:00 2001
+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
@@ -8,10 +8,10 @@ Subject: [PATCH] Do not install trezor dep libs
1 file changed, 4 deletions(-)
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
-index 3be1a6f6b2bf..8b0008fadf15 100644
+index a0a166a93bb9..64a10e8b913b 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
-@@ -148,11 +148,7 @@ if (BUILD_GUI_DEPS)
+@@ -149,11 +149,7 @@ if (BUILD_GUI_DEPS)
install(TARGETS wallet_merged
ARCHIVE DESTINATION ${lib_folder})
diff --git a/net-p2p/monero/files/0.15.0.5-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/0.16.0.1-Drop-in-tree-miniupnpc.patch
index 4dccd659..73a1944f 100644
--- a/net-p2p/monero/files/0.15.0.5-Drop-in-tree-miniupnpc.patch
+++ b/net-p2p/monero/files/0.16.0.1-Drop-in-tree-miniupnpc.patch
@@ -1,4 +1,4 @@
-From 557cbfb6f4cdb5c491ac75ff4f5e05c4747d1f79 Mon Sep 17 00:00:00 2001
+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
@@ -39,7 +39,7 @@ index 71b165f4f166..072a26d19586 100644
find_package(Unbound)
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 316ed1586e56..e33bac5175bd 100644
+index f8c177e3a99c..6ab425fd1d75 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -60,9 +60,9 @@
diff --git a/net-p2p/monero/files/0.15.0.5-Use-gentoo-dev-libs-randomx.patch b/net-p2p/monero/files/0.16.0.1-Use-gentoo-dev-libs-randomx.patch
index 9c1b4307..598dcc88 100644
--- a/net-p2p/monero/files/0.15.0.5-Use-gentoo-dev-libs-randomx.patch
+++ b/net-p2p/monero/files/0.16.0.1-Use-gentoo-dev-libs-randomx.patch
@@ -1,4 +1,4 @@
-From 13af354288a9334877ee4813eff3408a3af1c836 Mon Sep 17 00:00:00 2001
+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
diff --git a/net-p2p/monero/files/0.15.0.5-Use-gentoo-versioning.patch b/net-p2p/monero/files/0.16.0.1-Use-gentoo-versioning.patch
index 18f6ef51..e4280f4e 100644
--- a/net-p2p/monero/files/0.15.0.5-Use-gentoo-versioning.patch
+++ b/net-p2p/monero/files/0.16.0.1-Use-gentoo-versioning.patch
@@ -1,4 +1,4 @@
-From 0afb322b7f23924fcf5469fa6a012fb161f3d048 Mon Sep 17 00:00:00 2001
+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
diff --git a/net-p2p/monero/files/0.15.0.5-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch b/net-p2p/monero/files/0.16.0.1-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
index d3e075ac..941f4745 100644
--- a/net-p2p/monero/files/0.15.0.5-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
+++ b/net-p2p/monero/files/0.16.0.1-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch
@@ -1,4 +1,4 @@
-From febacda6465ec02768989cd4c49fe7f062867a2f Mon Sep 17 00:00:00 2001
+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
@@ -8,10 +8,10 @@ Subject: [PATCH] https://sourceware.org/bugzilla/show_bug.cgi?id=25210
1 file changed, 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 03e60cb1a475..cbf7232bd57b 100644
+index 882bc96c56a2..2cb9c040634d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -714,11 +714,6 @@ else()
+@@ -716,11 +716,6 @@ else()
CHECK_CXX_ACCEPTS_FLAG(-mfloat-abi=softfp CXX_ACCEPTS_MFLOAT_SOFTFP)
endif()
@@ -23,7 +23,7 @@ index 03e60cb1a475..cbf7232bd57b 100644
if(ARM6)
message(STATUS "Selecting VFP for ARMv6")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp")
-@@ -755,20 +750,6 @@ else()
+@@ -757,20 +752,6 @@ else()
endif()
endif(ARM7)
diff --git a/net-p2p/monero/files/0.15.0.5-translations-use-host-compiler.patch b/net-p2p/monero/files/0.16.0.1-translations-use-host-compiler.patch
index 4f36ec1f..1dd1af02 100644
--- a/net-p2p/monero/files/0.15.0.5-translations-use-host-compiler.patch
+++ b/net-p2p/monero/files/0.16.0.1-translations-use-host-compiler.patch
@@ -1,4 +1,4 @@
-From 759970067c04bab479f9a923cfa593adfe0c87f2 Mon Sep 17 00:00:00 2001
+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
@@ -11,10 +11,10 @@ compiler flags
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 03ede04837b5..03e60cb1a475 100644
+index d9ec866e49ec..882bc96c56a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -451,7 +451,12 @@ ExternalProject_Add(generate_translations_header
+@@ -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}
diff --git a/net-p2p/monero/monero-0.15.0.5.ebuild b/net-p2p/monero/monero-0.16.0.1.ebuild
index 0b0adb53..29b55430 100644
--- a/net-p2p/monero/monero-0.15.0.5.ebuild
+++ b/net-p2p/monero/monero-0.16.0.1.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python{3_6,3_7,3_8} )
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils flag-o-matic toolchain-funcs python-single-r1 systemd
+inherit cmake flag-o-matic toolchain-funcs python-single-r1 systemd
DESCRIPTION="Secure, private, untraceable cryptocurrency"
HOMEPAGE="https://getmonero.org"
-TREZOR_COMMON_COMMIT="31a0073c62738827b48d725facd3766879429124"
+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 )"
@@ -39,7 +39,6 @@ RDEPEND="net-dns/unbound:=[threads]
acct-user/monero
acct-group/monero"
DEPEND="${PYTHON_DEPS}
- >=dev-util/cmake-2.8.7
doc? (
media-gfx/graphviz
app-doc/doxygen:0
@@ -59,6 +58,8 @@ PATCHES=(
"${FILESDIR}/${PV}-https-sourceware.org-bugzilla-show_bug.cgi-id-25210.patch"
)
+QA_MULTILIB_PATHS="usr/lib/.*"
+
CMAKE_BUILD_TYPE=Release
src_unpack() {
@@ -73,7 +74,7 @@ src_unpack() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
append-cflags -DUSE_EXTRA_EC_CERT
append-cxxflags -DUSE_EXTRA_EC_CERT
@@ -103,11 +104,11 @@ src_configure() {
export DEVELOPER_LOCAL_TOOLS=0
export DEVELOPER_LIBUNBOUND_OLD=0
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
insinto /etc
doins utils/conf/monerod.conf
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 23:51:50 +0000