gentoo resync : 05.12.2021

3 files changed, 2 insertions, 117 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 66be05238b80..0e4cec89cffb 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,3 @@
-DIST kmail-21.04.3.tar.xz 6485408 BLAKE2B f2c1a1de707dbd9c8c2d2567670d9abec49378d847128ca1465e251ffb5e25a5a054247586ad33037925dfaf9ea014db01b7a1b1baa6b35fd689e7fdd0b888fa SHA512 348d67ad825b4e2a4066736a58b71301353258be5cee1c2252ce0789866f294e4145c4556f79f918c47ffea015e4cbed42270964b7cd1002feafd54fed8a9895
 DIST kmail-21.08.3.tar.xz 6929860 BLAKE2B d6adc4cd78c880dc61aaa6b9e443b658d49513d24f472877f2de3a6f8c383c8dbe7db11614540e00dc01a0e3de918a0df4b11c312287892a1ee66faf64d825b7 SHA512 f92ecb2a3095e5a2f3fec67f476ebf8c7cad38d5e6f23ed6ce67fc6244e5a3ec590aa85cec847bda50b47896a1a77079727980deab5d58e847a0e4b1e224e113
-EBUILD kmail-21.04.3.ebuild 3403 BLAKE2B 05bde189f3de3f0c7e785d4c6a0c210a6ff585978bf889e0e9988d63a5d754b7890bb63f2d9236c97b197aef5bcc9e2bece5cc68def8d6225af399ceb0541c93 SHA512 a60aa5c94064b548df242ee9997f3e26e61b809994669bfc40622a7bd0da4773e9cc70888d0bf3fe56512b821a04a3256ab8e6d1237dd9a66e673668e671d98d
-EBUILD kmail-21.08.3.ebuild 3399 BLAKE2B a6bcb260b9b89aa59332708aa824f8da497225f260e14be39f77eb8d1c526ac6b7dcb2f3d0885c71b57413525ccb6f68a34ba441c1921474c99e97f04752e35a SHA512 37b266eb7bc483dbdf27f308304cd7858da5f73ef5845cdf1c92ba00b69e558af5fbc4634f9f779c075762d7809938ec420fc904e5af0d940983c616d37e47d2
+EBUILD kmail-21.08.3.ebuild 3396 BLAKE2B c4ba4e8bea2a71233fa62171150b05d69e8be0830322ebe8958a9d1fc34afef5f3e0205080a4f28f319ca20c333b37c14b2febaa36971cb2b532baede5d84bcb SHA512 8731b2bdfc8ae6b264033edcf40b1058bb82c23c1397de133fecc12a2ca4c092a9987470a47121edbdbb1313d78b36fdfa3b6818fdc8d9611424af4d2ebf339c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kmail/kmail-21.04.3.ebuild b/kde-apps/kmail/kmail-21.04.3.ebuild
deleted file mode 100644
index 6ae82f477ef0..000000000000
--- a/kde-apps/kmail/kmail-21.04.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 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.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
-HOMEPAGE="https://apps.kde.org/kmail2/
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="pch telemetry"
-
-RESTRICT+=" test" # bug 616878
-
-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/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
-"
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PRECOMPILED_HEADERS=$(usex pch)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		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-21.08.3.ebuild b/kde-apps/kmail/kmail-21.08.3.ebuild
index 03bb1645d36a..30253db073be 100644
--- a/kde-apps/kmail/kmail-21.08.3.ebuild
+++ b/kde-apps/kmail/kmail-21.08.3.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="pch telemetry"
 
 RESTRICT="test" # bug 616878