app-i18n/multiskkserv: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

2 files changed, 6 insertions, 28 deletions

diff --git a/app-i18n/multiskkserv/files/multiskkserv.conf b/app-i18n/multiskkserv/files/multiskkserv.confd
index 12ca62e3987b..eaaa90def3f8 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 43fd803993f0..31c447da9d5d 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 $?
-}