Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: profiles/, net-p2p/monero/, net-p2p/monero/files/
Date: Sat, 26 Mar 2022 11:25:23
Message-Id: 1648293680.3fa54727e8a7f69d46b81f0544508dc596dd5f11.andrewammerlaan@gentoo
1 commit: 3fa54727e8a7f69d46b81f0544508dc596dd5f11
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 26 11:21:20 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 26 11:21:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3fa54727
7
8 net-p2p/monero: treeclean
9
10 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
11
12 net-p2p/monero/Manifest | 2 -
13 .../monero/files/monero-0.17.1.7-linkjobs.patch | 44 --------
14 .../monero-0.17.1.7-unbundle-dependencies.patch | 112 --------------------
15 .../monero/files/monero-0.17.2.0-boost-176.patch | 24 -----
16 net-p2p/monero/files/monerod.conf | 8 --
17 net-p2p/monero/files/monerod.confd | 6 --
18 net-p2p/monero/files/monerod.initd | 21 ----
19 net-p2p/monero/files/monerod.service | 17 ---
20 net-p2p/monero/metadata.xml | 31 ------
21 net-p2p/monero/monero-0.17.2.0.ebuild | 117 ---------------------
22 net-p2p/monero/monero-0.17.2.3.ebuild | 117 ---------------------
23 net-p2p/monero/monero-9999.ebuild | 114 --------------------
24 profiles/package.mask | 3 -
25 13 files changed, 616 deletions(-)
26
27 diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
28 deleted file mode 100644
29 index 40e48c455..000000000
30 --- a/net-p2p/monero/Manifest
31 +++ /dev/null
32 @@ -1,2 +0,0 @@
33 -DIST monero-0.17.2.0.tar.gz 10622184 BLAKE2B c439e447f524a08a7ee79420873b7cf393f5cd3269460944aac30a315ac7c273c12fd809d86d41445bfc7e8c2feb0538d4e9fc1dadeb55f7e09f2920778f07a7 SHA512 85b764f1fc25127e7ca4ada67b1d832a9604c4cf65b160d689650e7ca7bbc36b73d8b26c5409fabdaad7369684997447cd812d1c521fad19d24f5b35f4789a1e
34 -DIST monero-0.17.2.3.tar.gz 10640501 BLAKE2B 15c7b92e7d00788214953c09af96d578e79c65ba9263d2a9ea19cfb9cc65e77d15770b873a10b77aae9e908dce74162d3577ed241600ebd57098b860bfd8f114 SHA512 7f3363c2cb66fa90a47a4cbb03b367182afa63af21d40bf07ea57cd91e4805684ec4795c0390bc966626a3b7b3c0a47167036873f5d1ea4b487a3d02bf01aaa4
35
36 diff --git a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch b/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
37 deleted file mode 100644
38 index d0f59a6f9..000000000
39 --- a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
40 +++ /dev/null
41 @@ -1,44 +0,0 @@
42 -From 12a78e5e745556c29e45b7716a8b038ecfbff800 Mon Sep 17 00:00:00 2001
43 -From: Matt Smith <matt@×××××××××.uk>
44 -Date: Wed, 5 Aug 2020 18:39:44 +0100
45 -Subject: [PATCH] cmake: Use job pool feature to limit concurrent jobs
46 -
47 -Add two new options, MONERO_PARALLEL_COMPILE_JOBS and
48 -MONERO_PARALLEL_LINK_JOBS to try and prevent running out of memory when
49 -building everything.
50 -
51 -Requires >= cmake 3.0.0, and the use of the Ninja generator.
52 -
53 -Useful links:
54 -
55 -* https://cmake.org/cmake/help/latest/prop_gbl/JOB_POOLS.html
56 -* https://reviews.llvm.org/D6304
57 ----
58 - CMakeLists.txt | 14 ++++++++++++++
59 - 1 file changed, 14 insertions(+)
60 -
61 -diff --git a/CMakeLists.txt b/CMakeLists.txt
62 -index f63c07a35d..3729a6b659 100644
63 ---- a/CMakeLists.txt
64 -+++ b/CMakeLists.txt
65 -@@ -55,6 +55,20 @@ else()
66 - message(STATUS "ccache deselected")
67 - endif()
68 -
69 -+if (${CMAKE_VERSION} VERSION_GREATER "3.0.0" AND CMAKE_MAKE_PROGRAM MATCHES "ninja")
70 -+ set(MONERO_PARALLEL_COMPILE_JOBS "" CACHE STRING "The maximum number of concurrent compilation jobs.")
71 -+ if (MONERO_PARALLEL_COMPILE_JOBS)
72 -+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${MONERO_PARALLEL_COMPILE_JOBS})
73 -+ set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
74 -+ endif ()
75 -+
76 -+ set(MONERO_PARALLEL_LINK_JOBS "" CACHE STRING "The maximum number of concurrent link jobs.")
77 -+ if (MONERO_PARALLEL_LINK_JOBS)
78 -+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${MONERO_PARALLEL_LINK_JOBS})
79 -+ set(CMAKE_JOB_POOL_LINK link_job_pool)
80 -+ endif ()
81 -+endif()
82 -+
83 - enable_language(C ASM)
84 -
85 - function (die msg)
86
87 diff --git a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
88 deleted file mode 100644
89 index ea7f80499..000000000
90 --- a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
91 +++ /dev/null
92 @@ -1,112 +0,0 @@
93 -diff --git a/CMakeLists.txt b/CMakeLists.txt
94 -index 41f82e26c..3eb2b2e78 100644
95 ---- a/CMakeLists.txt
96 -+++ b/CMakeLists.txt
97 -@@ -312,7 +312,7 @@ endif()
98 - # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
99 - # set(BSDI TRUE)
100 -
101 --include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
102 -+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
103 -
104 - if(APPLE)
105 - include_directories(SYSTEM /usr/include/malloc)
106 -@@ -995,7 +995,6 @@ if(SODIUM_LIBRARY)
107 - set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
108 - endif()
109 -
110 --include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
111 - add_subdirectory(contrib)
112 - add_subdirectory(src)
113 -
114 -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
115 -index a8916a7d0..05ab35c82 100644
116 ---- a/external/CMakeLists.txt
117 -+++ b/external/CMakeLists.txt
118 -@@ -37,19 +37,7 @@
119 -
120 - find_package(Miniupnpc REQUIRED)
121 -
122 --message(STATUS "Using in-tree miniupnpc")
123 --add_subdirectory(miniupnp/miniupnpc)
124 --set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
125 --if(MSVC)
126 -- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
127 --elseif(NOT MSVC)
128 -- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
129 --endif()
130 --if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
131 -- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
132 --endif()
133 --
134 --set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
135 -+set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE)
136 -
137 - find_package(Unbound)
138 -
139 -@@ -81,4 +69,3 @@ endif()
140 - add_subdirectory(db_drivers)
141 - add_subdirectory(easylogging++)
142 - add_subdirectory(qrcodegen)
143 --add_subdirectory(randomx EXCLUDE_FROM_ALL)
144 -diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
145 -index 3b33fe90a..ba354a0e8 100644
146 ---- a/src/crypto/CMakeLists.txt
147 -+++ b/src/crypto/CMakeLists.txt
148 -@@ -55,6 +55,7 @@ list(APPEND crypto_sources CryptonightR_template.S)
149 - endif()
150 -
151 - include_directories(${RANDOMX_INCLUDE})
152 -+include_directories(SYSTEM /usr/include/monero)
153 -
154 - set(crypto_headers)
155 -
156 -@@ -116,6 +117,3 @@ endif()
157 -
158 - # cheat because cmake and ccache hate each other
159 - set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
160 --
161 --# Must be done last, because it references libraries in this directory
162 --add_subdirectory(wallet)
163 -diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
164 -index a4c5d5a07..5c6b96cd8 100644
165 ---- a/src/crypto/wallet/crypto.h
166 -+++ b/src/crypto/wallet/crypto.h
167 -@@ -29,7 +29,6 @@
168 - #pragma once
169 -
170 - #include <cstddef>
171 --#include "crypto/wallet/ops.h"
172 -
173 - namespace crypto {
174 - namespace wallet {
175 -diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
176 -index ff2afba4b..26b0f4523 100644
177 ---- a/src/device/CMakeLists.txt
178 -+++ b/src/device/CMakeLists.txt
179 -@@ -72,7 +72,7 @@ target_link_libraries(device
180 - ${HIDAPI_LIBRARIES}
181 - cncrypto
182 - ringct_basic
183 -- wallet-crypto
184 -+ monero-crypto
185 - ${OPENSSL_CRYPTO_LIBRARIES}
186 - ${Boost_SERIALIZATION_LIBRARY}
187 - PRIVATE
188 -diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
189 -index 65db2615c..3ace310f6 100644
190 ---- a/src/p2p/net_node.inl
191 -+++ b/src/p2p/net_node.inl
192 -@@ -60,9 +60,9 @@
193 - #include "cryptonote_core/cryptonote_core.h"
194 - #include "net/parse.h"
195 -
196 --#include <miniupnp/miniupnpc/miniupnpc.h>
197 --#include <miniupnp/miniupnpc/upnpcommands.h>
198 --#include <miniupnp/miniupnpc/upnperrors.h>
199 -+#include <miniupnpc/miniupnpc.h>
200 -+#include <miniupnpc/upnpcommands.h>
201 -+#include <miniupnpc/upnperrors.h>
202 -
203 - #undef MONERO_DEFAULT_LOG_CATEGORY
204 - #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
205
206 diff --git a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
207 deleted file mode 100644
208 index 07a584a39..000000000
209 --- a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
210 +++ /dev/null
211 @@ -1,24 +0,0 @@
212 -From c28d2f7c110c0a2161fa02d6c20df94a60a41965 Mon Sep 17 00:00:00 2001
213 -From: loqs <loqs@××××××××××××××××××××.com>
214 -Date: Sun, 23 May 2021 20:29:17 +0100
215 -Subject: [PATCH] Fix boost 1.76.0 compatibility
216 -
217 -Add missing header boost/mpl/contains.hpp
218 -monero-project/monero/issues/7728
219 ----
220 - contrib/epee/include/storages/portable_storage.h | 2 ++
221 - 1 file changed, 2 insertions(+)
222 -
223 -diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
224 -index 1e68605abf5..801bb2c3465 100644
225 ---- a/contrib/epee/include/storages/portable_storage.h
226 -+++ b/contrib/epee/include/storages/portable_storage.h
227 -@@ -40,6 +40,8 @@
228 - #include "span.h"
229 - #include "int-util.h"
230 -
231 -+#include <boost/mpl/contains.hpp>
232 -+
233 - namespace epee
234 - {
235 - namespace serialization
236
237 diff --git a/net-p2p/monero/files/monerod.conf b/net-p2p/monero/files/monerod.conf
238 deleted file mode 100644
239 index d019576c6..000000000
240 --- a/net-p2p/monero/files/monerod.conf
241 +++ /dev/null
242 @@ -1,8 +0,0 @@
243 -# Configuration for monerod
244 -# Syntax: any command line option may be specified as 'clioptionname=value'.
245 -# Boolean options such as 'no-igd' are specified as 'no-igd=1'.
246 -# See 'monerod --help' for all available options.
247 -
248 -data-dir=/var/lib/monero
249 -log-file=/var/log/monero/monero.log
250 -log-level=0
251
252 diff --git a/net-p2p/monero/files/monerod.confd b/net-p2p/monero/files/monerod.confd
253 deleted file mode 100644
254 index 94515dcc2..000000000
255 --- a/net-p2p/monero/files/monerod.confd
256 +++ /dev/null
257 @@ -1,6 +0,0 @@
258 -# Copyright 2020 Gentoo Authors
259 -# Distributed under the terms of the GNU General Public License v2
260 -
261 -monerod_args="--config-file /etc/monero/monerod.conf --non-interactive"
262 -monerod_user=monero
263 -monerod_group=monero
264
265 diff --git a/net-p2p/monero/files/monerod.initd b/net-p2p/monero/files/monerod.initd
266 deleted file mode 100644
267 index c94e6ff46..000000000
268 --- a/net-p2p/monero/files/monerod.initd
269 +++ /dev/null
270 @@ -1,21 +0,0 @@
271 -#!/sbin/openrc-run
272 -# Copyright 2020 Gentoo Authors
273 -# Distributed under the terms of the GNU General Public License v2
274 -
275 -pidfile=/var/run/monerod.pid
276 -command=/usr/bin/monerod
277 -command_args="${monerod_args}"
278 -start_stop_daemon_args="-u ${monerod_user} -b -m -p ${pidfile}"
279 -
280 -name="Monero P2P Daemon"
281 -description="Connects to the Monero P2P network"
282 -
283 -depend() {
284 - need localmount
285 - need net
286 -}
287 -
288 -start_pre() {
289 - checkpath --directory --owner ${monerod_user}:${monerod_group} --mode 0755 \
290 - /var/lib/monero /var/log/monero
291 -}
292
293 diff --git a/net-p2p/monero/files/monerod.service b/net-p2p/monero/files/monerod.service
294 deleted file mode 100644
295 index 327560497..000000000
296 --- a/net-p2p/monero/files/monerod.service
297 +++ /dev/null
298 @@ -1,17 +0,0 @@
299 -[Unit]
300 -Description=Monero P2P Daemon
301 -After=network.target
302 -
303 -[Service]
304 -User=monero
305 -Group=monero
306 -StateDirectory=monero
307 -LogsDirectory=monero
308 -Type=simple
309 -ExecStart=/usr/bin/monerod --config-file /etc/monero/monerod.conf --non-interactive
310 -Restart=on-failure
311 -StandardOutput=null
312 -StandardError=null
313 -
314 -[Install]
315 -WantedBy=multi-user.target
316
317 diff --git a/net-p2p/monero/metadata.xml b/net-p2p/monero/metadata.xml
318 deleted file mode 100644
319 index 7b6989c63..000000000
320 --- a/net-p2p/monero/metadata.xml
321 +++ /dev/null
322 @@ -1,31 +0,0 @@
323 -<?xml version="1.0" encoding="UTF-8"?>
324 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
325 -<pkgmetadata>
326 - <maintainer type="person">
327 - <email>telans@××××××.de</email>
328 - <name>James Beddek</name>
329 - </maintainer>
330 - <longdescription lang="en">
331 - Monero is a private, secure, untraceable, decentralised digital
332 - currency. You are your bank, you control your funds, and nobody
333 - can trace your transfers unless you allow them to do so.
334 - </longdescription>
335 - <use>
336 - <flag name="daemon">
337 - Build the Monero daemon used to connect to the P2P network.
338 - </flag>
339 - <flag name="tools">
340 - Build tools used to manipulate the blockchain as it is stored on
341 - disk.
342 - </flag>
343 - <flag name="wallet-cli">
344 - Build the command line wallet, monero-wallet-cli.
345 - </flag>
346 - <flag name="wallet-rpc">
347 - Build the RPC wallet, monero-wallet-rpc.
348 - </flag>
349 - </use>
350 - <upstream>
351 - <remote-id type="github">monero-project/monero</remote-id>
352 - </upstream>
353 -</pkgmetadata>
354
355 diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild
356 deleted file mode 100644
357 index 6107e459f..000000000
358 --- a/net-p2p/monero/monero-0.17.2.0.ebuild
359 +++ /dev/null
360 @@ -1,117 +0,0 @@
361 -# Copyright 1999-2021 Gentoo Authors
362 -# Distributed under the terms of the GNU General Public License v2
363 -
364 -EAPI=7
365 -
366 -inherit cmake systemd
367 -
368 -DESCRIPTION="The secure, private, untraceable cryptocurrency"
369 -HOMEPAGE="https://github.com/monero-project/monero"
370 -
371 -if [[ ${PV} == 9999 ]]; then
372 - inherit git-r3
373 - EGIT_REPO_URI="https://github.com/monero-project/monero.git"
374 - EGIT_SUBMODULES=()
375 -else
376 - SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
377 - KEYWORDS="~amd64 ~arm64 ~x86"
378 -fi
379 -
380 -LICENSE="BSD MIT"
381 -SLOT="0"
382 -IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
383 -REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
384 -RESTRICT="test"
385 -
386 -DEPEND="
387 - acct-group/monero
388 - acct-user/monero
389 - dev-libs/boost:=[nls,threads]
390 - dev-libs/libsodium:=
391 - dev-libs/openssl:=
392 - dev-libs/randomx
393 - dev-libs/rapidjson
394 - dev-libs/supercop
395 - net-dns/unbound:=[threads]
396 - net-libs/czmq:=
397 - net-libs/miniupnpc
398 - readline? ( sys-libs/readline:0= )
399 -"
400 -RDEPEND="${DEPEND}"
401 -BDEPEND="virtual/pkgconfig"
402 -
403 -PATCHES=(
404 - "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
405 - "${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
406 -)
407 -
408 -src_configure() {
409 - local mycmakeargs=(
410 - # TODO: Update CMake to install built libraries (help wanted)
411 - -DBUILD_SHARED_LIBS=OFF
412 - -DMANUAL_SUBMODULES=ON
413 - -DMONERO_PARALLEL_LINK_JOBS=1
414 - -DUSE_DEVICE_TREZOR=OFF
415 - )
416 -
417 - cmake_src_configure
418 -}
419 -
420 -src_compile() {
421 - local targets=()
422 - use daemon && targets+=(daemon)
423 - use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
424 - use wallet-cli && targets+=(simplewallet)
425 - use wallet-rpc && targets+=(wallet_rpc_server)
426 - cmake_build ${targets[@]}
427 -}
428 -
429 -src_install() {
430 - einstalldocs
431 -
432 - # Install all binaries.
433 - find "${BUILD_DIR}/bin/" -type f -executable -print0 |
434 - while IFS= read -r -d '' line; do
435 - dobin "$line"
436 - done
437 -
438 - if use daemon; then
439 - dodoc utils/conf/monerod.conf
440 -
441 - # data-dir
442 - keepdir /var/lib/monero
443 - fowners monero:monero /var/lib/monero
444 - fperms 0755 /var/lib/monero
445 -
446 - # log-file dir
447 - keepdir /var/log/monero
448 - fowners monero:monero /var/log/monero
449 - fperms 0755 /var/log/monero
450 -
451 - # /etc/monero/monerod.conf
452 - insinto /etc/monero
453 - doins "${FILESDIR}/monerod.conf"
454 -
455 - # OpenRC
456 - newconfd "${FILESDIR}/monerod.confd" monerod
457 - newinitd "${FILESDIR}/monerod.initd" monerod
458 -
459 - # systemd
460 - systemd_dounit "${FILESDIR}/monerod.service"
461 - fi
462 -}
463 -
464 -pkg_postinst() {
465 - if use daemon; then
466 - elog "Start the Monero P2P daemon as a system service with"
467 - elog "'rc-service monerod start'. Enable it at startup with"
468 - elog "'rc-update add monerod default'."
469 - elog
470 - elog "Run monerod status as any user to get sync status and other stats."
471 - elog
472 - elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
473 - elog "in /var/lib/monero by default. You may want to enable pruning by adding"
474 - elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
475 - elog "or move the data directory to another disk."
476 - fi
477 -}
478
479 diff --git a/net-p2p/monero/monero-0.17.2.3.ebuild b/net-p2p/monero/monero-0.17.2.3.ebuild
480 deleted file mode 100644
481 index 54a108f49..000000000
482 --- a/net-p2p/monero/monero-0.17.2.3.ebuild
483 +++ /dev/null
484 @@ -1,117 +0,0 @@
485 -# Copyright 1999-2021 Gentoo Authors
486 -# Distributed under the terms of the GNU General Public License v2
487 -
488 -EAPI=7
489 -
490 -inherit cmake systemd
491 -
492 -DESCRIPTION="The secure, private, untraceable cryptocurrency"
493 -HOMEPAGE="https://github.com/monero-project/monero"
494 -
495 -if [[ ${PV} == 9999 ]]; then
496 - inherit git-r3
497 - EGIT_REPO_URI="https://github.com/monero-project/monero.git"
498 - EGIT_SUBMODULES=()
499 -else
500 - SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
501 - KEYWORDS="~amd64 ~arm64 ~x86"
502 -fi
503 -
504 -LICENSE="BSD MIT"
505 -SLOT="0"
506 -IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
507 -REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
508 -RESTRICT="test"
509 -
510 -DEPEND="
511 - acct-group/monero
512 - acct-user/monero
513 - dev-libs/boost:=[nls,threads(+)]
514 - dev-libs/libsodium:=
515 - dev-libs/openssl:=
516 - dev-libs/randomx
517 - dev-libs/rapidjson
518 - dev-libs/supercop
519 - net-dns/unbound:=[threads]
520 - net-libs/czmq:=
521 - net-libs/miniupnpc
522 - readline? ( sys-libs/readline:0= )
523 -"
524 -RDEPEND="${DEPEND}"
525 -BDEPEND="virtual/pkgconfig"
526 -
527 -PATCHES=(
528 - "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
529 - "${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
530 -)
531 -
532 -src_configure() {
533 - local mycmakeargs=(
534 - # TODO: Update CMake to install built libraries (help wanted)
535 - -DBUILD_SHARED_LIBS=OFF
536 - -DMANUAL_SUBMODULES=ON
537 - -DMONERO_PARALLEL_LINK_JOBS=1
538 - -DUSE_DEVICE_TREZOR=OFF
539 - )
540 -
541 - cmake_src_configure
542 -}
543 -
544 -src_compile() {
545 - local targets=()
546 - use daemon && targets+=(daemon)
547 - use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
548 - use wallet-cli && targets+=(simplewallet)
549 - use wallet-rpc && targets+=(wallet_rpc_server)
550 - cmake_build ${targets[@]}
551 -}
552 -
553 -src_install() {
554 - einstalldocs
555 -
556 - # Install all binaries.
557 - find "${BUILD_DIR}/bin/" -type f -executable -print0 |
558 - while IFS= read -r -d '' line; do
559 - dobin "$line"
560 - done
561 -
562 - if use daemon; then
563 - dodoc utils/conf/monerod.conf
564 -
565 - # data-dir
566 - keepdir /var/lib/monero
567 - fowners monero:monero /var/lib/monero
568 - fperms 0755 /var/lib/monero
569 -
570 - # log-file dir
571 - keepdir /var/log/monero
572 - fowners monero:monero /var/log/monero
573 - fperms 0755 /var/log/monero
574 -
575 - # /etc/monero/monerod.conf
576 - insinto /etc/monero
577 - doins "${FILESDIR}/monerod.conf"
578 -
579 - # OpenRC
580 - newconfd "${FILESDIR}/monerod.confd" monerod
581 - newinitd "${FILESDIR}/monerod.initd" monerod
582 -
583 - # systemd
584 - systemd_dounit "${FILESDIR}/monerod.service"
585 - fi
586 -}
587 -
588 -pkg_postinst() {
589 - if use daemon; then
590 - elog "Start the Monero P2P daemon as a system service with"
591 - elog "'rc-service monerod start'. Enable it at startup with"
592 - elog "'rc-update add monerod default'."
593 - elog
594 - elog "Run monerod status as any user to get sync status and other stats."
595 - elog
596 - elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
597 - elog "in /var/lib/monero by default. You may want to enable pruning by adding"
598 - elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
599 - elog "or move the data directory to another disk."
600 - fi
601 -}
602
603 diff --git a/net-p2p/monero/monero-9999.ebuild b/net-p2p/monero/monero-9999.ebuild
604 deleted file mode 100644
605 index 1ee22fc10..000000000
606 --- a/net-p2p/monero/monero-9999.ebuild
607 +++ /dev/null
608 @@ -1,114 +0,0 @@
609 -# Copyright 1999-2021 Gentoo Authors
610 -# Distributed under the terms of the GNU General Public License v2
611 -
612 -EAPI=7
613 -
614 -inherit cmake systemd
615 -
616 -DESCRIPTION="The secure, private, untraceable cryptocurrency"
617 -HOMEPAGE="https://github.com/monero-project/monero"
618 -
619 -if [[ ${PV} == 9999 ]]; then
620 - inherit git-r3
621 - EGIT_REPO_URI="https://github.com/monero-project/monero.git"
622 - EGIT_SUBMODULES=()
623 -else
624 - SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
625 - KEYWORDS="~amd64 ~arm64 ~x86"
626 -fi
627 -
628 -LICENSE="BSD MIT"
629 -SLOT="0"
630 -IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
631 -REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
632 -RESTRICT="test"
633 -
634 -DEPEND="
635 - acct-group/monero
636 - acct-user/monero
637 - dev-libs/boost:=[nls,threads]
638 - dev-libs/libsodium:=
639 - dev-libs/openssl:=
640 - dev-libs/randomx
641 - dev-libs/rapidjson
642 - dev-libs/supercop
643 - net-dns/unbound:=[threads]
644 - net-libs/czmq:=
645 - net-libs/miniupnpc
646 - readline? ( sys-libs/readline:0= )
647 -"
648 -RDEPEND="${DEPEND}"
649 -BDEPEND="virtual/pkgconfig"
650 -
651 -PATCHES=( "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" )
652 -
653 -src_configure() {
654 - local mycmakeargs=(
655 - # TODO: Update CMake to install built libraries (help wanted)
656 - -DBUILD_SHARED_LIBS=OFF
657 - -DMANUAL_SUBMODULES=ON
658 - -DMONERO_PARALLEL_LINK_JOBS=1
659 - -DUSE_DEVICE_TREZOR=OFF
660 - )
661 -
662 - cmake_src_configure
663 -}
664 -
665 -src_compile() {
666 - local targets=()
667 - use daemon && targets+=(daemon)
668 - use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
669 - use wallet-cli && targets+=(simplewallet)
670 - use wallet-rpc && targets+=(wallet_rpc_server)
671 - cmake_build ${targets[@]}
672 -}
673 -
674 -src_install() {
675 - einstalldocs
676 -
677 - # Install all binaries.
678 - find "${BUILD_DIR}/bin/" -type f -executable -print0 |
679 - while IFS= read -r -d '' line; do
680 - dobin "$line"
681 - done
682 -
683 - if use daemon; then
684 - dodoc utils/conf/monerod.conf
685 -
686 - # data-dir
687 - keepdir /var/lib/monero
688 - fowners monero:monero /var/lib/monero
689 - fperms 0755 /var/lib/monero
690 -
691 - # log-file dir
692 - keepdir /var/log/monero
693 - fowners monero:monero /var/log/monero
694 - fperms 0755 /var/log/monero
695 -
696 - # /etc/monero/monerod.conf
697 - insinto /etc/monero
698 - doins "${FILESDIR}/monerod.conf"
699 -
700 - # OpenRC
701 - newconfd "${FILESDIR}/monerod.confd" monerod
702 - newinitd "${FILESDIR}/monerod.initd" monerod
703 -
704 - # systemd
705 - systemd_dounit "${FILESDIR}/monerod.service"
706 - fi
707 -}
708 -
709 -pkg_postinst() {
710 - if use daemon; then
711 - elog "Start the Monero P2P daemon as a system service with"
712 - elog "'rc-service monerod start'. Enable it at startup with"
713 - elog "'rc-update add monerod default'."
714 - elog
715 - elog "Run monerod status as any user to get sync status and other stats."
716 - elog
717 - elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
718 - elog "in /var/lib/monero by default. You may want to enable pruning by adding"
719 - elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
720 - elog "or move the data directory to another disk."
721 - fi
722 -}
723
724 diff --git a/profiles/package.mask b/profiles/package.mask
725 index f5e27c5f2..d65dbd474 100644
726 --- a/profiles/package.mask
727 +++ b/profiles/package.mask
728 @@ -22,6 +22,3 @@ gnome-extra/extension-manager
729 # Anna (cybertailor) Vyalkova <cyber+gentoo@×××××.in> (2022-01-09)
730 # Depends on masked libhandy 1.5.0
731 >=app-text/komikku-0.36.0
732 -
733 -# Unavailable dep dev-libs/boost[threads]
734 -net-p2p/monero