summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2018-08-08 22:04:46 +0900
committerAkinori Hattori <hattya@gentoo.org>2018-08-08 22:51:47 +0900
commit2b36f7ca86c75dacdd7a9ebfbbb31aa03b7b51f7 (patch)
tree97eeb6adc54563bcb4264b8c3d2bf5b0a912e711
parentdev-python/spyder: bump to 3.3.0 (diff)
downloadgentoo-2b36f7ca86c75dacdd7a9ebfbbb31aa03b7b51f7.tar.gz
gentoo-2b36f7ca86c75dacdd7a9ebfbbb31aa03b7b51f7.tar.bz2
gentoo-2b36f7ca86c75dacdd7a9ebfbbb31aa03b7b51f7.zip
app-i18n/sunpinyin: update patches
Package-Manager: Portage-2.3.40, Repoman-2.3.9
-rw-r--r--app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch2
-rw-r--r--app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch (renamed from app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch)8
-rw-r--r--app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch9
-rw-r--r--app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild6
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 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_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
index 77fe2831c7d8..0bceb38318b3 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 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 <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 84ef8dcc2cb4..f5a8f933a5f1 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
}