Fixed python dependency, bug #311211.

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

4 files changed, 142 insertions, 5 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 7061dae11f3b..1937a7a726a2 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.59 2010/05/07 16:14:57 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.60 2010/05/11 23:07:47 matsuu Exp $
+
+*ibus-1.3.3-r1 (11 May 2010)
+*ibus-1.2.1-r1 (11 May 2010)
+
+  11 May 2010; MATSUU Takuto <matsuu@gentoo.org> +ibus-1.2.1-r1.ebuild,
+  -ibus-1.3.2.ebuild, +ibus-1.3.3-r1.ebuild:
+  Fixed python dependency, bug #311211.
 
 *ibus-1.3.3 (07 May 2010)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 5ad50af6af75..2b58763c3224 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,10 +1,30 @@
+-----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.2.tar.gz 1216412 RMD160 5ebba87d47682c3976ff6f9d5776e22e9d3cc55f SHA1 3b324a768a9495b23a9a413b3998faf52194d98c SHA256 b0f418baf909d61d5ba4f9e736ace23f03c02199ac077ab23a4b75a8227bf83c
 DIST ibus-1.3.3.tar.gz 1219150 RMD160 ff399bc4d18883b3b587dbacb746c7897f91f304 SHA1 06b48165e861681678d6875ca904fc2b411b469d SHA256 25173a99c57a415638a242f8527ef2c867e9ec1e487340b11bff6b2d5ab78be1
 EBUILD ibus-1.2.0.20100111.ebuild 2587 RMD160 23a53da21cde5d48927eac1871f09bbeede594af SHA1 a8ad2777c9f61b81a23c602c7b81347deb015630 SHA256 8c74b19604d293719882b3a7ec3fa61a1eeec297181504c8ee74e64ac07c42a6
+EBUILD ibus-1.2.1-r1.ebuild 2550 RMD160 a576e4142c846c9576968ddc5d6699f5623a3d45 SHA1 64fce30a9e8006a91bf776ef2835407ab4935f78 SHA256 5ee6904ece300b8c0cc4fbccb3beb23a74114d1dbfdea575635ba820ceaaa142
 EBUILD ibus-1.2.1.ebuild 2592 RMD160 8af05162b45b7e9dd43b45bc29750b7cf6d3a70a SHA1 cb084099c851f3b3ee5238c970e036e247e109d5 SHA256 adff45115361d51728f10c9f0031de90db159fde0e7edeb8155ad7e87a3662c7
-EBUILD ibus-1.3.2.ebuild 2636 RMD160 dc772740bc781582aa5c9fb26f6bbf08c27a3e8d SHA1 d2ab84ed77b779c7d14213c866ebdec5476f86d0 SHA256 0912168ff31534c272c24f0c96b24cbc060b6c4cfae1ca7d7395c28e795fabdb
+EBUILD ibus-1.3.3-r1.ebuild 2685 RMD160 90f50e1986586783f5f67a11b0c6a6f905b6d358 SHA1 894ee125ccfeeecf8c77ae5990fabc1f6ed29843 SHA256 9efc9dab33fc8a205e396fc365193fb9678f51c2a61e17356ffda6893347584b
 EBUILD ibus-1.3.3.ebuild 2636 RMD160 2ef6def1ed9efa152808e2753164eea672b9d5a9 SHA1 888a45cb5abf32e618af9d8c37d0794b29ed932c SHA256 ad40c1abd4dd8fc76dec33b005d55ea3cd617d284427d02b5376b63009f1c941
-MISC ChangeLog 9774 RMD160 44b0aebd1c2561c7144487814f5b305feebd8648 SHA1 510581c3872b5ef2bdcde8fa97d3c2428056432e SHA256 122cd77d4a32448cf3726c18f03c28faa9020bb07ff363e7c1dba67516864160
+MISC ChangeLog 9991 RMD160 1c9f9d62a8647b5de03f207282659eafeff2beb5 SHA1 5c6f6c814c1ab7e1e348de4b082d3c8cf8b92b27 SHA256 7477b022a73f0177da3dcdfcd5ff5381b040971439767b291ec57eb7406a7e44
 MISC metadata.xml 500 RMD160 255d59a4fbb851d92699a1afcaea65eebc3e70ff SHA1 f2f800316e99b1098d43b40594bb48caa59b3d6c SHA256 43f14d2a789d78fe087e129848bb7925ca2700197bbd4b96995364c303d97ea9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBAgAGBQJL6eNmAAoJECaGw+YFKA1pfKoP/0MDLeDGaz9HYffmsd5oDZtq
+Fr5e4lYvKRwh9FzGXFvPjeNbgfBLpeWDnmY/IJmy/4Hu9x4eaxGMwFQvB3K+9/X7
+TWRUbfogopPxVXcg2x4Y28x8BnC8BbER8IS8glp95uoPD7ZNmBsB3dKyy4shQtlD
+i716xWZjuMIEHQiW9GUjriKlqu37ihsI0f1WlMIlG3EVyKsAqBnYkLAqoRGubG+x
+ZX8G9yRq26qPIL/HNHgDDZkGcxtpPuUIvx28Zpb6nHmtmSoCDbXpKhZewPzEDf/D
+cKSSl1zBEmu2JXyOUerxGXRCa7H/8twXz13iuSiV+A4JNebDA5x2oRJAzSTOe9T7
+9Y+s0FG5bbc/huSxwn+zBjf2mChQfgMOxhreNHlC8mzhrj/TAgRjxrF4ZreeazFj
+mlX4/xJFt6QMkeNbcqY37Ew585n5k6gCKwSvO8k1rk20MfpRiYNzgh9J1JmV+wq+
+7kPmtg6Heg9H3DR6iXBTseha/CmC0nPHzoZjdFFmxG7Llv9OSwWtffriyLxsEsgH
+bkv50hC5BEOTQNwWod9ZhCWNrhWA3Vp0jLYPFZl13byKFnzMKuIJtOCQJ8ydQiar
+9sCcD9LJAJrq/EEX0i3BQ+98RuiyGBcexYOfVlVeNcJZSTVEb9ROtt1zkSgMf7vd
+UM9p5vM+yKLs4mjRn0iY
+=y3+q
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.2.1-r1.ebuild b/app-i18n/ibus/ibus-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..922626447d2e
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.2.1-r1.ebuild
@@ -0,0 +1,106 @@
+# 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.2.1-r1.ebuild,v 1.1 2010/05/11 23:07:47 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 nls"
+
+RDEPEND=">=dev-libs/glib-2.18
+	>=x11-libs/gtk+-2
+	>=gnome-base/gconf-2.12
+	>=gnome-base/librsvg-2
+	sys-apps/dbus
+	app-text/iso-codes
+	x11-libs/libX11
+	>=dev-python/pygobject-2.14
+	dev-python/notify-python
+	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}
+	dev-python/pygtk
+	>=dev-python/dbus-python-0.83
+	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
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_enable nls) || 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
+
+	python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+
+	python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus/ibus-1.3.2.ebuild b/app-i18n/ibus/ibus-1.3.3-r1.ebuild
index 88e1cdc02477..b3debf984b45 100644
--- a/app-i18n/ibus/ibus-1.3.2.ebuild
+++ b/app-i18n/ibus/ibus-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2010/04/23 17:45:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.3-r1.ebuild,v 1.1 2010/05/11 23:07:47 matsuu Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.5"
@@ -52,6 +52,10 @@ update_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