gentoo auto-resync : 23:03:2024 - 13:01:09

5 files changed, 72 insertions, 12 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5d1d3157c29a..63ebcb5e1a7a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index b53267625f22..db58e25a6d0a 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -3,7 +3,9 @@ AUX xmrig-6.18.1-gcc-13.patch 1910 BLAKE2B e3a097ef3d4999a84a9aa4edad1fd14dc7c62
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
 DIST xmrig-6.18.1.tar.gz 2394259 BLAKE2B 4d7ed3ce7b6c9dce9b25da7c316df4542046b014167ce090c5c2ec4dbf61607e4238ce8a8407a396f1eb47dc76cbfac08e0131835d9c4bbff8f4e5920d2f19a6 SHA512 bb297b17f820ad38f0c68aebfe1be8e82e85aede99a9e2a7692935ed57dab06a36566d13c16f850123dc6e829dfb56bc9253c46b94e6a703fe169a0126feb37b
 DIST xmrig-6.21.1.tar.gz 2416545 BLAKE2B 72ecdfc8c999aee91aef4f540211c5d5a6f1992c76211162a623e89391cedfcc2d5540f291d9915ee4180b83f58ef7f2eb1e3aff8dee49c72f41f90878d7ef62 SHA512 a9267708e61084db7116381adb2256a04c30eba0c84b571764cc73ccafc9276f55b6665529eb7b9c1785d582d0d280ced6ee7ca88a5e98f9bbdef2a9176a9794
+DIST xmrig-6.21.2.tar.gz 2426759 BLAKE2B df2b25177ae4b60eff0f518cfe0aa513820fdce1811c329a33d16ee74c9f387b26bf41e8a2bf84471f0c1eef4deceee164e82a245c9a7813d633a08747bf6cfd SHA512 e6fefa091c5884ebd30a938472032efcf68fccde1ba492bd045dc50fef1ec95bb951bbbf1ed1832670bc241400629754f31318477ae634080a89790e9fa27957
 EBUILD xmrig-6.18.1-r2.ebuild 1592 BLAKE2B 7ca183e7fb3647b3dadbefbe2cfd3f9e2560a6e3b7c61b0200c617978f1f1683e1d10b9d5f44a48ecc18f9bbc01acc87298b06f1753b5ff09030b1df0d6041b4 SHA512 0349293e8eabf03b199523572c6b4c8fa1ebce93768ab70820f2d20768ecaf56a94224539778e4740f127543d7cb68815f79d9f85b1f2175431a9503e3e60555
-EBUILD xmrig-6.21.1.ebuild 1553 BLAKE2B ab6a6a35f869baee05387111b510ae3f6ca796e5a2343322b6abefcbbc992b61f93b63b53d61639b2812978cf43bedce2e5066f69aea7d4d574ce35d4220bca7 SHA512 fbac76b9ff9144413a432668602812a4b75f5acf5b472ef68d83666d5d117295e20bb7dc483579a6057d36a1bf50bb5a74fc60801e22b78b694363ab411cf7a4
-EBUILD xmrig-9999.ebuild 1553 BLAKE2B 4424c59bec325f902d6b0597406902faab3f55de490047dd7c73a0d56c8d4128243b52aceae5414f8aa460539f6ff131ca3e18a271af9ca9dc088b1f83509e9d SHA512 9355b207a49e67d0f16df4c03f34ebf6060839539b487a32c455a23832f5e68624d31120266fc0271c8976897019e388be62127ec9d581ab22f1bea681d38c19
+EBUILD xmrig-6.21.1.ebuild 1551 BLAKE2B e590f209544572f41c8ef3f9984791cedcf33d73626d47411eecaff54d3320111140de17da4790ab9a6a506ef7e58eb317d917840f6967b0b332870f5e4f37f8 SHA512 1046e575d34e47489533335121be7780f85a3fbd36669fb4d93e8344f24ae62f6fc82656c4927a537744942c384d2047cb28b134b925d735221845f151e0794c
+EBUILD xmrig-6.21.2.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
+EBUILD xmrig-9999.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 MISC metadata.xml 833 BLAKE2B ac0e7279af43dc7d8cefaf41d3cb02cc426080936eae5084b23011ef57be7162844d9d78edded1e2b18edd1cc90a03b0cb9fd52e834e79f195799b48fd2c20d6 SHA512 ce9293b9c560b227bf44f149010b259a86175a178a22b72187efa128dde1aa138928033e7cd7d9cee41313c083bb972248460f7a73d970e7fd1f74463e515c38
diff --git a/net-misc/xmrig/xmrig-6.21.1.ebuild b/net-misc/xmrig/xmrig-6.21.1.ebuild
index 93dd2712390e..b6cc3de16350 100644
--- a/net-misc/xmrig/xmrig-6.21.1.ebuild
+++ b/net-misc/xmrig/xmrig-6.21.1.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.21.2.ebuild b/net-misc/xmrig/xmrig-6.21.2.ebuild
new file mode 100644
index 000000000000..2061563b6ac5
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.21.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 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 a36872e00718..2061563b6ac5 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake flag-o-matic systemd toolchain-funcs
+inherit cmake systemd
 
 DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
 HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
@@ -44,13 +44,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# JIT broken with FORTIFY_SOURCE=3
-	# Bug #913420
-	if tc-enables-fortify-source; then
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
 	local mycmakeargs=(
 		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
 		-DWITH_HWLOC=$(usex hwloc)