app-i18n/nkf: update to EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
index 240a559e772a851f27afbc112ee1739fcc231b8f..23f6161b389907e8721d1c50a5b757c4a437417c 100644 (file)
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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 distutils-r1 perl-module toolchain-funcs
+
+inherit distutils-r1 perl-module toolchain-funcs
 
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
 HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
-       l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j )
+SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
+       l10n_ja? ( https://dev.gentoo.org/~naota/files/${PN}.1j )
        python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
 
 LICENSE="ZLIB"
@@ -18,56 +19,63 @@ IUSE="perl python l10n_ja"
 
 src_prepare() {
        sed -i \
-               -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
-               -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-               Makefile || die
-
+               -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+               -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+               Makefile
        if use l10n_ja; then
-               cp "${DISTDIR}"/nkf.1j "${S}" || die
+               cp "${DISTDIR}"/${PN}.1j ${PN}.ja.1 || die
        fi
-
        if use python; then
-               mv "${WORKDIR}/NKF.python" "${S}" || die
-               epatch "${FILESDIR}"/${P}-strip.patch
+               mv "${WORKDIR}"/NKF.python . || die
+               eapply "${FILESDIR}"/${P}-strip.patch
        fi
+
+       default
 }
 
 src_compile() {
-       emake CC="$(tc-getCC)" nkf || die
+       emake CC="$(tc-getCC)"
        if use perl; then
-               cd "${S}/NKF.mod"
+               cd NKF.mod
                perl-module_src_compile
+               cd - >/dev/null
        fi
        if use python; then
-               cd "${S}/NKF.python"
+               cd NKF.python
                distutils-r1_src_compile
+               cd - >/dev/null
        fi
 }
 
 src_test() {
-       emake test || die
+       default
        if use perl; then
-               cd "${S}/NKF.mod"
+               cd NKF.mod
                perl-module_src_test
+               cd - >/dev/null
        fi
 }
 
 src_install() {
-       dobin nkf || die
-       doman nkf.1
+       dobin ${PN}
+       doman ${PN}.1
 
        if use l10n_ja; then
-               ./nkf -e nkf.1j > nkf.1
-               doman -i18n=ja nkf.1
+               doman ${PN}.ja.1
        fi
-       dodoc nkf.doc
+       dodoc ${PN}.doc
 
        if use perl; then
-               cd "${S}/NKF.mod"
+               cd NKF.mod
+               docinto perl
                perl-module_src_install
+               cd - >/dev/null
        fi
        if use python; then
-               cd "${S}/NKF.python"
-               distutils-r1_src_install
+               cd NKF.python
+               docinto python
+               DOCS= distutils-r1_src_install
+               dodoc README
+               cd - >/dev/null
        fi
 }