bump upstream patches, fix bug 530768. enable USE=vala by default since ui/gtk3/*.vala have been touched

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

3 files changed, 212 insertions, 15 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 707b83d62abd..12f4f13b30d7 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.153 2014/11/17 08:55:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.154 2014/12/24 01:52:20 dlan Exp $
+
+*ibus-1.5.9-r1 (24 Dec 2014)
+
+  24 Dec 2014; Yixun Lan <dlan@gentoo.org> +ibus-1.5.9-r1.ebuild:
+  bump upstream patches, fix bug 530768. enable USE=vala by default since
+  ui/gtk3/*.vala have been touched
 
   17 Nov 2014; Agostino Sarubbo <ago@gentoo.org> ibus-1.5.5.ebuild:
   Stable for ppc64, wrt bug #517912
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index c4131c4c5f64..17acbfd6ccba 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
 DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78
+DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41
 DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221
 EBUILD ibus-1.5.5.ebuild 4427 SHA256 965b1ebdda67881f6f153401bacba5014bd126e53a040188dcb66f02775b816d SHA512 3d0b03e98220c652a9e5219d8844b4c4871d64fa1b8c5b96b1f3940699bc623e0fbb2a88251bc42e2dff3c1e29bc9ec2df714085f5d19996cefafef012e18030 WHIRLPOOL b8dad8962180fcdaf1f9eb5580004f78aafe1c9503174c5a8f35bd35bcda29087e139a7fbb6bc86b5d8eb5c5c850c0b6bd74631119cb06976a94b5fce7626d7d
 EBUILD ibus-1.5.8-r1.ebuild 4363 SHA256 621c0763552dc28fecd2cb5912ef8d3d13a4885ab0f39f209f36e31648533c44 SHA512 053c147844559354a5d841fe5fced2d5082cfc0f9a06273074c6dc84d6b0f28de1d3709e663021093a863b56b38782151937fd69334bedaab70e118e542bb3ee WHIRLPOOL e96973d988a25df48f31a49326a3e7c52a8d80511afe03ff25427179d989d2b87767c6598e84f403a5ddfae4ad9ffbde6d1e3dcb55bc72ece7055018b6c04c80
+EBUILD ibus-1.5.9-r1.ebuild 4717 SHA256 87b81b1428fd49b47a080a36f4a07e4b71309594e8a7f56ca6f4d9e6c22d4045 SHA512 29c89e0aeec5a874cc9662fe5336bcaa9ab620a414c5b612fe03af0fe3a951113c93ac71e09eb5acaf881c78c611f3c213262ed038856cc4c99d60522f0473ee WHIRLPOOL 7e02bfdab29258600fdfb930df4e7992821e271004154af57ce6e41746399d443f2222ad851f28ce8e3f4d0c35920763bf051bc2e311c1d6d7ef27ba0dbed5e2
 EBUILD ibus-1.5.9.ebuild 4360 SHA256 dc6e53fb76f217ae6822aca80ccd072c595b978825f983adc09116f76bae16ab SHA512 d6b3436aad5fa1972b2b1ca21a05b6974c70615d579735a8649025a9733a542304627d045343024d0f27eca9c1e8d327d96e44e6f5b7d4a665687e6be453d584 WHIRLPOOL 9f3e2a55fd9f51fc1eaf5b6682b5396288b268a469dba54b0b510de69853762d0e36797bdf88d623486afee78d7d146b851964de5756ffbf3b93173902939f98
-MISC ChangeLog 23788 SHA256 11526e36eeba316ca7ea141db56166b2b92e4567b6843562f9d470bff0c70d3a SHA512 157f41d232401d54412690893f87892dfbe5ef304a1841b44959386553ab4032e9a63aea6c008f4b29dd2107f9178e59b3924682de650961064e091722f49370 WHIRLPOOL ecd3c66e4c3ca516f5203e4fd1c024358a216ebb0936189b3fb868d6d4640c48af26e09cf5533abd1e04fc5ec91645ee81c2e55cea012a0192405883d63a9b8e
+MISC ChangeLog 23995 SHA256 fcd917d0c74afb4e7626c182d0da54e998b8fd9feca5d8b04b0a1d7edf253025 SHA512 b3465e99f59f1dc18539ea9a7525fb0a719292f0efe994603a2456d8866438a447fd484771f24ce9902afeaa9d12d0af1c62ee85d97126072061af98c2d93cf7 WHIRLPOOL 95c453b2cfecb5087073e470cbf1a93637fb354a1f50299f6d09f5b13cd4dc63cd641ebe1bd6e6410a2ef008d3e0129a7d8ade05b4cec97979c6d7f249186780
 MISC metadata.xml 907 SHA256 568c340b720f7300fc7fe240c3e374333315a56875fafd73f02a387709bfeaa7 SHA512 db257d82bf2f810da847b74f1770137288b89c8d6b827e46181d5d2ac8798c5acbdb1bb5ab0d82204f421426242abca912c6ab8ac0c1a4049a8c5944b2c7dd8b WHIRLPOOL 7f5f53519558eb5ee3d2f3db3bf08d1e490c1b5d84d5d76965fda838158facfe18168a32e95eaff1574ca62fde44f6ca95a1bfce3a86af200c8d4d5679054ddd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUabfyAAoJELp701BxlEWf/R4P/1ZgVTeWoJg8fGmlcpnKJD+p
-LQ0v2y07CRMsBOShJ4Al8OvNU88HFsmAirc9QotJh8AtPZRscT95gKSDQYTpH3oE
-DqdJFo9A04NsWcT2QUDDkIWEfzQnU5Nf3IS+iXRHCHm+7+mOrSNbw3PYNhyigohE
-sBcvynYTO+Du8relyW2h4E0NRcRDZ00XHo2IbYmm+deJkcCMa4wf7ymjnmyYFrBH
-qo46spiih8A8BWGmSUzvfqxRS92mvsIyr8PXxyQ20j6sQqvU6ULBknYb9wkrBbTJ
-Ho4DpQka/+A3Ukc9AeNym0Up/jhZJ+S8hC8ordpdV7F7vRBYwpIusF4wVoC0tMAJ
-721SFrrChG7Cm/QNMYq0Y1ydgUnolpQpejEd0mACG6ol000MUBkyLqyihjSDtGxv
-+bZQA176M7EU8BVzYHm7/H77xZ2EFinN/niqZU3AufNKha3Rkfgl80udTlz0cpyi
-hFqmTN0qlrESRN9c/1rkVgR5oNtAULr3M8KqT7ijTSOfU5A7Ckl5o6x8BG0AAVkc
-Xlqp4UvbSvoaYPUjfouKcjwMsFXmmJCw5PZ5OxR5iFK0RTlPx9a3hj7IjkQsb4G3
-490CGlFpmYG8Z+UpANhafPwPJ0BtWVUicGrf6n+M8CjLoX/dBUercJbZiicvKRCs
-I2p48oJztgVEXDBw4IFO
-=ff8t
+iQIcBAEBCAAGBQJUmhxjAAoJEJIMDbyqvv1V4YYQALFRz5VCehju2l/UIWTbat6N
++Gq4W6vAJKFM6CyyR+2T49jcnklapmAL5/gJ39vF0vaJYm/QWkCroecf9M+LY5dF
+BqRL+hcqsGeZ7jyBZgQjUDM0u+S+YmhwD+sCzuUCwq145giY35qOTLNXXuii5r/Y
+krGKgeUwByEJ2gVuLf9OIKdCO4702G8t9e9rDu2vmLi2MnKBA3ENAi5VopEncQAv
+4HSth4gWpnEUvNqqio3Bsw0G8mWdsBl2PQ5+0yF7rvRZEPiIS0mSIRvgajOK2RoD
+L4OhfZwq1UuRIcy0qRjYebzEsojUqAc4NNw8vPNboF+MoUKXz2au7vWQJVFAj+k9
+cRCKLryNLN1RZ1aXaeVdDQnXkDL5IzMVOw2mCvzIdvHqXuW99DV8L4QHHtzIoORy
+IYcBOmY62eJnzfQyTBK2fj85/rVbcWAyyJIdeMWbWRBrBkTRXiDiYDoznezUYN0M
+O2erf/jsRiJym5qZOkTFRjxkbXtO1ZPN6MO/9JvsBRNoLk19AZv7xdjIg4Qgi4uN
+f+XsCyC5SJhrcSeQsbI9paDLi+NqFnEE+hRQ62Wu4gJ0sdJj35sDwcHEXOcYxgLZ
+KI3qwpzJH2Q8xw5XJCncZZpl1lHyWkPTG8+pyKfFIB7pcxQ1jOrHEh9TK1PwQg5v
+lCeIBxON24oyXWwTZrPE
+=Cy5l
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
new file mode 100644
index 000000000000..c1fc195e3937
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.9-r1.ebuild,v 1.1 2014/12/24 01:52:20 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+UPSTREAM_VER=0
+
+inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test +vala wayland +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz
+	${UPSTRAM_PATCHSET_URI}"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	>=gnome-base/dconf-0.13.4
+	x11-libs/libnotify
+
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	python? ( ${PYTHON_DEPS} )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	nls? ( virtual/libintl )
+	wayland? ( dev-libs/wayland )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )
+	gnome-base/gconf"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To use ibus, you should:
+1. Get input engines from sunrise overlay.
+Run \"emerge -s ibus-\" in your favorite terminal
+for a list of packages we already have.
+
+2. Setup ibus:
+$ ibus-setup
+
+3. Set the following in your user startup scripts
+such as .xinitrc, .xsession or .xprofile:
+
+export XMODIFIERS=\"@im=ibus\"
+export GTK_IM_MODULE=\"ibus\"
+export QT_IM_MODULE=\"xim\"
+ibus-daemon -d -x
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/:/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		python_conf="PYTHON=${PYTHON}
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		--enable-dconf \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
+	rm -rf "${ED}"/usr/share/bash-completion || die
+	newbashcomp "${T}"/ibus.bash ${PN}
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+
+	use deprecated && python_optimize
+	use python && use gtk3 && python_optimize
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_schemas_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use gconf && gnome2_schemas_update
+	gnome2_schemas_savelist
+	gnome2_icon_cache_update
+}