Updating liguros repo

4 files changed, 51 insertions, 11 deletions

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index bc3c8b99f9c2..f05d250ad231 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,2 +1,2 @@
-DIST translate-toolkit-2.5.0.tar.gz 7679224 BLAKE2B 927b0dcfc0836ed2f2589d70f5789fc6d8b23a3e80bf4ef0054704ca12e4b5287a7e3b2a90992197bae6fc0acee1ea9d93a8eff05f6e5182f9269ca2aa9e5a66 SHA512 c4ff8fe9e7cc5b44a5448391ecbcfc454bf32d3794267e67824b020ca78cfbeba1283287a42f07859cd197a413fe8171ad5e31375f60fec77f334642ed2ad13e
 DIST translate-toolkit-2.5.1.tar.gz 5984081 BLAKE2B 55e158d0d354f181a4e23d9638306eb82bda0dd3133a507de682a54c4197d36ae6ad6bf3d733eb841d9406933407eb98c5874a13e55c7840a672971e87721d94 SHA512 57bdd7f824527955fde6db3a69ffadc27814336c6f792d08bb70e56e95a646d0366e8a3a48ac187ef62804f79dd8a61a4a0b76c8a28e57047c310fcfdf79e999
+DIST translate-toolkit-3.2.0.tar.gz 6029254 BLAKE2B fe4c30e09fcba6755a928775f931f1027bb5678606e74aa435fd5803642ab39b8b55d763bb96dba6b1a957d6656cfca4ec6400b735afd8df7f2c1273ac173c89 SHA512 1045762a5c63cc2bc8459b61a85ef56e4f1d1f705d74646b8235169f22d8d5aa4ab5e3599af52a860d9e434df0fad3e98836b0c021bb0a9697b36a59edbfb6ec
diff --git a/dev-python/translate-toolkit/metadata.xml b/dev-python/translate-toolkit/metadata.xml
index 0bce2f248cc4..deb26ac10c7a 100644
--- a/dev-python/translate-toolkit/metadata.xml
+++ b/dev-python/translate-toolkit/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="html">Support conversion between po and html files</flag>
 		<flag name="ical">Support conversion between po and ical files</flag>
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
index 198e83e0ddd2..6fe148d06b4c 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc +html +ical +ini +subtitles +yaml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
index 949e485f17c5..2dfbd4ae55b4 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
@@ -14,32 +14,32 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc +html +ical +ini +subtitles +yaml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-BDEPEND="
-	doc? ( >=dev-python/sphinx-3.0.1 )
-"
-DEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-"
+BDEPEND="doc? ( >=dev-python/sphinx-3.0.2 )"
+DEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	!dev-python/pydiff
 	app-text/iso-codes
 	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
 	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
 	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	sys-devel/gettext
 	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
 	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( dev-python/iniparse[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
 	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
 	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
 "
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	# Prevent unwanted d'loading in doc build
 	sed -e "/^    'sphinx.ext.intersphinx',/d" \
@@ -56,6 +56,45 @@ python_compile_all() {
 	fi
 }
 
+python_test() {
+	local deselect=(
+		# Not packaging optional phply for now.
+		# Seems inactive upstream.
+		--ignore translate/convert/test_php2po.py
+		--ignore translate/convert/test_po2php.py
+		--ignore translate/storage/test_php.py
+
+		# Need installed 'pocompile' from this pkg
+		# distutils_install_for_testing doesn't cover fully
+		--deselect 'translate/storage/test_cpo.py::TestCPOUnit::test_buildfromunit'
+		--deselect 'translate/storage/test_po.py::TestPOUnit::test_buildfromunit'
+		--deselect 'translate/storage/test_pypo.py::TestPYPOUnit::test_buildfromunit'
+		--deselect 'translate/storage/test_mo.py::TestMOFile::test_output'
+
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+	)
+
+	if ! use ini; then
+		deselect+=(
+			--ignore translate/convert/test_ini2po.py
+			--ignore translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		deselect+=(
+			--ignore translate/storage/test_subtitles.py
+		)
+	fi
+
+	# translate/storage/test_mo.py needs 'pocompile'
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
+
 python_install_all() {
 	distutils-r1_python_install_all