add pygtk dep, fix python shebang, bug 511922. thanks @Yi Yang

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

4 files changed, 153 insertions, 15 deletions

diff --git a/app-i18n/ibus-pinyin/ChangeLog b/app-i18n/ibus-pinyin/ChangeLog
index e74408ea2879..4348342bd804 100644
--- a/app-i18n/ibus-pinyin/ChangeLog
+++ b/app-i18n/ibus-pinyin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-pinyin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ChangeLog,v 1.47 2014/06/10 08:44:59 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-pinyin/ChangeLog,v 1.48 2014/06/19 15:19:47 dlan Exp $
+
+*ibus-pinyin-1.5.0-r1 (19 Jun 2014)
+*ibus-pinyin-1.4.0-r1 (19 Jun 2014)
+
+  19 Jun 2014; Yixun Lan <dlan@gentoo.org> +ibus-pinyin-1.4.0-r1.ebuild,
+  +ibus-pinyin-1.5.0-r1.ebuild:
+  add pygtk dep, fix python shebang, bug 511922. thanks @Yi Yang
 
   10 Jun 2014; Naohiro Aota <naota@gentoo.org> ibus-pinyin-1.4.0.ebuild,
   ibus-pinyin-1.5.0.ebuild:
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 005dd1f03f6c..c3ef3f7234c8 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -5,24 +5,26 @@ AUX ibus-pinyin-1.5.0-content-type-method.patch 7146 SHA256 3b7eea42c47c10f6844d
 DIST ibus-pinyin-1.4.0.tar.gz 1813003 SHA256 4fcaef6ac0533945c7feb4cb36fc72c102aae63b3fb4cbf338cdcc816182c24a SHA512 3aecac95d5ccdc494b885901780ceb72353350ed6d317e8ac9f34251e7a9354c63ebc5666af46f2fc47b4c7adf69950cb0ddee0cbd32a3e2194910b4974591e4 WHIRLPOOL 6591943f83cec6442196a4007e231711ba2a3121757f7a50381e2278ea8b3b0cda39fac10c0d761addb7235fa6eba0c7bdb8769dea4bb64498e03517482468f1
 DIST ibus-pinyin-1.5.0.tar.gz 692516 SHA256 a85d458dcc51ea9fd65849e63002428b3fcb3b39adcbea9214b5cb4a4cbdbc96 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241 WHIRLPOOL 80fd0ec7306d857870a0ceecce67166dd4d03529d5bdc404347dea6568c9b7271dbeb6feeebd8587bb5ab6856cec7f269fe5be9dbad5eb1b4297054eb9cb5ab2
 DIST pinyin-database-1.2.99.tar.bz2 9977983 SHA256 32c7d07b9f41e1dfc0f9008f54eca8e6cb367e7f2b19ac94c49754442694c321 SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7 WHIRLPOOL 07043adf9d83eb40b1a53409a31b3711f041e2b4dd5cf3f8c2034c129c31270fd37f2e53ecf2da5503562cf103ccb0a4487fa606928ac38a8775e90ff376ce3a
+EBUILD ibus-pinyin-1.4.0-r1.ebuild 1510 SHA256 e87c81e3ff8e123689276e97c08714cac24e19b626be0f693654cf4052f618ed SHA512 ca193bf6a5ca1cb70c04d38cc97a54fd1ee4e5169f5a125aa407e4fa1bf53ac418f8c2b7438201a7d8cf997153105522cd0dd3437b59eec7e3bb2e58f8f491bb WHIRLPOOL c10a5365412be888cbacae4444692e9e2c571344eb6fde7672ef10c4fd42e22cbc9814472add3b2470dd86bc71ab7ca6ed601c1f0a153a6a8416e7a22a64070a
 EBUILD ibus-pinyin-1.4.0.ebuild 1416 SHA256 78cc41725f9438faaf9092c570a94d84741ee94c4f262b5061204013c6714307 SHA512 f74169f28283d815c62a0eb4582ab2caf3078f97df67449548dfe1e3ffd9432975557226a8229d01229ca18abdd9f0879d1bbeaa825c7f2ad399477d33dd97da WHIRLPOOL 374102c96a564b319e7685ec1140980641f4069a36914ffb937145bb9da852f0cfff5031e937cc107c33a0aff895fa30435cf9ecd3f4f7037ee784a5abf00845
+EBUILD ibus-pinyin-1.5.0-r1.ebuild 1287 SHA256 7b54eb8e834400a0c9b8537ae24cd0062f1b0cdbe6d25bc33e1c8bf5321933bb SHA512 6399ebb1942662802691440680ad38546d67945f4903946498168913339e72dc0da09ff4a8f3cd437ddcf6bd45ba3a2445ca0a3886607298ed40cda10570c982 WHIRLPOOL 358a030f17f8756a0089efba418099d6d19e4894610ea48d2eaa40b6865172959b26889f5acb6b5d0eb7b46893b0c0ff1ff4003687c85bdf12dde9fe7ebec2a4
 EBUILD ibus-pinyin-1.5.0.ebuild 1193 SHA256 76e33c11c53b6f18a523b89f4998ee3d063feeb02d3dd36122f76a174c907ec6 SHA512 d90619b05a85a8a9d4038ef23aea7700ad1d2eab7f80dce547f1635a9dc98014616921ea606c25d042d4c7575a455217f9bd839cf161befc89973c3a57affa9e WHIRLPOOL 6c248bf7513d90348a2447195ded0e9f77c5df3dfd446b168b003c74c6a28aa588fcf813348a9ec5f5bb83051b300e50e3117a88c110c1cffae381e54d672e94
-MISC ChangeLog 8263 SHA256 f3d491d55167b2e8fae03c1adee00a09e5d1ac4011ece3773653cde0a1cffded SHA512 f1ef91854404c66df1212e7fe46f6778489d96ec9fcb9b47396ac1ddad000fb3ca631351e9e4486c8f4aedf610ba0c22be8b1bcedb6d0e05efc61b98f8cf1a0c WHIRLPOOL 90c0cae8d316f41cb4391dc03a61143310c1a786476a4f671941cea2a1f8123d36e846cfc3706de2f751672bb555a95de938fcaadb4c4870fd209bbfbcb12cb3
+MISC ChangeLog 8506 SHA256 b30b5b581e50ab9e3677696e1664630ec5b01a2902b8f64e7fe258bade3dd033 SHA512 1b066aa5e01755ee31affd750fed5ef2cd88bf85debca5a557d8f0516fcbdc9d0d7db3c12a8a90dd862e7ffc7f8d19cc534b943a51c54005297e5c97b6707d68 WHIRLPOOL ff4ef4fc2eeba4eda970465c29799df61eff7dfd9e38b212c41e8dad4f3ee9a0934bc2554be949836365e2c5c8d76ecdf889aed265541aacada472c92b0d8c13
 MISC metadata.xml 543 SHA256 c92f819fa3289cc65fc72fd8a3b5456c9cd0271e664d8c344a2d44842431f64e SHA512 426bc39fa9fdb0419be213138a1ebdbf1ce272cc6e9bf6b460614e85ea2010bc61e7931521e612a337c243d1c17ed55aa9160be645416bc9766a18d4cb65011e WHIRLPOOL e3267cd7eb3686d2fd05c6ce9e66486e7ae2d3b1a5916ab0a213e627833c28f0cfb0aad5e90443fec58428b28a96fed582c3322c8aed18a44abee21eb60992c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlsWTAAoJEDYO1FT4VRUUkl4QAIAOk1WnusUPgs3MCeWYqeYN
-AwucqO34bwckRnp4l4E2yPpMyi394XvmM75AeCMMf9+u3NUDxfV6E/WukgnCq8/d
-MSkOcwbV+qM3YQgJnWl0blAUKlYk1oxmW8aGjpWGJAxcoLzJKzOSDF68ds8tgp2o
-NHQrHDyvotZhPtVACKvfVqTpGe43AlJppn371hHKD7hxmdnzPeyerg30TYeHI7L1
-OAwhLQ9sgPHwXCJIM9l9uPgZVx7oVmH23hmRoa1ZhiqbGgstapn1+dPLCukk7ggw
-gF69+n9rd4Lwvyg0A6nTgEBXbgPdjAyyhlLMgzSVHfIpxXQWPg39EmqQluMcjvxx
-uimg7FOJ6rQwF2vYRNS+WqU9OpS0Y7my0IwKJyHrYB/o7nmEiv61BAxv/owtpOCG
-ctEh+cSM38+nKbtTkjvC/A3eb2WZonfYQh3FvUt0mtyc2YNd1qwDua5rBWA6zt/r
-MtSpCeLYWshakrfgfOBsxujrnm/t4ecfszKYRk6OAZWZNQpqqYXiY1JXG3gfaR7n
-LVwpUePkQRNanLEdoixLvvXslRNyoZynmctxp0NjZ8Mp4IjL+t4/dbfbjRpZLYFZ
-+kA06d5hrHK6k1FnU0WXeRb36VHD5Erxy/vKr1Pkh1hGOg3on6XyfFFgYBQHYcn/
-6nGOgBZGUUHe1S1gitrq
-=w1kl
+iQIcBAEBCAAGBQJTov+yAAoJEJIMDbyqvv1VRtgQANjvoWqLhzH7hjm/Ge2LzEyZ
+FBV3qrrmH2YdSQPyCGmhC4QV7NjgaHXESK4RKzXBTPFrlc6Wfm41dHJdl1zrkEFL
+zBcwxKRrmNipTInQAZoRCsdHSdIzzpj6jTltlYlXJQBfeDHuuLyoQAtMgo1PgVC4
+ht52EyWcEcD7Xqk/X0NUpDacxsNrz3klCTMFAxne53KXc6ABwpzv2q5gZqG6g1DY
+ckaq3Lw7H8Hv+s2gu18x63ByORaDhRof4CyvIdszdbIVAWuq1Mz/S8bv5ELICrEy
+oXsI162yZTMMm6l8Apw17/DWJ9xgxJtmHk1xEqp68e2cu3pyVWaW3PyTX946cIvj
+yWBv3vSk2twQsxtltk721Ev6IsMk3y3l7ISCjjMYVAoHAtA+pUxNoRmBaoKvwMyv
+zLB/+z7PSuQfJjrdodh48CMn7bec+UM0Rc2IEO/Yy0Cs3Uqu6A6XyJn2ANWmOv9U
+4H5qer1awfN81mlfiW7BQCcMHHJDg5n+h/h/TaQDYKh+ENdyBFghla3BFdNuBavi
+5yREqxgs5eb0Z+jW7U6tP2dH6FJere9agm3eG1kNwpgC8qceI3dWb1RYqDIlGjgq
+rVrOGyJIe0kjA2mHNh76VdBMm3+S8cZy1icPy3TGaaJUgJY0Sp9d1rftJ8w35WA7
+AQMRsauDjdpacuOAh/hb
+=MMZ+
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.4.0-r1.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..e57c68eeda03
--- /dev/null
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.4.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 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.4.0-r1.ebuild,v 1.1 2014/06/19 15:19:47 dlan Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
+
+inherit 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="boost lua nls opencc"
+
+RDEPEND=">=app-i18n/ibus-1.4
+	dev-python/pygtk
+	sys-apps/util-linux
+	boost? ( >=dev-libs/boost-1.39 )
+	lua? (
+		>=dev-lang/lua-5.1
+		<dev-lang/lua-5.2.0
+	)
+	nls? ( virtual/libintl )
+	opencc? ( app-i18n/opencc )"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e "s/python/&2/" setup/ibus-setup-pinyin.in || die
+	cp "${DISTDIR}"/${PYDB_TAR} data/db/open-phrase/ || die
+	>py-compile
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable nls) \
+		$(use_enable opencc) \
+		--enable-db-open-phrase
+		#--disable-db-android \
+		#--disable-english-input-mode \
+}
+
+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.5.0-r1.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..46b65d6b6f50
--- /dev/null
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 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.5.0-r1.ebuild,v 1.1 2014/06/19 15:19:47 dlan Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="sqlite"
+
+inherit python eutils
+
+DESCRIPTION="Chinese PinYin IMEngine 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="boost lua nls"
+
+RDEPEND=">=app-i18n/ibus-1.4
+	dev-python/pygtk
+	app-i18n/pyzy
+	boost? ( >=dev-libs/boost-1.39 )
+	lua? (
+		>=dev-lang/lua-5.1
+		<dev-lang/lua-5.2 )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e "s/python/&2/" setup/ibus-setup-pinyin.in || die
+	epatch "${FILESDIR}"/${P}-content-type-method.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable nls) \
+		--enable-english-input-mode
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}