gentoo resync : 15.06.2021

3 files changed, 2 insertions, 95 deletions

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 05624a09a0a2..f606e6c39f47 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.3.6.gh.tar.gz 1140841 BLAKE2B 77d8b930ba8a91e801a04c67bdd13c0c6538d4df2418f26e1f6bfdb98c275fe746062840034c5345dcf61abc87ee6b8e1b2cda34a71c8e3850ac37df707b8a34 SHA512 c6eedcdb9ecece4804c25aedd57de37da12baf9b2f3bae1c87377f9a07e1e5f1cfeeed8073861b73201de3b35ec4e5da5f972d775c7ff35fa7be21c97746435d
-DIST translate-toolkit-3.3.4.tar.gz 6060105 BLAKE2B 01f8e718a4a60d0f4d439be14b30b2e3f040045630d6f6254ad291a2558d59718521bfb79761d20933f7bb1abd2229ccce67fd71ccd54f6e43dffa7e7ecedd8c SHA512 6bfc4387aa600610fa2a9e7e58368924768ddcc8eb2a697ef02c59682e1e1304b7096f48a1e6e38cd47c68c644dff01d35ffc988d378dbf4833b41d1c5432c05
-EBUILD translate-toolkit-3.3.4.ebuild 2437 BLAKE2B 95e2afa1a0cae8ac04fb62a0a38c9361fc6a9bf93be0584a7ea7678f239858b2195b3b5e0864548943ec54346030e68a53ee777ee86d840b03f894801448ca9f SHA512 f27847bb686d765a48f1e654a367bb12b980a745309b93a2b545148fd0f3163042dfca56036f84116488199241c5abc02a1ab30f1eb25144dd50f3c2ba426f60
-EBUILD translate-toolkit-3.3.6.ebuild 2469 BLAKE2B 2aabcafc788c07285359021a60301e57eef231f98e562f582bd855e26e49c5b8c745e28d1ea8c356f80cb7a0360e3a44899af206cb260bfb97fcd799d33e3e48 SHA512 00c836a23ed0d5b4adda399ee7cf0ed8dc100d10191a23c68f99bab10ddab126512dc77c828da2e1ed33858ae1336cf4919c1b8791bc0118c83466d04ab604e9
+EBUILD translate-toolkit-3.3.6.ebuild 2466 BLAKE2B 045ef0a99924176b23591574e9b23d226fbc593c01c5878537f64797e8cf68efb6748d00e4a4b72e1e79a142ae15c1b5d4a91eb163409330a047bcd09d87707c SHA512 3a5099f26e850b7da77dcecac1e41e13d4695cff3a2d8ca94785400635a1e79b13dc0d91c28f5144649faca8ebbbc70130623fa7e873d81112ac0d8ef7b3a393
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
deleted file mode 100644
index 721d7f3f9907..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
index b816d199c9f7..56cface0ebea 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.6.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"