gentoo resync : 30.05.2020

5 files changed, 11 insertions, 6 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 48514f1774b4..d67ee75e99ce 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 8ee81c684bb9..a237dc783a05 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -17,5 +17,5 @@ DIST clamav-0.102.2.tar.gz 13227538 BLAKE2B 09d18f507a439f1dd63ebc038b129e0ead75
 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 6650 BLAKE2B 5e156a5fc41192e30ae36d525879d545d6d48dd417871a626bf52595600462c1a1b27907ea787f0a882bea2f2609ab2cd223e8608c7312fd7404dda01b144d11 SHA512 0fc27a730a0a276a3b7cb84f6162eb3bf17561e80ca318d88215b51d518f7ef8f66ce9e04f30bc0ca17e33980086455166e4506da0e175f49f2043b288c5b9fe
+EBUILD clamav-0.102.3.ebuild 6645 BLAKE2B 63a3013284bd8e3b600e1290699636a683484e00f1e58ce404051082d226c321e7b166d779ce7798610decf5604cca620ad69c89a18fc1e11dda31d1f763084f SHA512 2b746a2d76d0a799543d393245aaa765deb6c05770e60ea0cb1c39586bfca146bc609d3590de108199a684ef0ca9c343c43e058627577adf338cfebeca5ca23c
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.102.3.ebuild b/app-antivirus/clamav/clamav-0.102.3.ebuild
index 35a1db0325cf..23d5142b79e9 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/fangfrisch/Manifest b/app-antivirus/fangfrisch/Manifest
index 0b5da88007ed..89f7194852b7 100644
--- a/app-antivirus/fangfrisch/Manifest
+++ b/app-antivirus/fangfrisch/Manifest
@@ -1,5 +1,5 @@
 AUX fangfrisch.conf 512 BLAKE2B 1b1cd87fbf2095f8d6839fef2175b70cdf1c8d72bcfa8eb06e9abe5e88150f3d4414a64679d775f1fef4378a940334c6c1567f387dbf6ce7f8bb40f6070f31c0 SHA512 e3fff2b24a6bd05a709472e9b7b5416732807171539d31c9f2129e8b7c2ef2b5f047a7090818a2aae77941169030e7785be7a6cded1220f8a130e9e60ea05ce6
 AUX fangfrisch.cron 170 BLAKE2B b2b3572bb468942eecc006749710900bb19e29d40ad444a4b1ee1575f2d4eda77e2b4c66f6ab75208bbb28c48f0d26075b2d0517982cd62d0f082aa657ff82f2 SHA512 46ba3a9bbdc93896387e9ca3a2fef1bbae6711b3680baa0afddf41c83b537e62d9425fe93d7d7befc60dd8a89aa4c70f9947b596594d5ca93024acec1f9bf454
 DIST fangfrisch-1.2.0.tar.gz 113088 BLAKE2B 9fb5f4b838e6337128c9e988f5749864cadacb74c9e3006f29cf8b976592af88c00ff5359cd70e4d6901e24cfc01b061861b7b1a563a82d66b2d71c970627c26 SHA512 6f6c0cfc4d840f99186c83e6109c6234ff5bfb44e19bcd3309056347392e46da56e17106259508864b05397d39ea92500ab6863b50d55efc790d88b59f88ee3b
-EBUILD fangfrisch-1.2.0.ebuild 1721 BLAKE2B b3032f4ca1b2622ef4c177bd6bedd1ed127cca6f67581517f944a5523a42b2b70730b7fb9e852815ca8fe8677516687b68a04612f900e30f7c1a5af92aa6bca9 SHA512 9c9c5d2d8b294bf25dfdfa10588848620a9e594090152a22d8f35b526f8387c4b88a5ab1a69bef4f787f4b5da9e4669c07afa63d913bcf4e822581b1ebb8ab89
+EBUILD fangfrisch-1.2.0-r1.ebuild 1974 BLAKE2B aa48cb2d6beae1e5405deb60dfa0a68b9c7ccd7e5fa78ce8a0e66fb7241625ca3bbfef35f414e9a5c628792a3b944ec95ac5622a3a76872191c3fa42316ea7f7 SHA512 d02213e13ccca23c0fa667592e5f8e8d8c29fa3b7dac5183b6c5eba9742f4e493b98fd7daa0e583dbdc0d9c7a5132b2ab1b062e2ad297ed48d11e92b156306ad
 MISC metadata.xml 863 BLAKE2B f3324a0adbcf5979af8daf27906630edb5d6ae78cf74ef1abd7610297587a382981658381d22b8af6233f543b02903733d1dce13df27faa4c6eb243cc164b243 SHA512 b11935bd73f1d405292dbd80456380dcc1b390015158cbacb1023b12f755d41c2af656514ec1fc9e307752706166fa96651fdebc626f1e0e4134e0a0a9d01f82
diff --git a/app-antivirus/fangfrisch/fangfrisch-1.2.0.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.2.0-r1.ebuild
index 96c6bbfecc59..08c54e83ab3f 100644
--- a/app-antivirus/fangfrisch/fangfrisch-1.2.0.ebuild
+++ b/app-antivirus/fangfrisch/fangfrisch-1.2.0-r1.ebuild
@@ -37,16 +37,21 @@ 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}]"
 RDEPEND="${DEPEND}"
 
-distutils_enable_tests unittest
-
 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
 }