gentoo resync : 13.06.2020

10 files changed, 4 insertions, 688 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index d67ee75e99ce..d4d0b5126c49 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index a237dc783a05..2bcce774a14d 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,4 +1,3 @@
-AUX clamav-0.101.2-libxml2_pkgconfig.patch 2298 BLAKE2B 55c3cf4d4dda55816cb8830df0ba3d865559ffd7068c819c46788a8dbb9940c18a47d23333e5660c57d0b8e488c5359a7bf3d0d1d5024999fe230b080857787d SHA512 4ae92f85a1623fcc6a40f53af0d08bd6e3bf9f3283036f36924cf2b2559531174b7a19c667b496b391a1bfa901e0451a52546d5be7168983c82c2790af3ca738
 AUX clamav-0.101.2-tinfo.patch 854 BLAKE2B 46479552a2dffcf56c7b142062896e8ae34e3721bb604011c7f4d439a0475f7b20fc04b8027958e72eba6c97de4adee0de9f737cc4899bac194ad6fba8f0c475 SHA512 e78e1c13ba9398a59449376ba60f2728ce36feaa94342f675d2f7fe8245703f4c632028ca2bf161e6fe5c3238c540e49849c191b1b080b5486913803384882d9
 AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942bbd1c9b91d11ddb782cfaa0593458180207ffb873f783cea892d8eefd2402f30b7a0c4dcbbd5b61e01a54f98432c1164b29e7d83 SHA512 ee6379c85f7d85e30bfa4efda728cf9207a5017905abed8a6241561825ca54ec58a6cec2c1a8452574a9356491c192e89f76d19c2e404602637dcc9576b3fdea
 AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19
@@ -13,9 +12,6 @@ AUX clamd.service 202 BLAKE2B 4d02132cdb44a7155e881037b45bab28f42445808d1d3ff582
 AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376725e7857b8b911c841df89ce63ed665a1d0ca6d30f9456c9d47c370b36a2cf8df1e2f3f520d121fe0 SHA512 69a0ca31a7288b5494d8c85ce5ff859a8f34b8a93f573eded90c270099ecac30e01d8549a07a160d74bfdc3c5401c3fd625b178080ea2c02520aab91252739e7
 AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020dd326a437d6abf4bc515392d0b263eeb0773de128b9c0eff1c1f0b7b604dd14b9dffd50aba31909963e1 SHA512 28da28d633f487806448e17aec36648b6ba12f549549485704607e403e64643caea6ee9420e8101f11b3edebe62b651e6d6c338ab232f33b97b315d64b3789ac
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
-DIST clamav-0.102.2.tar.gz 13227538 BLAKE2B 09d18f507a439f1dd63ebc038b129e0ead75bb344bfad2b5bd36e2c0c76af01f42fcacc60ff40b5676cb5fb7b38b90747452654a5d104b9b7b5e2d5a06b3dc2d SHA512 7db53e0e2b4d6b0e4cf5048d3c9dfbcabcffd680c3a2b718c763b9599b0c1c14e56bae70c54c251ee9e8fd1acd3134657196dbaad2d23a16bad76a088c6fc41f
 DIST clamav-0.102.3.tar.gz 13226108 BLAKE2B 741c0cc6a088ffe880eabb7a59151b3c13c5754f9cb36582ffca9cbeea6b039e3c49b7155ba14fa302e9ee4bfa6adf8b98f0e29f2354ea8569b11b1ed2b2532c SHA512 d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2
-EBUILD clamav-0.102.2-r1.ebuild 6672 BLAKE2B 3c1f209b0e8acec2707188ed1b3530bb0ecef2e0a655ae21501be78c9596fd9167b21755b4aaa50b63f0c3bbfecdb88768a089a445f461c49743283852ed4892 SHA512 8e627bbce15dbfbd16b8f34502dbf1dcb7bc7cf5a879361a42f1a47a7472a17017286c876e75d9dd5d9c7d2a7b06aee54f06cdded1c303a9892734a05d424c66
-EBUILD clamav-0.102.2-r3.ebuild 7183 BLAKE2B b22974c7b3d75eb26e11286fb79251ec172316c08067d2da065610c1f41f1e4f77b0dc88e760de418284888788fe9a0007b4bb9944a1e375087d1c44538dc08b SHA512 117bac30e27e020b1c5ebbeb5c88a2df14477b766d290db2f10fdbd5e10485b8f11847c8187110a71ccebece6cf8d7f488ca093be7ca7acc413cca70c1bba739
-EBUILD clamav-0.102.3.ebuild 6645 BLAKE2B 63a3013284bd8e3b600e1290699636a683484e00f1e58ce404051082d226c321e7b166d779ce7798610decf5604cca620ad69c89a18fc1e11dda31d1f763084f SHA512 2b746a2d76d0a799543d393245aaa765deb6c05770e60ea0cb1c39586bfca146bc609d3590de108199a684ef0ca9c343c43e058627577adf338cfebeca5ca23c
+EBUILD clamav-0.102.3.ebuild 6644 BLAKE2B 5f3f39406472f1917d80d35d66738b9fa3d5d96ac0d85406d3c81dcb1afb8a16e04e128e6aa4d2e43e7768d004bf0ac142b2863d54ce427b901b9d94730101df SHA512 9cbb25b6cba7be41360f2f72a652ce23bca8e7e03f873454fb31dc1c68a964d7c9bbb99881a322af6c300c22553e16e781f184b559c29ce50b1faada14b4ee55
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.102.2-r1.ebuild b/app-antivirus/clamav/clamav-0.102.2-r1.ebuild
deleted file mode 100644
index 8809377758e3..000000000000
--- a/app-antivirus/clamav/clamav-0.102.2-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
-
-REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )"
-
-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/libpcre2 >dev-libs/libpcre-6 )
-	>=sys-libs/zlib-1.2.2:=
-	bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	clamsubmit? ( net-misc/curl dev-libs/json-c:= )
-	elibc_musl? ( sys-libs/fts-standalone )
-	iconv? ( virtual/libiconv )
-	!libclamav-only? ( net-misc/curl )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	xml? ( dev-libs/libxml2 )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	metadata-analysis-api? ( dev-libs/json-c:* )
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
-	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
-	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
-)
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	use elibc_musl && append-ldflags -lfts
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	# according to configure help it should be
-	# $(use_enable xml)
-	# but that does not work
-	# do not add this, since --disable-xml seems to override
-	# --without-xml
-	JSONUSE="--without-libjson"
-
-	if use clamsubmit || use metadata-analysis-api; then
-		# either of those 2 requires libjson.
-		# clamsubmit will be built as soon as libjson and curl are found
-		# but we only install the binary if requested
-		JSONUSE="--with-libjson=${EPREFIX}/usr"
-	fi
-
-	local myeconfargs=(
-		$(use_enable bzip2)
-		$(use_enable clamdtop)
-		$(use_enable ipv6)
-		$(use_enable milter)
-		$(use_enable static-libs static)
-		$(use_enable test check)
-		$(use_with xml)
-		$(use_with iconv)
-		${JSONUSE}
-		$(use_enable libclamav-only)
-		$(use_with !libclamav-only libcurl)
-		--with-system-libmspack
-		--cache-file="${S}"/config.cache
-		--disable-experimental
-		--disable-zlib-vcheck
-		--enable-id-check
-		--with-dbdir="${EPREFIX}"/var/lib/clamav
-		# Don't call --with-zlib=/usr (see bug #699296)
-		--with-zlib
-		--disable-llvm
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav || die
-
-	if ! use libclamav-only ; then
-		newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-		newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-		systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-		systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-		systemd_dounit "${FILESDIR}/clamd.service"
-		systemd_dounit "${FILESDIR}/freshclamd.service"
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/clamav.logrotate clamav
-
-		# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-			-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-			-e "s:^\#\(LogTime\).*:\1 yes:" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-			"${ED}"/etc/clamd.conf.sample || die
-
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-			-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-			-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-			-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-			-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-			"${ED}"/etc/freshclam.conf.sample || die
-
-		if use milter ; then
-			# MilterSocket one to include ' /' because there is a 2nd line for
-			# inet: which we want to leave
-			##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-			sed -i -e "s:^\(Example\):\# \1:" \
-				-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-				-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-				-e "s:.*\(User\) .*:\1 clamav:" \
-				-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-				-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-				"${ED}"/etc/clamav-milter.conf.sample || die
-
-			cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-				MILTER_NICELEVEL=19
-				START_MILTER=no
-			EOF
-
-			systemd_newunit "${FILESDIR}/clamav-milter.service-r1" 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
-
-	if use doc ; then
-		local HTML_DOCS=( docs/html/. )
-		einstalldocs
-
-		if ! use libclamav-only ; then
-			doman docs/man/*.[1-8]
-		fi
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
-	if use libclamav-only ; then
-		ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
-		return 0
-	fi
-
-	emake quick-check
-}
-
-pkg_postinst() {
-	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
-
-	elog "For instructions on how to use clamonacc, see"
-	elog
-	elog "  https://www.clamav.net/documents/on-access-scanning"
-}
diff --git a/app-antivirus/clamav/clamav-0.102.2-r3.ebuild b/app-antivirus/clamav/clamav-0.102.2-r3.ebuild
deleted file mode 100644
index e4700595b032..000000000000
--- a/app-antivirus/clamav/clamav-0.102.2-r3.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml"
-
-REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )"
-
-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/libpcre2 >dev-libs/libpcre-6 )
-	>=sys-libs/zlib-1.2.2:=
-	bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	clamsubmit? ( net-misc/curl dev-libs/json-c:= )
-	elibc_musl? ( sys-libs/fts-standalone )
-	iconv? ( virtual/libiconv )
-	!libclamav-only? ( net-misc/curl )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	xml? ( dev-libs/libxml2 )"
-
-BDEPEND="virtual/pkgconfig"
-
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
-	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
-	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
-)
-
-src_prepare() {
-	default
-	eautoconf
-
-	if ! use clamsubmit; then
-		# ENABLE_CLAMSUBMIT is defined in the configure script based on
-		# only the values of $have_curl and $have_json (so we have no
-		# easy way to disable it). Here we hack the configure script to
-		# manually set the value of ENABLE_CLAMSUBMIT to something falsy
-		# when USE=clamsubmit is not set. Yes, this looks backwards. The
-		# value '#' is not a boolean indicator, it's a comment character.
-		sed -e "s/ENABLE_CLAMSUBMIT_TRUE=$/ENABLE_CLAMSUBMIT_TRUE='#'/" \
-			-e "s/ENABLE_CLAMSUBMIT_FALSE='#'/ENABLE_CLAMSUBMIT_FALSE=/" \
-			-i configure \
-			|| die 'failed to disable clamsubmit in ./configure script'
-	fi
-}
-
-src_configure() {
-	use elibc_musl && append-ldflags -lfts
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	# according to configure help it should be
-	# $(use_enable xml)
-	# but that does not work
-	# do not add this, since --disable-xml seems to override
-	# --without-xml
-	JSONCONF="--without-libjson"
-
-	if use clamsubmit || use metadata-analysis-api; then
-		# Either of these requires libjson-c.
-		JSONCONF="--with-libjson=${EPREFIX}/usr"
-	fi
-
-	local myeconfargs=(
-		$(use_enable bzip2)
-		$(use_enable clamdtop)
-		$(use_enable ipv6)
-		$(use_enable milter)
-		$(use_enable test check)
-		$(use_with xml)
-		$(use_with iconv)
-		${JSONCONF}
-		$(use_enable libclamav-only)
-		$(use_with !libclamav-only libcurl)
-		--with-system-libmspack
-		--cache-file="${S}"/config.cache
-		--disable-experimental
-		--disable-static
-		--disable-zlib-vcheck
-		--enable-id-check
-		--with-dbdir="${EPREFIX}"/var/lib/clamav
-		# Don't call --with-zlib=/usr (see bug #699296)
-		--with-zlib
-		--disable-llvm
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav || die
-
-	if ! use libclamav-only ; then
-		newinitd "${FILESDIR}"/clamd.initd-r6 clamd
-		newconfd "${FILESDIR}"/clamd.conf-r1 clamd
-
-		systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
-		systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
-		systemd_dounit "${FILESDIR}/clamd.service"
-		systemd_dounit "${FILESDIR}/freshclamd.service"
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/clamav.logrotate clamav
-
-		# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-			-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-			-e "s:^\#\(LogTime\).*:\1 yes:" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-			"${ED}"/etc/clamd.conf.sample || die
-
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-			-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-			-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-			-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-			-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
-			"${ED}"/etc/freshclam.conf.sample || die
-
-		if use milter ; then
-			# MilterSocket one to include ' /' because there is a 2nd line for
-			# inet: which we want to leave
-			##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-			sed -i -e "s:^\(Example\):\# \1:" \
-				-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-				-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-				-e "s:.*\(User\) .*:\1 clamav:" \
-				-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-				-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-				"${ED}"/etc/clamav-milter.conf.sample || die
-
-			cat >> "${ED}"/etc/conf.d/clamd <<-EOF
-				MILTER_NICELEVEL=19
-				START_MILTER=no
-			EOF
-
-			systemd_newunit "${FILESDIR}/clamav-milter.service-r1" 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
-
-	if use doc ; then
-		local HTML_DOCS=( docs/html/. )
-		einstalldocs
-
-		if ! use libclamav-only ; then
-			doman docs/man/*.[1-8]
-		fi
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
-	if use libclamav-only ; then
-		ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
-		return 0
-	fi
-
-	emake quick-check
-}
-
-pkg_postinst() {
-	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
-
-	elog "For instructions on how to use clamonacc, see"
-	elog
-	elog "  https://www.clamav.net/documents/on-access-scanning"
-}
diff --git a/app-antivirus/clamav/clamav-0.102.3.ebuild b/app-antivirus/clamav/clamav-0.102.3.ebuild
index 23d5142b79e9..53ece5a2bf29 100644
--- a/app-antivirus/clamav/clamav-0.102.3.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.3.ebuild
@@ -11,7 +11,7 @@ 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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml"
 
 REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )"
diff --git a/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch b/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch
deleted file mode 100644
index e1f5bb9b338a..000000000000
--- a/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://bugs.gentoo.org/661328
-
---- clamav-0.101.2/m4/reorganization/libs/xml.m4
-+++ clamav-0.101.2/m4/reorganization/libs/xml.m4
-@@ -4,55 +4,19 @@
- [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])],
- want_xml=$enableval, want_xml="auto")
- 
--XML_HOME=""
--if test "X$want_xml" != "Xno"; then
--  AC_MSG_CHECKING([for libxml2 installation])
--  AC_ARG_WITH([xml],
--    AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library
--                    @<:@default=/usr/local or /usr if not found in /usr/local@:>@]),
--    [with_xml_val=$withval]
--  )
--fi
--
--AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""],
--  [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"],
--  [XML_HOME="$with_xml_val"])
--
--AS_IF([test "x$XML_HOME" != "x"], [
--   AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""])
--   ])
--
--AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [
--   AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"])
--   ])
--
--if test "x$XML_HOME" != "x"; then
--  AC_MSG_RESULT([$XML_HOME])
--else
--  AC_MSG_RESULT([not found])
--fi
--
--found_xml="no"
--XMLCONF_VERSION=""
--XML_CPPFLAGS=""
--XML_LIBS=""
--if test "x$XML_HOME" != "x"; then
--  AC_MSG_CHECKING([xml2-config version])
--  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
--  if test "x%XMLCONF_VERSION" != "x"; then
--    AC_MSG_RESULT([$XMLCONF_VERSION])
--    found_xml="yes"
--    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
--    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
--    AS_ECHO("$XML_CPPFLAGS")
--    AS_ECHO("$XML_LIBS")
--  else
--    AC_MSG_ERROR([xml2-config failed])
--  fi
--fi
-+PKG_CHECK_MODULES([XML], [libxml-2.0],
-+	[found_xml=yes],
-+	[
-+		found_xml=no
-+		AS_IF([test "x$want_xml" = xyes],
-+			[AC_MSG_ERROR([--enable-xml set but cannot find libxml2])]
-+		)
-+	]
-+)
- 
- working_xml="no"
- if test "X$found_xml" != "Xno"; then
-+  XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0)
-   AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
- 
-   if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
-@@ -61,6 +25,7 @@
-     AC_MSG_RESULT([found])
-     save_LIBS="$LIBS"
-     save_CPPFLAGS="$CPPFLAGS"
-+    XML_CPPFLAGS="$XML_CFLAGS"
-     CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-     save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="$LDFLAGS $XML_LIBS"
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index 489aef502f71..f35e0fcc92ab 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,10 +1,7 @@
-AUX clamtk-6.00-change_icon_path.patch 786 BLAKE2B 05a5e30bf33e4d13134d08277bac3011559c86d6a14d681dbf4217d62addb23345ded4e6e9c30bba1a5175a9a185150b1cf8d7d2773d49a33c6ef5117ab1647c SHA512 29871b25a948d182a613b5d12d60fc34e48ca473edae27763b51cc1403b7dbda56b4bfcf91bdfd04f0165f893010be8f0bf9975f74b8465239c7833cfd861932
-DIST clamtk-6.02.tar.xz 227780 BLAKE2B cd5f05c5d5fe2fe7e6d52ab4619fe01f810195ca505ae85101e0cf743d9d20e42de74dfadfaecdc23cb97359121ea8ddc49772a96ec237921a7d6628ae453cc4 SHA512 df619da28ebadb218bb2f9ab2c9be1804f2df5e7e444762f2b1eb3ce0e830b07ebfd05b8cb9c7d79a9e3523c9837b00b52d0e06265c62d782487546f15b0349f
 DIST clamtk-6.03.tar.xz 227940 BLAKE2B 08364ba8c3b4fcdb49364cd2721413c7f487aaff23dfa0fb0e7b28f9baf9d267589099cc159558dd004fe882d762b6ece272672aab962b4a666fb8c244671d19 SHA512 4e81b161b17ae15a307d026766efcab2ea0433437e68dd7e3465e07c999e66c556372adc29cee093a1cec5a8f37861d1b8cddd08ed6e4cfbd59f5333d4f03fac
 DIST clamtk-gnome-0.03.tar.xz 15088 BLAKE2B cc1440de117eea036cf14a9ed36650916703299799c90548b02a5fee92c80f82c1d4f63e1cd726438e428e1ae3ee1550b4c8acbc22e97093131f993099c47c36 SHA512 c35a3ee34cbe5609f2ad22d0974a503bf6f24710c26d71d865c3ad3751a72fe909a9773c27cc53295c581f77d33e58d49fdd6f38f71177aa7ef1570e00ea55f2
 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
-EBUILD clamtk-6.02-r1.ebuild 3889 BLAKE2B d3481bab34a0f27e0a5a6255e6f1744a5d38bfcfce57d0e493512f043fcc4ab44f446a67d33f5047612dbe6f9f6fba3000a63e5e0de810b5ab090efa2d3ebd96 SHA512 c4e6954978e84643c27457cc111df23ae3c1d2729a1caa9fc36406b4eaf2df70aa09ebe29d2dd1742047b2959e4f98940a984f4ec292dcea4a930e032867892f
-EBUILD clamtk-6.03.ebuild 3800 BLAKE2B 0facdff2ee818adeb256b3d4fd4c5a2d4f00264e5f479b1653cccc2a53d33b1d4e3a6bf6dcdc600825a0d3c69cdba77d05053ea836a4303e3c13cf6d27620cb9 SHA512 ed9f24cfa5f03aeef27123e576f47133b8fce38605a9e6561349fdd4cd7a1912dc0feb13c4a2afd7fafc65e1d657a9f7adf661cb45871350e3dbfb85d7ed18de
+EBUILD clamtk-6.03.ebuild 3798 BLAKE2B 8d2acfe64699eb1f7048767396db5e6e31ce5c18ae2bcaf805d27b45144b1499e38d2f6b23195612b6e1e680d2c24db8cd97327d8fb5114997886628326aee73 SHA512 92290a6ccdf14f5265251ecffc08a5737705e30b74bd630c05c998a9de55d56fdbf2186cdc4ddf150e372361744e4a7246f989a622d2b1303fabd183f9e11c21
 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.02-r1.ebuild b/app-antivirus/clamtk/clamtk-6.02-r1.ebuild
deleted file mode 100644
index 435b69a7e783..000000000000
--- a/app-antivirus/clamtk/clamtk-6.02-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.18"
-MY_PV_NAUTILUS="0.03"
-MY_PV_NEMO="0.04"
-MY_PV_THUNAR="0.06"
-
-DESCRIPTION="A graphical front-end for ClamAV"
-HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
-SRC_URI="
-	https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
-	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
-	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
-	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
-	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
-"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kde nautilus nemo +nls thunar"
-REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-antivirus/clamav
-	dev-perl/File-chdir
-	dev-perl/Gtk3
-	dev-perl/JSON
-	dev-perl/LWP-Protocol-https
-	dev-perl/LWP-UserAgent-Cached
-	dev-perl/Locale-gettext
-	dev-perl/Text-CSV
-	dev-perl/glib-perl
-	dev-perl/libwww-perl
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Encode
-	virtual/perl-MIME-Base64
-	virtual/perl-Time-Piece
-	x11-themes/faenza-icon-theme
-	nautilus? (
-		${PYTHON_DEPS}
-		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
-
-PATCHES=( "$FILESDIR"/"${PN}"-6.00-change_icon_path.patch )
-
-pkg_setup() {
-	use nautilus && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	unpack "${S}"/clamtk.1.gz
-
-	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
-	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
-	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
-	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
-}
-
-src_install() {
-	dobin clamtk
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"/ClamTk
-	doins lib/*.pm
-
-	use nls && domo po/*.mo
-
-	doicon images/clamtk.png images/clamtk.xpm
-
-	domenu clamtk.desktop
-
-	doman ../clamtk.1
-
-	if use kde; then
-		insinto /usr/share/kservices5/ServiceMenus
-		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
-
-		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
-
-		doman ../clamtk-kde.1
-
-		docinto dolphin
-		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
-	fi
-
-	if use nautilus; then
-		insinto /usr/share/nautilus-python/extensions
-		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
-
-		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
-
-		doman ../clamtk-gnome.1
-
-		docinto nautilus
-		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
-	fi
-
-	if use nemo; then
-		insinto /usr/share/nemo/actions/
-		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
-
-		doman ../nemo-sendto-clamtk.1
-
-		docinto nemo
-		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
-	fi
-
-	if use thunar; then
-		insinto /usr/share/Thunar/sendto
-		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
-
-		doman ../thunar-sendto-clamtk.1
-
-		docinto thunar
-		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-antivirus/clamtk/clamtk-6.03.ebuild b/app-antivirus/clamtk/clamtk-6.03.ebuild
index bb4940ea38be..f4de57265bc3 100644
--- a/app-antivirus/clamtk/clamtk-6.03.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.03.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde nautilus nemo +nls thunar"
 REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-antivirus/clamtk/files/clamtk-6.00-change_icon_path.patch b/app-antivirus/clamtk/files/clamtk-6.00-change_icon_path.patch
deleted file mode 100644
index 3b8018442d89..000000000000
--- a/app-antivirus/clamtk/files/clamtk-6.00-change_icon_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/GUI.pm	2019-02-22 12:05:43.000000000 +0100
-+++ b/lib/GUI.pm	2019-03-08 21:27:39.000000000 +0100
-@@ -35,9 +35,9 @@
-     # because it's missing an icon :|
-     # https://aur.archlinux.org/packages/clamtk/
-     my $theme = Gtk3::IconTheme::get_default;
--    $theme->append_search_path( '/usr/share/icons/gnome/24x24/actions' );
--    $theme->append_search_path( '/usr/share/icons/gnome/24x24/places' );
--    $theme->append_search_path( '/usr/share/icons/gnome/24x24/mimetypes' );
-+    $theme->append_search_path( '/usr/share/icons/Faenza/actions/24' );
-+    $theme->append_search_path( '/usr/share/icons/Faenza/places/24' );
-+    $theme->append_search_path( '/usr/share/icons/Faenza/mimetypes/24' );
- 
-     $window = Gtk3::Window->new( 'toplevel' );
-     $window->signal_connect(