gentoo resync : 14.07.2018

19 files changed, 0 insertions, 915 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
deleted file mode 100644
index c34bd7e68e4d..000000000000
--- a/app-antivirus/clamav/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-AUX clamav-0.100.0_autotools.patch 369 BLAKE2B ee30a0fe90e4553b64a67d1e0646a9d6c5ee33858e657905e0d71da9c4b14176469f1b2960dd04b25d46823fd239b252490c172a51d64eae589894423b8aafb0 SHA512 d872a162040ba10476f463b9e0e77edea81f022a4c0d53d7a6d09ca5753036a5236cf7182f518515f659888a203b07366873b757cf5af15c3dee74bbad6b2d02
-AUX clamav-0.99.4-fix-newer-zlib.patch 1721 BLAKE2B 5595696cb0fe1efbcf85d64fa2b9f9bd760ab38467a3d3c2996272d2e533b633d9a4d176096786a4ce666638902698be239d25762a61dec956100f6e33b3f9de SHA512 0b87152c6ecbdafabdb6fdef0e53c12c7651c8c47baa3c46497e19a7a220f4e1f9c1a79c99fb15399848d264ede38b3cddd3a369797a761069b370f367aa723d
-AUX clamav-0.99.4-pcre2-compile-erroffset.patch 510 BLAKE2B 888f5c0cf1205b5ca22ff5f445f194c9e62dd511fcf8a784be6592f700e0db6f7a36b00c88b73c5484cad2075822eb5c1e0c0f62c8ee12d6bac2d1b845a9aca5 SHA512 f03962fc47b10d729437f22374c17b773ee0f519cf537b1d7885ec6dbc1efd36d00372314faaabdf5400b85e781ab5b14e69b929c844b34520801e064d383dc2
-AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3
-AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee
-AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540
-AUX clamav.logrotate 391 BLAKE2B 9beb9e2918d7fbd30a9aeb479130086b620ab7a2e9e480cd4c4bd039929f3ac5bfd98f933731c974fc2797236a34847d8af7073436cf3d42bb2cdfb7959da0b0 SHA512 ef54facfa0ad830ea6eef499b92a1ffb37e719940385621dacd17062e556aa0d1f24104b3130a9a263f23621ab53f39283c10870a355ed6d505cc0e511b57224
-AUX clamd.conf 234 BLAKE2B 90d64dcdce96767ff34da1537d25bf2b508e038bde66a7e991f49b0fde7b5ceb2028d7e7a1a7b4f2fbdc4efcfb2cdfe3e68552570d15d87eb7d9c30c7e013998 SHA512 ec069cf7aaf10b42a701938b57e1fde1ee15afd1d4af928edfa7e5d505ba8b3edaaceac449da0f4ac6beea09a3fb73453526ba0cd3a04e13259c1a2720f42f78
-AUX clamd.conf-r1 129 BLAKE2B 3a6b0adc07df276054cda4d9b879b30e81fed06cee7562bc350d43e866f825c85788d3a7f45745111bf6a294e8cc20cc221433ad7bb291fbbc26b4e9107e580e SHA512 b85fd99c80242fb66380dfdef34387a2eff9326a1cb726940ab4bc450308e4942e57d1eb1cad979348f8aac685b53e2fa722cef0dab1f2ea2c958f2a5f818918
-AUX clamd.initd-r6 3253 BLAKE2B 3d675b3ab2b0832abcb2206e0373e37ff19000fd125ca9240942edefab9ed54e12be4bce4112118710e44de5f4f66da61e1cc8e01d725021da629d05089b9412 SHA512 0a76233e67bc25ef4bdf02218c2b3771569c4f9b2b1ae8ca2da22fcf4c1fc0ea17013523c2e2b048ce3db5c793a568fb59b40f4be78186d3adc0f774c3442a79
-AUX clamd.service 202 BLAKE2B 4d02132cdb44a7155e881037b45bab28f42445808d1d3ff5821e9b179b31efd7d5f217fb968efa17e77f6e0739f0258c4c49656283177a0f5b3d572490259bcd SHA512 799d3f33ca69841882f86f6853dd0dc6d8af73db8cfa5ce6dd6c873c5e7bc07d29bfe0f85cfb77edf2b0d8c05de73988d06148b993996ce639c5d0eeac908647
-AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376725e7857b8b911c841df89ce63ed665a1d0ca6d30f9456c9d47c370b36a2cf8df1e2f3f520d121fe0 SHA512 69a0ca31a7288b5494d8c85ce5ff859a8f34b8a93f573eded90c270099ecac30e01d8549a07a160d74bfdc3c5401c3fd625b178080ea2c02520aab91252739e7
-AUX freshclamd.service 191 BLAKE2B 5b517bf15d008454052bd0f7d5a10fb89284a5b64d1cd11570981ca07d70d4dbab6739175ef7434c5c16625fc4f342d21fe6c67970ebac9e64dc8c08732ab68e SHA512 aaf78e763d2aa9c17fc95edb1550547b6681a91fd239a86535e5193d36ff0e152c51c3a3957542f80d5b170805f296159958ac347886981ddd324bec4237da92
-AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
-DIST clamav-0.100.0.tar.gz 16036757 BLAKE2B c51edfb05726e16e2ff1ef1fee9f174af5a0d65396f847a4f6e1246d5844b92eb70896fc598d2c73719b1315ff3c41aca503823431e0918d52f56d29399dd796 SHA512 57e1da86a32fdfb66887c4aeed03008bc070ce3cb6b881db411332f2f2e640b73dca84d990f5886526b3d6bd0c2770c7dcce5b4e7cf48323824c362452593549
-DIST clamav-0.100.1.tar.gz 16154415 BLAKE2B df4ddde28b0b263765f4a571a407390b30aa6fe58d07e1b8fe427e70141219fb3d7c5addfbf30a350c6c08324dee1ec3dd80319306df7578ed87138c6513b99d SHA512 13a4e050e030ac3d1cc07b12bdd56c455e266e0b205a4c9bc9f18e53f6d8913a66eed2296abf857f395227ab0ed5c7bc90bc357bcb314dc9e18a9c6177dcc5b2
-DIST clamav-0.99.4.tar.gz 16083015 BLAKE2B 3c2e7d11ee05fe846f75c3fb6501b5fd809a2e58f8e69c82e493e32fcbc87ca0e5b5f7ab83a0d7e251a5dc8e84aed1475c87c1248b393fa04b6924a2ab32b9bf SHA512 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d
-EBUILD clamav-0.100.0.ebuild 5290 BLAKE2B 12205593f8c86aa98a2392dd22681dc0adc3606358778090b9ccf9ad09475bf456f29f6451a86640c518995109043ff308631607a40a6c3c7ada381872a1c964 SHA512 79e6747939af3ab9b52dfff633e0df9bc3932a478b0d17e5892f8b3b09477ab474eaf23f4431cab1d7ca03ff153d4ae3f8b199f8ed91cadc4f93fea92935538d
-EBUILD clamav-0.100.1.ebuild 5300 BLAKE2B de47c3b8f8b6b0f8a6e3dcbf54fc8c4258da3fb51f888b562fa311b4f51c3b669d1814dfb631d553c759c05cb01566b957ba24273aceb649f75a27979d13cedd SHA512 e4156130a684226167845266eaf7b5f6b5858d0011390ea8cb61067b12271ee05b614c509071fa2e44230dd734030a9fd4c232fd3f1aec350e442412529bcd9d
-EBUILD clamav-0.99.4-r1.ebuild 5167 BLAKE2B 952f9313405c6e8b57734244ce7bb3221149b5a84215b70b80e180ef195e227c287f32699046c9954ff35185ab38c9461be7457c273a64a9ed98db88408159a5 SHA512 7fb514f40822222ef259c97d41f8371d851399527c62eec9ae1b0095d5754218d6dd8d921ca5037588112f713a107d40a0b4636c98b159acee9a4fd902e54f83
-MISC metadata.xml 822 BLAKE2B fc73a9b45c1a80d590d4ce93f4c704ce2df3ec270cb292ad5552b2452e737cff45ceb2cf14d7c061f9a2ad2104081cacf36d4c19ccbddadd40579236da5b5939 SHA512 3cf072b3463e721584f5b608ced29f528f56119f17fa6879de3f0950ca4678ffdd32527a317d8740f4c288af440940fe35d876b3b9b1224cf804ce3808ef3add
diff --git a/app-antivirus/clamav/clamav-0.100.0.ebuild b/app-antivirus/clamav/clamav-0.100.0.ebuild
deleted file mode 100644
index 586714d43f5b..000000000000
--- a/app-antivirus/clamav/clamav-0.100.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic user 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="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-devel/libtool
-	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
-	system-libmspack? ( dev-libs/libmspack )
-	!!<app-antivirus/clamav-0.99"
-# hard block clamav < 0.99 due to linking problems Bug #567680
-# openssl is now *required* see this link as to why
-# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( docs/clamdoc.pdf docs/phishsigs_howto.pdf docs/signatures.pdf )
-HTML_DOCS=( docs/html )
-
-PATCHES=(
-	"${FILESDIR}/${P}_autotools.patch"
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	econf \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_enable test check) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr) \
-		$(use_with system-libmspack) \
-		--cache-file="${S}"/config.cache \
-		--disable-experimental \
-		--disable-gcc-vcheck \
-		--disable-zlib-vcheck \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		--disable-llvm
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	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"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	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:" \
-		"${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:" \
-		"${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
-
-	if use doc; then
-	   einstalldocs
-	   doman docs/man/*.[1-8]
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-src_test() {
-	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
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.100.1.ebuild b/app-antivirus/clamav/clamav-0.100.1.ebuild
deleted file mode 100644
index 3928b8054ddc..000000000000
--- a/app-antivirus/clamav/clamav-0.100.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic user 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="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs system-libmspack test uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-devel/libtool
-	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
-	system-libmspack? ( dev-libs/libmspack )
-	!!<app-antivirus/clamav-0.99"
-# hard block clamav < 0.99 due to linking problems Bug #567680
-# openssl is now *required* see this link as to why
-# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( docs/clamdoc.pdf docs/phishsigs_howto.pdf docs/signatures.pdf )
-HTML_DOCS=( docs/html )
-
-PATCHES=(
-	"${FILESDIR}/clamav-0.100.0_autotools.patch"
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	econf \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_enable test check) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr) \
-		$(use_with system-libmspack) \
-		--cache-file="${S}"/config.cache \
-		--disable-experimental \
-		--disable-gcc-vcheck \
-		--disable-zlib-vcheck \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		--disable-llvm
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	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"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	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:" \
-		"${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:" \
-		"${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
-
-	if use doc; then
-	   einstalldocs
-	   doman docs/man/*.[1-8]
-	fi
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-src_test() {
-	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
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild b/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
deleted file mode 100644
index 79549d3b99a3..000000000000
--- a/app-antivirus/clamav/clamav-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic user 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 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses:0 )
-	iconv? ( virtual/libiconv )
-	metadata-analysis-api? ( dev-libs/json-c:= )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-devel/libtool
-	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
-	!!<app-antivirus/clamav-0.99"
-# hard block clamav < 0.99 due to linking problems Bug #567680
-# openssl is now *required* see this link as to why
-# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.99.4-fix-newer-zlib.patch
-	"${FILESDIR}/${P}-pcre2-compile-erroffset.patch"
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-
-	econf \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_enable test check) \
-		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr) \
-		--cache-file="${S}"/config.cache \
-		--disable-experimental \
-		--disable-gcc-vcheck \
-		--disable-zlib-vcheck \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		--disable-llvm
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	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"
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	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:" \
-		"${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:" \
-		"${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
-
-	for i in clamd freshclam clamav-milter
-	do
-		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
-	done
-
-	prune_libtool_files --all
-}
-
-src_test() {
-	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
-	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
-		ewarn "You must run freshclam manually to populate the virus database files"
-		ewarn "before starting clamav for the first time.\n"
-	fi
-}
diff --git a/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch b/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch
deleted file mode 100644
index 58c3b4e324f8..000000000000
--- a/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- clamav-0.100.0/configure.ac_orig	2018-04-12 13:12:58.201729248 +0200
-+++ clamav-0.100.0/configure.ac	2018-04-12 13:23:44.982679360 +0200
-@@ -47,6 +47,7 @@
- LT_CONFIG_LTDL_DIR([libltdl])
- LT_INIT([dlopen disable-static])
- LTDL_INIT([recursive])
-+PKG_PROG_PKG_CONFIG(0.16)
- 
- m4_include([m4/reorganization/build_tools.m4])
- m4_include([m4/reorganization/headers.m4])
diff --git a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch b/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch
deleted file mode 100644
index 18673419a584..000000000000
--- a/app-antivirus/clamav/files/clamav-0.99.4-fix-newer-zlib.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/649516
-
-Description: fix compatibility with zlib 1.2.9 and newer
-Author: Marc Deslauriers <marc.deslauriers@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clamav/+bug/1692073
-
-Index: clamav-0.99.2+dfsg/libclamav/bytecode_api.c
-===================================================================
---- clamav-0.99.2+dfsg.orig/libclamav/bytecode_api.c	2017-08-08 15:20:06.651685637 -0400
-+++ clamav-0.99.2+dfsg/libclamav/bytecode_api.c	2017-08-15 15:45:14.645714766 -0400
-@@ -811,8 +811,20 @@ int32_t cli_bcapi_inflate_init(struct cl
-         cli_dbgmsg("bytecode api: inflate_init: invalid buffers!\n");
-         return -1;
-     }
--    memset(&stream, 0, sizeof(stream));
--    ret = inflateInit2(&stream, windowBits);
-+
-+    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
-+    if (!b) {
-+        return -1;
-+    }
-+    ctx->inflates = b;
-+    ctx->ninflates = n;
-+    b = &b[n-1];
-+
-+    b->from = from;
-+    b->to = to;
-+    b->needSync = 0;
-+    memset(&b->stream, 0, sizeof(stream));
-+    ret = inflateInit2(&b->stream, windowBits);
-     switch (ret) {
-         case Z_MEM_ERROR:
-             cli_dbgmsg("bytecode api: inflateInit2: out of memory!\n");
-@@ -829,20 +841,6 @@ int32_t cli_bcapi_inflate_init(struct cl
-             cli_dbgmsg("bytecode api: inflateInit2: unknown error %d\n", ret);
-             return -1;
-     }
--
--    b = cli_realloc(ctx->inflates, sizeof(*ctx->inflates)*n);
--    if (!b) {
--        inflateEnd(&stream);
--        return -1;
--    }
--    ctx->inflates = b;
--    ctx->ninflates = n;
--    b = &b[n-1];
--
--    b->from = from;
--    b->to = to;
--    b->needSync = 0;
--    memcpy(&b->stream, &stream, sizeof(stream));
-     return n-1;
- }
- 
diff --git a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch b/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch
deleted file mode 100644
index 5585ea614534..000000000000
--- a/app-antivirus/clamav/files/clamav-0.99.4-pcre2-compile-erroffset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- clamav-0.99.4/libclamav/regex_pcre.c_orig   2018-03-02 19:10:39.702899702 +0100
-+++ clamav-0.99.4/libclamav/regex_pcre.c        2018-03-02 19:09:27.600901912 +0100
-@@ -112,7 +112,8 @@
- #if USING_PCRE2
- int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override)
- {
--    int errornum, erroffset;
-+    int errornum;
-+    size_t erroffset;
-     pcre2_general_context *gctx;
-     pcre2_compile_context *cctx;
diff --git a/app-antivirus/clamav/files/clamav-milter.README.gentoo b/app-antivirus/clamav/files/clamav-milter.README.gentoo
deleted file mode 100644
index f526bd35a926..000000000000
--- a/app-antivirus/clamav/files/clamav-milter.README.gentoo
+++ /dev/null
@@ -1,85 +0,0 @@
-Nick Hadaway <raker@gentoo.org>
-Updated by Andrea Barisani <lcars@gentoo.org>
-18/05/2004
-
-Setting up clamav-milter on Gentoo Linux
-
-Step 1 - Configure clamd
-
-Check /etc/clamd.conf, default values should work out of the box but 
-read and understand all the options especially if you are going to
-use it on production boxes.
-
-Step 2 - Tell the init script to start clamd as well as freshclam and the
-         milter itself.
-
-	nano -w /etc/conf.d/clamd
-
-	START_CLAMD=yes
-	START_FRESHCLAM=yes
-	START_MILTER=yes
-
-Step 3 - Inform your MTA about the new milter.
-
-            SENDMAIL
-        Step 3.a.1 - Edit sendmail.mc
-
-	Add these lines to sendmail.mc before any any other 
-	INPUT_MAIL_FILTER lines and before MAILER(local)
-	NOTE: ANY INPUT_MAIL_FILTER definitions put before these lines
-	will be discarded due to the use of confINPUT_MAIL_FILTERS
-	Make this your first mail filter. :)
-
-	INPUT_MAIL_FILTER(`clmilter',`S=local:/var/run/clamav/clmilter.sock, F=, T=S:4m;R:4m')dnl
-	define(`confINPUT_MAIL_FILTERS', `clmilter')dnl
-
-	Step 3.a.2 - Rebuild sendmail.cf
-
-	cd /etc/mail
-	m4 sendmail.mc > sendmail.cf
-
-
-	
-	    POSTFIX
-	Step 3.b - Edit main.cf.
-
-	Add unix:/var/run/clamav/clamav-milter.sock to your 
-	smtpd_milters line.  If the line doesn't exist, just
-	stick it at the bottom of main.cf on a new line.
-	
-	If you're appending, this is a space separated list.
-	If virus scanning is your most intensive test, you 
-	may wish to put it on the end of the list so earlier,
-	easiser tests may punt the message before you go through the
-	trouble of virus scanning it.
-
-	Only one milter example:
-
-	# milters to run on network received mail.
-	smtpd_milters=unix:/var/run/clamav/clamav-milter.suck
-
-	Multiple milters example:
-
-	# milters to run on network received mail.
-	smtpd_milters=unix:/var/run/dkim-filter/dkim-filter.sock unix:/var/run/clamav/clamav-milter.sock
-
-
-Step 5 - Adjust permissions for clamav-milter socket
-
-	Edit /etc/clamav-milter.conf and check/change MilterSocketGroup and MilterSocketMode
-	e.g. for postfix it would be this (sendmail,.. should be similar):
-	MiltersocketGroup postfix
-	MilterSocketMode 660
-
-Step 6 - Start clamad
-
-	/etc/init.d/clamd start
-
-Step 7 - Restart your MTA
-
-	    SENDMAIL
-	/etc/init.d/sendmail restart
-
-	    POSTFIX
-	/etc/init.d/postfix restart
-
diff --git a/app-antivirus/clamav/files/clamav-milter.service b/app-antivirus/clamav/files/clamav-milter.service
deleted file mode 100644
index 5a1a24faa27d..000000000000
--- a/app-antivirus/clamav/files/clamav-milter.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Milter module for the ClamAV scanner
-After=nss-lookup.target network.target
-Before=sendmail.service
-Before=postfix.service
-
-[Service]
-ExecStart=/usr/sbin/clamav-milter -c /etc/clamav-milter.conf --nofork=yes
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamav-milter.service-r1 b/app-antivirus/clamav/files/clamav-milter.service-r1
deleted file mode 100644
index f0118d8346f5..000000000000
--- a/app-antivirus/clamav/files/clamav-milter.service-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Milter module for the ClamAV scanner
-After=nss-lookup.target network.target
-Before=sendmail.service
-Before=postfix.service
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/clamav-milter.pid
-ExecStart=/usr/sbin/clamav-milter -c /etc/clamav-milter.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamav.logrotate b/app-antivirus/clamav/files/clamav.logrotate
deleted file mode 100644
index 7a811264653b..000000000000
--- a/app-antivirus/clamav/files/clamav.logrotate
+++ /dev/null
@@ -1,17 +0,0 @@
-/var/log/clamav/clamd.log {
-	su clamav clamav
-	missingok
-	postrotate
-		/etc/init.d/clamd logfix
-		/bin/kill -HUP `cat /var/run/clamav/clamd.pid 2> /dev/null` 2>/dev/null || true
-	endscript
-}
-
-/var/log/clamav/freshclam.log {
-	su clamav clamav
-	missingok
-	postrotate
-		/etc/init.d/clamd logfix
-		/bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2> /dev/null` 2>/dev/null || true
-	endscript
-}
diff --git a/app-antivirus/clamav/files/clamd.conf b/app-antivirus/clamav/files/clamd.conf
deleted file mode 100644
index ee055138074c..000000000000
--- a/app-antivirus/clamav/files/clamd.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/clamd
-
-# NOTICE: Since clamav-0.85-r1, only START_CLAMD and START_FRESHCLAM settings
-#	  are used, other are silently ignored
-
-START_CLAMD=yes
-START_FRESHCLAM=yes
-CLAMD_NICELEVEL=3
-FRESHCLAM_NICELEVEL=19
diff --git a/app-antivirus/clamav/files/clamd.conf-r1 b/app-antivirus/clamav/files/clamd.conf-r1
deleted file mode 100644
index de95554eea7b..000000000000
--- a/app-antivirus/clamav/files/clamd.conf-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-# Config file for /etc/init.d/clamd
-
-START_CLAMD=yes
-START_FRESHCLAM=yes
-CLAMD_NICELEVEL=3
-FRESHCLAM_NICELEVEL=19
-IONICE_LEVEL=2
diff --git a/app-antivirus/clamav/files/clamd.initd-r6 b/app-antivirus/clamav/files/clamd.initd-r6
deleted file mode 100644
index 8cf8dd0a4bac..000000000000
--- a/app-antivirus/clamav/files/clamd.initd-r6
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-daemon_clamd="/usr/sbin/clamd"
-daemon_freshclam="/usr/bin/freshclam"
-daemon_milter="/usr/sbin/clamav-milter"
-
-extra_commands="logfix"
-
-depend() {
-	use net
-	provide antivirus
-}
-
-get_config() {
-	clamconf | sed 's/["=]//g' | \
-	awk "{
-	if(\$0==\"Config file: $1.conf\") S=1
-	if(S==1&&\$0==\"\") {
-		print \"$3\"
-		exit
-	}
-	if(S==1&&\$1~\"^$2\$\") {
-		print \$2!=\"disabled\"?\$2:\"$3\"
-		exit
-	}
-	}"
-}
-
-start() {
-	# populate variables and fix log file permissions
-	logfix
-
-	if [ "${START_CLAMD}" = "yes" ]; then
-		checkpath --quiet --mode 755 \
-			--owner "${clamd_user}":"${clamd_user}" \
-			--directory `dirname ${clamd_socket}`
-		if [ -S "${clamd_socket}" ]; then
-			rm -f ${clamd_socket}
-		fi
-		ebegin "Starting clamd"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${CLAMD_NICELEVEL:-0} \
-			--ionice ${IONICE_LEVEL:-0} \
-			--exec ${daemon_clamd}
-		eend $? "Failed to start clamd"
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		checkpath --quiet --mode 755 \
-			--owner "${clamd_user}":"${clamd_user}" \
-			--directory `dirname ${clamd_socket}`
-		ebegin "Starting freshclam"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
-			--ionice ${IONICE_LEVEL:-0} \
-			--exec ${daemon_freshclam} -- -d
-		retcode=$?
-		if [ ${retcode} = 1 ]; then
-			eend 0
-			einfo "Virus databases are already up to date."
-		else
-			eend ${retcode} "Failed to start freshclam"
-		fi
-	fi
-
-	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -z "${MILTER_CONF_FILE}" ]; then
-			MILTER_CONF_FILE="/etc/clamav-milter.conf"
-		fi
-
-		ebegin "Starting clamav-milter"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${MILTER_NICELEVEL:-0} \
-			--ionice ${IONICE_LEVEL:-0} \
-			--exec ${daemon_milter} -- -c ${MILTER_CONF_FILE}
-		eend $? "Failed to start clamav-milter"
-	fi
-}
-
-stop() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		ebegin "Stopping clamd"
-		start-stop-daemon --stop --quiet --name clamd
-		eend $? "Failed to stop clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Stopping freshclam"
-		start-stop-daemon --stop --quiet --name freshclam
-		eend $? "Failed to stop freshclam"
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		ebegin "Stopping clamav-milter"
-		start-stop-daemon --stop --quiet --name clamav-milter
-		eend $? "Failed to stop clamav-milter"
-	fi
-}
-
-logfix() {
-	clamd_socket=$(get_config clamd LocalSocket /run/clamav/clamd.sock)
-	clamd_user=$(get_config clamd User clamav)
-	freshclam_user=$(get_config freshclam DatabaseOwner clamav)
-
-	if [ "${START_CLAMD}" = "yes" ]; then
-		# fix clamd log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config clamd LogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner "${clamd_user}":"${clamd_user}" \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		# fix freshclam log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=$(get_config freshclam UpdateLogFile)
-		if [ -n "${logfile}" ]; then
-			checkpath --quiet \
-				--owner "${freshclam_user}":"${freshclam_user}" \
-				--mode 640 \
-				--file ${logfile}
-		fi
-	fi
-}
diff --git a/app-antivirus/clamav/files/clamd.service b/app-antivirus/clamav/files/clamd.service
deleted file mode 100644
index 75aa2ccb624d..000000000000
--- a/app-antivirus/clamav/files/clamd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=clamd scanner daemon
-After=nss-lookup.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/clamd
-Restart=on-failure
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamd_at.service b/app-antivirus/clamav/files/clamd_at.service
deleted file mode 100644
index 9008ba7e82ed..000000000000
--- a/app-antivirus/clamav/files/clamd_at.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=clamd scanner (%i) daemon
-After=nss-lookup.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/clamd -c /etc/clamd%i.conf
-Restart=on-failure
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/freshclamd.service b/app-antivirus/clamav/files/freshclamd.service
deleted file mode 100644
index a0a72c2e60eb..000000000000
--- a/app-antivirus/clamav/files/freshclamd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav updater
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/freshclam.pid
-ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/tmpfiles.d/clamav.conf b/app-antivirus/clamav/files/tmpfiles.d/clamav.conf
deleted file mode 100644
index 1672df60eab5..000000000000
--- a/app-antivirus/clamav/files/tmpfiles.d/clamav.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/clamav 0710 clamav clamav
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
deleted file mode 100644
index 5ddb818cae43..000000000000
--- a/app-antivirus/clamav/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>antivirus@gentoo.org</email>
-    <name>Gentoo Antivirus Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
-  <use>
-    <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
-    <flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
-    <flag name="system-libmspack">Use system libmspack instead of built in</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">clamav</remote-id>
-  </upstream>
-</pkgmetadata>