gentoo resync : 05.12.2021

3 files changed, 10 insertions, 76 deletions

diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 0b7fe0fe2a77..6885808f0bdd 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,3 @@
-DIST pimcommon-21.04.3.tar.xz 369372 BLAKE2B 4f378ae377b664839e7e7e6bc7d00565fb7ba24371582277575c23e989fd722945f0c78f187e7fcf931a26b417380e3244bddb682a23677f032a6f8faffaaa41 SHA512 b2ff1ff7942e49676aedfbe923e3a3bfa26e170007b58d2ee07d80da466b4d701fbf0707720cdc10304c7c41381c3503781993e83f88414546e605896817b320
 DIST pimcommon-21.08.3.tar.xz 368900 BLAKE2B 293d4d8ef29525bc7fdf439d7b8e356af5c8c959f0a08c1cd99b62080b605155dd1a44ca10891c8cd3d49ba9b2336d92ff766de3308f590862e9afd054f74967 SHA512 cb5c285bb92119507b09dbe9ca2fc1ec614ff23c33e04e4c821d499195aba48df00b79185877e4caf2fd6022dce7d1912bd83979049e66d0c5a812c14697fe7e
-EBUILD pimcommon-21.04.3.ebuild 1724 BLAKE2B 20da2b69b8ad110e29279fad84e6a46f7241b6bb8d42a2cba96adf67d0f05e3ef017cf0ea564ed70808ab45d92bc37971064a5939fd4c6f3d0c2c39a98adc498 SHA512 da560a66d85d5157be2bbbe170bd522114b0fdce44df86b4e460dfdc020a3f66912c8ba9fdb74bbd04022eee0225dc0e1cdc7d323aab256277390546d8773ed0
-EBUILD pimcommon-21.08.3.ebuild 1727 BLAKE2B de59bd5c90286ed26a867f8e5ade5aa80ae1f010bd4b855a28a0ade277b7da1bc4a25a1a5d9f613c4c4290d91662e11cb7ff9c79e5a5847ac86ff6a331c9850c SHA512 b3fbfa94f8077e2028a89a136f60dd9f752d5d1b73829ab95e28fb71e65ffc1acf6169fa617a6e49a7aae7a4217cf92603b82cfd3092fae3ae6d72da64158cee
+EBUILD pimcommon-21.08.3.ebuild 1798 BLAKE2B 37cd8a3515522c69768fdbb2efa68a1f776a4de121445d91f1620fc5555c40c1da40224fc3cb69e95b392c87c18a2e3585febfe3987d00fb51ce73f7171ed6fe SHA512 17ffc20cf78e5477b6bde4536d27faf0de1fe0e4f0e84652e6a170da4fec76146265e857739de50f7212dc9d716ab51b642d41f3ada59d728147d6fb3622b91b
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/kde-apps/pimcommon/pimcommon-21.04.3.ebuild b/kde-apps/pimcommon/pimcommon-21.04.3.ebuild
deleted file mode 100644
index 4caeb7ad81e6..000000000000
--- a/kde-apps/pimcommon/pimcommon-21.04.3.ebuild
+++ /dev/null
@@ -1,69 +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 PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${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-search-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-apps/kmime-${PVCUT}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/libkdepim-20.07.80:5
-"
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-21.08.3.ebuild b/kde-apps/pimcommon/pimcommon-21.08.3.ebuild
index 6f3a5489c88a..2a54f2b43ee5 100644
--- a/kde-apps/pimcommon/pimcommon-21.08.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-21.08.3.ebuild
@@ -15,12 +15,9 @@ DESCRIPTION="Common PIM libraries"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-BDEPEND="
-	dev-libs/libxslt
-"
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -58,6 +55,14 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/libkdepim-20.07.80:5
 "
+BDEPEND="
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
 
 src_test() {
 	# bugs 641730, 661330