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 0C6EC1382C5 for ; Tue, 29 Dec 2020 10:41:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3528DE0BC6; Tue, 29 Dec 2020 10:41:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 0C4FEE0BC6 for ; Tue, 29 Dec 2020 10:41:46 +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 4BB3B34156C for ; Tue, 29 Dec 2020 10:41:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 116A3476 for ; Tue, 29 Dec 2020 10:41:43 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1609238123.6d827547f7ea8dc12308edd30dc99cdd53f948c4.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/monero/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-p2p/monero/Manifest net-p2p/monero/metadata.xml net-p2p/monero/monero-0.17.1.7.ebuild X-VCS-Directories: net-p2p/monero/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: 6d827547f7ea8dc12308edd30dc99cdd53f948c4 X-VCS-Branch: dev Date: Tue, 29 Dec 2020 10:41:43 +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: 638935e5-5de4-4e9e-8db4-cf5dda8ae6fc X-Archives-Hash: 56d081a2e22ba67fa6910f59ea3a526a commit: 6d827547f7ea8dc12308edd30dc99cdd53f948c4 Author: Theo Anderson posteo de> AuthorDate: Tue Dec 29 08:28:49 2020 +0000 Commit: Theo Anderson posteo de> CommitDate: Tue Dec 29 10:35:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d827547 net-p2p/monero: remove hw-wallet use flag 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/metadata.xml | 4 ---- net-p2p/monero/monero-0.17.1.7.ebuild | 13 ++----------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest index 8dc5d5af..d313f0a4 100644 --- a/net-p2p/monero/Manifest +++ b/net-p2p/monero/Manifest @@ -1,4 +1,3 @@ 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 -DIST monero-trezor-common-0.17.1.7.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf diff --git a/net-p2p/monero/metadata.xml b/net-p2p/monero/metadata.xml index b865c6e7..d4e99387 100644 --- a/net-p2p/monero/metadata.xml +++ b/net-p2p/monero/metadata.xml @@ -14,10 +14,6 @@ Build the Monero daemon used to connect to the P2P network. - - Enable if you want to use a hardware wallet like a Trezor or - Ledger. - Build tools used to manipulate the blockchain as it is stored on disk. diff --git a/net-p2p/monero/monero-0.17.1.7.ebuild b/net-p2p/monero/monero-0.17.1.7.ebuild index 63a2009b..11f61385 100644 --- a/net-p2p/monero/monero-0.17.1.7.ebuild +++ b/net-p2p/monero/monero-0.17.1.7.ebuild @@ -7,7 +7,6 @@ inherit cmake systemd MY_RANDOMX_REV="5ce5f4906c1eb166be980f6d83cc80f4112ffc2a" MY_SUPERCOP_REV="633500ad8c8759995049ccd022107d1fa8a1bbc9" -MY_TREZORCOMMON_REV="bff7fdfe436c727982cc553bdfb29a9021b423b0" DESCRIPTION="The secure, private, untraceable cryptocurrency" HOMEPAGE="https://github.com/monero-project/monero" @@ -15,13 +14,12 @@ 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 - hw-wallet? ( https://github.com/trezor/trezor-common/archive/${MY_TREZORCOMMON_REV}.tar.gz -> ${PN}-trezor-common-${PV}.tar.gz ) " LICENSE="BSD MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="+daemon hw-wallet libressl readline tools +wallet-cli +wallet-rpc" +IUSE="+daemon libressl readline tools +wallet-cli +wallet-rpc" REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )" DEPEND=" @@ -33,11 +31,6 @@ DEPEND=" net-dns/unbound:=[threads] net-libs/czmq:= net-libs/miniupnpc - hw-wallet? ( - dev-libs/hidapi - dev-libs/protobuf:= - virtual/libusb:1 - ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) readline? ( sys-libs/readline:0= ) @@ -52,7 +45,6 @@ src_unpack() { rmdir "${S}"/external/{randomx,supercop,trezor-common} || die mv "${WORKDIR}"/RandomX-${MY_RANDOMX_REV} "${S}"/external/randomx || die mv "${WORKDIR}"/supercop-${MY_SUPERCOP_REV} "${S}"/external/supercop || die - use hw-wallet && (mv "${WORKDIR}"/trezor-common-${MY_TREZORCOMMON_REV} "${S}"/external/trezor-common || die) } src_prepare() { @@ -67,11 +59,10 @@ src_prepare() { src_configure() { local mycmakeargs=( - # Monero's liblmdb conflicts with the system liblmdb :( -DBUILD_SHARED_LIBS=OFF -DMANUAL_SUBMODULES=ON -DMONERO_PARALLEL_LINK_JOBS=1 - -DUSE_DEVICE_TREZOR=$(usex hw-wallet 1 0) + -DUSE_DEVICE_TREZOR=OFF ) cmake_src_configure