Fixed dependency.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 7 insertions, 80 deletions

diff --git a/app-i18n/ibus-table/ChangeLog b/app-i18n/ibus-table/ChangeLog
index f28d4b30f358..6c5fbd915cbf 100644
--- a/app-i18n/ibus-table/ChangeLog
+++ b/app-i18n/ibus-table/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/ibus-table
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ChangeLog,v 1.5 2009/01/04 13:51:53 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ChangeLog,v 1.6 2009/02/05 16:05:32 matsuu Exp $
+
+  05 Feb 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-table-0.1.1.20081115.ebuild, ibus-table-0.1.2.20090104.ebuild:
+  Fixed dependency. Removed old version.
 
 *ibus-table-0.1.2.20090104 (04 Jan 2009)
 
diff --git a/app-i18n/ibus-table/ibus-table-0.1.1.20081115.ebuild b/app-i18n/ibus-table/ibus-table-0.1.1.20081115.ebuild
deleted file mode 100644
index d402964fb3c1..000000000000
--- a/app-i18n/ibus-table/ibus-table-0.1.1.20081115.ebuild
+++ /dev/null
@@ -1,69 +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-table/ibus-table-0.1.1.20081115.ebuild,v 1.1 2008/11/16 17:14:56 matsuu Exp $
-
-EAPI="1"
-inherit eutils python
-
-DESCRIPTION="The Table Engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additional cangjie5 erbi-qs extra-phrases nls wubi zhengma"
-
-RDEPEND="app-i18n/ibus
-	>=dev-lang/python-2.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-pkg_setup() {
-	if ! built_with_use '>=dev-lang/python-2.5' sqlite; then
-		ewarn "You need build dev-lang/python with \"sqlite\" USE flag!"
-		die "Please rebuild dev-lang/python with sqlite USE flag!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_compile() {
-	econf \
-		$(use_enable additional) \
-		$(use_enable cangjie5) \
-		$(use_enable erbi-qs) \
-		$(use_enable extra-phrases) \
-		$(use_enable wubi wubi86) \
-		$(use_enable wubi wubi98) \
-		$(use_enable zhengma) \
-		$(use_enable nls) || die
-
-	# Parallel make uses a lot of memory to generate databases.
-	emake -j1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bugs to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	elog "You should run ibus-setup and enable IM Engines you want to use!"
-	elog
-	python_mod_optimize /usr/share/${PN}/engine
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}/engine
-}
diff --git a/app-i18n/ibus-table/ibus-table-0.1.2.20090104.ebuild b/app-i18n/ibus-table/ibus-table-0.1.2.20090104.ebuild
index 30699ec145ae..5d5c3743fcda 100644
--- a/app-i18n/ibus-table/ibus-table-0.1.2.20090104.ebuild
+++ b/app-i18n/ibus-table/ibus-table-0.1.2.20090104.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-table/ibus-table-0.1.2.20090104.ebuild,v 1.1 2009/01/04 13:51:53 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ibus-table-0.1.2.20090104.ebuild,v 1.2 2009/02/05 16:05:32 matsuu Exp $
 
 inherit eutils python
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="minimal nls"
 
-RDEPEND="app-i18n/ibus
+RDEPEND="=app-i18n/ibus-0.1*
 	>=dev-lang/python-2.5
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
index 77e37eff1eb0..34095f2d501a 100644
--- a/app-i18n/ibus-table/metadata.xml
+++ b/app-i18n/ibus-table/metadata.xml
@@ -5,12 +5,4 @@
 <longdescription lang="en">
 The package contains general Table engine for IBus platform.
 </longdescription>
-<use>
-  <flag name='additional'>Enable to generate additional Engine</flag>
-  <flag name='cangjie5'>Enable to generate CangJie5 Engine</flag>
-  <flag name='erbi-qs'>Enable to generate ErBi-QS Engine</flag>
-  <flag name='extra-phrases'>Add extra phrases into builded Engine</flag>
-  <flag name='wubi'>Enable to generate WuBi86 and WuBi98 Engine</flag>
-  <flag name='zhengma'>Enable to generate ZhengMa Engine</flag>
-</use>
 </pkgmetadata>