From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- app-i18n/sunpinyin/Manifest | 12 +++--- .../files/sunpinyin-2.0.3-force-switch.patch | 2 - .../sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch | 21 ++++++++++ .../sunpinyin/files/sunpinyin-2.0.4-pod2man.patch | 9 ++--- ...unpinyin-2.0.4_pre20130108-gcc6-use-float.patch | 17 -------- app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild | 42 +++++++++---------- .../sunpinyin-2.0.4_pre20130108-r1.ebuild | 47 ---------------------- .../sunpinyin-2.0.4_pre20130108-r2.ebuild | 46 +++++++++++++++++++++ app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild | 41 +++++++++++++++++++ 9 files changed, 140 insertions(+), 97 deletions(-) create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch delete mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch delete mode 100644 app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild create mode 100644 app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild create mode 100644 app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild (limited to 'app-i18n/sunpinyin') diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest index aa88043cc401..8b071569e419 100644 --- a/app-i18n/sunpinyin/Manifest +++ b/app-i18n/sunpinyin/Manifest @@ -1,11 +1,13 @@ -AUX sunpinyin-2.0.3-force-switch.patch 1046 BLAKE2B 786ff56100b308cbcd0bc7bb4a16d7e5691e0dae5778639f9b3d04f4eae531b44164262256443b62e191f72a4aa85a039c08cc0608b97796f76e7ae0f074f45c SHA512 abae0d760ecb93c6317483f3b14ee21670f1a42799ffc15a5dcfcf7f0838f0809731953bf6377a52a9647ace8172025bff5049859ac55db989d9f61904fa38ae +AUX sunpinyin-2.0.3-force-switch.patch 979 BLAKE2B 9274064e2966330c461f062316256e9d905217d5fbfd2dfd55cd881a5021fc5de747689709f58284f7674f78fabc81b7a8c635cac984e10be7832788eca7c4c7 SHA512 0782895b4a718f218f447fba66253ff38916dacf3168d6ff47e8186e39cdc968c467e74431105a8795cb04176309d5ce333e712a3aab2840094bbdd169853b3e 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 +AUX sunpinyin-2.0.4-gcc-6.patch 959 BLAKE2B 72e027a928bd9f684dbecc7ce50074df6d915b9e699de661853012961454bce48008bff50fd2de135ef828f08e84647b624bd844b9baafb2e929480171a44f63 SHA512 7093542613a2c15c6e1dc7e500bc38f65061d927d3f89f281973f401f19f0e151f0ef438c2a1c21d102bd56b23c81d206b6a524d77b04ae4e0b79f0b97691b96 +AUX sunpinyin-2.0.4-pod2man.patch 406 BLAKE2B debbbd0c004625c3e9dc73e07876774d12d3514757ea1d5a8ad9a978868f85175d0fa92e0e46541e00c208498b7bae9ac7257491de50f6d0829616c68decbcd5 SHA512 7a0b48e4b0270b1c60844b91df42dd8f59460c9a5725c5492fd4886b77d8e993dbe2c8efc464da271d51d19d17c3c94573c57c0dd7f28414336138212911e387 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 +DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e +EBUILD sunpinyin-2.0.3-r2.ebuild 1627 BLAKE2B e6868f2e9f3ca8bd1947d2eccf40e221afeab10046f493e6ed674a7e0ebe75994c8d801edecbab9529d21322068ac888fe36c6dc816e270e8b6684d1b9fb5997 SHA512 84ef99fd67b79b2bc0bc9ea8a8e2e110465a5b0103096364f142e98539262d42594c427761f2e0ce82761e4a3b9f49a331200891fe3f2641ccc1482739e4f4f9 +EBUILD sunpinyin-2.0.4_pre20130108-r2.ebuild 969 BLAKE2B 3a4fed1810722b8d0f74282add5b5298c120b373c083fab1f1289285435915a12be3b8cfd3c44514c5f0d085231ffe933d5fab0ba3a2522d1422b71447bb0da8 SHA512 588f5bf39e30b91ecea1550c28c6ab2fca113fbbcc999f12ebaa335abccb214d4d2f4f6d28dbbdf728561b6ccecd9177f518134b0d39dd9c36a19428cab70ebf +EBUILD sunpinyin-3.0.0_rc1.ebuild 918 BLAKE2B e5220cd1829a49aa2155ab92e5b9c2ea82ca281bff4743935f24b2072a8237f064905f979feccca99007d653877728430108c45793286eeb41d3668832b39859 SHA512 065897821edeed4dece2aff5061f7d97fcf634a544a7d1d6cf614b4215e05808459c7940953e8ae6f0319f3803d36630cb520b2b97da1284289e5d447da9a3e3 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 index f2f6b389ba09..de85e82c1d5e 100644 --- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch @@ -1,5 +1,3 @@ -diff --git a/SConstruct b/SConstruct -index 68cd365..9bb6ebc 100644 --- a/SConstruct +++ b/SConstruct @@ -180,12 +180,6 @@ libdir = env['LIBDIR'] diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch new file mode 100644 index 000000000000..0bceb38318b3 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/553796 + +Author: Peter Levine + +--- a/src/slm/tslmpack/common.h ++++ b/src/slm/tslmpack/common.h +@@ -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/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch index 54831df21220..36e69d2deda3 100644 --- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch @@ -1,9 +1,8 @@ -From: Guo Yixuan -Bug: https://code.google.com/archive/p/sunpinyin/issues/327 -Gentoo-Bug: 553796 +https://bugs.debian.org/790287 +https://code.google.com/p/sunpinyin/issues/detail?id=327 + +Author: Guo Yixuan -diff --git a/man/SConscript b/man/SConscript -index f3ebd03..e1551eb 100644 --- a/man/SConscript +++ b/man/SConscript @@ -1,7 +1,7 @@ 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 deleted file mode 100644 index 77fe2831c7d8..000000000000 --- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild index 8ef0101da1e5..c79fd710b993 100644 --- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild +++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="6" +PYTHON_COMPAT=( python2_7 ) -inherit scons-utils toolchain-funcs +inherit python-any-r1 scons-utils toolchain-funcs -DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME" -HOMEPAGE="https://sunpinyin.googlecode.com" +DESCRIPTION="A Statistical Language Model based Chinese input method library" +HOMEPAGE="https://github.com/sunpinyin/sunpinyin" 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" @@ -18,35 +19,34 @@ IUSE="" RDEPEND="dev-db/sqlite:3" DEPEND="${RDEPEND} - virtual/pkgconfig" + ${PYTHON_DEPS} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-force-switch.patch + "${FILESDIR}"/${P}-gcc-4.7.patch +) 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" + 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 + escons \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --libdatadir="${EPREFIX}"/usr/lib } src_install() { - escons --install-sandbox="${ED}" install || die + escons --install-sandbox="${D}" install } pkg_postinst() { diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild deleted file mode 100644 index 84ef8dcc2cb4..000000000000 --- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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} -} diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild new file mode 100644 index 000000000000..34f908fd9808 --- /dev/null +++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) + +inherit 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-20130220" + +PATCHES=( + "${FILESDIR}"/${P/_pre*}-gcc-6.patch + "${FILESDIR}"/${P/_pre*}-pod2man.patch +) + +src_prepare() { + sed -i "/^docdir/s/${PN}/${PF}/" SConstruct + + default + tc-export CXX +} + +src_compile() { + escons \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) +} + +src_install() { + escons --install-sandbox="${D}" install +} diff --git a/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild new file mode 100644 index 000000000000..386c1694c1a2 --- /dev/null +++ b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) + +inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot + +DESCRIPTION="A Statistical Language Model based Chinese input method library" +HOMEPAGE="https://github.com/sunpinyin/sunpinyin" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" + +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-20140820" + +src_prepare() { + sed -i "/^docdir/s/${PN}/${PF}/" SConstruct + + default + tc-export CXX +} + +src_compile() { + escons \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) +} + +src_install() { + escons --install-sandbox="${D}" install +} -- cgit v1.2.3