1 |
commit: 5d57ac53fac2562b9ec8dcb5eee9853705892a60 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 19 16:28:32 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 19 17:03:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d57ac53 |
7 |
|
8 |
kde-misc/kdeconnect: Drop USE sms, built unconditionally, adapt DEPENDs |
9 |
|
10 |
USE mousepad -> X, input plugins support is enabled per Wayland/X separately. |
11 |
|
12 |
Upstream commit 796953d853edc5c9bd5c1f6b2bf5466a0b721b63 |
13 |
|
14 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
kde-misc/kdeconnect/kdeconnect-9999.ebuild | 14 +++++++------- |
18 |
kde-misc/kdeconnect/metadata.xml | 5 ++--- |
19 |
2 files changed, 9 insertions(+), 10 deletions(-) |
20 |
|
21 |
diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild |
22 |
index 19b5f7d5c9..8fa4e101d9 100644 |
23 |
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild |
24 |
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild |
25 |
@@ -21,7 +21,7 @@ HOMEPAGE="https://kde.org/ https://community.kde.org/KDEConnect" |
26 |
|
27 |
LICENSE="GPL-2+" |
28 |
SLOT="5" |
29 |
-IUSE="bluetooth mousepad pulseaudio sms wayland" |
30 |
+IUSE="bluetooth pulseaudio wayland X" |
31 |
|
32 |
DEPEND=" |
33 |
>=app-crypt/qca-2.1.0:2[qt5(+),ssl] |
34 |
@@ -31,7 +31,6 @@ DEPEND=" |
35 |
>=dev-qt/qtmultimedia-${QTMIN}:5 |
36 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
37 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
38 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
39 |
>=kde-frameworks/kcmutils-${KFMIN}:5 |
40 |
>=kde-frameworks/kconfig-${KFMIN}:5 |
41 |
>=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
42 |
@@ -42,24 +41,26 @@ DEPEND=" |
43 |
>=kde-frameworks/kio-${KFMIN}:5 |
44 |
>=kde-frameworks/kirigami-${KFMIN}:5 |
45 |
>=kde-frameworks/knotifications-${KFMIN}:5 |
46 |
+ >=kde-frameworks/kpeople-${KFMIN}:5 |
47 |
>=kde-frameworks/kservice-${KFMIN}:5 |
48 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
49 |
>=kde-frameworks/plasma-${KFMIN}:5 |
50 |
bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 ) |
51 |
- mousepad? ( |
52 |
+ X? ( |
53 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
54 |
x11-libs/libfakekey |
55 |
x11-libs/libX11 |
56 |
x11-libs/libXtst |
57 |
) |
58 |
pulseaudio? ( media-libs/pulseaudio-qt ) |
59 |
- sms? ( >=kde-frameworks/kpeople-${KFMIN}:5 ) |
60 |
wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) |
61 |
" |
62 |
RDEPEND="${DEPEND} |
63 |
+ dev-libs/kpeoplevcard |
64 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
65 |
>=dev-qt/qtquickcontrols2-${QTMIN}:5 |
66 |
>=kde-frameworks/kdeclarative-${KFMIN}:5 |
67 |
net-fs/sshfs |
68 |
- sms? ( dev-libs/kpeoplevcard ) |
69 |
" |
70 |
|
71 |
RESTRICT+=" test" |
72 |
@@ -67,10 +68,9 @@ RESTRICT+=" test" |
73 |
src_configure() { |
74 |
local mycmakeargs=( |
75 |
-DBLUETOOTH_ENABLED=$(usex bluetooth) |
76 |
- $(cmake_use_find_package mousepad LibFakeKey) |
77 |
$(cmake_use_find_package pulseaudio KF5PulseAudioQt) |
78 |
- -DSMSAPP_ENABLED=$(usex sms) |
79 |
$(cmake_use_find_package wayland KF5Wayland) |
80 |
+ $(cmake_use_find_package X LibFakeKey) |
81 |
) |
82 |
|
83 |
ecm_src_configure |
84 |
|
85 |
diff --git a/kde-misc/kdeconnect/metadata.xml b/kde-misc/kdeconnect/metadata.xml |
86 |
index c45c927452..b3cf4c00a4 100644 |
87 |
--- a/kde-misc/kdeconnect/metadata.xml |
88 |
+++ b/kde-misc/kdeconnect/metadata.xml |
89 |
@@ -6,9 +6,8 @@ |
90 |
<name>Gentoo KDE Project</name> |
91 |
</maintainer> |
92 |
<use> |
93 |
- <flag name="mousepad">Enable remote mousepad plugin using <pkg>x11-libs/libfakekey</pkg></flag> |
94 |
<flag name="pulseaudio">Enable system volume control plugin using <pkg>media-sound/pulseaudio</pkg></flag> |
95 |
- <flag name="sms">Enable SMS support using <pkg>kde-frameworks/kpeople</pkg></flag> |
96 |
- <flag name="wayland">Enable kwin_wayland support for mousepad plugin using <pkg>kde-frameworks/kwayland</pkg></flag> |
97 |
+ <flag name="wayland">Enable remote input mousepad plugin using <pkg>kde-frameworks/kwayland</pkg></flag> |
98 |
+ <flag name="X">Enable remote input mousepad plugin using <pkg>x11-libs/libfakekey</pkg></flag> |
99 |
</use> |
100 |
</pkgmetadata> |