Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/, media-libs/libafterimage/files/
Date: Sun, 29 Jan 2017 21:59:29
Message-Id: 1485727154.9cb83c1e90f21cfa14c10b66a530071cce27bf37.jer@gentoo
1 commit: 9cb83c1e90f21cfa14c10b66a530071cce27bf37
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 29 21:54:26 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 21:59:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb83c1e
7
8 media-libs/libafterimage: Old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 .../files/libafterimage-giflib42.patch | 19 -
13 .../files/libafterimage-giflib5.patch | 382 ---------------------
14 .../libafterimage/libafterimage-1.20-r1.ebuild | 108 ------
15 media-libs/libafterimage/libafterimage-1.20.ebuild | 95 -----
16 4 files changed, 604 deletions(-)
17
18 diff --git a/media-libs/libafterimage/files/libafterimage-giflib42.patch b/media-libs/libafterimage/files/libafterimage-giflib42.patch
19 deleted file mode 100644
20 index b1b1f72..00000000
21 --- a/media-libs/libafterimage/files/libafterimage-giflib42.patch
22 +++ /dev/null
23 @@ -1,19 +0,0 @@
24 -Fix build failure with giflib 4.2.
25 -Patch by Andrew Savchenko <bircoph@×××××.com>.
26 -https://bugs.gentoo.org/486804
27 -
28 ---- libAfterImage-1.20/ungif.h.orig
29 -+++ libAfterImage-1.20/ungif.h
30 -@@ -7,6 +7,12 @@
31 - extern "C" {
32 - #endif
33 -
34 -+#if (GIFLIB_MAJOR>4) || ((GIFLIB_MAJOR==4) && (GIFLIB_MINOR>=2))
35 -+static inline void PrintGifError(void) {
36 -+ fprintf(stderr, "%s\n", GifErrorString());
37 -+}
38 -+#endif
39 -+
40 - #ifdef __GNUC__
41 - #define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0)
42 - #else
43
44 diff --git a/media-libs/libafterimage/files/libafterimage-giflib5.patch b/media-libs/libafterimage/files/libafterimage-giflib5.patch
45 deleted file mode 100644
46 index b650b24..00000000
47 --- a/media-libs/libafterimage/files/libafterimage-giflib5.patch
48 +++ /dev/null
49 @@ -1,382 +0,0 @@
50 -diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
51 ---- libAfterImage-1.20.orig/export.c 2016-05-01 11:44:19.000000000 +0300
52 -+++ libAfterImage-1.20/export.c 2016-05-02 10:57:59.688984491 +0300
53 -@@ -1048,6 +1048,9 @@
54 - Bool new_image = True ;
55 - START_TIME(started);
56 - int cmap_size = 1;
57 -+#if (GIFLIB_MAJOR>=5)
58 -+ int errcode;
59 -+#endif
60 - #define GIF_NETSCAPE_EXT_BYTES 3
61 - unsigned char netscape_ext_bytes[GIF_NETSCAPE_EXT_BYTES] = { 0x1, 0x0, 0x0};
62 - #define GIF_GCE_BYTES 4
63 -@@ -1086,10 +1089,18 @@
64 -
65 - while( cmap_size < 256 && cmap_size < (int)cmap.count+(gce_bytes[0]&0x01) )
66 - cmap_size = cmap_size<<1 ;
67 -+#if (GIFLIB_MAJOR>=5)
68 -+ if( (gif_cmap = GifMakeMapObject(cmap_size, NULL )) == NULL )
69 -+#else
70 - if( (gif_cmap = MakeMapObject(cmap_size, NULL )) == NULL )
71 -+#endif
72 - {
73 - free( mapped_im );
74 -+#if (GIFLIB_MAJOR>=5)
75 -+ ASIM_PrintGifError(E_GIF_ERR_NOT_ENOUGH_MEM);
76 -+#else
77 - ASIM_PrintGifError();
78 -+#endif
79 - return False;
80 - }
81 - memcpy( &(gif_cmap->Colors[0]), &(cmap.entries[0]), MIN(cmap.count,(unsigned int)cmap_size)*3 );
82 -@@ -1101,13 +1112,25 @@
83 - SavedImage *images = NULL ;
84 - int count = 0 ;
85 - /* TODO: do something about multiimage files !!! */
86 -+#if (GIFLIB_MAJOR>=5)
87 -+ gif = open_gif_read(infile, &errcode);
88 -+#else
89 - gif = open_gif_read(infile);
90 -+#endif
91 - if( gif == NULL || get_gif_saved_images(gif, -1, &images, &count) == GIF_ERROR)
92 - {
93 -+#if (GIFLIB_MAJOR>=5)
94 -+ ASIM_PrintGifError(errcode);
95 -+#else
96 - ASIM_PrintGifError();
97 -+#endif
98 - if( gif )
99 - {
100 -+#if (GIFLIB_MAJOR>=5)
101 -+ DGifCloseFile(gif, &errcode);
102 -+#else
103 - DGifCloseFile(gif);
104 -+#endif
105 - gif = NULL ;
106 - }
107 - if (infile)
108 -@@ -1123,14 +1146,22 @@
109 - gif_src = *gif ;
110 - gif->SColorMap = NULL ;
111 - gif->Image.ColorMap = NULL ;
112 -+#if (GIFLIB_MAJOR>=5)
113 -+ DGifCloseFile(gif, &errcode);
114 -+#else
115 - DGifCloseFile(gif);
116 -+#endif
117 - gif = NULL;
118 - fclose (infile);
119 - infile = NULL;
120 - outfile = open_writeable_image_file( path );
121 -
122 - if (outfile)
123 -+#if (GIFLIB_MAJOR>=5)
124 -+ gif = EGifOpenFileHandle(fileno(outfile), &errcode);
125 -+#else
126 - gif = EGifOpenFileHandle(fileno(outfile));
127 -+#endif
128 -
129 - if (gif)
130 - {
131 -@@ -1141,26 +1172,46 @@
132 - gif_src.SColorMap )) == GIF_OK )
133 - status = write_gif_saved_images( gif, images, count );
134 - if( status != GIF_OK )
135 -+#if (GIFLIB_MAJOR>=5)
136 -+ ASIM_PrintGifError(status);
137 -+#else
138 - ASIM_PrintGifError();
139 -+#endif
140 - }
141 - if (gif_src.SColorMap)
142 - { /* we only want to save private colormap if it is any different from
143 - * screen colormap ( saves us 768 bytes per image ) */
144 - if( gif_cmap->ColorCount == gif_src.SColorMap->ColorCount )
145 - dont_save_cmap = ( memcmp( gif_cmap->Colors, gif_src.SColorMap->Colors, gif_cmap->ColorCount*sizeof(GifColorType)) == 0 );
146 -+#if (GIFLIB_MAJOR>=5)
147 -+ GifFreeMapObject(gif_src.SColorMap);
148 -+#else
149 - FreeMapObject(gif_src.SColorMap);
150 -+#endif
151 - }
152 - if (gif)
153 - {
154 - EGifPutExtension(gif, GRAPHICS_EXT_FUNC_CODE, GIF_GCE_BYTES, &(gce_bytes[0]));
155 - if( get_flags( params->gif.flags, EXPORT_ANIMATION_REPEATS ) )
156 - {
157 -+#if (GIFLIB_MAJOR>=5)
158 -+ EGifPutExtensionLeader(gif, APPLICATION_EXT_FUNC_CODE);
159 -+ EGifPutExtensionBlock(gif, 11, "NETSCAPE2.0");
160 -+ EGifPutExtensionBlock(gif, GIF_NETSCAPE_EXT_BYTES, &(netscape_ext_bytes[0]));
161 -+ EGifPutExtensionTrailer(gif);
162 -+#else
163 - EGifPutExtensionFirst(gif, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0");
164 - EGifPutExtensionLast(gif, 0, GIF_NETSCAPE_EXT_BYTES, &(netscape_ext_bytes[0]));
165 -+#endif
166 - }
167 -
168 -+#if (GIFLIB_MAJOR>=5)
169 -+ if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, false, (dont_save_cmap)?NULL:gif_cmap )) == GIF_ERROR )
170 -+ ASIM_PrintGifError(errcode);
171 -+#else
172 - if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, (dont_save_cmap)?NULL:gif_cmap ) == GIF_ERROR )
173 - ASIM_PrintGifError();
174 -+#endif
175 - }
176 - }
177 - free_gif_saved_images( images, count );
178 -@@ -1172,24 +1223,46 @@
179 - outfile = open_writeable_image_file(path);
180 -
181 - if (outfile)
182 -+ {
183 -+#if (GIFLIB_MAJOR>=5)
184 -+ gif = EGifOpenFileHandle(fileno(outfile), &errcode);
185 -+ if (errcode != E_GIF_SUCCEEDED)
186 -+ ASIM_PrintGifError(errcode);
187 -+#else
188 - if ((gif = EGifOpenFileHandle(fileno(outfile))) == NULL)
189 - ASIM_PrintGifError();
190 -+#endif
191 -+ }
192 - }
193 -
194 - if( new_image && gif )
195 - {
196 -+#if (GIFLIB_MAJOR>=5)
197 -+ if( (errcode = EGifPutScreenDesc(gif, im->width, im->height, cmap_size, 0, gif_cmap )) == GIF_ERROR )
198 -+ ASIM_PrintGifError(errcode);
199 -+#else
200 - if( EGifPutScreenDesc(gif, im->width, im->height, cmap_size, 0, gif_cmap ) == GIF_ERROR )
201 - ASIM_PrintGifError();
202 -+#endif
203 -
204 - EGifPutExtension(gif, 0xf9, GIF_GCE_BYTES, &(gce_bytes[0]));
205 -
206 -+#if (GIFLIB_MAJOR>=5)
207 -+ if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, false, NULL )) == GIF_ERROR )
208 -+ ASIM_PrintGifError(errcode);
209 -+#else
210 - if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, NULL ) == GIF_ERROR )
211 - ASIM_PrintGifError();
212 -+#endif
213 - }
214 -
215 - if( gif_cmap )
216 - {
217 -+#if (GIFLIB_MAJOR>=5)
218 -+ GifFreeMapObject(gif_cmap);
219 -+#else
220 - FreeMapObject(gif_cmap);
221 -+#endif
222 - gif_cmap = NULL ;
223 - }
224 - if( gif )
225 -@@ -1203,12 +1276,23 @@
226 - register int *src = mapped_im + x*y;
227 - while( --x >= 0 )
228 - row_pointer[x] = src[x] ;
229 -+#if (GIFLIB_MAJOR>=5)
230 -+ if( (errcode = EGifPutLine(gif, row_pointer, im->width)) == GIF_ERROR)
231 -+ ASIM_PrintGifError(errcode);
232 -+#else
233 - if( EGifPutLine(gif, row_pointer, im->width) == GIF_ERROR)
234 - ASIM_PrintGifError();
235 -+#endif
236 - }
237 - free( row_pointer );
238 -+#if (GIFLIB_MAJOR>=5)
239 -+ EGifCloseFile(gif, &errcode);
240 -+ if (errcode != E_GIF_SUCCEEDED)
241 -+ ASIM_PrintGifError(errcode);
242 -+#else
243 - if (EGifCloseFile(gif) == GIF_ERROR)
244 - ASIM_PrintGifError();
245 -+#endif
246 - gif = NULL;
247 - }
248 - free( mapped_im );
249 -diff -Naurd libAfterImage-1.20.orig/import.c libAfterImage-1.20/import.c
250 ---- libAfterImage-1.20.orig/import.c 2016-05-01 11:44:19.000000000 +0300
251 -+++ libAfterImage-1.20/import.c 2016-05-02 11:01:58.979496755 +0300
252 -@@ -2178,6 +2178,9 @@
253 - int transparent = -1 ;
254 - unsigned int y;
255 - unsigned int width = 0, height = 0;
256 -+#if (GIFLIB_MAJOR>=5)
257 -+ int errcode;
258 -+#endif
259 - ColorMapObject *cmap = NULL ;
260 -
261 - START_TIME(started);
262 -@@ -2186,7 +2189,11 @@
263 -
264 - if ((fp = open_image_file(path)) == NULL)
265 - return NULL;
266 -+#if (GIFLIB_MAJOR>=5)
267 -+ if( (gif = open_gif_read(fp, &errcode)) != NULL )
268 -+#else
269 - if( (gif = open_gif_read(fp)) != NULL )
270 -+#endif
271 - {
272 - SavedImage *sp = NULL ;
273 - int count = 0 ;
274 -@@ -2289,13 +2296,21 @@
275 - }
276 - free_gif_saved_images( sp, count );
277 - }else if( status != GIF_OK )
278 -+#if (GIFLIB_MAJOR>=5)
279 -+ ASIM_PrintGifError(status);
280 -+#else
281 - ASIM_PrintGifError();
282 -+#endif
283 - else if( params->subimage == -1 )
284 - show_error( "Image file \"%s\" does not have any valid image information.", path );
285 - else
286 - show_error( "Image file \"%s\" does not have subimage %d.", path, params->subimage );
287 -
288 -+#if (GIFLIB_MAJOR>=5)
289 -+ DGifCloseFile(gif, &errcode);
290 -+#else
291 - DGifCloseFile(gif);
292 -+#endif
293 - fclose( fp );
294 - }
295 - SHOW_TIME("image loading",started);
296 -diff -Naurd libAfterImage-1.20.orig/ungif.c libAfterImage-1.20/ungif.c
297 ---- libAfterImage-1.20.orig/ungif.c 2011-01-15 08:52:22.000000000 +0300
298 -+++ libAfterImage-1.20/ungif.c 2016-05-02 16:03:57.590148737 +0300
299 -@@ -75,13 +75,21 @@
300 - if( sp )
301 - {
302 - if (sp->ImageDesc.ColorMap)
303 -+#if (GIFLIB_MAJOR>=5)
304 -+ GifFreeMapObject(sp->ImageDesc.ColorMap);
305 -+#else
306 - FreeMapObject(sp->ImageDesc.ColorMap);
307 -+#endif
308 -
309 - if (sp->RasterBits)
310 - free((char *)sp->RasterBits);
311 -
312 - if (sp->ExtensionBlocks)
313 -+#if (GIFLIB_MAJOR>=5)
314 -+ GifFreeExtensions(sp->ExtensionBlockCount, sp->ExtensionBlocks);
315 -+#else
316 - FreeExtension(sp);
317 -+#endif
318 -
319 - if( !reusable )
320 - free( sp );
321 -@@ -119,11 +127,19 @@
322 - return ret;
323 - }
324 -
325 -+#if (GIFLIB_MAJOR>=5)
326 -+GifFileType*
327 -+open_gif_read( FILE *in_stream, int *errcode )
328 -+{
329 -+ return DGifOpen(in_stream, fread_gif, errcode);
330 -+}
331 -+#else
332 - GifFileType*
333 - open_gif_read( FILE *in_stream )
334 - {
335 - return DGifOpen(in_stream, fread_gif);
336 - }
337 -+#endif
338 -
339 - int
340 - get_gif_image_desc( GifFileType *gif, SavedImage *im )
341 -@@ -151,7 +167,11 @@
342 - memcpy( &(im->ImageDesc), &(gif->Image), sizeof(GifImageDesc));
343 - if( gif->Image.ColorMap )
344 - {
345 -+#if (GIFLIB_MAJOR>=5)
346 -+ im->ImageDesc.ColorMap = GifMakeMapObject(gif->Image.ColorMap->ColorCount, NULL);
347 -+#else
348 - im->ImageDesc.ColorMap = MakeMapObject(gif->Image.ColorMap->ColorCount, NULL);
349 -+#endif
350 - fseek( gif->UserData, start_pos+9, SEEK_SET );
351 - fread( im->ImageDesc.ColorMap->Colors, 1, gif->Image.ColorMap->ColorCount*3, gif->UserData);
352 - fseek( gif->UserData, end_pos, SEEK_SET );
353 -@@ -166,6 +186,9 @@
354 - {
355 - GifRecordType RecordType;
356 - GifByteType *ExtData;
357 -+#if (GIFLIB_MAJOR>=5)
358 -+ int ExtCode;
359 -+#endif
360 - SavedImage temp_save;
361 - int curr_image = 0, ret_count = *ret_images ;
362 - int status = GIF_OK;
363 -@@ -197,13 +220,23 @@
364 - break;
365 -
366 - case EXTENSION_RECORD_TYPE:
367 -+#if (GIFLIB_MAJOR>=5)
368 -+ status = DGifGetExtension(gif,&ExtCode,&ExtData);
369 -+#else
370 - status = DGifGetExtension(gif,&temp_save.Function,&ExtData);
371 -+#endif
372 - while (ExtData != NULL && status == GIF_OK )
373 - {
374 - /* Create an extension block with our data */
375 -+#if (GIFLIB_MAJOR>=5)
376 -+ if ((status = GifAddExtensionBlock(&temp_save.ExtensionBlockCount, &temp_save.ExtensionBlocks,
377 -+ ExtCode, sizeof(ExtData), ExtData)) == GIF_OK)
378 -+ status = DGifGetExtension(gif,&ExtCode,&ExtData);
379 -+#else
380 - if ((status = AddExtensionBlock(&temp_save, ExtData[0], (char*)&(ExtData[1]))) == GIF_OK)
381 - status = DGifGetExtensionNext(gif, &ExtData);
382 - temp_save.Function = 0;
383 -+#endif
384 - }
385 - break;
386 -
387 -diff -Naurd libAfterImage-1.20.orig/ungif.h libAfterImage-1.20/ungif.h
388 ---- libAfterImage-1.20.orig/ungif.h 2011-01-15 08:52:22.000000000 +0300
389 -+++ libAfterImage-1.20/ungif.h 2016-05-02 10:57:59.715983533 +0300
390 -@@ -7,11 +7,29 @@
391 - extern "C" {
392 - #endif
393 -
394 -+#if ((GIFLIB_MAJOR==4) && (GIFLIB_MINOR>=2))
395 -+static inline void PrintGifError(void) {
396 -+ fprintf(stderr, "%s\n", GifErrorString());
397 -+}
398 -+#elif (GIFLIB_MAJOR>=5)
399 -+static inline void PrintGifError(int code) {
400 -+ fprintf(stderr, "%s\n", GifErrorString(code));
401 -+}
402 -+#endif
403 -+
404 -+#if (GIFLIB_MAJOR>=5)
405 -+#ifdef __GNUC__
406 -+#define ASIM_PrintGifError(code) do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(code); }while(0)
407 -+#else
408 -+#define ASIM_PrintGifError(code) do{ PrintGifError(code); }while(0)
409 -+#endif
410 -+#else // (GIFLIB_MAJOR>=5)
411 - #ifdef __GNUC__
412 - #define ASIM_PrintGifError() do{ fprintf( stderr, "%s():%d:<%s> ",__FUNCTION__, __LINE__, path?path:"null" ); PrintGifError(); }while(0)
413 - #else
414 - #define ASIM_PrintGifError() do{ PrintGifError(); }while(0)
415 - #endif
416 -+#endif // (GIFLIB_MAJOR>=5)
417 -
418 - #define GIF_GCE_DELAY_BYTE_LOW 1
419 - #define GIF_GCE_DELAY_BYTE_HIGH 2
420 -@@ -24,7 +42,11 @@
421 -
422 -
423 - int fread_gif( GifFileType *gif, GifByteType* buf, int len );
424 -+#if (GIFLIB_MAJOR>=5)
425 -+GifFileType* open_gif_read( FILE *in_stream, int *errcode );
426 -+#else
427 - GifFileType* open_gif_read( FILE *in_stream );
428 -+#endif
429 -
430 - int get_gif_image_desc( GifFileType *gif, SavedImage *im );
431 -
432
433 diff --git a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild b/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
434 deleted file mode 100644
435 index a737b89..00000000
436 --- a/media-libs/libafterimage/libafterimage-1.20-r1.ebuild
437 +++ /dev/null
438 @@ -1,108 +0,0 @@
439 -# Copyright 1999-2017 Gentoo Foundation
440 -# Distributed under the terms of the GNU General Public License v2
441 -# $Id$
442 -
443 -EAPI=6
444 -inherit autotools
445 -
446 -MY_PN=libAfterImage
447 -
448 -DESCRIPTION="Afterstep's standalone generic image manipulation library"
449 -HOMEPAGE="http://www.afterstep.org/afterimage/index.php"
450 -SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
451 -
452 -LICENSE="LGPL-2.1"
453 -SLOT="0"
454 -KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
455 -IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm +shaping svg tiff truetype"
456 -
457 -RDEPEND="
458 - X? ( x11-libs/libSM
459 - x11-libs/libXext
460 - x11-libs/libXrender )
461 - gif? ( media-libs/giflib:0= )
462 - jpeg? ( virtual/jpeg:0 )
463 - opengl? ( virtual/opengl )
464 - png? ( >=media-libs/libpng-1.4:0= )
465 - svg? ( gnome-base/librsvg:2 )
466 - tiff? ( media-libs/tiff:0 )
467 - truetype? ( media-libs/freetype )"
468 -DEPEND="${RDEPEND}
469 - X? ( x11-proto/xextproto )
470 - virtual/pkgconfig
471 - !!x11-wm/afterstep"
472 -REQUIRED_USE="
473 - opengl? ( X )
474 - shaping? ( X )
475 - shm? ( X )"
476 -
477 -S="${WORKDIR}/${MY_PN}-${PV}"
478 -
479 -src_prepare() {
480 - default
481 -
482 - # fix some ldconfig problem in makefile.in
483 - eapply -p0 "${FILESDIR}"/${PN}-makefile.in.patch
484 - # fix lib paths in afterimage-config
485 - eapply -p0 "${FILESDIR}"/${PN}-config.patch
486 - # fix gif unbundle
487 - eapply -p0 "${FILESDIR}"/${PN}-gif.patch
488 - # fix for libpng15 compability
489 - eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
490 - # add giflib-5 API support, bug 571654
491 - eapply "${FILESDIR}"/${PN}-giflib5.patch
492 - # do not build examples
493 - use examples || sed -i \
494 - -e '/^all:/s/apps//' \
495 - -e '/^install:/s/install.apps//' \
496 - Makefile.in || die "sed failed"
497 - # remove forced flags
498 - sed -i \
499 - -e 's/CFLAGS="-O3"//' \
500 - -e 's/ -rdynamic//' \
501 - configure.in || die "sed failed"
502 -
503 - mv configure.in configure.ac || die
504 - eautoreconf
505 -}
506 -
507 -src_configure() {
508 - econf \
509 - $(use_enable cpu_flags_x86_mmx mmx-optimization) \
510 - $(use_enable opengl glx) \
511 - $(use_enable nls i18n) \
512 - $(use_enable shaping) \
513 - $(use_enable shm shmimage ) \
514 - $(use_enable static-libs staticlibs) \
515 - $(use_with X x) \
516 - $(use_with gif) \
517 - $(use_with jpeg) \
518 - $(use_with png) \
519 - $(use_with svg) \
520 - $(use_with tiff) \
521 - $(use_with truetype ttf) \
522 - --enable-sharedlibs \
523 - --with-xpm \
524 - --without-builtin-gif \
525 - --without-builtin-jpeg \
526 - --without-builtin-png \
527 - --without-builtin-zlib \
528 - --without-afterbase
529 -}
530 -
531 -src_install() {
532 - emake \
533 - DESTDIR="${D}" \
534 - AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
535 - install
536 - dodoc ChangeLog README
537 - if use examples; then
538 - cd apps || die
539 - mv ascompose.man ascompose.1 || die
540 - doman ascompose.1
541 - emake clean
542 - rm Makefile* ascompose.1 || die
543 - insinto /usr/share/doc/${PF}/examples
544 - doins *
545 - fi
546 -}
547
548 diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild b/media-libs/libafterimage/libafterimage-1.20.ebuild
549 deleted file mode 100644
550 index 16418da..00000000
551 --- a/media-libs/libafterimage/libafterimage-1.20.ebuild
552 +++ /dev/null
553 @@ -1,95 +0,0 @@
554 -# Copyright 1999-2016 Gentoo Foundation
555 -# Distributed under the terms of the GNU General Public License v2
556 -# $Id$
557 -
558 -EAPI=5
559 -inherit eutils autotools
560 -
561 -MY_PN=libAfterImage
562 -
563 -DESCRIPTION="Afterstep's standalone generic image manipulation library"
564 -HOMEPAGE="http://www.afterstep.org/afterimage/index.php"
565 -SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
566 -
567 -LICENSE="LGPL-2.1"
568 -SLOT="0"
569 -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
570 -IUSE="examples gif jpeg cpu_flags_x86_mmx nls png static-libs svg tiff truetype"
571 -
572 -RDEPEND="
573 - x11-libs/libSM
574 - x11-libs/libXext
575 - x11-libs/libXrender
576 - png? ( >=media-libs/libpng-1.4:0 )
577 - jpeg? ( virtual/jpeg:= )
578 - gif? ( <media-libs/giflib-5 )
579 - svg? ( gnome-base/librsvg )
580 - tiff? ( media-libs/tiff:0 )
581 - truetype? ( media-libs/freetype )"
582 -DEPEND="${RDEPEND}
583 - virtual/pkgconfig
584 - x11-proto/xextproto
585 - !!x11-wm/afterstep"
586 -
587 -S="${WORKDIR}/${MY_PN}-${PV}"
588 -
589 -src_prepare() {
590 - # fix some ldconfig problem in makefile.in
591 - epatch "${FILESDIR}"/${PN}-makefile.in.patch
592 - # fix lib paths in afterimage-config
593 - epatch "${FILESDIR}"/${PN}-config.patch
594 - # fix gif unbundle
595 - epatch "${FILESDIR}"/${PN}-gif.patch
596 - # fix for libpng15 compability
597 - epatch "${FILESDIR}"/${PN}-libpng15.patch
598 - # fix for gif library bug #486804
599 - epatch "${FILESDIR}"/${PN}-giflib42.patch
600 - # do not build examples
601 - sed -i \
602 - -e '/^all:/s/apps//' \
603 - -e '/^install:/s/install.apps//' \
604 - Makefile.in || die
605 - # remove forced flags
606 - sed -i \
607 - -e 's/CFLAGS="-O3"//' \
608 - -e 's/ -rdynamic//' \
609 - configure.in || die "sed failed"
610 - eautoreconf
611 -}
612 -
613 -src_configure() {
614 - econf \
615 - $(use_enable static-libs staticlibs) \
616 - $(use_enable nls i18n) \
617 - $(use_enable cpu_flags_x86_mmx mmx-optimization) \
618 - $(use_with png) \
619 - $(use_with jpeg) \
620 - $(use_with gif) \
621 - $(use_with svg) \
622 - $(use_with tiff) \
623 - $(use_with truetype ttf) \
624 - --enable-glx \
625 - --enable-sharedlibs \
626 - --with-x \
627 - --with-xpm \
628 - --without-builtin-gif \
629 - --without-builtin-jpeg \
630 - --without-builtin-png \
631 - --without-builtin-zlib \
632 - --without-afterbase
633 -}
634 -
635 -src_install() {
636 - emake \
637 - DESTDIR="${D}" \
638 - AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
639 - install
640 - dodoc ChangeLog README
641 - if use examples; then
642 - cd apps || die
643 - emake clean
644 - rm Makefile* || die
645 - insinto /usr/share/doc/${PF}/examples
646 - doins *
647 - fi
648 -}
Report Message
Find on MARC Find on Google Groups