| 1 |
commit: 00a28a99118c3b55b79df6a2b3a150647b45c79f |
| 2 |
Author: Theo Anderson <telans <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Tue Dec 29 08:58:32 2020 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Tue Dec 29 10:35:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=00a28a99 |
| 7 |
|
| 8 |
net-p2p/monero: use dev-libs/randomx instead of bundled |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 11 |
Signed-off-by: Theo Anderson <telans <AT> posteo.de> |
| 12 |
|
| 13 |
net-p2p/monero/Manifest | 1 - |
| 14 |
net-p2p/monero/monero-0.17.1.7.ebuild | 29 ++++++++++++++++------------- |
| 15 |
2 files changed, 16 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest |
| 18 |
index d313f0a4..b4707575 100644 |
| 19 |
--- a/net-p2p/monero/Manifest |
| 20 |
+++ b/net-p2p/monero/Manifest |
| 21 |
@@ -1,3 +1,2 @@ |
| 22 |
DIST monero-0.17.1.7.tar.gz 10598750 BLAKE2B 03a80f3c38bc1b643d8d9ddba4ee1de59e0f4c6d66cfc5dcb700d19659a5cb66add4fcf1320c1ed2b7dfa15fdfe9548eb758e67661832f9da7bd0e173b5a0ae1 SHA512 b049a738eb5752a620fc19dfafd5e2996d3f33d89737774264a5ef69b7fcfcd9fe852b89e35187486f48fdc8bb73c2010a1917d1ed7fcb4f1f87b18a6bb4c2d5 |
| 23 |
-DIST monero-randomx-0.17.1.7.tar.gz 163581 BLAKE2B d1a4021a652c95d0af9c6bf2fdab2470641206e908778daafa2640e986d5635bdddfa39f44a6a9542d0c17284cf0551eac3be68a24176f1ba7106611517a080f SHA512 626cc83aa22015049c82811be5d66e96f3d14a413d9cb3eee3c28464fbdef71889b97a6385f24c7cac5fc5a9cada197ba887ae2c0782cec0d3e29debad0f3e91 |
| 24 |
DIST monero-supercop-0.17.1.7.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 |
| 25 |
|
| 26 |
diff --git a/net-p2p/monero/monero-0.17.1.7.ebuild b/net-p2p/monero/monero-0.17.1.7.ebuild |
| 27 |
index 0a67ec2b..a790abc7 100644 |
| 28 |
--- a/net-p2p/monero/monero-0.17.1.7.ebuild |
| 29 |
+++ b/net-p2p/monero/monero-0.17.1.7.ebuild |
| 30 |
@@ -12,7 +12,6 @@ DESCRIPTION="The secure, private, untraceable cryptocurrency" |
| 31 |
HOMEPAGE="https://github.com/monero-project/monero" |
| 32 |
SRC_URI=" |
| 33 |
https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 34 |
- https://github.com/tevador/RandomX/archive/${MY_RANDOMX_REV}.tar.gz -> ${PN}-randomx-${PV}.tar.gz |
| 35 |
https://github.com/monero-project/supercop/archive/${MY_SUPERCOP_REV}.tar.gz -> ${PN}-supercop-${PV}.tar.gz |
| 36 |
" |
| 37 |
|
| 38 |
@@ -27,6 +26,7 @@ DEPEND=" |
| 39 |
acct-user/monero |
| 40 |
dev-libs/boost:=[nls,threads] |
| 41 |
dev-libs/libsodium:= |
| 42 |
+ dev-libs/randomx |
| 43 |
dev-libs/rapidjson |
| 44 |
net-dns/unbound:=[threads] |
| 45 |
net-libs/czmq:= |
| 46 |
@@ -42,8 +42,7 @@ PATCHES=("${FILESDIR}/${P}-linkjobs.patch") |
| 47 |
|
| 48 |
src_unpack() { |
| 49 |
unpack ${A} |
| 50 |
- rmdir "${S}"/external/{randomx,supercop,trezor-common} || die |
| 51 |
- mv "${WORKDIR}"/RandomX-${MY_RANDOMX_REV} "${S}"/external/randomx || die |
| 52 |
+ rmdir "${S}"/external/supercop || die |
| 53 |
mv "${WORKDIR}"/supercop-${MY_SUPERCOP_REV} "${S}"/external/supercop || die |
| 54 |
} |
| 55 |
|
| 56 |
@@ -54,11 +53,13 @@ src_prepare() { |
| 57 |
sed -e 's/UPNP_LIBRARIES "libminiupnpc-static/UPNP_LIBRARIES "miniupnpc'/ \ |
| 58 |
-e '/libminiupnpc-static/d' \ |
| 59 |
-e '/\/miniupnpc/d' \ |
| 60 |
+ -e '/randomx/d' \ |
| 61 |
-i external/CMakeLists.txt || die |
| 62 |
} |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
local mycmakeargs=( |
| 66 |
+ # TODO: Update CMake to install built libraries (help wanted) |
| 67 |
-DBUILD_SHARED_LIBS=OFF |
| 68 |
-DMANUAL_SUBMODULES=ON |
| 69 |
-DMONERO_PARALLEL_LINK_JOBS=1 |
| 70 |
@@ -78,6 +79,8 @@ src_compile() { |
| 71 |
} |
| 72 |
|
| 73 |
src_install() { |
| 74 |
+ einstalldocs |
| 75 |
+ |
| 76 |
# Install all binaries. |
| 77 |
find "${BUILD_DIR}/bin/" -type f -executable -print0 | |
| 78 |
while IFS= read -r -d '' line; do |
| 79 |
@@ -112,15 +115,15 @@ src_install() { |
| 80 |
|
| 81 |
pkg_postinst() { |
| 82 |
if use daemon; then |
| 83 |
- einfo "Start the Monero P2P daemon as a system service with" |
| 84 |
- einfo "'rc-service monerod start'. Enable it at startup with" |
| 85 |
- einfo "'rc-update add monerod default'." |
| 86 |
- einfo |
| 87 |
- einfo "Run monerod status as any user to get sync status and other stats." |
| 88 |
- einfo |
| 89 |
- einfo "The Monero blockchain can take up a lot of space (80 GiB) and is stored" |
| 90 |
- einfo "in /var/lib/monero by default. You may want to enable pruning by adding" |
| 91 |
- einfo "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain" |
| 92 |
- einfo "or move the data directory to another disk." |
| 93 |
+ elog "Start the Monero P2P daemon as a system service with" |
| 94 |
+ elog "'rc-service monerod start'. Enable it at startup with" |
| 95 |
+ elog "'rc-update add monerod default'." |
| 96 |
+ elog |
| 97 |
+ elog "Run monerod status as any user to get sync status and other stats." |
| 98 |
+ elog |
| 99 |
+ elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored" |
| 100 |
+ elog "in /var/lib/monero by default. You may want to enable pruning by adding" |
| 101 |
+ elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain" |
| 102 |
+ elog "or move the data directory to another disk." |
| 103 |
fi |
| 104 |
} |
Archives