Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

3 files changed, 91 insertions, 2 deletions

diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 1db0cea19799..f1e312c56eb2 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,3 +1,5 @@
+DIST kdepim-addons-18.08.3.tar.xz 2134684 BLAKE2B cf311193dd1e100fd4c3c08926be0b8102795f7e7475b3610be4dc60e4071a5286bbfffcd7928edd5ae3f779c7266e9efe08664abea153bd95c8840c05240f92 SHA512 9d9ec5c0c51f14bc7936e40b8d67f67120e4d458d1b226dfcfc08b6aa28a30255300a83758c3af7b1e68e7f755fc198208402027303f4451c054dba4c7ef8f82
 DIST kdepim-addons-18.12.3.tar.xz 2039560 BLAKE2B 8f89a7b8e733511ff83a66eeff1e3b7809c9d8fae9d8cf8f237181e5af8022727f5e7a97e639e84cf5dc8c8db6cc5d77504677a6b6460dde196d858db72b06ea SHA512 44e03975e8ab302efec5e512ac753f35b5a9ddbac9cc88028b50e27d888372eea48aa937e30af6bdbebc442a73eb424d81da916111635456fb813dff241a8bf5
-EBUILD kdepim-addons-18.12.3.ebuild 2411 BLAKE2B 8d95113065f5c68ddac5e2448843805b68542093360258ea271e2f10b2770246ccb9a0ac13869032ad6d633c22d9e2c91166b6669b8a17a2b31260a4e5d81e48 SHA512 4ff7ca2425861096927891c635d1ac4ae3a11597f65f081309cc72c3e75d884db4a8804d477eb9ee147fb8d3413bc1b64ffa67e0bddd8b68cf628dc1f6c3b544
+EBUILD kdepim-addons-18.08.3.ebuild 2310 BLAKE2B 361eb1fb6cfb7c03da7533acef6c6ba527f401bb775e0c6dfb2ce0b292aba13a7fd8e6138204b7a8c435ad7e327627459dc47655db20e231e80ab704d65fa028 SHA512 401f3941a857f23bbab3d04ed1b908a2c7ce3025b15700dd06ff80a2f5d726f291bd8812202bb408d3e405a3c9168151394ba7d1ccd82ccd56b76916eb7a341b
+EBUILD kdepim-addons-18.12.3.ebuild 2406 BLAKE2B a25c632d8193adbb6cfc3641d244d0f9e25bcd08d172a7685f38cd6402c354c582793dd0d9d3bcf5bd13a04540c3cc25d9cd4529aa0456e3dc5a7dedc8aff02e SHA512 efdef364aa3064c360d61c5bffa42100f17346169436408cd21c91a3ca8603ef521861a5e163d1fcd816fbe0a4d769809703eb106aa50356d1a56b961abc6f9b
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.08.3.ebuild
new file mode 100644
index 000000000000..81e652c87688
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.08.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 x86"
+
+IUSE="importwizard"
+
+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)
+	$(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) )
+"
+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)
+	)
+
+	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-18.12.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.12.3.ebuild
index aaeb50533508..7eda22e80ef2 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-18.12.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.12.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="importwizard markdown"
 
 COMMON_DEPEND="