app-i18n/pyzy: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

2 files changed, 25 insertions, 20 deletions

diff --git a/app-i18n/pyzy/metadata.xml b/app-i18n/pyzy/metadata.xml
index cba74e837b89..f6afd400fc25 100644
--- a/app-i18n/pyzy/metadata.xml
+++ b/app-i18n/pyzy/metadata.xml
@@ -11,8 +11,8 @@
   </maintainer>
   <use>
     <flag name="boost">Enable support for <pkg>dev-libs/boost</pkg></flag>
-    <flag name="doc">Enable support for documents</flag>
-    <flag name="opencc">Use <pkg>app-i18n/opencc</pkg> for input</flag>
+    <flag name="doc">Generate API documentation</flag>
+    <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
   </use>
   <upstream>
     <remote-id type="github">pyzy/pyzy</remote-id>
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
index 982a943fe1c1..d164deb9a373 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
@@ -1,53 +1,58 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
-inherit eutils python-any-r1 autotools
 
-PY_DATABASE=${PN}-database-1.0.0
+inherit autotools python-any-r1
+
+PYZY_DB="${PN}-database-1.0.0"
+
 DESCRIPTION="The Chinese PinYin and Bopomofo conversion library"
 HOMEPAGE="https://github.com/pyzy/pyzy"
 SRC_URI="https://pyzy.googlecode.com/files/${P}.tar.gz
-	https://pyzy.googlecode.com/files/${PY_DATABASE}.tar.bz2"
+	https://pyzy.googlecode.com/files/${PYZY_DB}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="boost doc opencc test"
+# Currently it fails to build test code
+RESTRICT="test"
 
-RDEPEND="dev-libs/glib:2
-	dev-db/sqlite:3
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
 	sys-apps/util-linux
 	boost? ( dev-libs/boost )
-	opencc? ( app-i18n/opencc )"
-
+	opencc? ( app-i18n/opencc:= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )"
 
-# Currently it fails to build test code
-RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-db.patch
+	"${FILESDIR}"/${PN}-opencc-1.0.0.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-db.patch
-	epatch "${FILESDIR}"/${PN}-opencc-1.0.0.patch
+	mv "${WORKDIR}"/db data/db/open-phrase || die
 
-	mv ../db ./data/db/open-phrase/ || die
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--enable-db-open-phrase \
-		--enable-db-android \
 		$(use_enable boost) \
 		$(use_enable opencc) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		--enable-db-open-phrase
 }
 
 src_install() {
+	if use doc; then
+		HTML_DOCS=( docs/html/. )
+	fi
+
 	default
-	use doc && dohtml -r docs/html/*
 }