Fixed dependency.

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

5 files changed, 10 insertions, 187 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 82b51822305a..822a5008a284 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2008/09/17 16:20:47 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.4 2008/09/20 00:17:13 matsuu Exp $
+
+  20 Sep 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-0.1.1.20080901.ebuild, -ibus-0.1.1.20080908.ebuild,
+  ibus-0.1.1.20080917.ebuild:
+  Fixed dependency. Removed old versions.
 
 *ibus-0.1.1.20080917 (17 Sep 2008)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 8025c064d372..df92907f17b9 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,8 +1,4 @@
-DIST ibus-0.1.1.20080901.tar.gz 630193 RMD160 e160730b7229aa7226dc915390dec7c3bd5c8b73 SHA1 536540bb57bd6c76790fa39796c93eb673f15207 SHA256 1775b67098050f5898176118db576de128d40dd6bb09731b0b6242022b3ea83d
-DIST ibus-0.1.1.20080908.tar.gz 633964 RMD160 88191e598dc2e071973b867122e044db8cc9a12c SHA1 b0cf678320112b71019e42efa47174bf34c0e57e SHA256 0c1c2d16cdf1cfeaad4f5f6ff3362e899936f2cf0541ebbd85d33bdcf9c404f4
 DIST ibus-0.1.1.20080917.tar.gz 680616 RMD160 67aa19c7c45210722627f369374ec8aa1c4376e9 SHA1 9bfc70f0014cc8cfab7277ea4f0551a12334a4e7 SHA256 b9e5d19bfa5fd511d6d56605726ebe0eca220286e1be503d9e84b7b2271f1dd4
-EBUILD ibus-0.1.1.20080901.ebuild 2250 RMD160 22ba2cd165d9bd21a3ab98d942cce9ee16ab621b SHA1 7210f4f712a823bb478fb17871d729e2d5080483 SHA256 589208496703c22c7bee9009a68a6950dcc7a1f78045e5387aa4e4fb43c82fec
-EBUILD ibus-0.1.1.20080908.ebuild 2250 RMD160 0fff5be861869eb9034c795a8b0f01295aba7fde SHA1 a33a4207cc93c447beeb23d6b042f081591dfe90 SHA256 5bad9a410fbb51d2e368d426c98d77bcd06a38bffa88e9b27fcf6c920496caf6
-EBUILD ibus-0.1.1.20080917.ebuild 2250 RMD160 36248573da037dd0a3aeae5b443885052b9b59de SHA1 7933c68a2436abaa4ed311c48100dac2e923e869 SHA256 bf89cf9c0d1f3d437bd6959001bf1c4d733df411dff824614a5418dcdc5d2f20
-MISC ChangeLog 667 RMD160 80539f222b6b621f3e27fa9558672cecd4cf4d19 SHA1 6c3cef9e55dc45aa226073cbaa37c6899184c0bb SHA256 5c7f3b7464c5ee49f9fe06da13fa44cc40f1d9ab0531d7be958a897ec4f400b6
+EBUILD ibus-0.1.1.20080917.ebuild 2250 RMD160 dd88dec6603a60ae74bf54a3484b620a3bfa3fe7 SHA1 601ac1d02d55629fbef8e0bf5d9b3864ab1309f4 SHA256 4336622cbab48f5ea399f1bfdab7a4d4a2f761ac1f115114b1b09c32b275f71e
+MISC ChangeLog 849 RMD160 1b9dcae1358cfe4ec7a2f0c259247cc1509d78e8 SHA1 bc19094b3101a87882775735316ff3b2a9bf1947 SHA256 96ed9d73b19d19f9307f4f2794cb8bca00f860d3f7b437f9630661ff584df381
 MISC metadata.xml 413 RMD160 78bf392cb0f922f9b1dbc39475d27dc90bd5c3e8 SHA1 8a2bcbd11ee50f43bd1211c6e484fe16126debe1 SHA256 fc7288848e696d0b27471658ee44467d2cdc7d7d40d38287cafa1299c20e00d4
diff --git a/app-i18n/ibus/ibus-0.1.1.20080901.ebuild b/app-i18n/ibus/ibus-0.1.1.20080901.ebuild
deleted file mode 100644
index 2942a6f0921d..000000000000
--- a/app-i18n/ibus/ibus-0.1.1.20080901.ebuild
+++ /dev/null
@@ -1,89 +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.20080901.ebuild,v 1.1 2008/09/05 23:47:14 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
-	) )
-	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/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_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.20080908.ebuild b/app-i18n/ibus/ibus-0.1.1.20080908.ebuild
deleted file mode 100644
index 965fba39b6d9..000000000000
--- a/app-i18n/ibus/ibus-0.1.1.20080908.ebuild
+++ /dev/null
@@ -1,89 +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.20080908.ebuild,v 1.1 2008/09/09 09:39:12 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
-	) )
-	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/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_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.20080917.ebuild b/app-i18n/ibus/ibus-0.1.1.20080917.ebuild
index 59c919a8d842..55cd2cb57136 100644
--- a/app-i18n/ibus/ibus-0.1.1.20080917.ebuild
+++ b/app-i18n/ibus/ibus-0.1.1.20080917.ebuild
@@ -1,6 +1,6 @@
 # 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.20080917.ebuild,v 1.1 2008/09/17 16:20:47 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-0.1.1.20080917.ebuild,v 1.2 2008/09/20 00:17:13 matsuu Exp $
 
 EAPI="1"
 inherit multilib
@@ -34,7 +34,7 @@ RDEPEND="${RDEPEND}
 	dev-python/pygtk
 	>=dev-python/dbus-python-0.83
 	dev-python/pyxdg
-	dev-python/gnome-python"
+	dev-python/gconf-python"
 
 pkg_setup() {
 	# An arch specific config directory is used on multilib systems