Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/files/, app-text/cmigemo/
Date: Tue, 11 Dec 2018 09:24:46
Message-Id: 1544520264.26fc62d7a5dcdf4e68f76ada486b4a13c5e2a8c7.zlogene@gentoo
1 commit: 26fc62d7a5dcdf4e68f76ada486b4a13c5e2a8c7
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 11 09:24:24 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 11 09:24:24 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26fc62d7
7
8 app-text/cmigemo: Drop old
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 app-text/cmigemo/Manifest | 1 -
14 app-text/cmigemo/cmigemo-1.3c-r1.ebuild | 63 ------------------
15 app-text/cmigemo/cmigemo-1.3c-r2.ebuild | 76 ----------------------
16 app-text/cmigemo/cmigemo-1.3c.ebuild | 51 ---------------
17 .../cmigemo/files/cmigemo-1.2-migemo-dict.diff | 23 -------
18 5 files changed, 214 deletions(-)
19
20 diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
21 index c96f6f7280b..e1db9f4d264 100644
22 --- a/app-text/cmigemo/Manifest
23 +++ b/app-text/cmigemo/Manifest
24 @@ -1,2 +1 @@
25 DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18
26 -DIST cmigemo-1.3c.tar.bz2 54323 BLAKE2B 4d63bde57c442131056e1aabcc702308243491de0632325b7a80af328e293c97479ac1733f29484a2ee7912f6d599360e7703d45612e8b30b52fd7a1228b5152 SHA512 240bdc92139d692cdb9e98a977f77105ef3ca716ede030629b3c4652276f0b0955ae80cc443fb879cada4b3fc83f7e4181043355e0285fcfe1011f4db4d13cc1
27
28 diff --git a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
29 deleted file mode 100644
30 index 5339687735f..00000000000
31 --- a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
32 +++ /dev/null
33 @@ -1,63 +0,0 @@
34 -# Copyright 1999-2009 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=2
38 -inherit eutils flag-o-matic multilib toolchain-funcs
39 -
40 -MY_P="${P}-MIT"
41 -DESCRIPTION="C/Migemo -- Migemo library implementation in C"
42 -HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
43 -SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
44 -
45 -LICENSE="MIT"
46 -SLOT="0"
47 -KEYWORDS="alpha ~amd64 ~ppc x86"
48 -IUSE="unicode vim-syntax"
49 -
50 -DEPEND="dev-lang/perl
51 - >=app-dicts/migemo-dict-200812[unicode=]
52 - app-i18n/qkc"
53 -RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
54 -
55 -S="${WORKDIR}/${MY_P}"
56 -
57 -src_prepare() {
58 - epatch "${FILESDIR}/${PN}-1.2-migemo-dict.diff"
59 - touch dict/SKK-JISYO.L
60 - if use unicode ; then
61 - sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
62 - fi
63 -
64 - # Bug #246953
65 - sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
66 -}
67 -
68 -src_compile() {
69 - append-flags -fPIC
70 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" gcc || die
71 -}
72 -
73 -src_install() {
74 - # parallel make install borks
75 - emake -j1 \
76 - prefix="${D}/usr" \
77 - libdir="${D}/usr/$(get_libdir)" \
78 - gcc-install || die
79 -
80 - local encoding
81 - if use unicode ; then
82 - encoding="utf-8"
83 - else
84 - encoding="euc-jp"
85 - fi
86 -
87 - mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/"
88 - rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
89 -
90 - if use vim-syntax ; then
91 - insinto /usr/share/vim/vimfiles/plugin
92 - doins tools/migemo.vim
93 - fi
94 -
95 - dodoc doc/{README_j,TODO_j,vimigemo}.txt
96 -}
97
98 diff --git a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
99 deleted file mode 100644
100 index 5949875af65..00000000000
101 --- a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
102 +++ /dev/null
103 @@ -1,76 +0,0 @@
104 -# Copyright 1999-2018 Gentoo Foundation
105 -# Distributed under the terms of the GNU General Public License v2
106 -
107 -EAPI=2
108 -inherit eutils flag-o-matic multilib toolchain-funcs
109 -
110 -MY_P="${P}-MIT"
111 -DESCRIPTION="C/Migemo -- Migemo library implementation in C"
112 -HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
113 -SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
114 -
115 -LICENSE="MIT"
116 -SLOT="0"
117 -KEYWORDS="~alpha amd64 ~ppc x86"
118 -IUSE="unicode vim-syntax"
119 -
120 -DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
121 - dev-lang/perl
122 - || (
123 - net-misc/curl
124 - net-misc/wget
125 - www-client/fetch
126 - )
127 - app-i18n/nkf"
128 -RDEPEND="${RDEPEND}"
129 -
130 -S="${WORKDIR}/${MY_P}"
131 -
132 -src_prepare() {
133 - # Bug #246953
134 - epatch "${FILESDIR}/${P}-gentoo.patch" \
135 - "${FILESDIR}"/${P}-ldflags.patch
136 -
137 - touch dict/SKK-JISYO.L
138 - if use unicode ; then
139 - sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
140 - fi
141 -
142 - # Bug #255813
143 - sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
144 -}
145 -
146 -src_compile() {
147 - append-flags -fPIC
148 - # parallel make b0rked
149 - emake -j1 \
150 - CC="$(tc-getCC)" \
151 - CFLAGS="${CFLAGS}" \
152 - LDFLAGS="${LDFLAGS}" \
153 - gcc-all || die
154 -}
155 -
156 -src_install() {
157 - # parallel make b0rked
158 - emake -j1 \
159 - prefix="${D}/usr" \
160 - libdir="${D}/usr/$(get_libdir)" \
161 - gcc-install || die
162 -
163 - local encoding
164 - if use unicode ; then
165 - encoding="utf-8"
166 - else
167 - encoding="euc-jp"
168 - fi
169 -
170 - mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/"
171 - rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
172 -
173 - if use vim-syntax ; then
174 - insinto /usr/share/vim/vimfiles/plugin
175 - doins tools/migemo.vim
176 - fi
177 -
178 - dodoc doc/{README_j,TODO_j,vimigemo}.txt
179 -}
180
181 diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
182 deleted file mode 100644
183 index d00bfc14a73..00000000000
184 --- a/app-text/cmigemo/cmigemo-1.3c.ebuild
185 +++ /dev/null
186 @@ -1,51 +0,0 @@
187 -# Copyright 1999-2018 Gentoo Foundation
188 -# Distributed under the terms of the GNU General Public License v2
189 -
190 -EAPI=0
191 -
192 -inherit eutils
193 -
194 -DESCRIPTION="C/Migemo -- Migemo library implementation in C"
195 -HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
196 -SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2"
197 -
198 -LICENSE="cmigemo"
199 -SLOT="0"
200 -KEYWORDS="x86 alpha ppc" # development branch
201 -IUSE=""
202 -
203 -DEPEND="app-i18n/qkc
204 - app-dicts/migemo-dict"
205 -RDEPEND="app-dicts/migemo-dict"
206 -
207 -src_unpack() {
208 - unpack ${A}
209 - cd ${S}
210 - epatch "${FILESDIR}"/${PN}-1.2-migemo-dict.diff
211 - touch ${S}/dict/SKK-JISYO.L
212 -
213 - # Bug #246953
214 - sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
215 -}
216 -
217 -src_compile() {
218 - emake CFLAGS="-fPIC ${CFLAGS}" gcc || die
219 -}
220 -
221 -src_install() {
222 - make \
223 - prefix=${D}/usr \
224 - docdir=${D}/usr/share/doc/${P} \
225 - gcc-install || die
226 -
227 - mv ${D}/usr/share/migemo/euc-jp/*.dat ${D}/usr/share/migemo
228 - rm -rf ${D}/usr/share/migemo/{cp932,euc-jp}
229 -
230 - if has_version 'app-editors/vim-core' ; then
231 - insinto /usr/share/vim/vimfiles/plugin
232 - doins tools/migemo.vim
233 - fi
234 -
235 - dodoc tools/migemo.vim
236 - dodoc doc/{README_j,TODO_j,vimigemo}.txt
237 -}
238
239 diff --git a/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff b/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
240 deleted file mode 100644
241 index a216ceafb0c..00000000000
242 --- a/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
243 +++ /dev/null
244 @@ -1,23 +0,0 @@
245 -diff -urN cmigemo-1.2.ORIG/tools/migemo.vim cmigemo-1.2/tools/migemo.vim
246 ---- cmigemo-1.2.ORIG/tools/migemo.vim 2003-01-07 22:57:59.000000000 +0900
247 -+++ cmigemo-1.2/tools/migemo.vim 2004-03-13 17:25:31.944190968 +0900
248 -@@ -20,7 +20,7 @@
249 - let dict = globpath(path, "migemo-dict")
250 - endif
251 - if dict == ''
252 -- let dict = '/usr/local/share/migemo/'.&encoding.'/migemo-dict'
253 -+ let dict = '/usr/share/migemo/migemo-dict'
254 - if !filereadable(dict)
255 - let dict = ''
256 - endif
257 -@@ -43,7 +43,9 @@
258 - nnoremap <Leader>f :call <SID>SearchChar(0)<CR>
259 - else
260 - " non-builtin version
261 -- let g:migemodict = s:SearchDict()
262 -+ if !exists('g:migemodict')
263 -+ let g:migemodict = s:SearchDict()
264 -+ endif
265 - command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>)
266 - nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr>
267 -