Fixed dependency and QA issue. Cleanup.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 108 insertions, 2 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 51281f866e4d..5285ac131f5d 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.11 2008/10/07 16:09:16 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.12 2008/10/15 15:58:40 matsuu Exp $
+
+*ibus-0.1.1.20081006-r1 (15 Oct 2008)
+
+  15 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +ibus-0.1.1.20081006-r1.ebuild:
+  Fixed dependency and QA issue. Cleanup.
 
   07 Oct 2008; MATSUU Takuto <matsuu@gentoo.org>
   -ibus-0.1.1.20081005.ebuild, ibus-0.1.1.20081006.ebuild:
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index d547bb1ece38..7cd8343d66c8 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,4 +1,5 @@
 DIST ibus-0.1.1.20081006.tar.gz 680679 RMD160 cf943ab6b1fcd3c3426084090bc9b7675ee578d2 SHA1 9997de8dd0dffae9e3ca35c08e125e137d9f3e18 SHA256 833f5df969d0a3058efd85418089c0657ce72504cfcf475b0a143ab00bd0b06f
+EBUILD ibus-0.1.1.20081006-r1.ebuild 2500 RMD160 c81bdec1276993ba19d14b9e654860421691579a SHA1 1e470c5c0c16ea58ba439b198d5b8851bdcba76b SHA256 d7fef2db012402c962b841a014b09fd7e0998cf0aecf27b08e8c3622192e9f2d
 EBUILD ibus-0.1.1.20081006.ebuild 2186 RMD160 6046d85db29112ea389264a4dabf5481f4119a6f SHA1 651e63c4b842fed86d34abeb65dc9251073d9046 SHA256 b04c2dfc4d62986814f380dd3deb2c58960669e25c16d9a9dab13a865f6c81cf
-MISC ChangeLog 2001 RMD160 9f9fa119bab1a7f6804f080042b8ec6149950043 SHA1 79a98b48bb3124ea95177f17881cc9b40b0ca331 SHA256 bad047b491740b4b2dfd266f0c5d7dc98bfbd53817d4c9709432567f01fcf5a7
+MISC ChangeLog 2166 RMD160 11be660e17763d1d37f69e8fce2e0c8c08a39e90 SHA1 6822a98ecf82b133c57cdf5cd85402c32ea022a6 SHA256 07b539b1db07eb86b3be6b74df13325e9998cad4b8c2fc0d372ce4a4a1b03416
 MISC metadata.xml 412 RMD160 247791c63e8fc156c797836fca009b16f2ea30ab SHA1 f517966af22d725ade7672c3e346c8daf60b6461 SHA256 5d29d40b2dfff9cbbfbe9baacec5a3a8cefdfe99544bfe487547b9c5583901f5
diff --git a/app-i18n/ibus/ibus-0.1.1.20081006-r1.ebuild b/app-i18n/ibus/ibus-0.1.1.20081006-r1.ebuild
new file mode 100644
index 000000000000..b45abb31be8a
--- /dev/null
+++ b/app-i18n/ibus/ibus-0.1.1.20081006-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20081006-r1.ebuild,v 1.1 2008/10/15 15:58:40 matsuu Exp $
+
+EAPI="1"
+inherit autotools 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="nls qt4"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	dev-libs/dbus-glib
+	qt4? ( || (
+		(
+			>=x11-libs/qt-core-4.4:4
+			>=x11-libs/qt-dbus-4.4:4
+		)
+		>=x11-libs/qt-4.4:4
+	) )
+	app-text/iso-codes
+	x11-libs/libX11
+	>=dev-lang/python-2.5
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+	dev-python/pygtk
+	>=dev-python/dbus-python-0.83
+	dev-python/pyxdg
+	x11-misc/notification-daemon
+	|| (
+		dev-python/gconf-python
+		dev-python/gnome-python
+	)"
+
+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
+	sed -i -e '/QMAKE/s/$/ "CONFIG+=nostrip"/' client/qt4/Makefile.am || die
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable qt4 qt4-immodule) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	local qt_im_module="xim"
+	use qt4 && qt_im_module="ibus"
+
+	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 "2. Set the following in your"
+	elog "   user startup scripts such as .xinitrc or .bashrc"
+	elog
+	elog "   export XMODIFIERS=\"@im=ibus\""
+	elog "   export GTK_IM_MODULE=\"ibus\""
+	elog "   export QT_IM_MODULE=\"${qt_im_module}\""
+	elog "   ibus &"
+
+	[ "${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}
+}