Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/clara/files/, profiles/, app-text/clara/
Date: Tue, 11 Dec 2018 13:10:31
Message-Id: 1544533806.d8003b83c429344543fd08e79275d149718da26f.mgorny@gentoo
1 commit: d8003b83c429344543fd08e79275d149718da26f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 11 13:08:27 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 11 13:10:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8003b83
7
8 app-text/clara: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/665046
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 app-text/clara/Manifest | 1 -
14 app-text/clara/clara-20031214-r1.ebuild | 54 -------------
15 app-text/clara/clara-20031214.ebuild | 55 -------------
16 .../clara/files/clara-20031214-debian-vararg.patch | 90 ----------------------
17 app-text/clara/files/clara_open_mode.patch | 20 -----
18 app-text/clara/metadata.xml | 5 --
19 profiles/package.mask | 9 ---
20 7 files changed, 234 deletions(-)
21
22 diff --git a/app-text/clara/Manifest b/app-text/clara/Manifest
23 deleted file mode 100644
24 index 869d2b4637d..00000000000
25 --- a/app-text/clara/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST clara-20031214.tar.gz 451539 BLAKE2B beed8b3a199825a8d8699c10b6a08c4d71fbafa3f3d2ebbbff6b13eafa35b4f38bacca35209039a93f0d31a993987a8773371b43440a1a0fbd61c40c455ec1f9 SHA512 260d710132a3903d71b6c4c0885ac1709b60d520861e3dcd5e4b75a3bf5627549c94423670be08245e7a9db6a870a93a9526c8d318fadaddcce00cbf02985f49
29
30 diff --git a/app-text/clara/clara-20031214-r1.ebuild b/app-text/clara/clara-20031214-r1.ebuild
31 deleted file mode 100644
32 index 758415dfd6a..00000000000
33 --- a/app-text/clara/clara-20031214-r1.ebuild
34 +++ /dev/null
35 @@ -1,54 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -
41 -inherit eutils toolchain-funcs
42 -
43 -DESCRIPTION="An OCR (Optical Character Recognition) program"
44 -SRC_URI="mirror://gentoo/${P}.tar.gz"
45 -HOMEPAGE="http://www.claraocr.org/"
46 -
47 -SLOT="0"
48 -LICENSE="GPL-2"
49 -KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~sparc-solaris"
50 -IUSE=""
51 -
52 -RDEPEND="x11-libs/libX11"
53 -DEPEND="${RDEPEND}"
54 -
55 -# The test provided by clara doesn't seem to make any sense. It just
56 -# calls the binary with an unsupported option, which results in an
57 -# error.
58 -RESTRICT="test"
59 -
60 -src_prepare() {
61 - sed -i -re "s/(C|LD)FLAGS =/\1FLAGS +=/" Makefile
62 - epatch "${FILESDIR}/${PN}_open_mode.patch"
63 - epatch "${FILESDIR}/${P}-debian-vararg.patch"
64 -}
65 -
66 -src_compile() {
67 - emake CC="$(tc-getCC)" || die
68 - emake doc || die
69 -}
70 -
71 -src_install() {
72 - dobin ${PN} selthresh
73 - doman doc/${PN}*.1 selthresh.1
74 -
75 - dodoc ANNOUNCE CHANGELOG doc/FAQ
76 - insinto /usr/share/doc/${P}
77 - doins imre.pbm
78 -
79 - dohtml doc/*.html
80 -}
81 -
82 -pkg_postinst() {
83 - elog
84 - elog "Please note that Clara OCR has to be trained to recognize text,"
85 - elog "without a training session it simply won't work. Have a look at"
86 - elog "the docs in /usr/share/doc/${P}/html/ to get more "
87 - elog "info about the training procedure."
88 - elog
89 -}
90
91 diff --git a/app-text/clara/clara-20031214.ebuild b/app-text/clara/clara-20031214.ebuild
92 deleted file mode 100644
93 index e1143a5a99b..00000000000
94 --- a/app-text/clara/clara-20031214.ebuild
95 +++ /dev/null
96 @@ -1,55 +0,0 @@
97 -# Copyright 1999-2018 Gentoo Foundation
98 -# Distributed under the terms of the GNU General Public License v2
99 -
100 -EAPI=0
101 -
102 -inherit eutils toolchain-funcs
103 -
104 -DESCRIPTION="An OCR (Optical Character Recognition) program"
105 -SRC_URI="mirror://gentoo/clara-20031214.tar.gz"
106 -HOMEPAGE="http://www.claraocr.org/"
107 -
108 -SLOT="0"
109 -LICENSE="GPL-2"
110 -KEYWORDS="amd64 ppc x86 ~ppc-macos ~sparc-solaris"
111 -IUSE=""
112 -
113 -RDEPEND="x11-libs/libX11"
114 -DEPEND="${RDEPEND}"
115 -
116 -# The test provided by clara doesn't seem to make any sense. It just
117 -# calls the binary with an unsupported option, which results in an
118 -# error.
119 -RESTRICT="test"
120 -
121 -src_unpack() {
122 - unpack ${A}
123 - cd "${S}"
124 - sed -i -re "s/(C|LD)FLAGS =/\1FLAGS +=/" Makefile
125 - epatch "${FILESDIR}/clara_open_mode.patch"
126 -}
127 -
128 -src_compile() {
129 - emake CC="$(tc-getCC)" || die
130 - emake doc || die
131 -}
132 -
133 -src_install() {
134 - dobin clara selthresh
135 - doman doc/clara*.1 selthresh.1
136 -
137 - dodoc ANNOUNCE CHANGELOG doc/FAQ
138 - insinto /usr/share/doc/${P}
139 - doins imre.pbm
140 -
141 - dohtml doc/*.html
142 -}
143 -
144 -pkg_postinst() {
145 - elog
146 - elog "Please note that Clara OCR has to be trained to recognize text,"
147 - elog "without a training session it simply won't work. Have a look at"
148 - elog "the docs in /usr/share/doc/${P}/html/ to get more "
149 - elog "info about the training procedure."
150 - elog
151 -}
152
153 diff --git a/app-text/clara/files/clara-20031214-debian-vararg.patch b/app-text/clara/files/clara-20031214-debian-vararg.patch
154 deleted file mode 100644
155 index 570bc401899..00000000000
156 --- a/app-text/clara/files/clara-20031214-debian-vararg.patch
157 +++ /dev/null
158 @@ -1,90 +0,0 @@
159 ---- clara-20031214.orig/clara.c
160 -+++ clara-20031214/clara.c
161 -@@ -751,11 +751,12 @@
162 - s[128] = 0;
163 - logmsg(s);
164 -
165 -- if (!trace)
166 -- return;
167 -- va_start(args,m);
168 -- vfprintf(stderr,m,args);
169 -- fprintf(stderr,"\n");
170 -+ if (trace) {
171 -+ vfprintf(stderr,m,args);
172 -+ fprintf(stderr,"\n");
173 -+ }
174 -+
175 -+ va_end(args);
176 - }
177 -
178 - /*
179 -@@ -775,10 +776,12 @@
180 - logmsg(s);
181 -
182 - /* send to stderr if requested */
183 -- if (!debug)
184 -- return;
185 -- vfprintf(stderr,m,args);
186 -- fprintf(stderr,"\n");
187 -+ if (debug) {
188 -+ vfprintf(stderr,m,args);
189 -+ fprintf(stderr,"\n");
190 -+ }
191 -+
192 -+ va_end(args);
193 - }
194 -
195 - /*
196 -@@ -797,9 +800,10 @@
197 - s[128] = 0;
198 - logmsg(s);
199 -
200 -- va_start(args,m);
201 - vfprintf(stderr,m,args);
202 - fprintf(stderr,"\n");
203 -+
204 -+ va_end(args);
205 - }
206 -
207 - /* (devel)
208 ---- clara-20031214.orig/event.c
209 -+++ clara-20031214/event.c
210 -@@ -638,6 +638,8 @@
211 - }
212 - }
213 -
214 -+ va_end(args);
215 -+
216 - /*
217 - printf("request (priority %d, mclip=%d, redraw=%d) to draw the message \"%s\"\n",f,mclip,redraw_stline,s);
218 - */
219 ---- clara-20031214.orig/html.c
220 -+++ clara-20031214/html.c
221 -@@ -1548,11 +1548,12 @@
222 - va_list args;
223 - int n=0,f;
224 -
225 -- va_start(args, fmt);
226 - for (f=0; f==0; ) {
227 -
228 - /* try to write */
229 -+ va_start(args, fmt);
230 - n = vsnprintf(*t+*top+1,*sz-*top-1,fmt,args);
231 -+ va_end(args);
232 -
233 - /*
234 - Some implementations of vsnprintf return -1 when
235 -@@ -1589,11 +1590,12 @@
236 - va_list args;
237 - int n=0,f;
238 -
239 -- va_start(args, fmt);
240 - for (f=0; f==0; ) {
241 -
242 - /* try to write */
243 -+ va_start(args, fmt);
244 - n = vsnprintf(text+topt+1,textsz-topt-1,fmt,args);
245 -+ va_end(args);
246 -
247 - /*
248 - Some implementations of vsnprintf return -1 when
249
250 diff --git a/app-text/clara/files/clara_open_mode.patch b/app-text/clara/files/clara_open_mode.patch
251 deleted file mode 100644
252 index 3f73f466ab8..00000000000
253 --- a/app-text/clara/files/clara_open_mode.patch
254 +++ /dev/null
255 @@ -1,20 +0,0 @@
256 ---- pgmblock.c 2002-04-29 14:26:13.000000000 +0000
257 -+++ pgmblock.c 2009-03-05 02:51:43.000000000 +0000
258 -@@ -161,7 +161,7 @@
259 -
260 - printf("%d rare pixels (%1.4f)\n",t,((float)t)/(w*h));
261 -
262 -- F = open("map",O_WRONLY|O_CREAT);
263 -+ F = open("map",O_WRONLY|O_CREAT, 0644);
264 - write(F,m,h*bpl);
265 - write(F,map,256);
266 - close(F);
267 -@@ -197,7 +197,7 @@
268 - {
269 - int i,j,F;
270 -
271 -- F = open("map",O_RDONLY|O_CREAT);
272 -+ F = open("map",O_RDONLY|O_CREAT, 0644);
273 - read(F,m,h*bpl);
274 - read(F,map,256);
275 - close(F);
276
277 diff --git a/app-text/clara/metadata.xml b/app-text/clara/metadata.xml
278 deleted file mode 100644
279 index 6f49eba8f49..00000000000
280 --- a/app-text/clara/metadata.xml
281 +++ /dev/null
282 @@ -1,5 +0,0 @@
283 -<?xml version="1.0" encoding="UTF-8"?>
284 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
285 -<pkgmetadata>
286 -<!-- maintainer-needed -->
287 -</pkgmetadata>
288
289 diff --git a/profiles/package.mask b/profiles/package.mask
290 index 1228bcf469c..51e7e7741ef 100644
291 --- a/profiles/package.mask
292 +++ b/profiles/package.mask
293 @@ -263,11 +263,6 @@ dev-db/couchdb
294 # Unkeyworded since 2008, non-installable (#664680). Removal in a month.
295 sys-fs/devfsd
296
297 -# Pacho Ramos <pacho@g.o> (11 Nov 2018)
298 -# Orphan, no reverse deps, dead since 2003 (#665046, #521242). Removal in a
299 -# month.
300 -app-text/clara
301 -
302 # Pacho Ramos <pacho@g.o> (11 Nov 2018)
303 # Merged into >=media-tv/mythtv-29, bug #665924. Removal in a month.
304 media-plugins/mythplugins
305 @@ -282,10 +277,6 @@ dev-python/jenkins-webapi
306 media-plugins/vdr-image
307 media-plugins/vdr-picselshow
308
309 -# Pacho Ramos <pacho@g.o> (11 Nov 2018)
310 -# Dead for years, no reverse deps (#665046). Removal in a month.
311 -app-text/clara
312 -
313 # Mike Gilbert <floppym@g.o> (10 Nov 2018)
314 # Open bugs and no Gentoo maintainer.
315 # Removal in 30 days.