Include upstream patch.

(Portage version: 2.1.9.41/cvs/Linux x86_64)

3 files changed, 74 insertions, 1 deletions

diff --git a/app-i18n/scim-sunpinyin/ChangeLog b/app-i18n/scim-sunpinyin/ChangeLog
index 6b9813677663..6b138e7bbc57 100644
--- a/app-i18n/scim-sunpinyin/ChangeLog
+++ b/app-i18n/scim-sunpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-sunpinyin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sunpinyin/ChangeLog,v 1.1 2011/02/20 05:05:14 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-sunpinyin/ChangeLog,v 1.2 2011/02/26 08:21:36 qiaomuf Exp $
+
+*scim-sunpinyin-2.0.3-r1 (26 Feb 2011)
+
+  26 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> +scim-sunpinyin-2.0.3-r1.ebuild,
+  +files/scim-sunpinyin-2.0.3-force-switch.patch:
+  Include upstream patch.
 
 *scim-sunpinyin-2.0.3 (20 Feb 2011)
 
diff --git a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
new file mode 100644
index 000000000000..a0089ac11502
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
@@ -0,0 +1,34 @@
+diff --git a/wrapper/scim/SConstruct b/wrapper/scim/SConstruct
+index 7739300..ef7c69b 100644
+--- a/wrapper/scim/SConstruct
++++ b/wrapper/scim/SConstruct
+@@ -3,7 +3,7 @@ import SCons.Tool.textfile
+ 
+ locales = []
+ 
+-cflags = '-O2 -g -pipe'
++cflags = '-O2 -g -pipe '
+ version = '2.0.3'
+ 
+ AddOption('--prefix', dest='prefix', metavar='DIR',
+@@ -51,9 +51,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'),
+@@ -75,6 +72,10 @@ extra_cflags += ' -Isrc'
+ env.Append(CFLAGS=extra_cflags)
+ env.Append(CXXFLAGS=extra_cflags)
+ env.Replace(SHLIBPREFIX = '')
++
++if GetOption('rpath') is not None:
++    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
++
+ #
+ #==============================configure================================
+ #
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..6bb9213ce0ad
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.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/scim-sunpinyin/scim-sunpinyin-2.0.3-r1.ebuild,v 1.1 2011/02/26 08:21:36 qiaomuf Exp $
+
+EAPI="1"
+inherit eutils scons-utils
+
+DESCRIPTION="The SunPinyin IMEngine for Smart Common Input Method (SCIM)"
+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/scim
+		app-i18n/sunpinyin
+		x11-libs/gtk+:2 "
+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
+}