Verion bump wrt #478526

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

3 files changed, 197 insertions, 16 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 94ff4e40518d..ef61f3b61da2 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.130 2013/07/30 03:15:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.131 2013/08/03 23:51:15 naota Exp $
+
+*ibus-1.5.3 (03 Aug 2013)
+
+  03 Aug 2013; Naohiro Aota <naota@gentoo.org> +ibus-1.5.3.ebuild:
+  Verion bump wrt #478526
 
   30 Jul 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 18395fca171e..7cb3b7facd45 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -12,25 +12,27 @@ AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0
 DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6 SHA512 465f5d099ca60612e9d28c77da6a8da2435cc50c3f2f9b93c4c9258d18bb963d85b84ed9d7f9c58e90dc07a4898dc9668a6e2a3484b69074a1777761389ba468 WHIRLPOOL 800e68481202dfd6f4cef0de692f4fa3ceb9e570d34b632f9547605a9ed9688be75a69402ff5df3df71fed12f463502d6e8041862dd065e725e6fa16ec968bcf
 DIST ibus-1.4.2.tar.gz 1489482 SHA256 2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7 SHA512 0070f7d0a4bc6510692851f60e06e487f75fdbe47f50a2371f62dd06b89f20950161b5f1bb91e025dd8dced654d9e90eb910bb5be8e8923869e96e5048f8316d WHIRLPOOL c480ef6fabfe24f2350a0222945860e3b890b32373e159032cc4a9bb1a1df2ad22b6ce11fb9845c5ebacdb7662b9dd26bffb7dd8f6d366551e9ec226e2b14d8d
 DIST ibus-1.5.2.tar.gz 1882764 SHA256 394f5653e336c6bc02cb055b8eac9f0c9b2a337d582b278e3e825e8cf3f0230d SHA512 6dbf7c59ea57f1683c80595d292ccbe218b419513df2f03978f058a31f1df472bb82331f3432154991bec384a941f7c2bf13fa56e1fbb351f85faf51ee6f1e23 WHIRLPOOL c8113db0ddc021efbde74ef30edf9a3f063b657262614c78bdac12834afff2e446cc4e3873799ab06b44f925a9f1f8bb3cd9d860b1a5ccee78879911e93aca68
+DIST ibus-1.5.3.tar.gz 1976957 SHA256 2afc6371c24873f0e37554ef07effd022042f8eca6cb649d1bb02d8c57528b8c SHA512 fe961f3a6143ea8cb9f14531cfdf6f6058bf8aba7285e6746b1750fb8267947730986e1fc0abb77c4545ddc0d835a41f76f316f7387c85de7bbf4010c10e79db WHIRLPOOL db0f5dd7784b5440d5c95d5d4eb8c1433277dc20789b6b5f20cef0504ebc1fe1cf4c1fe26c1dde90e78a1349534bdcdf09af1156605c77b3f973f4f5908db09f
 EBUILD ibus-1.4.1.ebuild 4073 SHA256 9db71a96c8bfb8cd8cdfd1286d5a6ba19b7e6b82a3d86221b7dffd67bcd77c83 SHA512 b827c108e5ab4630a546d61406691f58faa771ecd36114123520cdcb8a2650435afc4d2eb433256a1c9040d9beb6bca2f7252dd152018d0da5f3371f1779d68e WHIRLPOOL 9ffcef18d4371a2e0e477a0d384d67394a41b555c40055b5e0759d26db043a90c460ce670821755840fd83bc6848b21b2ede8ba38a5ea174a35e074305de2979
 EBUILD ibus-1.4.2.ebuild 3443 SHA256 a5be7819f46e95e533a4198089f4a83de2d4735919fcb40d7a6ce5f832122478 SHA512 6a85b1f6df59cf70084cdef5c1905b0e63f86b2851c9bac5f77fedd05ba9a97d932f7299a29690a42c4c4f5857a703a66b08b2caa218c88b86a6efd9b99e084d WHIRLPOOL ca5eba00ce47c86cb44123cb60bd68f7da64d7befd4c703f45961e2666995deb19a865f5cc56bf463ca3a0526d3f901f38fee75b2b5d2b75819c81bd11c38310
 EBUILD ibus-1.5.2.ebuild 4477 SHA256 56f705a48973fd5b2ab105fc95ead917a07d3bcb5782229be464a852ebe79737 SHA512 3a9aeec1f1a480b9e1e8459cfdc42a3fef1dafb8c2ffc3d3bfdb70722db41fd5ce1faf637dcfe60afc87c071296ab0fcb2a75227b84bd81b3dc881a61acd4d66 WHIRLPOOL 63f4cd8035a4f217c0f9fac48000a5b3ab7ada79953ad23bc18cebb79b3518512ccccf11113e5e9d03fcc9cab8a6f35f5b2d410726658413489d0826ac4e3ffa
-MISC ChangeLog 20657 SHA256 4c7c6b314a40696ebf01363198f284e55f4501b61f77f50fd4c6e9a90ca6bc00 SHA512 b19b80a4458392c6a71b9ea1d99a66fb2f2132a4237bbc3c54ca10ae38c38be956f98b2ec0936b28309049bff118e8c1585d68055c5498613cb59650afb54c18 WHIRLPOOL d6ecb352f222fdaa9745e67cedc6b7a65725d07657ff27543ff503e43aaf611a1c563dda378536134ceea6f235c183404a7b549b49c164bbb3d67938c4ca5fe0
+EBUILD ibus-1.5.3.ebuild 4477 SHA256 25292acbd612ec53f08b44ef63e0e2c04d727642d1e4fe5b80dd8952e0e2fc33 SHA512 181c40cf9a100a9e7689fb82a5be13cd8459b8cac480e2c65b91e5c90acefa813db90cd4a43d926b20888294ccc6d52b1f2ff009e95ed38ccd039ebc19f26653 WHIRLPOOL d76603be94c62aa275cd4b2b1b859af062eda6cfde1e7db565946b977db75d4473547d84be23ca930428363d25a585cdcca7f835db9b2d2b61014bdef7bbd66e
+MISC ChangeLog 20777 SHA256 da8b204667c37269799daf88cad59fb6f224643965009e9309b5e37877093340 SHA512 3b24efb5538531542582b05be2fb3e031f7f5a487f4c259984f95ee7e531928b6f4c4a1bf5aadb943134276c38f0bbd3f6f0e39af3102e8589ac01ce258dc0a0 WHIRLPOOL bd1133eab6deae354cda9fe86235d5feb46b4b1cad4f7d3067840782dced02f94c168228714a09bf15240baa142f467669fac99d20aee22756ce551dad9f56c5
 MISC metadata.xml 984 SHA256 3fc098fc1705fd2415044e6fdba35555bdecad080c056ec418c7d53ddb8738c4 SHA512 b768faa0466a08629bd416b575c35b0e7868972d16878e7da79da5837549cbe4a5e5772a06117e7536f3b3b2d2c417afac14e7639747a9a2a1d220b297adffc3 WHIRLPOOL a3050b1d6a123b7a82d067d6fbdb35c941ac6fd902d58ccbb0a4a339f319e67b2dc8ad2f3fc1af521dd981fc3af41c9c4242a15235847856c1feb1f03e4bdc61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR9y/hAAoJELEHsLL7fEFWdGMP/0Y5Hbe1KEkhOP/5+nRqVF+6
-k2uXRUoMYYMacfpds3R64zHK78QRwPNtg4v0N9lth79kwZ4xrXzS/Y8OC3zXBBB4
-YchKRoBeUoI3049nVJNHbH+IEXZpWN5KyMjQYPxezsikLSxfp6rW0QmpCXh/jkEL
-iEK20Ejfii6Mr6DAi7zmsHPnjUgiHy21FUXLKtU8W/9k4jZD3m0m/Jn0ASaNuVll
-233PKp1kX6jokW1T3xMW46vy4fszxiO/Udi+M8RGXLn6oP5dDKkM5u8NR/E2lzjX
-AmTNo6aRp0ZDQ3dnUC3cbUkn5hNmOEGsA2hShLSSh/lH+SFWMUDIBaIZxStkVuS+
-W4bWN2g5g9eNyzBmqzvx6h87svK6NgLoUs0apGyZYnr8plax5UFfds6vI1SYzG+8
-YsFyWxPcM9xQ4wdAQVGZyJWDk7/y+DtVNeWK2ITCV/Wt4j2dnyOBArPtAOnuKvZR
-vZVXLLLVbrfFOt3xP2p9EfH6lHXych1z5/sF2z/bSdVt1NWbECMDPFsoDZTJcpu9
-6QpxfQ/QYYJA16LdnM3lE95RfrXMONRQSIXyAc/6rWab6/JDmu8Xp8g1YFyFx9ko
-M3+k4aa1PReobZlfkvs/pVDcuq0DhDRaiO8Tbx2VI3MdvINTYKg8YBp4FiR7COCA
-0GLYEuRS2/dscROepV7V
-=4uGv
+iQIcBAEBCAAGBQJR/ZeKAAoJEDYO1FT4VRUUoW4QAJ3VKfzDgapGR6mFEZUHnKi1
+09NT1SuNWg7xkZGE5/GIoDY/7W6xcqO3p5+fwCB/M1vF6h2TdhNSSU/Pd7VU0BIh
+uDrdF0JzlIPCihjjqr0ZFBzZn54RaRkTiSTfljEt9A1s4Ni8HfgVC3Yo6mhcJrB+
+uF0donk+Lpc3GUC+Kl1WuBgpbqqFDOtwG5eAl5KNlZRcEUhF3w82I0WOzY6pZxnx
+0ttS5gU7vmfuLuT6DXIUqcmPSmop7DNgydpcbXm1YF2MUVU+/bqEOxGxTN3Zmy93
+Uc16i9IkykRTwNb1wF2nIm5JoRFf8bNt6v3opKvyKfl4JhcDFXqOHpvwRs5DrCFQ
+ss6NIcQEEIA4+pYwu1T4ZDflFfwpBGBXDmmf7wFtnAYIRvxKH3Xj6SGKcxZ7UBTi
+YzThT57qwYNH2gFDkxNQllJYgK0knr0ifO8OoMsZiegMi8vT7G/r3af9DX91Bbud
+JTEdg8UbjZy/9ycXF7CojzYH70L6/ijJ4R0dy3xD0/ejvYkG6bx4z0X7pP7B8O9I
+Tg9yF29CIQrLb1Y8dzrY/T2K0ZGjjoMYLULrNOGM2sCWAN1aabb5YChIHxbKOwDT
+9NrGSQ4ju1fYeO6X/flh5lBB9w1K6XQQVmyJA2N+M4IysjZddTuIOI/+PlwsIok+
+X34188eVumDdphQYOWgk
+=hfXh
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.3.ebuild b/app-i18n/ibus/ibus-1.5.3.ebuild
new file mode 100644
index 000000000000..5727444cd06d
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.3.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.3.ebuild,v 1.1 2013/08/03 23:51:15 naota Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 vala virtualx
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test vala +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		|| ( deprecated ( gtk3 introspection ) ) )" #342903
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+
+	dconf? ( >=gnome-base/dconf-0.13.4 )
+	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 )"
+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"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/$(NULL)/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use vala && vala_src_prepare
+	cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die
+}
+
+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 \
+		$(use_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) \
+		${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
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_icon_cache_update
+
+	elog "To use ibus, you should:"
+	elog "1. Get input engines from sunrise overlay."
+	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
+	elog "   for a list of packages we already have."
+	elog
+	elog "2. Setup ibus:"
+	elog
+	elog "   $ ibus-setup"
+	elog
+	elog "3. Set the following in your user startup scripts"
+	elog "   such as .xinitrc, .xsession or .xprofile:"
+	elog
+	elog "   export XMODIFIERS=\"@im=ibus\""
+	elog "   export GTK_IM_MODULE=\"ibus\""
+	elog "   export QT_IM_MODULE=\"xim\""
+	elog "   ibus-daemon -d -x"
+}
+
+pkg_postrm() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	gnome2_icon_cache_update
+}