version bump

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

3 files changed, 198 insertions, 16 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 2a675adfbdf1..1935f6c7c4e0 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.145 2014/06/23 03:35:14 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.146 2014/08/01 07:14:27 dlan Exp $
+
+*ibus-1.5.8 (01 Aug 2014)
+
+  01 Aug 2014; Yixun Lan <dlan@gentoo.org> +ibus-1.5.8.ebuild:
+  version bump
 
   23 Jun 2014; Naohiro Aota <naota@gentoo.org> -ibus-1.5.2.ebuild,
   -ibus-1.5.3.ebuild, -ibus-1.5.4-r1.ebuild:
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index cafd0455a2b2..61bf16b1b991 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.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d
+DIST ibus-1.5.8.tar.gz 772270 SHA256 92b177cb97b1efcc274257b8e4b9174032ac3bb78c05a76f12d79e3122dc8613 SHA512 bec0a4e72fcb6db0a01daecc76f4a6f4784307beef96a72fd6be32f299195f0cd582ddc61d3dffb6e9da0d489cd35f6620434c7965f61ec3485e6a0d0f8e59fb WHIRLPOOL cd07d921be91b510b9242a036f16e76f57493b3e4d04e1ba1b16332bee6aa28967486ee01adcc03dc9789452bc06e614581de634d102ae35a3ec15df0ed06ed0
 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.5.ebuild 4431 SHA256 5853b4c09c57a2e6a4e15337eddd352f97632f77e312f1e13604c577a7940a13 SHA512 8529634fe9f3ba43f2bef4a21a136c8662c31e35418f50859852d07b120dd06e936917ab165fdab5f92606b5cab06279e20e868330debce012ddd1ab60bec4f7 WHIRLPOOL 262b71d6db8cbd45bff7058ce2b6030b15b0a1890fa6a1946b5e43515c1c9b2875b557f7856db0871f92a69478409dc907808dc7e389f0da7b66cca03099271f
-MISC ChangeLog 22415 SHA256 85652039cad26ad79eab1278cfb27de853acc95120980bd024639a65ea2b1d1b SHA512 386737989188b575797061741fb7eb2e9a2919e9cb7c8e2cf9c974ff173f5266f34552e56ba1638ca1055c83cc54af377c62571c5bf505a9e0316ab682733c90 WHIRLPOOL 4c97c13da38c4b6744801b698d203a4398a660f7c9da6a94dffed65f3703ced5a813279ce8b80b2cbd5ca8c70dc3b2bd08e6707019c33b78e5ab8967a590ed03
+EBUILD ibus-1.5.8.ebuild 4301 SHA256 84fb0cd6e6ef0f1ece5a74905579ac93a76cc886682dbc4963fe26fb30020d81 SHA512 04afa4ab0de9df3ece02b5eb0fa499b3acb3844b451296f6f7c6aa6cdf86dbb456acbba652ed1d60e89265cd40832384312978d981c05d4c47d09f855b087cde WHIRLPOOL 0bfafbd6e161a25fcee0385d8ea86068c3d02dec97488789622de26886b20c80c48dc9fa4d9770fe35c5c5add11540ea1665acf44fcb2b291af036cdda6cfebb
+MISC ChangeLog 22520 SHA256 85fd16da284dea79fdbdd1c85c5b9749962686f72ba7964dd06704114546f1c5 SHA512 19918b12510f0d3edc4521503f56a7b7f76054b620f18be49dcf3a87e1b0413be5cac9edf76da0defefc07c81133aacb477538318194b1b531ad0eb2db455959 WHIRLPOOL 392952d1c6ac534b07b0302fce984e4c228d9d425008f3e7416192d2de399c8e0e378ca0d473b5d2a6e3c4ddf569696109db20363b0ec176d5c9f8744585d69b
 MISC metadata.xml 984 SHA256 3fc098fc1705fd2415044e6fdba35555bdecad080c056ec418c7d53ddb8738c4 SHA512 b768faa0466a08629bd416b575c35b0e7868972d16878e7da79da5837549cbe4a5e5772a06117e7536f3b3b2d2c417afac14e7639747a9a2a1d220b297adffc3 WHIRLPOOL a3050b1d6a123b7a82d067d6fbdb35c941ac6fd902d58ccbb0a4a339f319e67b2dc8ad2f3fc1af521dd981fc3af41c9c4242a15235847856c1feb1f03e4bdc61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTp6BzAAoJEDYO1FT4VRUUh/4P/0WEZQNPWbGbOlX2Pz3PW2s3
-7AGTzvxIW2UPVdjVjQlPsYiYw84CqxKbtf7+pzCfAcFTLCoMDPqqCx7+Zu50O2mr
-76DElHbRyYBliolzztLdDvY8F5Za02GX6EzUZOB56DCzT82PjO8nsiaMaOj9vY9A
-pTam6dXIz1ikJmDsG2/YUfkso3eeOi/YzFI2P8GC+Ef5ITWOfZcxQxtkc56sngNN
-PP04tpFw0WdXQCmik4CTXG4XYO6lesIOsGTyZA/Fb8G7HCfw/Mqoiu20fPVQ0VRy
-LbOFgeIu+we5Y4fc4YlRgLe7l7DJ7jhhm1qpqksQY9wFDvPcXDwVHT+LCoE5yhDm
-PqRH1fNqmyl+bS0D+Cv1ZfxfECsXvZo51suZfQDuFWdALXtewXNcaVZYVjV0Zy3Y
-oTAHDDW7+YAxTMX8TcCKgWKCmnL5rXWIZx9YxjP6vwZWt1UKIAJPfjAdNkSUzMe6
-51mmK4RiW6TUQEt3JTVXh2We6g96MxUlOXpFhDO0kJhg9xDZR8P94uy4V9SAslH3
-ZkjeEa1kD3FHiOGG4W9iUsIhCRTGiVYHLdaIM4k9pXhoojywszBOMDqXm6tFzwxa
-0EiI0s1gzwfJ+lmHTi2rHOY6OCsWyTTMTw44geNJ5ONVF8d6IjSFPxzLRkDk2LdP
-BjAx8WV8Cw2MM0ieJn0v
-=PtEq
+iQIcBAEBCAAGBQJT2z2+AAoJEJIMDbyqvv1V97oP/i7iqJE2IxQhQn+DVMgqDluJ
+XsaGmjlbMUU0xOPc+HySCSXyhOJ7HRm++xhq1U7HPYu8ZKw03sh+IbbvOWZeewxn
+AKVP0qUeWgBqKap/3Kad36JBWEu1Gtjt+6R6IfRp3AlaG9OTIyof7O/qUjkQOnNj
+NJbc50hk77TagpP1t2xvGCpdd1/CBoGQSyxwDWlVIUc5xWnd0cehhMcSaL8VfrLU
+4UZOxuIGwLXg63AD8pQEFVuVwRzkqme6m2WlktpotSfsDvmhtJxuWpcODs/JenQ2
+qkl63WQHhnjhOQ7ubGdUeCfpQpcxozmyJCR6InO3Su0m0JkRgM8f06+l3S0x5Cf3
+8WY/APGg9U85F5o0WBQgfkKKuLITAh/UINUtRQ80cVtBOf7VpaJFrK8RhkoczEj2
+OhPne2y21TbMkrPIH+uJnlpqUMOjKHsCCkqbmJ532rE3HM1HSMPWJb2R53BDb164
+7c4jYdnMSFxIAQSuAmx/5CGdNo1sX3/1B6VPjMZYG1JpQHv5PwxefY8ukdm8tFKU
+xQ38VuHNu87q5ZQ85SbvtIl64acL0WclL28MYkIpwP43xCrhMseovXBuTVpGfLsi
+qQvHZKg6lkrAewMEq2SQo8ni1FFmcrgqCLvP0HdwbczEBD1SA8PEJXqBi9q8y03e
+GV+ee/IX8KiEJgMevF0v
+=5m7y
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.8.ebuild b/app-i18n/ibus/ibus-1.5.8.ebuild
new file mode 100644
index 000000000000..fa882ea35505
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.8.ebuild
@@ -0,0 +1,175 @@
+# 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.8.ebuild,v 1.1 2014/08/01 07:14:27 dlan Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils 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/"
+SRC_URI="https://github.com/ibus/ibus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+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
+
+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 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() {
+	autotools-utils_src_prepare
+	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
+}