4 files changed, 14 insertions, 76 deletions
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 8f3e8d340094..3afacdbdc6ff 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,6 +1,5 @@
-AUX kcontacts-18.04.0-unused-dep.patch 1283 BLAKE2B 20a4b624770a7a578d2e0be5a9f8db252d4ddeea5fe8521122023f13d15470b32dd1c0ae7f3e0b8ab65e0848a7f82e568a712e6af2191600bab97995307d881b SHA512 0aa1bffaf62df622975ff092df911a107aca1ec96376aad37339d5a54ed6e34bc7b0aa07b0b2be573382e2e6cd07208ffd463f0e60e13c4f8d5959dc85fe6acb
-DIST kcontacts-18.04.3.tar.xz 206936 BLAKE2B 00df6e8da4a3d70f7d630b8dd671c6214bca8ed7d938aafc2342dbba97337f077cb77bc9d0bab31a91b7b0b8dd9074f667846120e667a52bcb477ec6b29c20d0 SHA512 bf177c4cf0ecbdb71e75ee32a4e71599f864062524f5663e3c1d4b49a06d58a3abf7b18d2840cf7e70248a426fa6b6367375a2aaea211ba15a697e0dbd27953e
 DIST kcontacts-18.08.3.tar.xz 207328 BLAKE2B e39f313750ef9a21d8c85aaa1b21902151e6e21d542d0ccf26f9297e48e62885c27b77ab82f14dae66aaab1992a275e2fa389a93ce0fc64894eac8744a09590d SHA512 866c8d70e03985c346e1a4f8c6ba0114045e1650cb846b1a15ff44cfbe569de3107b9f6c75e2354d6bb5a08ce388ce78c0871e57ffcdb28ff246e69a5444aeb1
-EBUILD kcontacts-18.04.3.ebuild 889 BLAKE2B be58d2731e6ad0605817bbcf6e5786c03c7ffc5b49dd9d0e22967bb46d2f20d0d865737a8c0c0cd127201b50ea1d68414dc4c223c0162f74ea5d18da489b79ae SHA512 1d45d48805a52ee73219d1eb8b61dd66ef4f049fc02b25f4f3d63f79c32a6b1a9ddf037a296c28b86112ea2fe82fc95c1ef9f27f086286767c367e90c375fcdb
-EBUILD kcontacts-18.08.3.ebuild 830 BLAKE2B b93517236b74bbaf059523c2832aef00e01fab902924f54c59e233be03d009ce0c246ebc91a99512331923150f81e991252c4eabc42ae339537a3112864ed143 SHA512 0e3804067ffdcef4c78c9abdbcdfa9c8d67c0439398a7b40865aa76e32179411e45e77af8e112fb19e9bacd01e0840b13d07e7f392c405bfe761677201ea4ce6
+DIST kcontacts-18.12.0.tar.xz 603652 BLAKE2B 9786a81995912c2acb9184e6dc74c93fb75b52e54b493091c827a725089830bb69d1b633578d1b780157112a25db5b7e675296652dc0b96823b350541f496971 SHA512 be59dd2703bdbd42811ceba2059279d6f5ef47c839dffe72c722806ae87297caa5f5997c7600ef0a050cedda82bb31d7c5ddfed579b747aa0aa97e0929780e05
+EBUILD kcontacts-18.08.3.ebuild 739 BLAKE2B 930d3720029f351a741a9d9bbdd30a9a6ca27c8d31c92b6477b073db7c10d063950e6666b8725e56aab890064aa8a5572c2c14601b103872971c80757abe3468 SHA512 932e8b7297c0f6cf7de1bc1a9515438011722bdf2fdbe362df96c155c846692671453e7a5d36919e0ff20eca8cfbca1063df3ec8a17a14862cb4e2cecd6d01a5
+EBUILD kcontacts-18.12.0.ebuild 644 BLAKE2B 351a9dd762baac084abc109df9de93bf34fb4b427cd34bdd4f0e864f514e0ad49697f8f0fd5ba2659bf9a622ad5332bc1426bdb42e857b7124a514bfbb10fb16 SHA512 444d5df10c68824beca3ec9e842d14cc8c99ffbe6274f97fd210ada5d292fa91e4049a947318d7644cdb05f90b38c5368a0cda144d746b619a27b8ec69b5f9af
 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
deleted file mode 100644
index 2843c6d5422b..000000000000
--- a/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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.08.3.ebuild b/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
index 43629f6fffa5..7c758a9e8b61 100644
--- a/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
+++ b/kde-apps/kcontacts/kcontacts-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Address book API based on KDE Frameworks"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
@@ -23,17 +23,12 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
-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
+	# bug #566648 (access to /dev/dri/card0 denied)
+	local myctestargs=(
+		-E "(kcontacts-picturetest)"
+	)
 	kde5_src_test
 }
diff --git a/kde-apps/kcontacts/kcontacts-18.04.3.ebuild b/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
index 3deea51389bc..4a670d9b6da3 100644
--- a/kde-apps/kcontacts/kcontacts-18.04.3.ebuild
+++ b/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Address book API based on KDE Frameworks"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -23,19 +23,10 @@ RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
-PATCHES=( "${FILESDIR}/${PN}-18.04.0-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
+	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
 	kde5_src_test
 }