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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 98 insertions, 57 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/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
+}