gentoo resync : 25.11.2020

6 files changed, 5 insertions, 134 deletions

diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 776b4ca2a5b7..a037a1042747 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,9 +1,3 @@
-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 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
-EBUILD sunpinyin-2.0.4_pre20130108-r2.ebuild 969 BLAKE2B 3a4fed1810722b8d0f74282add5b5298c120b373c083fab1f1289285435915a12be3b8cfd3c44514c5f0d085231ffe933d5fab0ba3a2522d1422b71447bb0da8 SHA512 588f5bf39e30b91ecea1550c28c6ab2fca113fbbcc999f12ebaa335abccb214d4d2f4f6d28dbbdf728561b6ccecd9177f518134b0d39dd9c36a19428cab70ebf
-EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1585 BLAKE2B 910ce94a0b0595f95ee479a186241c3d3d8d5ba8abca47e9bf9dc33ef1df3d9fd48c02d2a1d3d7cc04d9253ed2f71a52d06c91e9a50dd3bdf400d834c9f80509 SHA512 1fd476776703c7669bd187fea471c25c4471f74e897720de92454b5a18831826385b1846ce70990a871cfdbc8ae8e5d5c2674c060777b51f64be0658d08f9698
-EBUILD sunpinyin-3.0.0_rc1.ebuild 918 BLAKE2B e5220cd1829a49aa2155ab92e5b9c2ea82ca281bff4743935f24b2072a8237f064905f979feccca99007d653877728430108c45793286eeb41d3668832b39859 SHA512 065897821edeed4dece2aff5061f7d97fcf634a544a7d1d6cf614b4215e05808459c7940953e8ae6f0319f3803d36630cb520b2b97da1284289e5d447da9a3e3
+EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1603 BLAKE2B 2355307f042bc089cb8732f48937f2c86fdb34205aa6aa838b01b50a652a4cb53ce8801803717b523401e0280f273c29f42c8cb88e27680cd8cf61c512a876d3 SHA512 bda02741dbe5e67b4d1d43a22eb08880f17ed701ea8ca6d4bb0ec5368c74a5aa9940524b880e53badc0257c6a0163f01849083b799db7cf2c0fe650039ecfba3
 MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628
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 0bceb38318b3..000000000000
--- 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 36e69d2deda3..000000000000
--- 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 34f908fd9808..000000000000
--- 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
-}
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index 9c87c79773ce..8944cebe91d1 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
@@ -26,12 +26,13 @@ fi
 
 LICENSE="|| ( CDDL LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="dev-lang/perl
 	virtual/pkgconfig"
-DEPEND="dev-db/sqlite:3"
+DEPEND="dev-db/sqlite:3
+	virtual/libiconv"
 RDEPEND="${DEPEND}"
 
 if [[ "${PV}" == *_pre* ]]; then
diff --git a/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
deleted file mode 100644
index 386c1694c1a2..000000000000
--- a/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
+++ /dev/null
@@ -1,41 +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 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
-}