gentoo auto-resync : 14:09:2022 - 11:10:10

5 files changed, 324 insertions, 1 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1ad833034165..c1813d191c71 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 5f40209618ef..513403da6c7b 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -2,6 +2,7 @@ AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942
 AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19
 AUX clamav-0.103.0-system-tomsfastmath.patch 3725 BLAKE2B 85640ded83600adfdcc03e8f42e3153c71a8b6c5884ca4cbd79a69121943fd171bc528aed26ded895189293008924cef6762a22001b4ee098fe5f680c7619bf0 SHA512 b67df39bc7d60f6ea9bb06d12413f0e4774185d4f020a68bdfdf8fe1ca669f70a62699b0f1100702af5ec47e460a35625dcaa09cfc6ea6d2f3957de227e87306
 AUX clamav-0.103.1-upstream-openrc.patch 18249 BLAKE2B 305db3181a4a22acde5b28cef6c2d01b639be8c5b9e9c77737be1ebcb0553040b6eda117285e3e8b4bf06d2565a5d73225d7ce20ba1f115fd08bc822d779b370 SHA512 89e95057ee2f29bcdf5787f659ffe43b055b599d9bb80bf54794859113d760dad135b5b8d80c23e98f8c6b699dc839d4922c4c3b45edf97296f4eea668e62672
+AUX clamav-0.105.1-cmake-llvm-fix.patch 3153 BLAKE2B 56a749687399d17896b0ac2bfc6706a3c49439c96112bdb9e72cab26749148697eeba56d752ad6373471770a0ca3b20d587b129c9be2259de3e64f56ec283ca3 SHA512 32b141fc1631a1829e5481a82690cfed3b970a5208e741b0da22b26771c804c86d0603bfd6b0d27109d5f5c554f287b152da4fbc3a722c116c95f40ebd95ced1
 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3
 AUX clamav-milter.initd 1164 BLAKE2B 190dee3476f8763dc2498e2099e6afa83c36642298618ad959940771e73c07456e30e6319d649291c82fec49e3712e500a65b167fe91b12bd2758f79f040e1c3 SHA512 d21c60e7d3ee5eee65da18831eed905858a1c7ab4ec02de1c16fa36179d9c1cf517eca8402b872f3d995fa1d59a9b2e79994655ca4570370b40dc810af5e0a3d
 AUX clamav-milter.logrotate-r1 1103 BLAKE2B b506a07f6ebdf697f87060424368ce4e4085564c3fa8e8cc4780ba786f2f543ae51a6e0f9d04db9ea9eb5554c1e395592453235db5abcc243fd2523cb44adec2 SHA512 890744086dcd8d6f7eba0f49df0941c643c6d730ea27a660ecaaab50c51c931489fa25079ad1aa9e307f919ac98a4e5d6b2e952cc46dcea8322b3253c6ba07b1
@@ -20,8 +21,10 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.103.6.tar.gz 16491761 BLAKE2B 3c43bcda4a613f81d1b31036e7323a7af7708e54af94ad30a659a8fb318d8f79f357086ce70703659298524d778374df886495cd8c75280bbbe4bae30795a85a SHA512 d39e1964678b8251bde3a9f3db30fe3d3d76cc566a86834297f4dd8489086dc9cc4c6541ca128089159f4c071d2d85b530455bd942987d3929ea0082b8ab272b
 DIST clamav-0.103.7.tar.gz 16501741 BLAKE2B 49fc1c8c42ee8168dbaec4aa13ab0dfef7fa285e335cb38b17bc020df7400ee1daae49e06ba5b4ae0364d47d707cb83c0b1a8442d5b01d2bba5827606fe27fb4 SHA512 d426169889d94411b20a2c9c9579fc22a15090c9847849822c63fc6b404075feba0ff3663ee1382b2af5300394c7a93669844736f7473bfdce3250e1fd130326
 DIST clamav-0.104.4.tar.gz 12027448 BLAKE2B e8627b49b46e9bf5669b7186d829fd2caa76d9071b1533da252fea1bdeed1b78ec4a138db8957b0d121df1180eb37a6230f5f0db1e4d3f2de80bf7dddad5b47e SHA512 5aa8abe96ff49548cf74df47a7e56279c3082dc8ca98cab02f64f44b2da0230e75b5f634b3086ba8ca155052cbc22a2a47ab3dd159ae033d3f599dcde1f2420e
+DIST clamav-0.105.1.tar.gz 29467856 BLAKE2B be46d9afd76fb536d7de7363a45d38fef6a5983011e3cd0dcc25c2a209c8d37a2bbe1f7f4a5694152cabf622ef83e072b892ae12ba404da1955bb5b654e5216d SHA512 dcaa3eb90e5a8951f1750f0676791c33507206ae0d58a3da0d07f6f86b559799db09a4aed83fbd9d3eed8f1f17654f8304070e6770ba7e02de6f2be2cda65bec
 EBUILD clamav-0.103.6.ebuild 7353 BLAKE2B 9849983170e473ed2c906cec47b2e99727e603e0f3f5c72ddcab1cbce3f9255101bc5be34544b89037b90bb967d1ab29c93ed77d8e35ac611493020d0165f5d2 SHA512 b70196e273dc8668bc77211c702dcafd218d7aca2a3ea444ece7a9c132aa3bcc551ba0f07a016fa13963f7642a3716682e00a353c3bc044779081b399226301d
 EBUILD clamav-0.103.7-r1.ebuild 7336 BLAKE2B 3a012365bbb6eb2a5486b3180f2514e057cef10fd1d0c4513387352cac0cd16206e332662e0b0f4aaf61cef0abf9b03bb022093b5819bd05cb01f3df18c4626e SHA512 d3609859db9dd5c93bb930ec9799c7827d3929da1b54ff67f8d166723cdfe5e872d57d8cd6000e2e0e9c7724311e95a264a84a12ada648039413a178c39a0773
 EBUILD clamav-0.103.7.ebuild 7359 BLAKE2B 95f3aebd8de5b0cac2ea20d5bc30848dce838d0cf4b56765c4b9a19aded0e430f132ab82eccaa08fbbe5e718c1d0bb6bb9b9fb904964e438087dd9b2ead6b848 SHA512 158ca8a5f39932198e0fcb89c07ca492f0db9b527f2d321e11d36403f7830257412d5a6cbb5aece5fb7f3f643cbaa338f1ffc377e69b84a10ab69ba64ddf88fd
 EBUILD clamav-0.104.4-r1.ebuild 6824 BLAKE2B 3ae09db7b19efeab2c335de27603f5b07832e71310afe03bb4c8ba453f6f18dfae0a059307c4bb86e2d31a57508db739bb92f6e7ad88220c967aacf498fd8f78 SHA512 722d48097dc6a069a56909af1b6ea86d3a6ae639e04c8ec538e22e657fc40cc407c3e4e296d5dea1519098446307372dfd12d34e54f6b9b1c504942bb8724870
-MISC metadata.xml 1345 BLAKE2B 69cd13c896ae294e700070936be046d20b6f384d0adfb1fdd5907213f54ae4ed81c9c5236e719da2b1c8ec14121bbf9778c325390be49f9f1c0473f2e4a83838 SHA512 04f26b4f043a19b93dabbcb9a287839b406054abee8d30877c8b9d95cbac3af6e258850167b58980781cab8b59f3453a5f8d6b9964f2ec37b6d91484efc83689
+EBUILD clamav-0.105.1.ebuild 7592 BLAKE2B 596298d64f5a2ba67eb09bc7d0768c4146cd817b8637350510d56b25dd2ed81e2002e9ab26f7d3138a6a03f58a6acf62ba1c3a7dba33a2c07628b969b26c7ad6 SHA512 3159d6d8e4d1b2b91930ce5207fe28c322108b50ebbeb742a3705c5e4138616983e9b63a997d54a972832af622878bcd53ea2c365f8bcbd0f6d064f8df2faed9
+MISC metadata.xml 1409 BLAKE2B 4edc66e7c2fe4944edfd30ea266dab1dc5ca48b7b8a89608b46eb990576508433394d82df3134cb37f1a9d8c8a66f1612ff57ce7317da965d9e05b27dc195c33 SHA512 44b24ca469474232649da9d6b586b96b5c5c743ac925646691fb3b1cd736000f397365c1693fbe95103ee6940a5e31ffba64c3fbf15ec71e442b7d0108c9030a
diff --git a/app-antivirus/clamav/clamav-0.105.1.ebuild b/app-antivirus/clamav/clamav-0.105.1.ebuild
new file mode 100644
index 000000000000..0d62bc5c14c0
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.105.1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=13
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake flag-o-matic llvm python-any-r1 systemd tmpfiles
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux systemd test"
+
+REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
+	clamonacc? ( clamapp )
+	milter? ( clamapp )
+	test? ( !libclamav-only )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="
+	acct-group/clamav
+	acct-user/clamav
+	app-arch/bzip2
+	dev-libs/json-c:=
+	dev-libs/libltdl
+	dev-libs/libmspack
+	dev-libs/libpcre2:=
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	dev-libs/tomsfastmath:=
+	>=sys-libs/zlib-1.2.2:=
+	virtual/libiconv
+	!libclamav-only? ( net-misc/curl )
+	clamapp? ( sys-libs/ncurses:= net-misc/curl )
+	elibc_musl? ( sys-libs/fts-standalone )
+	jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
+	milter? ( mail-filter/libmilter:= )
+	rar? ( app-arch/unrar )
+	test? ( dev-python/pytest )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	>=virtual/rust-1.56
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+python_check_deps() {
+	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use jit && llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-llvm-fix.patch"
+)
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+
+	local mycmakeargs=(
+		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
+		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
+		-DENABLE_EXPERIMENTAL=$(usex experimental ON OFF)
+		-DENABLE_JSON_SHARED=ON
+		-DENABLE_APP=$(usex clamapp ON OFF)
+		-DENABLE_MILTER=$(usex milter ON OFF)
+		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
+		-DCLAMAV_USER="clamav"
+		-DCLAMAV_GROUP="clamav"
+		-DBYTECODE_RUNTIME=$(usex jit llvm interpreter)
+		-DOPTIMIZE=ON
+		-DENABLE_EXTERNAL_MSPACK=ON
+		-DENABLE_EXTERNAL_TOMSFASTMATH=ON
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_UNRAR=$(usex rar ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+		-DENABLE_STATIC_LIB=OFF
+		-DENABLE_SHARED_LIB=ON
+		-DENABLE_SYSTEMD=$(usex systemd ON OFF)
+	)
+
+	if use test ; then
+		# https://bugs.gentoo.org/818673
+		# Used to enable some more tests but doesn't behave well in
+		# sandbox necessarily(?) + needs certain debug symbols present
+		# in e.g. glibc.
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON )
+	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 sys-devel/llvm:${LLVM_MAX_SLOT} | cut -c 16-)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# init scripts
+	newinitd "${FILESDIR}/clamd.initd" clamd
+	newinitd "${FILESDIR}/freshclam.initd" freshclam
+	use clamonacc && \
+		newinitd "${FILESDIR}/clamonacc.initd" clamonacc
+	use milter && \
+		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			# The tmpfiles entry is behind USE=systemd because the
+			# upstream OpenRC service files should (and do) ensure that
+			# the directories they need exist and have the correct
+			# permissions without the help of opentmpfiles. There are
+			# years-old root exploits in opentmpfiles, the design is
+			# fundamentally flawed, and the maintainer is not up to
+			# the task of fixing it.
+			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
+			systemd_newunit "${FILESDIR}/clamd_at.service-0.104.0" "clamd@.service"
+			systemd_dounit "${FILESDIR}/clamd.service"
+			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+							"freshclamd.service"
+		fi
+
+		if use clamapp ; then
+			# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(LocalSocket .*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+				-e "s:^\#\(LogTime\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/clamd.conf.sample > \
+				"${ED}"/etc/clamav/clamd.conf || die
+
+			sed -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(DatabaseOwner .*\)/\1/" \
+				-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+				-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \
+				-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+				"${ED}"/etc/clamav/freshclam.conf.sample > \
+				"${ED}"/etc/clamav/freshclam.conf || die
+
+			if use milter ; then
+				# Note: only keep the "unix" ClamdSocket and MilterSocket!
+				sed -e "s:^\(Example\):\# \1:" \
+					-e "s/^#\(PidFile .*\)/\1/" \
+					-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+					-e "s/^#\(User .*\)/\1/" \
+					-e "s/^#\(MilterSocket unix:.*\)/\1/" \
+					-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+					"${ED}"/etc/clamav/clamav-milter.conf.sample > \
+					"${ED}"/etc/clamav/clamav-milter.conf || die
+
+				systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service
+			fi
+
+			local i
+			for i in clamd freshclam clamav-milter
+			do
+				if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then
+					mv "${ED}"/etc/"${i}".conf{.sample,} || die
+				fi
+			done
+
+			# These both need to be writable by the clamav user.
+			# TODO: use syslog by default; that's what it's for.
+			diropts -o clamav -g clamav
+			keepdir /var/lib/clamav
+			keepdir /var/log/clamav
+		fi
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+	fi
+
+	# Don't install man pages for utilities we didn't install
+	if use libclamav-only ; then
+		rm -r "${ED}"/usr/share/man || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if ! use libclamav-only ; then
+		if use systemd ; then
+			tmpfiles_process clamav.conf
+		fi
+	fi
+
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	 if ! systemd_is_booted ; then
+		ewarn "This version of ClamAV provides separate OpenRC services"
+		ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+		ewarn "clamd service now starts only the clamd daemon itself. You"
+		ewarn "should add freshclam (and perhaps clamav-milter) to any"
+		ewarn "runlevels that previously contained clamd."
+	fi
+}
diff --git a/app-antivirus/clamav/files/clamav-0.105.1-cmake-llvm-fix.patch b/app-antivirus/clamav/files/clamav-0.105.1-cmake-llvm-fix.patch
new file mode 100644
index 000000000000..b73a2e066ef1
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.105.1-cmake-llvm-fix.patch
@@ -0,0 +1,73 @@
+clamav 0.105.1 doesn't support LLVM version detection
+
+See: https://github.com/Cisco-Talos/clamav/pull/692
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -480,39 +480,43 @@ find_package(JSONC REQUIRED)
+ # Set variable required by libclamav to use libjson-c
+ set(HAVE_JSON 1)
+ 
++set(LLVM_MAX_VER "14.0.0")
++set(LLVM_MIN_VER "8.0.0")
++
+ string (TOLOWER ${BYTECODE_RUNTIME} bytecodeRuntime)
+ if(${bytecodeRuntime} STREQUAL "llvm")
+-    set (LLVM_FIND_VERSION "8.0.0")
+-    find_package(LLVM REQUIRED)
++    if(DEFINED LLVM_ROOT_DIR AND DEFINED LLVM_FIND_VERSION)
++        find_package(LLVM EXACT ${LLVM_FIND_VERSION} REQUIRED HINTS ${LLVM_ROOT_DIR})
++    elseif(DEFINED LLVM_ROOT_DIR)
++        find_package(LLVM REQUIRED HINTS ${LLVM_ROOT_DIR})
++    elseif(DEFINED LLVM_FIND_VERSION)
++        find_package(LLVM EXACT ${LLVM_FIND_VERSION} REQUIRED)
++    else()
++        set (LLVM_FIND_VERSION ${LLVM_MIN_VER})
++        find_package(LLVM REQUIRED)
++    endif()
+     if(LLVM_FOUND)
+         if (LLVM_AVAILABLE_LIBS)
+-            # Found using LLVMConfig.cmake
+-            message("LLVM found using LLVMConfig.cmake")
+-            set(LLVM_VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR})
++            message(STATUS "LLVM found using LLVMConfig.cmake")
+             set(LLVM_LIBRARIES ${LLVM_AVAILABLE_LIBS})
+-
+-            if (${LLVM_PACKAGE_VERSION} VERSION_LESS "8.0.0")
+-                message(FATAL "LLVM version ${LLVM_PACKAGE_VERSION} is too old")
+-            endif()
+-
+         else()
+-            # Found using FindLLVM.cmake
+-            message("LLVM found using FindLLVM.cmake")
+-
+-            # Set variable required by libclamav to use llvm instead of interpreter
+-            set(LLVM_VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR})
+-            message("LLVM_FOUND ${LLVM_FOUND}")
++            message(STATUS "LLVM found using FindLLVM.cmake")
++            set(LLVM_PACKAGE_VERSION ${LLVM_VERSION_STRING})
+ 
+-            if (${LLVM_VERSION_STRING} VERSION_GREATER_EQUAL "9.0.0")
+-                if (${LLVM_VERSION_STRING} VERSION_LESS "10.0.0")
+-                    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
+-                endif()
++            if (${LLVM_VERSION_STRING} VERSION_GREATER_EQUAL "9.0.0" AND ${LLVM_VERSION_STRING} VERSION_LESS "10.0.0")
++                set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
+             endif()
++        endif()
+ 
+-            if (${LLVM_VERSION_STRING} VERSION_LESS "8.0.0")
+-                message(FATAL "LLVM version ${LLVM_VERSION_STRING} is too old")
+-            endif()
++        if (${LLVM_PACKAGE_VERSION} VERSION_LESS ${LLVM_MIN_VER})
++            message(FATAL_ERROR "LLVM version ${LLVM_PACKAGE_VERSION} is too old")
++        elseif (${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL ${LLVM_MAX_VER} )
++            message(FATAL_ERROR "LLVM version ${LLVM_PACKAGE_VERSION} is too new")
++        else()
++            message(STATUS "LLVM version ${LLVM_PACKAGE_VERSION} found")
+         endif()
++        # Set variable required by libclamav to use llvm instead of interpreter
++        set(LLVM_VERSION ${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR})
+     endif()
+ endif()
+ 
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index 7a3fe540cf8d..ea313c4a9868 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="clamonacc">Build the clamonacc on-access scanner</flag>
 		<flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
 		<flag name="clamsubmit">A tool to submit false positives / negatives</flag>
+		<flag name="experimental">Enable experimental features</flag>
 		<flag name="libclamav-only">Bypass building of libfreshclam and the ClamAV CLI applications.</flag>
 		<flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
 		<flag name="xml">DMG and XAR support</flag>