From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26CC6139694 for ; Sun, 25 Jun 2017 06:19:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4951EE077A; Sun, 25 Jun 2017 06:19:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 220CAE077A for ; Sun, 25 Jun 2017 06:19:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 861D3341861 for ; Sun, 25 Jun 2017 06:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5D747466 for ; Sun, 25 Jun 2017 06:19:40 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1498371564.7f5027649b1a38ab7ed633071e3cc12e344e8d68.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/yaskkserv/files/, app-i18n/yaskkserv/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/yaskkserv/files/yaskkserv.initd app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild X-VCS-Directories: app-i18n/yaskkserv/files/ app-i18n/yaskkserv/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 7f5027649b1a38ab7ed633071e3cc12e344e8d68 X-VCS-Branch: master Date: Sun, 25 Jun 2017 06:19:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e3f1be8b-6c7d-4cd3-9a80-ad1233a69aa1 X-Archives-Hash: 4afa831e82232424eb82dc881a93cb11 commit: 7f5027649b1a38ab7ed633071e3cc12e344e8d68 Author: Akinori Hattori gentoo org> AuthorDate: Sun Jun 25 06:19:24 2017 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sun Jun 25 06:19:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f502764 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(-) diff --git a/app-i18n/yaskkserv/files/yaskkserv.initd b/app-i18n/yaskkserv/files/yaskkserv.initd index 7e081d1938b..b9ae738b92a 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 2c06cd1815e..0d0ae48356c 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 +}