1 |
commit: 833f267f753b1d84149a30b7b161debbf2125a2a |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 28 13:40:12 2018 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 28 13:40:12 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833f267f |
7 |
|
8 |
app-i18n/imhangul: tidy |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
app-i18n/imhangul/imhangul-2.1.0-r1.ebuild | 58 +++++++++++++++++++++ |
13 |
app-i18n/imhangul/imhangul-2.1.0.ebuild | 82 ------------------------------ |
14 |
app-i18n/imhangul/imhangul-3.1.1.ebuild | 41 +++++++-------- |
15 |
3 files changed, 76 insertions(+), 105 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild |
18 |
new file mode 100644 |
19 |
index 00000000000..5f32412487a |
20 |
--- /dev/null |
21 |
+++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild |
22 |
@@ -0,0 +1,58 @@ |
23 |
+# Copyright 1999-2018 Gentoo Foundation |
24 |
+# Distributed under the terms of the GNU General Public License v2 |
25 |
+ |
26 |
+EAPI="6" |
27 |
+ |
28 |
+inherit gnome2-utils |
29 |
+ |
30 |
+DESCRIPTION="GTK+ 2 Hangul Input Modules" |
31 |
+HOMEPAGE="https://code.google.com/p/imhangul/" |
32 |
+SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2" |
33 |
+ |
34 |
+LICENSE="LGPL-2.1" |
35 |
+SLOT="0" |
36 |
+KEYWORDS="amd64 ppc x86" |
37 |
+IUSE="" |
38 |
+ |
39 |
+RDEPEND="app-i18n/libhangul |
40 |
+ x11-libs/gtk+:2 |
41 |
+ virtual/libintl" |
42 |
+DEPEND="${RDEPEND} |
43 |
+ virtual/pkgconfig |
44 |
+ sys-devel/gettext" |
45 |
+ |
46 |
+src_prepare() { |
47 |
+ default |
48 |
+ gnome2_environment_reset |
49 |
+ gnome2_disable_deprecation_warning |
50 |
+} |
51 |
+ |
52 |
+src_configure() { |
53 |
+ econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules |
54 |
+} |
55 |
+ |
56 |
+src_install() { |
57 |
+ default |
58 |
+ find "${ED}" -name '*.la' -delete || die |
59 |
+ dodoc ${PN}.conf |
60 |
+ |
61 |
+ local s |
62 |
+ insinto /etc/X11/xinit/xinput.d |
63 |
+ for s in 2{,y} 3{2,9,f,s,y} ahn ro; do |
64 |
+ newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf |
65 |
+ done |
66 |
+} |
67 |
+ |
68 |
+pkg_postinst() { |
69 |
+ gnome2_query_immodules_gtk2 |
70 |
+ elog |
71 |
+ elog "If you want to use one of the module as a default input method, " |
72 |
+ elog |
73 |
+ elog "export GTK_IM_MODULE=hangul2 # 2 input type" |
74 |
+ elog "export GTK_IM_MODULE=hangul3f # 3 input type" |
75 |
+ elog |
76 |
+} |
77 |
+ |
78 |
+pkg_postrm() { |
79 |
+ gnome2_query_immodules_gtk2 |
80 |
+} |
81 |
|
82 |
diff --git a/app-i18n/imhangul/imhangul-2.1.0.ebuild b/app-i18n/imhangul/imhangul-2.1.0.ebuild |
83 |
deleted file mode 100644 |
84 |
index 5503848cb8b..00000000000 |
85 |
--- a/app-i18n/imhangul/imhangul-2.1.0.ebuild |
86 |
+++ /dev/null |
87 |
@@ -1,82 +0,0 @@ |
88 |
-# Copyright 1999-2017 Gentoo Foundation |
89 |
-# Distributed under the terms of the GNU General Public License v2 |
90 |
- |
91 |
-EAPI=6 |
92 |
-inherit gnome2-utils multilib readme.gentoo-r1 |
93 |
- |
94 |
-DESCRIPTION="Gtk+-2.0 Hangul Input Modules" |
95 |
-HOMEPAGE="https://code.google.com/p/imhangul/" |
96 |
-SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2" |
97 |
- |
98 |
-SLOT="0" |
99 |
-LICENSE="LGPL-2.1" |
100 |
-KEYWORDS="amd64 ppc x86" |
101 |
-IUSE="" |
102 |
- |
103 |
-RDEPEND=" |
104 |
- >=app-i18n/libhangul-0.0.12 |
105 |
- >=x11-libs/gtk+-2.2:2 |
106 |
- virtual/libintl |
107 |
-" |
108 |
-DEPEND="${RDEPEND} |
109 |
- virtual/pkgconfig |
110 |
- sys-devel/gettext |
111 |
-" |
112 |
- |
113 |
-DISABLE_AUTOFORMATTING="yes" |
114 |
-DOC_CONTENTS=" |
115 |
-If you want to use one of the module as a default input method, |
116 |
- |
117 |
-export GTK_IM_MODULE=hangul2 # 2 input type |
118 |
-export GTK_IM_MODULE=hangul3f # 3 input type |
119 |
-" |
120 |
- |
121 |
-get_gtk_confdir() { |
122 |
- # bug #366889 |
123 |
- if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then |
124 |
- GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)}" |
125 |
- else |
126 |
- GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0}" |
127 |
- fi |
128 |
- echo ${GTK2_CONFDIR} |
129 |
-} |
130 |
- |
131 |
-src_prepare() { |
132 |
- default |
133 |
- gnome2_environment_reset |
134 |
- gnome2_disable_deprecation_warning |
135 |
-} |
136 |
- |
137 |
-src_configure() { |
138 |
- econf \ |
139 |
- --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-2.0/immodules" \ |
140 |
- --with-gtk-im-module-file="$(get_gtk_confdir)" |
141 |
-} |
142 |
- |
143 |
-src_install() { |
144 |
- default |
145 |
- prune_libtool_files --modules |
146 |
- |
147 |
- insinto /etc/X11/xinit/xinput.d |
148 |
- newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf |
149 |
- newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf |
150 |
- newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf |
151 |
- newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf |
152 |
- newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf |
153 |
- newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf |
154 |
- newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf |
155 |
- newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf |
156 |
- newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf |
157 |
- |
158 |
- dodoc imhangul.conf |
159 |
- readme.gentoo_create_doc |
160 |
-} |
161 |
- |
162 |
-pkg_postinst() { |
163 |
- gnome2_query_immodules_gtk2 |
164 |
- readme.gentoo_print_elog |
165 |
-} |
166 |
- |
167 |
-pkg_postrm() { |
168 |
- gnome2_query_immodules_gtk2 |
169 |
-} |
170 |
|
171 |
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild |
172 |
index 1cebdc2d5fc..e99ca8ce861 100644 |
173 |
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild |
174 |
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild |
175 |
@@ -1,9 +1,11 @@ |
176 |
-# Copyright 1999-2017 Gentoo Foundation |
177 |
+# Copyright 1999-2018 Gentoo Foundation |
178 |
# Distributed under the terms of the GNU General Public License v2 |
179 |
|
180 |
-EAPI=6 |
181 |
+EAPI="6" |
182 |
|
183 |
-DESCRIPTION="Gtk+-3.0 Hangul Input Modules" |
184 |
+inherit gnome2-utils |
185 |
+ |
186 |
+DESCRIPTION="GTK+ 3 Hangul Input Modules" |
187 |
HOMEPAGE="https://code.google.com/p/imhangul/" |
188 |
SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2" |
189 |
|
190 |
@@ -12,7 +14,7 @@ SLOT="3" |
191 |
KEYWORDS="~amd64 ~ppc ~x86" |
192 |
IUSE="" |
193 |
|
194 |
-RDEPEND=">=app-i18n/libhangul-0.0.12 |
195 |
+RDEPEND="app-i18n/libhangul |
196 |
x11-libs/gtk+:3 |
197 |
virtual/libintl" |
198 |
DEPEND="${RDEPEND} |
199 |
@@ -21,41 +23,34 @@ DEPEND="${RDEPEND} |
200 |
|
201 |
src_prepare() { |
202 |
default |
203 |
- |
204 |
- # Drop DEPRECATED flags, bug #387825 |
205 |
- sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die |
206 |
+ gnome2_environment_reset |
207 |
+ gnome2_disable_deprecation_warning |
208 |
} |
209 |
|
210 |
src_configure() { |
211 |
- econf --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules" |
212 |
+ econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules |
213 |
} |
214 |
|
215 |
src_install() { |
216 |
default |
217 |
- dodoc imhangul.conf |
218 |
+ find "${ED}" -name '*.la' -delete || die |
219 |
+ dodoc ${PN}.conf |
220 |
|
221 |
+ local s |
222 |
insinto /etc/X11/xinit/xinput.d |
223 |
- newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf |
224 |
- newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf |
225 |
- newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf |
226 |
- newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf |
227 |
- newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf |
228 |
- newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf |
229 |
- newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf |
230 |
- newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf |
231 |
- newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf |
232 |
- |
233 |
- find "${D}" -name '*.la' -delete || die |
234 |
+ for s in 2{,y} 3{2,9,f,s,y} ahn ro; do |
235 |
+ newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf |
236 |
+ done |
237 |
} |
238 |
|
239 |
pkg_postinst() { |
240 |
gnome2_query_immodules_gtk3 |
241 |
- elog "" |
242 |
+ elog |
243 |
elog "If you want to use one of the module as a default input method, " |
244 |
- elog "" |
245 |
+ elog |
246 |
elog "export GTK_IM_MODULE=hangul2 # 2 input type" |
247 |
elog "export GTK_IM_MODULE=hangul3f # 3 input type" |
248 |
- elog "" |
249 |
+ elog |
250 |
} |
251 |
|
252 |
pkg_postrm() { |