Fixed python dependency, bug #311211. Removed old versions.

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

4 files changed, 10 insertions, 96 deletions

diff --git a/app-i18n/ibus-table/ChangeLog b/app-i18n/ibus-table/ChangeLog
index dbeb0b32c4a8..a0279292f9c9 100644
--- a/app-i18n/ibus-table/ChangeLog
+++ b/app-i18n/ibus-table/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus-table
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ChangeLog,v 1.20 2010/03/01 10:20:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ChangeLog,v 1.21 2010/05/04 00:47:26 matsuu Exp $
+
+  04 May 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-table-1.1.0.20090615.ebuild, -ibus-table-1.2.0.20090904.ebuild,
+  ibus-table-1.2.0.20100111.ebuild:
+  Fixed python dependency, bug #311211. Removed old versions.
 
   01 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   ibus-table-1.2.0.20100111.ebuild:
diff --git a/app-i18n/ibus-table/ibus-table-1.1.0.20090615.ebuild b/app-i18n/ibus-table/ibus-table-1.1.0.20090615.ebuild
deleted file mode 100644
index c6d5c410d967..000000000000
--- a/app-i18n/ibus-table/ibus-table-1.1.0.20090615.ebuild
+++ /dev/null
@@ -1,47 +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-table/ibus-table-1.1.0.20090615.ebuild,v 1.1 2009/06/18 15:38:25 matsuu Exp $
-
-EAPI="2"
-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 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal nls"
-
-RDEPEND=">=app-i18n/ibus-1.1
-	>=dev-lang/python-2.5[sqlite]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable !minimal additional) \
-		$(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	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-1.2.0.20090904.ebuild b/app-i18n/ibus-table/ibus-table-1.2.0.20090904.ebuild
deleted file mode 100644
index 9be60d3193c7..000000000000
--- a/app-i18n/ibus-table/ibus-table-1.2.0.20090904.ebuild
+++ /dev/null
@@ -1,45 +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-table/ibus-table-1.2.0.20090904.ebuild,v 1.1 2009/09/07 23:19:51 matsuu Exp $
-
-EAPI="2"
-inherit 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 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.2
-	>=dev-lang/python-2.5[sqlite]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.16.1 )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf $(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	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-1.2.0.20100111.ebuild b/app-i18n/ibus-table/ibus-table-1.2.0.20100111.ebuild
index 9b17a4046684..02e506203f64 100644
--- a/app-i18n/ibus-table/ibus-table-1.2.0.20100111.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.2.0.20100111.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ibus-table-1.2.0.20100111.ebuild,v 1.2 2010/03/01 10:20:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table/ibus-table-1.2.0.20100111.ebuild,v 1.3 2010/05/04 00:47:26 matsuu Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
 inherit python
 
 DESCRIPTION="The Table Engine for IBus Framework"
@@ -15,7 +17,6 @@ KEYWORDS="~amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=app-i18n/ibus-1.2
-	=dev-lang/python-2*[sqlite]
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.16.1 )
@@ -33,7 +34,7 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README || die
 }
 
 pkg_postinst() {