Version bump. #485798

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

3 files changed, 199 insertions, 18 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index db0ddd4b9daf..e606ce0b0e0d 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.132 2013/09/05 18:22:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.133 2013/11/04 08:55:26 naota Exp $
+
+*ibus-1.5.4 (04 Nov 2013)
+
+  04 Nov 2013; Naohiro Aota <naota@gentoo.org> +ibus-1.5.4.ebuild:
+  Version bump. #485798
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> ibus-1.5.2.ebuild,
   ibus-1.5.3.ebuild:
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 3b723f04d079..0b5d1aace25d 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -13,28 +13,28 @@ DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3
 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
+DIST ibus-1.5.4.tar.gz 2026656 SHA256 703ebaba3f01b54a86119fb6161d85b9d1ccdb4edb79782d0d23ccde64d214fd SHA512 754cb402c5cd620955b553ab10a397e6f2e8a7db3016c83508fdfefeca0326e9a467bd2d5cc564914082cb1044e2bedeb79f7a20972395f58f58bad0d0855124 WHIRLPOOL 558fca78dcc2c05fdd154ca0940520a2caf579e6ca31b6f284ee2885fb3a5c2b6bc98d114589177f9fd7f5a7c27e036452e85d4c0fa646c7e7e7a947c485f759
 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 4474 SHA256 368cf6ecde0fdbaf96b40f286283c9745cd9b6eeb3a68c90cf639f31a2dc7ee4 SHA512 4b1d7b8669e7c1bb1992b834171f9622263c50e28ebdf134beeca505825b83a309ba5474be2ae067457bebf7090e5525c709434ac134eb10db877e711ea16981 WHIRLPOOL 57fa98557e6e81dfda14013a1a0a85827d24f7176deb753ee21ab639ccdbe0cf5ea8fcda7c1126d79b16b33132f995267e7d4a5b01ad2be5625cf14f29918a61
 EBUILD ibus-1.5.3.ebuild 4474 SHA256 5e13599ed9c1220eeb79cf1801ebc0bbaa42a3422a5d1b182532b528e35dd4f0 SHA512 16f5a8e8ec5f7295afd0d20e1f66c15d69eb1cf1ab39ccbfb3a251575b697ca152d1ff7eb545211f1d41d788908d552e6b47522b9152641032f130021b561fed WHIRLPOOL 44642095c33f2a546b2db39dc8651ba787b18b247bc8d2b6c48a15dc04ddd526636bd6f265332a8f81d277ddb2aa7e3d84ef696c4d261a7b1eb6ad3182dca328
-MISC ChangeLog 20920 SHA256 08fe4466aab1cb847c33ca67362abab52759d12c98b4998ac0898b4c839d72a8 SHA512 2e3e1b1fb9a03fea37f64b19a8256845f5205e1cac2095644b3e74f03abc48ebb31b1b5f88de47cb915546e73e723dc3f6e42ebbbfc1efd2536db0afa4832e50 WHIRLPOOL 8ca037e0b77bd220b630d4b348f29c974a72db44835678c3f2bc4208c6b7120be9bd56f0047dc9f6096ec69fab2bee7d4d99041e47a8dedacb3f8334fe212766
+EBUILD ibus-1.5.4.ebuild 4538 SHA256 0d9d89a4dd03fe971f3b6b1cac23e27d0b0f78d6732de45e7635185c590a8719 SHA512 882075baebed406f2418f5ac069d3eafb481e8b1f7d3552cc905f802382f3ab0918f33aa146ab0b5cf383dc6ea08880f7eb8fd89e30c6859f75c9944355f1d93 WHIRLPOOL 11a3e933d5bd940d7913828fe1c3fe9ea4d287790ddf2b66a347716a5b6d76f7717827dcea22a1181542019685aafb3b346077bda478a9ab06114a8db049d3aa
+MISC ChangeLog 21038 SHA256 5b955f8ded337bb6262b380df3624616b6fd3236f1c91a8488145ba38b53c9ee SHA512 92c8a3040bd55c91443ea663104d2e4c010bf72d01b29d8bd7577b15a5a5fc96efc375bc476e1f09fc8169967d01bf48620345e6abc3cefb03eac5da85dbbc8c WHIRLPOOL 44a7ad714d00c6682d3d9a74c75c345deed037b3cfd6751b49288436d2a4f777c144372f44055fceb38a5ea97f23ff5b17129a8fc081c84942e33d1dcf04537f
 MISC metadata.xml 984 SHA256 3fc098fc1705fd2415044e6fdba35555bdecad080c056ec418c7d53ddb8738c4 SHA512 b768faa0466a08629bd416b575c35b0e7868972d16878e7da79da5837549cbe4a5e5772a06117e7536f3b3b2d2c417afac14e7639747a9a2a1d220b297adffc3 WHIRLPOOL a3050b1d6a123b7a82d067d6fbdb35c941ac6fd902d58ccbb0a4a339f319e67b2dc8ad2f3fc1af521dd981fc3af41c9c4242a15235847856c1feb1f03e4bdc61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKMvnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjA4P/2xTZsy276HfF3K+wHFtmm35
-sr6Z5LSMndExLE+IITMiNl5OIOcTYLnl7Wcx3aw5rF3J5umr92gnGwjDEZ9o1YdT
-Z8uFbOVg/tH8Ui/DSu40k9TR8uGvQ17nOOlSFpYa3QRVojWGy2Y88/Ar0CrdimC+
-SE7NVMeZLUjSYSyG6Z1iVxOUtnOvdXE5I2yGISdtbpLUR23qMyqjBfzXijyQl8O5
-EQS5/cUuR13xVb0CFwlIKlVhTVsD5I8b5rkrXPaOuNDEAd5jbeMwjDTM2tA3j+Eh
-ZJ/Tv8hPCZYJf8tfFJT6/fUweoT6YDNd6V7MXbsBDQWPT+pVJqUKEcKTTWSR4gHR
-BaAyMx1IxO0w4VgfMnSuCoBlAevzNCq66Wv07lWeYkHJkOJSGIMR4gVyM2Oy4J7I
-Rvn2734HBXXA+QWA0rESQdS3PD6rfLVZ62pITa+sehCQSqk5SzpNGHh/zVoaQXjX
-Z1pEvFLQTcJJaGuti3ilVA+qI2W1huWgQHMAHtC4mGU8qprNZNIqiHVY43BEb57g
-Joc/iIq2foqfuMumXRFDsl/x/8bEiYK6jEs+qrh9felyGKrsXSd3MZkHGc+RVyIB
-yxA1AOdSWA9dwoQ0l2W8wc98weBN/ZXRma2qWUbDlJ4L0ltKWEQvpFuCkAsjswYv
-t2Qiwz0+QRMfZsi9o/5k
-=QCPw
+iQIcBAEBCAAGBQJSd2EBAAoJEDYO1FT4VRUUKU0QAJkf7U65DzrABgOaeFIw90Yy
+XscWcoOZGNAvqYfvU0ZRqKPpVhikhWL8QK7LWIhTdlqahNqWr/o8aldX9/+mff0+
+YCGlZnyoPn+igFDxz8s3vrITtfsCTXPitrydVeIJdZNaY+OftBJbws6fXp0qSLpd
+zk1r2HpUsn5NSGuzuIJlaIN40SRH0rWFPjo+3bk+FnAmMl63CyaUU43hbOkNM1l6
+3Lhq/7NV2n61KcazjG6Mp6ELY0eeZ/ODu3hdhLJuFDhRgkV6i9a5NDZfDIINSN11
+tOBS9YTtGdbqy75SLaiGK4RJfFqGyzd9ywsMRZbpHJ7SmuqkVx3IkPZm6xiFIequ
+NBlT7XqddOeVZgKeL3WsZsnzWKqdqFcgpFsxDNdQZXq4J44dA7XsMfQb/474iR39
+U1zr6xLiMCqqSLvC0PCzF/+T5LPVt8Nzesv/rtes457EmgU5TVPKWJak5t7Lf+eU
+jSET3bOLxWzyBcqLEKzig9N1ImJ/tDcdPuTCJtMI7YzwTgIgbtbCNWJd6tOP5xHO
+GMzKKOnOigFASPk5audSKVpAc1X97BpN1/iKYrQ63fFpp6chQ7SbI6tzknE5n87x
+l+B27FMjKC2XI4zXExpeFcyqG9brXcbrow0Ys3jUtAe0l6Uz2YaiDdFzR4FQIuSd
+J26HUdM0UvmXMZ8vPB+L
+=i+Dd
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.4.ebuild b/app-i18n/ibus/ibus-1.5.4.ebuild
new file mode 100644
index 000000000000..ebb89ab8989f
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.4.ebuild
@@ -0,0 +1,176 @@
+# 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.4.ebuild,v 1.1 2013/11/04 08:55:26 naota Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{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 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
+
+	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 )
+	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"
+
+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) \
+		$(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
+}
+
+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
+}