Fixed dependency. Add keepdir and gnome2_icon_cache_update, bug #289547.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 18 insertions, 95 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index fe0f32111733..1242b03dc4f9 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2009/10/17 17:14:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.43 2009/10/19 16:39:42 matsuu Exp $
+
+*ibus-1.2.0.20091014-r1 (19 Oct 2009)
+
+  19 Oct 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-1.2.0.20090904.ebuild, -ibus-1.2.0.20090915.ebuild,
+  +ibus-1.2.0.20091014-r1.ebuild:
+  Fixed dependency. Add keepdir and gnome2_icon_cache_update, bug #289547.
+  Removed old versions.
 
 *ibus-1.2.0.20091014 (17 Oct 2009)
 
diff --git a/app-i18n/ibus/ibus-1.2.0.20090915.ebuild b/app-i18n/ibus/ibus-1.2.0.20090915.ebuild
deleted file mode 100644
index b49dc0fe0704..000000000000
--- a/app-i18n/ibus/ibus-1.2.0.20090915.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.20090915.ebuild,v 1.1 2009/09/15 15:33:24 matsuu Exp $
-
-EAPI="1"
-inherit eutils 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
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	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"
-
-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
-}
-
-src_compile() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	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}
-}
-
-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}
-}
diff --git a/app-i18n/ibus/ibus-1.2.0.20090904.ebuild b/app-i18n/ibus/ibus-1.2.0.20091014-r1.ebuild
index 79228b6deed3..88c88b32f3e5 100644
--- a/app-i18n/ibus/ibus-1.2.0.20090904.ebuild
+++ b/app-i18n/ibus/ibus-1.2.0.20091014-r1.ebuild
@@ -1,9 +1,9 @@
 # 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.20090904.ebuild,v 1.1 2009/09/07 23:57:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20091014-r1.ebuild,v 1.1 2009/10/19 16:39:42 matsuu Exp $
 
 EAPI="1"
-inherit eutils multilib python
+inherit eutils gnome2-utils multilib python
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -25,6 +25,8 @@ RDEPEND=">=dev-libs/glib-2.18
 	>=dev-python/pygobject-2.14
 	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 )"
@@ -56,6 +58,9 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	# bug 289547
+	keepdir /usr/share/ibus/{engine,icons}
+
 	dodoc AUTHORS ChangeLog NEWS README
 }
 
@@ -82,6 +87,7 @@ pkg_postinst() {
 		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
 
 	python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
@@ -89,4 +95,5 @@ pkg_postrm() {
 		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
 
 	python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
 }