Fixed dependency, bug #298936.

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

3 files changed, 112 insertions, 2 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 48a4bb715f3b..ad28d62368ae 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.48 2009/12/26 17:47:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.49 2009/12/31 09:59:23 matsuu Exp $
+
+*ibus-1.2.0.20091225-r1 (31 Dec 2009)
+
+  31 Dec 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +ibus-1.2.0.20091225-r1.ebuild:
+  Fixed dependency, bug #298936.
 
 *ibus-1.2.0.20091225 (26 Dec 2009)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index dff83ab88638..9c6ac6546921 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -9,6 +9,7 @@ EBUILD ibus-1.2.0.20091024.ebuild 2544 RMD160 477a29012867393f5e2fdc8bf2350d4d23
 EBUILD ibus-1.2.0.20091124.ebuild 2544 RMD160 76643704711a6ccccd5922b1e5789bfc14b8a112 SHA1 fcfdb52ac4a241e7b4bb1b9d73829fd22ecf85fc SHA256 eb4777f1a5d7115fcaf369c858e0fbb11e612ad8d9821228b08d5877740f416b
 EBUILD ibus-1.2.0.20091204.ebuild 2544 RMD160 eccd39b20e8a8407d11f5e887d3e8fec4abefcda SHA1 52c8a164631c069ca3e7760e4658807adf2858f4 SHA256 b95a19e73a01b07c100162fe6dc739e194ca0d17357fd19b2f2c37e984b6958b
 EBUILD ibus-1.2.0.20091215.ebuild 2561 RMD160 d9b4ce13d8745c23bb0b876591e8f59161117444 SHA1 a959a354f60419600d922048d5df84b483c300bc SHA256 9b0340a3648f737f28dcad3191af68776787f4c578b35999e46074d9d6b48e42
+EBUILD ibus-1.2.0.20091225-r1.ebuild 2590 RMD160 cf01aa513c6519634f7ce5e7d5282797696710c1 SHA1 e243cb7ebf388f91fb370471ba2636d8fb70f833 SHA256 c3eea087838a7267b727e2000258c25806f403dfb78cd30266d2a2b5da415a71
 EBUILD ibus-1.2.0.20091225.ebuild 2532 RMD160 c5c38695f4dbbe094abd11c5ee71210c11c109dd SHA1 376c0f6998dea7ed81b0f186606951479d7196ac SHA256 76f2caad997c26c8a9b27fd7202e1753719468e8e152233836c6396f38dc5e77
-MISC ChangeLog 8100 RMD160 6fe97c7d848c36a269f4d662ce8b455666114498 SHA1 721dca27f8a646e952d57fd810e942bdf835f3c3 SHA256 e0982250381a4d279244281874dd2f6d5b0f9721a1ee0f19b77dafacdb3e2b6a
+MISC ChangeLog 8256 RMD160 4372d821cc8e9af6b46448991df0d00141d7b95e SHA1 4677faa36a3b4dfac203404db581d79b68122828 SHA256 26d5519878e450113fe01a6de9550853188b7d57df5c281e1b253c518bfd07c1
 MISC metadata.xml 412 RMD160 247791c63e8fc156c797836fca009b16f2ea30ab SHA1 f517966af22d725ade7672c3e346c8daf60b6461 SHA256 5d29d40b2dfff9cbbfbe9baacec5a3a8cefdfe99544bfe487547b9c5583901f5
diff --git a/app-i18n/ibus/ibus-1.2.0.20091225-r1.ebuild b/app-i18n/ibus/ibus-1.2.0.20091225-r1.ebuild
new file mode 100644
index 000000000000..2aa10e95a622
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.2.0.20091225-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20091225-r1.ebuild,v 1.1 2009/12/31 09:59:23 matsuu Exp $
+
+EAPI="1"
+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-lang/python-2.5
+	>=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"
+
+pkg_setup() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv py-compile py-compile.orig || die
+	ln -s "$(type -P true)" py-compile || die
+	echo "ibus/_config.py" >> po/POTFILES.skip || die
+}
+
+src_compile() {
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# bug 289547
+	keepdir /usr/share/ibus/{engine,icons}
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+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"
+
+	[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
+		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+
+	python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \
+		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+
+	python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}