Fix ldflags wrt bug #351017

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

5 files changed, 148 insertions, 10 deletions

diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
new file mode 100644
index 000000000000..1924914a5231
--- /dev/null
+++ b/app-i18n/imsettings/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST imsettings-1.0.0.tar.bz2 570007 RMD160 765ef8cd7272d69cd02ddc8ff461374d8f9a6e2c SHA1 d6e72a796278081067a3bc99a9bed2403a2f5027 SHA256 66bf77933800aaf87eb07c68db49c7d18699b671783d82e6f01052228cb496d9
+EBUILD imsettings-1.0.0.ebuild 1302 RMD160 17565928ce44d1a3c32f662d3e2418c67e500e28 SHA1 62fd4421ff75c73f55569166483609182e4861cc SHA256 4527122c68302ffcc6aa6a47c8461371d6e08f1d318dad5aa3433d19a4e36523
+MISC ChangeLog 355 RMD160 f5d01402d45f80b337634e8c5fb4e0e6052c99e3 SHA1 d28edda139d7792d88ea65fc6dfd925d023adbe1 SHA256 fae4c768304972e32af0fdd5ffe11615ab541b8ef7a28708b224246faa2ca737
+MISC metadata.xml 231 RMD160 75200cba4ee5103e132224627d48d476a62545f1 SHA1 b0dd5e115534ba370c2893a192d2400aa6d419cd SHA256 63de22b40020d4042c9ce625bd6511c70dcf660f5a2c6fa126146b60a757926a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNKAEGAAoJECaGw+YFKA1pp1QQAJSSBnjIu7a6+FZY5NiMOmG5
+3fNqevsp1BytZQ4H/zL+5LMkcpODZ9ScbV53UtQnJqxnp0rN3EclvzqCdLxx3xwm
+SI3L0x3jPRWyg36dQVfI0RXY6uYY8TNQfKFNdxsRab/lHRCEjyBRvPDRAsBjZ5w9
+WTlbpdWRtJxheZxVpDz3PDMTggPG6FRLIIh/G8RT+8vgWcb4TN5pFQDdej76WM6o
+c8gPyevCKx3p84eY6G5AN6eFq/tSO7wM8c/h84s0FLDNX0NFECv6muU4qsyaMd2J
+nFXxX8IXF9C+AO+zgTQx09YhBo3Of/X19RL3kgNxhm3ZXLafwPztIJSKECGxXhdt
++37IDs22JQQ5EGRB5Y386BqzpJvrj9/b17oZY5M/tJn7JPjHCK/RLziAdeijuIKH
++7WbNHB6h1eugKGuTyCWiGWEJOd9uUSLft23oEjK3VBWRqHJeeAQbe9IVP6VQJWR
+jCgJL61MCO6ejUSVFeNbvuILq0w64wL1xwYJxSLiwQ681+VE1uVHibea5ZZQSZVD
+gwy00qTh9dSKujoQJ+CtcrjN+tAjCULkNp0yfQpVfbGJKNmO3jnirdDjVF9HD4mR
+5CwzHE/UWbOFJ2VFfV+/bk9JQGbg5r2v38c8WjbiAtvB8uLCAObH0iKm3pZw1Vem
+65Ne7Aj8tOasdvwIr7KE
+=TSqE
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/sunpinyin/ChangeLog b/app-i18n/sunpinyin/ChangeLog
index e774cf213b2c..f87ec97c0c39 100644
--- a/app-i18n/sunpinyin/ChangeLog
+++ b/app-i18n/sunpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/sunpinyin
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/ChangeLog,v 1.3 2010/12/02 07:03:49 qiaomuf Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/ChangeLog,v 1.4 2011/01/08 06:13:50 qiaomuf Exp $
+
+*sunpinyin-2.0.2-r1 (08 Jan 2011)
+
+  08 Jan 2011; Mu Qiao <qiaomuf@gentoo.org> +sunpinyin-2.0.2-r1.ebuild,
+  +files/sunpinyin-2.0.2-ldflags.patch:
+  Fix ldflags wrt bug #351017
 
 *sunpinyin-2.0.2 (02 Dec 2010)
 
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index ba1f14f100bc..2d6067349d8a 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA1
 
 AUX sunpinyin-2.0.1-mkdir.patch 575 RMD160 e4f328907105e327317cce2f38fc8cbd31f4cea2 SHA1 33334c29e623dd588e3a53a82b4917d10eb30d9f SHA256 44c8811455806ecc91aaee73248114a2a62b0e7b162596138f3da4f74d4142d6
+AUX sunpinyin-2.0.2-ldflags.patch 2319 RMD160 ad046b3fb673618fca0d0a6da1d6993ddd0cc099 SHA1 33ecf7eecc93a3b7b14702087721b2eaa84a7825 SHA256 8888195a108c3c07263cc77087d407ac83e2981a6b9bfd0bc2c27dbd5f1dfdc1
 DIST sunpinyin-2.0.1.tar.gz 26318733 RMD160 ce855f819cfa091450bfb344a5132cead7afc33e SHA1 6c36c25f6365a83730f970e51682e5ba58f1c929 SHA256 bdaccb0ee9e618289d308b8cad1646b678fe2eaa946dc6198fc66bfb5f59063b
 DIST sunpinyin-2.0.2.tar.gz 27830779 RMD160 ffc1b96c6a9a506bb548e6d4154dd3008f192ebe SHA1 768b43ce838f43a60a6d70b7f11fc1729fa726d4 SHA256 d7cf1559478d17fd2e436caa87b6b5e6b9dc56fa68a70a07447786a0164b72c0
 EBUILD sunpinyin-2.0.1.ebuild 1683 RMD160 875135675a4ad50646705cb8c89c9777334ed920 SHA1 9b565bfc5458dbdea68c62c0440b33c89dd5631f SHA256 8b57716dcb11f92b935bf2c1f4217db22d8fab44510c1424972c90bfe827475e
+EBUILD sunpinyin-2.0.2-r1.ebuild 1178 RMD160 63cb5dc81ae581f83d657d023da5b3d0980f4a6b SHA1 d9c73772f4aa37cca58199c6feacfc7a7f812c57 SHA256 eeeccddedec86a89d0f3a1951ce24188b399dc95d95a6fbac19090d6c2a12e35
 EBUILD sunpinyin-2.0.2.ebuild 1096 RMD160 146af7c95ea67513a4ec41b522412028e7c5b291 SHA1 ea69b8607017638906ec5fa76f6bb63d99e79ae9 SHA256 bca779e7c1eeab377bb1525540934b65465699748ed91d43d746f4b11a561ff2
-MISC ChangeLog 1157 RMD160 0d9494b9f799c8317977230b1c60e160488772fe SHA1 5260e5d25ea809ab1dc21d7db268a638740e0007 SHA256 452bfce989e089890ded05c68bd52d9f7cb102948f764c745951186c2d02fe07
+MISC ChangeLog 1335 RMD160 cbc90a470eebdea018781967b3774e8e648bba56 SHA1 cb34a0b6d7143318f07405e5d6d0efaf4883b54e SHA256 e9c3ce4f5daa6553dc2b9ed0da8fc74e3798824eda686eb39834cb6a5a45aa9a
 MISC metadata.xml 307 RMD160 7b5210c750a70d4bd65c6ff529a6bd9ca2ec3052 SHA1 1820ca5b483e66bc6627dfe277749cd3daa47692 SHA256 84307cd50dcea4c60117927dc9e4f23c1dbfd8f73c9d1f0626f44114da0b551d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJM90T0AAoJEDCzDeQXsVfpKrsH/inSR2s/YLzhj6N8ct0Iw+dp
-dzy5CJI5bhXtjzgzNHm2Jr1KFrZvh97p2prqjSjtY/FZULkDBetHArFInLgmMYKA
-nflwEsDzKC7MhkoovJhSmMtAANVK4CcIpFxbxnTgHw3AawgbJ4/gJYRma/ALc5ve
-1hzTJrXCAsbxLYoX3UmQOi3ypitmNhMhSR1JPnG97SVyxn3eEKiJaUi+T5rYmPiO
-V09P0IwrpwNAM3ODqbz5cT+bsIm7y9LrrIm4fqeNuV7IdagBo4WthvdqljOdlLKq
-/TmjR84dV/IDO+K/CKWuLf/uTR649g8tILWzNcdqRrd8Q4D0VvmKkAO/3LsV1LY=
-=bfMv
+iQEcBAEBAgAGBQJNKAC6AAoJEDCzDeQXsVfp83IIAJa7BxR/u3SbU1Pj12bHxPW8
+5zmU+kI2V+CDWw+rM/0Vg3ASU+9IC/4RNXEtReyliMbod2Ls19I/QTi6fcjbg0nb
+QD2+az7Ds2m+bpSYm48M89j0dZUm8K/vWQGVajhlNpm8sxM+tF6FRMhx6vswf4I1
+/TrKHiMirpM4r/2kxQcsvJLXRsVhjcUw/n3U9+knxvznTZTOXCJJhVC3vG/HwuBM
+pDZmzz9fKUe0UPDcRgEPBLlPDZG52C9g7QNEx+UC7c9dIUSNghhX5Me38v+0j1X1
+YRfsKJTBGg9YX65+AgtRR2n1ezi0ZMRkelSKeQJOpS4TwYdIEIdxT38jvspgxDQ=
+=AL47
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.2-ldflags.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.2-ldflags.patch
new file mode 100644
index 000000000000..decffa287730
--- /dev/null
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.2-ldflags.patch
@@ -0,0 +1,55 @@
+diff -urN sunpinyin/SConstruct sunpinyin-patched/SConstruct
+--- sunpinyin/SConstruct	2010-08-15 13:32:48.000000000 +0800
++++ sunpinyin-patched/SConstruct	2011-01-08 13:54:44.588000007 +0800
+@@ -193,6 +193,10 @@
+ conf = Configure(env, custom_tests={'CheckPKGConfig' : CheckPKGConfig,
+                                     'CheckPKG' : CheckPKG})
+ 
++if 'LDFLAGS' in os.environ:
++    import SCons
++    conf.env.Append(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS']))
++
+ config_h_content = ''
+ 
+ def AddConfigItem(macro_name, res):
+diff -urN sunpinyin/wrapper/gtk_standalone/SConstruct sunpinyin-patched/wrapper/gtk_standalone/SConstruct
+--- sunpinyin/wrapper/gtk_standalone/SConstruct	2010-08-15 13:32:49.000000000 +0800
++++ sunpinyin-patched/wrapper/gtk_standalone/SConstruct	2011-01-08 13:55:27.696000007 +0800
+@@ -1,6 +1,10 @@
+ import os
+ 
+ env=Environment(ENV=os.environ, CFLAGS='-g', CXXFLAGS='-g')
++if 'LDFLAGS' in os.environ:
++    import SCons
++    env.Append(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS']))
++
+ env.ParseConfig('pkg-config gtk+-2.0 sunpinyin-2.0 sqlite3 --cflags --libs')
+ 
+ env.Program('sunpinyin', source=['imi_gtkwin.cpp', 'sunpinyin.cpp'])
+diff -urN sunpinyin/wrapper/ibus/SConstruct sunpinyin-patched/wrapper/ibus/SConstruct
+--- sunpinyin/wrapper/ibus/SConstruct	2010-08-15 13:32:49.000000000 +0800
++++ sunpinyin-patched/wrapper/ibus/SConstruct	2011-01-08 13:55:02.292000012 +0800
+@@ -71,6 +71,9 @@
+ 
+ conf = Configure(env, custom_tests={'CheckPKGConfig' : CheckPKGConfig,
+                                     'CheckPKG' : CheckPKG })
++if 'LDFLAGS' in os.environ:
++    import SCons
++    conf.env.Append(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS']))
+ 
+ def DoConfigure():
+     if GetOption('clean'):
+diff -urN sunpinyin/wrapper/xim/SConstruct sunpinyin-patched/wrapper/xim/SConstruct
+--- sunpinyin/wrapper/xim/SConstruct	2010-08-15 13:32:49.000000000 +0800
++++ sunpinyin-patched/wrapper/xim/SConstruct	2011-01-08 13:55:12.036000010 +0800
+@@ -81,6 +81,10 @@
+ 
+ conf = Configure(env, custom_tests={'CheckPKGConfig' : CheckPKGConfig,
+                                     'CheckPKG' : CheckPKG })
++if 'LDFLAGS' in os.environ:
++    import SCons
++    conf.env.Append(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS']))
++
+ def DoConfigure():
+     if GetOption('clean'):
+         return
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.2-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..33ad07d38528
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.2-r1.ebuild,v 1.1 2011/01/08 06:13:50 qiaomuf Exp $
+
+EAPI="1"
+PYTHON_DEPEND="ibus? 2:2.5"
+inherit eutils python scons-utils
+
+DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
+HOMEPAGE="http://sunpinyin.googlecode.com"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ibus +xim"
+
+RDEPEND="dev-db/sqlite:3
+	ibus? (
+		>=app-i18n/ibus-1.1
+		!app-i18n/ibus-sunpinyin
+		sys-devel/gettext
+	)
+	xim? (
+		>=x11-libs/gtk+-2.10:2
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	xim? ( x11-proto/xproto )"
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+src_compile() {
+	escons --prefix="/usr"
+}
+
+src_install() {
+	escons --prefix="/usr" --install-sandbox="${D}" install
+	if use ibus; then
+		cd "${S}/wrapper/ibus"
+		escons --prefix="/usr" --install-sandbox="${D}" install
+	elif use xim; then
+		cd "${S}/wrapper/xim"
+		escons --prefix="/usr" --install-sandbox="${D}" install
+	fi
+}