gentoo resync : 29.12.2022

4 files changed, 72 insertions, 5 deletions

diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index a804303fd7c1..b24f4fd8af77 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -2,7 +2,9 @@ AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e1
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
 DIST xmrig-6.16.4.tar.gz 2422895 BLAKE2B bdf4c2ee41b11a5a0d72518aadb71677536dee4ec80af191a337bddb9623e9ec8d0d3f5328732be6246eb08b28f845927ae611e2c8dc66d1b42f1c8f56a3451f SHA512 a66f5d8ef217a4ea31d65c03cc863be694947ce536ca66b0b66f523557fba1651accdc196b6ca1dbc34bd5688041248a3c30e9ee122394207f7e47d82d9e987d
 DIST xmrig-6.17.0.tar.gz 2443393 BLAKE2B 01fa7682dae6dd4aaa0f3b677bedfb3b2e9de35799f9bae0aa1a733b35152d1d6c56dfed06b9aa54fe64df4f40029d2657b9fc95e541746bd8e28bff15eef96b SHA512 a8361a5ccc8237afb59c496d88d920b7222158d9f874ff891f0cb78278e6e00881b75f4e129858c44ffc7d90227c995121f6611f1a20f84139930a883271f0d6
+DIST xmrig-6.18.0.tar.gz 2389032 BLAKE2B c7561e2d9303c80f97615471a28f57bc48c93749459e48451de52d1130b436298354a0419c3ed3c96f2bfe3592b7d28f85b91c7698174917d6eb08b685a12145 SHA512 ed20b760ae7603de752c933513c3f7abb2e254a44d79252264952f3e70c7b5320389ed4f6534a6dc8eb7cac8b1086239c46baf18c71f7ba7f0018914b2fd5917
 EBUILD xmrig-6.16.4.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
-EBUILD xmrig-6.17.0.ebuild 1341 BLAKE2B 4fd507e2a632944e37457aaba67f22031fbd7f39409f54b4818aa54606e66f2e72bc879093e1558247db5694add5b3b1963700b9ab7d05933962799d653d60b4 SHA512 4618b630f836af9d623c0b72460546c1f16c7f7d5b2c6db5275fe81a3c7e630670c8b975485dcdba976009b3df16a21cbeabd3a755e3b43cd7d43099a9da4f34
-EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
+EBUILD xmrig-6.17.0.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
+EBUILD xmrig-6.18.0.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
+EBUILD xmrig-9999.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
 MISC metadata.xml 1023 BLAKE2B 207d4db4091e38a612d7bf060ca7f58c97454a03d39b0f49e0968f387a1d97d7624834ea0d010b650fc384ab51550693d90710808516082f14a5d51ecd42b9f4 SHA512 93dd1dc29085b6277a5787515449b67c45753cdd00de5a854522907cec0a59078327074c0f3a8577c1d505b0eb30e63267375b3ccc2cf0dcae697b56d163aa39
diff --git a/net-misc/xmrig/xmrig-6.17.0.ebuild b/net-misc/xmrig/xmrig-6.17.0.ebuild
index 0b726e03276b..1b72caa1898c 100644
--- a/net-misc/xmrig/xmrig-6.17.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
diff --git a/net-misc/xmrig/xmrig-6.18.0.ebuild b/net-misc/xmrig/xmrig-6.18.0.ebuild
new file mode 100644
index 000000000000..5e038e700270
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.18.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index 516d44208bba..5e038e700270 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake systemd