[gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin-data/, app-i18n/sunpinyin-data/files/

[gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin-data/, app-i18n/sunpinyin-data/files/

[Akinori Hattori]

commit:     18c9ef56b0d883351ac6daf9f2f4de6f43923d3a
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  8 13:43:58 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug  8 13:51:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c9ef56

app-i18n/sunpinyin-data: update to EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/sunpinyin-data/files/SLM-inst.mk          | 62 ----------------------
 .../sunpinyin-data/sunpinyin-data-20121025.ebuild  | 21 +++++---
 .../sunpinyin-data/sunpinyin-data-20130220.ebuild  | 21 +++++---
 3 files changed, 28 insertions(+), 76 deletions(-)

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 9216a941ad1..00000000000
--- 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/sunpinyin-data-20121025.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
index 39214d4753b..55f47f7174b 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
 DICT_VERSION="20120830"
 LM_VERSION="${PV}"
@@ -16,22 +16,29 @@ 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-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
index 42ccdffd9bd..81a424941c7 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
@@ -1,7 +1,7 @@
 # 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"
@@ -16,22 +16,29 @@ 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
 }