1 |
commit: 467eca20025720901b9ee2aa074feb4958c0ba03 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Sat Sep 26 03:00:00 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 2 17:45:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467eca20 |
7 |
|
8 |
app-i18n/kcm-fcitx: Use EAPI="7". |
9 |
|
10 |
moc (dev-qt/qtcore:5) called by build system. |
11 |
uic (dev-qt/qtwidgets:5) called by build system. |
12 |
|
13 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
15 |
|
16 |
app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild | 19 +++++++++++-------- |
17 |
app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild | 19 +++++++++++-------- |
18 |
2 files changed, 22 insertions(+), 16 deletions(-) |
19 |
|
20 |
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild |
21 |
index 7204e2277fe..c8f903b0e90 100644 |
22 |
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild |
23 |
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild |
24 |
@@ -1,7 +1,7 @@ |
25 |
# Copyright 2013-2020 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
-EAPI="6" |
29 |
+EAPI="7" |
30 |
|
31 |
inherit cmake-utils |
32 |
|
33 |
@@ -24,7 +24,13 @@ SLOT="4-plasma5" |
34 |
KEYWORDS="amd64 x86" |
35 |
IUSE="" |
36 |
|
37 |
-RDEPEND=">=app-i18n/fcitx-4.2.9:4 |
38 |
+BDEPEND=">=app-i18n/fcitx-4.2.9:4 |
39 |
+ dev-qt/qtcore:5 |
40 |
+ dev-qt/qtwidgets:5 |
41 |
+ kde-frameworks/extra-cmake-modules:5 |
42 |
+ sys-devel/gettext |
43 |
+ virtual/pkgconfig" |
44 |
+DEPEND=">=app-i18n/fcitx-4.2.9:4 |
45 |
>=app-i18n/fcitx-qt5-1.1:4 |
46 |
dev-qt/qtcore:5 |
47 |
dev-qt/qtdbus:5 |
48 |
@@ -40,12 +46,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 |
49 |
kde-frameworks/kwidgetsaddons:5 |
50 |
virtual/libintl |
51 |
x11-libs/libX11 |
52 |
- x11-libs/libxkbfile |
53 |
- !${CATEGORY}/${PN}:4[-minimal(-)]" |
54 |
-DEPEND="${RDEPEND} |
55 |
- kde-frameworks/extra-cmake-modules:5 |
56 |
- sys-devel/gettext |
57 |
- virtual/pkgconfig" |
58 |
+ x11-libs/libxkbfile" |
59 |
+RDEPEND="${DEPEND} |
60 |
+ !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]" |
61 |
|
62 |
src_configure() { |
63 |
local mycmakeargs=( |
64 |
|
65 |
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild |
66 |
index bed2c38530a..5edbbf830dd 100644 |
67 |
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild |
68 |
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild |
69 |
@@ -1,7 +1,7 @@ |
70 |
# Copyright 2013-2020 Gentoo Authors |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
|
73 |
-EAPI="6" |
74 |
+EAPI="7" |
75 |
|
76 |
inherit cmake-utils |
77 |
|
78 |
@@ -24,7 +24,13 @@ SLOT="4-plasma5" |
79 |
KEYWORDS="" |
80 |
IUSE="" |
81 |
|
82 |
-RDEPEND=">=app-i18n/fcitx-4.2.9:4 |
83 |
+BDEPEND=">=app-i18n/fcitx-4.2.9:4 |
84 |
+ dev-qt/qtcore:5 |
85 |
+ dev-qt/qtwidgets:5 |
86 |
+ kde-frameworks/extra-cmake-modules:5 |
87 |
+ sys-devel/gettext |
88 |
+ virtual/pkgconfig" |
89 |
+DEPEND=">=app-i18n/fcitx-4.2.9:4 |
90 |
>=app-i18n/fcitx-qt5-1.1:4 |
91 |
dev-qt/qtcore:5 |
92 |
dev-qt/qtdbus:5 |
93 |
@@ -40,12 +46,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 |
94 |
kde-frameworks/kwidgetsaddons:5 |
95 |
virtual/libintl |
96 |
x11-libs/libX11 |
97 |
- x11-libs/libxkbfile |
98 |
- !${CATEGORY}/${PN}:4[-minimal(-)]" |
99 |
-DEPEND="${RDEPEND} |
100 |
- kde-frameworks/extra-cmake-modules:5 |
101 |
- sys-devel/gettext |
102 |
- virtual/pkgconfig" |
103 |
+ x11-libs/libxkbfile" |
104 |
+RDEPEND="${DEPEND} |
105 |
+ !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]" |
106 |
|
107 |
src_configure() { |
108 |
local mycmakeargs=( |