app-i18n/mecab-skkserv: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv b/app-i18n/mecab-skkserv/files/mecab-skkserv
deleted file mode 100644 (file)
index 5fa43fc..0000000
--- a/app-i18n/mecab-skkserv/files/mecab-skkserv
+++ /dev/null
@@ -1,11 +0,0 @@
-service skkserv
-{
-       disable         = yes
-        port            = 1178
-        socket_type     = stream
-        wait            = no
-        only_from       = 127.0.0.1
-        user            = nobody
-        server          = /usr/bin/mecab-skkserv
-        log_on_failure  += USERID
-}

diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv.xinetd b/app-i18n/mecab-skkserv/files/mecab-skkserv.xinetd
new file mode 100644 (file)
index 0000000..f5d14c3
--- /dev/null
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv.xinetd
@@ -0,0 +1,11 @@
+service skkserv
+{
+       disable         = yes
+       socket_type     = stream
+       wait            = no
+       user            = nobody
+       server          = /usr/bin/mecab-skkserv
+       only_from       = 127.0.0.1
+       log_on_failure += USERID
+       port            = 1178
+}

diff --git a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
index 631f686db7d429371c580bba54f049fcec3b0aef..601ca2cb26d284c753cd22a0744df693b627487d 100644 (file)
--- a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
+++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
@@ -1,40 +1,40 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit autotools-utils multilib
+inherit autotools
 
 DESCRIPTION="mecab-skkserv is a Kana-Kanji conversion server using MeCab"
 HOMEPAGE="http://chasen.org/~taku/software/mecab-skkserv/"
-SRC_URI="http://chasen.org/~taku/software/mecab-skkserv/${P}.tar.gz"
+SRC_URI="http://chasen.org/~taku/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 ipadic"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=app-text/mecab-0.91"
+DEPEND="app-text/mecab"
 RDEPEND="${DEPEND}
        sys-apps/xinetd"
 
-DOCS=( README NEWS AUTHORS )
-HTML_DOCS=( index.html )
 PATCHES=(
        "${FILESDIR}"/${PN}-cflags.patch
        "${FILESDIR}"/${PN}-dicrc.patch
 )
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( AUTHORS NEWS README )
+HTML_DOCS=( index.html ${PN}.css )
 
 src_prepare() {
-       sed -i -e "/^dictdir/s@lib@$(get_libdir)@" Makefile.am || die
-       autotools-utils_src_prepare
+       sed -i "/^dictdir/s:lib:$(get_libdir):" Makefile.am
+
+       default
+       eautoreconf
 }
 
 src_install() {
-       autotools-utils_src_install
+       default
 
-       # for running skkserv from xinetd
-       insinto /etc/xinetd.d; doins "${FILESDIR}"/mecab-skkserv
+       insinto /etc/xinetd.d
+       doins "${FILESDIR}"/${PN}.xinetd ${PN}
 }

diff --git a/app-i18n/mecab-skkserv/metadata.xml b/app-i18n/mecab-skkserv/metadata.xml
index c921b96adf6ced372394a69a4687e96d659e0e44..e1a49f498885809fa68430a67d65a8f2a65b1bba 100644 (file)
--- a/app-i18n/mecab-skkserv/metadata.xml
+++ b/app-i18n/mecab-skkserv/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>