Changed python USE flag to +python, bug #319417. Fixed bug #311211 again.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 141 insertions, 2 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 1937a7a726a2..14b6768f8dbb 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.60 2010/05/11 23:07:47 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.61 2010/05/14 16:43:36 matsuu Exp $
+
+*ibus-1.3.3-r2 (14 May 2010)
+
+  14 May 2010; MATSUU Takuto <matsuu@gentoo.org> +ibus-1.3.3-r2.ebuild:
+  Changed python USE flag to +python, bug #319417. Fixed bug #311211 again.
 
 *ibus-1.3.3-r1 (11 May 2010)
 *ibus-1.2.1-r1 (11 May 2010)
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 0165935a7f80..c45f94f79967 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.2.1.tar.gz 1205352 RMD160 f5429ddf958ba0d96dec121f77c6264d1ce53b38 SHA1 5c85452ef3cb3803574060a70af979e959b844f3 SHA256 af32dd8cca44a289d6a16b2aab8ffc32314f8538795ca1fc7d0b231912a75fc0
 DIST ibus-1.3.3.tar.gz 1219150 RMD160 ff399bc4d18883b3b587dbacb746c7897f91f304 SHA1 06b48165e861681678d6875ca904fc2b411b469d SHA256 25173a99c57a415638a242f8527ef2c867e9ec1e487340b11bff6b2d5ab78be1
@@ -5,6 +8,24 @@ EBUILD ibus-1.2.0.20100111.ebuild 2587 RMD160 23a53da21cde5d48927eac1871f09bbeed
 EBUILD ibus-1.2.1-r1.ebuild 2544 RMD160 d5830d0821d12decd9e2bbf646d6154ce43c08ab SHA1 7aabc8069fcf25574e3b463f600be5e00998f0bb SHA256 627b6d1d6fb57f6035dc02a1d01c6c257b6e87617e6380fb1ad84100ac51431c
 EBUILD ibus-1.2.1.ebuild 2592 RMD160 8af05162b45b7e9dd43b45bc29750b7cf6d3a70a SHA1 cb084099c851f3b3ee5238c970e036e247e109d5 SHA256 adff45115361d51728f10c9f0031de90db159fde0e7edeb8155ad7e87a3662c7
 EBUILD ibus-1.3.3-r1.ebuild 2685 RMD160 90f50e1986586783f5f67a11b0c6a6f905b6d358 SHA1 894ee125ccfeeecf8c77ae5990fabc1f6ed29843 SHA256 9efc9dab33fc8a205e396fc365193fb9678f51c2a61e17356ffda6893347584b
+EBUILD ibus-1.3.3-r2.ebuild 2766 RMD160 a93ba151bd65a29080ac77a3922fbe4c800e5d70 SHA1 d81cc74afee207af3e138a3d175ec54470b48fa4 SHA256 4147e52404d55884d95f61bcd514d6d30dd7e42142c1aa1e29032cc37f1d3c55
 EBUILD ibus-1.3.3.ebuild 2636 RMD160 2ef6def1ed9efa152808e2753164eea672b9d5a9 SHA1 888a45cb5abf32e618af9d8c37d0794b29ed932c SHA256 ad40c1abd4dd8fc76dec33b005d55ea3cd617d284427d02b5376b63009f1c941
-MISC ChangeLog 9991 RMD160 1c9f9d62a8647b5de03f207282659eafeff2beb5 SHA1 5c6f6c814c1ab7e1e348de4b082d3c8cf8b92b27 SHA256 7477b022a73f0177da3dcdfcd5ff5381b040971439767b291ec57eb7406a7e44
+MISC ChangeLog 10170 RMD160 c70d93fcb2b4cfc991adc4bffecea1a2a8493fc8 SHA1 8a7a80a8bd610aa071d80b4da4cb5d162eeaee1b SHA256 bfa32581fb720f7ae2370018db1c7cd41448f87ce7f9b34d5e8f95a66c5d0eac
 MISC metadata.xml 500 RMD160 255d59a4fbb851d92699a1afcaea65eebc3e70ff SHA1 f2f800316e99b1098d43b40594bb48caa59b3d6c SHA256 43f14d2a789d78fe087e129848bb7925ca2700197bbd4b96995364c303d97ea9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBAgAGBQJL7X3pAAoJECaGw+YFKA1pSr8QAJHCMeA6kGSjYoCfSwY6cVvJ
+fkfjLd64GF2ATfbSvBae8DQ4ZJJQzyr1+7W+7VkkwPsIWC0E1cg1m2TMGQrG8nai
+5x0skqAAKJBH7rkOSqnEhldMzSyd08x5O/NXyfPDXCwsixQzS3GQ/Qmw7q5JbfVN
+2q0KBEdHrefQfwm56vYjW7rKmWTZUb/dG0S/vFvQWFO76tHyV465gmKvhTUPtEIF
+60Po9ufT7KsTfH4SuIB8SPgy++/NrxplX1fl9WnFq556lnsO9jh0f5P6ATJCzPOy
+9XNXj/0SA6tdzmtbv/CorO1XhyZtnTt+IHCUNb67eR9hD2qXU0dnovYxtzU/eEPA
+pMo/pSwXnhzGhdqoRuldT3dV48ul92ChFG3e/HP4J54COVZMmL/eaTL+yQgKNm0T
+qxusByD5xiEmjGE0wYNKQJ2DIJ+NttSRyNsRbCiFLMgBCu5z0+5kRqm2zSSWzoyI
+YthjWrai+9zEIn0ipv9MjBrd+ji7cwzbCHyYawd6ZVF+q0tp5toRtDE4A+dshErH
+N/gK2XfqCtZZGcKZvz6oYb5HZO3ikeTFqjX/q3WcJUpHw0jnjhJ6MZj6121r9lu/
+Z2N9qoUsCPHNQl8PGZVSb4Jh6/QIobTEiIIONVHzy2tps5YBZj0SZRHb/QGmZe0a
+0zHKIxlt+1ofhe5L2gcM
+=THix
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.3.3-r2.ebuild b/app-i18n/ibus/ibus-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..49486bbd3167
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.3.3-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.3-r2.ebuild,v 1.1 2010/05/14 16:43:36 matsuu Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2:2.5"
+inherit 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 ~x86"
+IUSE="doc +gconf nls +python"
+
+RDEPEND=">=dev-libs/glib-2.18
+	>=x11-libs/gtk+-2
+	gconf? ( >=gnome-base/gconf-2.12 )
+	>=gnome-base/librsvg-2
+	sys-apps/dbus
+	app-text/iso-codes
+	x11-libs/libX11
+	python? (
+		>=dev-python/pygobject-2.14
+		dev-python/notify-python
+		>=dev-python/dbus-python-0.83
+	)
+	nls? ( virtual/libintl )"
+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() {
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		GTK2_CONFDIR="/etc/gtk-2.0"
+		# An arch specific config directory is used on multilib systems
+		has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+		mkdir -p "${ROOT}${GTK2_CONFDIR}"
+		gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+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 gconf) \
+		$(use_enable nls) \
+		$(use_enable python) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# bug 289547
+	keepdir /usr/share/ibus/{engine,icons} || die
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_postinst() {
+
+	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"
+
+	update_gtk_immodules
+
+	use python && python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+
+	use python && python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}