public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/, app-i18n/sunpinyin/files/
@ 2016-05-10  5:46 Benda XU
  0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2016-05-10  5:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2b81985e046cea8f059daa25c3ab886cdc37519b
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 05:45:25 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue May 10 05:45:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b81985e

app-i18n/sunpinyin: fix pod2man and install directory.

Bug: 581914 553796

Package-Manager: portage-2.2.28

 app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch | 17 +++++++++++++++++
 app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild  |  5 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)

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 0000000..54831df
--- /dev/null
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
@@ -0,0 +1,17 @@
+From: Guo Yixuan <culu.gyx@gmail.com>
+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/sunpinyin-2.0.4_pre20130108.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild
index ac30d88..87e36a1 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 PDEPEND="app-i18n/sunpinyin-data"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch
 	epatch_user
 }
 
@@ -40,7 +41,7 @@ src_compile() {
 }
 
 src_install() {
-	escons --install-sandbox="${ED}" install
+	escons --install-sandbox="${D}" install
 	rm -rf "${D}"/usr/share/doc/${PN} || die
 	dodoc doc/{README,SLM-inst.mk,SLM-train.mk}
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/, app-i18n/sunpinyin/files/
@ 2016-10-11 21:56 Yixun Lan
  0 siblings, 0 replies; 6+ messages in thread
From: Yixun Lan @ 2016-10-11 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     e056277175e3d4033840c60ca6f5ca437f75ffb7
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 21:53:54 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 21:56:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0562771

app-i18n/sunpinyin: fix gcc-6 build err

thanks Peter Levine for creating the patch

Gentoo-Bug: 594380

Package-Manager: portage-2.3.1

 ...unpinyin-2.0.4_pre20130108-gcc6-use-float.patch | 17 ++++++++
 .../sunpinyin-2.0.4_pre20130108-r1.ebuild          | 48 ++++++++++++++++++++++
 2 files changed, 65 insertions(+)

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 00000000..77fe283
--- /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<float, int> RealIndexMap;  // map real values to their indices
+ typedef std::map<std::string, unsigned int> 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.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
new file mode 100644
index 00000000..7a97afb
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/1"
+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}
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/, app-i18n/sunpinyin/files/
@ 2017-11-25 12:32 Andreas Hüttel
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2017-11-25 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     4f9268e50e56dc63243cc385aea7580a63ee91e3
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 12:21:13 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 12:31:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9268e5

Revert "app-i18n/sunpinyin: Remove old"

This reverts commit 342fbe62db3fb93842dedfbee7993d30ca4588eb.

 app-i18n/sunpinyin/Manifest                        |  3 +
 .../files/sunpinyin-2.0.3-force-switch.patch       | 30 ++++++++++
 .../sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch  | 49 +++++++++++++++++
 app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild       | 64 ++++++++++++++++++++++
 4 files changed, 146 insertions(+)

diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 6a7d9e8dd0d..8ea93a2261f 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1 +1,4 @@
+DIST dict.utf8.tar.bz2 1598995 SHA256 d8261f6b0bfcdd40a9c4f366228f86b017e06c9d7d64d6ddec1c2c3511eea805 SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34 WHIRLPOOL c1ead1556dbcbe0811551cff2b84367ce9827a06733a3f5a6c2a229882ecd9b83069455146d6ea507d235ef3ad979cd10d373cfc806e150ad0fae9bd91330925
+DIST lm_sc.t3g.arpa.tar.bz2 25098718 SHA256 c80093a8b43561e64158de4139967eef39b851432a2660e8050429d7560907cd SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98 WHIRLPOOL 294b668ca6bcb765392f882bd9b0f16e403c8709eb2d7ae129e4c4aba3372b8b6d9b6a78df67b811a742136e4d1b203b5da7e7f7554296c6986a6fcba361b50b
+DIST sunpinyin-2.0.3.tar.gz 169394 SHA256 4ab776e7563f69f8dbda8fac7cfaa42bd0db1ea68bab15f756094ce5398d83d1 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d WHIRLPOOL 71a4efedcbe4ec1dda9ecb1b94256a0e5e8ca570a234a8b378f85af68bf3da9f3b9220aee98c2f3ce509daa33996fea8b554e81594c299281ede58167cf633e8
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 SHA256 e650957aced55075448b7f02298d0c5cf59a8b8e041e9c7d92d24cb5170de93f SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 WHIRLPOOL 82535dcde38c2fce17877e465db7ebeaed14a7f305ad96ca451c5b35ae04244a94e9bde9ce51092a390964c557e39ab43742d2370342f9b72722b24f916c55d6

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 00000000000..f2f6b389ba0
--- /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 00000000000..c523449ef51
--- /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 <mail@yongsun.me>
+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 <string>
+ #include <cstring>
+ 
+-#if defined(sun)
++#if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #ifdef __cplusplus
+ #include <algorithm>
+ #else
+ #include <sys/ddi.h>
+ #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/sunpinyin-2.0.3-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild
new file mode 100644
index 00000000000..c0dea27daf5
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils multilib 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() {
+	epatch "${FILESDIR}/${P}-force-switch.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.7.patch"
+}
+
+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 ""
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/, app-i18n/sunpinyin/files/
@ 2018-08-08 13:52 Akinori Hattori
  0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-08-08 13:52 UTC (permalink / raw
  To: gentoo-commits

commit:     2b36f7ca86c75dacdd7a9ebfbbb31aa03b7b51f7
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  8 13:04:46 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug  8 13:51:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b36f7ca

app-i18n/sunpinyin: update patches

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch      | 2 --
 ...20130108-gcc6-use-float.patch => sunpinyin-2.0.4-gcc-6.patch} | 8 ++++++--
 app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch           | 9 ++++-----
 app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild         | 6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

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 f2f6b389ba0..de85e82c1d5 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_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
similarity index 80%
rename from app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
rename to app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
index 77fe2831c7d..0bceb38318b 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
@@ -1,5 +1,9 @@
---- 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
+https://bugs.gentoo.org/553796
+
+Author: Peter Levine <plevine457@gmail.com>
+
+--- a/src/slm/tslmpack/common.h
++++ b/src/slm/tslmpack/common.h
 @@ -53,10 +53,10 @@
  typedef std::map<float, int> RealIndexMap;  // map real values to their indices
  typedef std::map<std::string, unsigned int> TLexicon; // map word to wid

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 54831df2122..36e69d2deda 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 <culu.gyx@gmail.com>
-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 <culu.gyx@gmail.com>
 
-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/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
index 84ef8dcc2cb..f5a8f933a5f 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,8 +23,8 @@ DEPEND="${RDEPEND}
 PDEPEND="app-i18n/sunpinyin-data"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch
-	epatch "${FILESDIR}"/${P}-gcc6-use-float.patch
+	epatch "${FILESDIR}"/${P/_pre*}-pod2man.patch
+	epatch "${FILESDIR}"/${P/_pre*}-gcc-6.patch
 	epatch_user
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/, app-i18n/sunpinyin/files/
@ 2018-08-09 14:38 Akinori Hattori
  0 siblings, 0 replies; 6+ messages in thread
From: Akinori Hattori @ 2018-08-09 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     9319f48669ceb3a56b1e64c97c8bb89fa8541628
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  9 14:38:02 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Aug  9 14:38:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9319f486

app-i18n/sunpinyin: drop old

Closes: https://bugs.gentoo.org/596836
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/sunpinyin/Manifest                        |  3 -
 .../files/sunpinyin-2.0.3-force-switch.patch       | 28 ----------
 .../sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch  | 49 ----------------
 app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild       | 65 ----------------------
 4 files changed, 145 deletions(-)

diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 7a824982346..07104dfbfad 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,5 +1,2 @@
-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
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e

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
deleted file mode 100644
index de85e82c1d5..00000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
deleted file mode 100644
index c523449ef51..00000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3d35aa0370d9c7bd455098caa9ba22ebe1f82968 Mon Sep 17 00:00:00 2001
-From: Yong Sun <mail@yongsun.me>
-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 <string>
- #include <cstring>
- 
--#if defined(sun)
-+#if defined(HAVE_UNISTD_H)
- #include <unistd.h>
- #ifdef __cplusplus
- #include <algorithm>
- #else
- #include <sys/ddi.h>
- #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/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
deleted file mode 100644
index c79fd710b99..00000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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="${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}
-	${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"
-}
-
-src_prepare() {
-	default
-	tc-export CXX
-}
-
-src_compile() {
-	escons \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libdatadir="${EPREFIX}"/usr/lib
-}
-
-src_install() {
-	escons --install-sandbox="${D}" install
-}
-
-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 ""
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/, app-i18n/sunpinyin/files/
@ 2020-11-03 19:37 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-11-03 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3411d43fbf4046913e9daf0dd13239f4716ba970
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  3 14:07:03 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov  3 19:37:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3411d43f

app-i18n/sunpinyin: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-i18n/sunpinyin/Manifest                        |  1 -
 .../sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch    | 21 ----------
 .../sunpinyin/files/sunpinyin-2.0.4-pod2man.patch  | 16 --------
 .../sunpinyin-2.0.4_pre20130108-r2.ebuild          | 46 ----------------------
 4 files changed, 84 deletions(-)

diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index a9b7dd0fb6c..91033393128 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,3 +1,2 @@
-DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
 DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e

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
deleted file mode 100644
index 0bceb38318b..00000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/553796
-
-Author: Peter Levine <plevine457@gmail.com>
-
---- a/src/slm/tslmpack/common.h
-+++ b/src/slm/tslmpack/common.h
-@@ -53,10 +53,10 @@
- typedef std::map<float, int> RealIndexMap;  // map real values to their indices
- typedef std::map<std::string, unsigned int> 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
deleted file mode 100644
index 36e69d2deda..00000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.debian.org/790287
-https://code.google.com/p/sunpinyin/issues/detail?id=327
-
-Author: Guo Yixuan <culu.gyx@gmail.com>
-
---- 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/sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
deleted file mode 100644
index 34f908fd980..00000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-03 19:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-09 14:38 [gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/, app-i18n/sunpinyin/files/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2020-11-03 19:37 Michał Górny
2018-08-08 13:52 Akinori Hattori
2017-11-25 12:32 Andreas Hüttel
2016-10-11 21:56 Yixun Lan
2016-05-10  5:46 Benda XU

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox