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

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

7 files changed, 37 insertions, 133 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/Manifest b/app-i18n/ibus-pinyin/Manifest
index d3a95c172a51..4dfd0948961b 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -2,33 +2,29 @@
 Hash: SHA1
 
 DIST ibus-pinyin-1.2.0.20090915.tar.gz 279759 RMD160 14921d01679012dbc33a668f7887ecf6a47929c9 SHA1 cf8ce69fa1b9ce7a934497d100306007e282b1a3 SHA256 b38b5a72c3917e727b63f3f8f8e7ba9af6dda61a65caf15e61e8a908465b553b
-DIST ibus-pinyin-1.2.99.20100212.tar.gz 1555558 RMD160 b023e5b70e9e49d631b48ea896e1351fb5733632 SHA1 287e92b16b827b86d73e6543a129badfd7e0902a SHA256 a40c02d351d30d96a10c186f0f6bd25f88e8189b6f2fea3cd177c629ac5c30cc
-DIST ibus-pinyin-1.2.99.20100308.tar.gz 1555912 RMD160 7e2ea8a99c638b3237717187b44ffcc24ef58a87 SHA1 a3b643726a391e1bcb95e70195598850e4f571d8 SHA256 e54dca61f9cab0fb4d83cea91a83a59a078cca487312cf75ba64aea1672a1d40
-DIST ibus-pinyin-1.2.99.20100318.tar.gz 1557138 RMD160 8f5afd1816bb3fe8fac315afb1ef75b23b4a2fc8 SHA1 3f989d40c4a4a69d06796f21e5e9f45bcbbcc530 SHA256 4a913c9a5af40b92cb2b5729aa775153bceb019f33e7e7fd13bdd2a52dcc38bc
 DIST ibus-pinyin-1.3.0.tar.gz 1557936 RMD160 fc24686a9e9575e2754d98622ecd89f0a8623ada SHA1 6088e0abeb7dff25619bec43b0ba0eb6203d63cf SHA256 f95ce830de0e6fb42008b22c300cfac5b9f9a3cae2bc7ad15e26f57a9ec465d6
+DIST ibus-pinyin-1.3.1.tar.gz 1557876 RMD160 95ab2d969ba087d94b3cccea299af57b3e5971a9 SHA1 03ebd6433781dbcc0af0b8b6ab902bf72b607868 SHA256 9e84048604df393f8fd199c152785c574671b108450d65006466d93ebda68c1d
 DIST pinyin-database-0.1.10.6.tar.bz2 12008671 RMD160 2120f59575763848a0e77a829477ffb536fcfabc SHA1 84f505d46282cba1dabc058fe0c1e443d0a20e96 SHA256 f96c0adfd890b1ec5be534a147481900b96ba827910e140f1c76c679632f15fe
 DIST pinyin-database-1.2.99.tar.bz2 9977983 RMD160 1679567f31c20a235577f02175df38e16a05e7de SHA1 e38a148a772e9909facda66b2d579e17b94cccbe SHA256 32c7d07b9f41e1dfc0f9008f54eca8e6cb367e7f2b19ac94c49754442694c321
-EBUILD ibus-pinyin-1.2.0.20090915.ebuild 1378 RMD160 869a8e03bb9e52709d003949b717a762eae38706 SHA1 2c705fca30501d41953cf299f502f1e23461d837 SHA256 bf63ce1ef75ce79e2eb79fa9d10f8c780b4fe4ad1890e12f210008c214cf30d7
-EBUILD ibus-pinyin-1.2.99.20100212.ebuild 1216 RMD160 d50db7144cbef467e9170416cf661d2d6f8c1f57 SHA1 b451b768f54b2cd832c6371e25fa0cd8eb4d1479 SHA256 ed371e095dd593bd855a56b373fdcc35a3de593af87041cb8e805c08c9ba7983
-EBUILD ibus-pinyin-1.2.99.20100308.ebuild 1216 RMD160 b2e85b24ddc9c1fac094a7af1a6d3df153be33b3 SHA1 46a470f990b75f5c7571a9e1bd345536e3832b97 SHA256 66c98b697af84ab5a02128190b7058f597760d8240e683f2aa6112e21649d910
-EBUILD ibus-pinyin-1.2.99.20100318.ebuild 1216 RMD160 ef1e79b0894b08088a93f8f7ee49eeaccb977def SHA1 6697d2ce39f85375de84c43099899db89ce03fe5 SHA256 f2de78230cad558f70c66a71b6035b98dd0a81a69449717819de5ae3e7de22e4
-EBUILD ibus-pinyin-1.3.0.ebuild 1206 RMD160 87344e08c51e3c7db47932111cb7218d3b685afb SHA1 33f07b4dbd246a2f2fb9ac9f0d336ed02db82d56 SHA256 eb970311508bf9811cf676bba5eab2910b94136265766ca66651dcd2337e4556
-MISC ChangeLog 3340 RMD160 ec86faf21624ddbf6557b5871c94d7efbc2981db SHA1 d535480caeafdf6daf6a06d9a0f4e35c23c63ed9 SHA256 9f0918bb348dcb2fc8990ff921507525274cd41abeec4a6783bb161adc2d3cbc
+EBUILD ibus-pinyin-1.2.0.20090915.ebuild 1189 RMD160 b54664facca1099934861b91960dee4db8fcd768 SHA1 076caf7e1a9713bf249e8d11fb9d87ff4abe5fd6 SHA256 c99e0607d87d13050a9ecf25fad3c64ecf5111997991d3bf933f67032512ad88
+EBUILD ibus-pinyin-1.3.0.ebuild 1222 RMD160 cc29c4b569f7ea424af2f8f7003d0d2192f0f680 SHA1 707d7abee74824c6a4dc5f030e89572778c45fde SHA256 ce93f2d325608be0952c644076f949fa6d30367b44d687e9c16851af0c434d98
+EBUILD ibus-pinyin-1.3.1.ebuild 1222 RMD160 35d4e28db3b96942b572fa3d935632e477fdc758 SHA1 8752a518fcdf0c5876630132b8701fed39140c1e SHA256 7e6e333556fb98ae1ccb47cd7731fd19531b90289ea2bb5e2ec34521b7e5945e
+MISC ChangeLog 3709 RMD160 1a79907d4a27e259ddb1eb0ce1a16f13bf64a2e7 SHA1 30a209c1408c2d577784cd3fa2c88c10eac548aa SHA256 a52f0470e4fa949caeb1674d771a69d7675f7f9400df5d37d01b33d9db8e054e
 MISC metadata.xml 280 RMD160 2f693f9dba5c4abf24696fdf45b288284a6d2212 SHA1 776f22067d69b18b25b856bc939389b2a4f3f84d SHA256 04e7f95210b314c01f71ee1743dc709bebb501bb43ad052a268833fe7177f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBAgAGBQJLs4X9AAoJECaGw+YFKA1peqsP/1mLqlN61BGmT60TFmgH+3xR
-h1jzjEORklEutPwsFpN8Inkxj6xevo+Lf3jZdJ/WFEjVbdRPkbPMQP9SN56C9Gcy
-3BqjLykTMrQgm3INvU+3UCVMW7L71g6wnKhnbY575zPdIEhaGCCk2MaBwF2IvNQw
-NpHx12nn+bFt/nSgL6XG9WkS7fsmOkF9TNspV9kDsxSXiyjW2kXGbpDqhlTTJIvN
-q/1DpCDPO41aiu77XvfeaX6ebHmUvqworOXHqp7R8tnIjoK7XY852Jl+X5PRSK3y
-b9XwqEnOWYBrU/ZbQ+bH47SFqbc8MsRtvHsHUmKFkm6AXBwXnq35AKLzYg7wO9Yz
-QPlYmwn7TGoZgs86DGKCTFpgooSO03FJz7kI5eYxf16rXpX6JQoXNaXOqYUb8ync
-rWjoZWcO250X56vx/1tI2Z450QQg9aYIA9s042fCdA5CDWxiDNSywO0/4okElWHI
-4kRcNiMpbgYdpU5BNHCk7yz3Jjg9vk2ngwLrYbsaCn0F88TLWu7VnYurs4GFgsCW
-ZkKupbFz/DF8QqWwM+a/mpMS4N4+tESL+2dKVFPX4wG7IGd76AawsppcWk0m55r4
-gU36K8XbVOuRqFxt2TgJ1kR7BQefViY5JV4iK6K1mmnw0GDseqR7H5//6U0pj74s
-8U33V7oaIK77Xi5NEsYU
-=vLm7
+iQIcBAEBAgAGBQJLvmitAAoJECaGw+YFKA1pQ5wP/RiQ95zo5K56+gYH1IFSD4YC
+P65blU68dq2WHLr8v4qDHUnEiVfzr1i3QG4kPsa0BncZ1kuZ6P4Y+ojSUGtBcK3D
+P/AflidnlUnro5/fxZGGMplNBNztvCBKKjMrtaFjMQK03xN4uDNQxzXu/1xPgbzE
+LmgF6Woe7yZGF47rEgItu8ZGOAIb8edU/MH7eaZREIVaDS6o+wLwxycoS7sVpbR6
+yN/UdQ7d9lSn2jrABV9hqFixB6aUmRhQMF9ukfKneP4Ihr2vb/mTtb6u4aO/jaFd
++akp8PQXaGaZQHntAFJmCjYglNDN0idD8ty6iRxrdh4y5SHB4GhXKviENY03E9CQ
+gGMPzZACoOV8cnd+utnLOyyrGoJM8bXNAUnIyBnm7tTLGO87tj4Vtrc6Qp6M4UW0
+T2JHNtRw8+BGuMXHHzT9e2NY3XZMSBT2IFWpz4PCIBRQmLkj5RirEcOP3f+qpDbx
+3Fzib+Fx7OEJ/fG5xHTBgcovLQIrA/ZXreF1tzB6iDSKAPcs9s5bT4mQwhaA9XE4
+I9VKfO1GOMBoizsCXwHk/9rd6T8p6bSGYhbKthzQwEvzBywCqTiyy2SelGzJsus8
+moxj7TCqByNLdZMIiOL9gHy1ms8xxLxjfBQMdXUUR9UEHyZsZ7D06ZnY1h8CuVYW
+muJ25bv2Z6ClGAJ9hhQP
+=NIVx
 -----END PGP SIGNATURE-----
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}