Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-m17n/
Date: Thu, 20 Jul 2017 15:04:34
Message-Id: 1500563051.ce2019556de4202ba5b97672f27ea7fc55475f72.hattya@gentoo
1 commit: ce2019556de4202ba5b97672f27ea7fc55475f72
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 20 15:02:37 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 20 15:04:11 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce201955
7
8 app-i18n/ibus-m17n: add gtk3 USE flag
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild | 10 +++++++---
13 app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild | 10 +++++++---
14 app-i18n/ibus-m17n/metadata.xml | 3 +++
15 3 files changed, 17 insertions(+), 6 deletions(-)
16
17 diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
18 index 2b578de899a..aad4f296f04 100644
19 --- a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
20 +++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
21 @@ -10,11 +10,14 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
22 LICENSE="GPL-2"
23 SLOT="0"
24 KEYWORDS="amd64 x86"
25 -IUSE="gtk nls"
26 +IUSE="gtk gtk3 nls"
27
28 CDEPEND="app-i18n/ibus
29 dev-libs/m17n-lib
30 - gtk? ( x11-libs/gtk+:2 )
31 + gtk? (
32 + !gtk3? ( x11-libs/gtk+:2 )
33 + gtk3? ( x11-libs/gtk+:3 )
34 + )
35 nls? ( virtual/libintl )"
36 RDEPEND="${CDEPEND}
37 || (
38 @@ -25,9 +28,10 @@ DEPEND="${CDEPEND}
39 dev-util/intltool
40 sys-devel/gettext
41 virtual/pkgconfig"
42 +REQUIRED_USE="gtk3? ( gtk )"
43
44 src_configure() {
45 econf \
46 $(use_enable nls) \
47 - $(use_with gtk gtk 2.0)
48 + $(use_with gtk gtk $(usex !gtk3 2.0 3.0))
49 }
50
51 diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
52 index 6bfbff46dbf..e3d0ab7586c 100644
53 --- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
54 +++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
55 @@ -10,11 +10,14 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
56 LICENSE="GPL-2"
57 SLOT="0"
58 KEYWORDS="~amd64 ~x86"
59 -IUSE="gtk nls"
60 +IUSE="gtk gtk3 nls"
61
62 CDEPEND="app-i18n/ibus
63 dev-libs/m17n-lib
64 - gtk? ( x11-libs/gtk+:2 )
65 + gtk? (
66 + !gtk3? ( x11-libs/gtk+:2 )
67 + gtk3? ( x11-libs/gtk+:3 )
68 + )
69 nls? ( virtual/libintl )"
70 RDEPEND="${CDEPEND}
71 || (
72 @@ -25,9 +28,10 @@ DEPEND="${CDEPEND}
73 dev-util/intltool
74 sys-devel/gettext
75 virtual/pkgconfig"
76 +REQUIRED_USE="gtk3? ( gtk )"
77
78 src_configure() {
79 econf \
80 $(use_enable nls) \
81 - $(use_with gtk gtk 2.0)
82 + $(use_with gtk gtk $(usex !gtk3 2.0 3.0))
83 }
84
85 diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
86 index cd556d26d1a..b9d88c40b20 100644
87 --- a/app-i18n/ibus-m17n/metadata.xml
88 +++ b/app-i18n/ibus-m17n/metadata.xml
89 @@ -17,5 +17,8 @@
90 <flag name="gtk">
91 Build the preference interfaces, based on <pkg>x11-libs/gtk+</pkg>:2
92 </flag>
93 + <flag name="gtk3">
94 + Build the preference interfaces, based on <pkg>x11-libs/gtk+</pkg>:3
95 + </flag>
96 </use>
97 </pkgmetadata>