gentoo resync : 02.08.2019

4 files changed, 2 insertions, 99 deletions

diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 951afb6ba76b..1a9ac1e83be1 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,6 +1,3 @@
-AUX akonadi-calendar-18.12.3-korgac-crash.patch 1738 BLAKE2B d210ea7e6339a72aa73eb49a6cb1172a29529180e734a5a83465f9a01d641677109e105768d6556b4cc07a75fe3bbc41ac4a4ba1bc3e3691c6121a1df288a562 SHA512 8ad17dfbd42244532c6ea3cc5fb0bbdca756dc00de647b69a13240e4eb028302cb3d03e4741e31fbab5a0a04808bb1c75ffaa55c60de57b544284ee3c0c7b2c6
-DIST akonadi-calendar-18.12.3.tar.xz 333656 BLAKE2B 039a132cf2e8dcc5935a4027b9e8b757b9b0060a3eb0e209dc87e8ee22b75117aa2f137c1c3508587b741de10cc466a7c5c9fae127e9bfbb59ea0870cdd4c5d4 SHA512 aac520c64a66fdeb27a2394e3eb7e4f4f30b123f4e9bf35cd01bf421d67c6dcdaa2041037e50474dd98b737c6ecbcd6c57f30e0a4ac7d2996ad18ed839288967
 DIST akonadi-calendar-19.04.3.tar.xz 332632 BLAKE2B 928fc1ce338f90fa16378eddab3861aa49938f35d434259675362ca1a4461cfc7c4181f2c14f5b037be8f4e512ba917b3adb58440415c34c4a1c91259bab2c3c SHA512 b72b79c51d007669f637299a60dc246a363a9484f332983c348984e62e8e1dfd3f7808e6de9014efc09786f78a12bb705cf11193c32071aef7b916c7a4abc3e2
-EBUILD akonadi-calendar-18.12.3-r2.ebuild 1224 BLAKE2B 37e9cf5134461ed6f0ab4942680f25fa1e4e33878737acff9ec9bed12e8c06507ebe6da4626968b47c4621462755ba56a574d394a0fb97bbc93d40b39aa48263 SHA512 0f24c17cae18f40f8253abaadd0f1e298423f63ca13ca47527fc13026a23bca7814046f945ed9db7eaaa6ef69ae1276a0be81fff2d3c37930be72a1549a45206
-EBUILD akonadi-calendar-19.04.3.ebuild 1161 BLAKE2B 42025eaf42f7e40a4ff81ef955a3e53b61c29dc166b24d9ccacd3811580f5d45207ebd14e6f1e35de80f29d0dc0d71ca8f7cd00e207397197a6d4b45ccd436fe SHA512 e2924e0021b55535bd0426f4a367ea61ae4a3a05185c6dffe8549407f9547b658d3d0a8ce149f2f212cb805fee585ffa4d8b0bb2fb95b5f1dbb175559180e61c
+EBUILD akonadi-calendar-19.04.3.ebuild 1158 BLAKE2B 5810b19759b28d1ccb55642dbb9b27d757176006ec15173515971f0c710bedd3f18b8d46d0400ba984bfffcf0d98b4013ffd4d382f1dc724a6348a82ef971330 SHA512 8accd7ad834b011f61f7ee16f87cb6baca1888c1016766adabac903fb62234450998b4bc850c398ca1de7ba9c7d7c8e57ef4869f4b4bfd4707e1b09152e60c31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r2.ebuild
deleted file mode 100644
index 8dceb3cf01e0..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.3-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-PATCHES=( "${FILESDIR}/${P}-korgac-crash.patch" )
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.04.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.04.3.ebuild
index c2875fb209bf..7af44096708c 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.04.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for akonadi calendar integration"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-calendar/files/akonadi-calendar-18.12.3-korgac-crash.patch b/kde-apps/akonadi-calendar/files/akonadi-calendar-18.12.3-korgac-crash.patch
deleted file mode 100644
index ca159c05d110..000000000000
--- a/kde-apps/akonadi-calendar/files/akonadi-calendar-18.12.3-korgac-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c9129b07b42097f6b5eb54c2103d22a9c2263d83 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Wed, 27 Mar 2019 14:45:25 +0100
-Subject: Fix crash due to using an attribute from a collection that went out
- of scope
-
-Summary: Probably a consequence of the const/non-const changes (detaching?)
-
-Test Plan:
-Untested, but based on a crash report by Allen, pointing to
-ETMCalendar::alarms() calling BlockAlarmsAttribute::isAlarmTypeBlocked
-on line 579.
-
-Reviewers: dvratil, winterz
-
-Reviewed By: dvratil
-
-Subscribers: kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D20079
----
- src/etmcalendar.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/etmcalendar.cpp b/src/etmcalendar.cpp
-index 295785d..75e131b 100644
---- a/src/etmcalendar.cpp
-+++ b/src/etmcalendar.cpp
-@@ -549,11 +549,12 @@ KCalCore::Alarm::List ETMCalendar::alarms(const QDateTime &from,
-     while (i.hasNext()) {
-         const Akonadi::Item item = i.next().value();
- 
-+        Akonadi::Collection parentCollection; // must have same lifetime as blockedAttr
-         BlockAlarmsAttribute *blockedAttr = nullptr;
- 
-         if (excludeBlockedAlarms) {
-             // take the collection from m_collectionMap, because we need the up-to-date collection attrs
--            Akonadi::Collection parentCollection = d->mCollectionMap.value(item.storageCollectionId());
-+            parentCollection = d->mCollectionMap.value(item.storageCollectionId());
-             if (parentCollection.isValid() && parentCollection.hasAttribute<BlockAlarmsAttribute>()) {
-                 blockedAttr = parentCollection.attribute<BlockAlarmsAttribute>();
-                 if (blockedAttr->isEverythingBlocked()) {
--- 
-cgit v1.1