gentoo resync : 03.03.2021

3 files changed, 18 insertions, 61 deletions

diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 5b915b133113..3baac3c78d7c 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,3 @@
-DIST incidenceeditor-20.08.3.tar.xz 543076 BLAKE2B 7990a6aa13098f92d0ab8b767c87592011f55e2847c7b21aac8a324a70c2e4cec8d9d5763760feb785b5eb8e3801cb862ed9f1e1aff2c30811f301c606f7a8a8 SHA512 d471a646ecb5a3ba9f0e932baa0fbccf2e159d7b69fd797003dd60f526bdfcc63dd7145bc335c3d850ec5934ccaaac52e682205f55a668bf93f713e575d5b5d0
 DIST incidenceeditor-20.12.2.tar.xz 546144 BLAKE2B 2a7ee26b398347595a26b4a74c2dbfbd3c99e3cf576b484497b418b7522c9fe3ed0c218434da79b2fe72063224ab11add669e02dd033529f24a02cbf001f429b SHA512 4c28ccdbc7e389a26f93072309626966570392bb05af2457c8a8c73581f7ca9e04d030eb7d4bc45c16a5545218e928d66575cd9f5fb2333131be136f3b52c0ad
-EBUILD incidenceeditor-20.08.3.ebuild 1568 BLAKE2B cdab655889726bb320d6b7d320c7b5cb9bccbfdefb6a4c736318087bb0c582b439c49086cd5bd71d750a24f44390c98f494db578e164a01c7dee1f482e6c26b4 SHA512 9bd95d1756457fec98c8eb1d726a54bd021301e21b5e35d6e2645912c70551152ac25bff3b269608055024efc5547bd77dd10ef99bc3dd19e3ebb2cffc857e77
-EBUILD incidenceeditor-20.12.2.ebuild 1571 BLAKE2B 0a6dd9c2d931b0215723174e1d06b15c9a89fe6d9dcd006de83625b4432274902923f67ddfcab7aa5ae569dbe6807cbc6f05088e75be5735cbe9defc56e312da SHA512 63304b3fc4628821d16d3dce85344605402d33a5fa327a9dd1c1be9447d26aad087ed80f344aac216d0cfbb77e365a07c6e97d951689ada7aef5108e3cccf0e6
+EBUILD incidenceeditor-20.12.2.ebuild 1878 BLAKE2B 3e8ef837ff891798e1d0bf5688d3d7d53836a5bd366f1136b782aa0f48dbe6627f507e1973aea214b5442a90108bb3e9c137b41907a593ab3f25cd535e5989b5 SHA512 c2decbf0782791fdd58622bc0a965ae5b192bbd943f5a608ed988a9391edc82ddb72b15dd9f2acf1f0d73752d722a2b87ee10dc3e663390ab445dcd91e259291
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
deleted file mode 100644
index 6000ab94f038..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/kdiagram:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${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/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
index abaf121ed4ad..72a8cbb949a6 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
@@ -14,10 +14,10 @@ DESCRIPTION="Incidence editor for korganizer"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	dev-libs/kdiagram:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -52,4 +52,18 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[postgres,sqlite] )
+"
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+
+src_test() {
+	# Paths exceed unix domain socket limit, bug 770775
+	local myctestargs=(
+		-E "(akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
+	)
+
+	ecm_src_test
+}