gentoo resync : 05.12.2021

3 files changed, 7 insertions, 66 deletions

diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 705ec07ca269..1806154b4419 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,3 @@
-DIST mailcommon-21.04.3.tar.xz 730556 BLAKE2B 12a4ff5b41258c852fa6f6842b58b083b9cfa689b358cb3cf8c39424b0937f78797ff102ee06699106e883ac770d012babd0f8783def087949d8a2876416557a SHA512 4d64a0eaa7668a17487edbc1d5b92c82e73e0b84bc424a43666268fbbbfb62822c9f01ac7a3ac1ceb2a16887431c4c1f94633ca740a87eb20d37601b8201e0cd
 DIST mailcommon-21.08.3.tar.xz 737088 BLAKE2B b624cbeb62cfb76d84742e610009c7d6f0be9cdd96e64cd165b50f0aa193a856eb3d6872937fecd84f8c3347c3e28395de885ad4374fe03430e022685a764af1 SHA512 4d923b034a19399d47c7f5813f6fc0af493816cb14e2776a64ea78620eae57d24374b2793a0fbbc7445d81ed39af72aac7b74f8f63697bc1e71f1119c7fe08cd
-EBUILD mailcommon-21.04.3.ebuild 1719 BLAKE2B ce9a7cd93aafd8415a507ee29994a9c8665ed81695c1f2912eede14b10c5de93ea36afe95a0934f505bfa8ea6d677df04eb7327a4da7fb19683ef9ea1e8fa70e SHA512 bc9f9c882ca3324a540ed0044a9a39743507e3c993ab8d710c79f266bfd327ddfa235026f30fb35b2c252d817e10039a001a59fb0e64ff6d7a67e98a309d139b
-EBUILD mailcommon-21.08.3.ebuild 1720 BLAKE2B 0f8268d3d0b98e007e876a0e96c27890b5a9587551e60ad23c087a0f3ddb3c938902dd225609627570a2a94087c253a46d951953013ada8cd2df02008657ca17 SHA512 2504106f9bd557eb80709fa6935f158a6e423223c632b53ff20dde7425a1e57a284e0ab338c1cf25a6ed4164bb2643b458c14745b01ae6e8102aab1f2d0069f4
+EBUILD mailcommon-21.08.3-r1.ebuild 1754 BLAKE2B 1dfb8692897a5c615113bd8684bf7e6b85ee8263627bdde422a6cc88101ee6c73739f6910f299c3601fab17e9f973b6e80b6e7d43f1a22e45d4b457fef818407 SHA512 ec18c693294200cffd787adae8447f3be18a79a948d6d6a7430820f0f16e3ac1af97a7adef7d748b15a1fa07a961f55b21cf2621fe080f8443534ff9eee29c8e
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/mailcommon/mailcommon-21.04.3.ebuild b/kde-apps/mailcommon/mailcommon-21.04.3.ebuild
deleted file mode 100644
index 3984c9bed28d..000000000000
--- a/kde-apps/mailcommon/mailcommon-21.04.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-libs/libxslt"
diff --git a/kde-apps/mailcommon/mailcommon-21.08.3.ebuild b/kde-apps/mailcommon/mailcommon-21.08.3-r1.ebuild
index d8054f348741..4b69db134aea 100644
--- a/kde-apps/mailcommon/mailcommon-21.08.3.ebuild
+++ b/kde-apps/mailcommon/mailcommon-21.08.3-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Common mail library"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT="test"
@@ -30,7 +30,6 @@ DEPEND="
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
 	>=kde-apps/kmailtransport-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
 	>=kde-apps/kpimtextedit-${PVCUT}:5
@@ -59,3 +58,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 BDEPEND="dev-libs/libxslt"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}