net-p2p/monero: + 0.18.3.2, rm old

Signed-off-by: Sergey Alirzaev <l29ah@riseup.net>

3 files changed, 10 insertions, 123 deletions

diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index 6bee6f329..deea35528 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -2,10 +2,9 @@ DIST monero-0.17.2.0.tar.gz 10622184 BLAKE2B c439e447f524a08a7ee79420873b7cf393f
 DIST monero-0.17.2.3.tar.gz 10640501 BLAKE2B 15c7b92e7d00788214953c09af96d578e79c65ba9263d2a9ea19cfb9cc65e77d15770b873a10b77aae9e908dce74162d3577ed241600ebd57098b860bfd8f114 SHA512 7f3363c2cb66fa90a47a4cbb03b367182afa63af21d40bf07ea57cd91e4805684ec4795c0390bc966626a3b7b3c0a47167036873f5d1ea4b487a3d02bf01aaa4
 DIST monero-0.17.3.0.tar.gz 10659302 BLAKE2B fe73172e490f119a3d3730e3c11afd386e54fa22e12ac69d6f5e420d5409ba8201289feb01041520b374768325ea82132108972f68ef59114f414451232daea6 SHA512 97a40f594aaa6f588a3ad982142a0ea4f4410d208dd5ff43b09c70baadd32f87e92eac97abd800f25298e8d0613ae85f68605f586ceccf9dc078fcb189d7511a
 DIST monero-0.17.3.2.tar.gz 10685156 BLAKE2B f313ec0e5e224797448a43ad46d4e990174eec6cdceec6dc9a25d62f014a775172e103d05a33558404bd84a8443ba6ada0c27f81a3a83fe630d16cbad97602f5 SHA512 2d34e0525b2ca1d7bddb8ea51776b49fec4fb866a1c1239c347460ed3369af2f430be32da45666f16c369cebef099f285971c0e806d75d60354f195c5f93891d
-DIST monero-0.18.1.0.tar.gz 11600139 BLAKE2B dac1182e772b4163b2cc76ec83dc2cb5e91b251dab2185d4a2df6134780f05fadba2fc603964caab973ef6bc37dce1bfcb194c92ea4f843cfb953f9a5fc24378 SHA512 761f1bae4157ea05565c7459d1cd2a9316317068e3afc18a7215e4a949dee7eb58fe023cbd04c9fec0141d1f3dc33f526b2a187934b33d7aff2b55e47fad599c
-DIST monero-0.18.1.1.tar.gz 11609864 BLAKE2B 45591a856d251b6d11dc9eac987852fc413bea3fd035c330218cbb2226636ed4284b69e016a0e4ad71e2976fbe8bd6a4bc1d48cca05a45722add068c56ae0d9e SHA512 71c7d1940a31943b5a01236ffd7760907a3e63c50e31efa04cbd75f90d65401ed367efc1a9685a45638df7bdabd158ab61ee94398e3ca8e6c998aeb779db2066
 DIST monero-0.18.1.2.tar.gz 11609034 BLAKE2B 3186a1038e9dd8f204a506df28c526bf3e0e5f788ad2d6b512f02735162a479be3f46d309d4e6888f30f962d68ecaf269888c8c0b21a066cad78b3c06f8cfc83 SHA512 d112f34b2fe6720c324560dd523badb68f08d03183d4bbbe7e1aa95f641cde4a1c4fa4042f1d47f9920f799269cc9620150136ebbef6dd66fcd4df0336c0d7f3
 DIST monero-0.18.2.0.tar.gz 11624875 BLAKE2B e8dc2e89c664cb218d900ce0803dd1716f1ee363bbddb232fbd22570818c9a9ca307df04808ffef1eb30ee6097fbe243f6977dfad181f57b9169f22d4819f145 SHA512 19625d8e6ee3e9f27ba06eb6027ef21571a2ae8261c9e32f6e74d2f7adf8c73e9dfe34516cd456426274c41ce941e1e5b7eba9f9d20492b99decbd9262aec434
 DIST monero-0.18.2.2.tar.gz 11640001 BLAKE2B 04b19e760b09636d7862af2a071128a28006d2829f08039cf55cfa1fd7d054b1382dbbcfc7f0ed381fcbd358e75ec437467349c7f250510e99e06527d1209da6 SHA512 78d4f7fee4eb37ba4837bc392c5869e21c9ea1e9bd9e95f768003bc833302935121c315fb3b4fcbe8f07a9513f928e9e9146dc7ca8892a3db2eb14cfe1371727
 DIST monero-0.18.3.1.tar.gz 14005197 BLAKE2B 169d876caf94090894c9a2bd9d07b71e46411971b06da0f51fc57f01396de4f5f770062e08cbebf702b6b49dbcd47923675d2375795969f5673bf2091a7da742 SHA512 b29d25043d50fa30459e59e0c82627cc3dc4a7e2e28a727a353915a32cf5e70e36f548bda152dee13329cb2d09a978ff45c2121f8bf7acc8966957a53e772f03
+DIST monero-0.18.3.2.tar.gz 14024322 BLAKE2B abba3ef7896101d8730963dad588b0314decbcbd949bae63a796f828ade2e94c62620d5920fe7d08f2afe3ae06bf52e9f570749ac380322d46a58a146fa1380a SHA512 90acaf32e4dce753dc01e391cfe626611a31c3b024547f512d43a8e490814c5234f4ded57c7dd4c735cd8f60e545364618f0b8e6bfd5271660dcc89eb735d74c
 DIST monero-8682.patch 1053 BLAKE2B 6252ee36961d41e6c7161004f2b3ddb0916a2dc91b91eed0e500a9681040366eb7e696abc91b138484bc735da5eb13f0a79ec1ded6f3c36dd3c8f8565113d7cf SHA512 2960a937ec04bc96a3564d2c730ca53cd1369f26d47567cd08c8e90abaf126f336a083e297b4240b5fae22ab3ad3cb45d741f2f48364d30f1442df393109a6eb
diff --git a/net-p2p/monero/monero-0.18.1.1.ebuild b/net-p2p/monero/monero-0.18.1.1.ebuild
deleted file mode 100644
index ab8f289a3..000000000
--- a/net-p2p/monero/monero-0.18.1.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
-	acct-group/monero
-	acct-user/monero
-	dev-libs/boost:=[nls]
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/randomx
-	dev-libs/rapidjson
-	dev-libs/supercop
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-	net-libs/miniupnpc
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.1.0-unbundle-dependencies.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Update CMake to install built libraries (help wanted)
-		-DBUILD_SHARED_LIBS=OFF
-		-DMANUAL_SUBMODULES=ON
-		-DUSE_DEVICE_TREZOR=OFF
-	)
-
-	use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	local targets=()
-	use daemon && targets+=(daemon)
-	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
-	use wallet-cli && targets+=(simplewallet)
-	use wallet-rpc && targets+=(wallet_rpc_server)
-	cmake_build ${targets[@]}
-}
-
-src_install() {
-	einstalldocs
-
-	# Install all binaries.
-	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
-		while IFS= read -r -d '' line; do
-			dobin "$line"
-		done
-
-	if use daemon; then
-		dodoc utils/conf/monerod.conf
-
-		# data-dir
-		keepdir /var/lib/monero
-		fowners monero:monero /var/lib/monero
-		fperms 0755 /var/lib/monero
-
-		# log-file dir
-		keepdir /var/log/monero
-		fowners monero:monero /var/log/monero
-		fperms 0755 /var/log/monero
-
-		# /etc/monero/monerod.conf
-		insinto /etc/monero
-		doins "${FILESDIR}/monerod.conf"
-
-		# OpenRC
-		newconfd "${FILESDIR}/monerod.confd" monerod
-		newinitd "${FILESDIR}/monerod.initd" monerod
-
-		# systemd
-		systemd_dounit "${FILESDIR}/monerod.service"
-	fi
-}
-
-pkg_postinst() {
-	if use daemon; then
-		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
-}
diff --git a/net-p2p/monero/monero-0.18.1.0.ebuild b/net-p2p/monero/monero-0.18.3.2.ebuild
index 54ce411dc..567c589b3 100644
--- a/net-p2p/monero/monero-0.18.1.0.ebuild
+++ b/net-p2p/monero/monero-0.18.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
+IUSE="+daemon hw-wallet readline +tools +wallet-cli +wallet-rpc"
 REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
 RESTRICT="test"
 
@@ -36,12 +36,17 @@ DEPEND="
 	net-libs/czmq:=
 	net-libs/miniupnpc
 	readline? ( sys-libs/readline:0= )
+	hw-wallet? (
+		dev-libs/hidapi
+		dev-libs/protobuf:=
+		virtual/libusb:1
+	)
 "
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.18.1.0-unbundle-dependencies.patch"
+	"${FILESDIR}/${PN}-0.18.1.2-unbundle-dependencies.patch"
 )
 
 src_configure() {
@@ -49,7 +54,7 @@ src_configure() {
 		# TODO: Update CMake to install built libraries (help wanted)
 		-DBUILD_SHARED_LIBS=OFF
 		-DMANUAL_SUBMODULES=ON
-		-DUSE_DEVICE_TREZOR=OFF
+		-DUSE_DEVICE_TREZOR=$(usex hw-wallet ON OFF)
 	)
 
 	use elibc_musl && mycmakeargs+=( -DSTACK_TRACE=OFF )