app-i18n/canfep: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/canfep/canfep-1.0.ebuild b/app-i18n/canfep/canfep-1.0.ebuild
index c389556651ad645200a6ae75f542aa4ddf243a3c..a872be23a4fa4d28628563a9ff38dc19e9e0e704 100644 (file)
--- a/app-i18n/canfep/canfep-1.0.ebuild
+++ b/app-i18n/canfep/canfep-1.0.ebuild
@@ -1,38 +1,38 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI="6"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
 HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
-SRC_URI="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/${P}.tar.gz
-       unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/canfep_utf8.diff )"
+SRC_URI="http://www.geocities.co.jp/SiliconValley-Bay/7584/${PN}/${P}.tar.gz
+       unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
 
 LICENSE="canfep"
 SLOT="0"
 KEYWORDS="-alpha ~amd64 ppc ~sparc x86"
 IUSE="unicode"
 
-DEPEND="app-i18n/canna
-       sys-libs/ncurses"
-RDEPEND="app-i18n/canna"
+RDEPEND="app-i18n/canna
+       sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-       use unicode && epatch "${DISTDIR}"/canfep_utf8.diff
-       sed -i "s:\$(CFLAGS):\$(CFLAGS) \$(LDFLAGS):" Makefile || die
+       use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
+       sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
+
+       default
 }
 
 src_compile() {
        emake \
                CC="$(tc-getCXX)" \
-               CFLAGS="${CFLAGS}" \
-               LDFLAGS="${LDFLAGS}" \
                LIBS="-lcanna -lncurses"
 }
 
 src_install() {
-       dobin canfep
-       dodoc 00changes 00readme
+       dobin ${PN}
+       dodoc 00{changes,readme}
 }

diff --git a/app-i18n/canfep/metadata.xml b/app-i18n/canfep/metadata.xml
index c921b96adf6ced372394a69a4687e96d659e0e44..e1a49f498885809fa68430a67d65a8f2a65b1bba 100644 (file)
--- a/app-i18n/canfep/metadata.xml
+++ b/app-i18n/canfep/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-       <email>cjk@gentoo.org</email>
-       <name>Cjk</name>
-</maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>