commit:     396f59676fd3c6429eb28206b1ac76bad18ba1cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 07:46:02 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 07:46:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396f5967

app-antivirus/clamav: drop 0.104.4-r1, 0.105.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-antivirus/clamav/Manifest                      |   2 -
 app-antivirus/clamav/clamav-0.104.4-r1.ebuild      | 215 ------------------
 app-antivirus/clamav/clamav-0.105.1.ebuild         | 246 ---------------------
 .../files/clamav-0.105.1-cmake-llvm-fix.patch      |  73 ------
 4 files changed, 536 deletions(-)

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 2fec99b21026..481ecf0d62e2 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -15,8 +15,6 @@ DIST cexpr-0.6.0.crate 17966 BLAKE2B 
cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B 
e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b
 SHA512 
0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 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
 DIST clamav-1.0.0.tar.gz 10311477 BLAKE2B 
8d66c03e7717ed52cb90a139f565abe2ed3379e09d500530c260f129f1f8eb2549dca11898f6c1a85e7988ce06388c8967e6decea06c840220ffccb4010add60
 SHA512 
a1be526516e622fd3359461db7dd8eb0734f7ba8ecb0b63c1574e216885cd7bcdc69ffdbc5e507a0060d23769e3caa8423aa273ec57bb86e40049679a818152a
 DIST clang-sys-1.4.0.crate 38679 BLAKE2B 
d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d
 SHA512 
062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a
 DIST clap-2.34.0.crate 202210 BLAKE2B 
f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c
 SHA512 
c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8

diff --git a/app-antivirus/clamav/clamav-0.104.4-r1.ebuild 
b/app-antivirus/clamav/clamav-0.104.4-r1.ebuild
deleted file mode 100644
index 6514459df831..000000000000
--- a/app-antivirus/clamav/clamav-0.104.4-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake flag-o-matic 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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc clamonacc +clamapp 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
-       dev-libs/libltdl
-       dev-libs/libmspack
-       dev-libs/json-c:=
-       dev-libs/libpcre2
-       >=sys-libs/zlib-1.2.2:=
-       app-arch/bzip2
-       clamapp? ( sys-libs/ncurses:= net-misc/curl )
-       elibc_musl? ( sys-libs/fts-standalone )
-       virtual/libiconv
-       !libclamav-only? ( net-misc/curl )
-       dev-libs/openssl:=
-       milter? ( mail-filter/libmilter:= )
-       dev-libs/libxml2
-       rar? ( app-arch/unrar )
-       test? ( dev-python/pytest )"
-# TODO: there is no way to use this with the new build system instead of the 
bundled one
-#      dev-libs/tomsfastmath
-BDEPEND="virtual/pkgconfig
-       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() {
-       has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       use test && python-any-r1_pkg_setup
-}
-
-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=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=interpreter
-               -DOPTIMIZE=ON
-               -DENABLE_EXTERNAL_MSPACK=ON
-               -DENABLE_MAN_PAGES=ON
-               -DENABLE_DOXYGEN=$(usex doc)
-               -DENABLE_UNRAR=$(usex rar ON OFF)
-               -DENABLE_TESTS=$(usex test ON OFF)
-               # Used to enable some more tests but doesn't behave well in
-               # sandbox necessarily(?) + needs certain debug symbols present
-               # in e.g. glibc.
-               -DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON
-               -DENABLE_STATIC_LIB=OFF
-               -DENABLE_SHARED_LIB=ON
-               -DENABLE_SYSTEMD=$(usex systemd ON OFF)
-       )
-       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" 
"[email protected]"
-                       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
-
-       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."
-}

diff --git a/app-antivirus/clamav/clamav-0.105.1.ebuild 
b/app-antivirus/clamav/clamav-0.105.1.ebuild
deleted file mode 100644
index 0d62bc5c14c0..000000000000
--- a/app-antivirus/clamav/clamav-0.105.1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# 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" 
"[email protected]"
-                       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
deleted file mode 100644
index b73a2e066ef1..000000000000
--- a/app-antivirus/clamav/files/clamav-0.105.1-cmake-llvm-fix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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()
- 

Reply via email to