From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-i18n/sunpinyin/Manifest | 11 ++++ .../files/sunpinyin-2.0.3-force-switch.patch | 30 ++++++++++ .../sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch | 49 ++++++++++++++++ .../sunpinyin/files/sunpinyin-2.0.4-pod2man.patch | 17 ++++++ ...unpinyin-2.0.4_pre20130108-gcc6-use-float.patch | 17 ++++++ app-i18n/sunpinyin/metadata.xml | 11 ++++ app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild | 65 ++++++++++++++++++++++ .../sunpinyin-2.0.4_pre20130108-r1.ebuild | 47 ++++++++++++++++ 8 files changed, 247 insertions(+) create mode 100644 app-i18n/sunpinyin/Manifest create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch create mode 100644 app-i18n/sunpinyin/metadata.xml create mode 100644 app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild create mode 100644 app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild (limited to 'app-i18n/sunpinyin') diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest new file mode 100644 index 000000000000..aa88043cc401 --- /dev/null +++ b/app-i18n/sunpinyin/Manifest @@ -0,0 +1,11 @@ +AUX sunpinyin-2.0.3-force-switch.patch 1046 BLAKE2B 786ff56100b308cbcd0bc7bb4a16d7e5691e0dae5778639f9b3d04f4eae531b44164262256443b62e191f72a4aa85a039c08cc0608b97796f76e7ae0f074f45c SHA512 abae0d760ecb93c6317483f3b14ee21670f1a42799ffc15a5dcfcf7f0838f0809731953bf6377a52a9647ace8172025bff5049859ac55db989d9f61904fa38ae +AUX sunpinyin-2.0.3-gcc-4.7.patch 1275 BLAKE2B 9dc9fbc1b63f59fcdd853a8c99e9bfbf021540672729991cab67ea67b82e9d530963b33a34ce378af7309d9b749e0a831b6d1cd0393f3a7c182ca29d9411b27c SHA512 48d7e5ab52395467f3b282b73bb3ca5b2cd27c76ac1b454c0e248a9cfb13d8d628fbdf93b82a57404109d288c46d70456bb4aaf4f2899e3dd6e047140cdfc7c0 +AUX sunpinyin-2.0.4-pod2man.patch 469 BLAKE2B 5fab9d9a4cdb88189dfe0b8146f42effa9a48df8ce98e510a85c2cd55b92260803fb2350d921fa2a7e2a49e61ffbe82d2873397426c29ace1a50ba5c1d2c25b5 SHA512 1cc36f21dd11c802365fd770e7eefb324a3200e6570d7b585179778c8385dc694b214ad1339ac266f0adfa9d1f1ebca87b7847544069e25cfb563b0cb5bd8172 +AUX sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch 1010 BLAKE2B 3d34ca402e1504880e1abea8e2afc5fd5e342762020c450300ce01301f60d2c8cc527fdecb420eadf682fc1e086fef15b085518618c3803195d3afe4fd147d98 SHA512 8aaba439c49fac48c9523471bdbbac52feb594f61da6e3ba3747e3e6a08498817f06a8af8bcaa35d6b25ce0d31af3faac24faa57e15e3cae446f37dac5a30337 +DIST dict.utf8.tar.bz2 1598995 BLAKE2B 4cb990b6bbb440218c6af695369bdccf97b820da9aa10d118043a7bda1c602e53d0c63c4a460db2c64530e69ac1d98619e1a2efa2113a292063b422fc1b3d32c SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34 +DIST lm_sc.t3g.arpa.tar.bz2 25098718 BLAKE2B a7cd87d4e786a7dfe854b33c5c70019075ec99b02fd6cb33f91f89babdd2b255b6d157fff30c22b5372e74908483b814cc9698fd84caa3e56c61e76a59dbea04 SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98 +DIST sunpinyin-2.0.3.tar.gz 169394 BLAKE2B d93472c0c208da2a7aab99b1d514fa01acf67e69bdddc2c0e15f40af7a2abaf8860f8e792c2bd286bd1ec3a24124b0284d28295115c8dff1051f5df3c2314bb7 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d +DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 +EBUILD sunpinyin-2.0.3-r2.ebuild 1608 BLAKE2B cd4e7cbbb893e1dc9867e9c0d88628a2264ec60759550409e6c8437224495124749b3efeeb75c7ca5177bafff2121655376b3f7087e00f59b99c19e3b61cf5b6 SHA512 e4e06b77ac463074ea01211e754e7a3a90e4c0d7026b7bb321d18f79105d7bfca635e5a82e06f956ceb0b4d8febe5a1497cbbc8ec48ef2c994f1b00d90f66a57 +EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1057 BLAKE2B 0bd5fe2b7ac7af8b635bd45c3a28c7f79f8a4212830b939501c9c94dc67972ce3b6333beb937e57c2886aba33cd8ad86b916a26d1ea1c7d4881846c97d597e3f SHA512 594ea06940263db5afa0cb87631074417a05999863b0d64793b6567732bf4ebf37b8c7f02c14ab3f91e18755f7b6bebce325d1d0578c191d5f70d2af75ca5a36 +MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628 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/files/sunpinyin-2.0.3-gcc-4.7.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch new file mode 100644 index 000000000000..c523449ef514 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch @@ -0,0 +1,49 @@ +From 3d35aa0370d9c7bd455098caa9ba22ebe1f82968 Mon Sep 17 00:00:00 2001 +From: Yong Sun +Date: Wed, 4 Apr 2012 18:41:39 +0800 +Subject: [PATCH] Integrated patch from YunQiang Su, fixed FTBFS with gcc-4.7 + +--- + SConstruct | 3 ++- + src/portability.h | 5 ++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 97abf47..354fd19 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -313,7 +313,8 @@ def DoConfigure(): + conf.CheckCHeader('sys/param.h') + conf.CheckCHeader('sys/stat.h') + conf.CheckCHeader('sys/types.h') +- conf.CheckCHeader('unistd.h') ++ if conf.CheckCHeader('unistd.h'): ++ conf.Define('DHAVE_UNISTD_H', 1) + conf.CheckCHeader('wchar.h') + + # add essential package requirements +diff --git a/src/portability.h b/src/portability.h +index 949d4f2..cf43bd0 100644 +--- a/src/portability.h ++++ b/src/portability.h +@@ -44,15 +44,14 @@ + #include + #include + +-#if defined(sun) ++#if defined(HAVE_UNISTD_H) + #include + #ifdef __cplusplus + #include + #else + #include + #endif //__cpluscplus +-#endif //defined(sun) +- ++#endif //defined(HAVE_UNISTD_H) + + #ifndef HOST_OS_GNUC_2 + #if defined(DEBUG) && !defined(NDEBUG) +-- +1.7.8.5 + diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch new file mode 100644 index 000000000000..54831df21220 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch @@ -0,0 +1,17 @@ +From: Guo Yixuan +Bug: https://code.google.com/archive/p/sunpinyin/issues/327 +Gentoo-Bug: 553796 + +diff --git a/man/SConscript b/man/SConscript +index f3ebd03..e1551eb 100644 +--- a/man/SConscript ++++ b/man/SConscript +@@ -1,7 +1,7 @@ + import os + Import('env') + +-pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET') ++pod2man = Builder(action = 'pod2man $SOURCE $TARGET') + env.Append(BUILDERS = {'Man': pod2man}) + + env.Man('mmseg.1', 'mmseg.pod') diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch new file mode 100644 index 000000000000..77fe2831c7d8 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch @@ -0,0 +1,17 @@ +--- sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h.old 2016-09-20 02:54:15.046257131 -0400 ++++ sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h 2016-09-20 02:55:48.041124978 -0400 +@@ -53,10 +53,10 @@ + typedef std::map RealIndexMap; // map real values to their indices + typedef std::map TLexicon; // map word to wid + +-#define EffectivePr(a) (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a))))) +-#define OriginalPr(b) (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b))))) +-#define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a)))) +-#define OriginalBow(b) (float((usingLogPr) ? (-log((b))) : ((b)))) ++#define EffectivePr(a) (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a))))) ++#define OriginalPr(b) (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b))))) ++#define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a)))) ++#define OriginalBow(b) (float((usingLogPr) ? (-logf((b))) : ((b)))) + + #endif //_SLM_PACK_COMMON_H + diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml new file mode 100644 index 000000000000..da2c1e97edca --- /dev/null +++ b/app-i18n/sunpinyin/metadata.xml @@ -0,0 +1,11 @@ + + + + + cjk@gentoo.org + Cjk + + + sunpinyin/sunpinyin + + diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild new file mode 100644 index 000000000000..8ef0101da1e5 --- /dev/null +++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit scons-utils toolchain-funcs + +DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME" +HOMEPAGE="https://sunpinyin.googlecode.com" +SRC_URI="${HOMEPAGE}/files/${P}.tar.gz + https://open-gram.googlecode.com/files/dict.utf8.tar.bz2 + https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2" + +LICENSE="LGPL-2.1 CDDL" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" + +RDEPEND="dev-db/sqlite:3" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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" +} + +src_prepare() { + eapply "${FILESDIR}/${P}-force-switch.patch" + eapply "${FILESDIR}/${P}-gcc-4.7.patch" + default +} + +src_configure() { + tc-export CXX + myesconsargs=( + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir) + --libdatadir="${EPREFIX}"/usr/lib + ) +} + +src_compile() { + escons || die +} + +src_install() { + escons --install-sandbox="${ED}" install || die +} + +pkg_postinst() { + elog "" + elog "If you have already installed former version of ${PN}" + elog "and any wrapper, please remerge the wrapper to make it work with" + elog "the new version." + elog "" + elog "To use any wrapper for ${PN}, please merge any of the following" + elog "packages: " + elog "emerge app-i18n/fcitx-sunpinyin" + elog "emerge app-i18n/ibus-sunpinyin" + elog "emerge app-i18n/scim-sunpinyin" + elog "emerge app-i18n/xsunpinyin" + elog "" +} diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild new file mode 100644 index 000000000000..84ef8dcc2cb4 --- /dev/null +++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +inherit eutils multilib python-any-r1 scons-utils toolchain-funcs + +DESCRIPTION="A Statistical Language Model based Chinese input method library" +HOMEPAGE="https://github.com/sunpinyin/sunpinyin" +SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz" + +LICENSE="LGPL-2.1 CDDL" +SLOT="0/3" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="" + +RDEPEND="dev-db/sqlite:3" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" +PDEPEND="app-i18n/sunpinyin-data" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch + epatch "${FILESDIR}"/${P}-gcc6-use-float.patch + epatch_user +} + +src_configure() { + tc-export CXX + myesconsargs=( + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir) + ) +} + +src_compile() { + escons +} + +src_install() { + escons --install-sandbox="${D}" install + rm -rf "${D}"/usr/share/doc/${PN} || die + dodoc doc/{README,SLM-inst.mk,SLM-train.mk} +} -- cgit v1.2.3