gentoo resync : 18.12.2020

3 files changed, 2 insertions, 81 deletions

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 793a56cf41f5..6648619f6a37 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD translate-toolkit-2.5.1.ebuild 1936 BLAKE2B 7d9d2c054f8d71841d0ea8cb88851ab59fd0ad2458603f8c26d2876e5021153ba98a3ffd7db1fdb743df708ef986bf2794807085289e6b1705f059f0e8c53ac1 SHA512 f40cf5b7384ce50b908eeba85915b9e70c9834b36dc5bf2d7a96d917df55807154e4c092def35d33616425e8bb138a053073f38231b6153c4d38ee2cf8d0bfa4
-EBUILD translate-toolkit-3.2.0.ebuild 3292 BLAKE2B ac6a59e7650125c2cdb03631e7be4b616d1bdecfa3ebd6c8db5cfce39e51311352a0c964bcb194781d578a0dd4f06178964f4d8b81a3c4d17a87c27dee7580c3 SHA512 76e628ee8e79f582188c0c4f151d13e0954e82ba1b4a4626f0e36ca2b0ce68eec87c58de81ffb2e133c21d2c2cd8b8f24ca68bb847b8f60a7d9d6f4d7a978039
+EBUILD translate-toolkit-3.2.0.ebuild 3289 BLAKE2B 421050ac03ffc23314f7a827b7b98132674e696df390a788ccdc6be95ff01ccf76672ea8e34fd404394f3b1db6dbe30605668ffed6684587d861edd3b0fe33c2 SHA512 61e6941b491c922657cbe3f91fe2673dc6e54608c129ee63e3736a9c64a50681d9661da1a847b217f2de831b526f8fcb013878f55e6ae9eca3495e20cf53fd80
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
deleted file mode 100644
index 6fe148d06b4c..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,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 ~amd64-linux ~x86-linux"
-IUSE="doc +html +ical +ini +subtitles +yaml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/python-levenshtein-0.12.0[${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}] )
-"
-
-python_prepare_all() {
-	# Prevent unwanted d'loading in doc build
-	sed -e "/^    'sphinx.ext.intersphinx',/d" \
-		-e "/html_theme/ s/sphinx-bootstrap/classic/" \
-		-i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( "${S}"/docs/_build/html/. )
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -Rf docs || die
-	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.2.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
index 2dfbd4ae55b4..8b289f3448e2 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.2.0.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="doc +html +ical +ini +subtitles +yaml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"