gentoo resync : 17.07.2021

4 files changed, 29 insertions, 76 deletions

diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index c7684c389b5f..a8e12676562f 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,7 +1,6 @@
+AUX lokalize-21.04.3-unused-dep.patch 847 BLAKE2B aaa6d5deb07d844f0c25a5d42f8fb3e41bb7ed41d2f7a56154b9218c2265f21d9e169349898278d403fffd91ff9db637b6585ec55524e1c178620d71bf1d9374 SHA512 0c5191a95c333b5232d69a3c3d7b204a6f87fcb4b8a111241ca5f24c8533108a64657759626cf2be5fc70c357ed61f65bb8893dd9a929f455c6597381730f318
 DIST lokalize-20.12.3.tar.xz 1995860 BLAKE2B 1d53d6e99936d284567f48439fc84a95edcc8c971f4732711ea5c45f39bc4a698ba5f7883ad0411e1e069a08d35630f37957e92e1ba11aedc7fb643b4c217102 SHA512 dd12526cbade8a71d0c0a395ebaba50b00a5357c3cdc68779520da1aec7a0dc2d87f29504f45315ccf5108346b60ab0df235a80c000ece9d9f5d434b91829cdf
-DIST lokalize-21.04.2.tar.xz 2023088 BLAKE2B a083f829bb6e3e9ebc233d457a9f28ed8b6d8d51faefc7f7d0ba6818f90d2e396aa761afa739997599404d76c83fe81cb0b79359f484947dfd65409fdce21c7c SHA512 c88e547f0d1e9fe40b885adb453e3bf3efdf72f018cd5b1cad60bdd5323434805b59d8d1c5a32d6f60eae7809841aa45756cf5da89ac3241ea9d3b5536b4c202
 DIST lokalize-21.04.3.tar.xz 2023364 BLAKE2B 8b8790e72e1b4a6e7389adf9577ed1d392693ec14072d314d8c3d0e269a6d40c11acf22537bc328831de9a8e28a6b948fc02ac4956a325b887172e78fa56f9bd SHA512 b336fe464c123b60e4de4ba8bda0f34e2ba5eaf7708879179b9671bc33d8b031f81d595d089c24b4275ea56032e9867653cd98bf21c3d0c3db125564c057e21d
 EBUILD lokalize-20.12.3.ebuild 1973 BLAKE2B 5ae0cbdab456cb1bfb50d5ac3ef3c88d0dcd6d4662fc2a8671f92fd4aa7b4f96c2cab5a016c9548be652da76e38678409830c9a82e898ab8ff272c3ea13d34a8 SHA512 dc59c0bc4fa7f01c2996fd1f907a92afcf8f32dd4d6b5dd55cd6f328f1088f658321798e35ef5403a7b188fcc00c242f96c73f7228ae0b4b2e2351c28d3ea146
-EBUILD lokalize-21.04.2.ebuild 1976 BLAKE2B 73fee3d7c4c2d08110c742e6ef7eed91b7f152e3e439ffb5518538b6d387a27a7656aef7cf8117379dc1ba2271e0a2673cb1ea1b62e98e4be94f5979fcedc372 SHA512 792e2549a4895dd1d903fcacf3037991031cf59db2e7d1ed00fec1d784d190aee5552932e10e9bdeab793a78acfde1db8aee4f863bdc37439627f84030978aa0
-EBUILD lokalize-21.04.3.ebuild 1974 BLAKE2B 2c8834df50417da8d3502558a7d13021fb4e10605eec5debcee71a7694ef6ace6e32eda865a32dc754715251153e94a176873ceea8bf5202f419393cde4333ca SHA512 d8f0000484f4f4809e5437e51dad1a6c49ac915730a05f1de8ebb9b9c7198131d7e78f6212873a47e8c67311ea7e85deccadd8fe567cd6a0abbcd53fefd8e00d
+EBUILD lokalize-21.04.3-r1.ebuild 1993 BLAKE2B 7005ed74730cbe5e4e56247a576d62d111141fdacd0df4c428fcc1128ec009165c6ec8864c46fc3b9603cb266db27064a2263372e85770e33e9207b11525b9a6 SHA512 7fb06b76982bb4dfec2f1c96e582ebea82a350d3e47c79fec9b40446cf8782f5cc162021616fa7513b0bd362b11c97c7c11de9ff6aa8afea9172590a41341b25
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch b/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch
new file mode 100644
index 000000000000..efb230d3a650
--- /dev/null
+++ b/kde-apps/lokalize/files/lokalize-21.04.3-unused-dep.patch
@@ -0,0 +1,25 @@
+From 07fa320da849f9f283ffd707d684e29f1d807405 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Sun, 6 Jun 2021 22:29:57 +0200
+Subject: [PATCH] Remove unneeded Qt5::Script find_package call
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e95619..10bfd6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMAddAppIcon)
+ include(ECMQtDeclareLoggingCategory)
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Sql)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED I18n KIO XmlGui Notifications Config CoreAddons DocTools Kross Sonnet DBusAddons Crash)
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/lokalize/lokalize-21.04.2.ebuild b/kde-apps/lokalize/lokalize-21.04.2.ebuild
deleted file mode 100644
index e21c623158ae..000000000000
--- a/kde-apps/lokalize/lokalize-21.04.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit python-single-r1 ecm kde.org optfeature
-
-DESCRIPTION="Localization tool for KDE software and other free and open source software"
-HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT+=" test" # tests are broken, bug 739734
-
-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}]
-	')
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die
-	python_fix_shebang "${ED}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "autofetch kde.org translations in new project wizard" dev-vcs/subversion
-		optfeature "spell and grammar checking" app-text/languagetool
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-apps/lokalize/lokalize-21.04.3.ebuild b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
index 8ee2f89e4300..a93b5b86e594 100644
--- a/kde-apps/lokalize/lokalize-21.04.3.ebuild
+++ b/kde-apps/lokalize/lokalize-21.04.3-r1.ebuild
@@ -25,7 +25,6 @@ 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
@@ -52,6 +51,8 @@ RDEPEND="${DEPEND}
 	')
 "
 
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	ecm_pkg_setup