1 |
commit: 3e281277cc726d8ba2c660b5c253113cbd05d417 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 25 05:49:11 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 25 05:49:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e281277 |
7 |
|
8 |
app-i18n/skkserv: update to EAPI 6 |
9 |
|
10 |
Gentoo-Bug: 621952 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
app-i18n/skkserv/files/skkserv.initd | 22 +++++++++++++--------- |
15 |
app-i18n/skkserv/metadata.xml | 8 ++++---- |
16 |
app-i18n/skkserv/skkserv-9.6-r3.ebuild | 22 +++++++++------------- |
17 |
3 files changed, 26 insertions(+), 26 deletions(-) |
18 |
|
19 |
diff --git a/app-i18n/skkserv/files/skkserv.initd b/app-i18n/skkserv/files/skkserv.initd |
20 |
index abab626c62c..f01e98c8bd8 100644 |
21 |
--- a/app-i18n/skkserv/files/skkserv.initd |
22 |
+++ b/app-i18n/skkserv/files/skkserv.initd |
23 |
@@ -1,15 +1,19 @@ |
24 |
#!/sbin/openrc-run |
25 |
-# Copyright 1999-2004 Gentoo Foundation |
26 |
+# Copyright 1999-2017 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-start() { |
30 |
- ebegin "Starting skkserv" |
31 |
- start-stop-daemon --start --quiet --exec /usr/sbin/skkserv |
32 |
- eend $? |
33 |
+extra_started_commands="reload" |
34 |
+ |
35 |
+description_reload="Reload the SKK-JISYO.L" |
36 |
+ |
37 |
+command="/usr/sbin/${SVCNAME}" |
38 |
+ |
39 |
+depend() { |
40 |
+ need net |
41 |
} |
42 |
|
43 |
-stop() { |
44 |
- ebegin "Stopping skkserv" |
45 |
- start-stop-daemon --stop --quiet --exec /usr/sbin/skkserv |
46 |
- eend $? |
47 |
+reload() { |
48 |
+ ebegin "Reloading ${SVCNAME}" |
49 |
+ start-stop-daemon --signal INT --name "${command}" |
50 |
+ eend ${?} |
51 |
} |
52 |
|
53 |
diff --git a/app-i18n/skkserv/metadata.xml b/app-i18n/skkserv/metadata.xml |
54 |
index c921b96adf6..e1a49f49888 100644 |
55 |
--- a/app-i18n/skkserv/metadata.xml |
56 |
+++ b/app-i18n/skkserv/metadata.xml |
57 |
@@ -1,8 +1,8 @@ |
58 |
<?xml version="1.0" encoding="UTF-8"?> |
59 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
60 |
<pkgmetadata> |
61 |
-<maintainer type="project"> |
62 |
- <email>cjk@g.o</email> |
63 |
- <name>Cjk</name> |
64 |
-</maintainer> |
65 |
+ <maintainer type="project"> |
66 |
+ <email>cjk@g.o</email> |
67 |
+ <name>Cjk</name> |
68 |
+ </maintainer> |
69 |
</pkgmetadata> |
70 |
|
71 |
diff --git a/app-i18n/skkserv/skkserv-9.6-r3.ebuild b/app-i18n/skkserv/skkserv-9.6-r3.ebuild |
72 |
index 0cde423d7d2..2ea92aff50a 100644 |
73 |
--- a/app-i18n/skkserv/skkserv-9.6-r3.ebuild |
74 |
+++ b/app-i18n/skkserv/skkserv-9.6-r3.ebuild |
75 |
@@ -1,8 +1,7 @@ |
76 |
# Copyright 1999-2017 Gentoo Foundation |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
|
79 |
-EAPI=3 |
80 |
-inherit eutils |
81 |
+EAPI="6" |
82 |
|
83 |
MY_P="skk${PV}mu" |
84 |
|
85 |
@@ -15,27 +14,24 @@ SLOT="0" |
86 |
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
87 |
IUSE="" |
88 |
|
89 |
-DEPEND=">=app-i18n/skk-jisyo-200210" |
90 |
- |
91 |
+DEPEND="app-i18n/skk-jisyo" |
92 |
S="${WORKDIR}/skk-${PV}mu" |
93 |
|
94 |
-src_prepare() { |
95 |
- epatch "${FILESDIR}"/${PN}-segfault.patch |
96 |
- epatch "${FILESDIR}"/${PN}-headers.patch |
97 |
-} |
98 |
+PATCHES=( |
99 |
+ "${FILESDIR}"/${PN}-segfault.patch |
100 |
+ "${FILESDIR}"/${PN}-headers.patch |
101 |
+) |
102 |
|
103 |
src_configure() { |
104 |
econf --libexecdir="${EPREFIX}"/usr/sbin |
105 |
} |
106 |
|
107 |
src_compile() { |
108 |
- cd skkserv |
109 |
- emake || die |
110 |
+ emake -C ${PN} |
111 |
} |
112 |
|
113 |
src_install() { |
114 |
- cd skkserv |
115 |
- dosbin skkserv || die |
116 |
+ dosbin ${PN}/${PN} |
117 |
|
118 |
- newinitd "${FILESDIR}"/skkserv.initd skkserv |
119 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
120 |
} |