Version bumped. Fixed python dependency, bug #311211. Added new USE flags.

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

4 files changed, 135 insertions, 16 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 7d2761cf6568..257ff46ede7a 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2010/03/27 07:03:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.56 2010/04/03 04:03:39 matsuu Exp $
+
+*ibus-1.3.1 (03 Apr 2010)
+
+  03 Apr 2010; MATSUU Takuto <matsuu@gentoo.org> +ibus-1.3.1.ebuild,
+  metadata.xml:
+  Version bumped. Fixed python dependency, bug #311211. Added new USE flags.
 
 *ibus-1.2.1 (27 Mar 2010)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 3c1146117ecd..d08c93734c25 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -5,26 +5,28 @@ DIST ibus-1.1.0.20090829.tar.gz 1233331 RMD160 a96d6802c199c1373462b4a37875bc345
 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.0.tar.gz 1236755 RMD160 ce403dfcd53d282b94c6bc83986793be422f1f84 SHA1 9153a84b5affca5950f930c21c24da73295b8280 SHA256 4a38a64770c80b8bdb4e65d689b27494a6ae28befe0d555048f8b9cf0ccce372
+DIST ibus-1.3.1.tar.gz 1243636 RMD160 8778e91747367566c841e34217a88bb2a76af8f8 SHA1 adb5d1d4d80f0c4d56c53437363dad7f41f53b9a SHA256 839a00b2997deca0b1d7e18e832339ee27175b918ff9606f6a2cf45c4f885a8c
 EBUILD ibus-1.1.0.20090829.ebuild 2329 RMD160 7b3acc3327d942d1f0aea9b147a282d2f48808d5 SHA1 7f0a7da808c486611ec10e011f17186f960bed72 SHA256 8b8c0919d3504402a4bddea49356be4bf1a0b070c9db3aa1e9a11e21cacd10db
 EBUILD ibus-1.2.0.20100111.ebuild 2587 RMD160 23a53da21cde5d48927eac1871f09bbeede594af SHA1 a8ad2777c9f61b81a23c602c7b81347deb015630 SHA256 8c74b19604d293719882b3a7ec3fa61a1eeec297181504c8ee74e64ac07c42a6
 EBUILD ibus-1.2.1.ebuild 2592 RMD160 8af05162b45b7e9dd43b45bc29750b7cf6d3a70a SHA1 cb084099c851f3b3ee5238c970e036e247e109d5 SHA256 adff45115361d51728f10c9f0031de90db159fde0e7edeb8155ad7e87a3662c7
 EBUILD ibus-1.3.0.ebuild 2592 RMD160 e889a869275f23fc0347c78b3f96dc7323cfa0ce SHA1 578be14a95581423ac1a35901c167416c5340bca SHA256 eb775f25b76e613db2f0344772b989f9164a3428a579cca61e48512488b52b0a
-MISC ChangeLog 9249 RMD160 9cb6deac56414f4216a79cef65d365c2d1ca65b7 SHA1 002d5e2c97f6c80c34acebd9872705775ef219ae SHA256 3ba500c6045003c4c2749237670933d6e064991efccb0c7e007abdf818f9eab8
-MISC metadata.xml 412 RMD160 247791c63e8fc156c797836fca009b16f2ea30ab SHA1 f517966af22d725ade7672c3e346c8daf60b6461 SHA256 5d29d40b2dfff9cbbfbe9baacec5a3a8cefdfe99544bfe487547b9c5583901f5
+EBUILD ibus-1.3.1.ebuild 2635 RMD160 4e08e09deb8bd8d8ec249c7dcee2d9ce143780bc SHA1 22a837e5561c31436009f807054d19b1f622a540 SHA256 fafd94cbeff9340f38b00089fbd38a30323dbc24a04f240f45bed9a1b6fe5b76
+MISC ChangeLog 9439 RMD160 6fa6521211fce1bdd0241f0118e3fcd0f70bc515 SHA1 f4f4edc5347509a625e91c4ce9cc6bb416277d9c SHA256 36b5c3dceb0f8e97e09865b07e8fe6193f64ccc226ea2941c85246ebcea65081
+MISC metadata.xml 500 RMD160 255d59a4fbb851d92699a1afcaea65eebc3e70ff SHA1 f2f800316e99b1098d43b40594bb48caa59b3d6c SHA256 43f14d2a789d78fe087e129848bb7925ca2700197bbd4b96995364c303d97ea9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBAgAGBQJLra3MAAoJECaGw+YFKA1pcIgQAJ8IuwYBwshWJvVRzJhEoE5b
-elnHnQHugT77b4wFEAiZCYGKb32epC1MrR84yNKgq865xQx45V4rmhaIQnmFzrC3
-Jd9J039c7vc1CMjgysJ9PmKLiQf6j4K4bnFIObmp9eXvC7GtdmY12rtALMTXYTJk
-iyinH/2ZXMVxp64bn4IhRmL6QChMQhnXJX4ODdlO8I5sBy6IBP5hKkcfcbvB1jlr
-XSIAM6V6rle7kAgaG7gRk2gFXaCiRf+YTkMETW/nl4YgiTniXiAKu+DpPk0iUW+Y
-uPJMHYqJ0OE/IfhnVFelvx1aAYGHt4J/DftnsHBqbz+3dCif6K2HdCgnPaf/dOmF
-MUvqFnHXSMc/qEzUHq6HqSTyc+T/QxejjfzOdBhFOz5MLpwAx8ectG26KwDFpLXk
-tYdSjWKFdhJxrKuq8uBqSxrmU+UsqOmKRNW3dGGnLvUY0dG72rAkPnPgWz9gnzTe
-rGV1QYyp8jfYX1/GFDESy1u9MvOMiaJafo5AgaJP2WKMuOtyoT0lFlOp+DxQmssd
-owV1T28V1o5wrrU5dfu7lv0ufc93D/7qbqGnkUOY7i+Op2PUfRn5+sbePZfDyiY7
-zHbL4wdu327HQ1QkVN9B+dFtTX9Ein29zWjTIIK3rmYffyvCzKkCiqUx4ttrMonV
-de0GjMrRgRg2QEImCYQB
-=SrMj
+iQIcBAEBAgAGBQJLtr4kAAoJECaGw+YFKA1pf3IQAIMY6yws5sYUaO4yH9RQDazg
+FFYCRUroLxDims9oTjnYM4dsoOjccvxyxjfqOV6l8kRl4FLFL+wGGUnaVIGuGpYU
+b589rqU+YUn1mwn/an/ZO8nDsOKOq/bepgFHs1VuFshMAzBdVutG5qyZmTg/cUte
+pWJ+wVvALV8RUv2M4V3LtvCdl54vtVEDUqR/ifNbiQHOPAUtkl9qArNENohaZ1U6
+tVV0v77Vx6QP74H1QsnYxSMBGEo1WAGK3YLM0+WJAP7D71/yzt9i+i6FeDl0UqeR
+rwiDKeJiB861TOV1Yi50Gb6j6tRjNRMqABl99mNXTviYgEgga7JJZcJhbJaulYSP
+/kJtrIEdw9jVepLpByP/LrZyNf18rKRpeR3MCBu22NSN/CrEc63DDUEq5NBP55Vm
+Q9WVpQNwFR2wJO4EpykPikFB9PSF34dPgyERDD3HEOR9FzbndvVA37xk+rTSaSvR
+OkjxkLYnTLJWoXKQsuH6tJfxdEn8hzX9X6BMtf+rFIEbRvUlpfCTNRWlN3dhXLwR
+QNzYd6gnIM1d2wL9v+oIb/7pWB4L9DMd3YmpLa9k3IxOz6ZaRQBOZ/rzjns94xMg
+wsV1oM3lxY0eavqikCWlPqelieCVAlDTgikhyXvPVdxCRkL9UERs2Go1w7Wjcjvq
+VSjDikrwKs5GGXUg0nE3
+=DueR
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.3.1.ebuild b/app-i18n/ibus/ibus-1.3.1.ebuild
new file mode 100644
index 000000000000..4f943633bbb3
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.3.1.ebuild
@@ -0,0 +1,108 @@
+# 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.1.ebuild,v 1.1 2010/04/03 04:03:39 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
+}
+
+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 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
+}
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 540ea09db689..3a1797ecc644 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -7,4 +7,7 @@ IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It p
 full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.
 </longdescription>
+<use>
+  <flag name='gconf'>Enable support for <pkg>gnome-base/gconf</pkg></flag>
+</use>
 </pkgmetadata>