gentoo resync : 02.09.2020

10 files changed, 75 insertions, 14 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 24cb65c2220b..703002097c39 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 7012759b8536..75b869f43abb 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -5,5 +5,5 @@ DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e
 EBUILD afew-1.2.0.ebuild 815 BLAKE2B 4073b92aa56297b14c39ed1d954dc69cb2284526a08dca2ef9f1809c63a5b1ec03e4e110fc097e4fa5bccc49a21751379f9a9c2d0a0d9fa7bea967031deb8137 SHA512 bc0a703814c7813d217fecd568ee71ba04bbbefe348733bee0e8b0d9f7b83149fd6d8cc3710b79885cabbc64af4c865b6d96be4b2cdef1a5eccb37d7d108aafd
 EBUILD afew-1.3.0-r1.ebuild 865 BLAKE2B 9b17cdb5481927f3d5dcaa3b19b0305238331e47fc84337bc47edf041021c82c4229a8a9d65b516f81ce92706d991a2cd057dfc53efa313520e76cd361e2dc35 SHA512 03de0950dd23a2fc7d5424d1b17ac1472576cbcc8764fc98ae1bba5cd75c0758b44bccbacca9ceb0b38a15f515a7860d1cc77c124690ab4c96ece5061f2aae99
 EBUILD afew-2.0.0.ebuild 1166 BLAKE2B 460e123ac14cbb91eeb5173e006379052e8175b55e216738b450a41fc9902d1c32daa247c913fdfad2e30e4e5d8f077f9fa350232731abb0ad9e86084cb62d04 SHA512 dc1a65b85308cc7daea5dc770301515d0a7221abfe0ca84ba281f158705bc41ce4defc2095bced5831ee1b6211bce5cfbda35a4154cbc7717d940084069916d5
-EBUILD afew-3.0.0.ebuild 1166 BLAKE2B 460e123ac14cbb91eeb5173e006379052e8175b55e216738b450a41fc9902d1c32daa247c913fdfad2e30e4e5d8f077f9fa350232731abb0ad9e86084cb62d04 SHA512 dc1a65b85308cc7daea5dc770301515d0a7221abfe0ca84ba281f158705bc41ce4defc2095bced5831ee1b6211bce5cfbda35a4154cbc7717d940084069916d5
+EBUILD afew-3.0.0.ebuild 1165 BLAKE2B b0ace2eebed48bf98c09b5ee1cc6ccffd4e10fd23cced0a59376d35c34bf6f421d4038521e8383c9e697e1d1c7526d912b425178e786be5d9e788e22bc93e778 SHA512 c8f2561321ea850e6de1005291ef5073a47d1bc6687691524624bbb6a673ffbf0ccf18222b6ef12290682418a93537844dc58535c278e0fa86fdb87d68c24a9b
 MISC metadata.xml 1001 BLAKE2B 33e569aa1f5f64926dfb7a74743d1cd40d16177ef814cb25e16904c20b8ba7b1ef1b12562bd437353254af73abf0759ab90da818a0aaf5acc4cae089bd21451a SHA512 44016d8a87273ede7b9fd52871095894725584202b17c69feb7b599859cbdd6202c2e41296744e63fcc918b95daf1962f64af9ea87b627bd4bf8d318b2703feb
diff --git a/mail-filter/afew/afew-3.0.0.ebuild b/mail-filter/afew/afew-3.0.0.ebuild
index b9e74273e201..799d25c1b5ff 100644
--- a/mail-filter/afew/afew-3.0.0.ebuild
+++ b/mail-filter/afew/afew-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 01d876fdf611..5e66506560be 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -2,5 +2,5 @@ AUX gld.rc 443 BLAKE2B da060c3e9c29b4a12a1e8d74c29b82f9d29943864cdbdd4e4fd6ee502
 AUX tables.sql 1141 BLAKE2B 0154c7dfe7a1761c15c2548990d5fb3889218287e7f5a4ddb943d871245d2aafe4d4cac014855dcfb3dd9fbaf9e950b0d2be9d6135eb4527e99b4521d5197dcd SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a
 DIST gld-1.7.tgz 40241 BLAKE2B 3ec3f28d933da4cf7cbb5d66188f162be6d4d6882c5c1d6a143ca6ce1222e92abb7f0e67dba6cb49e9af5b9b2eec9ec962c82edea97aa305efe23acda2825c8b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e
 EBUILD gld-1.7-r2.ebuild 1875 BLAKE2B 1f2f2dccb676953a92aa4933fdd8a4ee580500c5118327d1c2ea950cbe6a92879a133d7a742d96409253e73df5a0a5409270ad9c9fba1e8a54269d3c982e618f SHA512 16e11bd850678ef303a81fab386870bc54d9a6341f66ac55e8a84b3d0d86cf9f0fccb3aec9cd39c0eff906eac976e554c055e91c197af8f91eadb35414b931ab
-EBUILD gld-1.7-r4.ebuild 2052 BLAKE2B c9478b99900909a4c2fd744d6d352283c95292337675fedc2b9faaede5486a0d8ae0490bc50f1584e67e6103c4ee55ff09d20eb411a4ee17c1cc40937c42357e SHA512 b93674a81aa7463e7aad21f10c616e3797e47433625f97868849323ab2e1f89096fc993006e70ef7201de2c53c24ce44b84efb6a0eea7dd23864ada3f4b0e099
+EBUILD gld-1.7-r4.ebuild 2051 BLAKE2B 9edab9b96caaa40877df42f5169abd072113bdcc03a7b5b1d0fe707fa552f024eb9c259f46dc6f30979f0bcf98885088b259bb235512a006feebf237b3d289db SHA512 ebd7d1de7212ee06688941ec068c57cf6f1764cc7361e035e0de1c7e70a001fcd9f161424eb47a0b32dff4a0a34164cba35980c796a5759dfbf23889694a81a9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/gld/gld-1.7-r4.ebuild b/mail-filter/gld/gld-1.7-r4.ebuild
index c367f5ee96a7..0bcd3923f278 100644
--- a/mail-filter/gld/gld-1.7-r4.ebuild
+++ b/mail-filter/gld/gld-1.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://www.gasmi.net/down/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="libressl postgres"
 # Not adding a mysql USE flag. The package defaults to it, so we will too.
 DEPEND="sys-libs/zlib
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index 527907296de6..a377e5d843cb 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,5 +1,7 @@
 AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
 AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
+DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
 EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466
-MISC metadata.xml 808 BLAKE2B 4c49c0d23d504122e7bb2d603f74cf5468cc84c212342dce3ca36b1fd5ec54b2b1aa65e8966ffb94a19a49d08eb8614af5f082faee32f94a315a8d51c9235ccc SHA512 8547153e5e1cd014039d497440197df6144d0dc1be2ebc31dca25551cb4ca1bd7399c2aac7e1c521e9c6b1d4172a6a88c1a98047f4a6bf49e58ac11671388230
+EBUILD pyzor-1.0.0_p20200523.ebuild 1568 BLAKE2B 471cb842c1bf016aceb0c017b4f869bca4caf4526e540f020427a4ab7cb25f25415043587066b0bbd9e3211ba1888c75ac677071a09fc4441a31881b2d9624d4 SHA512 b35c3043c6733101e098edabbfc349891ba2b9fc2b8cccb5b617d916b9d3f4ac12bd76340432dc8ee0043cc7b3b0174955fea6bce01268ba1b7f3ef86f15dc12
+MISC metadata.xml 953 BLAKE2B fe7e5e35caa89645a565b81176783dd56302b60be89423f4dd882f14ec6b437daaacdeb1c253440eb67dc7f9dbc5daa9c838bb39ccea2e38b2eb48817c28a559 SHA512 ab71adbb406760237a26728a512f32a10e3e55d17bed7c09d37e7da32abe21dcce9d4506630c7a59e681e4096ee4c436e8edcf220e22038d45a6b755e123acea
diff --git a/mail-filter/pyzor/metadata.xml b/mail-filter/pyzor/metadata.xml
index 21a8605f2713..c8b645011f06 100644
--- a/mail-filter/pyzor/metadata.xml
+++ b/mail-filter/pyzor/metadata.xml
@@ -10,6 +10,10 @@
     <flag name="gdbm">
       Enables the Gdbm back-end database engine for pyzord
     </flag>
+    <flag name="mysql">
+      Enables the MySQL back-end database engine for pyzord through
+      <pkg>dev-python/mysqlclient</pkg>.
+    </flag>
     <flag name="redis">
       Enables the redis back-end database engine for pyzord through
       <pkg>dev-python/redis-py</pkg>
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
new file mode 100644
index 000000000000..4ad861c375c7
--- /dev/null
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+COMMIT="f46159bd6519cebcebf59e9334a7920371111d75"
+
+DESCRIPTION="A distributed, collaborative spam detection and filtering network"
+HOMEPAGE="https://github.com/SpamExperts/pyzor"
+SRC_URI="https://github.com/SpamExperts/pyzor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gdbm gevent mysql pyzord redis test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	pyzord? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
+		mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	)"
+DEPEND="
+	test? (
+		gdbm? ( $(python_gen_impl_dep 'gdbm') )
+		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	)
+"
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# TODO: maybe upstream would support skipping tests for which the
+# dependencies are missing?
+REQUIRED_USE="
+	pyzord? ( || ( gdbm redis ) )
+	test? ( gdbm redis )
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+distutils_enable_sphinx "docs"
+
+python_test() {
+	pytest -vv tests/unit || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use pyzord; then
+		dodir /usr/sbin
+		mv "${ED}"/usr/bin/pyzord* "${ED}/usr/sbin" \
+		   || die "failed to relocate pyzord"
+	else
+		rm "${ED}"/usr/bin/pyzord* || die "failed to remove pyzord"
+	fi
+}
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 572ac515efce..360fbf5183e2 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -12,4 +12,4 @@ EBUILD spamassassin-3.4.4-r2.ebuild 9632 BLAKE2B 6b7816eeb6eaad6ecc1734e3b67b9b0
 EBUILD spamassassin-3.4.4-r3.ebuild 9512 BLAKE2B bd5116a376a3bbf87ad962453e32bc60ccd3868c767a96b71fdad39d7753eb1d27a7f3eba8ba0b62ebed31c9e3f27711d04a8135bf3a3e276023478200c69c56 SHA512 20b012f637533a50cda2c921a6345595eaf6f6354577f976b875b31b2f5832cd329b6c775e915e9f2bf3f35c6dcdeb41f51640b8276e7a23b277c0c3452a09ca
 EBUILD spamassassin-3.4.4-r4.ebuild 9605 BLAKE2B a51cd8edf4104b8a5c61e7093ce5ba739d5a64971577e5cd77e79995f452721c748ec8eb4e2da9e7299c1b633f796e1ef1897e40683096ed93548cf9f342c6ff SHA512 21865ff9434b6575ab35e840607fc9a90088bf9f3f6c19182ce1d5eda364be316593d33629bc79b0d7223ee2be36337f1fb45ccbd2d0a2466ed1c1f0e3669688
 EBUILD spamassassin-3.4.4.ebuild 8488 BLAKE2B b6d4f0dfd63739daaf7b48352caf580130dad0aa765c5f3347d790eaae6410703d8f66dc2b1b365e056c7b18bf1df3e2110b2f8cc3b4f2c6f67095142553dbad SHA512 12d0b6ae6e886d42448329f8bee89ab015a391dbe7497888a5b35a7e41463a52d2c51ca13e567f1cd2f4f6cfd9686a8425947fc956a5523438e710e20b90ca16
-MISC metadata.xml 693 BLAKE2B 57b8a079ed95858b27fb567e1c3b77389e8141315fcf69e34e2b80dab13e5b0f88c9f50f2387f7537cedd5a3cd56adcb611932a641e31a7f875914bb847708d3 SHA512 991a54ec305b6b4c4e9fd27ba77abf2ad7e72647776e0acc0e29a058566d0045e31df8ceebee6e320f758f10fb12973239d1650e469e910ac77a887656fcff3e
+MISC metadata.xml 579 BLAKE2B 98c1b526193c33a3f6d7aac34f9e93dcf81dfbd5b288da9a9a196d94e03fe7cb17d3b06de41042941a70f70215a6104a048fe67ff97b225490139bfb06fd8186 SHA512 f02b525fb0daf5a90edb2cfff536c51240bcc4c040f6ee6126b95865d0c61b1ded0d72d89b114ba58389963b033df1d8df97df6c39e49ac1ffbb69fee96acc7f
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index b9faf870933f..eec4aadcd854 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -5,17 +5,10 @@
     <email>gentoo_bugs_peep@parallaxshift.com</email>
     <name>Philippe Chaintreuil</name>
   </maintainer>
-
-  <maintainer type="person">
-    <email>bug@mejor.pl</email>
-    <name>Marcin Mirosław</name>
-  </maintainer>
-
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-
   <use>
     <flag name="cron">
       Install a cron job to update SpamAssassin's rules daily.