Version bump.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 164 insertions, 16 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 6090b6332194..b2327ce0a12c 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.87 2011/05/28 01:55:14 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.88 2011/09/04 14:30:32 naota Exp $
+
+*ibus-1.3.99.20110817 (04 Sep 2011)
+
+  04 Sep 2011; Naohiro Aota <naota@gentoo.org> +ibus-1.3.99.20110817.ebuild:
+  Version bump.
 
 *ibus-1.3.99.20110419-r2 (28 May 2011)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index dde1e6cb63ee..b9cc9c60a821 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -5,28 +5,20 @@ AUX ibus-1.3.9-remove-unused-build.patch 367 RMD160 ff8c355dc1eb3b70cb1efeac4008
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
 DIST ibus-1.3.99.20110419.tar.gz 1402824 RMD160 b8820544bd874674377e6a61494d097fbb3d9de5 SHA1 2cc0eea42862dac4d43076a33f5d21e47865f71d SHA256 1110c819b246f08a232985258d3c707191f64fc3695b9f5c634f14d6cfe82160
+DIST ibus-1.3.99.20110817.tar.gz 1470606 RMD160 3b56578153ffd27080d6f2a136823ef00e1c00bf SHA1 c2b941b17deba1b2ff43b6e4c68ea1854b2b09ac SHA256 5bb66690da0c675bee340388ef26c6ac9558d8480d2b65be0e280cd024a95b32
 EBUILD ibus-1.2.0.20100111.ebuild 2559 RMD160 efd0b291781b1b82bca04f9f1eac8104ca151e0c SHA1 6a449de6e9668b6129ae764a04305d39ec4a170e SHA256 d078fe38c54256397eab0599d6d61f3d27f92ca7b1e3b5cda02f412e5f1f6212
 EBUILD ibus-1.3.9-r1.ebuild 3499 RMD160 dfc5f28ae7b46887390a634ef15e473f5dd52382 SHA1 06eb904312b4ae3d11deb435a259fda371698d52 SHA256 114fe47aa0e75ad91484e57a50b1091c5e6945a4942ece6273e9507bb019d98c
 EBUILD ibus-1.3.9-r2.ebuild 3903 RMD160 814dcff4d59f932c544f78a83988f61c1352de71 SHA1 2cc0e19524f04ba18dc95e1ae362143c675a86ed SHA256 be0b0a252b87fc3fc8e88cf0efa6da72df3cb639e25e54909aa1ba2c2d8d207e
 EBUILD ibus-1.3.9.ebuild 3320 RMD160 11f9ae31c87e5c13ecc8d5be4853a9e1ae5124a1 SHA1 facb5624fcee283abd961ef76fa7cc685cb27c5a SHA256 19be3ef31f61faf42a15899b8109d604227e9989c38e9a58d69f27c8daa79e40
 EBUILD ibus-1.3.99.20110419-r1.ebuild 3771 RMD160 ec4e71d909e7c5723a12d4c4bd1a66d7bee3b811 SHA1 698805f2d7e88a9b3f35dea9ff0580c14dbae1aa SHA256 432d089bd351883611a36a5db3c931713ef4640c986af6222e47e53ac03e9d03
 EBUILD ibus-1.3.99.20110419-r2.ebuild 3838 RMD160 08f7255ce8defcca5cab62e2b7fbe9797566fe4f SHA1 bef44f856b6bed94b5217a6e080ccd4a50610733 SHA256 657ccaf7cc735326eb5d813363737e82f02a29171708e465caffbc7247ee42fa
-MISC ChangeLog 14449 RMD160 7b2cff8438a4d6e5b49fade173c167d39d65bd18 SHA1 dbe348ecc20d30dd02005718845566acd6bc657e SHA256 ace74531dc6404cc27528d7260015cf5b93ca24435321c0c722d951a5be8ce88
+EBUILD ibus-1.3.99.20110817.ebuild 3834 RMD160 cf4a45046aaf478502f2a065de466838e7f0bf3d SHA1 723224d9a7815371b2672f74c55adbb5e4ee5124 SHA256 019c38e5790cdcd832014d6c6f50681b450a82908d5455dbe092af98d80bca70
+MISC ChangeLog 14579 RMD160 3df96b9e59321914ddb4a7eb859646d829173a20 SHA1 37b6c55eab96f6cb3efae50c9096fbaa3a6dd139 SHA256 b1ac768dab5da7c92556a48cfec19abf58d7e305cef257adc311bdc232f6383a
 MISC metadata.xml 723 RMD160 d31d47e723adafe801a851aeacc97195bf133988 SHA1 90a3dfcb261747eb663fc8e6ad3612f919d3033e SHA256 4cbc8c17e6b95b36d48ad63e5fab15b0a52f1ef78bcc6f67044ab722fcef3156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN4FYaAAoJECaGw+YFKA1pmUAP/RotErMf8/gt0a429Itio07H
-1P3yQR9BntiL+wPs4mSZ3rYUmNrxl7E8XzTTXnM3qu9JUVT5qQA5fGSIktTXql63
-vtfq//PePlyh+BPlBL/4pTk/AUoh4o/D9nEMuimyBaO+oi6i8Atz1/djsWOj7pAF
-SJ+lU+bXiXloTitcvmD7oTwsrPB+Tjfj/N3dYqjUHNEZwuuIY1X58awkBxgY9Vw9
-XTxdbyxcC2pEKM6AQ5mkdNzC6aTbikYLZQlbhTqniTGwjHmueVkzvbDN1ocS7PD4
-ncNbKnksNkzCNhiM+W+pGHqhPvdxYH55HDu7EpZPANOhK+HQEO0t3PZkF8wIiKx0
-2CBs4EA7SXdzHG6NXCLRi8oIVfbxIIG2cZW9DxfKOWRO/QQ6Qnr5C448SiZiJncL
-Sb6GMYGjCkwuIhZyRd0sTKTLO+2rEzIV8qgvOg+kF/DU8u+cM+ItjfZclBeryBvW
-ameX2q0zB2JhERTw9/5YeFALYMyeYpRBEaJWvWDM3i+vjLEaQejPckoEmocTjcaL
-SfvAWM3ZwkhD104IB8qIjlmbK+z0fwF8lf5lZnkA31GBoPmZ+x7GZjSxgtvGxeNh
-9O/BIE/OLLquNXAbflDQqelHB4Mvb1BJDkiG1jMBpw/ZIbRBnZAGf4ajQDHan4XN
-nZXcEfnKiDRglfbCDY8k
-=IXJx
+iEYEARECAAYFAk5ji44ACgkQGpDnPLSHuMDxqQCghNFiH+3rFcDYN2a3lMAEE51n
+rikAoJJtXg5smVlDt7GwvZatlwry19IA
+=LWMt
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.3.99.20110817.ebuild b/app-i18n/ibus/ibus-1.3.99.20110817.ebuild
new file mode 100644
index 000000000000..10d884108f25
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.3.99.20110817.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20110817.ebuild,v 1.1 2011/09/04 14:30:32 naota Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.5"
+inherit confutils eutils gnome2-utils multilib python
+
+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="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc +gconf gtk gtk3 introspection nls +python vala X"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	app-text/iso-codes
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	python? (
+		dev-python/notify-python
+		>=dev-python/dbus-python-0.83
+	)
+	nls? ( virtual/libintl )"
+#	X? ( x11-libs/libX11 )
+#	gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
+#	vala? ( dev-lang/vala )
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+	python? (
+		dev-python/pygtk
+		dev-python/pyxdg
+	)"
+
+RESTRICT="test"
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+pkg_setup() {
+	# bug #342903
+	confutils_require_any X gtk gtk3
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	mv py-compile py-compile.orig || die
+	ln -s "$(type -P true)" py-compile || die
+	echo "ibus/_config.py" >> po/POTFILES.skip || die
+	sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-html) \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(use_enable python) \
+		$(use_enable vala) \
+		$(use_enable X xim) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf || die
+
+	# bug 289547
+	keepdir /usr/share/ibus/{engine,icons} || die
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use python && python_mod_optimize /usr/share/${PN}
+	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() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	use python && python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}