[gentoo-commits] repo/gentoo:master commit in: app-text/mecab/

[Akinori Hattori]

commit:     c7e47bac3c5bf63d21eef66fbc1ba4a7abe90db4
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 13:54:47 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 13:54:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e47bac

app-text/mecab: update to EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/mecab/mecab-0.996.ebuild | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app-text/mecab/mecab-0.996.ebuild 
b/app-text/mecab/mecab-0.996.ebuild
index 07dbb45ea0c..bbe99716930 100644
--- a/app-text/mecab/mecab-0.996.ebuild
+++ b/app-text/mecab/mecab-0.996.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"
 
 inherit autotools eutils
 
@@ -22,12 +22,17 @@ PDEPEND="|| (
                app-dicts/mecab-naist-jdic[unicode=]
        )"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.98-iconv.patch )
+HTML_DOCS=( doc/. )
+
 src_prepare() {
+       default
        sed -i \
                -e "/CFLAGS/s/-O3/${CFLAGS}/" \
                -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
                configure.in || die
-       epatch "${FILESDIR}/${PN}-0.98-iconv.patch"
+
+       mv configure.{in,ac}
        eautoreconf
 }
 
@@ -39,8 +44,6 @@ src_configure() {
 
 src_install() {
        default
-       dodoc AUTHORS README
-       dohtml -r doc/*
-
-       use static-libs || find "${ED}" -name '*.la' -delete
+       find "${ED}" -name 'Makefile*' -delete || die
+       use static-libs || find "${ED}" -name '*.la' -delete || die
 }