gentoo resync : 25.08.2020

3 files changed, 2 insertions, 80 deletions

diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 2e9f6e0aca29..6a633f7f0d17 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,3 @@
-DIST translate-toolkit-2.4.0.tar.gz 7646438 BLAKE2B 5d956ce05b57aa3ec2c7896a36f199cab5a590d4d6a4ad84263d7b757e35d5e42a40cac38ea3da1c8a11c64b1cacff5a5742b79ad5a87436842a35547d89e611 SHA512 715d9e974c451a5c3d92471287f4da8e8ba663efda849398f77a3c3d6f16e0c9a8e685261ec07c02ce9bd13f3766f0b2b1ad441b92116bb3913036ffbd415658
 DIST translate-toolkit-2.5.0.tar.gz 7679224 BLAKE2B 927b0dcfc0836ed2f2589d70f5789fc6d8b23a3e80bf4ef0054704ca12e4b5287a7e3b2a90992197bae6fc0acee1ea9d93a8eff05f6e5182f9269ca2aa9e5a66 SHA512 c4ff8fe9e7cc5b44a5448391ecbcfc454bf32d3794267e67824b020ca78cfbeba1283287a42f07859cd197a413fe8171ad5e31375f60fec77f334642ed2ad13e
-EBUILD translate-toolkit-2.4.0.ebuild 1909 BLAKE2B ae816dbf3748c3a794b5593773480b2886dc4637121f4d27776bc88e48a55013ea712ca88eb66716173a8ff16a340f679ee5dc70c88bc62ca76a40952dbb2869 SHA512 db6aacf34558c4bbbdabde084e53a4d5e67726b1ea54bed21fb513932e0f70c1716556ed9495fea47638b0bb8c6b445f97b1fd075fa983a808f9be4b38546f55
-EBUILD translate-toolkit-2.5.0.ebuild 1932 BLAKE2B 8a10478aa9c51e009850027d924ce9ecc69a5b651cb2f8dd07ffd987337b8cfea2b0d960507e582a89eb297e6316f29a7a7b4bcb52460312df27bd01f2a4d03b SHA512 bd040475f5593a110104cc70c4afd53e5fd7a292b7c8e8a17ff9613100df33425f1b3c5d3591d0731c319edc3dda4f09c717564d4f6e81cd82a166cfb13daa4f
+EBUILD translate-toolkit-2.5.0.ebuild 1930 BLAKE2B d14340824d56742941d5ec3be728f79308e59a8ac8e6a5c646609f5075036467831d493b00f56f96563d5889d61cb28b287ff45583578511d85357ccf3b39946 SHA512 e95b1509e9575c3aeca90087aba030296fb60d4b32c52b8c6c5e6d46de2567f843bd220bb3533f365673033a63b118237fc8ff15a33ab52abbf877b990245e06
 MISC metadata.xml 666 BLAKE2B 8f550fcb2d34ecd84e4125645f127260c154022bd7cf03b7742313632627c207a476f1e4a98c83b5d5890beff7558ec548f16c675135822d790146c842bec04b SHA512 34bae48b0be0aa5ef195757bded33736a051ad563ceac7be514bee3b54c67637f308d7a7844fa0657bbb4bc6ad987bd3ee9b04d65d16fdbd6d5d7791e4bd155d
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
deleted file mode 100644
index 95b94c3da370..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-2.4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite"
-
-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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-"
-DEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!dev-python/pydiff
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.5[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-18.5.26[${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[${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
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
index 8cb0310220df..84b66865615f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.5.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 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc +html +ical +ini +subtitles +yaml"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"