gentoo resync : 02.08.2019

3 files changed, 2 insertions, 93 deletions

diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 789f7a7abef4..fd28c7475fea 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-addons-18.12.3.tar.xz 2039560 BLAKE2B 8f89a7b8e733511ff83a66eeff1e3b7809c9d8fae9d8cf8f237181e5af8022727f5e7a97e639e84cf5dc8c8db6cc5d77504677a6b6460dde196d858db72b06ea SHA512 44e03975e8ab302efec5e512ac753f35b5a9ddbac9cc88028b50e27d888372eea48aa937e30af6bdbebc442a73eb424d81da916111635456fb813dff241a8bf5
 DIST kdepim-addons-19.04.3.tar.xz 2076656 BLAKE2B 1b60fb43489836081a4456836d9c5e521368002550ce2b451ca13565519be04a18e08f5ca7e02ec63ae25efb9614f1fd5da2a519361c4cca488d10e711448fb1 SHA512 b5111cde99153939fb7bc4165331467fcaf607098b81be5ad711ddbdb953f93612ace52a76c6b784060b212ca84af3e1034180964cbc0397bfebf25274509dc9
-EBUILD kdepim-addons-18.12.3-r1.ebuild 2425 BLAKE2B c3c111e503e0ddf863f513f8c22c53792532989f5f58fa56c0189475bb89de71e3546541c79a6d235d7d3cea9dc49de40c0a76d4ad58c9a944d78d9229008312 SHA512 0957a1bc578e8d3f8e02d1db0bd018a6fbb11437804e127542af591902310b5d6c28d6b7cb5bbdca54d21511ece3b626a7e2f8099667ca7e99d366b96db044da
-EBUILD kdepim-addons-19.04.3.ebuild 2409 BLAKE2B 5149fe38819bfaa29e55af9ecb75da500f432b3944d1fa029b6069209272887f6ea3423d2f7afdd648d695256d7364e5b0af93cd31a4f32932eddd589d27ecac SHA512 42839f9414bb76e3f1be24f9aef757441b902540c1854a8c61cb031176c4295e6cb3f0dc5e37456674c2942ffb4b905dd575e7cbb44f26d2937ed04448c40824
+EBUILD kdepim-addons-19.04.3.ebuild 2406 BLAKE2B a0369974a7c15003602461ef3c3f59cde976aeb229136d1e4cdf474183068778c070573ecd04ede4e91ffd9d72a4d0036c2c5c767c975f85315cf64c8b90c740 SHA512 90223da6066fdea518da99204fa4e3b3f2e0ba1c134e7f50b6d8a586b63e3b89dacd82aaa23812719e212398f1038913188497e10fc91f4a25586af80ecb4f03
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild
deleted file mode 100644
index 4871b6d0e044..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-18.12.3-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="importwizard markdown"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kitinerary)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
-	markdown? ( app-text/discount )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-		$(cmake-utils_use_find_package markdown Discount)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild
index c61074c3ac0d..3108de034476 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plugins for KDE Personal Information Management Suite"
 HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="importwizard markdown"
 
 COMMON_DEPEND="