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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 19 insertions, 111 deletions

diff --git a/app-i18n/ibus-pinyin/ChangeLog b/app-i18n/ibus-pinyin/ChangeLog
index 6e7e4a55f92e..a1b67ddacf6d 100644
--- a/app-i18n/ibus-pinyin/ChangeLog
+++ b/app-i18n/ibus-pinyin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/ibus-pinyin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ChangeLog,v 1.17 2010/03/31 17:27:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ChangeLog,v 1.18 2010/04/08 23:35:39 matsuu Exp $
+
+*ibus-pinyin-1.3.1 (08 Apr 2010)
+
+  08 Apr 2010; MATSUU Takuto <matsuu@gentoo.org>
+  ibus-pinyin-1.2.0.20090915.ebuild, -ibus-pinyin-1.2.99.20100212.ebuild,
+  -ibus-pinyin-1.2.99.20100308.ebuild, -ibus-pinyin-1.2.99.20100318.ebuild,
+  ibus-pinyin-1.3.0.ebuild, +ibus-pinyin-1.3.1.ebuild:
+  Version bumped. Removed old versions. Fixed python dependency, bug
+  #311211.
 
 *ibus-pinyin-1.3.0 (31 Mar 2010)
 
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.ebuild
index 22ba13d8317e..9da284c7047a 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.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-pinyin/ibus-pinyin-1.2.0.20090915.ebuild,v 1.2 2010/02/14 05:40:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ibus-pinyin-1.2.0.20090915.ebuild,v 1.3 2010/04/08 23:35:39 matsuu Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
 inherit eutils python
 
 PYDB_TAR="pinyin-database-0.1.10.6.tar.bz2"
@@ -17,7 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=app-i18n/ibus-1.1.0
-	>=dev-lang/python-2.5[sqlite]
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -42,12 +43,6 @@ src_install() {
 }
 
 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}
 }
 
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100308.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100308.ebuild
deleted file mode 100644
index 96549236175c..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100308.ebuild
+++ /dev/null
@@ -1,49 +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-pinyin/ibus-pinyin-1.2.99.20100308.ebuild,v 1.1 2010/03/13 00:50:22 matsuu Exp $
-
-EAPI="2"
-inherit eutils python
-
-PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
-DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
-	http://ibus.googlecode.com/files/${PYDB_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.1.0
-	>=dev-lang/python-2.5[sqlite]
-	dev-libs/libsigc++:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-src_prepare() {
-	cp "${DISTDIR}/${PYDB_TAR}" "${S}"/data/db/open-phrase/ || die
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf $(use_enable nls) --enable-db-open-phrase || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100318.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100318.ebuild
deleted file mode 100644
index 00cb2e4640ff..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100318.ebuild
+++ /dev/null
@@ -1,49 +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-pinyin/ibus-pinyin-1.2.99.20100318.ebuild,v 1.1 2010/03/19 16:05:58 matsuu Exp $
-
-EAPI="2"
-inherit eutils python
-
-PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
-DESCRIPTION="Chinese PinYin IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz
-	http://ibus.googlecode.com/files/${PYDB_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.1.0
-	>=dev-lang/python-2.5[sqlite]
-	dev-libs/libsigc++:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-src_prepare() {
-	cp "${DISTDIR}/${PYDB_TAR}" "${S}"/data/db/open-phrase/ || die
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf $(use_enable nls) --enable-db-open-phrase || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.0.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.0.ebuild
index 8804b32bfd4f..b9385671cd12 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.3.0.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.0.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-pinyin/ibus-pinyin-1.3.0.ebuild,v 1.1 2010/03/31 17:27:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ibus-pinyin-1.3.0.ebuild,v 1.2 2010/04/08 23:35:39 matsuu Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
 inherit eutils python
 
 PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
@@ -17,7 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=app-i18n/ibus-1.1.0
-	>=dev-lang/python-2.5[sqlite]
 	dev-libs/libsigc++:2
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100212.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.1.ebuild
index f7cc3aca8c95..09a47fe317a5 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.2.99.20100212.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.3.1.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-pinyin/ibus-pinyin-1.2.99.20100212.ebuild,v 1.1 2010/02/14 05:40:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ibus-pinyin-1.3.1.ebuild,v 1.1 2010/04/08 23:35:39 matsuu Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
 inherit eutils python
 
 PYDB_TAR="pinyin-database-1.2.99.tar.bz2"
@@ -17,7 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=app-i18n/ibus-1.1.0
-	>=dev-lang/python-2.5[sqlite]
 	dev-libs/libsigc++:2
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}