gentoo resync : 02.09.2020

3 files changed, 69 insertions, 1 deletions

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
+}