gentoo (valentine's day) resync : 14.02.2021

4 files changed, 48 insertions, 9 deletions

diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index d6676646bf81..712c20bfc0ef 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1,7 @@
-DIST guessit-3.1.1.tar.gz 147605 BLAKE2B 3b11747b652e922aada12ce771c1e91e8842c78c221ac39c068488ae6cae95ebc6d9f6d8849aaef11d522e2c7d6e6f8e34981179e48d9db649e811c5fa2e52ef SHA512 6a02c4024d286cf49c62e072bcb616a052cec1ce51d364b17cea1768504c4ecebba914a3bf5beda9a61dca0e7764c8642cb5b918a20fb25cdd7120ad1667825f
 DIST guessit-3.2.0.tar.gz 147286 BLAKE2B 0ab249eb82204fd58a6d6c960b11b2009a3055ae91a91c244192a2bd9832e7356f444a6b4291cf56d55a4c9a1cd0ccec22d527114d61f9f5888a8439918ba6bc SHA512 5eaa0ad8cdf60812bebf10af51f62095baa70f48b66a052002fceb0d705daab3b8bcd2cb0fc3d18b63b9f4aa8118b9d85283bebdcfdb8ed4204e1b7e2b5ae78c
-EBUILD guessit-3.1.1.ebuild 1068 BLAKE2B 877a623f18a63dd7cbbcfc4f46cf40b1445fc2130404ddf8aa84cc167ec75577e1b9569c583ba7611fad189d1275e9bc05f0d717ddb2f90fdffa7292d785150b SHA512 493a39587cf8ed448ebd4884422054da784f26672087bf0537d70ca456c2cdb26fa92ef3286592d024e386362737be6912cde9f4405cb85b926c821881455b4d
-EBUILD guessit-3.2.0.ebuild 1032 BLAKE2B ac46c37a9622fe4f9fc58fe67d374f8c4011d12962c00957201ae54498c45cd0bfff59f999be564c82dcbe3513adb2ff56db91556cca5781e24c774530c2e3b2 SHA512 34795595458158649f0e525af272365145d17d875742abf5373d10b33d963fa00a8e946f5bc1c711e3bdcd80891017380f9c41a5ac2b7909303675c1f7253be6
+DIST guessit-3.3.0.tar.gz 157901 BLAKE2B 8022e69f763d09912349e193d3273a95adf6cd533d28097e3e17e5a5d3a9f18b623024bac6b00b3aa78ac43cb6ff179a97344e516401f71e1ad23743d033604e SHA512 5569572ed6d7910b320e1742b902325baf3f3455598e17a7e3bb36ae5da0e450d4bc2db0b1651a8d4df7354e0624216c1093aace48ef607b3146933fbb83a918
+DIST guessit-3.3.1.tar.gz 156178 BLAKE2B 190b61eb98c4945eb2e14bbc3387a2eabff4e0f2fccf42f3b957d2b081d83d96333f3931837ad77d6b09c12aaa174eb8adf993d62ab9de7b74d8f0c55282a77c SHA512 42c87525ea2d9c808e30b50db674862f5362f26b95ba5e6bc163df03a261d9b24daf4b4d525677d3e6d53e8e7f637c3d9e0ba3f25f4397e0658b618f50a3248b
+EBUILD guessit-3.2.0.ebuild 1030 BLAKE2B 6c9c912637d955c92a67474f8328760a4a55866d63fd59129b567596721f08afab3026d50b26da6287b87c9f516a77105d60c9c32c93cd68047b96e058249a48 SHA512 5b0d1c0b2269b85d6e9a028f4c9db23ac8b384b1147e8629470d6fa636ca0997b484a35ec7e5cef827b226b42d0b19eab08e598097645a6879f53eda44ee48b7
+EBUILD guessit-3.3.0.ebuild 1032 BLAKE2B d1bcb45fd8d0d70c6b7413c7725813eb49fcd185fa87007e90f8b3556a6a3ba4db0be8cba256efc69355ffb12d2c4eba75ef2955bb38d2f57c36ac7e024c36d2 SHA512 cb99c0e7922030e87c770c1eef32797da728fdb8c89a38168b6b0fe35109457684c23c10088c6c8ebccd36bf1438ed0710f39dddbe62e8041a34c13c24c5a3f7
+EBUILD guessit-3.3.1.ebuild 1032 BLAKE2B d1bcb45fd8d0d70c6b7413c7725813eb49fcd185fa87007e90f8b3556a6a3ba4db0be8cba256efc69355ffb12d2c4eba75ef2955bb38d2f57c36ac7e024c36d2 SHA512 cb99c0e7922030e87c770c1eef32797da728fdb8c89a38168b6b0fe35109457684c23c10088c6c8ebccd36bf1438ed0710f39dddbe62e8041a34c13c24c5a3f7
 MISC metadata.xml 392 BLAKE2B fa31237c110d3c600f6f4416685509ecf55f2e90dd4630b6980907703a2d65676dfc0fc36d94ec53f452dcfa393c5e8784af03b2071e0660f5c0597f7c0744f7 SHA512 c1cd9bc55758444324bce57d1bb07c597a95e8552ca14a81b42806cd71df5af343fa211cd1fd9b36a8918ca8b36383c37cb943d6336c74e8df7665e7bb048e7f
diff --git a/dev-python/guessit/guessit-3.2.0.ebuild b/dev-python/guessit/guessit-3.2.0.ebuild
index a53973ca6b74..b7a5ba657f3c 100644
--- a/dev-python/guessit/guessit-3.2.0.ebuild
+++ b/dev-python/guessit/guessit-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/guessit/guessit-3.1.1.ebuild b/dev-python/guessit/guessit-3.3.0.ebuild
index 11c9053755b4..cbd2a8e83fc4 100644
--- a/dev-python/guessit/guessit-3.1.1.ebuild
+++ b/dev-python/guessit/guessit-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,14 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/guessit/guessit-3.3.1.ebuild b/dev-python/guessit/guessit-3.3.1.ebuild
new file mode 100644
index 000000000000..cbd2a8e83fc4
--- /dev/null
+++ b/dev-python/guessit/guessit-3.3.1.ebuild
@@ -0,0 +1,38 @@
+# 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
+
+DESCRIPTION="Python library for guessing information from video filenames"
+HOMEPAGE="https://github.com/guessit-io/guessit
+	https://pypi.org/project/guessit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Disable benchmarks as they require unavailable pytest-benchmark.
+	rm guessit/test/test_benchmark.py || die
+	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}