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-unikey/
Date: Sat, 12 Aug 2017 14:39:19
Message-Id: 1502548732.1bc7cbe866535252e1e8a232bb274011d0db3c30.hattya@gentoo
1 commit: 1bc7cbe866535252e1e8a232bb274011d0db3c30
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 12 14:36:11 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 12 14:38:52 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc7cbe8
7
8 app-i18n/ibus-unikey: switch to gtk2 USE flag
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild | 11 +++++++----
13 app-i18n/ibus-unikey/metadata.xml | 2 +-
14 2 files changed, 8 insertions(+), 5 deletions(-)
15
16 diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
17 index 88450838275..63c9b7f5815 100644
18 --- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
19 +++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
20 @@ -11,12 +11,15 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
21 LICENSE="GPL-3"
22 SLOT="0"
23 KEYWORDS="~amd64 ~x86"
24 -IUSE="gtk3 nls"
25 +IUSE="+gtk gtk2 nls"
26 +REQUIRED_USE="gtk2? ( gtk )"
27
28 RDEPEND="app-i18n/ibus
29 x11-libs/libX11
30 - gtk3? ( x11-libs/gtk+:3 )
31 - !gtk3? ( x11-libs/gtk+:2 )
32 + gtk? (
33 + gtk2? ( x11-libs/gtk+:2 )
34 + !gtk2? ( x11-libs/gtk+:3 )
35 + )
36 nls? ( virtual/libintl )"
37 DEPEND="${RDEPEND}
38 virtual/pkgconfig
39 @@ -28,5 +31,5 @@ PATCHES=( "${DISTDIR}"/${P}-gcc6.patch )
40 src_configure() {
41 econf \
42 $(use_enable nls) \
43 - --with-gtk-version=$(usex gtk3 3 2)
44 + --with-gtk-version=$(usex gtk2 3 2)
45 }
46
47 diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
48 index cf5b6f5768b..880cfde265e 100644
49 --- a/app-i18n/ibus-unikey/metadata.xml
50 +++ b/app-i18n/ibus-unikey/metadata.xml
51 @@ -10,7 +10,7 @@
52 UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
53 </longdescription>
54 <use>
55 - <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
56 + <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag>
57 </use>
58 <upstream>
59 <remote-id type="github">mrlequoctuan/ibus-unikey</remote-id>