gentoo resync : 25.08.2020

3 files changed, 34 insertions, 25 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 11753b9a8b28..6aa9b8ca92d0 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
-DIST kaddressbook-19.12.3.tar.xz 2418004 BLAKE2B 73932d0ae81bc16715a137ebf8d6464d657a623c9bae1ee0d6066478ade39b2c88b80f52994ee4221a545732970f63f6c524cef65c4d368f6640632f97c2ea16 SHA512 e08cd6ce8b1583431ea2ee79818f82183c9d3109852277b80ea6e1ff84b0ed921eef1b443617128bd67e4240834f63722f8b4a60c4195bb9ac96810fc0bb4719
-DIST kaddressbook-20.04.2.tar.xz 2427676 BLAKE2B 7e8e4ca0bd153c7732b11e8c1270f5cee384f9d5d4a81570212e10bb362095e2cb335373e9c28dce113eb90e26c693e991a157a4af623631b33140025cdffedf SHA512 6cfa68b09ae2cc0cbd1499676ea327cfdbe49784e872ec0451f77951f499277f48a2ee86d861f70b1bc20bc27d46de49c6680785906f6ddc663b344de95090a0
-EBUILD kaddressbook-19.12.3.ebuild 1947 BLAKE2B cb61e4cbf47771d1ee4fdc59d849ed3e1c9ded94d359b97038cca60c54dd281da6f83bb6ec4064dfb46a3698cc7100f835bf5fd9c4c8b190c08d2f48c9219cff SHA512 eec78b70df75fff31700702c8626747c5b10948d26d7cbaefeeaa064f0f7c6a32bc4a396483b4ab4ebfd699338ce26212b65915944aea670c33aaf7dbcee87c1
-EBUILD kaddressbook-20.04.2.ebuild 2117 BLAKE2B cc0e4b70390485af8fb13df2340b762b7a815e19108e3289e0d279f7b41859942b4af5ce8656e8643a4dff8eb597b590647cc1573d2b5c8d6cd880214cc0a77b SHA512 871f49ef2f50c778f56dd29b9602d116d0e2577a88e355276c30272f310fbd4a217a52cc6244430833dc3df476bdc1995adf7a76ad149b2354f89cb16aeae4a8
+DIST kaddressbook-20.04.3.tar.xz 2427140 BLAKE2B 26e916eae393816769411d5d66946e5e9455a21d9b710f90801fa86d9409f6fa61fdc4a112c4691deeba578b0ed16ea713d312b53a7d1a0876cedcce39b97c39 SHA512 3b9d3f17a73c5687a30b10909004aa9c6ed52210808cb147badae4bc07046cac44b0ae2f64e8c950344e755afe3da0f402fb3ed6688d825d99d5e0faf160df5a
+DIST kaddressbook-20.08.0.tar.xz 3165664 BLAKE2B 2ce06a44a1df35f2430c4b60887490097f427cb404d1ab258e1b9d185d5bcda59a53a7a711153067b77abc99f3d710164069d634e15b89527bf392ffd4529b93 SHA512 169b65f86aff5b2066a1fd06c113559d98cc04493e14ff993eaa5e8037ce948d4fb7b77b1d83f7e6d9d15c4b3d5b06d491c19c647ae802f4410fa7ea5d82605b
+EBUILD kaddressbook-20.04.3.ebuild 2114 BLAKE2B e406e01d554c9859058b864acadf8738f113592570db51dec617cbc850085284b7062cd5bce0661662d1e2df149e4f3ed5d7788fc5dd10af95138477f2ff02b3 SHA512 3f9d7dc0cca3fe4856985398829a5781e3271a760faf563ef43b50ade009ec442eb83db6d03b9c5215c36148366161c0b47ea47c08e2989594d07be3db74676c
+EBUILD kaddressbook-20.08.0.ebuild 2117 BLAKE2B 621b708039dd2b25874c37f87b9adc097152db4288998945cee874e9e22b8a436fc3a5064ef29a26bafe3549a65f47b20935d3f4b00d9d07f462d2c076060873 SHA512 07c1ea34cca85b7819cab3f22b2b4a81c98e29452a10b14f0c7d5c7a0db8ff1d8094ba27482d1b73b8a420ace5f126629fd27aad3ca36e648466449aa2cfaa61
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.04.3.ebuild
index 67527793251a..a77d9b654e16 100644
--- a/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.04.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,9 +17,25 @@ HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE=""
+IUSE="telemetry"
 
 DEPEND="
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -37,27 +53,20 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
 pkg_postinst() {
 	ecm_pkg_postinst
 
diff --git a/kde-apps/kaddressbook/kaddressbook-20.04.2.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.0.ebuild
index 8e9b6d96abe7..53d41d35bcf6 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.04.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org