1 |
commit: 755f053c855dfcc92529994470b1e7c0a81cb2d2 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 30 19:42:12 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 30 20:01:05 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755f053c |
7 |
|
8 |
media-fonts/culmus: port restored 0.120-r5 to EAPI 7 |
9 |
|
10 |
Adjust 0.133* too. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/737406 |
13 |
Bug: https://bugs.gentoo.org/777570 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
media-fonts/culmus/culmus-0.120-r5.ebuild | 133 ++++++++++++++++++------------ |
17 |
media-fonts/culmus/culmus-0.133-r1.ebuild | 84 ++++++++++++------- |
18 |
2 files changed, 135 insertions(+), 82 deletions(-) |
19 |
|
20 |
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild |
21 |
index 95a55a83564..572a3bfcc36 100644 |
22 |
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild |
23 |
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild |
24 |
@@ -1,7 +1,7 @@ |
25 |
-# Copyright 1999-2020 Gentoo Authors |
26 |
+# Copyright 1999-2021 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI="6" |
30 |
+EAPI=7 |
31 |
|
32 |
inherit font |
33 |
|
34 |
@@ -28,6 +28,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz |
35 |
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )" |
36 |
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )" |
37 |
SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )" |
38 |
+S="${WORKDIR}" |
39 |
|
40 |
# Some fonts are available in otf format too. Do we need them? |
41 |
# http://culmus.sourceforge.net/fancy/anka-otf.zip |
42 |
@@ -39,16 +40,15 @@ SLOT="0" |
43 |
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86" |
44 |
IUSE="ancient fancy fontforge taamey" |
45 |
|
46 |
-FONT_CONF=( "${T}/65-culmus.conf" ) |
47 |
- |
48 |
RDEPEND="!media-fonts/culmus-ancient" |
49 |
# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required |
50 |
-DEPEND="${RDEPEND} |
51 |
+BDEPEND=" |
52 |
app-arch/unzip |
53 |
>=x11-apps/mkfontscale-1.0.9-r1 |
54 |
- fontforge? ( media-gfx/fontforge )" |
55 |
+ fontforge? ( media-gfx/fontforge ) |
56 |
+" |
57 |
|
58 |
-S=${WORKDIR} |
59 |
+FONT_CONF=( "${T}/65-culmus.conf" ) |
60 |
# Put all fonts, generated or not here |
61 |
FONT_S=${S}/FONTS |
62 |
|
63 |
@@ -62,15 +62,15 @@ src_unpack() { |
64 |
if use fancy; then |
65 |
unpack $(printf "%s.tar.gz " ${FANCY_FONTS}) |
66 |
unpack $(printf "%s.zip " ${FANCY_YG_FONTS}) |
67 |
- mv TTF/* . |
68 |
+ mv TTF/* . || die |
69 |
fi |
70 |
|
71 |
if use taamey; then |
72 |
for font in ${TAAMEY_FONTS}; do |
73 |
- mkdir ${font} |
74 |
- pushd ${font} |
75 |
+ mkdir ${font} || die |
76 |
+ pushd ${font} || die |
77 |
unpack ${font}.zip |
78 |
- popd >/dev/null |
79 |
+ popd >/dev/null || die |
80 |
done |
81 |
fi |
82 |
} |
83 |
@@ -83,65 +83,88 @@ src_prepare() { |
84 |
src_compile() { |
85 |
mkdir -p "${FONT_S}" |
86 |
if use fontforge; then |
87 |
- pushd ${P} |
88 |
- mv *.afm *.pfa "${FONT_S}" |
89 |
- rm *.ttf |
90 |
- popd >/dev/null |
91 |
+ pushd ${P} || die |
92 |
+ |
93 |
+ mv *.afm *.pfa "${FONT_S}" || die |
94 |
+ rm *.ttf || die |
95 |
+ |
96 |
+ popd >/dev/null || die |
97 |
+ |
98 |
+ pushd ${PN}-type1-${TYPE1_PV} || die |
99 |
+ |
100 |
+ mv *.afm *.pfa "${FONT_S}" || die |
101 |
+ |
102 |
+ popd >/dev/null || die |
103 |
|
104 |
- pushd ${PN}-type1-${TYPE1_PV} |
105 |
- mv *.afm *.pfa "${FONT_S}" |
106 |
- popd >/dev/null |
107 |
+ pushd ${PN}-src-${PV} || die |
108 |
|
109 |
- pushd ${PN}-src-${PV} |
110 |
for f in *.sfd; do |
111 |
"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die |
112 |
done |
113 |
- popd >/dev/null |
114 |
+ |
115 |
+ popd >/dev/null || die |
116 |
|
117 |
if use ancient; then |
118 |
- pushd ${MY_A_P}/src |
119 |
+ pushd ${MY_A_P}/src || die |
120 |
+ |
121 |
export FONTFORGE_LANGUAGE=ff |
122 |
- make clean |
123 |
- make all || die "Failed to build fonts" |
124 |
- mv *.ttf "${FONT_S}" |
125 |
- popd >/dev/null |
126 |
+ |
127 |
+ emake clean |
128 |
+ emake all |
129 |
+ |
130 |
+ mv *.ttf "${FONT_S}" || die |
131 |
+ |
132 |
+ popd >/dev/null || die |
133 |
fi |
134 |
|
135 |
if use taamey; then |
136 |
for font in ${TAAMEY_FONTS}; do |
137 |
- rm -rf ${font}/TTF |
138 |
- pushd ${font}/SFD |
139 |
+ rm -rf ${font}/TTF || die |
140 |
+ |
141 |
+ pushd ${font}/SFD || die |
142 |
+ |
143 |
for f in *.sfd; do |
144 |
"${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die |
145 |
done |
146 |
- popd >/dev/null |
147 |
+ |
148 |
+ popd >/dev/null || die |
149 |
done |
150 |
fi |
151 |
else |
152 |
- pushd ${P} |
153 |
- mv *.afm *.pfa *.ttf "${FONT_S}" |
154 |
- popd >/dev/null |
155 |
+ pushd ${P} || die |
156 |
|
157 |
- pushd ${PN}-type1-${TYPE1_PV} |
158 |
- mv *.afm *.pfa "${FONT_S}" |
159 |
- popd >/dev/null |
160 |
+ mv *.afm *.pfa *.ttf "${FONT_S}" || die |
161 |
+ |
162 |
+ popd >/dev/null || die |
163 |
+ |
164 |
+ pushd ${PN}-type1-${TYPE1_PV} || die |
165 |
+ |
166 |
+ mv *.afm *.pfa "${FONT_S}" || die |
167 |
+ |
168 |
+ popd >/dev/null || die |
169 |
|
170 |
if use ancient; then |
171 |
- pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts |
172 |
- mv *.ttf "${FONT_S}" |
173 |
- popd >/dev/null |
174 |
+ pushd ${MY_A_P}$(use fontforge || echo .TTF)/fonts || die |
175 |
+ |
176 |
+ mv *.ttf "${FONT_S}" || die |
177 |
+ |
178 |
+ popd >/dev/null || die |
179 |
fi |
180 |
|
181 |
if use taamey; then |
182 |
for font in ${TAAMEY_FONTS}; do |
183 |
- pushd ${font}/TTF |
184 |
- mv *.ttf "${FONT_S}" |
185 |
- popd >/dev/null |
186 |
+ pushd ${font}/TTF || die |
187 |
+ |
188 |
+ mv *.ttf "${FONT_S}" || die |
189 |
+ |
190 |
+ popd >/dev/null || die |
191 |
done |
192 |
fi |
193 |
fi |
194 |
|
195 |
- use fancy && mv *.afm *.pfa *.ttf "${FONT_S}" |
196 |
+ if use fancy; then |
197 |
+ mv *.afm *.pfa *.ttf "${FONT_S}" || die |
198 |
+ fi |
199 |
} |
200 |
|
201 |
src_install() { |
202 |
@@ -150,31 +173,37 @@ src_install() { |
203 |
FONT_SUFFIX="pfa afm $((use fancy || use taamey) && echo ttf)" \ |
204 |
font_src_install |
205 |
|
206 |
- rm -rf "${FONT_S}" |
207 |
+ rm -rf "${FONT_S}" || die |
208 |
find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' | |
209 |
while read font; do |
210 |
- ewarn "QA: missed font file: ${font}" |
211 |
+ eqawarn "Missed font file: ${font}" |
212 |
done |
213 |
|
214 |
- pushd ${PN}$(use fontforge && echo -src)-${PV} |
215 |
+ pushd ${PN}$(use fontforge && echo -src)-${PV} || die |
216 |
+ |
217 |
dodoc CHANGES |
218 |
- popd >/dev/null |
219 |
+ |
220 |
+ popd >/dev/null || die |
221 |
|
222 |
if use ancient; then |
223 |
- pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/" |
224 |
+ pushd "${WORKDIR}/${MY_A_P}$(use fontforge || echo .TTF)/" || die |
225 |
+ |
226 |
newdoc CHANGES{,.ancient} || die |
227 |
newdoc README{,.ancient} || die |
228 |
- popd >/dev/null |
229 |
+ |
230 |
+ popd >/dev/null || die |
231 |
fi |
232 |
|
233 |
if use taamey; then |
234 |
for font in ${TAAMEY_FONTS}; do |
235 |
- pushd ${font} |
236 |
- [[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; } |
237 |
- newdoc README{,.${font}} || die |
238 |
- insinto /usr/share/doc/${PF}/${font} |
239 |
+ pushd ${font} || die |
240 |
+ |
241 |
+ [[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}} |
242 |
+ newdoc README{,.${font}} |
243 |
+ docinto ${font} |
244 |
doins -r Samples |
245 |
- popd >/dev/null |
246 |
+ |
247 |
+ popd >/dev/null || die |
248 |
done |
249 |
fi |
250 |
} |
251 |
|
252 |
diff --git a/media-fonts/culmus/culmus-0.133-r1.ebuild b/media-fonts/culmus/culmus-0.133-r1.ebuild |
253 |
index 1d3fec0e13b..170ad94a7b6 100644 |
254 |
--- a/media-fonts/culmus/culmus-0.133-r1.ebuild |
255 |
+++ b/media-fonts/culmus/culmus-0.133-r1.ebuild |
256 |
@@ -28,6 +28,7 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz |
257 |
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy/%s.tar.gz " ${FANCY_FONTS}) )" |
258 |
SRC_URI+=" fancy? ( $(printf "http://culmus.sourceforge.net/fancy-yg/%s.zip " ${FANCY_YG_FONTS}) )" |
259 |
SRC_URI+=" taamey? ( $(printf "http://culmus.sourceforge.net/taamim/%s.zip " ${TAAMEY_FONTS}) )" |
260 |
+S="${WORKDIR}" |
261 |
|
262 |
# Some fonts are available in otf format too. Do we need them? |
263 |
# http://culmus.sourceforge.net/fancy/anka-otf.zip |
264 |
@@ -39,8 +40,6 @@ SLOT="0" |
265 |
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86" |
266 |
IUSE="ancient fancy fontforge taamey" |
267 |
|
268 |
-FONT_CONF=( "${T}"/65-culmus.conf ) |
269 |
- |
270 |
RDEPEND="!media-fonts/culmus-ancient" |
271 |
# >=x11-apps/mkfontscale-1.0.9-r1 as Heavy weight support is required |
272 |
BDEPEND=" |
273 |
@@ -49,7 +48,7 @@ BDEPEND=" |
274 |
fontforge? ( media-gfx/fontforge ) |
275 |
" |
276 |
|
277 |
-S="${WORKDIR}" |
278 |
+FONT_CONF=( "${T}"/65-culmus.conf ) |
279 |
# Put all fonts, generated or not here |
280 |
FONT_S="${S}/FONTS" |
281 |
|
282 |
@@ -58,8 +57,8 @@ PATCHES=( "${FILESDIR}/${P}-fontconfig-test.patch" ) # bug 695708 |
283 |
src_unpack() { |
284 |
unpack ${P}.tar.gz # For type1 fonts... |
285 |
unpack ${PN}-type1-${TYPE1_PV}.tar.gz |
286 |
- use fontforge && unpack ${PN}-src-${PV}.tar.gz |
287 |
|
288 |
+ use fontforge && unpack ${PN}-src-${PV}.tar.gz |
289 |
use ancient && unpack ${MY_A_P}$(usex fontforge '' .TTF).tgz |
290 |
|
291 |
if use fancy; then |
292 |
@@ -71,8 +70,11 @@ src_unpack() { |
293 |
if use taamey; then |
294 |
for font in ${TAAMEY_FONTS}; do |
295 |
mkdir ${font} || die |
296 |
+ |
297 |
pushd ${font} > /dev/null || die |
298 |
- unpack ${font}.zip |
299 |
+ |
300 |
+ unpack ${font}.zip |
301 |
+ |
302 |
popd > /dev/null || die |
303 |
done |
304 |
fi |
305 |
@@ -85,60 +87,78 @@ src_prepare() { |
306 |
|
307 |
src_compile() { |
308 |
mkdir -p "${FONT_S}" || die |
309 |
+ |
310 |
if use fontforge; then |
311 |
pushd ${P} > /dev/null || die |
312 |
- mv *.afm *.pfa "${FONT_S}" || die |
313 |
- rm *.ttf || die |
314 |
+ |
315 |
+ mv *.afm *.pfa "${FONT_S}" || die |
316 |
+ rm *.ttf || die |
317 |
+ |
318 |
popd > /dev/null || die |
319 |
|
320 |
pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die |
321 |
- mv *.afm *.pfa "${FONT_S}" || die |
322 |
+ |
323 |
+ mv *.afm *.pfa "${FONT_S}" || die |
324 |
+ |
325 |
popd > /dev/null || die |
326 |
|
327 |
pushd ${PN}-src-${PV} > /dev/null || die |
328 |
- for f in *.sfd; do |
329 |
- "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die |
330 |
- done |
331 |
+ |
332 |
+ for f in *.sfd; do |
333 |
+ "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die |
334 |
+ done |
335 |
+ |
336 |
popd > /dev/null || die |
337 |
|
338 |
if use ancient; then |
339 |
pushd ${MY_A_P}/src > /dev/null || die |
340 |
- export FONTFORGE_LANGUAGE=ff |
341 |
- make clean || die |
342 |
- make all || die "Failed to build fonts" |
343 |
- mv *.ttf "${FONT_S}" || die |
344 |
+ |
345 |
+ export FONTFORGE_LANGUAGE=ff |
346 |
+ |
347 |
+ emake clean |
348 |
+ emake all |
349 |
+ |
350 |
+ mv *.ttf "${FONT_S}" || die |
351 |
+ |
352 |
popd > /dev/null || die |
353 |
fi |
354 |
|
355 |
if use taamey; then |
356 |
for font in ${TAAMEY_FONTS}; do |
357 |
rm -rf ${font}/TTF || die |
358 |
+ |
359 |
pushd ${font}/SFD > /dev/null || die |
360 |
- for f in *.sfd; do |
361 |
- "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die |
362 |
- done |
363 |
+ |
364 |
+ for f in *.sfd; do |
365 |
+ "${WORKDIR}"/${PN}-src-${PV}/GenerateTTF.pe ${f} "${FONT_S}" || die |
366 |
+ done |
367 |
+ |
368 |
popd > /dev/null || die |
369 |
done |
370 |
fi |
371 |
else |
372 |
pushd ${P} > /dev/null || die |
373 |
- mv *.afm *.pfa *.ttf "${FONT_S}" || die |
374 |
+ mv *.afm *.pfa *.ttf "${FONT_S}" || die |
375 |
popd >/dev/null || die |
376 |
|
377 |
pushd ${PN}-type1-${TYPE1_PV} > /dev/null || die |
378 |
- mv *.afm *.pfa "${FONT_S}" || die |
379 |
+ mv *.afm *.pfa "${FONT_S}" || die |
380 |
popd > /dev/null || die |
381 |
|
382 |
if use ancient; then |
383 |
pushd ${MY_A_P}$(usex fontforge '' .TTF)/fonts > /dev/null || die |
384 |
- mv *.ttf "${FONT_S}" || die |
385 |
+ |
386 |
+ mv *.ttf "${FONT_S}" || die |
387 |
+ |
388 |
popd > /dev/null || die |
389 |
fi |
390 |
|
391 |
if use taamey; then |
392 |
for font in ${TAAMEY_FONTS}; do |
393 |
pushd ${font}/TTF > /dev/null || die |
394 |
- mv *.ttf "${FONT_S}" || die |
395 |
+ |
396 |
+ mv *.ttf "${FONT_S}" || die |
397 |
+ |
398 |
popd > /dev/null || die |
399 |
done |
400 |
fi |
401 |
@@ -158,27 +178,31 @@ src_install() { |
402 |
rm -rf "${FONT_S}" || die |
403 |
find "${WORKDIR}" -name '*.ttf' -o -name '*.pfa' -o -name '*.pfm' | |
404 |
while read font; do |
405 |
- ewarn "QA: missed font file: ${font}" |
406 |
+ eqawarn "Missed font file: ${font}" |
407 |
done |
408 |
|
409 |
pushd ${PN}$(usex fontforge -src '')-${PV} > /dev/null || die |
410 |
- dodoc CHANGES |
411 |
+ dodoc CHANGES |
412 |
popd > /dev/null || die |
413 |
|
414 |
if use ancient; then |
415 |
pushd "${WORKDIR}/${MY_A_P}$(usex fontforge '' .TTF)/" > /dev/null || die |
416 |
- newdoc CHANGES{,.ancient} || die |
417 |
- newdoc README{,.ancient} || die |
418 |
+ |
419 |
+ newdoc CHANGES{,.ancient} |
420 |
+ newdoc README{,.ancient} |
421 |
+ |
422 |
popd > /dev/null || die |
423 |
fi |
424 |
|
425 |
if use taamey; then |
426 |
for font in ${TAAMEY_FONTS}; do |
427 |
pushd ${font} > /dev/null || die |
428 |
- docinto ${font} |
429 |
- [[ -f ChangeLog ]] && { newdoc ChangeLog{,.${font}} || die; } |
430 |
- newdoc README{,.${font}} || die |
431 |
- dodoc -r Samples |
432 |
+ |
433 |
+ docinto ${font} |
434 |
+ [[ -f ChangeLog ]] && newdoc ChangeLog{,.${font}} |
435 |
+ newdoc README{,.${font}} |
436 |
+ dodoc -r Samples |
437 |
+ |
438 |
popd > /dev/null || die |
439 |
done |
440 |
fi |