gentoo resync : 03.03.2021

3 files changed, 2 insertions, 118 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index c342294517f4..3ef84e6bca4e 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-20.08.3.tar.xz 5157880 BLAKE2B 58c3ef185f08c18a514fb281746c4148d0cef56fec7dc85234ef3ea217c4eca04da5cb044cbf1455478ec84d5ae4a3854e2a7ea061f30e0d700abeb4e3afc626 SHA512 88b3bf94702a61d3082106ca1fea08df6a2231493f62adc92138e2beebb896668aafd1271f20cea5ca0b45e545400fcbcbd42804eaa5727d192e6908f310b3f7
 DIST kmail-20.12.2.tar.xz 4671468 BLAKE2B b95329724286f690a990a100bf88b5c743ac9e06688fe1e8c7208fffb0fe3a600b68a61215d2761a1edabfb56d95264765e790db1156b2c49349fcbfd93077ee SHA512 f6b2b217c95b844b8a4ed3c254a798310da411b6a9bc911378e087c6a150f83d76ab0c7d27bb337b5d5713f62852c3c646f2f8d5a1ef4cd44f7250be38a71945
-EBUILD kmail-20.08.3.ebuild 3431 BLAKE2B 89a8f11ecb8892ad1eb684f7ad8f931035e5513eba6eb97785b4716f52af8d45bc0ae94c17166323590ec51d1ee6225a13f94f058b2d24a26910bbe40fbf0dd6 SHA512 6997f5253b748d1a30ba37434336a9652ff524f921b1ae96953b3790896701f426ec3e7bcd1714663e47d7d585cefcae68e49963398d8da1def6d41be1ded72f
-EBUILD kmail-20.12.2.ebuild 3434 BLAKE2B ce3f7d8114688c17843b982c9865120407ea5ac07cda2ce083ee5062d5dfea28f0c94590e71b046b6f4744d86f72423c81824425556b4f36de3495a6eeea65c1 SHA512 6b87e5d7bfccddbf82718f3f9943eb6f70bc2c5eab59a5a52c8e70150044e1b610e48f21031702e7dd64d52867285f70af791056c986ba679d06dd669ffdb742
+EBUILD kmail-20.12.2.ebuild 3431 BLAKE2B a2311087df478180bb351552bee6e24442513f0b526c5ffd7b7c7dc2900a6af366bd943c2fbd444a0ce83a18809ec37c503541c60d8c8042c18e9126e4971b44 SHA512 5919b130db0efd512c617b351b0b7ab994862a5e4e9166d0001192163cee767a76bdc90c1e781975a19ab2e2f969b122e0e1ba9f9d7dc08bcaa847fed83355fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-20.08.3.ebuild b/kde-apps/kmail/kmail-20.08.3.ebuild
deleted file mode 100644
index d0884ed171cf..000000000000
--- a/kde-apps/kmail/kmail-20.08.3.ebuild
+++ /dev/null
@@ -1,114 +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.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-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 ~ppc64 x86"
-IUSE="telemetry"
-
-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/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
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		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
-}
diff --git a/kde-apps/kmail/kmail-20.12.2.ebuild b/kde-apps/kmail/kmail-20.12.2.ebuild
index 453b9dbcdede..5b1a935b2e84 100644
--- a/kde-apps/kmail/kmail-20.12.2.ebuild
+++ b/kde-apps/kmail/kmail-20.12.2.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/kmail.html"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry"
 
 BDEPEND="