gentoo resync : 15.12.2019

12 files changed, 254 insertions, 219 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 3902af0560d3..9d0946260edb 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 3e94d26c9218..318924118f0a 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,7 +1,7 @@
 AUX clamav-0.100.0_autotools.patch 369 BLAKE2B ee30a0fe90e4553b64a67d1e0646a9d6c5ee33858e657905e0d71da9c4b14176469f1b2960dd04b25d46823fd239b252490c172a51d64eae589894423b8aafb0 SHA512 d872a162040ba10476f463b9e0e77edea81f022a4c0d53d7a6d09ca5753036a5236cf7182f518515f659888a203b07366873b757cf5af15c3dee74bbad6b2d02
 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.0-libxml2_pkgconfig.patch 3357 BLAKE2B bc15b0e1c143233beaa46b0c5b9c526006acc77ae6163b1fcc9744d0a79f574c8f1802ce1a7b83ac6d097f5f1b993943569c8ca16d74fb496ce1adc181798a97 SHA512 6b671596e638606b41fd88757f485186d056d9d0e7659c21e793e256d671d212422385dfa30aefc590fc37e535953c0002ed1b3088e4bfac95d7ba6d612df623
+AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942bbd1c9b91d11ddb782cfaa0593458180207ffb873f783cea892d8eefd2402f30b7a0c4dcbbd5b61e01a54f98432c1164b29e7d83 SHA512 ee6379c85f7d85e30bfa4efda728cf9207a5017905abed8a6241561825ca54ec58a6cec2c1a8452574a9356491c192e89f76d19c2e404602637dcc9576b3fdea
 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
@@ -16,9 +16,11 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
 DIST clamav-0.101.3.tar.gz 21389753 BLAKE2B f254846dad40bd9dda650ece9dd672ca040fe4779b4f46a5cfa087808711055745d02c65f24da9589420e979a777bc435f68d25f6940ebf283cd0a8f240908b5 SHA512 285e6011ef5b68683daae7287005b2a615d7ee2fb9dac28d6db347cf7fe101da627aaec800366e83551f41afb78c6b08517def7aa30d0f0c347e54344b0b14d3
 DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3
-DIST clamav-0.102.0.tar.gz 13211357 BLAKE2B b3ba01f7ff63dbb4fcba57955b3ea364b56da6b71c01770cb6fabbd48a60cf43935aa0a869ef8d96d8f7adc65c9ebc681d08e87c2e07bc7469584a0d9833a4fd SHA512 7228f5f572e5ca32a458c262a5d297694059de04cb4a64364dd92e1d2e4560d58263d05bfb2053641ea7521c4040bef5a49b3cea27e77b907c95195cf4a54d84
-EBUILD clamav-0.101.2-r1.ebuild 5547 BLAKE2B 391c8a6b259c11fe82ff6a58aa78ad43506623360adb6e3aad575b4ce090c56b22f6f4accb57e5b9c226584dec5291ae85e276e527f2d081a603333acf07ea70 SHA512 d301811b92594ab509a8dfe3e517665a18cbf543fecd872fd52206756b4d689cf7df94d3f0315cf52859fb1f9e73223ab86e792a11f1d03c04b7f0501b8662a7
-EBUILD clamav-0.101.3.ebuild 5556 BLAKE2B d051a2176e74f9247827737f7315ba4a1a5db3ac5e3a76d52bd693d6bd9333cc0fe606c80f402a9c05f1e8910defd6c38ed4ca5125d7244b696d806ad1858759 SHA512 e0b0bd68566807dcd280882c34ea024a77cc1a8acee865b22c845c146e1e1c5a74840a3f5b060aba425e0317c03b4f19f23c32a4953f18919e8e3484dae3ac8a
-EBUILD clamav-0.101.4.ebuild 5548 BLAKE2B d102648b218b1e739a402c867dcc45f19738f69111a0f32373bf71b151c90fdd002e882cba9d09e624a731216bc0c36ea3a1b70ef7a720e0124b5bc56c33434e SHA512 b3ec73628fb8409920ab053eea527d70c4a203f32ea25c423bbf1ff3d87d9d8a230386f5419237c78a1871e834d0604051baa2b0fc8c5a6b9b5c0cd443fd664c
-EBUILD clamav-0.102.0-r2.ebuild 6298 BLAKE2B ac8d09c53280836d1ecb957fb677d2dc7e3b8c2706182f6a071188fc914d479452e15ed341a786a6d0898c6c0e0668ce91d35a8b213b92e17907920eee48ea2d SHA512 25b917cbc035b4f097f4f1ebe8e968275a8f6b359e7b0ab6afc2f47fbe4de2e55b0a966d3ab20d98b7a3ae549e693a03d3489bf000ee800383916802a332e172
+DIST clamav-0.101.5.tar.gz 21423304 BLAKE2B b6468595f79f2040b414bf288efcfcd41ffcba377595b5d829a3bc24ab92c4ad7585f5f15b55430f591c50e85a47d49e1597264249b80dfe931a449086de1077 SHA512 14e2f79573ed8bf885e4ba47ac22e713060d46e1704467f6c83c3a3abf37ffbd3a1b20bb0de87059a8df6faca9c10efe0f01cdfee54edb62ad863679013e1966
+DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90
+EBUILD clamav-0.101.2-r1.ebuild 5574 BLAKE2B 6a81f3b8382419d3ff5292d44192e5ce56f9929a82ed7d23b35dc6acc5f891cf0d1a65ca07192c70395dbe13122b0267791ebb420ba80d77409de165515d2866 SHA512 1c90b67907aef36f8b2496dc8273919145f7388383545da4a98280f74ba0113ec31da45f815dcac80f37d918f36f3777647e2920c4dfc69ac6bce5da695678fe
+EBUILD clamav-0.101.3.ebuild 5583 BLAKE2B 4f5a9713f6be41eaccfa8d32cd577f42fb5201b75dab50fa0778b1a905134cd2b9b54ae9df8cda12d57f351383531306bb2a26afc26ad86afdb6b2d3ed0487ec SHA512 6ee06499d3a98249b984a9a563b607fb48c398ade458847db962bc54a46e61efdaebb7100c164adbf1c9c8946016ea905ef47add478b359883b255a6cbe672be
+EBUILD clamav-0.101.4.ebuild 5575 BLAKE2B 9b9c9cc85eafd5b34d5b027ed1f532eedaadbd363e49d26e516d0bea22290c43023dcfe52957843ba6a6361e6081cf100c4fdf8f03cd78ae6dbc2cbc7332407d SHA512 ebdb4e06350b524a844f42d8cb6f818135c2e541b088b4e49859440aebb4390438fb52198f9a65e0844c9e3d6fec2fe5c80b572289b965fb27b69cef06b02fd3
+EBUILD clamav-0.101.5.ebuild 5583 BLAKE2B 4f5a9713f6be41eaccfa8d32cd577f42fb5201b75dab50fa0778b1a905134cd2b9b54ae9df8cda12d57f351383531306bb2a26afc26ad86afdb6b2d3ed0487ec SHA512 6ee06499d3a98249b984a9a563b607fb48c398ade458847db962bc54a46e61efdaebb7100c164adbf1c9c8946016ea905ef47add478b359883b255a6cbe672be
+EBUILD clamav-0.102.1-r1.ebuild 6293 BLAKE2B 08abfa9c070a5648c504f8c70c4f93e79bcc1db39d70ca6553174eed95dabd4dae6eeb03d075fcbfd06f480280a1e02e506afe48a885ece4daa880168d784d2e SHA512 50b2b83466f4bb9aca7618dfa65085df865c91cfbe2230a207ec0e929f2643c2177324c83460af9471f79e539672dcaea371e20bc89b4e1460784e4e3d96b4d9
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
index 4991a4a08280..f9e2b5caed66 100644
--- a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
@@ -13,6 +13,7 @@ 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 iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+RESTRICT="!test? ( test )"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
 	clamdtop? ( sys-libs/ncurses:0 )
diff --git a/app-antivirus/clamav/clamav-0.101.3.ebuild b/app-antivirus/clamav/clamav-0.101.3.ebuild
index 4872ce687bf5..5530e25ebe2e 100644
--- a/app-antivirus/clamav/clamav-0.101.3.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.3.ebuild
@@ -13,6 +13,7 @@ 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 iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+RESTRICT="!test? ( test )"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
 	clamdtop? ( sys-libs/ncurses:0 )
diff --git a/app-antivirus/clamav/clamav-0.101.4.ebuild b/app-antivirus/clamav/clamav-0.101.4.ebuild
index 4de9af941ffa..57d0df79beb1 100644
--- a/app-antivirus/clamav/clamav-0.101.4.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.4.ebuild
@@ -13,6 +13,7 @@ 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 iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+RESTRICT="!test? ( test )"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
 	clamdtop? ( sys-libs/ncurses:0 )
diff --git a/app-antivirus/clamav/clamav-0.101.5.ebuild b/app-antivirus/clamav/clamav-0.101.5.ebuild
new file mode 100644
index 000000000000..5530e25ebe2e
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.101.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+RESTRICT="!test? ( test )"
+
+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 ) )
+	>=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 )
+	dev-libs/libmspack
+	xml? ( dev-libs/libxml2 )
+	elibc_musl? ( sys-libs/fts-standalone )
+	!!<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/UserManual.md docs/UserManual )
+HTML_DOCS=( docs/html )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.101.2-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+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
+
+	econf \
+		$(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) \
+		$(use_with metadata-analysis-api libjson /usr) \
+		--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-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.102.0-r2.ebuild b/app-antivirus/clamav/clamav-0.102.1-r1.ebuild
index e768ec499d09..2c69d1693411 100644
--- a/app-antivirus/clamav/clamav-0.102.0-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.1-r1.ebuild
@@ -13,6 +13,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
 	clamdtop? ( sys-libs/ncurses:0 )
@@ -43,12 +44,11 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-clamav )"
 
-#DOCS=( docs/UserManual.md docs/UserManual )
-HTML_DOCS=( docs/html )
+HTML_DOCS=( docs/html/. )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.102.0-libxml2_pkgconfig.patch" #661328
 	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
+	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
 )
 
 pkg_setup() {
@@ -71,37 +71,38 @@ src_configure() {
 	# but that does not work
 	# do not add this, since --disable-xml seems to override
 	# --without-xml
-	JSONUSE=""
+	JSONUSE="--without-libjson"
 
-	if [ use clamsubmit ] || [ use metadata-analysis-api ]; then
+	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=/usr"
-	else
-		JSONUSE="--without-libjson"
+		JSONUSE="--with-libjson=${EPREFIX}/usr"
 	fi
 
-	econf \
-		$(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) \
-		$(use_with metadata-analysis-api libjson /usr) \
-		${JSONUSE} \
-		$(use_enable libclamav-only) \
-		--with-system-libmspack \
-		--cache-file="${S}"/config.cache \
-		--disable-experimental \
-		--disable-zlib-vcheck \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-zlib="${EPREFIX}"/usr \
+	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() {
diff --git a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch b/app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch
index 1a6303b5c8c2..ea39173c8ba1 100644
--- a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch
+++ b/app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch
@@ -1,8 +1,22 @@
-https://bugs.gentoo.org/661328
+From 25b9fccdae3a05561b6b7c9c82018a9a3dfec819 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 25 Nov 2019 15:54:09 +0100
+Subject: [PATCH] build: Use pkg-config to find libxml2
 
---- clamav-0.102.0/m4/reorganization/libs/xml.m4
-+++ clamav-0.102.0/m4/reorganization/libs/xml.m4
-@@ -4,85 +4,29 @@
+Otherwise we get unneccesary linkage to icu and other unwanted stuff
+
+Bug: https://bugzilla.clamav.net/show_bug.cgi?id=12202
+Gentoo-bug: https://bugs.gentoo.org/661328
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ m4/reorganization/libs/xml.m4 | 82 ++++++-----------------------------
+ 1 file changed, 13 insertions(+), 69 deletions(-)
+
+diff --git a/m4/reorganization/libs/xml.m4 b/m4/reorganization/libs/xml.m4
+index 24f0cfa92..d143e3a47 100644
+--- a/m4/reorganization/libs/xml.m4
++++ b/m4/reorganization/libs/xml.m4
+@@ -4,85 +4,29 @@ AC_ARG_ENABLE([xml],
  [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])],
  want_xml=$enableval, want_xml="auto")
  
@@ -14,16 +28,8 @@ https://bugs.gentoo.org/661328
 -    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]
-+  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])]
-+	)
-+    ]
-   )
- 
+-  )
+-
 -  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"])
@@ -74,7 +80,16 @@ https://bugs.gentoo.org/661328
 -            XML_LIBS="`$xmlconfig --libs`"
 -        fi
 -  esac
--
++    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
 -
@@ -87,8 +102,9 @@ https://bugs.gentoo.org/661328
 -    
 +    XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0)
      AC_MSG_CHECKING([for xmlreader.h in $readerresult])
-     
+-    
 -    if test ! -f "$readerresult"; then
++
 +    if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
        AC_MSG_RESULT([not found])
      else
@@ -99,3 +115,6 @@ https://bugs.gentoo.org/661328
        CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
        save_LDFLAGS="$LDFLAGS"
        LDFLAGS="$LDFLAGS $XML_LIBS"
+-- 
+2.24.0
+
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index e7c921beb5a1..e6630acd2488 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,10 +1,8 @@
 AUX clamtk-6.00-change_icon_path.patch 786 BLAKE2B 05a5e30bf33e4d13134d08277bac3011559c86d6a14d681dbf4217d62addb23345ded4e6e9c30bba1a5175a9a185150b1cf8d7d2773d49a33c6ef5117ab1647c SHA512 29871b25a948d182a613b5d12d60fc34e48ca473edae27763b51cc1403b7dbda56b4bfcf91bdfd04f0165f893010be8f0bf9975f74b8465239c7833cfd861932
-DIST clamtk-6.01.tar.xz 227872 BLAKE2B 25cc54b8aa3d6cd16317b0266dfc2aa035ad168f009678e82a648ea05da7850cee52772d0ea540b5cf84783c4ce52fda115de4695fb416e25f4242c0640c4a23 SHA512 43db326e322dce9632b03ce44475c36dacfee86e5059ebdea827ddc58b73fb66e36982a86427267b7ae37839688f16673e9e5dc4c9286eb545b75aac3711da6b
 DIST clamtk-6.02.tar.xz 227780 BLAKE2B cd5f05c5d5fe2fe7e6d52ab4619fe01f810195ca505ae85101e0cf743d9d20e42de74dfadfaecdc23cb97359121ea8ddc49772a96ec237921a7d6628ae453cc4 SHA512 df619da28ebadb218bb2f9ab2c9be1804f2df5e7e444762f2b1eb3ce0e830b07ebfd05b8cb9c7d79a9e3523c9837b00b52d0e06265c62d782487546f15b0349f
 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.01-r1.ebuild 3953 BLAKE2B f07b7b1595d4ebd0a69277ed645dd57a57457ac26f5b32d2181f63ea4d37cdc45c4cfc992345a668c0ffdfd8e26f328c162482b60ab74068e5378f9ad6193860 SHA512 26121c486b7e64d4118d3650c4b15199f1156cfec41ce9fb3227358ae842adf151f88f1fb096c0f9f0a10597e11d8344dc9e747092736111dfffc05af5f257ea
-EBUILD clamtk-6.02.ebuild 3884 BLAKE2B 4c7889686edab31d818df4dc3a5216b6d16274bff067b859e1edddf5976012a839961393d06ff5c8afdbab753709c1460f987370e7e9f2d44b8904b7ff543f95 SHA512 5c8074e0e5768abfae043b9ba8ccd701aa756c4e4d3e7766f5971bc3402ab0cd4cb8ab008a6fa0bd61117091e4c01664cbc8c20c8d75a24648f510f9b490d1c0
-MISC metadata.xml 928 BLAKE2B cb47b88895378fe651e643f91820ed39a554e9e389346a8d68ef6d942fb08759c4f2b26ca660453aba67b32274eb654ff092d921062b517514346f69e60e8d4d SHA512 ca121472d4a5ee69abafa75a7f60b41481c2ced34cbc4ec0dfe06212b7fe2c01985b0f4bb34e08efcb1a76931aa9cf16f0b5f738b9f06138277761c5b0ba6c3a
+EBUILD clamtk-6.02.ebuild 3882 BLAKE2B cb1440345212573b261607787e57fe3f15573e11bf10c1245f7da5e50d08466e0182f78cee7c89578c424ae8d574aaa32564872fef7f41c8993fe77b968348ad SHA512 70513406c36700ddabb413f94792e6e8605bb7a7fba972cbfbdc7044a70d1215a205f131807d9dfe09b6e9dd4972d9ba573ddcfd8243853fad1d21b9933c6cd6
+MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.01-r1.ebuild b/app-antivirus/clamtk/clamtk-6.01-r1.ebuild
deleted file mode 100644
index ea9ef8556d47..000000000000
--- a/app-antivirus/clamtk/clamtk-6.01-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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://dave-theunsub.github.io/clamtk/"
-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_USEDEP}]
-	)
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
-
-PATCHES=( "$FILESDIR"/"${PN}"-6.00-change_icon_path.patch )
-
-pkg_setup() {
-	if use nautilus; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-
-	unpack "${S}"/clamtk.1.gz
-
-	if use kde; then
-		unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
-	fi
-
-	if use nautilus; then
-		unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
-	fi
-
-	if use nemo; then
-		unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
-	fi
-
-	if use thunar; then
-		unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
-	fi
-}
-
-src_install() {
-	dobin clamtk
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"/ClamTk
-	doins lib/*.pm
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	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.02.ebuild b/app-antivirus/clamtk/clamtk-6.02.ebuild
index 6c25b6922b3c..df2e37a36698 100644
--- a/app-antivirus/clamtk/clamtk-6.02.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.02.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/metadata.xml b/app-antivirus/clamtk/metadata.xml
index 4b20e8622587..ab0a05cd928f 100644
--- a/app-antivirus/clamtk/metadata.xml
+++ b/app-antivirus/clamtk/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		ClamTk is a frontend for ClamAV (Clam Antivirus).
 		It is intended to be an easy to use, light-weight,