diff options
| -rw-r--r-- | app-i18n/sunpinyin/ChangeLog | 8 | ||||
| -rw-r--r-- | app-i18n/sunpinyin/Manifest | 5 | ||||
| -rw-r--r-- | app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch | 30 | ||||
| -rw-r--r-- | app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild (renamed from app-i18n/sunpinyin/sunpinyin-2.0.3.ebuild) | 5 |
4 files changed, 43 insertions, 5 deletions
diff --git a/app-i18n/sunpinyin/ChangeLog b/app-i18n/sunpinyin/ChangeLog index ed15fbda9892..75997074e7cb 100644 --- a/app-i18n/sunpinyin/ChangeLog +++ b/app-i18n/sunpinyin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-i18n/sunpinyin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/ChangeLog,v 1.6 2011/02/20 13:22:37 qiaomuf Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/ChangeLog,v 1.7 2011/02/26 08:09:49 qiaomuf Exp $ + +*sunpinyin-2.0.3-r1 (26 Feb 2011) + + 26 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> -sunpinyin-2.0.3.ebuild, + +sunpinyin-2.0.3-r1.ebuild, +files/sunpinyin-2.0.3-force-switch.patch: + Include upstream patch. 20 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> sunpinyin-2.0.3.ebuild: Fix compilation for userpriv, thanks to Alphat-PC. diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest index bf923a650f27..ce17ab3c9649 100644 --- a/app-i18n/sunpinyin/Manifest +++ b/app-i18n/sunpinyin/Manifest @@ -1,5 +1,6 @@ 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 +AUX sunpinyin-2.0.3-force-switch.patch 1046 RMD160 d98f16f71f03c455baf62c8ea3013ddb28593e90 SHA1 dab1204663f66777f55154402f0f2e8a24691332 SHA256 ddb9fe9f219ae1e6d8754fb03187dba913ac9d731836da15e93d155a9c287bbf DIST dict.utf8.tar.bz2 1598995 RMD160 748e7e4e4f6e0f557b46dc8a7f1eb747210f3aea SHA1 44bfe155044326d2343aa2cf589db41a81cdaf13 SHA256 d8261f6b0bfcdd40a9c4f366228f86b017e06c9d7d64d6ddec1c2c3511eea805 DIST lm_sc.t3g.arpa.tar.bz2 25098718 RMD160 f7ba622aa909ea624049f3572ec1363953dee974 SHA1 be340be53007637e58feba211715df59f9c86025 SHA256 c80093a8b43561e64158de4139967eef39b851432a2660e8050429d7560907cd DIST sunpinyin-2.0.1.tar.gz 26318733 RMD160 ce855f819cfa091450bfb344a5132cead7afc33e SHA1 6c36c25f6365a83730f970e51682e5ba58f1c929 SHA256 bdaccb0ee9e618289d308b8cad1646b678fe2eaa946dc6198fc66bfb5f59063b @@ -7,6 +8,6 @@ DIST sunpinyin-2.0.2.tar.gz 27830779 RMD160 ffc1b96c6a9a506bb548e6d4154dd3008f19 DIST sunpinyin-2.0.3.tar.gz 169394 RMD160 b9ca794576dd71814a9b1cea33391dad3bffdc7e SHA1 8fe8c1fe9a959baedd1e9ed0f63e3b91108c35a4 SHA256 4ab776e7563f69f8dbda8fac7cfaa42bd0db1ea68bab15f756094ce5398d83d1 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.3.ebuild 1437 RMD160 3a718923b40b856892991685c9d22030c2a15db5 SHA1 90f10edcd522b575a17283ce97490d409f8a4f37 SHA256 096296ab4ee77616d73e8ff32969a205309e660ebaf5a2e7ba327f2983f21c31 -MISC ChangeLog 1604 RMD160 618b9414cf6862dd7b4411c44571e7e123c4bcbc SHA1 5330a50dad5e462499ce24951595d95bfdd0d985 SHA256 4414304833ab9efabb58cbf2c3e43fd683cd9bfdfb2f93339a6c1aa6bc9c47fa +EBUILD sunpinyin-2.0.3-r1.ebuild 1506 RMD160 79c9044c71bdb89f64398a79e6d825a8e70368ac SHA1 63cf0ce8cb9390e302ffd259c71386a32de28884 SHA256 d7db5b463d01ac7c5cd37ff2dceac844bc99a68e3af13051aa3f35667af4ec2d +MISC ChangeLog 1808 RMD160 2bdbaaf76e7b7589b29d2e16603c5c62082a2ab0 SHA1 33c89686ea1dd13f54d51bf989d4bd944a3bcf8a SHA256 a8e1cdfeff5a25b2b592cbe6ca6abf016831d631f2135e2576e7fd403c5bf052 MISC metadata.xml 307 RMD160 7b5210c750a70d4bd65c6ff529a6bd9ca2ec3052 SHA1 1820ca5b483e66bc6627dfe277749cd3daa47692 SHA256 84307cd50dcea4c60117927dc9e4f23c1dbfd8f73c9d1f0626f44114da0b551d diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch new file mode 100644 index 000000000000..f2f6b389ba09 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch @@ -0,0 +1,30 @@ +diff --git a/SConstruct b/SConstruct +index 68cd365..9bb6ebc 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -180,12 +180,6 @@ libdir = env['LIBDIR'] + libdatadir = env['LIBDATADIR'] + '/sunpinyin/data' + headersdir = env['PREFIX'] + '/include/sunpinyin-2.0' + +-if GetOS() != 'Darwin': +- env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major]) +- +-if GetOption('rpath') is not None and GetOS() != 'Darwin': +- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) +- + # pass through environmental variables + envvar = [('CC', 'CC'), + ('CXX', 'CXX'), +@@ -202,6 +196,12 @@ extra_cflags=' -DHAVE_CONFIG_H -DSUNPINYIN_DATA_DIR=\'"%s"\'' % libdatadir + env.Append(CFLAGS=extra_cflags) + env.Append(CXXFLAGS=extra_cflags) + ++if GetOS() != 'Darwin': ++ env.Append(LINKFLAGS=' -Wl,-soname=libsunpinyin.so.%d' % abi_major) ++ ++if GetOption('rpath') is not None and GetOS() != 'Darwin': ++ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath')) ++ + # + #==============================configure================================ + # diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild index fe7fd7211bbd..542c37df0f82 100644 --- a/app-i18n/sunpinyin/sunpinyin-2.0.3.ebuild +++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild @@ -1,9 +1,9 @@ # 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.3.ebuild,v 1.3 2011/02/20 13:22:37 qiaomuf Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild,v 1.1 2011/02/26 08:09:49 qiaomuf Exp $ EAPI="1" -inherit scons-utils +inherit eutils scons-utils DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME" HOMEPAGE="http://sunpinyin.googlecode.com" @@ -24,6 +24,7 @@ src_unpack() { unpack "${P}.tar.gz" ln -s "${DISTDIR}/dict.utf8.tar.bz2" "${S}/raw/" || die "dict file not found" ln -s "${DISTDIR}/lm_sc.t3g.arpa.tar.bz2" "${S}/raw/" || die "dict file not found" + cd "${S}" && epatch "${FILESDIR}/${P}-force-switch.patch" } src_compile() { |