Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/
Date: Fri, 10 Mar 2017 12:12:03
Message-Id: 1489147914.e7e810cb4b83b97040c7292aacbc576749bba81a.dlan@gentoo
1 commit: e7e810cb4b83b97040c7292aacbc576749bba81a
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 10 12:08:47 2017 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 10 12:11:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e810cb
7
8 app-i18n/ibus: version bump, 1.5.15
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.2
11
12 app-i18n/ibus/Manifest | 1 +
13 app-i18n/ibus/ibus-1.5.15.ebuild | 189 +++++++++++++++++++++++++++++++++++++++
14 2 files changed, 190 insertions(+)
15
16 diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
17 index f3afd72bb80..228c9d87414 100644
18 --- a/app-i18n/ibus/Manifest
19 +++ b/app-i18n/ibus/Manifest
20 @@ -3,6 +3,7 @@ DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b
21 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293
22 DIST ibus-1.5.13.tar.gz 2194054 SHA256 ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 SHA512 bffb3cecf984ec6e383a111b4e62506390f083476f59404e2e9b90251e6e06853d7f1dc06194456ab5064b5d375820510be1ab12ebd29b966d6a7f5b8aca07ab WHIRLPOOL bf28cc0f20942e7e253b2ae49d3112acad313c15bbaf5697f8319c13c90fa17c569b5bdd2bf8d83895361ec99f06a05317ef752d4e5fa0e1de06267e1347c463
23 DIST ibus-1.5.14.tar.gz 2214350 SHA256 a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c SHA512 2e86bc4e282265cfec6882fd132b36521bc2b64796e3d473668512d82ab8059c409ca1226d6b15d64ff4d46754cafa1585eddcc3aa89d58f9e9fdab0a825de0d WHIRLPOOL d2f7da33c73dded936ecf1c7f3edf1f5cdc70a8db70caec774246b1062d659fbb17495a1228cc7e126f99f52c068bc068d5ffb67d032dd6022c1f210eed0f230
24 +DIST ibus-1.5.15.tar.gz 2259352 SHA256 41f7baad6f3aac0cdfaebef674a8731ae47950f140edfbeefebaeed78c93e385 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e WHIRLPOOL ba40cfe9f398963ce6122d4beabdccaa94c6ac7a7463fe3cea3dc967b19a4702996fd132372a167a02956e1340b4278c61ea19ed781203db33a4651ddd3824b1
25 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
26 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
27 DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41
28
29 diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild
30 new file mode 100644
31 index 00000000000..35d71d4d9a7
32 --- /dev/null
33 +++ b/app-i18n/ibus/ibus-1.5.15.ebuild
34 @@ -0,0 +1,189 @@
35 +# Copyright 1999-2017 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=5
39 +
40 +PYTHON_COMPAT=( python2_7 )
41 +VALA_USE_DEPEND="vapigen"
42 +# Vapigen is needed for the vala binding
43 +# Valac is needed when building from git for the engine
44 +UPSTREAM_VER=
45 +
46 +inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx
47 +
48 +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
49 +HOMEPAGE="https://github.com/ibus/ibus/wiki"
50 +
51 +LICENSE="LGPL-2.1"
52 +SLOT="0"
53 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
54 +IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
55 +REQUIRED_USE="
56 + || ( gtk gtk3 X )
57 + deprecated? ( python )
58 + vala? ( introspection )
59 + python? (
60 + ${PYTHON_REQUIRED_USE}
61 + || ( deprecated ( gtk3 introspection ) ) )" #342903
62 +
63 +[[ -n ${UPSTREAM_VER} ]] && \
64 + UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
65 +
66 +SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
67 + ${UPSTRAM_PATCHSET_URI}"
68 +
69 +COMMON_DEPEND="
70 + >=dev-libs/glib-2.26:2
71 + gnome-base/librsvg:2
72 + sys-apps/dbus[X?]
73 + app-text/iso-codes
74 + >=gnome-base/dconf-0.13.4
75 + x11-libs/libnotify
76 + gconf? ( >=gnome-base/gconf-2.12:2 )
77 + gtk? ( x11-libs/gtk+:2 )
78 + gtk3? ( x11-libs/gtk+:3 )
79 + python? ( ${PYTHON_DEPS} )
80 + X? (
81 + x11-libs/libX11
82 + x11-libs/gtk+:2 )
83 + introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
84 + nls? ( virtual/libintl )
85 + wayland? ( dev-libs/wayland )"
86 +RDEPEND="${COMMON_DEPEND}
87 + x11-apps/setxkbmap
88 + python? (
89 + dev-python/pyxdg
90 + deprecated? (
91 + >=dev-python/dbus-python-0.83
92 + dev-python/pygobject:2
93 + dev-python/pygtk:2 )
94 + gtk3? (
95 + dev-python/pygobject:3
96 + x11-libs/gdk-pixbuf:2[introspection]
97 + x11-libs/pango[introspection]
98 + x11-libs/gtk+:3[introspection] )
99 + )"
100 +DEPEND="${COMMON_DEPEND}
101 + >=dev-lang/perl-5.8.1
102 + dev-util/gtk-doc-am
103 + dev-util/intltool
104 + virtual/pkgconfig
105 + nls? ( >=sys-devel/gettext-0.16.1 )
106 + vala? ( $(vala_depend) )"
107 +
108 +# stress test in bus/ fails
109 +# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
110 +RESTRICT="test"
111 +
112 +DOCS="AUTHORS ChangeLog NEWS README"
113 +
114 +DISABLE_AUTOFORMATTING="yes"
115 +DOC_CONTENTS="To use ibus, you should:
116 +1. Get input engines from sunrise overlay.
117 +Run \"emerge -s ibus-\" in your favorite terminal
118 +for a list of packages we already have.
119 +
120 +2. Setup ibus:
121 +$ ibus-setup
122 +
123 +3. Set the following in your user startup scripts
124 +such as .xinitrc, .xsession or .xprofile:
125 +
126 +export XMODIFIERS=\"@im=ibus\"
127 +export GTK_IM_MODULE=\"ibus\"
128 +export QT_IM_MODULE=\"xim\"
129 +ibus-daemon -d -x
130 +"
131 +
132 +pkg_setup() {
133 + use python && python-single-r1_pkg_setup
134 +}
135 +
136 +src_prepare() {
137 + # Upstream's patchset
138 + if [[ -n ${UPSTREAM_VER} ]]; then
139 + EPATCH_SUFFIX="patch" \
140 + EPATCH_FORCE="yes" \
141 + EPATCH_OPTS="-p1" \
142 + epatch "${WORKDIR}"/patches-upstream
143 + fi
144 +
145 + # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
146 + sed -e 's/dconf update/:/' \
147 + -i data/dconf/Makefile.{am,in} || die
148 + use vala && vala_src_prepare
149 +
150 + eautoreconf
151 +}
152 +
153 +src_configure() {
154 + local python_conf
155 + if use python; then
156 + python_conf="PYTHON=${PYTHON}
157 + $(use_enable deprecated python-library)
158 + $(use_enable gtk3 setup)"
159 + else
160 + python_conf="--disable-python-library --disable-setup"
161 + fi
162 + econf \
163 + --enable-dconf \
164 + --disable-emoji-dict \
165 + $(use_enable introspection) \
166 + $(use_enable gconf) \
167 + $(use_enable gtk gtk2) \
168 + $(use_enable gtk xim) \
169 + $(use_enable gtk3) \
170 + $(use_enable gtk3 ui) \
171 + $(use_enable nls) \
172 + $(use_enable test tests) \
173 + $(use_enable X xim) \
174 + $(use_enable vala) \
175 + $(use_enable wayland) \
176 + ${python_conf}
177 +}
178 +
179 +src_test() {
180 + unset DBUS_SESSION_BUS_ADDRESS
181 + Xemake check || die
182 +}
183 +
184 +src_install() {
185 + default
186 +
187 + prune_libtool_files --all
188 +
189 + mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
190 + rm -rf "${ED}"/usr/share/bash-completion || die
191 + newbashcomp "${T}"/ibus.bash ${PN}
192 + insinto /etc/X11/xinit/xinput.d
193 + newins xinput-ibus ibus.conf
194 +
195 + keepdir /usr/share/ibus/{engine,icons} #289547
196 +
197 + use deprecated && python_optimize
198 + use python && use gtk3 && python_optimize
199 +
200 + readme.gentoo_create_doc
201 +}
202 +
203 +pkg_preinst() {
204 + use gconf && gnome2_gconf_savelist
205 + gnome2_schemas_savelist
206 + gnome2_icon_savelist
207 +}
208 +
209 +pkg_postinst() {
210 + use gconf && gnome2_gconf_install
211 + use gtk && gnome2_query_immodules_gtk2
212 + use gtk3 && gnome2_query_immodules_gtk3
213 + gnome2_schemas_update
214 + gnome2_icon_cache_update
215 + readme.gentoo_print_elog
216 +}
217 +
218 +pkg_postrm() {
219 + use gtk && gnome2_query_immodules_gtk2
220 + use gtk3 && gnome2_query_immodules_gtk3
221 + use gconf && gnome2_schemas_update
222 + gnome2_icon_cache_update
223 +}