gentoo resync : 06.04.2022

3 files changed, 2 insertions, 104 deletions

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index fc4fd0d60a6d..02277660ddd5 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,6 +1,4 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-3.5.3.gh.tar.gz 1148120 BLAKE2B e848a089281ab7f1e17b28beefbea50245025bc3db0616bab3f5e1d288b2aacc0df636dca11f17481af863a4845594ecff9fc66dbc33d403a8fe0575ff90581d SHA512 3ad1bc4742e4d91dbdd8b4662597d07c792e306426dac42b6f8720cefdf1f4cf502d587941df3e6a93dd5648a1b92f5951bd1b5e79a41e5476f1b9ca06624656
 DIST translate-3.6.0.gh.tar.gz 1150765 BLAKE2B 0b69d21782d8d6b3ae322b480ad2205e577d87a3a9448f8a428f666d3d141063ad06f83eaa38f5d5903cc4263bbdcf261523fef57111c1ba705b640835c11416 SHA512 3ce371cb688dcfa656676fdc3ca920d76088fad67dbfb112511a0439250913e1f4587df681752bf1b288b9c4af3e4ebd11b8f8db51670f0fe14e9db68d7917f7
-EBUILD translate-toolkit-3.5.3.ebuild 2554 BLAKE2B 3afd37b94ccfb0bae8bc4bcb72987abcebb2ca8d668b7d782d5f12ff54bfafd6bf497b51a2f7ea6c857a28de7bd7154f99bee321ff9406d53bd872e15b183cb0 SHA512 4ddb9b2de3252c26db3ce3691638584b9c6ac38beec3ffa53df5e302a82df0f1b157504a61640ba9ae054b7029c4d5a980d57a49a9001e84e21859dce3770a06
-EBUILD translate-toolkit-3.6.0.ebuild 2524 BLAKE2B 75c253a5bfbd770ec6dfbc21c359014ce4f7df779d14d75902f55ef2dcbc51ce526f921666d7f39afcacd083a0716222b7f73cc9962b9b5946aa15102584bb46 SHA512 1158fc636df324981fb53303a112bcb6401255b6f1ea7ddb4aaaf47fb0bfa4538c52631493b945c296f595db1faae490c21d305d5a88ed49b58dc395be2be056
+EBUILD translate-toolkit-3.6.0.ebuild 2521 BLAKE2B 415a34c66319672dc9ce3d0bde31824d8ed0bcb13d728795650eda5332ff8f2fc496fb5293805f9d08ab418bb403263b2125ae20a697741a6aad7581af925a33 SHA512 ec024534b6af2e1cb0f99444540a6d897f53543bca2cfd7145a87b13732492d62e3dd51b799b75b69124a24d7114c245c35a0579770ae46dac61bcf311954169
 MISC metadata.xml 746 BLAKE2B d11f99224b1dd6ccb5a64b2f3346f3963f7874197fc5cd13a9bc84036d7f6d78e62d4f92d80b41b3a71426978c605d599207ba7d20ee94ca195e6be3b60f41cb SHA512 07dfd2ab55c6eb0ab346e66a3f03dd82e193382c6bdec0d2b8826cde7e4e11bb5d6f3bc1a5885b08d9c2aa51f8afedc6ec6684f224951e6dd80bc500c783cbb3
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild
deleted file mode 100644
index 27305a40ae05..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.5.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="
-	https://github.com/translate/translate/archive/refs/tags/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-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/pyparsing-3[${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 EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-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
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
index c9ba581f8597..476d408a194d 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 BDEPEND="