gentoo resync : 20.03.2021

3 files changed, 2 insertions, 103 deletions

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 4e6ecb6da75a..d8892b05f01b 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,8 +1,6 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-toolkit-3.3.1.tar.gz 5969914 BLAKE2B 2ede440a341be0bd0206400d01bab881e6070820f362c53f47b5f88e192bcb7a18d2bf667a678378110046f70a035d42b67a77e2dc70829da323d69f675d21cc SHA512 1578fb8f96fa83ad97051a20f02d6570f96f2346d99fc86172718c995468c318f318f27f2ef259bd5dc10521bda4ac7da17385f72b726d7ea3c0fe65af8f313e
 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.1.ebuild 2865 BLAKE2B 241cd7c4edb1c7ac600d0b426510eea52e85eef01318b3453afa9b9f35cd77e23c79b93e1566e16b2a4fef07a71d1c1d4e68edea50e9a96e8ce817e76cf0cb34 SHA512 33c174b4ed4d7eb7563ff060324971da0e39cea92bd59e35291aa787bfbc8df805ae4f020c44fb6a74d063d715409f44535b10c13b2c2ae2667568192c21d95d
-EBUILD translate-toolkit-3.3.2.ebuild 2491 BLAKE2B 7ad339b2a37e1b74108560616ceabb9c905f6e5e66ad1d3478f51152216f1b9da462d6dd7435d72f2069930164f7d44bc94e5cd774b4af55c51b3a858ce8d951 SHA512 5b7f8d55e330e34157b721a17c65a45811289964dff369af62047ecd19e4c48d6d6dabd495fa32e1ca29a65706c53418cc599ba77ebf5679bbc9d2ea076ba214
+EBUILD translate-toolkit-3.3.2.ebuild 2490 BLAKE2B b9a141e9ff4920fff39ee14ab65433e9d7ac5ef14b7080730e1c1f7d165fdfe539a507d3d8ca73329864cb84739dded979ca8a31ab1f36c426f14e71f42bb1d2 SHA512 a9cad20219d6b808639501bcd1288731dca962576d880efac3c083b5cb953b04b0ddec236ac3e924e55dce1d74c0a8547872be3bb9036914d7b5bcef52b40c3e
 EBUILD translate-toolkit-3.3.3.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
deleted file mode 100644
index 34d7b5c496f9..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
+++ /dev/null
@@ -1,99 +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}"
-
-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-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${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=(
-		# 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
-		--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'
-
-		# 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 --via-root
-
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
-
-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.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
index db64c6cc4c27..894d0ead037f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.2.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}"