gentoo resync : 01.12.2017

3 files changed, 2 insertions, 36 deletions

diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index a7fff0ff3c05..0f1d69fd8a80 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,3 @@
-DIST mbox-importer-17.04.3.tar.xz 32936 SHA256 2c2ef2a0f6c15d220a891330fc6cfae693fe4c4eba7d88f7477ad62c5b80aa0e SHA512 185176c1adf7d3db1485eeb9dc254e4e59d9ae7cbadd24975cf8b271e9032ed6b47fef5e41ca373071f34b6562372b4f781d5f554dee266d2d6cab68b0b34096 WHIRLPOOL 7090bd91f5aa2da9e95f735edf3db636a44aea469199a1bbeba6aa8ce8dd3bb85551ed9e84eb0d814e768d2efb807d0a30a5942626635a348fe26876b26d963b
 DIST mbox-importer-17.08.3.tar.xz 33032 SHA256 484034b0bf00951d1f2771b155d462e975f7354d380d8a17a64a92cbff969fda SHA512 6b5daa7800aca63cde814464b9471eb14cac76112a374258644cbfbf0cb16f5777ed27f37c4a3f22973062fe9ed65d92366e77154ec106a4a84c9d034e8d9b58 WHIRLPOOL dba0f442da904e2f2699b9932901813a856cf0481e7dfa89cc6fb996c8e42066b495eaeb9d9382cefd33ba28dd597ef2a825788a70ebfbedd5d5d73ed7bb64ee
-EBUILD mbox-importer-17.04.3.ebuild 825 BLAKE2B 1546fb5aad8d08474af21a3319ea0036d3a617ab087b293dcc71696c5b0e59f65a5bc9c3c4369f99d19587446109f7d8c34676951d4ad895d7af2ad10456fc32 SHA512 acf89446d56f7893587c791058e6557880035ed87bfb010fe37b596a7e06dca1fb5e1f4f9b9711c0f881d9798150499496d6452ae4096f3057b42375c2b489bf
-EBUILD mbox-importer-17.08.3.ebuild 827 BLAKE2B 8b2527bc24e1b6ec3b24e6ff12637f8e2a663991c765ec935fe66da57e4930c9d00afbd5099d50f3b117795db408dc7323119ecaf608101c6eb2063b0cc150ee SHA512 3078c51c86ecc0e49ab1c996b544a1d7a89c6e77a96817fa9b3faf38af31b331449fd7236bbb8c942e7d482dd8400ad7156bdb7f3af692e13cc4233b5f2d6d95
+EBUILD mbox-importer-17.08.3.ebuild 825 BLAKE2B 1546fb5aad8d08474af21a3319ea0036d3a617ab087b293dcc71696c5b0e59f65a5bc9c3c4369f99d19587446109f7d8c34676951d4ad895d7af2ad10456fc32 SHA512 acf89446d56f7893587c791058e6557880035ed87bfb010fe37b596a7e06dca1fb5e1f4f9b9711c0f881d9798150499496d6452ae4096f3057b42375c2b489bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-17.04.3.ebuild b/kde-apps/mbox-importer/mbox-importer-17.04.3.ebuild
deleted file mode 100644
index 7e9e3e51850f..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-17.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/mbox-importer/mbox-importer-17.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-17.08.3.ebuild
index 907f2b5ce945..7e9e3e51850f 100644
--- a/kde-apps/mbox-importer/mbox-importer-17.08.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-17.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="