From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 574521382C5 for ; Tue, 29 Dec 2020 10:58:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68B5C2BC05C; Tue, 29 Dec 2020 10:58:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 450EA2BC05C for ; Tue, 29 Dec 2020 10:58:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 257DC3416CC for ; Tue, 29 Dec 2020 10:58:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82F2C483 for ; Tue, 29 Dec 2020 10:58:08 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1609238124.00a28a99118c3b55b79df6a2b3a150647b45c79f.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-p2p/monero/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-p2p/monero/Manifest net-p2p/monero/monero-0.17.1.7.ebuild X-VCS-Directories: net-p2p/monero/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 00a28a99118c3b55b79df6a2b3a150647b45c79f X-VCS-Branch: master Date: Tue, 29 Dec 2020 10:58:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 71ba9d66-465f-49fa-9988-fc373bc325f7 X-Archives-Hash: 082e3ea43a3f738dda0da0fcfb8ab759 commit: 00a28a99118c3b55b79df6a2b3a150647b45c79f Author: Theo Anderson posteo de> AuthorDate: Tue Dec 29 08:58:32 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Tue Dec 29 10:35:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=00a28a99 net-p2p/monero: use dev-libs/randomx instead of bundled Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson posteo.de> net-p2p/monero/Manifest | 1 - net-p2p/monero/monero-0.17.1.7.ebuild | 29 ++++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index d313f0a4..b4707575 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,3 +1,2 @@ DIST monero-0.17.1.7.tar.gz 10598750 BLAKE2B 03a80f3c38bc1b643d8d9ddba4ee1de59e0f4c6d66cfc5dcb700d19659a5cb66add4fcf1320c1ed2b7dfa15fdfe9548eb758e67661832f9da7bd0e173b5a0ae1 SHA512 b049a738eb5752a620fc19dfafd5e2996d3f33d89737774264a5ef69b7fcfcd9fe852b89e35187486f48fdc8bb73c2010a1917d1ed7fcb4f1f87b18a6bb4c2d5 -DIST monero-randomx-0.17.1.7.tar.gz 163581 BLAKE2B d1a4021a652c95d0af9c6bf2fdab2470641206e908778daafa2640e986d5635bdddfa39f44a6a9542d0c17284cf0551eac3be68a24176f1ba7106611517a080f SHA512 626cc83aa22015049c82811be5d66e96f3d14a413d9cb3eee3c28464fbdef71889b97a6385f24c7cac5fc5a9cada197ba887ae2c0782cec0d3e29debad0f3e91 DIST monero-supercop-0.17.1.7.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 diff --git a/net-p2p/monero/monero-0.17.1.7.ebuild b/net-p2p/monero/monero-0.17.1.7.ebuild index 0a67ec2b..a790abc7 100644 --- a/net-p2p/monero/monero-0.17.1.7.ebuild +++ b/net-p2p/monero/monero-0.17.1.7.ebuild @@ -12,7 +12,6 @@ DESCRIPTION="The secure, private, untraceable cryptocurrency" HOMEPAGE="https://github.com/monero-project/monero" SRC_URI=" https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/tevador/RandomX/archive/${MY_RANDOMX_REV}.tar.gz -> ${PN}-randomx-${PV}.tar.gz https://github.com/monero-project/supercop/archive/${MY_SUPERCOP_REV}.tar.gz -> ${PN}-supercop-${PV}.tar.gz " @@ -27,6 +26,7 @@ DEPEND=" acct-user/monero dev-libs/boost:=[nls,threads] dev-libs/libsodium:= + dev-libs/randomx dev-libs/rapidjson net-dns/unbound:=[threads] net-libs/czmq:= @@ -42,8 +42,7 @@ PATCHES=("${FILESDIR}/${P}-linkjobs.patch") src_unpack() { unpack ${A} - rmdir "${S}"/external/{randomx,supercop,trezor-common} || die - mv "${WORKDIR}"/RandomX-${MY_RANDOMX_REV} "${S}"/external/randomx || die + rmdir "${S}"/external/supercop || die mv "${WORKDIR}"/supercop-${MY_SUPERCOP_REV} "${S}"/external/supercop || die } @@ -54,11 +53,13 @@ src_prepare() { sed -e 's/UPNP_LIBRARIES "libminiupnpc-static/UPNP_LIBRARIES "miniupnpc'/ \ -e '/libminiupnpc-static/d' \ -e '/\/miniupnpc/d' \ + -e '/randomx/d' \ -i external/CMakeLists.txt || die } src_configure() { local mycmakeargs=( + # TODO: Update CMake to install built libraries (help wanted) -DBUILD_SHARED_LIBS=OFF -DMANUAL_SUBMODULES=ON -DMONERO_PARALLEL_LINK_JOBS=1 @@ -78,6 +79,8 @@ src_compile() { } src_install() { + einstalldocs + # Install all binaries. find "${BUILD_DIR}/bin/" -type f -executable -print0 | while IFS= read -r -d '' line; do @@ -112,15 +115,15 @@ src_install() { pkg_postinst() { if use daemon; then - einfo "Start the Monero P2P daemon as a system service with" - einfo "'rc-service monerod start'. Enable it at startup with" - einfo "'rc-update add monerod default'." - einfo - einfo "Run monerod status as any user to get sync status and other stats." - einfo - einfo "The Monero blockchain can take up a lot of space (80 GiB) and is stored" - einfo "in /var/lib/monero by default. You may want to enable pruning by adding" - einfo "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain" - einfo "or move the data directory to another disk." + elog "Start the Monero P2P daemon as a system service with" + elog "'rc-service monerod start'. Enable it at startup with" + elog "'rc-update add monerod default'." + elog + elog "Run monerod status as any user to get sync status and other stats." + elog + elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored" + elog "in /var/lib/monero by default. You may want to enable pruning by adding" + elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain" + elog "or move the data directory to another disk." fi }