From 2c34bb23f4575419d2c5e467850033a7c541df0a Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Tue, 7 Oct 2008 16:09:16 +0000 Subject: Fixed dependency. Clean up. (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) --- app-i18n/ibus/ChangeLog | 6 ++- app-i18n/ibus/ibus-0.1.1.20081005.ebuild | 90 -------------------------------- app-i18n/ibus/ibus-0.1.1.20081006.ebuild | 16 +++--- 3 files changed, 13 insertions(+), 99 deletions(-) delete mode 100644 app-i18n/ibus/ibus-0.1.1.20081005.ebuild diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog index 807236465ce0..51281f866e4d 100644 --- a/app-i18n/ibus/ChangeLog +++ b/app-i18n/ibus/ChangeLog @@ -1,6 +1,10 @@ # 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.10 2008/10/06 16:56:39 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.11 2008/10/07 16:09:16 matsuu Exp $ + + 07 Oct 2008; MATSUU Takuto + -ibus-0.1.1.20081005.ebuild, ibus-0.1.1.20081006.ebuild: + Fixed dependency. Clean up. *ibus-0.1.1.20081006 (06 Oct 2008) diff --git a/app-i18n/ibus/ibus-0.1.1.20081005.ebuild b/app-i18n/ibus/ibus-0.1.1.20081005.ebuild deleted file mode 100644 index 94080bbb50be..000000000000 --- a/app-i18n/ibus/ibus-0.1.1.20081005.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# 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.20081005.ebuild,v 1.1 2008/10/05 15:41:49 matsuu Exp $ - -EAPI="1" -inherit multilib - -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" -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 - dev-python/gconf-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_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() { - ewarn "This package is very experimental, please report your bug to" - ewarn "http://ibus.googlecode.com/issues/list" - elog - 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=\"ibus\"" - elog " ibus &" - elog - if ! use qt4; then - ewarn "Missing qt4 use flag, ibus will not work in qt4 applications." - ebeep 3 - fi - elog - - if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then - gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" - fi -} - -pkg_postrm() { - if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then - gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" - fi -} diff --git a/app-i18n/ibus/ibus-0.1.1.20081006.ebuild b/app-i18n/ibus/ibus-0.1.1.20081006.ebuild index d87087e47355..84ecc5bbdb5c 100644 --- a/app-i18n/ibus/ibus-0.1.1.20081006.ebuild +++ b/app-i18n/ibus/ibus-0.1.1.20081006.ebuild @@ -1,9 +1,9 @@ # 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.ebuild,v 1.1 2008/10/06 16:56:39 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20081006.ebuild,v 1.2 2008/10/07 16:09:16 matsuu Exp $ EAPI="1" -inherit multilib +inherit eutils multilib DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" HOMEPAGE="http://code.google.com/p/ibus/" @@ -35,7 +35,10 @@ RDEPEND="${RDEPEND} dev-python/pygtk >=dev-python/dbus-python-0.83 dev-python/pyxdg - dev-python/gconf-python" + || ( + dev-python/gconf-python + dev-python/gnome-python + )" pkg_setup() { # An arch specific config directory is used on multilib systems @@ -57,9 +60,6 @@ src_install() { } pkg_postinst() { - ewarn "This package is very experimental, please report your bug to" - ewarn "http://ibus.googlecode.com/issues/list" - elog elog "To use ibus, you should:" elog "1. Get input engines from sunrise overlay." elog " Run \"emerge -s ibus-\" in your favorite terminal" @@ -71,10 +71,10 @@ pkg_postinst() { elog " export GTK_IM_MODULE=\"ibus\"" elog " export QT_IM_MODULE=\"ibus\"" elog " ibus &" - elog + if ! use qt4; then ewarn "Missing qt4 use flag, ibus will not work in qt4 applications." - ebeep 3 + ebeep 5 fi elog -- cgit v1.2.3-65-gdbad