gentoo resync : 25.11.2020

3 files changed, 13 insertions, 154 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index a635fd8f8d56..8788830ff633 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-20.04.3.tar.xz 4719852 BLAKE2B 4e116a47a4335c1322de6f54e4b8f8e7e060d531bbf2daf93778fb2892c6a20ba6854668655f9a7d25aa79e564aa2f4b26b9147dd163948fd3efbe7f829367eb SHA512 d0dd10bad186c6c03222909089ca46c046807eb3c2a0b5193560c6117990681adbdc95ef56a10e8bbbf64d4999420e451a892758250a6851eaac7c9fffa238a2
-DIST kmail-20.08.1.tar.xz 5153040 BLAKE2B 448bbfd7b1ee0a7405de1eb0f6462d755aecb8b94012ea01f9b4c7a975c6eeb9c680564b4edf4ba323f3a8a3bf0b182d775fd09c280b66629e293981cf966233 SHA512 f3814d26dbd0f29290bbe633b9ccbc47bdfb4b9747af4a93d89bb6d599e6cf9c96f31b3c2cf8cdd40d4deeebb15ad141aa3365889b1eae9f88b5e982fa2c1680
-EBUILD kmail-20.04.3.ebuild 3843 BLAKE2B 93510a5cbaa7c61afcd23ba13951448801bdf4ec7918a2f433d977d06b436638aa1c2530ac0d4b62a0e1d6d372799c9d1720ac60be8588780541d779d4f3ea4a SHA512 b950108635efaa73f15c7883d5a0a4a8c7ac41ea4bda53c33a343aa988d348068e5e1296eeb991267cef682a2ef496dc737e9f36a3c482fb0ab937d4c51ef24f
-EBUILD kmail-20.08.1.ebuild 3712 BLAKE2B d3f236177ac13739d566eb3cc51ce96ec20d3c4535b5823b8b80335e90bf69956c7f366b3bc0baeb0ea7774f7e8f31a8149dd984c7ebcc78e818aa269e082332 SHA512 ff2dafff5b75e0cfb41df4a0521a7363fbf99bf15012265c9fe282257ab7f893326be0ec55223d8263fb8f9bfff2699b93e62d3886cee9b7fa3171bff5bc1bb8
+DIST kmail-20.08.3.tar.xz 5157880 BLAKE2B 58c3ef185f08c18a514fb281746c4148d0cef56fec7dc85234ef3ea217c4eca04da5cb044cbf1455478ec84d5ae4a3854e2a7ea061f30e0d700abeb4e3afc626 SHA512 88b3bf94702a61d3082106ca1fea08df6a2231493f62adc92138e2beebb896668aafd1271f20cea5ca0b45e545400fcbcbd42804eaa5727d192e6908f310b3f7
+EBUILD kmail-20.08.3.ebuild 3431 BLAKE2B 89a8f11ecb8892ad1eb684f7ad8f931035e5513eba6eb97785b4716f52af8d45bc0ae94c17166323590ec51d1ee6225a13f94f058b2d24a26910bbe40fbf0dd6 SHA512 6997f5253b748d1a30ba37434336a9652ff524f921b1ae96953b3790896701f426ec3e7bcd1714663e47d7d585cefcae68e49963398d8da1def6d41be1ded72f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.04.3.ebuild b/kde-apps/kmail/kmail-20.04.3.ebuild
deleted file mode 100644
index c8e0a062850f..000000000000
--- a/kde-apps/kmail/kmail-20.04.3.ebuild
+++ /dev/null
@@ -1,129 +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.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-# drop qtcore subslot operator when QT_MINIMAL >= 5.15.0
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}: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/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "KMail supports the following runtime dependencies:"
-		elog "  Virus detection:"
-		elog "    $(pkg_is_installed app-antivirus/clamav)"
-		elog "  Spam filtering:"
-		elog "    $(pkg_is_installed mail-filter/bogofilter)"
-		elog "    $(pkg_is_installed mail-filter/spamassassin)"
-		elog "  Fancy e-mail headers and various useful plugins:"
-		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-		elog "  Crypto config and certificate details GUI:"
-		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-	fi
-}
diff --git a/kde-apps/kmail/kmail-20.08.1.ebuild b/kde-apps/kmail/kmail-20.08.3.ebuild
index 47ceca275abe..d0884ed171cf 100644
--- a/kde-apps/kmail/kmail-20.08.1.ebuild
+++ b/kde-apps/kmail/kmail-20.08.3.ebuild
@@ -6,18 +6,18 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.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="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
+HOMEPAGE="https://apps.kde.org/en/kmail2
 https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 BDEPEND="
@@ -103,22 +103,12 @@ src_configure() {
 }
 
 pkg_postinst() {
-	ecm_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "KMail supports the following runtime dependencies:"
-		elog "  Virus detection:"
-		elog "    $(pkg_is_installed app-antivirus/clamav)"
-		elog "  Spam filtering:"
-		elog "    $(pkg_is_installed mail-filter/bogofilter)"
-		elog "    $(pkg_is_installed mail-filter/spamassassin)"
-		elog "  Fancy e-mail headers and various useful plugins:"
-		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-		elog "  Crypto config and certificate details GUI:"
-		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+		elog "Optional dependencies:"
+		optfeature "Virus detection" app-antivirus/clamav
+		optfeature "Spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+		optfeature "Fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT}
+		optfeature "Crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT}
 	fi
+	ecm_pkg_postinst
 }