add sunpinyin, change dependency of fcitx-sunpinyin

(Portage version: 2.1.9.25/git/Linux x86_64, signed Manifest commit with key 17B157E9)

10 files changed, 90 insertions, 91 deletions

diff --git a/app-i18n/fcitx-sunpinyin/ChangeLog b/app-i18n/fcitx-sunpinyin/ChangeLog
index 23b96d9..cb21688 100644
--- a/app-i18n/fcitx-sunpinyin/ChangeLog
+++ b/app-i18n/fcitx-sunpinyin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Nov 2010; <gentoo@gentoo.org> fcitx-sunpinyin-0.1.1.ebuild:
+  Depend on app-i18n/sunpinyin, add keywords
+
 *fcitx-sunpinyin-0.1.1 (26 Nov 2010)
 
   26 Nov 2010; <gentoo@gentoo.org> +fcitx-sunpinyin-0.1.1.ebuild,
diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest
index 80f210e..ff47330 100644
--- a/app-i18n/fcitx-sunpinyin/Manifest
+++ b/app-i18n/fcitx-sunpinyin/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST fcitx-sunpinyin-0.1.1.tar.gz 393563 RMD160 cdc2ebff093947f15c010639f85261e8859bb31a SHA1 42ee052cc4de8cce64e048320d78eaa14a8d6c64 SHA256 9d45dbcc44da18a6e9d3fb8c1fc50e3d8e27b3a103e81880c28fee82751e7e99
-EBUILD fcitx-sunpinyin-0.1.1.ebuild 490 RMD160 9b82c53cf680061451085f14a3a992dbdeb139b5 SHA1 7dae51e7e4f7e0ca033df5f5e48cc87df0ae332b SHA256 10921e0cbd21a59bae466f3459a3f7ec1b98988da57f1e0f129b49f8aa0e352d
-MISC ChangeLog 265 RMD160 e689b1034bde460c1ed0939bb55d9491d2655381 SHA1 6d279090917e31420cffdff4b57c8b95316c60db SHA256 28456e60abc080c11a4e7d2464383516bf710ea6b7d736ece7cc63e0833dc01f
+EBUILD fcitx-sunpinyin-0.1.1.ebuild 498 RMD160 888a6ce2a5bf8497eb6c175a372d6338f6dfe6a1 SHA1 216ffba1e9f8150d5a6c04a2b9ecd7e100aa47b0 SHA256 b911153ec8da2c2c5b2d2ab81d7b398b6993508a540bcd993c81d70188dc823a
+MISC ChangeLog 376 RMD160 f5b6fef8fbf6b2f1f662e914db1adca4cf8a49b1 SHA1 ad4fbbc3ff2217e03d3b8d9272a5665c87938d7d SHA256 15d59054bc807b75961b7a990fe8e6b7f0f1237d4e13994bad8231cb5af54a29
 MISC metadata.xml 211 RMD160 40271b9978e78e5a4f992660d5401dec72c0c8d7 SHA1 7c537253de80853cd61ed87f48a79ea32777b22d SHA256 81765dd1417d904741d17835469203fa64deaa59b00b515148a17b1853d8a3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJM78YKAAoJEDCzDeQXsVfp1nAH/2nPVNGwWuLtjW6ED1FkZU29
-yiDLZb5sF7nAoF/2/LhY2hAM4zWWtWOL3CYYBPA6HCKKMaZfv9JtqbFeqNZC0DcX
-M9DvW8IXwq+SkVGmIj5XoBcUENwkArNwFg+Qek5dj/5PFW8WjpyGUvQ7CHrnH0rm
-XPS1RRxp/bI50DC5YwILCAX8kx6u1FIhSRkXvf5vEpt8lexo9TYVjpASKAKmouiD
-5dT40Lr1Hs4RScAWvR/GqE912DLBL9IZHSCYAIAbvADUokQnD8hjwcvrG89ZwWF1
-W+TWfuQ6/1M7kbSLEPhCuR1T+f/MxYqDYeG5uiR2zUPl0N9UJbnfyjxXSz7GSRQ=
-=ymJw
+iQEcBAEBAgAGBQJM8h4jAAoJEDCzDeQXsVfpktkIAKEGmSoMisKOiify+p7fxsig
+xsMKFdPMwaQ33hpAzV2Kf4qlaJAOoxnqt8EN/ykzcLvMXkb7cKVxmedqHhm6O6Yu
+KLlFsH1IManwQcMqizh76maZuPLzQHAOt08e9y7S/TRHeJl1i7mXmD3HnKGiAD9N
+E5etmNH1czyCTTDc65X/iM+vc0dTaEYuOrIZQ+BMPyBNWSm/C+jkAxoouMSBoAeD
+T8xH9C+5VL3IRuZ+glaVBPdnDfWc1B3vwRZ1i9T4/66ogBxgthGXJdoEXQaj7cgL
+f0Dnm0znm4b7wTZmLgnGucJiuUNAvDzyZ3hqBAdrANFsoDJa0Omm5Fdy5p52dlI=
+=++/W
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.1.1.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.1.1.ebuild
index 919ae8a..40f657d 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.1.1.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.1.1.ebuild
@@ -9,10 +9,10 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 IUSE="nls"
-DEPEND=" >=app-i18n/sunpinyin-core-2.0 "
+DEPEND=" >=app-i18n/sunpinyin-2.0.2 "
 RDEPEND="${DEPEND}"
 
 src_configure(){
diff --git a/app-i18n/sunpinyin-core/ChangeLog b/app-i18n/sunpinyin-core/ChangeLog
deleted file mode 100644
index 490faa2..0000000
--- a/app-i18n/sunpinyin-core/ChangeLog
+++ /dev/null
@@ -1,14 +0,0 @@
-# ChangeLog for app-i18n/sunpinyin-core
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  26 Nov 2010; <gentoo@gentoo.org> +sunpinyin-core-9999.ebuild,
-  +metadata.xml:
-  Add xim in IUSE
-
-*sunpinyin-core-9999 (04 Sep 2010)
-
-  04 Sep 2010; Coderoar <coderoar@gmail.com> +sunpinyin-core-9999.ebuild,
-  +metadata.xml:
-  initial commit
-
diff --git a/app-i18n/sunpinyin-core/Manifest b/app-i18n/sunpinyin-core/Manifest
deleted file mode 100644
index 656388e..0000000
--- a/app-i18n/sunpinyin-core/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD sunpinyin-core-9999.ebuild 878 RMD160 e0e2854fef3fd05d21865dc838b0f4b56ccef9a3 SHA1 34980ab61d7a5cb767abeb0b0e64c5398f57fa38 SHA256 5781571e85b1a9968ee0a7284b6541f3ff77e4f817e5eb59b27c3853a2ce57df
-MISC ChangeLog 369 RMD160 29090f8239cc74b88ba3f7019e8e3888347f5170 SHA1 e9cb6a9e9703770027bb80782f39df2a03795f63 SHA256 9afc5b4da206e6139b19faa27661c4a2b033bc724606cb97a6389d49292e77db
-MISC metadata.xml 264 RMD160 017f9c44c5b9c9751f7323439a145cfcf9204dd4 SHA1 f5d19e621b5b863fbb9dc941b173232ba5462160 SHA256 3546918cfd52d9dd98f47a835dd9105548ca35cc68cbd42d8365bb2cafbf5cba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJM78YKAAoJEDCzDeQXsVfpdHYIAIurGPSnzy3t2n3Hyq9aNvD7
-Xj7xrKtobI3WGw6hD5xib9eQxUzHEjl2+8rIRAXOF+ToJ2xQdbjo4fnNU9wMbnky
-ddCg12fTeuvILcU+YpotLqlfmdIL1aFnN25Rq5NtwPsy9aqnVCe+BmtuXphtrqWN
-MiMaFjP19ElrIyOM0QU6IA9tC91z27wW0HKyKc1IpyRjq7npzDmqP9SYHmAood/A
-kN1WaVQP2QD3ZdCN0F02GFrpzUbf36dDdG38TENyk5MqTu7mj5D8asbRD3DA7mcl
-jE825IP1Pt3utmpgRE9uCHHVkgw5ERpFvxSYXywT+b/zSHXIBY8v1vq+8p9Xb54=
-=/JCE
------END PGP SIGNATURE-----
diff --git a/app-i18n/sunpinyin-core/sunpinyin-core-9999.ebuild b/app-i18n/sunpinyin-core/sunpinyin-core-9999.ebuild
deleted file mode 100644
index ea62387..0000000
--- a/app-i18n/sunpinyin-core/sunpinyin-core-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit git python
-
-EGIT_PROJECT="sunpinyin"
-EGIT_REPO_URI="git://github.com/sunpinyin/sunpinyin.git"
-
-DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
-HOMEPAGE="http://sunpinyin.org/"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls xim"
-
-RDEPEND="dev-db/sqlite:3
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/scons
-	nls? ( sys-devel/gettext )
-	xim? ( x11-proto/xproto )"
-
-_scons_do() {
-	if [ "${1}" == "compile" ]; then
-		dest=""
-		operation=""
-	elif [ "${1}" == "install" ]; then
-		dest="--install-sandbox=${D}"
-		operation="${1}"
-	fi
-	scons --prefix=/usr "${dest}" "${operation}" || die "${1} failed"
-}
-
-src_compile() {
-	_scons_do "compile"
-}
-
-src_install() {
-	_scons_do "install"
-}
diff --git a/app-i18n/sunpinyin/ChangeLog b/app-i18n/sunpinyin/ChangeLog
new file mode 100644
index 0000000..d30cfcf
--- /dev/null
+++ b/app-i18n/sunpinyin/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for app-i18n/sunpinyin
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*sunpinyin-2.0.2 (28 Nov 2010)
+
+  28 Nov 2010; <gentoo@gentoo.org> +sunpinyin-2.0.2.ebuild, +metadata.xml:
+  Initial commit.
+
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
new file mode 100644
index 0000000..b367939
--- /dev/null
+++ b/app-i18n/sunpinyin/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST sunpinyin-2.0.2.tar.gz 27830779 RMD160 ffc1b96c6a9a506bb548e6d4154dd3008f192ebe SHA1 768b43ce838f43a60a6d70b7f11fc1729fa726d4 SHA256 d7cf1559478d17fd2e436caa87b6b5e6b9dc56fa68a70a07447786a0164b72c0
+EBUILD sunpinyin-2.0.2.ebuild 1004 RMD160 acd0887a2f1134eefa28c710686a402375dfcb2c SHA1 bc952772d01f6bc13fa8c70c3bbc30b919287c47 SHA256 163d151d00b6a2495530153bc15f00228a40aa3847dcc87a4ce18591cc4e8df8
+MISC ChangeLog 245 RMD160 fddcd5d91064e18453f93525e5ca2c84f0ae21e5 SHA1 04e3f86d5ad0043634a1572778757db805787265 SHA256 2bdfe414ac888b9118caf33d54c021881937f8af5dfb3c228ee5508d12f74aad
+MISC metadata.xml 307 RMD160 7b5210c750a70d4bd65c6ff529a6bd9ca2ec3052 SHA1 1820ca5b483e66bc6627dfe277749cd3daa47692 SHA256 84307cd50dcea4c60117927dc9e4f23c1dbfd8f73c9d1f0626f44114da0b551d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJM8h4iAAoJEDCzDeQXsVfp8zYH/3dcajDaws6PhJf2NiO/4OHg
+783bzqYW/tlfT2l02T7kOPc0Wu+tHRnFMrJs7Ez+qh90veLSG/EvhmZ0Pb2UXUxv
+7WYSzKFhMLC3Kdh7TI8AyCn2Uy38stnUcYPBJDwngh6BjG2KU9fHeS8r024AoVXj
+lAwPwdEHalbewc0ydBfmZ76870H56wwdVTDOVyD2SlXcfxAmMZU0er7Cq7PKEYlN
+5QVKNMZKj2o+nWxpzEMx+hwrTrT7WcaA7DrWvR6/IWXk4O/a4w9RgEyZOickiNvY
++3V0w8Lzw84OkOGfW41Psior/fm1Da95Y0M3bdwllsBJiSvJy9jTGZu2dzQh7jg=
+=VxAw
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/sunpinyin-core/metadata.xml b/app-i18n/sunpinyin/metadata.xml
index 623130e..55b4637 100644
--- a/app-i18n/sunpinyin-core/metadata.xml
+++ b/app-i18n/sunpinyin/metadata.xml
@@ -2,10 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>cjk</herd>
-<maintainer>
-	<email>@gentoo.org</email>
-</maintainer>
 <use>
-	<flag name='xim'>build with xim</flag>
+  <flag name='ibus'>Enable support for <pkg>app-i18n/ibus</pkg> input method
+    </flag>
+  <flag name='xim'>Enable support for XIM</flag>
 </use>
 </pkgmetadata>
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.2.ebuild
new file mode 100644
index 0000000..f2a1b93
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+PYTHON_DEPEND="ibus? 2:2.5"
+inherit python scons-utils
+
+DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ibus +xim"
+
+RDEPEND="dev-db/sqlite:3
+	ibus? (
+		>=app-i18n/ibus-1.1
+		!app-i18n/ibus-sunpinyin
+		sys-devel/gettext
+	)
+	xim? (
+		>=x11-libs/gtk+-2.12:2
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	xim? ( x11-proto/xproto )"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	escons --prefix="/usr" ${MAKEOPTS}
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+	if use ibus; then
+		cd "${S}/wrapper/ibus"
+		escons --prefix="/usr" --install-sandbox="${D}" install
+	elif use xim; then
+		cd "${S}/wrapper/xim"
+		escons --prefix="/usr" --install-sandbox="${D}" install
+	fi
+}