gentoo resync : 22.04.2018

3 files changed, 91 insertions, 0 deletions

diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 41706ac8b224..1eb076308db8 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,3 +1,6 @@
+AUX kcontacts-18.04.0-unused-dep.patch 1283 BLAKE2B 20a4b624770a7a578d2e0be5a9f8db252d4ddeea5fe8521122023f13d15470b32dd1c0ae7f3e0b8ab65e0848a7f82e568a712e6af2191600bab97995307d881b SHA512 0aa1bffaf62df622975ff092df911a107aca1ec96376aad37339d5a54ed6e34bc7b0aa07b0b2be573382e2e6cd07208ffd463f0e60e13c4f8d5959dc85fe6acb
 DIST kcontacts-17.12.3.tar.xz 206708 BLAKE2B 8c948183fa389be754ee7a8d2928c64f9b854ce06c97fbbca79c784d8e7cd48cade5c2e6a95b3dfe77017f2fcc7bcaebc15c8fb759755b2402a50f4e7dd029e3 SHA512 e6f77cb685d6c163e575862608d127b524815704a4d124234f871aeb36abdbbe6efca26d17c86692094b395e7edf889f53cc70b7c72f33746483c9a04a674e21
+DIST kcontacts-18.04.0.tar.xz 206920 BLAKE2B 00da3c840b09526903cad4a9c51f70f7ea9c3ed2df4cdee64477312ff713d3002d008a2f0274f1b11b979619277b979978a6c408027d551ac86b3cb2447dc518 SHA512 2cd7ff23f18df20020760c8969725be683d04855949dc0b926c720a65c1e160f3a1085b1ba03b80ec86c7ed5575407a4c8f16f45142326de809c4bc1be5ba0e7
 EBUILD kcontacts-17.12.3.ebuild 853 BLAKE2B 0301f620a23a5135f1222517ba1a30989033f116a598de17b915f17952db5a621bd64eeff73560b69f6ca951dbd11c80a5462c199336ae5e37a993006658a367 SHA512 1c8457c6e45fb5ca445f23a6b5351de168aa081a66858f717954bcd5eeee620571de1290cc7cb3da929b88e29090cbdcf1eaad83dc9f3b49037fd643e9f57f82
+EBUILD kcontacts-18.04.0.ebuild 882 BLAKE2B 1fc916a2cc2aee36bc37e621b89e6bccb6736d9a80d31638cfa6a8f3558c7954d8e31dc81528350a665fee4c7dbe67a37ddeffd4f4aa2a965913962c343c0d60 SHA512 065e9ff4b8cc8ef75162a27251bb20b326766305fa98ab5ec0d15f6f1cad0cb1b996069a04d91eb282ba41a6b9355745886bb38c81c96ddc8e4ee6b6a7a0fc07
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch b/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch
new file mode 100644
index 000000000000..2843c6d5422b
--- /dev/null
+++ b/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch
@@ -0,0 +1,47 @@
+From fc512cee665f1e2736a701c9960efce5c093bca3 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sat, 14 Apr 2018 18:08:38 +0200
+Subject: Remove unused D-Bus dependency
+
+Summary: Makes this much easier to build on Android.
+
+Reviewers: #kde_pim, dvratil
+
+Reviewed By: #kde_pim, dvratil
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D12198
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f47888b..87408d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,7 +33,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KContacts
+ )
+ 
+ ########### Find packages ###########
+-find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS DBus Gui)
++find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui)
+ find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS CoreAddons I18n Config Codecs)
+ 
+ ########### Targets ###########
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 819e7fe..e1a2094 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,7 +63,6 @@ PUBLIC
+     KF5::CoreAddons
+ PRIVATE
+     Qt5::Gui
+-    Qt5::DBus
+     KF5::ConfigCore
+     KF5::I18n
+     KF5::Codecs # for the vcard parser
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/kcontacts/kcontacts-18.04.0.ebuild b/kde-apps/kcontacts/kcontacts-18.04.0.ebuild
new file mode 100644
index 000000000000..0eb69f42b2ae
--- /dev/null
+++ b/kde-apps/kcontacts/kcontacts-18.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Fails test because access to /dev/dri/card0 is denied
+	sed -i \
+		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
+		autotests/CMakeLists.txt || die
+}
+
+src_test() {
+	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
+	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
+	kde5_src_test
+}