Version bumped.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 54 insertions, 332 deletions

diff --git a/app-i18n/ibus-unikey/ChangeLog b/app-i18n/ibus-unikey/ChangeLog
index 19a0950c4702..07b512b1b0d4 100644
--- a/app-i18n/ibus-unikey/ChangeLog
+++ b/app-i18n/ibus-unikey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus-unikey
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ChangeLog,v 1.2 2010/04/14 16:42:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ChangeLog,v 1.3 2010/06/15 17:56:12 matsuu Exp $
+
+*ibus-unikey-0.5 (15 Jun 2010)
+
+  15 Jun 2010; MATSUU Takuto <matsuu@gentoo.org> +ibus-unikey-0.5.ebuild:
+  Version bumped.
 
 *ibus-unikey-0.4 (14 Apr 2010)
 
diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild
new file mode 100644
index 000000000000..a7258ebe06f0
--- /dev/null
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-unikey/ibus-unikey-0.5.ebuild,v 1.1 2010/06/15 17:56:12 matsuu Exp $
+
+EAPI="2"
+
+DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
+HOMEPAGE="http://code.google.com/p/ibus-unikey/"
+SRC_URI="http://ibus-unikey.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/ibus-1.2
+	gnome-base/gconf:2
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 2b3716168ec6..537e61470cb5 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2010/05/29 08:06:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.63 2010/06/15 17:58:35 matsuu Exp $
+
+*ibus-1.3.5 (15 Jun 2010)
+
+  15 Jun 2010; MATSUU Takuto <matsuu@gentoo.org> -ibus-1.2.1.ebuild,
+  -ibus-1.3.3.ebuild, -ibus-1.3.3-r1.ebuild, -ibus-1.3.3-r2.ebuild,
+  +ibus-1.3.5.ebuild, metadata.xml:
+  Version bumped. Removed old versions.
 
 *ibus-1.3.4 (29 May 2010)
 
diff --git a/app-i18n/ibus/ibus-1.2.1.ebuild b/app-i18n/ibus/ibus-1.2.1.ebuild
deleted file mode 100644
index 8cbb4efc20da..000000000000
--- a/app-i18n/ibus/ibus-1.2.1.ebuild
+++ /dev/null
@@ -1,103 +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.2.1.ebuild,v 1.1 2010/03/27 07:03:28 matsuu Exp $
-
-EAPI="1"
-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 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
-	dev-python/notify-python
-	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}
-	dev-python/pygtk
-	>=dev-python/dbus-python-0.83
-	dev-python/pyxdg"
-
-RESTRICT="test"
-
-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
-	echo "ibus/_config.py" >> po/POTFILES.skip || die
-}
-
-src_compile() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable nls) || die
-	emake || 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"
-
-	[ "${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}
-	gnome2_icon_cache_update
-}
-
-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}
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus/ibus-1.3.3-r1.ebuild b/app-i18n/ibus/ibus-1.3.3-r1.ebuild
deleted file mode 100644
index b3debf984b45..000000000000
--- a/app-i18n/ibus/ibus-1.3.3-r1.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.3-r1.ebuild,v 1.1 2010/05/11 23:07:47 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/pygobject-2.14
-		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
-}
-
-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.3.ebuild b/app-i18n/ibus/ibus-1.3.3.ebuild
deleted file mode 100644
index 567b07bc84a7..000000000000
--- a/app-i18n/ibus/ibus-1.3.3.ebuild
+++ /dev/null
@@ -1,108 +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.3.ebuild,v 1.1 2010/05/07 16:14:57 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/pygobject-2.14
-		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
-}
-
-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
-}
-
-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.3-r2.ebuild b/app-i18n/ibus/ibus-1.3.5.ebuild
index 49486bbd3167..3375ef1245c6 100644
--- a/app-i18n/ibus/ibus-1.3.3-r2.ebuild
+++ b/app-i18n/ibus/ibus-1.3.5.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.3-r2.ebuild,v 1.1 2010/05/14 16:43:36 matsuu Exp $
+# $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"
@@ -13,21 +13,22 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +gconf nls +python"
+IUSE="doc +gconf gtk nls +python vala X"
 
 RDEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-2
+	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/pygobject-2.14
 		dev-python/notify-python
 		>=dev-python/dbus-python-0.83
 	)
-	nls? ( virtual/libintl )"
+	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
@@ -67,8 +68,12 @@ src_configure() {
 	econf \
 		$(use_enable doc gtk-doc) \
 		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
 		$(use_enable nls) \
-		$(use_enable python) || die
+		$(use_enable python) \
+		$(use_enable vala) \
+		$(use_enable X xim) || die
+		#$(use_enable gtk gtk3) \
 }
 
 src_install() {
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 3a1797ecc644..5ec6adab3420 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -9,5 +9,6 @@ developers to develop input method easily.
 </longdescription>
 <use>
   <flag name='gconf'>Enable support for <pkg>gnome-base/gconf</pkg></flag>
+  <flag name='vala'>Enable support for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>