Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-rime/
Date: Fri, 02 Oct 2020 17:45:38
Message-Id: 1601660709.c73df141c5e99ee8d4cc02fce3a9c63ccc1cae44.floppym@gentoo
1 commit: c73df141c5e99ee8d4cc02fce3a9c63ccc1cae44
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Sat Sep 26 02: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=c73df141
7
8 app-i18n/fcitx-rime: 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/fcitx-rime/fcitx-rime-0.3.2.ebuild | 11 ++++++-----
17 app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild | 16 +++++++++++-----
18 2 files changed, 17 insertions(+), 10 deletions(-)
19
20 diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
21 index 273db4b0c27..e50bc4d56d1 100644
22 --- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
23 +++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
24 @@ -1,7 +1,7 @@
25 # Copyright 2012-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 xdg-utils
32
33 @@ -24,12 +24,13 @@ SLOT="4"
34 KEYWORDS="amd64 ppc ppc64 x86"
35 IUSE=""
36
37 -RDEPEND=">=app-i18n/fcitx-4.2.9:4
38 +BDEPEND=">=app-i18n/fcitx-4.2.9:4
39 + virtual/pkgconfig"
40 +DEPEND=">=app-i18n/fcitx-4.2.9:4
41 >=app-i18n/librime-1.0.0:=
42 - app-i18n/rime-data
43 virtual/libintl"
44 -DEPEND="${RDEPEND}
45 - virtual/pkgconfig"
46 +RDEPEND="${DEPEND}
47 + app-i18n/rime-data"
48
49 DOCS=()
50
51
52 diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
53 index 382c68ff750..4be868b1075 100644
54 --- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
55 +++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
56 @@ -1,7 +1,7 @@
57 # Copyright 2012-2020 Gentoo Authors
58 # Distributed under the terms of the GNU General Public License v2
59
60 -EAPI="6"
61 +EAPI="7"
62
63 inherit cmake-utils xdg-utils
64
65 @@ -24,9 +24,14 @@ SLOT="4"
66 KEYWORDS=""
67 IUSE="+configuration_tool"
68
69 -RDEPEND=">=app-i18n/fcitx-4.2.9:4
70 +BDEPEND=">=app-i18n/fcitx-4.2.9:4
71 + virtual/pkgconfig
72 + configuration_tool? (
73 + dev-qt/qtcore:5
74 + dev-qt/qtwidgets:5
75 + )"
76 +DEPEND=">=app-i18n/fcitx-4.2.9:4
77 >=app-i18n/librime-1.0.0:=
78 - app-i18n/rime-data
79 virtual/libintl
80 configuration_tool? (
81 >=app-i18n/fcitx-qt5-1.1:4
82 @@ -34,8 +39,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
83 dev-qt/qtgui:5
84 dev-qt/qtwidgets:5
85 )"
86 -DEPEND="${RDEPEND}
87 - virtual/pkgconfig
88 +RDEPEND="${DEPEND}
89 + app-i18n/rime-data"
90 +DEPEND="${DEPEND}
91 configuration_tool? ( dev-qt/qtconcurrent:5 )"
92
93 DOCS=()