Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

4 files changed, 72 insertions, 2 deletions

diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index f35a4d8895a9..02dde5805436 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,3 +1,6 @@
+AUX libqaccessibilityclient-0.3.0-tests.patch 1117 BLAKE2B 0382b50d8244249b4b1e7cf1efd3ad301648341ae66496296d7f216dae79a7acd6641fe9d69ecd94f0e6124b92c7aed7915dcbd9f8bd217c620125437a7ecad0 SHA512 becaf6dd528f461370ec474e98aac8da33ee6803096d33137f5ea9284b65f4db2413553566def1c0615bcc920c885dc459c425afa105af02522da67f5a25859f
+DIST libqaccessibilityclient-0.3.0.tar.xz 104784 BLAKE2B a472cd2287340fbe5e5e4404fcdb4d1b6a28f39bf61117156f2e38622f10e0913f4c3818a9f7ff682eb195905e837c589d396df5fc8637a511d6e293e4b59a6a SHA512 d3c28a2dcb308e3248276c5b1ab822decb0c32afce8636ce30941320381431a8d7e064ff1451b14e64cbc83d03e3693d645d1739e64830bacefcd7fa68b0d2e1
 DIST libqaccessibilityclient-0.4.0.tar.xz 105700 BLAKE2B 30c2ebcae046480536fa2c193130b3e0e99bfeeacb40ee9fae22574d9a8ff84da4fc5d746e1ba2f369f99c9d6227fea65ef55628aeff37b455cdf730708608c9 SHA512 bd2e0d29605f222084f86664a52488a5340e0ac16433fd65c8ada195e4cb5988ebac357a991ea8ebc5af22f81825212ce07209939ad5e4a00a9daeed37b56ffb
-EBUILD libqaccessibilityclient-0.4.0.ebuild 629 BLAKE2B 1bf60e020ff19695eb84f7c8794c819ee45f302e1bcdec93334f2a38ca2bc3ae6feda9c41ea80d273b81a77c276f34a48baac3e07df5400a8bdca2ec9232dc48 SHA512 5bc23325808ea36235f8aecb8e2f4eb941f8e9315561aa68dcb3c5fab226a458669a7eb25d019a833c1f2b8ba9f1cee407b9160056189d7e5beeda32dcb06ebd
+EBUILD libqaccessibilityclient-0.3.0.ebuild 670 BLAKE2B ec6c4e9af062116a47addb5cb595a52d23f0c7e0e20dcdd2c752b848761f8f6ad57a38da3501c7a0cfd122386507ef662ef7ac7efe5d090f58f32b5b1e6eb341 SHA512 864d17e0172c08d0026f3a8f177d53149f4bc12f781e232518fd106cf474358c312bd822f6ecc7002d9a7d69ddaee63f80473f1ebeb6863e16945bd924fde2bf
+EBUILD libqaccessibilityclient-0.4.0.ebuild 631 BLAKE2B 3724c327cf59a21cecfc9c099e36ba48d41f6890f9e3a5740a13f1eaa168e9e099845e682e5442347b95462882a0317f3882bb31b28dfeb83409e692346fe046 SHA512 1bb9dd5226df0ceb284241748a8d96c2047553d8febdec84eda35f9299dc06bc254d73f101ee2aaefa3016790397ba128eed9b4849673800ceda0450ebc83af7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch
new file mode 100644
index 000000000000..1ec1317ea80f
--- /dev/null
+++ b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.3.0-tests.patch
@@ -0,0 +1,37 @@
+From a85bce953b8a231cfe9b47d9f3fd80f6149f51f2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Nov 2018 12:13:28 +0100
+Subject: [PATCH] Use standard BUILD_TESTING instead of BUILD_TESTS
+
+Add tests subdir conditionally.
+---
+ CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73bb3cb..13531cc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@ include_directories(
+ find_package(Qt5Widgets QUIET)
+ find_package(Qt5DBus QUIET)
+ find_package(Qt5Test QUIET)
+-set(BUILD_TESTS ${Qt5Test_FOUND})
++set(BUILD_TESTING ${Qt5Test_FOUND})
+ 
+ add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5DBus_DEFINITIONS})
+ include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
+@@ -70,7 +70,9 @@ if(APPLE)
+ endif(APPLE)
+ 
+ add_subdirectory(src)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++   add_subdirectory(tests)
++endif()
+ add_subdirectory(examples)
+ 
+ # we need the absolute directories where stuff will be installed too
+-- 
+2.19.1
+
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild
new file mode 100644
index 000000000000..37ae0d8ab71f
--- /dev/null
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ECM_KDEINSTALLDIRS="false"
+KDE_TEST="optional"
+KDE_EXAMPLES="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for writing accessibility clients such as screen readers"
+HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+# tests require DBus
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
index 244647903c51..7cf95fcd3bdb 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityc
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="