Version bumped. Moved from app-i18n/ibus-sunpinyin to app-i18n/sunpinyin, bug #314769.

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

6 files changed, 123 insertions, 61 deletions

diff --git a/app-i18n/ibus-sunpinyin/ChangeLog b/app-i18n/ibus-sunpinyin/ChangeLog
index 4fbb8a892254..92d6167c51aa 100644
--- a/app-i18n/ibus-sunpinyin/ChangeLog
+++ b/app-i18n/ibus-sunpinyin/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-i18n/ibus-sunpinyin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ChangeLog,v 1.2 2009/11/19 16:05:58 matsuu Exp $
+# ChangeLog for app-i18n/sunpinyin
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ChangeLog,v 1.3 2010/05/04 01:27:22 matsuu Exp $
+
+*sunpinyin-2.0.1 (04 May 2010)
+
+  04 May 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-sunpinyin-2.0_rc3.ebuild, +sunpinyin-2.0.1.ebuild,
+  +files/sunpinyin-2.0.1-mkdir.patch, metadata.xml:
+  Version bumped. Moved from app-i18n/ibus-sunpinyin to app-i18n/sunpinyin,
+  bug #314769.
 
 *ibus-sunpinyin-2.0_rc3 (19 Nov 2009)
 
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index ed9ae4672b94..bc85bcd3cea5 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,25 @@
-DIST ibus-sunpinyin-2.0_rc3.tar.gz 26147017 RMD160 d7195aaa5f8f7fdf309cdc67cae77b8dd90680e2 SHA1 9d95d124c3115de37612cd81078ef8f109f3ed88 SHA256 cf925d20ec0f376338b290f72962a2021202959e0e3131564e39aee89af052ce
-EBUILD ibus-sunpinyin-2.0_rc3.ebuild 1199 RMD160 a73a3a91b8e76603ff716e53ffcfce8824eebe26 SHA1 0ad602e82a1e8f7ea729ffe21013abf53b164e86 SHA256 a2caf02ad81f31d2db8f898cd5746156d4240aac56406ace2a869a001f099c26
-MISC ChangeLog 651 RMD160 4faf2e8ad460df76273d3070a4c720fbc57893b8 SHA1 a2b56a3d3f7e4fa2d4965dd6c781f4f3e4ace986 SHA256 1dd2567875d7f46f83666f856d7de034675c2949632c5302f90fbe5879f538fe
-MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sunpinyin-2.0.1-mkdir.patch 575 RMD160 e4f328907105e327317cce2f38fc8cbd31f4cea2 SHA1 33334c29e623dd588e3a53a82b4917d10eb30d9f SHA256 44c8811455806ecc91aaee73248114a2a62b0e7b162596138f3da4f74d4142d6
+DIST sunpinyin-2.0.1.tar.gz 26318733 RMD160 ce855f819cfa091450bfb344a5132cead7afc33e SHA1 6c36c25f6365a83730f970e51682e5ba58f1c929 SHA256 bdaccb0ee9e618289d308b8cad1646b678fe2eaa946dc6198fc66bfb5f59063b
+EBUILD sunpinyin-2.0.1.ebuild 1687 RMD160 9426f71bfecf4809d6d30a7a3be7b020a5d404aa SHA1 caca01affe32642352902ac623fce694c818dc48 SHA256 d872329355991f231b8d9f9895f771d77821659307d1e0a9fe3dbc12982d79d7
+MISC ChangeLog 930 RMD160 50a49539f4ec89ab540601a574ba45694ab40543 SHA1 001970b8d714c9fae2b03e939fd792f1ea65f28d SHA256 c2d33a2cdfa19a793d3a65cb943722e321b4a8fde39d466e8ec21f0091b95f03
+MISC metadata.xml 307 RMD160 7b5210c750a70d4bd65c6ff529a6bd9ca2ec3052 SHA1 1820ca5b483e66bc6627dfe277749cd3daa47692 SHA256 84307cd50dcea4c60117927dc9e4f23c1dbfd8f73c9d1f0626f44114da0b551d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBAgAGBQJL33gFAAoJECaGw+YFKA1pFRcQALLMtzJxZxT9b3DuQ6uaczYf
+63zpVypszwqAv076PX1rZ2bJPvBkhDuV9nxpCISMxGJXzPAfBFp8GqR3oHQj5wcG
+kkR7+k991rDMjk5JQ38JyXSunUpRhnn+r9MPTR4rKeUP/6SMfGvjGAxhCeH9XAp1
+wajuQMojmGBi9qbyMMwGlJ4tlSV+zo/aGMDSiVYshPMeOMPzXlVrnD6kujaOk9ID
+FHicDdQxTtjO1DxiQvpwmvfkJD/tHaJgAqsaT3pt21l1RBe4CUMJedpCjbbbApZn
+9DBJWVunl+VRyuKPyXFPnb8Lp8YCyF70Cwnzeabhs6m4okm6WLwn9NLotuoLLEua
+Vr4IoUC/FaZsvlOIAE2N5AABG+/B6xUJ8xi8tMK1c4JBcVdL1+yOBBwVwe/x9cUv
+m/UsmBSW4++8wxQ61tohb5gKCDtjoLvoxozJBPBmAADk4mI26X4SaPwMBFjOR69k
+5eV7QKXY6EGui3m+4J393SFZydufGagwxTaozdn2grFzRJA0qkv+CkkeNRo03tM+
+nmsY1hhwNw/ZhweVmbRE+VMlCVZ3TrhaPw9u9/Bipm61ixzqVttJigJsSOYGHYUe
+iDlYlp0MpJRQR0tbCqE6sp/aojgycPkbfCoM2fxct/7hYES7ztnDyUqv4hgnlDdJ
+TCd3GEJwVj4bjWGNHUNF
+=RIff
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-sunpinyin/files/sunpinyin-2.0.1-mkdir.patch b/app-i18n/ibus-sunpinyin/files/sunpinyin-2.0.1-mkdir.patch
new file mode 100644
index 000000000000..71cfcae40324
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/files/sunpinyin-2.0.1-mkdir.patch
@@ -0,0 +1,12 @@
+diff -Naur sunpinyin-2.0.orig/wrapper/xim/settings.c sunpinyin-2.0/wrapper/xim/settings.c
+--- sunpinyin-2.0.orig/wrapper/xim/settings.c	2010-04-10 20:37:24.000000000 +0900
++++ sunpinyin-2.0/wrapper/xim/settings.c	2010-05-04 10:16:45.000000000 +0900
+@@ -294,7 +294,7 @@
+     if (fp == NULL) {
+         char config_dir[256];
+         snprintf(config_dir, 256, "%s/.sunpinyin", getenv("HOME"));
+-        mkdir(config_dir, 0600);
++        mkdir(config_dir, 0700);
+         char cmd[256];
+         snprintf(cmd, 256, "cp %s %s", DEFAULT_SETTING_FILE, path);
+         system(cmd);
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0_rc3.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0_rc3.ebuild
deleted file mode 100644
index 7ffdc0766b03..000000000000
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0_rc3.ebuild
+++ /dev/null
@@ -1,54 +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-sunpinyin/ibus-sunpinyin-2.0_rc3.ebuild,v 1.1 2009/11/19 16:05:58 matsuu Exp $
-
-EAPI="2"
-
-inherit python
-
-DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
-HOMEPAGE="http://code.google.com/p/ibus-sunpinyin/"
-SRC_URI="http://ibus-sunpinyin.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls"
-
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2
-	dev-db/sqlite:3
-	>=app-i18n/ibus-1.1
-	>=dev-lang/python-2.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/sunpinyin-${PV/_*}"
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		--enable-ibus || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}/setup
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}/setup
-}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
index 2d5852c16c60..55b463759d55 100644
--- a/app-i18n/ibus-sunpinyin/metadata.xml
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>cjk</herd>
+<use>
+  <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/ibus-sunpinyin/sunpinyin-2.0.1.ebuild b/app-i18n/ibus-sunpinyin/sunpinyin-2.0.1.ebuild
new file mode 100644
index 000000000000..62389872a422
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/sunpinyin-2.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/sunpinyin-2.0.1.ebuild,v 1.1 2010/05/04 01:27:22 matsuu Exp $
+
+EAPI="2"
+PYTHON_DEPEND="ibus? 2:2.5"
+inherit confutils eutils python versionator
+
+DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
+HOMEPAGE="http://sunpinyin.org/"
+SRC_URI="http://sunpinyin.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ibus nls +xim"
+
+RDEPEND="dev-db/sqlite:3
+	ibus? (
+		>=app-i18n/ibus-1.1
+		!app-i18n/ibus-sunpinyin
+	)
+	nls? ( virtual/libintl )
+	xim? (
+		>=x11-libs/gtk+-2.12:2
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
+	xim? ( x11-proto/xproto )"
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
+
+pkg_setup() {
+	confutils_require_any uim xim
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-mkdir.patch"
+	mv py-compile py-compile.orig || die
+	ln -s "$(type -P true)" py-compile || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ibus) \
+		$(use_enable nls) \
+		$(use_enable xim) || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "Install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
+
+pkg_postinst() {
+	use ibus && python_mod_optimize /usr/share/ibus-${PN}/setup
+	if use xim ; then
+		elog "To use sunpinyin with XIM, you should use the following"
+		elog "in your user startup scripts such as .xinitrc or .xprofile:"
+		elog "XMODIFIERS=@im=xsunpinyin ; export XMODIFIERS"
+	fi
+}
+
+pkg_postrm() {
+	use ibus && python_mod_cleanup /usr/share/ibus-${PN}/setup
+}