Include upstream patch.

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

4 files changed, 77 insertions, 2 deletions

diff --git a/app-i18n/ibus-sunpinyin/ChangeLog b/app-i18n/ibus-sunpinyin/ChangeLog
index a6d54113d79d..7dff558bf42b 100644
--- a/app-i18n/ibus-sunpinyin/ChangeLog
+++ b/app-i18n/ibus-sunpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus-sunpinyin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ChangeLog,v 1.5 2011/02/20 05:03:36 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-sunpinyin/ChangeLog,v 1.6 2011/02/26 08:15:58 qiaomuf Exp $
+
+*ibus-sunpinyin-2.0.3-r1 (26 Feb 2011)
+
+  26 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> +ibus-sunpinyin-2.0.3-r1.ebuild,
+  +files/ibus-sunpinyin-2.0.3-force-switch.patch:
+  Include upstream patch.
 
 *ibus-sunpinyin-2.0.3 (20 Feb 2011)
 
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index 4d4278d61fa3..60320e96a6fe 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,6 @@
+AUX ibus-sunpinyin-2.0.3-force-switch.patch 964 RMD160 ab024870af82644d229fa9a6f60e7f3dc2cecf0b SHA1 1a59a8e195e16862cd8cf5924150cd5bf144b958 SHA256 5f24f965c67ecd5e0e496303d1503607c1c3492e97209138a020b834cf9f11b4
 DIST ibus-sunpinyin-2.0.3.tar.gz 218785 RMD160 655c1d53790156b381c70b22352bf997cb8233e5 SHA1 86f34ca4ec60a1e30362aca82d89b529b4326c14 SHA256 9c15b89d683318f3b1f3475dcabf7a91ee815692b233a289bcadab3ab7f8fa3c
+EBUILD ibus-sunpinyin-2.0.3-r1.ebuild 812 RMD160 344646b6ef9b7e13f3ee5a1e163f490d543396d0 SHA1 1668958dd571aa2c25014c2382bba84163c1449d SHA256 8cb307ceeb29494466c72722aaa08db06e1dcc207e68bdc958b7d68d01d2f758
 EBUILD ibus-sunpinyin-2.0.3.ebuild 703 RMD160 3c6b73db074850069753d94fc5bcbe7faf59ffb6 SHA1 a30af98bf8c3107d49e123b7bec72b631fa3af87 SHA256 ebea5e6306060b3eb1501088a1cd572743fab57b63ec6850bc8f3ec203c73d84
-MISC ChangeLog 382 RMD160 29285e3a5913a6f10e36775371a8e0962e5224e2 SHA1 92506afd4d48adff48ec9d492d6d5e9014ca6a0a SHA256 12d9b8259cfe0601603892f6f0448cf77e64fe9e85a6f4c6dcc98f919f5b1b0a
+MISC ChangeLog 576 RMD160 b51b3a5419d782e4016c6140ed813852a9c26f75 SHA1 1cad84c88ae82f3b8d7daf7f9a97b454514a20d5 SHA256 4377e17cf5bc0a72c2faa2a194ca76963bdef5742b92503a5f0513d512302ac0
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.3-force-switch.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.3-force-switch.patch
new file mode 100644
index 000000000000..66b0165b9eb0
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.3-force-switch.patch
@@ -0,0 +1,33 @@
+diff --git a/wrapper/ibus/SConstruct b/wrapper/ibus/SConstruct
+index 92b1094..3e1166f 100644
+--- a/wrapper/ibus/SConstruct
++++ b/wrapper/ibus/SConstruct
+@@ -14,7 +14,7 @@ sources = ['src/debug.cpp',
+ 
+ locales = ['zh_CN']
+ 
+-cflags = '-O2 -g -pipe'
++cflags = '-O2 -g -pipe '
+ version = '2.0.3'
+ 
+ AddOption('--prefix', dest='prefix', metavar='DIR',
+@@ -62,9 +62,6 @@ if GetOption('datadir') is not None:
+ 
+ opts.Save('configure.conf', env)
+ 
+-if GetOption('rpath') is not None:
+-    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
+-
+ envvar = [('CC', 'CC'),
+           ('CXX', 'CXX'),
+           ('CFLAGS', 'CFLAGS'),
+@@ -85,6 +82,9 @@ extra_cflags += ' -DGETTEXT_PACKAGE=\'"%s"\'' % gettext_package
+ env.Append(CFLAGS=extra_cflags)
+ env.Append(CXXFLAGS=extra_cflags)
+ 
++if GetOption('rpath') is not None:
++    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
++
+ #
+ #==============================configure================================
+ #
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..7ff6ff5d6acf
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 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.3-r1.ebuild,v 1.1 2011/02/26 08:15:58 qiaomuf Exp $
+
+EAPI="1"
+PYTHON_DEPEND="2:2.5"
+inherit eutils python scons-utils
+
+DESCRIPTION="The SunPinYin IMEngine for IBus Framework"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/ibus
+		app-i18n/sunpinyin"
+DEPEND="${RDEPEND}
+		sys-devel/gettext"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}" && epatch "${FILESDIR}/${P}-force-switch.patch"
+}
+
+src_compile() {
+	escons --prefix="/usr"
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+}