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

["Akinori Hattori" <hattya@gentoo.org>]

commit:     0d7472af4eccee98a0d0b7c10e3348a2599810b9
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  8 13:29:07 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=0d7472af

app-i18n/sunpinyin: update to EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild       | 42 +++++++++++-----------
 ...build => sunpinyin-2.0.4_pre20130108-r2.ebuild} | 29 ++++++++-------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
index 8ef0101da1e..c79fd710b99 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
 
-inherit scons-utils toolchain-funcs
+inherit python-any-r1 scons-utils toolchain-funcs
 
-DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
-HOMEPAGE="https://sunpinyin.googlecode.com"
+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"
@@ -18,35 +19,34 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+	${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"
+	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() {
-	eapply "${FILESDIR}/${P}-force-switch.patch"
-	eapply "${FILESDIR}/${P}-gcc-4.7.patch"
 	default
-}
-
-src_configure() {
 	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--libdatadir="${EPREFIX}"/usr/lib
-	)
 }
 
 src_compile() {
-	escons || die
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libdatadir="${EPREFIX}"/usr/lib
 }
 
 src_install() {
-	escons --install-sandbox="${ED}" install || die
+	escons --install-sandbox="${D}" install
 }
 
 pkg_postinst() {

diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
similarity index 64%
rename from app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
rename to app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
index f5a8f933a5f..34f908fd980 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1 scons-utils toolchain-funcs
+
+inherit python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="A Statistical Language Model based Chinese input method library"
 HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
@@ -20,28 +21,26 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-PDEPEND="app-i18n/sunpinyin-data"
+PDEPEND="<=app-i18n/sunpinyin-data-20130220"
+
+PATCHES=(
+	"${FILESDIR}"/${P/_pre*}-gcc-6.patch
+	"${FILESDIR}"/${P/_pre*}-pod2man.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P/_pre*}-pod2man.patch
-	epatch "${FILESDIR}"/${P/_pre*}-gcc-6.patch
-	epatch_user
-}
+	sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
 
-src_configure() {
+	default
 	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-	)
 }
 
 src_compile() {
-	escons
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_install() {
 	escons --install-sandbox="${D}" install
-	rm -rf "${D}"/usr/share/doc/${PN} || die
-	dodoc doc/{README,SLM-inst.mk,SLM-train.mk}
 }