diff --git a/app-i18n/skkserv/files/skkserv.initd b/app-i18n/skkserv/files/skkserv.initd index abab626c62c2a..f01e98c8bd8b6 100644 --- a/app-i18n/skkserv/files/skkserv.initd +++ b/app-i18n/skkserv/files/skkserv.initd @@ -1,15 +1,19 @@ #!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -start() { - ebegin "Starting skkserv" - start-stop-daemon --start --quiet --exec /usr/sbin/skkserv - eend $? +extra_started_commands="reload" + +description_reload="Reload the SKK-JISYO.L" + +command="/usr/sbin/${SVCNAME}" + +depend() { + need net } -stop() { - ebegin "Stopping skkserv" - start-stop-daemon --stop --quiet --exec /usr/sbin/skkserv - eend $? +reload() { + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --signal INT --name "${command}" + eend ${?} } diff --git a/app-i18n/skkserv/metadata.xml b/app-i18n/skkserv/metadata.xml index c921b96adf6ce..e1a49f4988858 100644 --- a/app-i18n/skkserv/metadata.xml +++ b/app-i18n/skkserv/metadata.xml @@ -1,8 +1,8 @@ - - cjk@gentoo.org - Cjk - + + cjk@gentoo.org + Cjk + diff --git a/app-i18n/skkserv/skkserv-9.6-r3.ebuild b/app-i18n/skkserv/skkserv-9.6-r3.ebuild index 0cde423d7d2c4..2ea92aff50a8f 100644 --- a/app-i18n/skkserv/skkserv-9.6-r3.ebuild +++ b/app-i18n/skkserv/skkserv-9.6-r3.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 -inherit eutils +EAPI="6" MY_P="skk${PV}mu" @@ -15,27 +14,24 @@ SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -DEPEND=">=app-i18n/skk-jisyo-200210" - +DEPEND="app-i18n/skk-jisyo" S="${WORKDIR}/skk-${PV}mu" -src_prepare() { - epatch "${FILESDIR}"/${PN}-segfault.patch - epatch "${FILESDIR}"/${PN}-headers.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-segfault.patch + "${FILESDIR}"/${PN}-headers.patch +) src_configure() { econf --libexecdir="${EPREFIX}"/usr/sbin } src_compile() { - cd skkserv - emake || die + emake -C ${PN} } src_install() { - cd skkserv - dosbin skkserv || die + dosbin ${PN}/${PN} - newinitd "${FILESDIR}"/skkserv.initd skkserv + newinitd "${FILESDIR}"/${PN}.initd ${PN} }