gentoo resync : 22.05.2021

3 files changed, 2 insertions, 73 deletions

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}]"