gentoo resync : 25.11.2020

3 files changed, 10 insertions, 90 deletions

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 68f57ef4fc5d..a13873807e99 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,3 @@
-DIST kaddressbook-20.04.3.tar.xz 2427140 BLAKE2B 26e916eae393816769411d5d66946e5e9455a21d9b710f90801fa86d9409f6fa61fdc4a112c4691deeba578b0ed16ea713d312b53a7d1a0876cedcce39b97c39 SHA512 3b9d3f17a73c5687a30b10909004aa9c6ed52210808cb147badae4bc07046cac44b0ae2f64e8c950344e755afe3da0f402fb3ed6688d825d99d5e0faf160df5a
-DIST kaddressbook-20.08.1.tar.xz 3167108 BLAKE2B 2d99a5e4561bb964a769335eeb0ff651ace93d0583bc5097cbeff6064a549b70ea8286e71904c605a59a2d0835434d953edca7a08683384f9c6413da148428c4 SHA512 2904dcb07799489bab5e8e3faf2c36be0f0c44d084e8d96dccb014de7f3fcee745213ac9a5d5a72bfdfa89f14e9c0f1391669a1a2ae26454d2bc170f4b6a17c3
-EBUILD kaddressbook-20.04.3.ebuild 2114 BLAKE2B e406e01d554c9859058b864acadf8738f113592570db51dec617cbc850085284b7062cd5bce0661662d1e2df149e4f3ed5d7788fc5dd10af95138477f2ff02b3 SHA512 3f9d7dc0cca3fe4856985398829a5781e3271a760faf563ef43b50ade009ec442eb83db6d03b9c5215c36148366161c0b47ea47c08e2989594d07be3db74676c
-EBUILD kaddressbook-20.08.1.ebuild 2117 BLAKE2B 621b708039dd2b25874c37f87b9adc097152db4288998945cee874e9e22b8a436fc3a5064ef29a26bafe3549a65f47b20935d3f4b00d9d07f462d2c076060873 SHA512 07c1ea34cca85b7819cab3f22b2b4a81c98e29452a10b14f0c7d5c7a0db8ff1d8094ba27482d1b73b8a420ace5f126629fd27aad3ca36e648466449aa2cfaa61
+DIST kaddressbook-20.08.3.tar.xz 3168192 BLAKE2B d7776c19b4cbe6eb0a1034b25c1ba4efe26d965091b749dd3691557d8202bf8ea13afcf9125454aeea986394b8e23ace4af4be7a38512a4a860639c65c90ab12 SHA512 ff63a0a0b5f8d45bfde0a41f15157bbc338aceebc9455b70626a3baab5b294b24951f72c9c110f356f04dd0f5f1ed191454e1b11a13ffe10df95d99efbf6f052
+EBUILD kaddressbook-20.08.3.ebuild 2082 BLAKE2B 7bfc3ab231a6b2279ea670816ad348a1b96372da4eb9d625315b8f852bc266a6cbe053d005a2dea2d07bcc85701825b8788b3092fc5bec7b47c0c20ff3dd8e65 SHA512 3d12ca7a644d6d7749972dd351efda245c2bad847ee25d15e143167b692f908c5b424ec75ffdd99e70bff17a9e4fd1365a7d0f08b42ad500f712f0858ad96e85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.1.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.1.ebuild
deleted file mode 100644
index 53d41d35bcf6..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-20.08.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-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
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}: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
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/kdepim-addons:${SLOT}" || \
-			elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
-	fi
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-20.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
index a77d9b654e16..7da1971f7284 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.04.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
@@ -6,17 +6,17 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
+HOMEPAGE="https://apps.kde.org/en/kaddressbook"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 DEPEND="
@@ -68,10 +68,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	ecm_pkg_postinst
-
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/kdepim-addons:${SLOT}" || \
-			elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
+		elog "Optional dependencies:"
+		optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
 	fi
+	ecm_pkg_postinst
 }