gentoo resync : 01.12.2017

4 files changed, 3 insertions, 85 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index f832546f6a8b..7573e388de4c 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,3 @@
-DIST kdepim-runtime-17.04.3.tar.xz 1492480 SHA256 f85fa76556a5900861e3c9ccca4210af9ac66082109817d7b15d6295f4cecc1d SHA512 dd17f6bb3ba7372bad0e0647de13eb4d54f5d1a6c81f415eb037e7f90cc60fc0723922829282b57fa08559d1e85b4f46c17a7c4c0e85ee96516787fc78ed898d WHIRLPOOL f46ad65fd6a828de4129dffdb378731879c65a6695751bbda567cdc725a13acc7d9ee3bed2a2297847f3057787989d4cdcc2c8d18b19b4994e9379db0f028e23
 DIST kdepim-runtime-17.08.3.tar.xz 1507128 SHA256 672a02f572678ee2992ffd4c6f2ecdea541faed15a45466fa1e9e95cd89c8661 SHA512 fbc13a0b92d47d057ff94101485e9e76eddd002c51d1696146313f6fa5be412759b44c1f24e0a4d1282140b985926370310de77cec7f9281771d15e6d5c919f2 WHIRLPOOL 84ff6fc07415b862eab6ccfb648febe501f98c87e7e92fd226bd8f0a92ce7a8287cecab9aefdad6e5fbc4ff75d4b00a90e57cd3888a55fc42784b2b58314441a
-EBUILD kdepim-runtime-17.04.3.ebuild 2028 BLAKE2B f2abffd7dced9f55345bbd0f27d2cb8997ee44f8b7775f2f15457c9ec008c028b0f9d304b4f73517d30144bca9482ee057d629ad3c0946efcd85af1700d9fbbe SHA512 9b4fe519bbf20003a7b75b9b484144aee2744fb74147f976187d43f9a36b71bdb1f470b3751680b3473a4488a31ba989796ad343a2e40562c2a414d23951e80d
-EBUILD kdepim-runtime-17.08.3.ebuild 2074 BLAKE2B f66fb7addf14111146924121813db78433e9b7bd85d4e3330a597153b76310f336b9a095c8846f6a78236486f80a8ceaf6a3b84673e426cef96834f7905f504b SHA512 1e80e7429ab22932205a0aec7834de0b9f00cf3b7522ac83af9dd8ff92eeeeaaf5d10f836224172a87a71051db13566e02cd13fa8dcbfa8fd2c1df850c23bb34
-MISC metadata.xml 412 BLAKE2B b92a8b82ac31dfdfd47f84f8114922dba86e5e4d2fa90a9ec84bb4157e3609a1e73b0b7049d7a73df4a0c492ce8cbc78ce57bd48abfd75f6b8141d34bf648e8c SHA512 101b4954369de91252b4da9e3c4e637ac694959da3707f3b4f6bf126c8a8f167b2de8413c4a2e5da47db41fcdc9a73285a73377b3dfe4549e8fe69736e372478
+EBUILD kdepim-runtime-17.08.3.ebuild 2072 BLAKE2B f0b89498dfe71aa7a60fdd10ef57bd29c4da7e00e95c47bb2659991929da70911fd841ffea3e2bb831f8e5224effb99f371c0888865055e7b85e3f79b118268e SHA512 5c7459d4b4dbf517738540365b4a6c323cb2dd79a29cec5ede078d02c4d8642634c09140ecde3f32d4523d078a90c1c7230df86cc19c3acc9cf8daf6bf2e91f8
+MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.3.ebuild
deleted file mode 100644
index e22892bcbfbd..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE="google"
-
-# TODO kolab, Qt5TextToSpeech
-CDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdav)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	google? ( $(add_kdeapps_dep libkgapi) )
-"
-DEPEND="${CDEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libxslt
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_frameworks_dep oxygen-icons)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package google KPimGAPI)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.08.3.ebuild
index 4073c1b8ac0d..7ba46b903c1f 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.08.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="speech"
 
 # TODO kolab
diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml
index 36d85d6c5631..b337e66e249b 100644
--- a/kde-apps/kdepim-runtime/metadata.xml
+++ b/kde-apps/kdepim-runtime/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
 </pkgmetadata>