gentoo resync : 14.05.2020

5 files changed, 311 insertions, 11 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index b3ab0913bb7f..5d8e2835d118 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,13 @@
 AUX plasma-desktop-5.17.5-revert-activities-jagginess.patch 1214 BLAKE2B 3d6517a6020639a5f0f7720d22e45c985a95553bb62a2d365d219ff05d18eed5c105c17c54b21eb114e85b2012dead46f1e928d1082b7b1387d813e75144f775 SHA512 c7910def604e6a6cf23d11d50c33f585d67a7e539cdfc2d4a81449e46eb4e823fe63e484f5cdb535f4fdec0fcc6be805ede703b74b22b88f4dc941593b6f4fa3
+AUX plasma-desktop-5.18.4.1-synaptics-header.patch 821 BLAKE2B 96cbad72391a1d361b009b25362980c8b0ec3e583368ffc4d599b73289e6e6228afc65d08236d704af8878c6b21a9bd1a15f3fad952855d88bc660f73feb9bf4 SHA512 02cf404a9bce33e689f40597d35afb1ca3625e7caaf775a50ed70217bd8034f842001a16e1084bf81bba9dff0361a4e57a6e08853beb7d90216bf1519d305516
+AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf5158c33ad58e275a926ea441a90008f8e2a7fc1c175e2b38e72f06d754b131a47f1cf5ef3d2268630816b1a60090c9bab44198ff37b0 SHA512 f81e84c56ddd5591ba59beb1d12654403bef5fd1bb6c51f8d6c404e36ca47cc7fa82a575892627be8aed465253830d3e76c2c89ed6db8ea858b9d705df08184b
+AUX plasma-desktop-5.18.5-override-include-dirs.patch 3334 BLAKE2B f715aba5b555d7adec73748233398337b18e70e3ae069ee0ca48b3ea661ba386ef81d5f34f851b6b6b68e945ee6ea200f17ed58ac057b603a8460c53bb8f1c9c SHA512 3aa585f2c51d7efd77503fbb49cb516d4d92ece3f8c163edb96c8e45a7f8e64d55e6c7c3956127841b4c48126857308b950fc06f9ac52821463fa04322c50822
+DIST evdev-properties.h-425ed601 3662 BLAKE2B e538376a81fe519eb43c739a842111e449643deef968398181e948e9cbc0d71b280ae35386c1076f06e0d315ec1a0fbda883cf43d41e752564e1e9d921285189 SHA512 7a7425787d94c7d7f22c0870976af523c82d2b4c2c14dfa56e969a23a02bf97ed73b268790d4e59bc575a094e9d90c0c90d84af116f02583a360d1c70d6dbcd7
+DIST libinput-properties.h-e52daf20 9255 BLAKE2B 05e002dec267e5019ea37fbbb862f0786c671773021f246d0e925b7850ee063c64fcad216db0d03f5561848852bfcf699b197e42e4d4ae8a0d1a9c9c213cad52 SHA512 20e00e7c8df2126dbabca969d5a5df2c5aff9d4b7d5d08a8676d9b2ff90cc422c979e253f6f0d98f1df55c66de98bfd9bb81645c223b1fdf5dfc044912d8216e
 DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
-DIST plasma-desktop-5.18.4.1.tar.xz 9411912 BLAKE2B b34792e3418230fc7a6beabfe595c6873e61e884f7ac8204444ce5785d7e048f2eb145949240ff20a2d8821a3cee4afe4a4200e7b88b015e5906a6f9bbb8f1ef SHA512 4cac140ddca8ce57a6e27cfac2946824db40a0adf9f0a9b6fe6079f9b899f4b145941803d4a0f1c575a27a8c76d6a7e889c3218287a126efedd9e722fa9d7089
+DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
+DIST synaptics-properties.h-383355fa 5932 BLAKE2B 5108697e861f0de8c6fdafa731f819411e09881801c32fc1d3f5d8a2cf360655fd551dd3ec858195c056d6666863947441cebea6f119f37e2cb65321c85cc902 SHA512 91065cbdc64da46dfa19ef93e939bf4e4773ecf740a228551e4bc38dc83dd84f83db6f2dfd1f1be2108dd54416752285298dfe5a447a28891ca194463d9354ae
+DIST xserver-properties.h-d511a301 9515 BLAKE2B ff660a01266ef52ca01189040cec71efabeb683604621dc435e0a65de58919fea92ad9e14839c538132df74aaa395d1f63e75120d8361420c20072b7ba0152fc SHA512 916c05e13798a538b7dc9c46d77764aa65c582d6c513702ad18f10560eb71605f1bafd08a4eff6c86adff51d5a007185b2cdc71a07af138c82130f1fd9c28f2d
 EBUILD plasma-desktop-5.17.5-r1.ebuild 4071 BLAKE2B 8710be965b9fa342a9c8d4331181cf4ccb1f258fccff4cd19ce2b17a6e0c79a3ef3ef79a5bee41e11ba19a9334c800c57723b18089211111ca5879bc0d2b216a SHA512 669dd8f639d8b7c36b4cd45268972935c18dfe8a274c532100573d65d20d714dedce1c2d4879a543dfc1534827e1a9ab1d1ecca39c7036ef25d4f753ebfd838a
-EBUILD plasma-desktop-5.18.4.1-r1.ebuild 4047 BLAKE2B c5f897327e10cdace81dab521d929c57fe2d0f42e89dd12f646a8503245e852620dd470a0965f98d12bc535e15732deb0727b895140fa10086c7f1401254f1a1 SHA512 3843fb3d925d8497fec7bc2e570142f7ee1feae1b07ab2bdbd8ef00f7e6ff799ec8fdfd65d1588854677a14eb5c925016f20d02780fe2d55912bdc82ec45b3e3
+EBUILD plasma-desktop-5.18.5.ebuild 5597 BLAKE2B 94551323951fba190ecf92d133d9c06f8abd22aa5d552dc97034ce27e2330d6137643ed8fa9fea0421077dbe52754c6c91b74260e9d5960c8bbe5f802fb5e8c0 SHA512 0cc26d88f21646abf3858865def961b8c43a0d9075bbcebef408d24c84d49b9d3184ec83f7f795af42eae0ea390ccf4886241a26af6ef6f6323d1c00b0108259
 MISC metadata.xml 514 BLAKE2B 31b846e6675005788e3041e22365385edcb4ac253db87f15a048b7d3a0cbe61494ce7a3e495444ef9c9bd3455e566d7a89664a8969041b22a3474eb4e99d1397 SHA512 a14dbd159795a2982ba81c0856f2f058664b807a3c26afe9371e4be3ccb5bb0b8a48c086fd580549c35006821304df4c22ad3a1c7e43d5fda4a37688044fb99d
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
new file mode 100644
index 000000000000..181e89e7db38
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
@@ -0,0 +1,26 @@
+From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 24 Apr 2020 18:55:30 +0200
+Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
+ dir from include
+
+---
+ kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+index d2f41d70b..3eb3171ee 100644
+--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
++++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+@@ -53,7 +53,7 @@
+ 
+ #include <stddef.h>
+ #include <limits.h>
+-#include <xorg/synaptics-properties.h>
++#include <synaptics-properties.h>
+ 
+ #define SYN_MAX_BUTTONS 12
+ 
+-- 
+2.26.2
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
new file mode 100644
index 000000000000..115d52423fbf
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
@@ -0,0 +1,130 @@
+From 82e7a6b68d81ca2be0fdc3fc13cd5ca5f5e03e81 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 7 May 2020 16:18:13 +0200
+Subject: [PATCH] Add FindXorgServer.cmake and use it for touchpad KCM
+
+Summary:
+x11 backend of the touchpad KCM uses xserver-properties.h that is part of
+xorg-server package. As XORG_INCLUDE_DIRS seems to be empty, so far, it was
+relying on Synaptics_INCLUDE_DIRS implicitly and worked only if the header
+happened to be in the same directory as Synaptics' which is the case most of
+the time.
+
+FindXorgServer.cmake is just a copy of FindXorgLibinput, adapted accordingly.
+
+Test Plan:
+Pointed Synaptics_INCLUDE_DIRS somewhere else than /usr/include/xorg and build
+succeeded.
+
+Reviewers: #plasma, zzag
+
+Reviewed By: #plasma, zzag
+
+Subscribers: broulik, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D29514
+---
+ CMakeLists.txt                     |  4 +++
+ cmake/modules/FindXorgServer.cmake | 45 ++++++++++++++++++++++++++++++
+ kcms/CMakeLists.txt                |  2 +-
+ kcms/touchpad/src/backends/x11.cmake   |  2 +-
+ 4 files changed, 51 insertions(+), 2 deletions(-)
+ create mode 100644 cmake/modules/FindXorgServer.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fbdd95433..64e8bbd60 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,6 +133,10 @@ find_package(Synaptics)
+ set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL)
+ add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries needed for touchpad KCM")
+ 
++find_package(XorgServer)
++set_package_properties(XorgServer PROPERTIES TYPE OPTIONAL)
++add_feature_info("XorgServer" XORGSERVER_FOUND "XServer header needed for touchpad KCM (X11 backend)")
++
+ find_package(XorgLibinput)
+ set_package_properties(XorgLibinput PROPERTIES TYPE OPTIONAL)
+ add_feature_info("XorgLibinput" XORGLIBINPUT_FOUND "Libinput driver headers needed for mouse and touchpad KCM")
+diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
+new file mode 100644
+index 000000000..5248c6d25
+--- /dev/null
++++ b/cmake/modules/FindXorgServer.cmake
+@@ -0,0 +1,45 @@
++# - Find xorg-server's headers.
++# This module defines the following variables:
++#
++#  XORGSERVER_FOUND        - true if xserver was found
++#  XORGSERVER_INCLUDE_DIRS - include path for xserver
++#  There are no libraries, just a header file
++#
++# Copyright (c) 2020 Andreas Sturmlechner <asturm@gentoo.org>
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 3. Neither the name of the University nor the names of its contributors
++#    may be used to endorse or promote products derived from this software
++#    without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++# SUCH DAMAGE.
++
++find_package(PkgConfig)
++pkg_check_modules(PC_XORGSERVER xorg-server)
++
++find_path(XORGSERVER_INCLUDE_DIRS
++    NAMES xserver-properties.h
++    HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
++
++mark_as_advanced(XORGSERVER_INCLUDE_DIRS)
+diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
+index 7ab966e8e..ce730f537 100644
+--- a/kcms/CMakeLists.txt
++++ b/kcms/CMakeLists.txt
+@@ -58,7 +58,7 @@ if(X11_Xcursor_FOUND)
+     add_subdirectory(cursortheme)
+ endif()
+ 
+-if (SYNAPTICS_FOUND AND X11_Xinput_FOUND)
++if (XORGSERVER_FOUND AND SYNAPTICS_FOUND AND X11_Xinput_FOUND)
+     add_subdirectory(touchpad)
+ endif()
+ 
+diff --git a/kcms/touchpad/src/backends/x11.cmake b/kcms/touchpad/src/backends/x11.cmake
+index 9248eff7c..8a584e939 100644
+--- a/kcms/touchpad/src/backends/x11.cmake
++++ b/kcms/touchpad/src/backends/x11.cmake
+@@ -11,7 +11,7 @@ endif()
+ include_directories(${X11_Xinput_INCLUDE_PATH}
+                     ${X11_X11_INCLUDE_PATH}
+                     ${Synaptics_INCLUDE_DIRS}
+-                    ${XORG_INCLUDE_DIRS}
++                    ${XORGSERVER_INCLUDE_DIRS}
+ )
+ 
+ SET(backend_SRCS
+-- 
+2.26.2
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
new file mode 100644
index 000000000000..ffbf2b644292
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
@@ -0,0 +1,108 @@
+From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 6 Apr 2020 00:41:07 +0200
+Subject: [PATCH] cmake modules: Allow include dir overrides for various input
+ drivers
+
+FindEvdev - evdev-properties.h
+FindSynaptics - synaptics-properties.h
+FindXorgLibinput - libinput-properties.h
+FindXorgServer - xserver-properties.h
+---
+ cmake/modules/FindEvdev.cmake        | 4 ++++
+ cmake/modules/FindSynaptics.cmake    | 4 ++++
+ cmake/modules/FindXorgLibinput.cmake | 4 ++++
+ cmake/modules/FindXorgServer.cmake   | 4 ++++
+ 4 files changed, 16 insertions(+)
+
+diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
+index 153128a90..c19c31a96 100644
+--- a/cmake/modules/FindEvdev.cmake
++++ b/cmake/modules/FindEvdev.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++if(NOT Evdev_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1)
+ 
+@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS
+     HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR}
+ )
+ 
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
+ 
+diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
+index fb5f9bc3e..eb56965e0 100644
+--- a/cmake/modules/FindSynaptics.cmake
++++ b/cmake/modules/FindSynaptics.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++if(NOT Synaptics_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
+ 
+@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
+     HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
+ )
+ 
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
+ 
+diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
+index 1550751ae..5b7af5e79 100644
+--- a/cmake/modules/FindXorgLibinput.cmake
++++ b/cmake/modules/FindXorgLibinput.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++if(NOT XORGLIBINPUT_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_XORGLIBINPUT xorg-libinput)
+ 
+@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS
+     HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR}
+ )
+ 
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
+ 
+diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
+index 5248c6d25..9de16dba0 100644
+--- a/cmake/modules/FindXorgServer.cmake
++++ b/cmake/modules/FindXorgServer.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++if(NOT XORGSERVER_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_XORGSERVER xorg-server)
+ 
+@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS
+     HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
+ )
+ 
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
+ 
+-- 
+2.26.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
index 59270a36de40..2560f8c7928d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
@@ -13,10 +13,24 @@ inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma desktop"
 
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
+SHA_EVDEV="425ed601"
+SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
+XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
+SRC_URI+="
+	${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
+	${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+	${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
+	${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
+"
+
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
+IUSE="+fontconfig ibus scim +semantic-desktop"
 
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -93,16 +107,11 @@ COMMON_DEPEND="
 	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	x11-base/xorg-proto
 	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
 "
 RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
@@ -117,15 +126,35 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/kdeplasma-addons-5.15.80
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
+	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
+	"${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
+)
+
+src_unpack() {
+	kde.org_src_unpack
+	mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
+	cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
+		"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
+	cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
+		"${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+	cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+		"${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
+	cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+		"${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fontconfig Fontconfig)
+		-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
+		-DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
 		$(cmake_use_find_package ibus IBus)
-		$(cmake_use_find_package mouse Evdev)
-		$(cmake_use_find_package mouse XorgLibinput)
 		$(cmake_use_find_package scim SCIM)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package touchpad Synaptics)
 	)
 
 	ecm_src_configure