gentoo resync : 12.05.2022

3 files changed, 17 insertions, 9 deletions

diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 28be6dbd3e25..1abecbe74484 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,8 +1,8 @@
 AUX kpimtextedit-21.12.3-speech-optional-1.patch 10518 BLAKE2B d9f7eac9018034573d7454b85a1a942f99999b2a59f628cf969895b576986e4b7dc3ab6a07aa824fd6ee042dc45f474fcf2a96ae77be4a7b21ce5416d7fd31a5 SHA512 57e97ba8c66d5aa7be34cf43ba2129fc804b39504d65853482e58141844650f427b68d17930b83d6d53fe49542b9d9e48de89be198869f0674882cede4c6e5e4
 AUX kpimtextedit-21.12.3-speech-optional-2.patch 688 BLAKE2B 1a210bc6d38ac9078bd69df4cf576d6a8727aa008e026e6ec1033089bd55444fdceec33a565c7c8060470018dce8dc26497d462d85312b2f8b411c60fe6fe893 SHA512 f3c6842cef52af589dd03d64393bd12dc38a8e042aae14b1d1ae4645821522a9937d3131264563c77e3385de7b63ab9d316f58c04a3a325989a71901a76ce599
 AUX kpimtextedit-21.12.3-speech-optional-3.patch 3446 BLAKE2B 1d14e6f4815a3d806f131ebf90e245f087921890ae8410016cdb0f885eb8dc629008234a3fe4a1d60a73dbe25d5fd2ed5b64f406e12774ff15473effb75f89e6 SHA512 cdf481e4e816b35679dc2dae7fad0068b8eae3a7efd26747589b172281c9610dc01a17c9982bcf474efbe7745c12fe131f6003ac90e9ecbb1d2ff718051d4181
-DIST kpimtextedit-21.08.3.tar.xz 204960 BLAKE2B 1355f96646d34393177ac2b41b6bcb563840db9d97087027dab55cae3b9fa92814d729106a815d2044211db58a03282a2909da17784b9e1d02628b9f92d69ce9 SHA512 7cb07eeeb7c630eb0251f21de1aeaa8ac6b92bc5a5e951548544db2c48d01eda46ea1c546aef340044a26a29597d91189de1705c688d1b9aa4f9e06027e885e2
 DIST kpimtextedit-21.12.3.tar.xz 211716 BLAKE2B 44a936e68752daeb2d7b4fe56c41ec6577eb112d695b048e5c9f7eb6e80037af795a381e14061ac8312babb33245eb0ec09cfecef20a36877e8118cf98f3f1e6 SHA512 85614f77c59d533ee9c947f61e7c78b9846e8f3df03f7331f86549c8ba06a9627f70dcf4743810c2fbae57615b79bd889db975c0fb69e8bcce05d17b44eda0fb
-EBUILD kpimtextedit-21.08.3.ebuild 991 BLAKE2B 86b5a2a70550cf082526cfa5a155b87eaf539c9131f8816914953a8c49102a016dca812360e5f163a79f991707b92e662b6cc7065e2419638e2b7cf26619d18f SHA512 b09d2c802aacb101d95493bb4c6d5ce5df7255bc0dca7f630257bfe443faaadf1316651135223a71adb88f69e45fb49e536ab9122dccdf9e870b9673c872782b
-EBUILD kpimtextedit-21.12.3.ebuild 1214 BLAKE2B d22add3b78e4b06213a346729b25bd346fde4a6968812c589f8c06ec8dfdd5c4b68b6acaca8a50132f31b591246f393d0dbf2a9007f9b0f1bbf0433df72dc2c6 SHA512 1651f828baff3c6edbc00a9d257759abaf97e1326a845aa42830382a5e31b393d110f945584ef1fbbb7d9a91a1e65271882f30001ef4bc45044ca3bace9f7690
+DIST kpimtextedit-22.04.0.tar.xz 215884 BLAKE2B 0ec197dda89c1022856eb11cdb3ddac3bf1b48ae0f63cb03050b2b73a320a2cb78cbd6e1ca636f3c38e3700ce4bb3f78a6c8f17b9a76dfac78c575a28e80450d SHA512 ec53584f04ae29f5b05b5d7c3ea02c874e4f04c017b802476f1bb651bb35cb64fcc8fd6198953f53dab40baaeffdff4c87dac0d1aa7326fc6e651126e34f33eb
+EBUILD kpimtextedit-21.12.3.ebuild 1213 BLAKE2B a4f0f6106328a56ce9f5cea80eb3b52f88eee6e687ad8c47bbc7ae1b0ae34688008b25f728258d855e1afe3bf6048a01f636902f38130358533ae2b52f8b3a69 SHA512 89410b04458da0f29b04e4e155b1e7c83a16b6bd1b82a8be908a329dc34eedc696b0273cbd8122ff29710dc20d69b145d2fab3fec4a85600d915fd2b798fc059
+EBUILD kpimtextedit-22.04.0.ebuild 1145 BLAKE2B 7396a89f60b113bcd98e92db666e97a47a6627b1cf5ae8e0a3063a987a8a640f57397e046012b73b9aefd3ad4ede8144bc8c6123bd312942b83a597bce79c1a5 SHA512 b09bac2ba2d8bc0ce3dacf109317c6f2bde3127cf9e9bc268cb56cbadc2d6865bcfe8dabc6e18592445e20514e04f3eeba99d7c5efd2f5c610ccb6bd81822d9f
 MISC metadata.xml 468 BLAKE2B 7d0732951e5cb3f8fa895bcd7646ad46f2834c8a67324cd12aecd43de9d525cce139bb78704e32f9d43f3c3e9dc8b6d785182306e846387ea872965561bfcff8 SHA512 0d1f7883fa05a190c019d5ab1d0d6fd54e73ccd0b9f09c790f7c818636c5961331aa17058d0fe5ac0bd8f90736fc7148cd2b40c4cc772039e875057a60d501b4
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild
index d0d689093307..227a61ba07a8 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="speech"
 
 RESTRICT="test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-22.04.0.ebuild
index 296b048393d6..51cfff829bcc 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-21.08.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-22.04.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_DESIGNERPLUGIN="true"
+ECM_QTHELP="true"
 ECM_TEST="true"
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -14,14 +15,13 @@ DESCRIPTION="Extended text editor for PIM applications"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="speech"
 
 RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -34,7 +34,15 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+	ecm_src_configure
+}