Version bumped.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 15 insertions, 238 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index f645cc77f97e..68117074dddf 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.66 2010/07/17 15:55:28 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.67 2010/08/06 17:08:06 matsuu Exp $
+
+*ibus-1.3.7 (05 Aug 2010)
+
+  05 Aug 2010; MATSUU Takuto <matsuu@gentoo.org> +ibus-1.3.7.ebuild:
+  Version bumped.
 
   17 Jul 2010; Tobias Klausmann <klausman@gentoo.org>
   ibus-1.2.0.20100111.ebuild:
diff --git a/app-i18n/ibus/ibus-1.3.4.ebuild b/app-i18n/ibus/ibus-1.3.4.ebuild
deleted file mode 100644
index 912f7c481049..000000000000
--- a/app-i18n/ibus/ibus-1.3.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.4.ebuild,v 1.1 2010/05/29 08:06:21 matsuu Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2:2.5"
-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 +gconf nls +python"
-
-RDEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2
-	gconf? ( >=gnome-base/gconf-2.12 )
-	>=gnome-base/librsvg-2
-	sys-apps/dbus
-	app-text/iso-codes
-	x11-libs/libX11
-	python? (
-		dev-python/notify-python
-		>=dev-python/dbus-python-0.83
-	)
-	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}
-	python? (
-		dev-python/pygtk
-		dev-python/pyxdg
-	)"
-
-RESTRICT="test"
-
-update_gtk_immodules() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		GTK2_CONFDIR="/etc/gtk-2.0"
-		# An arch specific config directory is used on multilib systems
-		has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
-		mkdir -p "${ROOT}${GTK2_CONFDIR}"
-		gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	echo "ibus/_config.py" >> po/POTFILES.skip || die
-	sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable gconf) \
-		$(use_enable nls) \
-		$(use_enable python) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# bug 289547
-	keepdir /usr/share/ibus/{engine,icons} || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-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"
-
-	update_gtk_immodules
-
-	use python && python_mod_optimize /usr/share/${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	update_gtk_immodules
-
-	use python && python_mod_cleanup /usr/share/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus/ibus-1.3.5.ebuild b/app-i18n/ibus/ibus-1.3.5.ebuild
deleted file mode 100644
index 3375ef1245c6..000000000000
--- a/app-i18n/ibus/ibus-1.3.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.5.ebuild,v 1.1 2010/06/15 17:58:35 matsuu Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2:2.5"
-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 +gconf gtk nls +python vala X"
-
-RDEPEND=">=dev-libs/glib-2.18
-	x11-libs/gtk+:2
-	gconf? ( >=gnome-base/gconf-2.12 )
-	>=gnome-base/librsvg-2
-	sys-apps/dbus
-	app-text/iso-codes
-	python? (
-		dev-python/notify-python
-		>=dev-python/dbus-python-0.83
-	)
-	nls? ( virtual/libintl )
-	vala? ( dev-lang/vala )
-	X? ( x11-libs/libX11 )"
-#	x11-libs/gtk+:3
-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}
-	python? (
-		dev-python/pygtk
-		dev-python/pyxdg
-	)"
-
-RESTRICT="test"
-
-update_gtk_immodules() {
-	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
-		GTK2_CONFDIR="/etc/gtk-2.0"
-		# An arch specific config directory is used on multilib systems
-		has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
-		mkdir -p "${ROOT}${GTK2_CONFDIR}"
-		gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	echo "ibus/_config.py" >> po/POTFILES.skip || die
-	sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk2) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable vala) \
-		$(use_enable X xim) || die
-		#$(use_enable gtk gtk3) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# bug 289547
-	keepdir /usr/share/ibus/{engine,icons} || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-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"
-
-	update_gtk_immodules
-
-	use python && python_mod_optimize /usr/share/${PN}
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	update_gtk_immodules
-
-	use python && python_mod_cleanup /usr/share/${PN}
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus/ibus-1.3.5-r1.ebuild b/app-i18n/ibus/ibus-1.3.7.ebuild
index 1d62227b8fc7..63714716676e 100644
--- a/app-i18n/ibus/ibus-1.3.5-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.5-r1.ebuild,v 1.1 2010/06/17 13:30:19 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild,v 1.1 2010/08/06 17:08:06 matsuu Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.5"
@@ -12,9 +12,8 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#IUSE="doc +gconf gtk nls +python vala X"
-IUSE="doc +gconf gtk nls +python vala"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="doc +gconf gtk nls +python vala X"
 
 RDEPEND=">=dev-libs/glib-2.18
 	gconf? ( >=gnome-base/gconf-2.12 )
@@ -22,6 +21,9 @@ RDEPEND=">=dev-libs/glib-2.18
 	sys-apps/dbus
 	app-text/iso-codes
 	gtk? (
+		x11-libs/gtk+:2
+	)
+	X? (
 		x11-libs/libX11
 		x11-libs/gtk+:2
 	)
@@ -71,14 +73,14 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-html) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
 		$(use_enable gtk xim) \
 		$(use_enable nls) \
 		$(use_enable python) \
-		$(use_enable vala) || die
-		# Bug 324339
-		#$(use_enable X xim) \
+		$(use_enable vala) \
+		$(use_enable X xim) || die
 		#$(use_enable gtk gtk3) \
 }