gentoo resync : 01.12.2017

4 files changed, 2 insertions, 115 deletions

diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 6fc3d3cfb24e..b8fc4b4390ce 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,6 +1,3 @@
-AUX pimcommon-17.04.3-deps.patch 2275 BLAKE2B e7fae2bb57f660c853e5e3c6e37a0ccabeea2676c16e16822d40eb9d3b3a2581c8d5bd5464ab55bcad95b4b1e5bb00313a3c6b7ad68694b2bf17cec1bec89c27 SHA512 8e123d9e5e952503120b329d7f94e7fd09dd364eb3871580cb2d8c444626daff2a538a07577b90ba40ca7ee9204344614392ea76df4c92dea1a4daf39b3ac8ec
-DIST pimcommon-17.04.3.tar.xz 272836 SHA256 a3dbde5f54566e5b56e32bf116bb49004c0914e60786a38e1bf231e59a8d9f0b SHA512 e8017278776f04e6217cf712e8feff9cc63ff9c5356b82b7a4e3a76e23dd0ce1580ff7b1bee071518d0505ee2e5ac83d660bc1d3e9815e5d23b5e57ee56a0b8a WHIRLPOOL 37617f2205c1d1db7b16dfaf046028527f6d0791d2341bfa99e5b53e8ddef7d7ccfbd9ee92158407f0e9baa84bccf16e7423e50f6a4fe10314b750b2a1e6ce64
 DIST pimcommon-17.08.3.tar.xz 275848 SHA256 19e574432006f334fb7a9fe2154ca23ccc73abc672798de8966ea25361db2a34 SHA512 f5de67a51ce69332e0d61c10d2baa97cd8b5128d4f4e48b0503191b9cab283fcf32b4e205be2ce360acb3a523cdfd6ae416264b718c633ef6a1603a939c55bd1 WHIRLPOOL 16e16a330e6f069442ebea8b86fcf77815a12c9939e47273fa0d89dbc98d955279c2509fd091a2c1952e2bed8e3e6c7deb4a8ebc8e3b1ec3647e8ba024165054
-EBUILD pimcommon-17.04.3-r1.ebuild 1404 BLAKE2B ffcc49c3787644e5c90d6432d3d337c69bc18cc26fbec48efd1f5e606faa606a9c006a22e44720960ee60944af9fffd712cdd9d769c4939deec7687230b00902 SHA512 bd90009d65c2219c8e7309a96a339c841b335bbd8cc7e19859b7bcaec1128acb23742594361c43a8605ddb6d90a29a7e29e62f7e10766407658c0891e6602e6f
-EBUILD pimcommon-17.08.3.ebuild 1415 BLAKE2B d6256f1f2686a1f5be744a12fba52e6360ae00e2d72cd2cdab1ffbf779dd2200ecee407e00d9fdf4f20dae29ca3103ae585bc4350f2d0f4d11ee8fd71aafcbdc SHA512 c5c60cb3deafcc03ec044fb87c91040cc83815aa3e351798744da68b3bd642c836de814a9fe0fc0055c680af0f97d5a6482696173aad07c44c0a0008982f9124
+EBUILD pimcommon-17.08.3.ebuild 1413 BLAKE2B 1ded71ba7b1a4e22a9a94325f70a2fce81012113b1d3c2828edc3d7d575ff7d4673bc75913723600147579b151121ac16e6ba5c31b1d0a59cc41f336b4e6e054 SHA512 d63ca2120c97d9df881a04ab8a9360aab220808f3c639ea101657b66065f71e3af009f8a44f6beb379ade2d4ace87d1e333a605e8618930b4ba1e0d871294ecd
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch b/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch
deleted file mode 100644
index 9e9b37b4f399..000000000000
--- a/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit fbebfbe29d1928a36fe5643853b5a02f13f7b07c
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Jul 23 22:21:38 2017 +0200
-
-    Cleanup unused dependencies
-    
-    Test Plan: Builds fine.
-    
-    Reviewers: #kde_pim, mlaurent
-    
-    Reviewed By: #kde_pim, mlaurent
-    
-    Subscribers: mlaurent
-    
-    Tags: #kde_pim
-    
-    Differential Revision: https://phabricator.kde.org/D6859
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dca7fe2..d5f41fc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,23 +47,18 @@ find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
--find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5JobWidgets ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
--find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
--find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
- find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
- 
- find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
- find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
--find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
--find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
- find_package(Grantlee5 "5.1" CONFIG REQUIRED)
- 
-@@ -82,6 +76,7 @@ find_package(Xsltproc)
- set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
- 
- if(BUILD_TESTING)
-+   find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
-    add_definitions(-DBUILD_TESTING)
- endif(BUILD_TESTING)
- 
diff --git a/kde-apps/pimcommon/pimcommon-17.04.3-r1.ebuild b/kde-apps/pimcommon/pimcommon-17.04.3-r1.ebuild
deleted file mode 100644
index 1a6fb739d5fc..000000000000
--- a/kde-apps/pimcommon/pimcommon-17.04.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kmime) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=( "${FILESDIR}/${P}-deps.patch" )
diff --git a/kde-apps/pimcommon/pimcommon-17.08.3.ebuild b/kde-apps/pimcommon/pimcommon-17.08.3.ebuild
index e08688f90ad2..0d599b6351d2 100644
--- a/kde-apps/pimcommon/pimcommon-17.08.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-17.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="