commit: d3e2a8d5314f00b8e8c8d838ef83d73d58e0b288
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 1 13:25:32 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 13:25:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e2a8d5
app-i18n/multiskkserv: update to EAPI 6
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../{multiskkserv.conf => multiskkserv.confd} | 4 ---
app-i18n/multiskkserv/files/multiskkserv.initd | 30 +++++-----------------
app-i18n/multiskkserv/metadata.xml | 8 +++---
app-i18n/multiskkserv/multiskkserv-20100128.ebuild | 29 ++++++++-------------
4 files changed, 21 insertions(+), 50 deletions(-)
diff --git a/app-i18n/multiskkserv/files/multiskkserv.conf
b/app-i18n/multiskkserv/files/multiskkserv.confd
similarity index 67%
rename from app-i18n/multiskkserv/files/multiskkserv.conf
rename to app-i18n/multiskkserv/files/multiskkserv.confd
index 12ca62e3987..eaaa90def3f 100644
--- a/app-i18n/multiskkserv/files/multiskkserv.conf
+++ b/app-i18n/multiskkserv/files/multiskkserv.confd
@@ -1,6 +1,3 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
# Config file for /etc/init.d/multiskkserv
# define which SKK-JISYO to use (you may define multiple files)
@@ -11,4 +8,3 @@
#
SKKJISYO_CDB="SKK-JISYO.L.cdb"
-
diff --git a/app-i18n/multiskkserv/files/multiskkserv.initd
b/app-i18n/multiskkserv/files/multiskkserv.initd
index 43fd803993f..31c447da9d5 100644
--- a/app-i18n/multiskkserv/files/multiskkserv.initd
+++ b/app-i18n/multiskkserv/files/multiskkserv.initd
@@ -1,30 +1,12 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+command="/usr/sbin/${RC_SVCNAME}"
+command_args="-r /usr/share/skk ${SKKJISYO_CDB}"
+command_background="true"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+
depend() {
need net
}
-
-start() {
- if [ -e /var/run/multiskkserv.pid ] ; then
- eerror "Anothor pid file is detected."
- eerror "If you are sure any multiskkserv is not running,"
- eerror "please rm /var/run/multiskkserv manually."
- fi
-
- ebegin "Starting multiskkserv"
- start-stop-daemon --start --quiet --background \
- --make-pidfile --pidfile /var/run/multiskkserv.pid \
- /usr/sbin/multiskkserv -- \
- -r /usr/share/skk ${SKKJISYO_CDB}
- eend $?
-}
-
-stop() {
- ebegin "Stopping multiskkserv"
- start-stop-daemon --stop --quiet -R 5 \
- --pidfile /var/run/multiskkserv.pid \
- --exec /usr/sbin/multiskkserv
- eend $?
-}
diff --git a/app-i18n/multiskkserv/metadata.xml
b/app-i18n/multiskkserv/metadata.xml
index c921b96adf6..e1a49f49888 100644
--- a/app-i18n/multiskkserv/metadata.xml
+++ b/app-i18n/multiskkserv/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>c...@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
+ <maintainer type="project">
+ <email>c...@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
index 0f34d617864..b6ec66dc57b 100644
--- a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
-inherit autotools eutils
+inherit autotools
DESCRIPTION="SKK server that handles multiple dictionaries"
HOMEPAGE="http://www3.big.or.jp/~sian/linux/products/";
@@ -14,16 +14,15 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="test"
-DEPEND="app-arch/xz-utils
- dev-db/cdb
+DEPEND="dev-db/cdb
test? ( app-i18n/nkf )"
-RDEPEND="|| (
- >=app-i18n/skk-jisyo-200705[cdb]
- app-i18n/skk-jisyo-cdb
- )"
+RDEPEND="app-i18n/skk-jisyo[cdb]"
+
+PATCHES=( "${FILESDIR}"/${P}-cdb.patch )
src_prepare() {
- epatch "${FILESDIR}"/${P}-cdb.patch
+ default
+ mv configure.{in,ac}
eautoreconf
}
@@ -34,12 +33,6 @@ src_configure() {
src_install() {
default
- newconfd "${FILESDIR}"/multiskkserv.conf multiskkserv
- newinitd "${FILESDIR}"/multiskkserv.initd multiskkserv
-}
-
-pkg_postinst() {
- elog "By default, multiskkserv will look up only SKK-JISYO.L.cdb."
- elog "If you want to use more dictionaries,"
- elog "edit /etc/conf.d/multiskkserv manually."
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
}
