gentoo resync : 25.11.2020

3 files changed, 16 insertions, 87 deletions

diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 7f297494f542..ca6f01d2e777 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,3 @@
-DIST lokalize-20.04.3.tar.xz 1718604 BLAKE2B 07b4a54a01c23f1f49e6c23441ccccf7b6e25e10d42389a790fe427ab3a5543d27073ff3f56315bca8dab3238b558df15a0b22be0f6a3938acd61a2e3d3d8a2b SHA512 becc88705957386a1012378e28c025eb4087f46e2f0953eaa3d8f8d6625cce3be1d23bf1a92ef38f02793a0f175115141839e360bce7f9adcf6ccd494b17b65c
-DIST lokalize-20.08.1.tar.xz 1984984 BLAKE2B c6f3ba95c924dce7de511d3f8cc9f96e25002a98f1c78ed13dedbf9bb33ae3e86e422f75b6ab1249624c6fc47208ac51a2d27c4beaf739a95b8a202f266bc057 SHA512 9ac2990ee4147114e42ae0098e65ea608a8052d836b5d8a4a4b721d1fa631f6e40a21431ef8c00c03adb7fcc668ea76704f3be207c74347480c33f59ad4f6a22
-EBUILD lokalize-20.04.3.ebuild 1824 BLAKE2B 71f30dce1cdd65248ec0c06a48a099c7b36500dd013135c016f7f7ffadd827049ab08abebfe2e65e541d5a66084ba7aca2048769316e200638a4935e5f626bae SHA512 102ff732b1be7a7b5cf58aa35891f7df3e077cde1dabd497a6fefafa6b8698fb782c5415359d0f6d5f8b6f3511ab331637f515ee0ad62a483bd1389faeeed9d8
-EBUILD lokalize-20.08.1.ebuild 1877 BLAKE2B 2cfea08b928f026c31a14011dc5c02b443fcdead29ab715f1900d7337e8bcfccf54ffa579e997df6f40b49bbf887b26077bad5c2b33e5c0cdc366e884a7fecf7 SHA512 13c633352471f2cc34767327b412e83011193cbbbaa7341c1da5078a541e224bc5c7bb4766eae622d23ee34695aa1da26ff27f6e3f6b907c38b0ff07bb364bb8
+DIST lokalize-20.08.3.tar.xz 1987496 BLAKE2B 7928bd191443d517722fbd6753e71c9c74b105b9645d51a97787f6f4b62d93dbbcef2cd2304fba5a942bc4c876bee0eb5a0dea3e8480856d4d3fb50ca8f34660 SHA512 20b102b262f5fb595476ef0dd226b362cc16ec7cc3e5935f9a993fe01ac8f959baf788feaa6fd040c23a73cb64edfda667b3d03b1eb079c022797064ebef1ced
+EBUILD lokalize-20.08.3.ebuild 2007 BLAKE2B cc9298b121a139a9ce5df3f2daa02e129589f10a134e4fdea63ce1bc9ab554bfa47618a865662426d4397c6fb1a0631defea2b512dc6fcd858123cfc860c26ea SHA512 fd950b9175eaed51c9c7be4580c6c0e8cabc8c287ae50b038c9cb4d9f555ff1c2fcb78a81452fd6a4fbe90b7260934e08320bae3d8118af2de117ed01a4db5ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-20.04.3.ebuild b/kde-apps/lokalize/lokalize-20.04.3.ebuild
deleted file mode 100644
index 47b2267aae82..000000000000
--- a/kde-apps/lokalize/lokalize-20.04.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/office/org.kde.lokalize
-https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
-	')
-	>=kde-apps/kross-interpreters-${PV}:${SLOT}[python]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	has_version dev-vcs/subversion || \
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-}
diff --git a/kde-apps/lokalize/lokalize-20.08.1.ebuild b/kde-apps/lokalize/lokalize-20.08.3.ebuild
index 0748859e7a10..013a786c6807 100644
--- a/kde-apps/lokalize/lokalize-20.08.1.ebuild
+++ b/kde-apps/lokalize/lokalize-20.08.3.ebuild
@@ -4,18 +4,17 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit python-single-r1 ecm kde.org
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit python-single-r1 ecm kde.org optfeature
 
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/office/org.kde.lokalize
-https://l10n.kde.org/tools/"
+DESCRIPTION="Localization tool for KDE software and other free and open source software"
+HOMEPAGE="https://apps.kde.org/en/lokalize https://l10n.kde.org/tools/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -51,7 +50,6 @@ RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
 	')
-	>=kde-apps/kross-interpreters-${PV}:${SLOT}[python]
 "
 
 pkg_setup() {
@@ -61,12 +59,15 @@ pkg_setup() {
 
 src_install() {
 	ecm_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
+	rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die
+	python_fix_shebang "${ED}"/usr/share/${PN}
 }
 
 pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Autofetch kde.org translations in new project wizard" dev-vcs/subversion
+		optfeature "Spell and grammar checking" app-text/languagetool
+	fi
 	ecm_pkg_postinst
-
-	has_version dev-vcs/subversion || \
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
 }