From 7f5027649b1a38ab7ed633071e3cc12e344e8d68 Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Sun, 25 Jun 2017 15:19:24 +0900
Subject: app-i18n/yaskkserv: avoid phase function call

Gentoo-Bug: 596620

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---
 app-i18n/yaskkserv/files/yaskkserv.initd  |  6 +++---
 app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild | 32 +++++++++++++++++--------------
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'app-i18n/yaskkserv')

diff --git a/app-i18n/yaskkserv/files/yaskkserv.initd b/app-i18n/yaskkserv/files/yaskkserv.initd
index 7e081d1938b7..b9ae738b92ac 100644
--- a/app-i18n/yaskkserv/files/yaskkserv.initd
+++ b/app-i18n/yaskkserv/files/yaskkserv.initd
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command=/usr/sbin/${SVCNAME}_${YASKKSERV_SERVER_TYPE}
+command="/usr/sbin/${SVCNAME}_${YASKKSERV_SERVER_TYPE}"
 command_args="--no-daemonize ${YASKKSERV_OPTS}"
 command_background="true"
-pidfile=${pidfile:-/run/${SVCNAME}.pid}
+pidfile="${pidfile:-/run/${SVCNAME}.pid}"
 
 depend() {
 	need net
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
index 2c06cd1815e6..0d0ae48356cc 100644
--- a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
@@ -48,20 +48,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
-pkg_postinst() {
-	pkg_config
-
-	elog "You need to run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	elog "after updating app-i18n/skk-jisyo from next time."
-}
-
-pkg_postrm() {
-	rm -f "${ROOT}"/usr/share/skk/SKK-JISYO.*.${PN}
-	rmdir "${ROOT}"/usr/share/skk 2>/dev/null
-}
-
-pkg_config() {
+yaskkserv_update() {
 	local f
 	for f in "${ROOT}"/usr/share/skk/SKK-JISYO.*; do
 		case ${f} in
@@ -76,3 +63,20 @@ pkg_config() {
 		esac
 	done
 }
+
+pkg_postinst() {
+	yaskkserv_update
+
+	elog "You need to run:"
+	elog "  emerge --config =${CATEGORY}/${PF}"
+	elog "after updating app-i18n/skk-jisyo from next time."
+}
+
+pkg_postrm() {
+	rm -f "${ROOT}"/usr/share/skk/SKK-JISYO.*.${PN}
+	rmdir "${ROOT}"/usr/share/skk 2>/dev/null
+}
+
+pkg_config() {
+	yaskkserv_update
+}
-- 
cgit v1.2.3-65-gdbad