gentoo resync : 22.05.2021

7 files changed, 4 insertions, 219 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 9b4b321b61f0..c21563876328 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index 233e83bde047..8bb5bd4fecfb 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,9 +1,7 @@
-DIST clamtk-6.06.tar.xz 232024 BLAKE2B a9a7310410f685bb6cae24ae6cee45b31a524b88cf75c9346617614e5dba43f3942d39dd6d484d656906c3fbb2122ab3858ab017c0e79d5ed9271b2968b750d2 SHA512 ee4d09e0f3c703bef5a1b3e1bdc97d3d1d91998c98e82a2fb1e3326fa8fdff32d7bbef7d9e2bf2b6292fa1982b1efb3b5cdb4cdd7afb17f6ffd0e089d8b4539a
 DIST clamtk-6.11.tar.xz 286216 BLAKE2B 7ce995fbe12e215cfd22517e648a6d68dd7603c694c8b2fb4a25c6070fa07895f8aee1ae7e6dcc8ae0bc01fb7950a69019bd8cdaf3c01cd0e7754ad0341afb5c SHA512 6fb0512460ae8f9c4762beb012a2539b6eb157c513138e661e10d3a8f615b8b6c9b0876772defa705f0180bea0a8b97fe187c1114611fe75906f8dae108db11c
 DIST clamtk-gnome-0.05.tar.xz 15148 BLAKE2B d72ad0c9b3272c1a21d3722994152e23aeb01bd79d006cbcd3545c2689887b4f596daeeef72a13d9cdd9cfc89c4091963b4a1917824bbb06be4678f2c446a114 SHA512 a5d3b0e87889880272aa61a0feebca8e885c7fa964bad767351c826188c236f2152b3c43328b6aa720c5942b2bf1da69916d3664358c274813a6ac032ee4dea0
 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.06.ebuild 3803 BLAKE2B 7d674a0e2d104b37823e70857ec9948e8de03a97f577aaa09baaf8b9a4066ac6acd884f42f512c0eeab0548d8b10ece39f611b5ddafa7e0dfee95094ed7f3d6f SHA512 254ac7f66ea2923d5882ebc84ebf070de75080f610b22b3887c490d3eaa1723bb60796bd49d312ee591573d6192cfd8e22ad4c6961f0f670b3be55d852aefa5e
-EBUILD clamtk-6.11.ebuild 3819 BLAKE2B c0b4148f50e43fbc50dbb7ec3bc58766d7af17234ae724f49b3e8e714cf5e69209d83bd51dfdc294205da658a09df56513d1c60ebc4ba7e2f1efdf4af985ecbb SHA512 b9b5113f5995c6f1064b5659a5d3376265d143d861a133461f5db5165e0a9be0bff0302457cc629031ac5436f18202701999264ec17aeec7b49b17dd479d4952
+EBUILD clamtk-6.11.ebuild 3817 BLAKE2B dd6c4d8f9aed296c925455bf279cb6bbcdc2bde556fedf4a540f9e0737d4656b3d32ed6dbcbe79ff6796a7270aed883e53e7d72c70d6f50788eb5c4852f0221d SHA512 9787d1417eda55908c6d7d7f06c8639018b38abe2773cdd9537713fdcc83e510f6cb1e8263312054e4819f183fe6ab6dafdc8857015020e76b05115e4885e5ae
 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.06.ebuild b/app-antivirus/clamtk/clamtk-6.06.ebuild
deleted file mode 100644
index 64ea29497fbe..000000000000
--- a/app-antivirus/clamtk/clamtk-6.06.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit desktop perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.18"
-MY_PV_NAUTILUS="0.05"
-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
-	nautilus? (
-		${PYTHON_DEPS}
-		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
-	)
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
-
-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.11.ebuild b/app-antivirus/clamtk/clamtk-6.11.ebuild
index a03f211ef68b..79a160d99f2d 100644
--- a/app-antivirus/clamtk/clamtk-6.11.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.11.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/fangfrisch/Manifest b/app-antivirus/fangfrisch/Manifest
index 1a8945f352e9..ea15c0dd6bd0 100644
--- a/app-antivirus/fangfrisch/Manifest
+++ b/app-antivirus/fangfrisch/Manifest
@@ -1,7 +1,5 @@
 AUX fangfrisch.conf 512 BLAKE2B 1b1cd87fbf2095f8d6839fef2175b70cdf1c8d72bcfa8eb06e9abe5e88150f3d4414a64679d775f1fef4378a940334c6c1567f387dbf6ce7f8bb40f6070f31c0 SHA512 e3fff2b24a6bd05a709472e9b7b5416732807171539d31c9f2129e8b7c2ef2b5f047a7090818a2aae77941169030e7785be7a6cded1220f8a130e9e60ea05ce6
 AUX fangfrisch.cron 170 BLAKE2B b2b3572bb468942eecc006749710900bb19e29d40ad444a4b1ee1575f2d4eda77e2b4c66f6ab75208bbb28c48f0d26075b2d0517982cd62d0f082aa657ff82f2 SHA512 46ba3a9bbdc93896387e9ca3a2fef1bbae6711b3680baa0afddf41c83b537e62d9425fe93d7d7befc60dd8a89aa4c70f9947b596594d5ca93024acec1f9bf454
-DIST fangfrisch-1.3.0.tar.gz 114361 BLAKE2B eca124f02f814d2915c4dbba45b6e4dc620e250730a32b34d3f5f5eaa33945e697d2d887f29251f1f8a3b1813476a54092091235a786e84695a3bc1cadebad28 SHA512 9c138737908a02efa5c9b4c6792a31e2a4908f8ab27e8cecab78612f812ab151afef75a405f47695779a949485aa88a3a5830efd02344ec334e6f37425cffe49
 DIST fangfrisch-1.4.0.tar.gz 115303 BLAKE2B 6dea9305ad22e8beff0fc04219d24da995c36e0838e1be8b98d12b11db1f68d7ca4f6084d15270c09e8a4b8d94a7bdfe1b9bb336abef1767b1ded2d1751fa22b SHA512 5fca7b7e8d24daadfb450851c70391fce94943a718bbed4fc76efe08a730cce313d92e7d9a6a8324a0b0039871f8c77f1fcd3744c569826cc0d2e7a7fd4e9b32
-EBUILD fangfrisch-1.3.0.ebuild 1976 BLAKE2B 6ae2b185454375f005ce29c44e20905c46ea68a6b9f7b12b340aae679f643880cd43d5e03606355b62156569900ef14aa567179ed5d317563ab5612b4f2c30da SHA512 ae3ac41b250d230c1d47c30b38aaa7f70391731d546d73148d9ae00a8a867f7205d98e613737289929ecfa0f0c4937ee87fe2bc81644228829b979d3fb8019c6
-EBUILD fangfrisch-1.4.0.ebuild 1978 BLAKE2B 0bae4e9fca95089a1b05e0bf352f2d9a08bd9c0c75e062bdc794181524ffe7c533d67978731a37fe1d0b1c615abc7c6e0963a5546472e5bc6f5487367f46de82 SHA512 61f5ce2be798a99bfe8b79594756be9bd66c8694a5bb343bb1dc992f2ae7e8e973d7a1a531e0c09960ca54d682f7c0ef64fd75afef3d8033148a116a3ea566c8
+EBUILD fangfrisch-1.4.0.ebuild 1976 BLAKE2B 6ae2b185454375f005ce29c44e20905c46ea68a6b9f7b12b340aae679f643880cd43d5e03606355b62156569900ef14aa567179ed5d317563ab5612b4f2c30da SHA512 ae3ac41b250d230c1d47c30b38aaa7f70391731d546d73148d9ae00a8a867f7205d98e613737289929ecfa0f0c4937ee87fe2bc81644228829b979d3fb8019c6
 MISC metadata.xml 901 BLAKE2B 2cd17c12d83281f8167ce3ccc0050c02ff13355fdb781abab571ef0aeec15374fdbffdbb83881d1daab4a5ec1dbd2d05e5894f61319b4fb05aac76817fcd901f SHA512 cdd4680327c1e0dde0634952466feb2e45d8ef41246f4c9e5aff7c48187d5719b34aaed2d8a95415db351349f23a6485d03e3cad9e69855ae0c70d16b3d88ce2
diff --git a/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild
deleted file mode 100644
index f70138cc4b33..000000000000
--- a/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Update and verify unofficial Clam Anti-Virus signatures"
-HOMEPAGE="https://github.com/rseichter/fangfrisch https://pypi.org/project/fangfrisch/"
-SRC_URI="https://github.com/rseichter/fangfrisch/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-MY_CONF="/etc/${PN}.conf"
-MY_DBDIR="/var/lib/${PN}"
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="See https://rseichter.github.io/fangfrisch/ for the official
-documentation.
-
-### Fresh installations:
-
-Modify ${MY_CONF} according to your preferences.
-Assuming you place the database into ${MY_DBDIR}
-(recommended), execute the following commands in a root shell:
-
-mkdir -m 0770 ${MY_DBDIR}
-chgrp clamav ${MY_DBDIR}
-sudo -u clamav -- fangfrisch -c ${MY_CONF} initdb
-
-You can now enable /etc/cron.d/${PN} for periodic updates.
-
-### Alternative: Updating from release 1.0.1:
-
-Either create a fresh database or manually delete all existing
-database tables, then run the initdb command as shown above."
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	sed -i -e '/SQLAlchemy/d' setup.py || die
-	# Due to the nature of Fangfrisch, most tests require network
-	# connectivity. Upstream CI reports show that the tests are
-	# successful, so instead of a pick-and-choose approach, the
-	# complete tests directory is removed in this ebuild.
-	if [ -d tests ]; then
-		rm -r tests || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	insinto /etc
-	doins "${FILESDIR}/${PN}.conf"
-	insinto /etc/cron.d
-	newins "${FILESDIR}/${PN}.cron" ${PN}
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
-}
diff --git a/app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild
index 3c01329a331e..f70138cc4b33 100644
--- a/app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild
+++ b/app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild
@@ -37,7 +37,7 @@ database tables, then run the initdb command as shown above."
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]"