Version bumped.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 10 insertions, 115 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index b7f632281e55..8cb809abadf8 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.34 2009/07/23 22:51:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.35 2009/08/10 23:44:58 matsuu Exp $
+
+*ibus-1.2.0.20090810 (10 Aug 2009)
+
+  10 Aug 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-1.2.0.20090617.ebuild, -ibus-1.2.0.20090719.ebuild,
+  +ibus-1.2.0.20090810.ebuild:
+  Version bumped. Removed old versions.
 
 *ibus-1.2.0.20090723 (23 Jul 2009)
 
diff --git a/app-i18n/ibus/ibus-1.2.0.20090719.ebuild b/app-i18n/ibus/ibus-1.2.0.20090719.ebuild
deleted file mode 100644
index 174ee5455f77..000000000000
--- a/app-i18n/ibus/ibus-1.2.0.20090719.ebuild
+++ /dev/null
@@ -1,104 +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.20090719.ebuild,v 1.1 2009/07/19 06:07:48 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="doc nls qt4"
-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"
-#	qt4? (
-#		>=x11-libs/qt-core-4.4:4
-#		>=x11-libs/qt-dbus-4.4:4
-#	)
-
-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
-	eautomake
-}
-
-src_compile() {
-	# qt4-immodule won't work
-	# http://code.google.com/p/ibus/issues/detail?id=341
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) || die
-#		$(use_enable qt4 qt4-immodule)
-	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
-	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=\"${qt_im_module}\""
-	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.20090617.ebuild b/app-i18n/ibus/ibus-1.2.0.20090810.ebuild
index 39e482d5f44f..e53dce9c7553 100644
--- a/app-i18n/ibus/ibus-1.2.0.20090617.ebuild
+++ b/app-i18n/ibus/ibus-1.2.0.20090810.ebuild
@@ -1,6 +1,6 @@
 # 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.20090617.ebuild,v 1.1 2009/06/18 15:38:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20090810.ebuild,v 1.1 2009/08/10 23:44:58 matsuu Exp $
 
 EAPI="1"
 inherit autotools eutils multilib python
@@ -12,7 +12,6 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-#IUSE="doc nls qt4"
 IUSE="doc nls"
 
 RDEPEND=">=dev-libs/glib-2.18
@@ -33,10 +32,6 @@ RDEPEND="${RDEPEND}
 	dev-python/pygtk
 	>=dev-python/dbus-python-0.83
 	dev-python/pyxdg"
-#	qt4? (
-#		>=x11-libs/qt-core-4.4:4
-#		>=x11-libs/qt-dbus-4.4:4
-#	)
 
 pkg_setup() {
 	# An arch specific config directory is used on multilib systems
@@ -59,7 +54,6 @@ src_compile() {
 	econf \
 		$(use_enable doc gtk-doc) \
 		$(use_enable nls) || die
-#		$(use_enable qt4 qt4-immodule)
 	emake || die
 }
 
@@ -70,8 +64,6 @@ src_install() {
 }
 
 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."
@@ -87,7 +79,7 @@ pkg_postinst() {
 	elog
 	elog "   export XMODIFIERS=\"@im=ibus\""
 	elog "   export GTK_IM_MODULE=\"ibus\""
-	elog "   export QT_IM_MODULE=\"${qt_im_module}\""
+	elog "   export QT_IM_MODULE=\"xim\""
 	elog "   ibus-daemon -d -x"
 
 	[ "${ROOT}" = "/" -a -x /usr/bin/gtk-query-immodules-2.0 ] && \