gentoo auto-resync : 02:03:2025 - 19:29:42

6 files changed, 16 insertions, 63 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 0bb6445160cf..a4fb007d7686 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 11867be35414..7e2f06d1e7b4 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -286,8 +286,8 @@ DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a733
 DIST zune-inflate-0.2.42.crate 37288 BLAKE2B 2d60c589607583826570c2877e1deae1a4dcf2c76ef705efc792cbf0f8bef2a1f4c4e75380efa890479b2cf168c34c7054b520aa799ccb20d43ae94526752458 SHA512 ea2c070a3df93c519f4360ee17fd1c51d8c6e194c61b391ab8c40d81c86bc7d2021bf08f97a106710806cdb16797d710b7722197edc9cce25de3c3752549bf09
 DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
 EBUILD clamav-0.103.11-r1.ebuild 7154 BLAKE2B 8e4698c56e9768f73f18e88f34e8991f9b316fd9f4a60175bc3e345d3ea6246620aaa572a655ed246704c73635dd9f47671779294297d75aa536779255cf8cfb SHA512 35d8f4a7e5109f41733e7e24e70a911f6d3b9828fe6ecc7375d60e483fcc3ebe73015b814c3f2bf125c32d114df4248ebe6f9dbe0755474730257ae19b74d874
-EBUILD clamav-0.103.12.ebuild 7195 BLAKE2B 3ad412aa8a6d38b9bcf027953e01fb44a845787ea770311666879d9db6f2102955309a4fad1ec1f487881058e66ba075ce6168769056922d6c89c7654ef2f6c7 SHA512 630b5297ad2eeebd31d28b99435e443d71df3f1fd3951987a5a3dab4e70d851c6d465effe2e2195f473e5f1407f71f4f967844943fefaca640da089411e2d678
-EBUILD clamav-1.0.7-r1.ebuild 10606 BLAKE2B b4a0f7b398d2493686b5e2bc67af60f9610f361327094ad23b06bbd7c43ff63d37c5194007f3c0155e0280a48ce649d1712d4b77d3ebe67c98cb1dd75d04b25e SHA512 2832fb028428593811166adee41191b90b5d33b4b195ad9a313d9d10f91747ecc915885aa5a8eae385a8e7e75164f02b846270afe34a0b6db53bfaabf144da36
-EBUILD clamav-1.4.1-r2.ebuild 11203 BLAKE2B 8216e28873f95a720db14052d71a40950f6c094706c6c5a0bcdd645eb338b40f3fd9bb675d57f49c43dd10e3af5a7810d13fc845bdd60495abec7200aa9c6f2c SHA512 31b74be26ad15cb25d76be9a316b2213e8516583baf96796aa6b38521cc31861e0e198c1d652a44b9171a86d62e841b772fb1df4fadf41d6e09f7cafc4deb6e4
-EBUILD clamav-1.4.2.ebuild 11170 BLAKE2B f4652cc4eea596f9b7d384506822456ef258599952ff8935776df8d5f899d71433ab7ebb9f76794e155de9153f4a51db199cd8ec6f86e860e7cb6472a579cae9 SHA512 4fa4c559d4d2f5dd939c4fd0fd70dcd23d7986a59ad7677a83a6f3dc218735ee4354e9be4bc833ecf318358702212cea0ea4f4d3b48d9bebe62f7d96759efc62
+EBUILD clamav-0.103.12.ebuild 7194 BLAKE2B 0c282bf39e2dce4174e5e41612c6a5253b835f79de39a726f2b37975ed6f97f61f5987e3aa966ddf4ac4d6da4ac9d168f6533fe2dbc8edd1c13b1ec166419043 SHA512 a511a1101a0f160d220d7fc6e0839f13d43ae82afb8fd404e400ecd4d54da215b4ac5e2aeaabd032b5e335745e23d3081bd8553bca87d5db03c2f700067ea034
+EBUILD clamav-1.0.7-r1.ebuild 10075 BLAKE2B e6a435141881fb9d00efaf9bc3192d6750fa1e99cdaae877eb80f1bf1495271587de332433cbb3f4b74ddb5c516229fe5aaf8c0fb9e15614a36bcbba1f0f20fd SHA512 ba228e9523a98077c1c796a536582f4bf9bd992f549171a8361dfc7fe3224d7eecb2b7414c5407df062249d3d3a22c1c542d19f3c1f08af67c8755344df8f3ef
+EBUILD clamav-1.4.1-r2.ebuild 10402 BLAKE2B 3128f1f948cd5b28f8aa92f3a99c0d7c63f6f4a21410ac1c86ccabd73cc6465b2c257e2d50db3622141ee55858db235b6cd1658ecb1c9e7a79697aacf492cea3 SHA512 a51a39c05027f27e3aba15b9e614882c2bf87558252ddc33e706f9765ecca614d9f6f66d3589f9373330f93164b22a814d56c47c6f6998732d57f98574f064cb
+EBUILD clamav-1.4.2.ebuild 10391 BLAKE2B 57c7c266e64ff3172161615e5a4346d6a47ecc3457f58ccd7165700ca39f849965f60431d62d8dbbe588a8b849d3affa0ccf616bc574dba959fe70b85457ddf4 SHA512 f01ea4f6ec48fa041fb84e1f0762484b01f8cc1dc36abc554db3f5d02b71539cde1a9246719660a79c6f2a1850bb2dbfb986947e3baa00208d978e4f3f9b8797
 MISC metadata.xml 1575 BLAKE2B b069c507c1f2c0fa87825a61b468d294e941264f672ada0fc82b473b5706b37bf512bd35ac42bcdba38f3d295ca95394c3923180093ca59581c74099cf23c447 SHA512 cbe1cb7b54a0c73150149c8a721282e8f20ea9bff0eaa6fa3146a3aa27687245f467788552c33337810c26562e3d916a3f19cb0923397e54031a38e58a07e140
diff --git a/app-antivirus/clamav/clamav-0.103.12.ebuild b/app-antivirus/clamav/clamav-0.103.12.ebuild
index 1c158c5742f0..e75a72ecd0b5 100644
--- a/app-antivirus/clamav/clamav-0.103.12.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2 unRAR"
 SLOT="0/lts"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-antivirus/clamav/clamav-1.0.7-r1.ebuild b/app-antivirus/clamav/clamav-1.0.7-r1.ebuild
index 0ef1d488cc1f..7f6d8b35bbad 100644
--- a/app-antivirus/clamav/clamav-1.0.7-r1.ebuild
+++ b/app-antivirus/clamav/clamav-1.0.7-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_MAX_SLOT=13
 PYTHON_COMPAT=( python3_{10..12} )
 
 # Auto-Generated by cargo-ebuild 0.5.4-r1
@@ -155,7 +154,7 @@ CRATES="
 	zune-inflate@0.2.42
 "
 
-inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles
+inherit cargo cmake flag-o-matic python-any-r1 systemd tmpfiles
 
 MY_P=${P//_/-}
 
@@ -171,7 +170,7 @@ if [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
+IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
 	clamonacc? ( clamapp )
@@ -197,7 +196,6 @@ COMMON_DEPEND="
 	!libclamav-only? ( net-misc/curl )
 	clamapp? ( sys-libs/ncurses:= net-misc/curl )
 	elibc_musl? ( sys-libs/fts-standalone )
-	jit? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	milter? ( mail-filter/libmilter:= )
 	rar? ( app-arch/unrar )
 	system-mspack? ( dev-libs/libmspack )
@@ -229,7 +227,6 @@ python_check_deps() {
 
 pkg_setup() {
 	rust_pkg_setup
-	use jit && llvm_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
@@ -239,7 +236,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
-		-DBYTECODE_RUNTIME=$(usex jit llvm interpreter)
+		-DBYTECODE_RUNTIME="interpreter" # https://github.com/Cisco-Talos/clamav/issues/581
 		-DCLAMAV_GROUP="clamav"
 		-DCLAMAV_USER="clamav"
 		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
@@ -270,16 +267,6 @@ src_configure() {
 		)
 	fi
 
-	if use jit ; then
-		# Suppress CMake warnings that variables aren't consumed if we aren't using LLVM
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime
-		mycmakeargs+=(
-			-DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
-			-DLLVM_FIND_VERSION="$(best_version llvm-core/llvm:${LLVM_MAX_SLOT} | cut -c 16-)"
-		)
-	fi
-
 	cmake_src_configure
 }
 
diff --git a/app-antivirus/clamav/clamav-1.4.1-r2.ebuild b/app-antivirus/clamav/clamav-1.4.1-r2.ebuild
index 341bc6af02a8..99f3d1d6f0ae 100644
--- a/app-antivirus/clamav/clamav-1.4.1-r2.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.1-r2.ebuild
@@ -1,12 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-# Upstream are working on updating clamav's LLVM bytecode interpreter to work
-# with later versions of LLVM, but it's not ready yet. See:
-# https://github.com/Cisco-Talos/clamav/issues/581
-# This does not impact the ability of the package to build with llvm/clang otherwise.
-LLVM_MAX_SLOT=13
 PYTHON_COMPAT=( python3_{11..13} )
 
 CRATES="
@@ -174,7 +169,7 @@ if [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
+IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
 	clamonacc? ( clamapp )
@@ -200,7 +195,6 @@ COMMON_DEPEND="
 	!libclamav-only? ( net-misc/curl )
 	clamapp? ( sys-libs/ncurses:= net-misc/curl )
 	elibc_musl? ( sys-libs/fts-standalone )
-	jit? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	milter? ( mail-filter/libmilter:= )
 	rar? ( app-arch/unrar )
 	system-mspack? ( dev-libs/libmspack )
@@ -232,7 +226,6 @@ python_check_deps() {
 
 pkg_setup() {
 	rust_pkg_setup
-	use jit && llvm_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
@@ -246,7 +239,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
-		-DBYTECODE_RUNTIME=$(usex jit llvm interpreter)
+		-DBYTECODE_RUNTIME="interpreter" # https://github.com/Cisco-Talos/clamav/issues/581
 		-DCLAMAV_GROUP="clamav"
 		-DCLAMAV_USER="clamav"
 		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
@@ -277,16 +270,6 @@ src_configure() {
 		)
 	fi
 
-	if use jit ; then
-		# Suppress CMake warnings that variables aren't consumed if we aren't using LLVM
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime
-		mycmakeargs+=(
-			-DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
-			-DLLVM_FIND_VERSION="$(best_version llvm-core/llvm:${LLVM_MAX_SLOT} | cut -c 16-)"
-		)
-	fi
-
 	cmake_src_configure
 }
 
diff --git a/app-antivirus/clamav/clamav-1.4.2.ebuild b/app-antivirus/clamav/clamav-1.4.2.ebuild
index 590a0cf5e91f..5b431a4cc219 100644
--- a/app-antivirus/clamav/clamav-1.4.2.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.2.ebuild
@@ -2,11 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-# Upstream are working on updating clamav's LLVM bytecode interpreter to work
-# with later versions of LLVM, but it's not ready yet. See:
-# https://github.com/Cisco-Talos/clamav/issues/581
-# This does not impact the ability of the package to build with llvm/clang otherwise.
-LLVM_MAX_SLOT=13
 PYTHON_COMPAT=( python3_{11..13} )
 
 CRATES="
@@ -157,7 +152,7 @@ declare -A GIT_CRATES=(
 	[onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;29c08532252b917543ff268284f926f30876bb79;onenote.rs-%commit%"
 )
 
-inherit cargo cmake eapi9-ver flag-o-matic llvm python-any-r1 systemd tmpfiles
+inherit cargo cmake eapi9-ver flag-o-matic python-any-r1 systemd tmpfiles
 
 MY_P=${P//_/-}
 
@@ -171,10 +166,10 @@ LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
 # 0/sts (short term support) if not an LTS release
 SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
+IUSE="doc clamonacc +clamapp experimental libclamav-only milter rar selinux +system-mspack systemd test"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
 	clamonacc? ( clamapp )
@@ -200,7 +195,6 @@ COMMON_DEPEND="
 	!libclamav-only? ( net-misc/curl )
 	clamapp? ( sys-libs/ncurses:= net-misc/curl )
 	elibc_musl? ( sys-libs/fts-standalone )
-	jit? ( <llvm-core/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	milter? ( mail-filter/libmilter:= )
 	rar? ( app-arch/unrar )
 	system-mspack? ( dev-libs/libmspack )
@@ -232,7 +226,6 @@ python_check_deps() {
 
 pkg_setup() {
 	rust_pkg_setup
-	use jit && llvm_pkg_setup
 	use test && python-any-r1_pkg_setup
 }
 
@@ -246,7 +239,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
-		-DBYTECODE_RUNTIME=$(usex jit llvm interpreter)
+		-DBYTECODE_RUNTIME="interpreter" # https://github.com/Cisco-Talos/clamav/issues/581 (does not support modern llvm)
 		-DCLAMAV_GROUP="clamav"
 		-DCLAMAV_USER="clamav"
 		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
@@ -277,16 +270,6 @@ src_configure() {
 		)
 	fi
 
-	if use jit ; then
-		# Suppress CMake warnings that variables aren't consumed if we aren't using LLVM
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime
-		mycmakeargs+=(
-			-DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
-			-DLLVM_FIND_VERSION="$(best_version llvm-core/llvm:${LLVM_MAX_SLOT} | cut -c 16-)"
-		)
-	fi
-
 	cmake_src_configure
 }