gentoo resync : 28.04.2021

4 files changed, 100 insertions, 8 deletions

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index d8892b05f01b..0d9c06e20e6d 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,6 +1,8 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-toolkit-3.3.2.tar.gz 6123347 BLAKE2B 9bf5f2c84d15043d25744b3bb63526177748c7c38425bd73ad34dcf3b4051c11a3ce28ccaf5c907b6ced27d1fe9ecb06cfde46481a609df64adfedec83b91680 SHA512 53baf7c1203c27335201fbf339e2747d7b22696c219e6911c191b3c89cf6d1c0d84624ffa8c4c687e45fad229d3cb09f52d15d1d80dd914ccc8e2fff34a601be
 DIST translate-toolkit-3.3.3.tar.gz 5903525 BLAKE2B a21c5d89c808615ff2f3f718e732ce5d5591a9d8a997950ae1066655cc3e4382065f75e7a86f8e37bdd0e146283f9bd941ff20479cb1af635f393e0e7f8fc196 SHA512 41964dc26dfbb983b1c2e4cbb0e9d8eb2a035369a94ef872f7703080b5ca0280a9364916a1e1256cd358b263bc72198e767462cc9065b54556fc481d1b85a836
-EBUILD translate-toolkit-3.3.2.ebuild 2490 BLAKE2B b9a141e9ff4920fff39ee14ab65433e9d7ac5ef14b7080730e1c1f7d165fdfe539a507d3d8ca73329864cb84739dded979ca8a31ab1f36c426f14e71f42bb1d2 SHA512 a9cad20219d6b808639501bcd1288731dca962576d880efac3c083b5cb953b04b0ddec236ac3e924e55dce1d74c0a8547872be3bb9036914d7b5bcef52b40c3e
-EBUILD translate-toolkit-3.3.3.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
+DIST translate-toolkit-3.3.4.tar.gz 6060105 BLAKE2B 01f8e718a4a60d0f4d439be14b30b2e3f040045630d6f6254ad291a2558d59718521bfb79761d20933f7bb1abd2229ccce67fd71ccd54f6e43dffa7e7ecedd8c SHA512 6bfc4387aa600610fa2a9e7e58368924768ddcc8eb2a697ef02c59682e1e1304b7096f48a1e6e38cd47c68c644dff01d35ffc988d378dbf4833b41d1c5432c05
+DIST translate-toolkit-3.3.5.tar.gz 6061630 BLAKE2B 18843344acf8eecf6d1859e1c6d6148046ba3adc56d00413234e1fb755e7cc14f3ffc22d9cc46b249d01ea5d4b73b4edf4d8c6a22ddb882c62183e1f4ce8dd23 SHA512 9e5837e487b7ec703078d6babfeb2fc720c4c4fd2896e5a23839a856d76f6372d5d3c72f5f1e20ee9d130cb2224c5d8a5b9e33e0154484edd0e0ed756ae8429f
+EBUILD translate-toolkit-3.3.3.ebuild 2490 BLAKE2B b9a141e9ff4920fff39ee14ab65433e9d7ac5ef14b7080730e1c1f7d165fdfe539a507d3d8ca73329864cb84739dded979ca8a31ab1f36c426f14e71f42bb1d2 SHA512 a9cad20219d6b808639501bcd1288731dca962576d880efac3c083b5cb953b04b0ddec236ac3e924e55dce1d74c0a8547872be3bb9036914d7b5bcef52b40c3e
+EBUILD translate-toolkit-3.3.4.ebuild 2440 BLAKE2B 55b8d6301b6d8473fcdf85bd54b091441f6f6a01a61c07d6d1981930741e04e0cdf93e29961cde928f1ad8d6ba20b6372b85c4c773f4b8de2a169885e691988e SHA512 c2998e8495b02a26ea5c3e46b5260f96ca3a422b910fd70b52d84515f7bf5dc79cb7fa75475be2af20e5d0a852d61ff01fcfdd4468d8a9d83a0396f2a7d28018
+EBUILD translate-toolkit-3.3.5.ebuild 2440 BLAKE2B 55b8d6301b6d8473fcdf85bd54b091441f6f6a01a61c07d6d1981930741e04e0cdf93e29961cde928f1ad8d6ba20b6372b85c4c773f4b8de2a169885e691988e SHA512 c2998e8495b02a26ea5c3e46b5260f96ca3a422b910fd70b52d84515f7bf5dc79cb7fa75475be2af20e5d0a852d61ff01fcfdd4468d8a9d83a0396f2a7d28018
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild
index fe65fd0c9450..894d0ead037f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.3.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"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
index 894d0ead037f..b209da46f3f0 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.4.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"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -67,9 +67,8 @@ python_test() {
 	fi
 
 	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing --via-root
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+	distutils_install_for_testing
+	epytest "${deselect[@]}"
 }
 
 python_install_all() {
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.5.ebuild
new file mode 100644
index 000000000000..b209da46f3f0
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="https://github.com/translate/translate"
+SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	!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-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+BDEPEND+="
+	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-bootstrap-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
+)
+
+python_test() {
+	local deselect=(
+		# 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
+	epytest "${deselect[@]}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}