Version bump wrt #468348

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

3 files changed, 192 insertions, 15 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index ffbbfc147ba8..c814287e6713 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.124 2013/05/03 23:37:09 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.125 2013/05/04 06:48:01 naota Exp $
+
+*ibus-1.5.2 (04 May 2013)
+
+  04 May 2013; Naohiro Aota <naota@gentoo.org> +ibus-1.5.2.ebuild:
+  Version bump wrt #468348
 
   03 May 2013; Naohiro Aota <naota@gentoo.org> -ibus-1.4.99.20121006.ebuild:
   Drop old development version.
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 8854c574add6..efaf4e864600 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -12,28 +12,30 @@ 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.1.tar.gz 1888861 SHA256 6023809ced2794b75fad07eb1b1d6288154b373920ecdcd51582a4cde4e0d017 SHA512 8fcc0a6156d8638023f8a430385abd5a278af1c6fec9127c721831d408157fe5c74a7f2a9a46749d71edd3ea419335f9edce8f095a1414707197c652bdad4404 WHIRLPOOL 01fae34b89df4959136061cca1b050b5cb8c180df897a4d5994d3c588a280632cae97fe955e637ad2fce16412a1b63c48212ec7e720d61d9e5f29c65298bc094
+DIST ibus-1.5.2.tar.gz 1882764 SHA256 394f5653e336c6bc02cb055b8eac9f0c9b2a337d582b278e3e825e8cf3f0230d SHA512 6dbf7c59ea57f1683c80595d292ccbe218b419513df2f03978f058a31f1df472bb82331f3432154991bec384a941f7c2bf13fa56e1fbb351f85faf51ee6f1e23 WHIRLPOOL c8113db0ddc021efbde74ef30edf9a3f063b657262614c78bdac12834afff2e446cc4e3873799ab06b44f925a9f1f8bb3cd9d860b1a5ccee78879911e93aca68
 EBUILD ibus-1.4.1.ebuild 4053 SHA256 79a1a785c465a508dcba5131a3905f31012d37e5b1ceb357c8f7ec8d9362f52f SHA512 d83e8c815b491e3ccc09057cb400858ffe8753a858333591e33b171e14594272e2f688248da8d0a9d3c5105711d4fba042621440cffe202b6c80e7ea7c4b67e0 WHIRLPOOL 959ea0684701a5d5a9aabb02e8744e7dec295977c3f73050e94a5503ca8bca570fa8c9203b54621e05267ae5c422b9a2cbaa1a1bb4e038c023f66f1c069d4c24
 EBUILD ibus-1.4.2.ebuild 3423 SHA256 0fe2e0bcba3e2de68d978a6206c183f86817627ee6fef57cb1ed301cca6536d6 SHA512 e900fd50da69b1595bc81476986ebacac33c4b41249ec60bec06d757ecd1396fbaec760876ccb2d20f2ba9c144e1a0543db43ad6e3bc76678a3b76949bb5d146 WHIRLPOOL 0634ccec487d562587fcb30b7bedbeabaabb636ebd296912bad551d175a0558f4bdfe53dc9058abd8f3faaeb80cdfe0655c48f1541b35ee6c34d1883336bbbf1
 EBUILD ibus-1.5.1-r1.ebuild 4577 SHA256 033e9361147e752153290c8354a641653b6c1a2be09c960ace2728b6a857c1e6 SHA512 5cf8d534be46651f5d12f516911e96928fb2ec6ff60935f81b3f0118df4a4c6c35c3855e1ba95076e7d868cf7511e995ec81c8451410bbc811918fbb75ae9f31 WHIRLPOOL 87eb14f8b709aecb5728d6004c9cb34c19164edf7f1f22a57e79852493b5af36c19ccd2a9135e743109d4dcf8d0b0bcf60d2ef2b78da46bb1c4124fd21b7ee63
 EBUILD ibus-1.5.1-r2.ebuild 4737 SHA256 6b1100aeb0a1250174dd0a421f4d129f3d580fb882955b21fbf7a8c12468a561 SHA512 5668e06a70a8c0f4c7734a2eb2c43a24a3ef8aeae7687338202d57d5d8879352ff8d0bb1035f34d0411ebb6837b443b210e7fabaabe222c03810e15a8b410dc1 WHIRLPOOL 0c5cb1cb3877a39988600e24c6debb7c53e2b95fc87dc2f196201f483002ea745ccec79b5fe1b07af10157b3f84cbcaa568c369c792036c95cc085cf57d794f6
 EBUILD ibus-1.5.1.ebuild 4413 SHA256 2ee0742ec4c74f5c180e28a76c2b204a2383a11bd518cb0f9e0a6a5a4f433c24 SHA512 e416bf01c40ab88ca95b5848f57b02afd71bd4524c3197308e8a67dc1e2f977ab533e9c40cbd80e98663ac2bc0f90131e0151263fd2654b60a59ff3bdc0e5455 WHIRLPOOL 844e07ff24166c172b20bfa6c6d8d7cee89b26322ffbea1b3f36d922ab8a0497511ced6ab73cf841b86aade5751bb76d83c6683c3501e5010e4da33967c83a45
-MISC ChangeLog 19893 SHA256 b764902945f5926b2f57b8029f850da5935d6fa32fc4a114bc8fa3fe919da9f4 SHA512 be4949130187d63ed9cf26bea43e6169c933a6a45902291bea2ddaad1bb152a1b404795f63687a06ac78d73bb6c60b3df693458def988506c9d7225c9551f0a1 WHIRLPOOL 335f0389a22655e9890f5045ce199b8e547e3690df36aeccbab2058d88d6c551d006c687e43a32e92edd125e3a8b0cf496dab5a1eca421dd41edcc03065bec7b
+EBUILD ibus-1.5.2.ebuild 4417 SHA256 1436df33bd100377a4ae38ea1b8b7f596134aceb091d047fc385e0022900867c SHA512 a8cb28e1632b513a01a5073069074f9b52c6ed33d7bb65d90cf4f5b7fb7de56ccd970a5dedcdde220c8b2e47728e8aedca4db850683f8ee813c61cd252639939 WHIRLPOOL 6f67231fa5302c77f0c7bab7a7966fad9f501dc62d7168d8a564312ccb54daac37d698b31dd97c5667149f40515dd0b4b6452eb180b25f9439e3554d77850ed0
+MISC ChangeLog 20015 SHA256 f669412890022fbce9b81fef60d25dc92ab7f674fcf7d67b9fb760a3b0d1c2fa SHA512 c7e2d44bbf0cfefbcc327bc2a855b444e3b125adb6e26a654e8a1863047451b635b9509ba01e08d05b96d82920fb8eac35841c9d45faa97dbf8e9ca7b4604391 WHIRLPOOL 55ff209b5a830e00ec88b6e66c32129037e0231d420f5f54593bec3dbc1dcc9ffb07f997f086695a1c5714569aa30a8a45c485aa2894351b44dfecd0a0939254
 MISC ibus-1.4.2.ebuild.orig 3388 SHA256 d48e09f5233209764a4f927c4d5345a4b886c3d7459e7cb7771bb21b777a7a7f SHA512 dbb20f61ffd58b88e7637b8a6b6daae72344a3c4e67605cb975d3e2a5327befdc29b8052e6f472f12bccb267842bd9ed21a61cf3d34d9f5cc49a33d7c8d1e9e3 WHIRLPOOL 5f7fca4a64a2022a101bc7791dd4053d660fc82156768096bc8bb0332e87c68d83bb7ac63ab4b9626a3f3e73f896891cafd72a07d3c3a083cc53bf2404ea16ce
 MISC metadata.xml 874 SHA256 b4601d52556db214f080e217b8ba86b0a9f9eda360fbb334d2a32f7399f432d3 SHA512 1c4ff452971777a3c64ba53b4c013aa92b8962f1e62f3ead43468da88fa8bc5e330226cfd2c5cc6e9fa0ab94b756dfff43bb0086cceea8a622a22c5dfec8cf6d WHIRLPOOL f1891ef7eb11b751d8550bc7f26d1233b1c0e589f27dc838f94242174b11501f0296c165bbdba5e005064837a079fd433aefcaab9ffe4713acdd012821425e07
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRhEomAAoJEDYO1FT4VRUUYikP/1MpcACN8D7EsZ66/zXveMcE
-oIC5YyylstgZhhaJXeYxyMvf//ywDds+NEaufi5KWF0gciDirUgsfnCI3hQdtWuk
-shtVxg5aSMWZ/W53CnPDAx1jqb2M8VL/mABjCnnpfemhqSn8tKqP6uuSETUlcUxj
-tLj8WahRGmC845HLugnnuBnTHw3nMEarBlYZiajW8+j7XTKV++tAX66v1FB1iqww
-8HdD+7+cUBt4wj42vQlI9Sxtbp4Eg8/pGRdKERCBvHrEl3FnzzOHxJ+jAav8Tx/L
-Ilrub1Sc/YOmi1Zfsg0eVRSg0NS90r+aBilKDrHpgGquN9ei7AEQWmVyAxvlvPFk
-bS1nUpbCdC1hwkdzKFbw4GKk3O/+rLj9Skp96SJNHW/7LbHvpB2eEfXu9WeE5gaJ
-afDRWtv8pwEuglfcZ46KSHYub/+2thsUJv474CfuGtpjCUdTHjHCBSvKodZAqR+9
-iQppeiTYpImXQIfzjiw3EirzSVUX2K7tWKqNn2jsgX2VDbxjoN8CqNCUo+qgP4/0
-Al84nhpE3KuMB+aIzFRInrFcXlUzV3/s4TIiZRRHUIxFtXR7U8LCiJFiMTnkGhNR
-VFAN0dXKrVa4iOKrpbnDnbHlEQV0fzb2pHiLM/U+tRgepS3Cq95j1AAmX8y2kTFS
-XvHhLYYWpUnOfWjz15B3
-=3dJB
+iQIcBAEBCAAGBQJRhK8qAAoJEDYO1FT4VRUUxfcP/26Lhb3VJ1byFqpftvMgxT/e
+7pbPtaVmkvfg9UAC2Fqb0PBHTyqtAXwx60xIl7s1n2isazBKAf5jSG0Y/BRG0OaJ
+r0meciaPtCh6N/Sh2eDmNoHvGHCsFBl5TSdU6giw6QP7X3Ru/6Nxuw57AR66ka2U
+CRN2nZavEVwR1k/3veGer3SCB9pJVCo78oC/aGm3S9+ZbYQ3TeDE9FUZGrOdIjc0
+8+ZuMY7ApQamtcqpBlb5N6E/LfsA1KNiZYlDbWT3jAPfvux3ZhXNo3vzw/L7hU6E
+djNMBUnQgnJuOD1iYaSxYrpRBj8zgholNKMuymn2V/fvEu75hnRrDVPw8vi9Icfh
+0MxLULBSeOnpZJ6sY9Fa/HWo8boAXZ+pB/fZV084uxQcwAcpS9fE+O4XbOVgzZV0
+vGbbTgvXuGtH0v6Kk3xSj9yS7lcCBAhjBMYVjTDGt+wjyynZGtKlIEhwfC0lfub1
+2yMYJwML3xr1TNySxiIgWmFjLkz4M6c3A+9M2Bg90jTBtGVplzL+1CkimpzqGX5k
+NfTBmozsmW6AqqIN9xnJVQhop2d1UDDmaghh2LDlPbfRaDgKKvZh4VMWneckGYs5
+mKYv16c24BXcwse1nJZwvNOgRgxqUuIeWtzAeZJ5BKBhhY6/AFvml5an9OQ16n6s
+X3M+MqvZDWgAMhLuJ3y0
+=guWn
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.2.ebuild b/app-i18n/ibus/ibus-1.5.2.ebuild
new file mode 100644
index 000000000000..e97a89ebad45
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.2.ebuild
@@ -0,0 +1,170 @@
+# 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.2.ebuild,v 1.1 2013/05/04 06:48:01 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? ( || ( 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}
+	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
+
+	newbashcomp "${ED}"/usr/share/bash-completion/completions/ibus.bash ${PN}
+	rm -rf "${ED}"/usr/share/bash-completion/completions/ || die
+	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
+}