1 |
commit: 1258c9e3376bc4e2c4d82cf047312892157c2233 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 18 15:18:57 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 18 15:18:57 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1258c9e3 |
7 |
|
8 |
app-i18n/kinput2: update to EAPI 6 |
9 |
|
10 |
Gentoo-Bug: 621946 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
app-i18n/kinput2/files/xinput-kinput2 | 2 +- |
15 |
app-i18n/kinput2/kinput2-3.1-r1.ebuild | 66 +++++++++++++++++--------------- |
16 |
app-i18n/kinput2/kinput2-3.1-r2.ebuild | 69 +++++++++++++++++----------------- |
17 |
app-i18n/kinput2/metadata.xml | 8 ++-- |
18 |
4 files changed, 75 insertions(+), 70 deletions(-) |
19 |
|
20 |
diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2 |
21 |
index 16de07ca4f7..dcb3b63330a 100644 |
22 |
--- a/app-i18n/kinput2/files/xinput-kinput2 |
23 |
+++ b/app-i18n/kinput2/files/xinput-kinput2 |
24 |
@@ -1,5 +1,5 @@ |
25 |
XIM=kinput2 |
26 |
-XIM_PROGRAM=@EPREFIX@/usr/bin/kinput2 |
27 |
+XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2" |
28 |
XIM_ARGS="-@SERVER@ +kinput -xim" |
29 |
GTK_IM_MODULE=xim |
30 |
QT_IM_MODULE=xim |
31 |
|
32 |
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
33 |
index 7d264fb834e..5e3579baa0d 100644 |
34 |
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
35 |
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild |
36 |
@@ -1,62 +1,68 @@ |
37 |
# Copyright 1999-2017 Gentoo Foundation |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
-inherit eutils |
41 |
+EAPI="6" |
42 |
+ |
43 |
+inherit toolchain-funcs |
44 |
|
45 |
MY_P="${PN}-v${PV}" |
46 |
+ |
47 |
DESCRIPTION="A Japanese input server which supports the XIM protocol" |
48 |
-HOMEPAGE="http://www.nec.co.jp/canna/" |
49 |
+HOMEPAGE="http://www.nec.co.jp/canna" |
50 |
SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz" |
51 |
|
52 |
LICENSE="HPND" |
53 |
SLOT="0" |
54 |
-KEYWORDS="x86 ppc sparc amd64 ppc64" |
55 |
+KEYWORDS="amd64 ppc ppc64 sparc x86" |
56 |
IUSE="freewnn" |
57 |
|
58 |
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 ) |
59 |
- !freewnn? ( >=app-i18n/canna-3.5_beta2-r1 ) |
60 |
+RDEPEND="x11-libs/libICE |
61 |
+ x11-libs/libSM |
62 |
x11-libs/libX11 |
63 |
x11-libs/libXaw |
64 |
+ x11-libs/libXext |
65 |
x11-libs/libXmu |
66 |
- x11-libs/libXp |
67 |
- x11-libs/libXt" |
68 |
- |
69 |
+ x11-libs/libXpm |
70 |
+ x11-libs/libXt |
71 |
+ !freewnn? ( app-i18n/canna ) |
72 |
+ freewnn? ( app-i18n/freewnn )" |
73 |
DEPEND="${RDEPEND} |
74 |
x11-misc/gccmakedep |
75 |
- x11-misc/imake |
76 |
- app-text/rman" |
77 |
- |
78 |
+ x11-misc/imake" |
79 |
S="${WORKDIR}/${MY_P}" |
80 |
|
81 |
-src_unpack() { |
82 |
- local mysed="" |
83 |
+PATCHES=( |
84 |
+ "${FILESDIR}"/${PN}-gentoo.patch |
85 |
+ "${FILESDIR}"/${PN}-ppc.patch |
86 |
+ "${FILESDIR}"/${PN}-segfault.patch |
87 |
+) |
88 |
+DOCS=( README NEWS doc/. ) |
89 |
|
90 |
- unpack ${A} |
91 |
- cd "${S}" |
92 |
- epatch "${FILESDIR}/${PN}-gentoo.patch" |
93 |
- epatch "${FILESDIR}/${PN}-ppc.patch" |
94 |
- epatch "${FILESDIR}/${PN}-segfault.patch" |
95 |
+src_prepare() { |
96 |
+ default |
97 |
|
98 |
- if use freewnn; then |
99 |
- sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf |
100 |
- else |
101 |
- sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf |
102 |
- fi |
103 |
+ sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf |
104 |
} |
105 |
|
106 |
-src_compile() { |
107 |
+src_configure() { |
108 |
xmkmf -a || die |
109 |
+} |
110 |
+ |
111 |
+src_compile() { |
112 |
emake \ |
113 |
- XAPPLOADDIR="/usr/share/X11/app-defaults/" \ |
114 |
+ CC="$(tc-getCC)" \ |
115 |
CDEBUGFLAGS="${CFLAGS}" \ |
116 |
LOCAL_LDFLAGS="${LDFLAGS}" \ |
117 |
- || die |
118 |
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" |
119 |
} |
120 |
|
121 |
src_install() { |
122 |
- emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die |
123 |
- rm -rf "${D}/usr/lib/X11" |
124 |
- |
125 |
- dodoc README NEWS doc/* |
126 |
+ emake \ |
127 |
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \ |
128 |
+ DESTDIR="${D}" \ |
129 |
+ install |
130 |
+ einstalldocs |
131 |
newman cmd/${PN}.man ${PN}.1 |
132 |
+ |
133 |
+ rm -rf "${ED}"/usr/$(get_libdir)/X11 |
134 |
} |
135 |
|
136 |
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
137 |
index d0412807189..724a233a91e 100644 |
138 |
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
139 |
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild |
140 |
@@ -1,12 +1,14 @@ |
141 |
# Copyright 1999-2017 Gentoo Foundation |
142 |
# Distributed under the terms of the GNU General Public License v2 |
143 |
|
144 |
-EAPI="3" |
145 |
-inherit eutils |
146 |
+EAPI="6" |
147 |
+ |
148 |
+inherit toolchain-funcs |
149 |
|
150 |
MY_P="${PN}-v${PV}" |
151 |
+ |
152 |
DESCRIPTION="A Japanese input server which supports the XIM protocol" |
153 |
-HOMEPAGE="http://www.nec.co.jp/canna/" |
154 |
+HOMEPAGE="http://www.nec.co.jp/canna" |
155 |
SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz" |
156 |
|
157 |
LICENSE="HPND" |
158 |
@@ -14,31 +16,32 @@ SLOT="0" |
159 |
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" |
160 |
IUSE="freewnn" |
161 |
|
162 |
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 ) |
163 |
- !freewnn? ( >=app-i18n/canna-3.5_beta2-r1 ) |
164 |
+RDEPEND="x11-libs/libICE |
165 |
+ x11-libs/libSM |
166 |
x11-libs/libX11 |
167 |
x11-libs/libXaw |
168 |
+ x11-libs/libXext |
169 |
x11-libs/libXmu |
170 |
- x11-libs/libXp |
171 |
- x11-libs/libXt" |
172 |
- |
173 |
+ x11-libs/libXpm |
174 |
+ x11-libs/libXt |
175 |
+ !freewnn? ( app-i18n/canna ) |
176 |
+ freewnn? ( app-i18n/freewnn )" |
177 |
DEPEND="${RDEPEND} |
178 |
x11-misc/gccmakedep |
179 |
- x11-misc/imake |
180 |
- app-text/rman" |
181 |
- |
182 |
+ x11-misc/imake" |
183 |
S="${WORKDIR}/${MY_P}" |
184 |
|
185 |
+PATCHES=( |
186 |
+ "${FILESDIR}"/${PN}-gentoo.patch |
187 |
+ "${FILESDIR}"/${PN}-ppc.patch |
188 |
+ "${FILESDIR}"/${PN}-segfault.patch |
189 |
+) |
190 |
+DOCS=( README NEWS doc/. ) |
191 |
+ |
192 |
src_prepare() { |
193 |
- epatch "${FILESDIR}/${PN}-gentoo.patch" |
194 |
- epatch "${FILESDIR}/${PN}-ppc.patch" |
195 |
- epatch "${FILESDIR}/${PN}-segfault.patch" |
196 |
+ default |
197 |
|
198 |
- if use freewnn; then |
199 |
- sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf || die |
200 |
- else |
201 |
- sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf || die |
202 |
- fi |
203 |
+ sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf |
204 |
} |
205 |
|
206 |
src_configure() { |
207 |
@@ -47,30 +50,26 @@ src_configure() { |
208 |
|
209 |
src_compile() { |
210 |
emake \ |
211 |
- XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults/" \ |
212 |
+ CC="$(tc-getCC)" \ |
213 |
CDEBUGFLAGS="${CFLAGS}" \ |
214 |
LOCAL_LDFLAGS="${LDFLAGS}" \ |
215 |
- || die |
216 |
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" |
217 |
} |
218 |
|
219 |
src_install() { |
220 |
- emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die |
221 |
- rm -rf "${ED}/usr/lib/X11" || die |
222 |
+ emake \ |
223 |
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \ |
224 |
+ DESTDIR="${D}" \ |
225 |
+ install |
226 |
+ einstalldocs |
227 |
+ newman cmd/${PN}.man ${PN}.1 |
228 |
|
229 |
- local server |
230 |
- if use freewnn; then |
231 |
- server="wnn" |
232 |
- else |
233 |
- server="canna" |
234 |
- fi |
235 |
+ rm -rf "${ED}"/usr/$(get_libdir)/X11 |
236 |
|
237 |
insinto /etc/X11/xinit/xinput.d |
238 |
sed \ |
239 |
-e "s:@EPREFIX@:${EPREFIX}:g" \ |
240 |
- -e "s:@SERVER@:${server}:g" \ |
241 |
- "${FILESDIR}/xinput-kinput2" > "${T}/kinput2.conf" || die |
242 |
- doins "${T}/kinput2.conf" || die |
243 |
- |
244 |
- dodoc README NEWS doc/* || die |
245 |
- newman cmd/${PN}.man ${PN}.1 || die |
246 |
+ -e "s:@SERVER@:$(usex freewnn wnn canna):g" \ |
247 |
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf |
248 |
+ doins "${T}"/${PN}.conf |
249 |
} |
250 |
|
251 |
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml |
252 |
index c921b96adf6..e1a49f49888 100644 |
253 |
--- a/app-i18n/kinput2/metadata.xml |
254 |
+++ b/app-i18n/kinput2/metadata.xml |
255 |
@@ -1,8 +1,8 @@ |
256 |
<?xml version="1.0" encoding="UTF-8"?> |
257 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
258 |
<pkgmetadata> |
259 |
-<maintainer type="project"> |
260 |
- <email>cjk@g.o</email> |
261 |
- <name>Cjk</name> |
262 |
-</maintainer> |
263 |
+ <maintainer type="project"> |
264 |
+ <email>cjk@g.o</email> |
265 |
+ <name>Cjk</name> |
266 |
+ </maintainer> |
267 |
</pkgmetadata> |