Include upstream patch.

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

3 files changed, 85 insertions, 1 deletions

diff --git a/app-i18n/xsunpinyin/ChangeLog b/app-i18n/xsunpinyin/ChangeLog
index fa682cc77cf6..049e0ba87640 100644
--- a/app-i18n/xsunpinyin/ChangeLog
+++ b/app-i18n/xsunpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/xsunpinyin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsunpinyin/ChangeLog,v 1.3 2011/02/23 06:18:24 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsunpinyin/ChangeLog,v 1.4 2011/02/26 08:24:47 qiaomuf Exp $
+
+*xsunpinyin-2.0.3-r2 (26 Feb 2011)
+
+  26 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> +xsunpinyin-2.0.3-r2.ebuild,
+  +files/xsunpinyin-2.0.3-force-switch.patch:
+  Include upstream patch.
 
 *xsunpinyin-2.0.3-r1 (23 Feb 2011)
 
diff --git a/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch b/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
new file mode 100644
index 000000000000..04f70e2d2aad
--- /dev/null
+++ b/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
@@ -0,0 +1,45 @@
+diff --git a/wrapper/xim/SConstruct b/wrapper/xim/SConstruct
+index 9d1cafd..495871d 100644
+--- a/wrapper/xim/SConstruct
++++ b/wrapper/xim/SConstruct
+@@ -32,7 +32,7 @@ imdkit_sources = ['IMdkit/FrameMgr.c',
+                   'IMdkit/IMValues.c']
+ 
+ 
+-cflags='-O2 -g -pipe'
++cflags='-O2 -g -pipe '
+ 
+ # options
+ AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store',
+@@ -52,7 +52,6 @@ def PassVariables(envvar, env):
+ 
+ env = Environment(ENV=os.environ,
+                   CFLAGS=cflags, CXXFLAGS=cflags,
+-                  LINKFLAGS=['-export-dynamic'],
+                   CPPPATH=['.', 'IMdkit'])
+ opts.Update(env)
+ 
+@@ -62,11 +61,6 @@ if GetOption('prefix') is not None:
+ 
+ opts.Save('configure.conf', env)
+ 
+-
+-# set rpath
+-if GetOption('rpath') is not None:
+-    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
+-
+ envvar = [('CC', 'CC'),
+           ('CXX', 'CXX'),
+           ('CFLAGS', 'CFLAGS'),
+@@ -83,7 +77,11 @@ extra_cflags += ' -DSUNPINYIN_XIM_SETTING_DIR=\\"%s\\"' % data_dir
+ 
+ env.Append(CFLAGS=extra_cflags)
+ env.Append(CXXFLAGS=extra_cflags)
++env.Append(LINKFLAGS=' -export-dynamic')
+ 
++# set rpath
++if GetOption('rpath') is not None:
++    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
+ 
+ #
+ #==============================configure================================
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..1c6c5645f538
--- /dev/null
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r2.ebuild,v 1.1 2011/02/26 08:24:46 qiaomuf Exp $
+
+EAPI="1"
+inherit eutils scons-utils
+
+DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-i18n/sunpinyin
+		x11-libs/gtk+:2
+		x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+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
+}