gentoo resync : 08.08.2018

6 files changed, 69 insertions, 116 deletions

diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index 46562c393ffc..cfc1550cdd29 100644
--- a/app-i18n/sunpinyin-data/Manifest
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -1,7 +1,7 @@
-AUX SLM-inst.mk 1847 BLAKE2B aab982dc7c1f93db8c4ac9b77b793fbe4304ab70d62d3c18741e87c91dc6fd876e0f9a8f346b1e621f7ce11669eb335dcd9082894130f4d7b0c1c4c5812df588 SHA512 fcbc2e7f18d02dc7ae13ceb9926018d8e83ff955eacae69d664842a84cc4aac2c6f9070e1a33ca6b9b68b4d3ca3ef1ec2e8863f82a8eea1183e7b02d5b665470
-DIST dict.utf8-20120830.tar.bz2 652472 BLAKE2B bd31553027e25261e2d69a4f1a82d2c1f18b424f16f1b62a817151892b0d012be7cf1f2b7f7fbbfda98dbc40c21186eaccdca2453d139f0e50aaf3d793d64671 SHA512 4400bc2a54cbf828e1d34f8240d8915a29171d6def125fecf4aa13b442dc2442d9ea591e4451cf030d22d974fbdba09adde4112c08acae9ae023823311ae8535
 DIST dict.utf8-20130220.tar.bz2 652859 BLAKE2B 9e0cdefc0db519b0e12dd2cb2621ef500e0ed5a0ff9a0eea76d6f64eac1cdb455f2d3c8a806fe7aa8c50cbc369c0ef6d937fdf01fecbc349773b12375bb419f3 SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8
+DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b
+DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
 DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97
-EBUILD sunpinyin-data-20121025.ebuild 910 BLAKE2B dbf1f2e6a9f4b3a8dc3497eaa3dc0f29f0d47c65231c5cab27ae896d4cd981acacdd5f03ba8765cb13cd05aa0e72b330205f97cc4f4aa11c9c2a042437666738 SHA512 6fcf7bc0d142f966c42c0ea54627d677649db74b1c93e6630ab708438cf22a29f33cd8d4f88fe154c6712d647880deaf5a5cac197ebea2376b810b36a9df8d7c
-EBUILD sunpinyin-data-20130220.ebuild 906 BLAKE2B 705fa18d72412168875820721be68a59f59ff63fca0759cb6fc8cc35c5ea263e44b862f8ec03a5f4c1810f5563a5f01831629ca156460c0daaf328c0c60c4a34 SHA512 8786ad78957d1e23896af0c68d83a1a1eab158b59a60a158be32a88942e453178e626fa74f0464b61f6dc504c5c9ff428c8b35f0b5a2a86f77671197da23b4b8
-MISC metadata.xml 323 BLAKE2B cb36295be070944db054e52bd199f502dd1136e35d27e7eb9a0caac66798393c12d19fa9b7a421c9e3561023474a01d0788da1a333b34f15fc576862272955ee SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39
+EBUILD sunpinyin-data-20130220.ebuild 984 BLAKE2B fdce14f8c0249901c821f913a793273dfd6c1be537656323ec28b428bec3758e45f065b89e5b62bd2066ab204410c81f61d5fdceb7bd51aebef32d54747926d4 SHA512 b58d6e341b56027aebe84fc5144a3b1da3c83feeabf4392a4c39e77f88b8a9d4c1ae7ec0075d822ac24be031c13cc72b5be530a1678fcf87b87ba4fb79b2d559
+EBUILD sunpinyin-data-20140820.ebuild 1021 BLAKE2B 29fe8b3174cb786e2f3bd169440031b126f00bc21b86cd943cc7f31cca730fbaaa3751e74bb035ea0cad2fda8ee86f27b4af9f2ad0b5ed51f90dfb0bf57bc913 SHA512 fe35e205be1a079abf43b8b3e4b793e7fc3207d95498a32dd9fbe95e87fcf3e4ffed08501f7e26dd5f1a25b4cf4326352f1968844391a0e93dc89a622c812087
+MISC metadata.xml 328 BLAKE2B fe394bf1f33b3b39d476a8e8a0ce7a58c071646be7455b102c5b298ae22afc9e2b6a2571e3ca52024f46d7675a6568313dde549576d17d117e1feb01a6559e78 SHA512 43f6f1fc7c0a311ae6e0d5712e570a43a3530173231f054eb939a36f7c4bc117e026678a837dd11b3fd10945d7a476a38f2d10f55501884bb53a29895fab9e01
diff --git a/app-i18n/sunpinyin-data/files/SLM-inst.mk b/app-i18n/sunpinyin-data/files/SLM-inst.mk
deleted file mode 100644
index 9216a941ad1c..000000000000
--- a/app-i18n/sunpinyin-data/files/SLM-inst.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; indent-tabs-mode: t -*- vim:noet:ts=4
-# Sample Makefile for lexicon generation and installation.
-
-# Little endian platforms: alpha amd64 arm hurd-i386 i386 ia64 mipsel sh3 sh4
-# Big endian platforms: hppa m68k mips powerpc ppc64 sparc s390
-ifndef ENDIANNESS
-	ENDIANNESS = le
-endif
-
-DICT_FILE = dict.utf8
-
-SLM_TARGET = lm_sc
-TSLM2_TEXT_FILE = ${SLM_TARGET}.t2g.arpa
-TSLM2_ORIG_FILE = ${SLM_TARGET}.t2g.orig
-TSLM2_DIST_FILE = ${SLM_TARGET}.t2g
-TSLM3_TEXT_FILE = ${SLM_TARGET}.t3g.arpa
-TSLM3_ORIG_FILE = ${SLM_TARGET}.t3g.orig
-TSLM3_DIST_FILE = ${SLM_TARGET}.t3g
-
-PYTRIE_FILE = pydict_sc.bin
-PYTRIE_LOG_FILE = pydict_sc.log
-
-SYSTEM_DATA_DIR = ${DESTDIR}/usr/share/sunpinyin
-
-all: slm3_dist
-install: slm3_install
-
-tslm2_orig: ${TSLM2_ORIG_FILE}
-${TSLM2_ORIG_FILE}: ${DICT_FILE} ${TSLM2_TEXT_FILE}
-	tslmpack ${TSLM2_TEXT_FILE} ${DICT_FILE} $@
-
-tslm2_dist: ${TSLM2_DIST_FILE}
-${TSLM2_DIST_FILE}: ${TSLM2_ORIG_FILE}
-	tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon2: ${DICT_FILE} ${TSLM2_ORIG_FILE}
-	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM2_ORIG_FILE} \
-		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-tslm3_orig: ${TSLM3_ORIG_FILE}
-${TSLM3_ORIG_FILE}: ${DICT_FILE} ${TSLM3_TEXT_FILE}
-	tslmpack ${TSLM3_TEXT_FILE} ${DICT_FILE} $@
-
-tslm3_dist: ${TSLM3_DIST_FILE}
-${TSLM3_DIST_FILE}: ${TSLM3_ORIG_FILE}
-	tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon3: ${DICT_FILE} ${TSLM3_ORIG_FILE}
-	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM3_ORIG_FILE} \
-		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-slm2_dist: ${TSLM2_DIST_FILE} lexicon2
-slm2_install: ${TSLM2_DIST_FILE} ${PYTRIE_FILE}
-	install -d ${SYSTEM_DATA_DIR}
-	install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
-slm3_dist: ${TSLM3_DIST_FILE} lexicon3
-slm3_install: ${TSLM3_DIST_FILE} ${PYTRIE_FILE}
-	install -d ${SYSTEM_DATA_DIR}
-	install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
index 11bbcd490ca1..3ce0e2257d3e 100644
--- a/app-i18n/sunpinyin-data/metadata.xml
+++ b/app-i18n/sunpinyin-data/metadata.xml
@@ -6,6 +6,6 @@
     <name>Cjk</name>
   </maintainer>
   <upstream>
-    <remote-id type="google-code">sunpinyin</remote-id>
+    <remote-id type="github">sunpinyin/open-gram</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
deleted file mode 100644
index fa390bb7a465..000000000000
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DICT_VERSION="20120830"
-LM_VERSION="${PV}"
-
-DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
-	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${S}" || die
-	mv "${WORKDIR}"/dict.utf8 "${S}" || die
-	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
-	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
-}
-
-src_compile() {
-	# we don't have any big-endian architectures keyworded yet, so hardcode
-	emake ENDIANNESS=le
-}
-
-src_install() {
-	emake ENDIANNESS=le DESTDIR="${D}" install
-}
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
index 9b450e30a2e9..81a424941c72 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
 DICT_VERSION="${PV}"
 LM_VERSION="20121025"
 
 DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
-	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+	mirror://sourceforge/open-gram/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
+DEPEND="=app-i18n/sunpinyin-2.0.4*"
 
 src_unpack() {
 	default
 	mkdir "${S}" || die
 	mv "${WORKDIR}"/dict.utf8 "${S}" || die
 	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
-	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
 }
 
 src_compile() {
-	# we don't have any big-endian architectures keyworded yet, so hardcode
-	emake ENDIANNESS=le
+	# lm_sc.t3g
+	echoit tslmpack lm_sc.t3g.arpa dict.utf8 lm_sc.t3g.orig
+	echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+	# lexicon3
+	echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+	echo "${@}"
+	"${@}"
 }
 
 src_install() {
-	emake ENDIANNESS=le DESTDIR="${D}" install
+	insinto /usr/share/${PN/-data}
+	doins lm_sc.t3g pydict_sc.bin
 }
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
new file mode 100644
index 000000000000..c35487a14eac
--- /dev/null
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DICT_VERSION="20131214"
+LM_VERSION="${PV}"
+
+DESCRIPTION="Data sets for Sunpinyin"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+	mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=app-i18n/sunpinyin-3*"
+
+src_unpack() {
+	default
+	mkdir "${S}" || die
+	mv "${WORKDIR}"/dict.utf8 "${S}" || die
+	mv "${WORKDIR}"/lm_sc.3gm.arpa "${S}" || die
+}
+
+src_compile() {
+	# lm_sc.t3g
+	echoit slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm
+	echoit slmthread lm_sc.3gm lm_sc.t3g.orig
+	echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+	# lexicon3
+	echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+	echo "${@}"
+	"${@}"
+}
+
+src_install() {
+	insinto /usr/share/${PN/-data}
+	doins lm_sc.t3g pydict_sc.bin
+}